Seam SVN: r13630 - branches/community/Seam_2_2/src/remoting/org/jboss/seam/remoting/messaging.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2010-08-24 20:52:00 -0400 (Tue, 24 Aug 2010)
New Revision: 13630
Modified:
branches/community/Seam_2_2/src/remoting/org/jboss/seam/remoting/messaging/SubscriptionRegistry.java
Log:
JBSEAM-4697
Modified: branches/community/Seam_2_2/src/remoting/org/jboss/seam/remoting/messaging/SubscriptionRegistry.java
===================================================================
--- branches/community/Seam_2_2/src/remoting/org/jboss/seam/remoting/messaging/SubscriptionRegistry.java 2010-08-23 22:33:44 UTC (rev 13629)
+++ branches/community/Seam_2_2/src/remoting/org/jboss/seam/remoting/messaging/SubscriptionRegistry.java 2010-08-25 00:52:00 UTC (rev 13630)
@@ -2,11 +2,11 @@
import static org.jboss.seam.annotations.Install.BUILT_IN;
-import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
import javax.jms.ExceptionListener;
import javax.jms.JMSException;
@@ -39,7 +39,7 @@
private Object monitor = new Object();
- private Map<String,RemoteSubscriber> subscriptions = new HashMap<String,RemoteSubscriber>();
+ private Map<String,RemoteSubscriber> subscriptions = new ConcurrentHashMap<String,RemoteSubscriber>();
/**
* Contains a list of all the topics that clients are allowed to subscribe to.
14 years, 1 month
Seam SVN: r13629 - in modules/faces/trunk: impl and 1 other directories.
by seam-commits＠lists.jboss.org
Author: lincolnthree
Date: 2010-08-23 18:33:44 -0400 (Mon, 23 Aug 2010)
New Revision: 13629
Modified:
modules/faces/trunk/impl/pom.xml
modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/environment/ExternalContextProducerTest.java
modules/faces/trunk/pom.xml
Log:
fixed my erroneous POM deletions
Modified: modules/faces/trunk/impl/pom.xml
===================================================================
--- modules/faces/trunk/impl/pom.xml 2010-08-23 08:50:46 UTC (rev 13628)
+++ modules/faces/trunk/impl/pom.xml 2010-08-23 22:33:44 UTC (rev 13629)
@@ -32,6 +32,18 @@
<artifactId>seam-international</artifactId>
<version>${seam.i18n.version}</version>
</dependency>
+ <dependency>
+ <artifactId>seam-persistence-api</artifactId>
+ <groupId>org.jboss.seam.persistence</groupId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
</dependencies>
<profiles>
Modified: modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/environment/ExternalContextProducerTest.java
===================================================================
--- modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/environment/ExternalContextProducerTest.java 2010-08-23 08:50:46 UTC (rev 13628)
+++ modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/environment/ExternalContextProducerTest.java 2010-08-23 22:33:44 UTC (rev 13629)
@@ -40,8 +40,8 @@
import org.junit.runner.RunWith;
/**
- * Verify that the ExternalContextProducer produces the same ExternalContext as
- * returned by FacesContext#getExternalContext() and the CDI producer method.
+ * Verify that the ExternalContextProducer produces the same ExternalContext as returned by
+ * FacesContext#getExternalContext() and the CDI producer method.
*
* @author Dan Allen
*/
@@ -51,7 +51,9 @@
@Deployment
public static Archive<?> createTestArchive()
{
- return ShrinkWrap.create("test.jar", JavaArchive.class).addClass(FacesContextProducer.class).addClass(ExternalContextProducer.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml"));
+ return ShrinkWrap.create("test.jar", JavaArchive.class).addClass(FacesContextProducer.class).addClass(
+ ExternalContextProducer.class).addManifestResource(new ByteArrayAsset(new byte[0]),
+ ArchivePaths.create("beans.xml"));
}
@Inject
Modified: modules/faces/trunk/pom.xml
===================================================================
--- modules/faces/trunk/pom.xml 2010-08-23 08:50:46 UTC (rev 13628)
+++ modules/faces/trunk/pom.xml 2010-08-23 22:33:44 UTC (rev 13629)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.seam</groupId>
<artifactId>seam-parent</artifactId>
- <version>2</version>
+ <version>3</version>
</parent>
<artifactId>seam-faces-parent</artifactId>
14 years, 1 month
Seam SVN: r13628 - in modules/persistence/trunk/impl/src/main/java/org/jboss/seam/persistence: util and 1 other directory.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2010-08-23 04:50:46 -0400 (Mon, 23 Aug 2010)
New Revision: 13628
Modified:
modules/persistence/trunk/impl/src/main/java/org/jboss/seam/persistence/InjectionEventListener.java
modules/persistence/trunk/impl/src/main/java/org/jboss/seam/persistence/util/EjbApi.java
Log:
updated to use new weld extensions methods
Modified: modules/persistence/trunk/impl/src/main/java/org/jboss/seam/persistence/InjectionEventListener.java
===================================================================
--- modules/persistence/trunk/impl/src/main/java/org/jboss/seam/persistence/InjectionEventListener.java 2010-08-23 08:34:43 UTC (rev 13627)
+++ modules/persistence/trunk/impl/src/main/java/org/jboss/seam/persistence/InjectionEventListener.java 2010-08-23 08:50:46 UTC (rev 13628)
@@ -100,7 +100,7 @@
*/
private boolean injectionRequired(Class<?> entityClass)
{
- for (Field f : Reflections.getAllFields(entityClass))
+ for (Field f : Reflections.getAllDeclaredFields(entityClass))
{
if (f.isAnnotationPresent(Inject.class))
{
@@ -108,7 +108,7 @@
}
}
- for (Method m : Reflections.getAllMethods(entityClass))
+ for (Method m : Reflections.getAllDeclaredMethods(entityClass))
{
if (m.isAnnotationPresent(Inject.class))
{
@@ -116,7 +116,7 @@
}
}
- for (Constructor<?> c : Reflections.getAllConstructors(entityClass))
+ for (Constructor<?> c : Reflections.getAllDeclaredConstructors(entityClass))
{
if (c.isAnnotationPresent(Inject.class))
{
Modified: modules/persistence/trunk/impl/src/main/java/org/jboss/seam/persistence/util/EjbApi.java
===================================================================
--- modules/persistence/trunk/impl/src/main/java/org/jboss/seam/persistence/util/EjbApi.java 2010-08-23 08:34:43 UTC (rev 13627)
+++ modules/persistence/trunk/impl/src/main/java/org/jboss/seam/persistence/util/EjbApi.java 2010-08-23 08:50:46 UTC (rev 13628)
@@ -111,17 +111,17 @@
public static String name(Annotation annotation)
{
- return (String) invokeAndWrap(Reflections.getMethod(annotation.annotationType(), "name"), annotation);
+ return (String) invokeAndWrap(Reflections.findDeclaredMethod(annotation.annotationType(), "name"), annotation);
}
public static Class[] value(Annotation annotation)
{
- return (Class[]) invokeAndWrap(Reflections.getMethod(annotation.annotationType(), "value"), annotation);
+ return (Class[]) invokeAndWrap(Reflections.findDeclaredMethod(annotation.annotationType(), "value"), annotation);
}
public static boolean rollback(Annotation annotation)
{
- return (Boolean) invokeAndWrap(Reflections.getMethod(annotation.annotationType(), "rollback"), annotation);
+ return (Boolean) invokeAndWrap(Reflections.findDeclaredMethod(annotation.annotationType(), "rollback"), annotation);
}
private static Object invokeAndWrap(Method method, Object instance, Object... parameters)
14 years, 1 month
Seam SVN: r13627 - tags.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2010-08-23 04:34:43 -0400 (Mon, 23 Aug 2010)
New Revision: 13627
Added:
tags/JBPAPP_5_1_0/
Log:
Created tag for JBPAPP_5_1_0
Copied: tags/JBPAPP_5_1_0 (from rev 13626, branches/enterprise/JBPAPP_5_0)
14 years, 1 month
Seam SVN: r13626 - branches/community/Seam_2_2/src/test/ftest/examples/blog.
by seam-commits＠lists.jboss.org
Author: jharting
Date: 2010-08-23 03:39:18 -0400 (Mon, 23 Aug 2010)
New Revision: 13626
Modified:
branches/community/Seam_2_2/src/test/ftest/examples/blog/build.xml
Log:
JBSEAM-4569 use the jboss42 target in functional tests
Modified: branches/community/Seam_2_2/src/test/ftest/examples/blog/build.xml
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/examples/blog/build.xml 2010-08-22 21:15:36 UTC (rev 13625)
+++ branches/community/Seam_2_2/src/test/ftest/examples/blog/build.xml 2010-08-23 07:39:18 UTC (rev 13626)
@@ -22,6 +22,7 @@
-->
<project name="blog.ftest.build" basedir="." default="build">
<property name="example.name" value="blog" />
+ <property name="jboss4.deploy.target" value="jboss42" />
<import file="../build.xml" />
</project>
14 years, 1 month
Seam SVN: r13625 - modules/persistence/trunk/impl/src/main/java/org/jboss/seam/persistence.
by seam-commits＠lists.jboss.org
Author: swd847
Date: 2010-08-22 17:15:36 -0400 (Sun, 22 Aug 2010)
New Revision: 13625
Modified:
modules/persistence/trunk/impl/src/main/java/org/jboss/seam/persistence/ManagedPersistenceContextProxyHandler.java
Log:
infinite loop fix
Modified: modules/persistence/trunk/impl/src/main/java/org/jboss/seam/persistence/ManagedPersistenceContextProxyHandler.java
===================================================================
--- modules/persistence/trunk/impl/src/main/java/org/jboss/seam/persistence/ManagedPersistenceContextProxyHandler.java 2010-08-21 11:29:28 UTC (rev 13624)
+++ modules/persistence/trunk/impl/src/main/java/org/jboss/seam/persistence/ManagedPersistenceContextProxyHandler.java 2010-08-22 21:15:36 UTC (rev 13625)
@@ -114,11 +114,13 @@
{
try
{
+ // we need to do this first to prevent an infinite loop
+ persistenceContextsTouched = true;
persistenceContexts.touch(delegate);
- persistenceContextsTouched = true;
}
catch (ContextNotActiveException e)
{
+ persistenceContextsTouched = false;
log.debug("Not touching pc " + this + "as conversation scope not active");
}
}
14 years, 1 month
seam-commits@lists.jboss.org 33% 0FF on Pfizer.
by seam-commits＠lists.jboss.org
http://groups.yahoo.com/group/tgoaynxbsit/message
ngsnest legt, dem Presseunfug ein Ende macht,
auch dieses Erziehungssmittel in den Dienst des Staates stellt und nicht mehr in der Hand von
Volksfremden und Volksfeinden bela.t. Allein ich glaube, da. dies uns Jungere weniger belastigen wird
als einstens unsere Vater. Eine Drei.ig-Zentimeter-Granate zischte immer noch mehr als tausend
judische Zeitungsvipern also la.t sie denn nur zischen!
Ein weiteres Beispiel fur Halbheit und Schwache in den wichtigsten Lebensfragen der Nation bei der
Leitung des Vorkriegsdeutschlands ist folgendes: Parallel der politischen, sittlichen und mo
14 years, 1 month
Seam SVN: r13624 - modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model.
by seam-commits＠lists.jboss.org
Author: swd847
Date: 2010-08-21 07:29:28 -0400 (Sat, 21 Aug 2010)
New Revision: 13624
Modified:
modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/ModelBuilder.java
Log:
minor
Modified: modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/ModelBuilder.java
===================================================================
--- modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/ModelBuilder.java 2010-08-20 14:22:38 UTC (rev 13623)
+++ modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/ModelBuilder.java 2010-08-21 11:29:28 UTC (rev 13624)
@@ -326,7 +326,7 @@
{
if (count > type.getMaxOccurances())
{
- throw new XmlConfigurationException("Item " + item.getType() + " has " + count + "children of type " + type.getType() + " when it should have at most " + type.getMaxOccurances(), item.getDocument(), item.getLineno());
+ throw new XmlConfigurationException("Item " + item.getType() + " has " + count + " children of type " + type.getType() + " when it should have at most " + type.getMaxOccurances(), item.getDocument(), item.getLineno());
}
}
}
@@ -334,7 +334,7 @@
{
if (count == null || count < type.getMinOccurances())
{
- throw new XmlConfigurationException("Item " + item.getType() + " has " + count + "children of type " + type.getType() + " when it should have at least " + type.getMaxOccurances(), item.getDocument(), item.getLineno());
+ throw new XmlConfigurationException("Item " + item.getType() + " has " + count + " children of type " + type.getType() + " when it should have at least " + type.getMinOccurances(), item.getDocument(), item.getLineno());
}
}
14 years, 1 month
Seam SVN: r13623 - branches/enterprise/JBPAPP_5_0/build.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2010-08-20 10:22:38 -0400 (Fri, 20 Aug 2010)
New Revision: 13623
Modified:
branches/enterprise/JBPAPP_5_0/build/root.pom.xml
Log:
fixed resteasy version to align EAP 5.1
Modified: branches/enterprise/JBPAPP_5_0/build/root.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/build/root.pom.xml 2010-08-20 11:39:48 UTC (rev 13622)
+++ branches/enterprise/JBPAPP_5_0/build/root.pom.xml 2010-08-20 14:22:38 UTC (rev 13623)
@@ -14,7 +14,7 @@
<version.richfaces>3.3.1.SP2</version.richfaces>
<version.drools>5.0.1</version.drools>
<version.testng>5.9</version.testng>
- <version.resteasy>1.2.1.GA_CP02</version.resteasy>
+ <version.resteasy>1.2.1.GA</version.resteasy>
<version.spring>2.5.6.SEC02</version.spring>
<version.hibernate-core>3.3.2.GA_CP03</version.hibernate-core>
</properties>
14 years, 1 month
Seam SVN: r13622 - in branches/community/Seam_2_2/examples: blog and 1 other directory.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2010-08-20 07:39:48 -0400 (Fri, 20 Aug 2010)
New Revision: 13622
Added:
branches/community/Seam_2_2/examples/blog/build-jboss42.xml
Modified:
branches/community/Seam_2_2/examples/blog/build.xml
branches/community/Seam_2_2/examples/blog/readme.txt
branches/community/Seam_2_2/examples/build.xml
Log:
JBSEAM-4569 added jboss42 ant target
Added: branches/community/Seam_2_2/examples/blog/build-jboss42.xml
===================================================================
--- branches/community/Seam_2_2/examples/blog/build-jboss42.xml (rev 0)
+++ branches/community/Seam_2_2/examples/blog/build-jboss42.xml 2010-08-20 11:39:48 UTC (rev 13622)
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+
+<project name="Blog" default="deploy" basedir=".">
+
+ <property name="han.lib" value="yes"/>
+
+ <import file="../build.xml"/>
+
+</project>
Property changes on: branches/community/Seam_2_2/examples/blog/build-jboss42.xml
___________________________________________________________________
Name: svn:executable
+ *
Modified: branches/community/Seam_2_2/examples/blog/build.xml
===================================================================
--- branches/community/Seam_2_2/examples/blog/build.xml 2010-08-20 10:50:41 UTC (rev 13621)
+++ branches/community/Seam_2_2/examples/blog/build.xml 2010-08-20 11:39:48 UTC (rev 13622)
@@ -16,8 +16,11 @@
<!-- Datasource -->
<property name="example.ds" value="blog-ds.xml"/>
- <property name="clean.extra" value="${basedir}/blogindexes" />
+ <property name="clean.extra" value="${basedir}/blogindexes" />
+ <target name="jboss42" description="Build the Groovy Booking example artifacts, and deploy to JBoss 4.2.x.GA">
+ <ant antfile="build-jboss42.xml"/>
+ </target>
+
<import file="../build.xml"/>
-
</project>
Modified: branches/community/Seam_2_2/examples/blog/readme.txt
===================================================================
--- branches/community/Seam_2_2/examples/blog/readme.txt 2010-08-20 10:50:41 UTC (rev 13621)
+++ branches/community/Seam_2_2/examples/blog/readme.txt 2010-08-20 11:39:48 UTC (rev 13622)
@@ -6,4 +6,6 @@
This example runs on JBoss AS as an EAR or Tomcat with JBoss Embedded as a WAR.
+JBoss AS 4.2 needs additional hibernate libraries, use ant target jboss42 for deploying to it.
+
example.name=blog
Modified: branches/community/Seam_2_2/examples/build.xml
===================================================================
--- branches/community/Seam_2_2/examples/build.xml 2010-08-20 10:50:41 UTC (rev 13621)
+++ branches/community/Seam_2_2/examples/build.xml 2010-08-20 11:39:48 UTC (rev 13622)
@@ -291,7 +291,7 @@
<include name="cglib-nodep.jar" if="spring.lib" />
</fileset>
- <fileset id="hibernate-annotations.jar" dir="${lib.dir}">
+ <fileset id="hibernate-deps" dir="${lib.dir}">
<include name="hibernate-core.jar" if="han.lib" />
<include name="hibernate-annotations.jar" if="han.lib" />
<include name="hibernate-commons-annotations.jar" if="han.lib" />
@@ -811,6 +811,7 @@
<fileset refid="metawidget-backend.jar" />
<fileset refid="jboss-common-core.jar" />
<fileset refid="openid.jar" />
+ <fileset refid="hibernate-deps" />
<mapper type="flatten" />
</copy>
</target>
@@ -1056,7 +1057,7 @@
<fileset refid="drools.jar" />
<fileset refid="cache.jar" />
<fileset refid="jbpm.jar" />
- <fileset refid="hibernate-annotations.jar" />
+ <fileset refid="hibernate-deps" />
<fileset refid="spring.jar" />
<fileset refid="gwt.jar" />
<fileset refid="jboss-el.jar" />
14 years, 1 month