[jboss-cvs] JBossAS SVN: r65423 - in trunk/tomcat: src/resources and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat Sep 15 22:31:48 EDT 2007
Author: bstansberry at jboss.com
Date: 2007-09-15 22:31:47 -0400 (Sat, 15 Sep 2007)
New Revision: 65423
Added:
trunk/tomcat/src/resources/jbossweb-cluster-beans.xml
trunk/tomcat/src/resources/jbossweb-clusteredsso-beans.xml
Removed:
trunk/tomcat/src/resources/jboss-web-cluster-beans.xml
trunk/tomcat/src/resources/jboss-web-clusteredsso-beans.xml
Modified:
trunk/tomcat/build.xml
Log:
[JBAS-4709] Organize clustering artifacts in deploy
Modified: trunk/tomcat/build.xml
===================================================================
--- trunk/tomcat/build.xml 2007-09-16 02:30:17 UTC (rev 65422)
+++ trunk/tomcat/build.xml 2007-09-16 02:31:47 UTC (rev 65423)
@@ -285,11 +285,7 @@
<!-- jar for fine grained aop -->
<!-- package in .aop. This is used for fine-grained replication -->
- <jar destfile="${build.lib}/jboss-web-cluster.aop">
- <fileset dir="${build.classes}">
- <include name="org/jboss/web/tomcat/service/session/AopMarker.class"/>
- <include name="org/jboss/web/tomcat/service/session/InstanceOfAopMarker.class"/>
- </fileset>
+ <jar destfile="${build.lib}/jbossweb-cluster.aop">
<fileset dir="${build.resources}">
<include name="META-INF/jboss-aop.xml"/>
</fileset>
@@ -302,14 +298,14 @@
</fileset>
</jar>
- <!-- Cluster service sar and aop descriptor used for fine-grained replication -->
- <mkdir dir="${build.deploy}/jboss-web-cluster"/>
- <copy todir="${build.deploy}/jboss-web-cluster"
- file="${build.lib}/jboss-web-cluster.aop"/>
- <copy tofile="${build.deploy}/jboss-web-cluster/jboss-web-cluster-beans.xml"
- file="${build.resources}/jboss-web-cluster-beans.xml"/>
- <copy tofile="${build.deploy}/jboss-web-cluster/jboss-web-clusteredsso-beans.xml"
- file="${build.resources}/jboss-web-clusteredsso-beans.xml"/>
+ <!-- Cluster caches and aop descriptor used for fine-grained replication -->
+ <mkdir dir="${build.deploy}/cluster"/>
+ <copy todir="${build.deploy}/cluster"
+ file="${build.lib}/jbossweb-cluster.aop"/>
+ <copy tofile="${build.deploy}/cluster/jbossweb-cluster-beans.xml"
+ file="${build.resources}/jbossweb-cluster-beans.xml"/>
+ <copy tofile="${build.deploy}/cluster/jbossweb-clusteredsso-beans.xml"
+ file="${build.resources}/jbossweb-clusteredsso-beans.xml"/>
<!-- Update the build marker to allow bypassing -->
<touch file="${build-bypass.marker}"/>
Deleted: trunk/tomcat/src/resources/jboss-web-cluster-beans.xml
===================================================================
--- trunk/tomcat/src/resources/jboss-web-cluster-beans.xml 2007-09-16 02:30:17 UTC (rev 65422)
+++ trunk/tomcat/src/resources/jboss-web-cluster-beans.xml 2007-09-16 02:31:47 UTC (rev 65423)
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <!-- First we create a Configuration object for the cache -->
- <bean name="TomcatClusteringCacheConfig" class="org.jboss.cache.config.Configuration">
-
- <!-- Externally injected services -->
- <property name="runtimeConfig">
- <bean name="TomcatClusteringCacheRuntimeConfig" class="org.jboss.cache.config.RuntimeConfig">
- <property name="transactionManager">
- <bean name="TomcatClusteringBatchManager" class="org.jboss.cache.transaction.BatchModeTransactionManager"/>
- </property>
- <property name="muxChannelFactory"><inject bean="JChannelFactory"/></property>
- </bean>
- </property>
-
- <property name="multiplexerStack">${jboss.multiplexer.stack:udp}</property>
-
- <property name="clusterName">${jboss.partition.name:DefaultPartition}-TomcatCache</property>
-
- <property name="nodeLockingSchemeString" class="java.lang.String">PESSIMISTIC</property>
- <property name="isolationLevelString" class="java.lang.String">REPEATABLE_READ</property>
- <property name="cacheModeString">REPL_ASYNC</property>
-
- <property name="syncReplTimeout">20000</property>
- <property name="lockAcquisitionTimeout">15000</property>
- <property name="stateRetrievalTimeout">60000</property>
-
- <property name="useRegionBasedMarshalling">false</property>
- <property name="inactiveOnStartup">false</property>
-
- <property name="exposeManagementStatistics">true</property>
-
- <property name="buddyReplicationConfig">
- <bean name="TomcatClusteringBuddyReplicationConfig"
- class="org.jboss.cache.config.BuddyReplicationConfig">
-
- <property name="enabled">true</property>
- <property name="buddyPoolName">default</property>
- <property name="buddyCommunicationTimeout">2000</property>
-
- <property name="autoDataGravitation">false</property>
- <property name="dataGravitationRemoveOnFind">true</property>
- <property name="dataGravitationSearchBackupTrees">true</property>
-
- <property name="buddyLocatorConfig">
- <bean name="TomcatClusteringBuddyLocatorConfig" class="org.jboss.cache.buddyreplication.NextMemberBuddyLocatorConfig">
- <property name="numBuddies">1</property>
- <property name="ignoreColocatedBuddies">true</property>
- </bean>
- </property>
- </bean>
- </property>
- <property name="cacheLoaderConfig">
- <bean name="TomcatClusteringCacheLoaderConfig"
- class="org.jboss.cache.config.CacheLoaderConfig">
- <property name="passivation">true</property>
- <property name="preload">/</property>
- <property name="shared">false</property>
- <property name="individualCacheLoaderConfigs">
- <list>
- <bean name="TomcatClusteringFileCacheLoader" class="org.jboss.cache.loader.FileCacheLoaderConfig">
- <property name="location">${jboss.server.data.dir}${/}tomcat-cluster</property>
- <property name="async">false</property>
- <property name="fetchPersistentState">true</property>
- <property name="ignoreModifications">false</property>
- </bean>
- </list>
- </property>
- </bean>
- </property>
- </bean>
-
- <!-- Now we use the above configuration to construct the cache itself -->
- <bean name="TomcatClusteringCache" class="org.jboss.cache.pojo.jmx.PojoCacheJmxWrapper">
-
- <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.cache:service=TomcatClusteringCache", exposedInterface=org.jboss.cache.pojo.jmx.PojoCacheJmxWrapperMBean.class, registerDirectly=true)</annotation>
-
- <property name="configuration"><inject bean="TomcatClusteringCacheConfig"/></property>
- <property name="registerPlainCache">true</property>
-
- </bean>
-
-</deployment>
\ No newline at end of file
Deleted: trunk/tomcat/src/resources/jboss-web-clusteredsso-beans.xml
===================================================================
--- trunk/tomcat/src/resources/jboss-web-clusteredsso-beans.xml 2007-09-16 02:30:17 UTC (rev 65422)
+++ trunk/tomcat/src/resources/jboss-web-clusteredsso-beans.xml 2007-09-16 02:31:47 UTC (rev 65423)
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <!-- First we create a Configuration object for the cache -->
- <bean name="ClusteredSSOCacheConfig" class="org.jboss.cache.config.Configuration">
-
- <!-- Externally injected services -->
- <property name="runtimeConfig">
- <bean name="ClusteredSSOCacheRuntimeConfig" class="org.jboss.cache.config.RuntimeConfig">
- <property name="transactionManager">
- <bean name="ClusteredSSOBatchManager" class="org.jboss.cache.transaction.BatchModeTransactionManager"/>
- </property>
- <property name="muxChannelFactory"><inject bean="JChannelFactory"/></property>
- </bean>
- </property>
-
- <property name="multiplexerStack">${jboss.multiplexer.stack:udp}</property>
-
- <property name="clusterName">${jboss.partition.name:DefaultPartition}-ClusteredSSOCache</property>
-
- <property name="nodeLockingSchemeString" class="java.lang.String">PESSIMISTIC</property>
- <property name="isolationLevelString" class="java.lang.String">REPEATABLE_READ</property>
- <property name="cacheModeString">REPL_ASYNC</property>
-
- <property name="syncReplTimeout">20000</property>
- <property name="lockAcquisitionTimeout">15000</property>
- <property name="stateRetrievalTimeout">60000</property>
-
- <property name="useRegionBasedMarshalling">false</property>
- <property name="inactiveOnStartup">false</property>
-
- <property name="exposeManagementStatistics">true</property>
- </bean>
-
- <!-- Now we use the above configuration to construct the cache itself -->
- <bean name="ClusteredSSOCache" class="org.jboss.cache.jmx.CacheJmxWrapper">
-
- <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.cache:service=ClusteredSSOCache", exposedInterface=org.jboss.cache.pojo.jmx.PojoCacheJmxWrapperMBean.class, registerDirectly=true)</annotation>
-
- <property name="configuration"><inject bean="ClusteredSSOCacheConfig"/></property>
-
- </bean>
-
-</deployment>
\ No newline at end of file
Copied: trunk/tomcat/src/resources/jbossweb-cluster-beans.xml (from rev 65417, trunk/tomcat/src/resources/jboss-web-cluster-beans.xml)
===================================================================
--- trunk/tomcat/src/resources/jbossweb-cluster-beans.xml (rev 0)
+++ trunk/tomcat/src/resources/jbossweb-cluster-beans.xml 2007-09-16 02:31:47 UTC (rev 65423)
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!-- First we create a Configuration object for the cache -->
+ <bean name="TomcatClusteringCacheConfig" class="org.jboss.cache.config.Configuration">
+
+ <!-- Externally injected services -->
+ <property name="runtimeConfig">
+ <bean name="TomcatClusteringCacheRuntimeConfig" class="org.jboss.cache.config.RuntimeConfig">
+ <property name="transactionManager">
+ <bean name="TomcatClusteringBatchManager" class="org.jboss.cache.transaction.BatchModeTransactionManager"/>
+ </property>
+ <property name="muxChannelFactory"><inject bean="JChannelFactory"/></property>
+ </bean>
+ </property>
+
+ <property name="multiplexerStack">${jboss.multiplexer.stack:udp}</property>
+
+ <property name="clusterName">${jboss.partition.name:DefaultPartition}-TomcatCache</property>
+
+ <property name="nodeLockingSchemeString" class="java.lang.String">PESSIMISTIC</property>
+ <property name="isolationLevelString" class="java.lang.String">REPEATABLE_READ</property>
+ <property name="cacheModeString">REPL_ASYNC</property>
+
+ <property name="syncReplTimeout">20000</property>
+ <property name="lockAcquisitionTimeout">15000</property>
+ <property name="stateRetrievalTimeout">60000</property>
+
+ <property name="useRegionBasedMarshalling">false</property>
+ <property name="inactiveOnStartup">false</property>
+
+ <property name="exposeManagementStatistics">true</property>
+
+ <property name="buddyReplicationConfig">
+ <bean name="TomcatClusteringBuddyReplicationConfig"
+ class="org.jboss.cache.config.BuddyReplicationConfig">
+
+ <property name="enabled">true</property>
+ <property name="buddyPoolName">default</property>
+ <property name="buddyCommunicationTimeout">2000</property>
+
+ <property name="autoDataGravitation">false</property>
+ <property name="dataGravitationRemoveOnFind">true</property>
+ <property name="dataGravitationSearchBackupTrees">true</property>
+
+ <property name="buddyLocatorConfig">
+ <bean name="TomcatClusteringBuddyLocatorConfig" class="org.jboss.cache.buddyreplication.NextMemberBuddyLocatorConfig">
+ <property name="numBuddies">1</property>
+ <property name="ignoreColocatedBuddies">true</property>
+ </bean>
+ </property>
+ </bean>
+ </property>
+ <property name="cacheLoaderConfig">
+ <bean name="TomcatClusteringCacheLoaderConfig"
+ class="org.jboss.cache.config.CacheLoaderConfig">
+ <property name="passivation">true</property>
+ <property name="preload">/</property>
+ <property name="shared">false</property>
+ <property name="individualCacheLoaderConfigs">
+ <list>
+ <bean name="TomcatClusteringFileCacheLoader" class="org.jboss.cache.loader.FileCacheLoaderConfig">
+ <property name="location">${jboss.server.data.dir}${/}tomcat-cluster</property>
+ <property name="async">false</property>
+ <property name="fetchPersistentState">true</property>
+ <property name="ignoreModifications">false</property>
+ </bean>
+ </list>
+ </property>
+ </bean>
+ </property>
+ </bean>
+
+ <!-- Now we use the above configuration to construct the cache itself -->
+ <bean name="TomcatClusteringCache" class="org.jboss.cache.pojo.jmx.PojoCacheJmxWrapper">
+
+ <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.cache:service=TomcatClusteringCache", exposedInterface=org.jboss.cache.pojo.jmx.PojoCacheJmxWrapperMBean.class, registerDirectly=true)</annotation>
+
+ <property name="configuration"><inject bean="TomcatClusteringCacheConfig"/></property>
+ <property name="registerPlainCache">true</property>
+
+ </bean>
+
+</deployment>
\ No newline at end of file
Copied: trunk/tomcat/src/resources/jbossweb-clusteredsso-beans.xml (from rev 65417, trunk/tomcat/src/resources/jboss-web-clusteredsso-beans.xml)
===================================================================
--- trunk/tomcat/src/resources/jbossweb-clusteredsso-beans.xml (rev 0)
+++ trunk/tomcat/src/resources/jbossweb-clusteredsso-beans.xml 2007-09-16 02:31:47 UTC (rev 65423)
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!-- First we create a Configuration object for the cache -->
+ <bean name="ClusteredSSOCacheConfig" class="org.jboss.cache.config.Configuration">
+
+ <!-- Externally injected services -->
+ <property name="runtimeConfig">
+ <bean name="ClusteredSSOCacheRuntimeConfig" class="org.jboss.cache.config.RuntimeConfig">
+ <property name="transactionManager">
+ <bean name="ClusteredSSOBatchManager" class="org.jboss.cache.transaction.BatchModeTransactionManager"/>
+ </property>
+ <property name="muxChannelFactory"><inject bean="JChannelFactory"/></property>
+ </bean>
+ </property>
+
+ <property name="multiplexerStack">${jboss.multiplexer.stack:udp}</property>
+
+ <property name="clusterName">${jboss.partition.name:DefaultPartition}-ClusteredSSOCache</property>
+
+ <property name="nodeLockingSchemeString" class="java.lang.String">PESSIMISTIC</property>
+ <property name="isolationLevelString" class="java.lang.String">REPEATABLE_READ</property>
+ <property name="cacheModeString">REPL_ASYNC</property>
+
+ <property name="syncReplTimeout">20000</property>
+ <property name="lockAcquisitionTimeout">15000</property>
+ <property name="stateRetrievalTimeout">60000</property>
+
+ <property name="useRegionBasedMarshalling">false</property>
+ <property name="inactiveOnStartup">false</property>
+
+ <property name="exposeManagementStatistics">true</property>
+ </bean>
+
+ <!-- Now we use the above configuration to construct the cache itself -->
+ <bean name="ClusteredSSOCache" class="org.jboss.cache.jmx.CacheJmxWrapper">
+
+ <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.cache:service=ClusteredSSOCache", exposedInterface=org.jboss.cache.pojo.jmx.PojoCacheJmxWrapperMBean.class, registerDirectly=true)</annotation>
+
+ <property name="configuration"><inject bean="ClusteredSSOCacheConfig"/></property>
+
+ </bean>
+
+</deployment>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list