[jboss-cvs] JBossAS SVN: r109958 - in branches/JBoss-AS-6.0.x-ipv6: build/src and 10 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Dec 15 18:52:00 EST 2010
Author: rachmatowicz at jboss.com
Date: 2010-12-15 18:51:59 -0500 (Wed, 15 Dec 2010)
New Revision: 109958
Modified:
branches/JBoss-AS-6.0.x-ipv6/build/build.xml
branches/JBoss-AS-6.0.x-ipv6/build/src/licenses.xml
branches/JBoss-AS-6.0.x-ipv6/cluster/src/resources/infinispan/infinispan-configs.xml
branches/JBoss-AS-6.0.x-ipv6/component-matrix/pom.xml
branches/JBoss-AS-6.0.x-ipv6/depchain/pom.xml
branches/JBoss-AS-6.0.x-ipv6/embedded/src/test/java/org/jboss/jbossas/embedded/testsuite/ServerIntegrationTest.java
branches/JBoss-AS-6.0.x-ipv6/profileservice/src/resources/profileservice-jboss-beans.xml
branches/JBoss-AS-6.0.x-ipv6/resteasy-int/test/async-http-servlet-3.0-test/pom.xml
branches/JBoss-AS-6.0.x-ipv6/server/src/etc/deployers/metadata-deployer-jboss-beans.xml
branches/JBoss-AS-6.0.x-ipv6/testsuite/imports/config/tests-clustering.xml
branches/JBoss-AS-6.0.x-ipv6/testsuite/imports/server-config.xml
branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/cluster/testutil/SessionTestUtil.java
Log:
Merge trunk interval (109878-109952) into ipv6 revision 109953
Modified: branches/JBoss-AS-6.0.x-ipv6/build/build.xml
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/build/build.xml 2010-12-15 23:37:10 UTC (rev 109957)
+++ branches/JBoss-AS-6.0.x-ipv6/build/build.xml 2010-12-15 23:51:59 UTC (rev 109958)
@@ -2055,6 +2055,7 @@
<fileset refid="org.jboss.ejb3.embedded:jboss-ejb3-embedded-impl-base:jar"/>
<fileset refid="org.jboss.ejb3.embedded:jboss-ejb3-embedded-impl-shrinkwrap:jar"/>
<fileset refid="org.jboss.ejb3.embedded:jboss-ejb3-embedded-spi:jar"/>
+ <fileset refid="org.jboss.ejb3.embedded:jboss-ejb3-embedded-sub:jar"/>
<fileset refid="org.jboss.ejb3.heks:jboss-ejb3-heks:jar"/>
<fileset refid="org.jboss.ejb3:jboss-ejb3-core:jar"/>
<fileset refid="org.jboss.ejb3:jboss-ejb3-deployers:jar"/>
@@ -2417,6 +2418,7 @@
<fileset refid="org.jboss.ejb3:jboss-ejb3-proxy-clustered:jar:client"/>
<fileset refid="org.jboss.ejb3:jboss-ejb3-security:jar:client"/>
<fileset refid="org.jboss.ejb3.context:jboss-ejb3-context-spi:jar"/>
+ <fileset refid="org.jboss.ejb3.embedded:jboss-ejb3-embedded-standalone:jar"/>
<fileset refid="org.jboss.ejb3.singleton:jboss-ejb3-singleton-proxy-impl:jar"/>
<fileset refid="org.jboss.ejb3.async:jboss-ejb3-async-spi:jar"/>
<fileset refid="org.jboss.ejb3.async:jboss-ejb3-async-impl:jar"/>
Modified: branches/JBoss-AS-6.0.x-ipv6/build/src/licenses.xml
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/build/src/licenses.xml 2010-12-15 23:37:10 UTC (rev 109957)
+++ branches/JBoss-AS-6.0.x-ipv6/build/src/licenses.xml 2010-12-15 23:51:59 UTC (rev 109958)
@@ -167,7 +167,7 @@
<groupId>i18nlog</groupId>
<artifactId>i18nlog</artifactId>
<licenses>
- <!-- License from jar in JBoss repository -->
+ <!-- License from jar in JBoss Maven repository -->
<license>
<name>GNU Lesser General Public License</name>
<url>http://www.gnu.org/licenses/lgpl.txt</url>
@@ -178,7 +178,7 @@
<groupId>org.rhq</groupId>
<artifactId>rhq-core-domain</artifactId>
<licenses>
- <!-- License from jar in JBoss repository -->
+ <!-- License from jar in JBoss Maven repository -->
<license>
<name>GNU Lesser General Public License</name>
<url>http://www.gnu.org/licenses/lgpl.txt</url>
@@ -189,7 +189,7 @@
<groupId>org.rhq</groupId>
<artifactId>rhq-core-util</artifactId>
<licenses>
- <!-- License from jar in JBoss repository -->
+ <!-- License from jar in JBoss Maven repository -->
<license>
<name>GNU Lesser General Public License</name>
<url>http://www.gnu.org/licenses/lgpl.txt</url>
@@ -200,7 +200,7 @@
<groupId>org.rhq</groupId>
<artifactId>rhq-core-plugin</artifactId>
<licenses>
- <!-- License from jar in JBoss repository -->
+ <!-- License from jar in JBoss Maven repository -->
<license>
<name>GNU Lesser General Public License</name>
<url>http://www.gnu.org/licenses/lgpl.txt</url>
@@ -211,7 +211,7 @@
<groupId>org.rhq</groupId>
<artifactId>rhq-core-native-system</artifactId>
<licenses>
- <!-- License from jar in JBoss repository -->
+ <!-- License from jar in JBoss Maven repository -->
<license>
<name>GNU Lesser General Public License</name>
<url>http://www.gnu.org/licenses/lgpl.txt</url>
@@ -407,5 +407,362 @@
</license>
</licenses>
</dependency>
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <licenses>
+ <!-- Fix broken URL from POM -->
+ <license>
+ <name>CDDL</name>
+ <url>http://repository.jboss.org/licenses/cddl.txt</url>
+ <distribution>repo</distribution>
+ <comments>A business-friendly OSS license</comments>
+ </license>
+ <!-- Fix broken URL from POM -->
+ <license>
+ <name>GPLv2+CE</name>
+ <url>http://glassfish.dev.java.net/public/CDDL+GPL.html</url>
+ <distribution>repo</distribution>
+ <comments>GPL version 2 plus the Classpath Exception</comments>
+ </license>
+ </licenses>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate.javax.persistence</groupId>
+ <artifactId>hibernate-jpa-2.0-api</artifactId>
+ <!-- Invalid license in POM -->
+ <licenses>
+ <license>
+ <name>GNU Lesser General Public License</name>
+ <url>http://www.gnu.org/licenses/lgpl.txt</url>
+ </license>
+ </licenses>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ejb3.ejbref.resolver</groupId>
+ <artifactId>ejbref-resolver-ejb30-impl</artifactId>
+ <!-- No license info in POM -->
+ <licenses>
+ <license>
+ <name>GNU Lesser General Public License</name>
+ <url>http://www.gnu.org/licenses/lgpl.txt</url>
+ </license>
+ </licenses>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ejb3.ejbref.resolver</groupId>
+ <artifactId>ejbref-resolver-ejb31-impl</artifactId>
+ <!-- No license info in POM -->
+ <licenses>
+ <license>
+ <name>GNU Lesser General Public License</name>
+ <url>http://www.gnu.org/licenses/lgpl.txt</url>
+ </license>
+ </licenses>
+ </dependency>
+ <dependency>
+ <groupId>jdom</groupId>
+ <artifactId>jdom</artifactId>
+ <!-- License info taken from jar file in JBoss Maven repo -->
+ <licenses>
+ <license>
+ <name>JDOM Licnese</name>
+ <url>http://repository.jboss.org/licenses/jdom-1.0.txt</url>
+ </license>
+ </licenses>
+ </dependency>
+ <dependency>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-core-plugin-api</artifactId>
+ <!-- No license info in POM -->
+ <licenses>
+ <license>
+ <name>GNU Lesser General Public License</name>
+ <url>http://www.gnu.org/licenses/lgpl.txt</url>
+ </license>
+ </licenses>
+ </dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-jboss-as-integration</artifactId>
+ <!-- No license info in POM, license info taken from source jar in JBoss Maven repo -->
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ </dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-resources</artifactId>
+ <!-- No license info in POM, license info taken from source jar in JBoss Maven repo -->
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ </dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-bootstrap</artifactId>
+ <!-- No license info in POM, license info taken from source jar in JBoss Maven repo -->
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ </dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-core-client</artifactId>
+ <!-- No license info in POM, license info taken from source jar in JBoss Maven repo -->
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ </dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-core</artifactId>
+ <!-- No license info in POM, license info taken from source jar in JBoss Maven repo -->
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ </dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-jms-client</artifactId>
+ <!-- No license info in POM, license info taken from source jar in JBoss Maven repo -->
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ </dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-logging</artifactId>
+ <!-- No license info in POM, license info taken from source jar in JBoss Maven repo -->
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ </dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-ra</artifactId>
+ <!-- No license info in POM, license info taken from source jar in JBoss Maven repo -->
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-webmvc</artifactId>
+ <!-- No license info in POM, license info taken from source jar in central Maven repo -->
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ <!-- No license info in POM, license info taken from source jar in central Maven repo -->
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <!-- No license info in POM, license info taken from source jar in central Maven repo -->
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <!-- No license info in POM, license info taken from source jar in central Maven repo -->
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-expression</artifactId>
+ <!-- No license info in POM, license info taken from source jar in central Maven repo -->
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-asm</artifactId>
+ <!-- No license info in POM, license info taken from source jar in central Maven repo -->
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <!-- No license info in POM, license info taken from source jar in central Maven repo -->
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <!-- No license info in POM, license info taken from source jar in central Maven repo -->
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ </dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ <licenses>
+ <!-- Fix broken URL from POM -->
+ <license>
+ <name>GPLv2+CE</name>
+ <url>http://glassfish.dev.java.net/public/CDDL+GPL.html</url>
+ <distribution>repo</distribution>
+ <comments>GPL version 2 plus the Classpath Exception</comments>
+ </license>
+ </licenses>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jaxws-rt</artifactId>
+ <licenses>
+ <!-- Fix broken URL from POM -->
+ <license>
+ <name>GPLv2+CE</name>
+ <url>http://glassfish.dev.java.net/public/CDDL+GPL.html</url>
+ <distribution>repo</distribution>
+ <comments>GPL version 2 plus the Classpath Exception</comments>
+ </license>
+ </licenses>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jaxws-tools</artifactId>
+ <licenses>
+ <!-- Fix broken URL from POM -->
+ <license>
+ <name>GPLv2+CE</name>
+ <url>http://glassfish.dev.java.net/public/CDDL+GPL.html</url>
+ <distribution>repo</distribution>
+ <comments>GPL version 2 plus the Classpath Exception</comments>
+ </license>
+ </licenses>
+ </dependency>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ <licenses>
+ <!-- Fix broken URL from POM -->
+ <license>
+ <name>GPLv2+CE</name>
+ <url>http://glassfish.dev.java.net/public/CDDL+GPL.html</url>
+ <distribution>repo</distribution>
+ <comments>GPL version 2 plus the Classpath Exception</comments>
+ </license>
+ </licenses>
+ </dependency>
+ <dependency>
+ <groupId>javax.jws</groupId>
+ <artifactId>jsr181-api</artifactId>
+ <licenses>
+ <!-- Fix broken URL from POM -->
+ <license>
+ <name>GPLv2+CE</name>
+ <url>http://glassfish.dev.java.net/public/CDDL+GPL.html</url>
+ <distribution>repo</distribution>
+ <comments>GPL version 2 plus the Classpath Exception</comments>
+ </license>
+ </licenses>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>policy</artifactId>
+ <licenses>
+ <!-- Fix broken URL from POM -->
+ <license>
+ <name>GPLv2+CE</name>
+ <url>http://glassfish.dev.java.net/public/CDDL+GPL.html</url>
+ <distribution>repo</distribution>
+ <comments>GPL version 2 plus the Classpath Exception</comments>
+ </license>
+ </licenses>
+ </dependency>
+ <dependency>
+ <groupId>system</groupId>
+ <artifactId>jdk-tools</artifactId>
+ <licenses>
+ <license>
+ <name>GPLv2+CE</name>
+ <url>http://glassfish.dev.java.net/public/CDDL+GPL.html</url>
+ <distribution>repo</distribution>
+ <comments>GPL version 2 plus the Classpath Exception</comments>
+ </license>
+ </licenses>
+ </dependency>
</dependencies>
</licenseSummary>
\ No newline at end of file
Modified: branches/JBoss-AS-6.0.x-ipv6/cluster/src/resources/infinispan/infinispan-configs.xml
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/cluster/src/resources/infinispan/infinispan-configs.xml 2010-12-15 23:37:10 UTC (rev 109957)
+++ branches/JBoss-AS-6.0.x-ipv6/cluster/src/resources/infinispan/infinispan-configs.xml 2010-12-15 23:51:59 UTC (rev 109958)
@@ -23,9 +23,17 @@
<lazyDeserialization enabled="false"/>
<invocationBatching enabled="true"/>
<clustering mode="replication">
- <stateRetrieval timeout="60000" fetchInMemoryState="true"/>
+ <!-- ISPN-835 workaround, use cluster cache loader in place of state transfer -->
+ <!--stateRetrieval timeout="60000" fetchInMemoryState="true"/-->
<sync replTimeout="17500"/>
</clustering>
+ <loaders>
+ <loader class="org.infinispan.loaders.cluster.ClusterCacheLoader">
+ <properties>
+ <property name="timeout" value="60000"/>
+ </properties>
+ </loader>
+ </loaders>
</default>
</infinispan>
</infinispan-config>
@@ -49,7 +57,8 @@
<lazyDeserialization enabled="true"/>
<invocationBatching enabled="true"/>
<clustering mode="replication">
- <stateRetrieval timeout="60000" fetchInMemoryState="true"/>
+ <!-- ISPN-835 workaround, use cluster cache loader in place of state transfer -->
+ <!--stateRetrieval timeout="60000" fetchInMemoryState="true"/-->
<async useReplQueue="false"/>
</clustering>
<loaders passivation="true">
@@ -58,18 +67,24 @@
<property name="location" value="${jboss.server.data.dir}${/}web"/>
</properties>
</loader>
+ <loader class="org.infinispan.loaders.cluster.ClusterCacheLoader">
+ <properties>
+ <property name="timeout" value="60000"/>
+ </properties>
+ </loader>
</loaders>
</default>
<namedCache name="sync">
<clustering mode="replication">
- <stateRetrieval timeout="60000" fetchInMemoryState="true"/>
+ <!-- ISPN-835 workaround, use cluster cache loader in place of state transfer -->
+ <!--stateRetrieval timeout="60000" fetchInMemoryState="true"/-->
<sync/>
</clustering>
</namedCache>
<namedCache name="dist">
<clustering mode="distribution">
- <stateRetrieval timeout="60000" fetchInMemoryState="false"/>
- <sync/>
+ <!-- ISPN-835 workaround, use cluster cache loader in place of state transfer -->
+ <!--stateRetrieval timeout="60000" fetchInMemoryState="false"/-->
<hash numOwners="2"/>
</clustering>
<loaders passivation="true">
@@ -78,6 +93,11 @@
<property name="location" value="${jboss.server.data.dir}${/}web"/>
</properties>
</loader>
+ <loader class="org.infinispan.loaders.cluster.ClusterCacheLoader">
+ <properties>
+ <property name="timeout" value="60000"/>
+ </properties>
+ </loader>
</loaders>
</namedCache>
</infinispan>
@@ -103,7 +123,8 @@
<lazyDeserialization enabled="true"/>
<invocationBatching enabled="true"/>
<clustering mode="replication">
- <stateRetrieval timeout="60000" fetchInMemoryState="true"/>
+ <!-- ISPN-835 workaround, use cluster cache loader in place of state transfer -->
+ <!--stateRetrieval timeout="60000" fetchInMemoryState="true"/-->
<async useReplQueue="false"/>
</clustering>
<loaders passivation="true" shared="false">
@@ -112,19 +133,24 @@
<property name="location" value="${jboss.server.data.dir}${/}sfsb"/>
</properties>
</loader>
+ <loader class="org.infinispan.loaders.cluster.ClusterCacheLoader">
+ <properties>
+ <property name="timeout" value="60000"/>
+ </properties>
+ </loader>
</loaders>
<eviction wakeUpInterval="5000" strategy="LRU"/>
</default>
<namedCache name="sync">
<clustering mode="replication">
- <stateRetrieval timeout="60000" fetchInMemoryState="true"/>
+ <!-- ISPN-835 workaround, use cluster cache loader in place of state transfer -->
+ <!--stateRetrieval timeout="60000" fetchInMemoryState="true"/-->
<sync/>
</clustering>
</namedCache>
<namedCache name="dist">
<clustering mode="distribution">
- <stateRetrieval timeout="60000" fetchInMemoryState="false"/>
- <sync/>
+ <!--stateRetrieval timeout="60000" fetchInMemoryState="false"/-->
<hash numOwners="2"/>
<l1 enabled="true"/>
</clustering>
@@ -134,6 +160,11 @@
<property name="location" value="${jboss.server.data.dir}${/}web"/>
</properties>
</loader>
+ <loader class="org.infinispan.loaders.cluster.ClusterCacheLoader">
+ <properties>
+ <property name="timeout" value="60000"/>
+ </properties>
+ </loader>
</loaders>
</namedCache>
</infinispan>
@@ -221,7 +252,7 @@
<!-- A query cache that replicates queries. Replication is asynchronous. -->
<namedCache name="replicated-query">
<clustering mode="replication">
- <stateRetrieval fetchInMemoryState="false"/>
+ <!--stateRetrieval fetchInMemoryState="false"/-->
<async/>
</clustering>
<locking isolationLevel="READ_COMMITTED" concurrencyLevel="1000"
@@ -231,13 +262,20 @@
<eviction wakeUpInterval="5000" maxEntries="10000" strategy="LRU"/>
<expiration maxIdle="100000"/>
<lazyDeserialization enabled="true"/>
+ <loaders>
+ <loader class="org.infinispan.loaders.cluster.ClusterCacheLoader">
+ <properties>
+ <property name="timeout" value="10000"/>
+ </properties>
+ </loader>
+ </loaders>
</namedCache>
<!-- Optimized for timestamp caching. -->
<!-- A clustered timestamp cache is required if query caching is used, even if the query cache itself is configured with CacheMode=LOCAL. -->
<namedCache name="timestamps">
<clustering mode="replication">
- <stateRetrieval fetchInMemoryState="true" timeout="20000"/>
+ <!--stateRetrieval fetchInMemoryState="true" timeout="20000"/-->
<async/>
</clustering>
<locking isolationLevel="READ_COMMITTED" concurrencyLevel="1000"
@@ -245,6 +283,13 @@
<!-- Don't ever evict modification timestamps -->
<eviction wakeUpInterval="0" strategy="NONE"/>
<lazyDeserialization enabled="true"/>
+ <loaders>
+ <loader class="org.infinispan.loaders.cluster.ClusterCacheLoader">
+ <properties>
+ <property name="timeout" value="20000"/>
+ </properties>
+ </loader>
+ </loaders>
</namedCache>
</infinispan>
</infinispan-config>
Modified: branches/JBoss-AS-6.0.x-ipv6/component-matrix/pom.xml
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/component-matrix/pom.xml 2010-12-15 23:37:10 UTC (rev 109957)
+++ branches/JBoss-AS-6.0.x-ipv6/component-matrix/pom.xml 2010-12-15 23:51:59 UTC (rev 109958)
@@ -52,7 +52,7 @@
<version.jaxws-httpserver-httpspi>1.0.0.GA</version.jaxws-httpserver-httpspi>
<version.jboss.injection>1.0.0-alpha-6</version.jboss.injection>
<version.jboss.jaxr>2.0.2</version.jboss.jaxr>
- <version.jboss.jbossts>4.13.1.Final</version.jboss.jbossts>
+ <version.jboss.jbossts>4.14.0.Final</version.jboss.jbossts>
<version.jboss.jbossws-native>3.4.0.CR3</version.jboss.jbossws-native>
<version.jboss.jbossws-cxf>3.4.1.CR1</version.jboss.jbossws-cxf>
<version.jboss.jbossws-common>1.4.1.CR4</version.jboss.jbossws-common>
@@ -70,7 +70,7 @@
<version.org.hibernate.javax.persistence>1.0.0.Final</version.org.hibernate.javax.persistence>
<version.org.hibernate.legacy>4.0.2.GA</version.org.hibernate.legacy>
<version.org.hibernate.validator>4.1.0.Final</version.org.hibernate.validator>
- <version.org.infinispan>4.2.0.CR3</version.org.infinispan>
+ <version.org.infinispan>4.2.0.CR4</version.org.infinispan>
<version.org.jboss.aop>2.2.1.Alpha3</version.org.jboss.aop>
<version.org.jboss.aspects.currentinvocation>1.0.1</version.org.jboss.aspects.currentinvocation>
<version.org.jboss.aspects.remoting>1.0.1.GA</version.org.jboss.aspects.remoting>
@@ -82,21 +82,21 @@
<version.org.jboss.cluster.client>1.1.2.Final</version.org.jboss.cluster.client>
<version.org.jboss.cluster.server.api>2.0.0.CR1</version.org.jboss.cluster.server.api>
<version.org.jboss.cluster.server.core>1.0.0.CR2</version.org.jboss.cluster.server.core>
- <version.org.jboss.cluster.server.ispn>1.0.0.CR7</version.org.jboss.cluster.server.ispn>
+ <version.org.jboss.cluster.server.ispn>1.0.0.CR8</version.org.jboss.cluster.server.ispn>
<version.org.jboss.cluster.cache.spi>3.0.0.CR1</version.org.jboss.cluster.cache.spi>
<version.org.jboss.cluster.cache.ispn>1.0.0.CR8</version.org.jboss.cluster.cache.ispn>
<version.org.jboss.common.core>2.2.17.GA</version.org.jboss.common.core>
<version.org.jboss.deployers>2.2.0.Alpha8</version.org.jboss.deployers>
- <version.org.jboss.ejb3.depchain>1.0.0-alpha-35</version.org.jboss.ejb3.depchain>
+ <version.org.jboss.ejb3.depchain>1.0.0-alpha-36</version.org.jboss.ejb3.depchain>
<!-- This to move into the EJB3 BOM -->
- <version.org.jboss.ejb3.embedded>1.0.0-alpha-1</version.org.jboss.ejb3.embedded>
+ <version.org.jboss.ejb3.embedded>1.0.0-alpha-2</version.org.jboss.ejb3.embedded>
<version.org.jboss.ejb.api>1.0-alpha-1</version.org.jboss.ejb.api>
<version.org.jboss.embedded>1.0.0-alpha-3</version.org.jboss.embedded>
<version.org.jboss.injection>0.1.0-alpha-2</version.org.jboss.injection>
- <version.org.jboss.interceptor>2.0.0.Alpha3</version.org.jboss.interceptor>
+ <version.org.jboss.interceptor>2.0.0.CR1</version.org.jboss.interceptor>
<version.org.jboss.integration>6.0.0.CR1</version.org.jboss.integration>
<version.org.jboss.javaee.specs.bom>1.0.0.CR1</version.org.jboss.javaee.specs.bom>
- <version.org.jboss.jbossxb>2.0.2.GA</version.org.jboss.jbossxb>
+ <version.org.jboss.jbossxb>2.0.3.GA</version.org.jboss.jbossxb>
<version.org.jboss.jopr>1.4.0.GA</version.org.jboss.jopr>
<version.org.jboss.jpa.deployers>1.0.2-alpha-3</version.org.jboss.jpa.deployers>
<version.org.jboss.jpa.vfs3>1.0.2-alpha-2</version.org.jboss.jpa.vfs3>
@@ -117,14 +117,14 @@
<version.org.jboss.metadata.ear>2.0.0.Alpha4</version.org.jboss.metadata.ear>
<version.org.jboss.metadata.ejb>2.0.0-alpha-26</version.org.jboss.metadata.ejb>
<version.org.jboss.metadata.rar>2.0.0.Alpha</version.org.jboss.metadata.rar>
- <version.org.jboss.metadata.war>2.0.0.Alpha15</version.org.jboss.metadata.war>
+ <version.org.jboss.metadata.war>2.0.0.CR1</version.org.jboss.metadata.war>
<version.org.jboss.mod_cluster>1.1.0.Final</version.org.jboss.mod_cluster>
<version.org.jboss.mx>6.0.0.Beta5</version.org.jboss.mx>
<version.org.jboss.naming>5.0.5.Final</version.org.jboss.naming>
<version.org.jboss.profileservice>0.2.1</version.org.jboss.profileservice>
<version.org.jboss.reflect>2.2.0.Alpha9</version.org.jboss.reflect>
<version.org.jboss.reloaded.naming>0.3.0</version.org.jboss.reloaded.naming>
- <version.org.jboss.resteasy>2.1-beta-1</version.org.jboss.resteasy>
+ <version.org.jboss.resteasy>2.1.0.GA</version.org.jboss.resteasy>
<version.org.jboss.remoting>2.5.3</version.org.jboss.remoting>
<version.org.jboss.remoting3>3.1.0.Beta2</version.org.jboss.remoting3>
<version.org.jboss.remoting3.metadata>1.0.0.Beta2</version.org.jboss.remoting3.metadata>
@@ -139,7 +139,7 @@
<version.org.jboss.threads>2.0.0.CR7</version.org.jboss.threads>
<version.org.jboss.threads-metadata>2.0.0.CR4</version.org.jboss.threads-metadata>
<version.org.jboss.vfs>3.0.0.CR5</version.org.jboss.vfs>
- <version.org.jboss.weld>1.1.0.Beta2</version.org.jboss.weld>
+ <version.org.jboss.weld>1.1.0.CR1</version.org.jboss.weld>
<version.org.jboss.xnio>2.1.0.CR2</version.org.jboss.xnio>
<version.org.jboss.xnio.metadata>2.1.0.CR5</version.org.jboss.xnio.metadata>
<version.org.jgroups>2.11.0.GA</version.org.jgroups>
@@ -2962,6 +2962,16 @@
<artifactId>jboss-ejb3-embedded-spi</artifactId>
<version>${version.org.jboss.ejb3.embedded}</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss.ejb3.embedded</groupId>
+ <artifactId>jboss-ejb3-embedded-standalone</artifactId>
+ <version>${version.org.jboss.ejb3.embedded}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ejb3.embedded</groupId>
+ <artifactId>jboss-ejb3-embedded-sub</artifactId>
+ <version>${version.org.jboss.ejb3.embedded}</version>
+ </dependency>
<dependency>
<groupId>org.jboss.embedded</groupId>
Modified: branches/JBoss-AS-6.0.x-ipv6/depchain/pom.xml
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/depchain/pom.xml 2010-12-15 23:37:10 UTC (rev 109957)
+++ branches/JBoss-AS-6.0.x-ipv6/depchain/pom.xml 2010-12-15 23:51:59 UTC (rev 109958)
@@ -700,6 +700,34 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.jboss.ejb3.embedded</groupId>
+ <artifactId>jboss-ejb3-embedded-standalone</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ejb3.embedded</groupId>
+ <artifactId>jboss-ejb3-embedded-sub</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-endpoint-deployer</artifactId>
<exclusions>
Modified: branches/JBoss-AS-6.0.x-ipv6/embedded/src/test/java/org/jboss/jbossas/embedded/testsuite/ServerIntegrationTest.java
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/embedded/src/test/java/org/jboss/jbossas/embedded/testsuite/ServerIntegrationTest.java 2010-12-15 23:37:10 UTC (rev 109957)
+++ branches/JBoss-AS-6.0.x-ipv6/embedded/src/test/java/org/jboss/jbossas/embedded/testsuite/ServerIntegrationTest.java 2010-12-15 23:51:59 UTC (rev 109958)
@@ -420,6 +420,7 @@
* @throws Exception
*/
@Test
+ @Ignore // we're running embedded, calling a servlet, which starts embedded, which starts standalone, which starts embedded... This requires CL magic
public void testServletUsingEmbeddedEJB() throws Exception
{
// Log
Modified: branches/JBoss-AS-6.0.x-ipv6/profileservice/src/resources/profileservice-jboss-beans.xml
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/profileservice/src/resources/profileservice-jboss-beans.xml 2010-12-15 23:37:10 UTC (rev 109957)
+++ branches/JBoss-AS-6.0.x-ipv6/profileservice/src/resources/profileservice-jboss-beans.xml 2010-12-15 23:51:59 UTC (rev 109958)
@@ -291,7 +291,7 @@
<bean class="org.jboss.profileservice.management.ProxyDeploymentInfo">
<property name="compType">MBean</property>
<property name="compSubtype">WebApplicationManager</property>
- <property name="pattern">jboss.web:host=localhost,type=Manager,*</property>
+ <property name="pattern">jboss.web:host=*,type=Manager,*</property>
<property name="nameBuilder">
<inject bean="WarManagerMBeanDeploymentNameBuilder"/>
</property>
Modified: branches/JBoss-AS-6.0.x-ipv6/resteasy-int/test/async-http-servlet-3.0-test/pom.xml
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/resteasy-int/test/async-http-servlet-3.0-test/pom.xml 2010-12-15 23:37:10 UTC (rev 109957)
+++ branches/JBoss-AS-6.0.x-ipv6/resteasy-int/test/async-http-servlet-3.0-test/pom.xml 2010-12-15 23:51:59 UTC (rev 109958)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxrs-all</artifactId>
- <version>2.0.0.GA</version>
+ <version>2.1.0.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>async-http-servlet-3.0-test</artifactId>
Modified: branches/JBoss-AS-6.0.x-ipv6/server/src/etc/deployers/metadata-deployer-jboss-beans.xml
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/server/src/etc/deployers/metadata-deployer-jboss-beans.xml 2010-12-15 23:37:10 UTC (rev 109957)
+++ branches/JBoss-AS-6.0.x-ipv6/server/src/etc/deployers/metadata-deployer-jboss-beans.xml 2010-12-15 23:51:59 UTC (rev 109958)
@@ -18,6 +18,31 @@
<bean name="SchemaResolverConfig"
class="org.jboss.xb.binding.sunday.unmarshalling.SchemaResolverConfig">
+ <property name="schemaInitializerInstances">
+ <map keyClass="java.lang.String" valueClass="java.lang.String">
+ <entry>
+ <key>http://java.sun.com/xml/ns/javaee</key>
+ <value>
+ <!-- Every specified property in this schema initializer
+ will override the value of the corresponding SchemaBinding property
+ which was initialized from binding annotations.
+ Properties that are commented will not affect the corresponding SchemaBinding properties. -->
+ <bean class="org.jboss.xb.util.SchemaBindingPropertyInitializer">
+ <!-- must all content have a valid binding
+ <property name="strictSchema">true</property> -->
+ <!-- Should ${x} references be replaced with x system property
+ <property name="replacePropertyRefs">true</property> -->
+ <!-- if all the characters in the mixed content are whitespaces
+ should they be considered indentation and ignored?
+ <property name="ignoreWhitespacesInMixedContent">true</property> -->
+ <!-- whether to trim string values
+ <property name="normalizeSpace">true</property> -->
+ </bean>
+ </value>
+ </entry>
+ </map>
+ </property>
+
<!-- schemaLocation to JBossXBuilder binding classes -->
<property name="bindingClassesByLocations">
<map keyClass="java.lang.String" valueClass="java.lang.String">
Modified: branches/JBoss-AS-6.0.x-ipv6/testsuite/imports/config/tests-clustering.xml
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/testsuite/imports/config/tests-clustering.xml 2010-12-15 23:37:10 UTC (rev 109957)
+++ branches/JBoss-AS-6.0.x-ipv6/testsuite/imports/config/tests-clustering.xml 2010-12-15 23:51:59 UTC (rev 109958)
@@ -209,7 +209,7 @@
<sleep seconds="4"/>
- <echo message="Going to call target tests-clustering-unit again with new configuration (DIST_SYNC)"/>
+ <echo message="Going to call target tests-clustering-unit again with new configuration (DIST_ASYNC)"/>
<antcall target="tests-clustering-dist-configure" inheritRefs="true"/>
@@ -613,7 +613,7 @@
<server:stop name="cluster-${jboss-junit-configuration}-1"/>
</target>
- <!-- Runs the EJB3 tests (DIST_SYNC) -->
+ <!-- Runs the EJB3 tests (DIST_ASYNC) -->
<target name="tests-clustering-ejb3-dist" depends="init">
<property name="jboss-junit-configuration" value="udp"/>
@@ -705,7 +705,7 @@
<server:stop name="cluster-${jboss-junit-configuration}-1"/>
</target>
- <!-- Runs only the basic http tests (DIST_SYNC) -->
+ <!-- Runs only the basic http tests (DIST_ASYNC) -->
<target name="tests-clustering-http-dist" depends="init">
<property name="jboss-junit-configuration" value="udp"/>
@@ -735,4 +735,34 @@
<server:stop name="cluster-${jboss-junit-configuration}-DIST-1"/>
</target>
+ <!-- Runs only the basic http tests (REPL_SYNC) -->
+ <target name="tests-clustering-http-sync" depends="init">
+
+ <property name="jboss-junit-configuration" value="udp"/>
+
+ <antcall target="tests-clustering-sync-configure" inheritRefs="true"/>
+
+ <server:start name="cluster-${jboss-junit-configuration}-SYNC-0"/>
+ <server:start name="cluster-${jboss-junit-configuration}-SYNC-1"/>
+
+ <antcall target="tests-clustering-unit" inheritRefs="true">
+ <param name="cluster.includes.refid" value="cluster.defaultcfg.http.jk.includes"/>
+ <param name="jboss-junit-configuration" value="SYNC-${jboss-junit-configuration}"/>
+ <param name="jbosstest.cluster.web.cache.config" value="standard-session-cache/sync"/>
+ <param name="jbosstest.cluster.node0.config" value="cluster-${jboss-junit-configuration}-SYNC-0"/>
+ <param name="jbosstest.cluster.node1.config" value="cluster-${jboss-junit-configuration}-SYNC-1"/>
+ </antcall>
+
+ <antcall target="tests-clustering-unit" inheritRefs="true">
+ <param name="cluster.includes.refid" value="cluster.defaultcfg.http.includes"/>
+ <param name="jboss-junit-configuration" value="SYNC-${jboss-junit-configuration}"/>
+ <param name="jbosstest.cluster.web.cache.config" value="standard-session-cache/sync"/>
+ <param name="jbosstest.cluster.node0.config" value="cluster-${jboss-junit-configuration}-SYNC-0"/>
+ <param name="jbosstest.cluster.node1.config" value="cluster-${jboss-junit-configuration}-SYNC-1"/>
+ </antcall>
+
+ <server:stop name="cluster-${jboss-junit-configuration}-SYNC-0"/>
+ <server:stop name="cluster-${jboss-junit-configuration}-SYNC-1"/>
+ </target>
+
</project>
Modified: branches/JBoss-AS-6.0.x-ipv6/testsuite/imports/server-config.xml
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/testsuite/imports/server-config.xml 2010-12-15 23:37:10 UTC (rev 109957)
+++ branches/JBoss-AS-6.0.x-ipv6/testsuite/imports/server-config.xml 2010-12-15 23:51:59 UTC (rev 109958)
@@ -452,7 +452,7 @@
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
- <sysproperty key="jboss.multiplexer.stack" value="udp-sync" />
+ <sysproperty key="jboss.multiplexer.stack" value="udp" />
<sysproperty key="jgroups.bind_addr" value="${node0.jgroups.bind_addr}" />
<sysproperty key="node0.bind.address" value="${node0}" />
<sysproperty key="node0.bind.address.url" value="${node0.url}" />
@@ -468,7 +468,7 @@
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
- <sysproperty key="jboss.multiplexer.stack" value="udp-sync" />
+ <sysproperty key="jboss.multiplexer.stack" value="udp" />
<sysproperty key="jgroups.bind_addr" value="${node1.jgroups.bind_addr}" />
<sysproperty key="node0.bind.address" value="${node0}" />
<sysproperty key="node0.bind.address.url" value="${node0.url}" />
@@ -573,7 +573,7 @@
<sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
<sysproperty key="resolve.dns" value="false" />
- <sysproperty key="jboss.multiplexer.stack" value="tcp-sync" />
+ <sysproperty key="jboss.multiplexer.stack" value="tcp" />
<sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7650],${node1}[7650]"/>
<sysproperty key="jgroups.bind_addr" value="${node0.jgroups.bind_addr}" />
</server>
@@ -587,7 +587,7 @@
<sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
<sysproperty key="resolve.dns" value="false" />
- <sysproperty key="jboss.multiplexer.stack" value="tcp-sync" />
+ <sysproperty key="jboss.multiplexer.stack" value="tcp" />
<sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7650],${node1}[7650]"/>
<sysproperty key="jgroups.bind_addr" value="${node1.jgroups.bind_addr}" />
</server>
Modified: branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/cluster/testutil/SessionTestUtil.java
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/cluster/testutil/SessionTestUtil.java 2010-12-15 23:37:10 UTC (rev 109957)
+++ branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/cluster/testutil/SessionTestUtil.java 2010-12-15 23:51:59 UTC (rev 109958)
@@ -57,9 +57,7 @@
import org.infinispan.manager.DefaultCacheManager;
import org.infinispan.manager.EmbeddedCacheManager;
import org.infinispan.remoting.transport.Address;
-import org.infinispan.transaction.tm.BatchModeTransactionManager;
import org.infinispan.util.concurrent.IsolationLevel;
-import org.jboss.ha.ispn.DefaultCacheContainer;
import org.jboss.logging.Logger;
import org.jboss.metadata.javaee.spec.EmptyMetaData;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
@@ -302,6 +300,24 @@
{
return sessionContainer.getCacheNames();
}
+
+ @Override
+ public Address getCoordinator()
+ {
+ return sessionContainer.getCoordinator();
+ }
+
+ @Override
+ public boolean isRunning(String cacheName)
+ {
+ return cacheName.equals("jboss.web") ? jvmRouteContainer.isDefaultRunning() : sessionContainer.isRunning(cacheName);
+ }
+
+ @Override
+ public boolean isDefaultRunning()
+ {
+ return sessionContainer.isDefaultRunning();
+ }
};
}
More information about the jboss-cvs-commits
mailing list