[jboss-cvs] JBossAS SVN: r109976 - in trunk: cluster/src/etc and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Dec 16 20:46:49 EST 2010
Author: pferraro
Date: 2010-12-16 20:46:48 -0500 (Thu, 16 Dec 2010)
New Revision: 109976
Added:
trunk/cluster/src/etc/ejb3-cache-factory-registry-jboss-beans.xml
trunk/ejb3/src/resources/META-INF/ejb3-cache-factory-registry-jboss-beans.xml
Modified:
trunk/build/build.xml
trunk/ejb3/pom.xml
trunk/ejb3/src/resources/META-INF/ejb3-as-deployers-jboss-beans.xml
Log:
JBAS-8742 Move jboss-ejb3-statefulcache-ispn from common/lib to server/all/lib. Drop references to InfinispanStatefulCacheFactory in default profile.
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2010-12-16 20:21:59 UTC (rev 109975)
+++ trunk/build/build.xml 2010-12-17 01:46:48 UTC (rev 109976)
@@ -250,6 +250,12 @@
<copy tofile="${install.default}/deployers/clustering-deployer-jboss-beans.xml"
file="${project.root}/cluster/target/etc/clustering-deployer-jboss-beans-non-clustered.xml"/>
+ <copy todir="${install.all}/deployers/ejb3.deployer/META-INF" overwrite="true">
+ <fileset dir="${project.root}/cluster/target/etc">
+ <include name="ejb3-cache-factory-registry-jboss-beans.xml"/>
+ </fileset>
+ </copy>
+
<!-- Build server/minimal manually -->
<mkdir dir="${install.minimal.deploy}"/>
<mkdir dir="${install.minimal.deployers}"/>
@@ -2080,7 +2086,7 @@
<fileset refid="org.jboss.ejb3.singleton:jboss-ejb3-singleton-proxy-impl:jar"/>
<fileset refid="org.jboss.ejb3.singleton:jboss-ejb3-singleton-spi:jar"/>
<fileset refid="org.jboss.ejb3.sis:jboss-ejb3-sis:jar"/>
- <fileset refid="org.jboss.ejb3.statefulcache:jboss-ejb3-statefulcache-ispn:jar"/>
+ <!--fileset refid="org.jboss.ejb3.statefulcache:jboss-ejb3-statefulcache-ispn:jar"/-->
<fileset refid="org.jboss.ejb3:jboss-ejb3-proxy-impl:jar"/>
<fileset refid="org.jboss.ejb3:jboss-ejb3-proxy-spi:jar"/>
<fileset refid="org.jboss.ejb3:jboss-ejb3-proxy-clustered:jar"/>
@@ -2201,6 +2207,7 @@
<fileset refid="org.hibernate:hibernate-infinispan:jar"/>
<fileset refid="org.infinispan:infinispan-core:jar"/>
<fileset refid="org.infinispan:infinispan-tree:jar"/>
+ <fileset refid="org.jboss.ejb3.statefulcache:jboss-ejb3-statefulcache-ispn:jar"/>
<fileset refid="org.jboss.cluster:jboss-ha-server-ispn:jar"/>
<fileset refid="org.jboss.cluster:jboss-ha-server-cache-ispn:jar"/>
<fileset refid="org.rhq.helpers:rhq-pluginAnnotations:jar"/>
Added: trunk/cluster/src/etc/ejb3-cache-factory-registry-jboss-beans.xml
===================================================================
--- trunk/cluster/src/etc/ejb3-cache-factory-registry-jboss-beans.xml (rev 0)
+++ trunk/cluster/src/etc/ejb3-cache-factory-registry-jboss-beans.xml 2010-12-17 01:46:48 UTC (rev 109976)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Stateful cache factories used by EJB3 Deployers
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!-- EJB3 Cache Factory Registry -->
+ <bean name="EJB3CacheFactoryRegistry" class="org.jboss.ejb3.cache.CacheFactoryRegistry">
+ <property name="factories">
+ <!-- Define each of the registered factories -->
+ <map class="java.util.HashMap" keyClass="java.lang.String"
+ valueClass="java.lang.Class">
+ <!-- NoPassivationCache -->
+ <entry>
+ <key>NoPassivationCache</key>
+ <value>org.jboss.ejb3.cache.NoPassivationCacheFactory</value>
+ </entry>
+ <!-- SimpleStatefulCache -->
+ <entry>
+ <key>SimpleStatefulCache</key>
+ <value>org.jboss.ejb3.cache.simple.SimpleStatefulCacheFactory</value>
+ </entry>
+ <!-- Infinispan-backed clustered stateful cache -->
+ <entry>
+ <key>StatefulTreeCache</key>
+ <value>org.jboss.ejb3.cache.infinispan.InfinispanStatefulCacheFactory</value>
+ </entry>
+ </map>
+ </property>
+ </bean>
+
+</deployment>
\ No newline at end of file
Modified: trunk/ejb3/pom.xml
===================================================================
--- trunk/ejb3/pom.xml 2010-12-16 20:21:59 UTC (rev 109975)
+++ trunk/ejb3/pom.xml 2010-12-17 01:46:48 UTC (rev 109976)
@@ -128,6 +128,7 @@
</fileset>
<fileset dir="target/resources">
<include name="META-INF/ejb3-as-deployers-jboss-beans.xml"/>
+ <include name="META-INF/ejb3-cache-factory-registry-jboss-beans.xml"/>
<include name="META-INF/jpa-deployers-jboss-beans.xml"/>
</fileset>
Modified: trunk/ejb3/src/resources/META-INF/ejb3-as-deployers-jboss-beans.xml
===================================================================
--- trunk/ejb3/src/resources/META-INF/ejb3-as-deployers-jboss-beans.xml 2010-12-16 20:21:59 UTC (rev 109975)
+++ trunk/ejb3/src/resources/META-INF/ejb3-as-deployers-jboss-beans.xml 2010-12-17 01:46:48 UTC (rev 109976)
@@ -185,30 +185,6 @@
</uninstall>
</bean>
- <!-- EJB3 Cache Factory Registry -->
- <bean name="EJB3CacheFactoryRegistry" class="org.jboss.ejb3.cache.CacheFactoryRegistry">
- <property name="factories">
- <!-- Define each of the registered factories -->
- <map class="java.util.HashMap" keyClass="java.lang.String"
- valueClass="java.lang.Class">
- <!-- NoPassivationCache -->
- <entry>
- <key>NoPassivationCache</key>
- <value>org.jboss.ejb3.cache.NoPassivationCacheFactory</value>
- </entry>
- <!-- SimpleStatefulCache -->
- <entry>
- <key>SimpleStatefulCache</key>
- <value>org.jboss.ejb3.cache.simple.SimpleStatefulCacheFactory</value>
- </entry>
- <entry>
- <key>StatefulTreeCache</key>
- <value>org.jboss.ejb3.cache.infinispan.InfinispanStatefulCacheFactory</value>
- </entry>
- </map>
- </property>
- </bean>
-
<!-- EJB3 Pool Factory Registry -->
<bean name="EJB3PoolFactoryRegistry" class="org.jboss.ejb3.pool.PoolFactoryRegistry">
<property name="factories">
Added: trunk/ejb3/src/resources/META-INF/ejb3-cache-factory-registry-jboss-beans.xml
===================================================================
--- trunk/ejb3/src/resources/META-INF/ejb3-cache-factory-registry-jboss-beans.xml (rev 0)
+++ trunk/ejb3/src/resources/META-INF/ejb3-cache-factory-registry-jboss-beans.xml 2010-12-17 01:46:48 UTC (rev 109976)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Stateful cache factories used by EJB3 Deployers
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!-- EJB3 Cache Factory Registry -->
+ <bean name="EJB3CacheFactoryRegistry" class="org.jboss.ejb3.cache.CacheFactoryRegistry">
+ <property name="factories">
+ <!-- Define each of the registered factories -->
+ <map class="java.util.HashMap" keyClass="java.lang.String"
+ valueClass="java.lang.Class">
+ <!-- NoPassivationCache -->
+ <entry>
+ <key>NoPassivationCache</key>
+ <value>org.jboss.ejb3.cache.NoPassivationCacheFactory</value>
+ </entry>
+ <!-- SimpleStatefulCache -->
+ <entry>
+ <key>SimpleStatefulCache</key>
+ <value>org.jboss.ejb3.cache.simple.SimpleStatefulCacheFactory</value>
+ </entry>
+ </map>
+ </property>
+ </bean>
+
+</deployment>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list