[jboss-cvs] JBossAS SVN: r76414 - trunk/testsuite/src/resources/cluster/ejb2/passexp/META-INF.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jul 29 08:38:34 EDT 2008
Author: adrian at jboss.org
Date: 2008-07-29 08:38:34 -0400 (Tue, 29 Jul 2008)
New Revision: 76414
Added:
trunk/testsuite/src/resources/cluster/ejb2/passexp/META-INF/partition-passexp-jboss-beans.xml
Removed:
trunk/testsuite/src/resources/cluster/ejb2/passexp/META-INF/partition-passexp-beans.xml
Log:
[JBAS-5803] beans.xml -> jboss-beans.xml
Deleted: trunk/testsuite/src/resources/cluster/ejb2/passexp/META-INF/partition-passexp-beans.xml
===================================================================
--- trunk/testsuite/src/resources/cluster/ejb2/passexp/META-INF/partition-passexp-beans.xml 2008-07-29 12:37:52 UTC (rev 76413)
+++ trunk/testsuite/src/resources/cluster/ejb2/passexp/META-INF/partition-passexp-beans.xml 2008-07-29 12:38:34 UTC (rev 76414)
@@ -1,179 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <!-- Don't inject the real AS thread pool, as it has a classloader
- leak and we don't want to leak this classloader to it
- -->
- <bean name="PassExpThreadPool" class="org.jboss.util.threadpool.BasicThreadPool">
- <constructor>
- <parameter>PassExpThreadPool</parameter>
- <parameter>
- <bean name="PassExpThreadGroup" class="java.lang.ThreadGroup">
- <constructor>
- <parameter>PassExpThreadGroup</parameter>
- </constructor>
- </bean>
- </parameter>
- </constructor>
- </bean>
-
- <!-- Add a stack with JGroups message bundling disabled to the app server's standard JChannelFactory -->
- <bean name="PassExpStackInjector" class="java.lang.Object">
- <install bean="JChannelFactory" method="setMultiplexerConfig">
- <parameter class="java.lang.String">META-INF/passexp-stacks.xml</parameter>
- <parameter>true</parameter>
- </install>
- </bean>
-
- <!--
- The HAPartitionCache instance defined here is shared by JBoss cluster services that
- use JBossCache as their underlying data store. Currently the services that share this
- cache are HAJNDI and DistributedState. It is possible to change the cluster name but this
- isn't recommended since it will be more difficult for others to recognize that the renamed
- cluster is the one used by JBoss cluster services.
- -->
-
- <!-- First we create a Configuration object for the cache -->
- <bean name="PassExpPartition-HAPartitionCacheConfig"
- class="org.jboss.cache.config.Configuration">
-
- <depends>PassExpStackInjector</depends>
-
- <!-- When we're installed, register ourself -->
- <install bean="CacheConfigurationRegistry" method="registerConfiguration">
- <parameter>passexp-partition</parameter>
- <parameter><this/></parameter>
- </install>
-
- <!-- When we're uninstalled, unregister ourself -->
- <uninstall bean="CacheConfigurationRegistry" method="registerConfiguration">
- <parameter>passexp-partition</parameter>
- </uninstall>
-
- <!-- The ClusterPartition beans need to wait until we are completely
- installed and have register ourself -->
- <supply>PassExpPartitionCacheConfigSupply</supply>
-
- <!-- Externally injected services -->
- <property name="runtimeConfig">
- <bean name="PassExpPartition-HAPartitionCacheRuntimeConfig" class="org.jboss.cache.config.RuntimeConfig">
- <property name="transactionManager"><inject bean="jboss:service=TransactionManager" property="TransactionManager"/></property>
- </bean>
- </property>
-
- <!-- We use the "no-bundling" stacks previously injected into our JChannelFactory -->
- <property name="multiplexerStack">passexp-${jboss.multiplexer.stack:udp}</property>
-
- <!-- Valid isolation levels are
- SERIALIZABLE
- REPEATABLE_READ (default)
- READ_COMMITTED
- READ_UNCOMMITTED
- NONE
- -->
- <property name="isolationLevelString">REPEATABLE_READ</property>
-
- <!-- Valid modes are LOCAL, REPL_ASYNC and REPL_SYNC -->
- <property name="cacheModeString">REPL_SYNC</property>
-
- <!-- Name of cluster. Needs to be the same for all nodes in clusters,
- in order to find each other -->
- <property name="clusterName">PassExpPartition-HAPartitionCache</property>
-
- <!-- Whether or not to fetch state on joining a cluster -->
- <property name="fetchInMemoryState">true</property>
-
- <!-- The max amount of time (in milliseconds) we wait until the
- initial state (ie. the contents of the cache) are retrieved from
- existing members in a clustered environment -->
- <property name="stateRetrievalTimeout">5000</property>
-
- <!-- Number of milliseconds to wait until all responses for a
- synchronous call have been received. -->
- <property name="syncReplTimeout">20000</property>
-
- <!-- Max number of milliseconds to wait for a lock acquisition -->
- <property name="lockAcquisitionTimeout">15000</property>
-
- <property name="exposeManagementStatistics">true</property>
-
- </bean>
-
- <!-- ==================================================================== -->
- <!-- DistributedState Service, a legacy wrapper around JBoss Cache -->
- <!-- ==================================================================== -->
-
- <!-- ==================================================================== -->
- <!-- Cluster Partition: defines cluster -->
- <!-- ==================================================================== -->
-
- <bean name="PassExpPartition"
- class="org.jboss.ha.framework.server.ClusterPartition">
-
- <depends>jboss:service=Naming</depends>
-
- <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=PassExpPartition", exposedInterface=org.jboss.ha.framework.server.ClusterPartitionMBean.class)</annotation>
-
- <demand>PassExpPartitionCacheConfigSupply</demand>
-
- <!-- ClusterPartition requires a Cache for state management -->
- <property name="cacheManager"><inject bean="CacheManager"/></property>
- <property name="cacheConfigName">passexp-partition</property>
-
- <!-- Name of the partition being built -->
- <property name="partitionName">PassExpPartition</property>
-
- <!-- The address used to determine the node name -->
- <property name="nodeAddress">${jboss.bind.address}</property>
-
- <!-- Determine if deadlock detection is enabled -->
- <property name="deadlockDetection">false</property>
-
- <!-- Max time (in ms) to wait for state transfer to complete. Increase for large states -->
- <property name="stateTransferTimeout">30000</property>
-
- <!-- Max time (in ms) to wait for RPC calls to complete. -->
- <property name="methodCallTimeout">60000</property>
-
- <property name="distributedReplicantManagerImpl">
- <bean name="PassExpPartitionDRM" class="org.jboss.ha.framework.server.DistributedReplicantManagerImpl">
- <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=PassExpPartitionDRM,partitionName=PassExpPartition", exposedInterface=org.jboss.ha.framework.server.DistributedReplicantManagerImplMBean.class, registerDirectly=true)</annotation>
- </bean>
- </property>
-
- <property name="distributedStateImpl">
- <bean name="PassExpDistributedState"
- class="org.jboss.ha.framework.server.DistributedStateImpl">
- <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=DistributedState,partitionName=PassExpPartition", exposedInterface=org.jboss.ha.framework.server.DistributedStateImplMBean.class, registerDirectly=true)</annotation>
- </bean>
- </property>
-
- </bean>
-
- <bean class="org.jboss.remoting.transport.Connector"
- name="PassExpConnector">
-
- <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.remoting:service=PassExpConnector,transport=socket", exposedInterface=org.jboss.remoting.transport.ConnectorMBean.class, registerDirectly=true)</annotation>
-
- <constructor>
- <!-- Remember that if you do use more than one param on the uri, will have to include as a CDATA, -->
- <!-- otherwise, parser will complain. -->
- <parameter><![CDATA[socket://${jboss.bind.address:localhost}:24446/?datatype=invocation&marshaller=org.jboss.invocation.unified.marshall.InvocationMarshaller&unmarshaller=org.jboss.invocation.unified.marshall.InvocationUnMarshaller&socketTimeout=60000&enableTcpNoDelay=true]]></parameter>
- <parameter>
- <map class="java.util.HashMap" keyClass="java.lang.String" valueClass="java.lang.String">
- <entry><key>dataType</key><value>invocation</value></entry>
- <entry><key>marshaller</key><value>org.jboss.invocation.unified.marshall.InvocationMarshaller</value></entry>
- <entry><key>unmarshaller</key><value>org.jboss.invocation.unified.marshall.InvocationUnMarshaller</value></entry>
- <entry><key>socketTimeout</key><value>600000</value></entry>
- <entry><key>serverBindAddress</key><value>${jboss.bind.address:localhost}</value></entry>
- <entry><key>serverBindPort</key><value>24446</value></entry>
- <entry><key>enableTcpNoDelay</key><value>true</value></entry>
- </map>
- </parameter>
- </constructor>
-
- <depends>jboss.remoting:service=NetworkRegistry</depends>
- </bean>
-
-</deployment>
Copied: trunk/testsuite/src/resources/cluster/ejb2/passexp/META-INF/partition-passexp-jboss-beans.xml (from rev 76413, trunk/testsuite/src/resources/cluster/ejb2/passexp/META-INF/partition-passexp-beans.xml)
===================================================================
--- trunk/testsuite/src/resources/cluster/ejb2/passexp/META-INF/partition-passexp-jboss-beans.xml (rev 0)
+++ trunk/testsuite/src/resources/cluster/ejb2/passexp/META-INF/partition-passexp-jboss-beans.xml 2008-07-29 12:38:34 UTC (rev 76414)
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!-- Don't inject the real AS thread pool, as it has a classloader
+ leak and we don't want to leak this classloader to it
+ -->
+ <bean name="PassExpThreadPool" class="org.jboss.util.threadpool.BasicThreadPool">
+ <constructor>
+ <parameter>PassExpThreadPool</parameter>
+ <parameter>
+ <bean name="PassExpThreadGroup" class="java.lang.ThreadGroup">
+ <constructor>
+ <parameter>PassExpThreadGroup</parameter>
+ </constructor>
+ </bean>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- Add a stack with JGroups message bundling disabled to the app server's standard JChannelFactory -->
+ <bean name="PassExpStackInjector" class="java.lang.Object">
+ <install bean="JChannelFactory" method="setMultiplexerConfig">
+ <parameter class="java.lang.String">META-INF/passexp-stacks.xml</parameter>
+ <parameter>true</parameter>
+ </install>
+ </bean>
+
+ <!--
+ The HAPartitionCache instance defined here is shared by JBoss cluster services that
+ use JBossCache as their underlying data store. Currently the services that share this
+ cache are HAJNDI and DistributedState. It is possible to change the cluster name but this
+ isn't recommended since it will be more difficult for others to recognize that the renamed
+ cluster is the one used by JBoss cluster services.
+ -->
+
+ <!-- First we create a Configuration object for the cache -->
+ <bean name="PassExpPartition-HAPartitionCacheConfig"
+ class="org.jboss.cache.config.Configuration">
+
+ <depends>PassExpStackInjector</depends>
+
+ <!-- When we're installed, register ourself -->
+ <install bean="CacheConfigurationRegistry" method="registerConfiguration">
+ <parameter>passexp-partition</parameter>
+ <parameter><this/></parameter>
+ </install>
+
+ <!-- When we're uninstalled, unregister ourself -->
+ <uninstall bean="CacheConfigurationRegistry" method="registerConfiguration">
+ <parameter>passexp-partition</parameter>
+ </uninstall>
+
+ <!-- The ClusterPartition beans need to wait until we are completely
+ installed and have register ourself -->
+ <supply>PassExpPartitionCacheConfigSupply</supply>
+
+ <!-- Externally injected services -->
+ <property name="runtimeConfig">
+ <bean name="PassExpPartition-HAPartitionCacheRuntimeConfig" class="org.jboss.cache.config.RuntimeConfig">
+ <property name="transactionManager"><inject bean="jboss:service=TransactionManager" property="TransactionManager"/></property>
+ </bean>
+ </property>
+
+ <!-- We use the "no-bundling" stacks previously injected into our JChannelFactory -->
+ <property name="multiplexerStack">passexp-${jboss.multiplexer.stack:udp}</property>
+
+ <!-- Valid isolation levels are
+ SERIALIZABLE
+ REPEATABLE_READ (default)
+ READ_COMMITTED
+ READ_UNCOMMITTED
+ NONE
+ -->
+ <property name="isolationLevelString">REPEATABLE_READ</property>
+
+ <!-- Valid modes are LOCAL, REPL_ASYNC and REPL_SYNC -->
+ <property name="cacheModeString">REPL_SYNC</property>
+
+ <!-- Name of cluster. Needs to be the same for all nodes in clusters,
+ in order to find each other -->
+ <property name="clusterName">PassExpPartition-HAPartitionCache</property>
+
+ <!-- Whether or not to fetch state on joining a cluster -->
+ <property name="fetchInMemoryState">true</property>
+
+ <!-- The max amount of time (in milliseconds) we wait until the
+ initial state (ie. the contents of the cache) are retrieved from
+ existing members in a clustered environment -->
+ <property name="stateRetrievalTimeout">5000</property>
+
+ <!-- Number of milliseconds to wait until all responses for a
+ synchronous call have been received. -->
+ <property name="syncReplTimeout">20000</property>
+
+ <!-- Max number of milliseconds to wait for a lock acquisition -->
+ <property name="lockAcquisitionTimeout">15000</property>
+
+ <property name="exposeManagementStatistics">true</property>
+
+ </bean>
+
+ <!-- ==================================================================== -->
+ <!-- DistributedState Service, a legacy wrapper around JBoss Cache -->
+ <!-- ==================================================================== -->
+
+ <!-- ==================================================================== -->
+ <!-- Cluster Partition: defines cluster -->
+ <!-- ==================================================================== -->
+
+ <bean name="PassExpPartition"
+ class="org.jboss.ha.framework.server.ClusterPartition">
+
+ <depends>jboss:service=Naming</depends>
+
+ <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=PassExpPartition", exposedInterface=org.jboss.ha.framework.server.ClusterPartitionMBean.class)</annotation>
+
+ <demand>PassExpPartitionCacheConfigSupply</demand>
+
+ <!-- ClusterPartition requires a Cache for state management -->
+ <property name="cacheManager"><inject bean="CacheManager"/></property>
+ <property name="cacheConfigName">passexp-partition</property>
+
+ <!-- Name of the partition being built -->
+ <property name="partitionName">PassExpPartition</property>
+
+ <!-- The address used to determine the node name -->
+ <property name="nodeAddress">${jboss.bind.address}</property>
+
+ <!-- Determine if deadlock detection is enabled -->
+ <property name="deadlockDetection">false</property>
+
+ <!-- Max time (in ms) to wait for state transfer to complete. Increase for large states -->
+ <property name="stateTransferTimeout">30000</property>
+
+ <!-- Max time (in ms) to wait for RPC calls to complete. -->
+ <property name="methodCallTimeout">60000</property>
+
+ <property name="distributedReplicantManagerImpl">
+ <bean name="PassExpPartitionDRM" class="org.jboss.ha.framework.server.DistributedReplicantManagerImpl">
+ <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=PassExpPartitionDRM,partitionName=PassExpPartition", exposedInterface=org.jboss.ha.framework.server.DistributedReplicantManagerImplMBean.class, registerDirectly=true)</annotation>
+ </bean>
+ </property>
+
+ <property name="distributedStateImpl">
+ <bean name="PassExpDistributedState"
+ class="org.jboss.ha.framework.server.DistributedStateImpl">
+ <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=DistributedState,partitionName=PassExpPartition", exposedInterface=org.jboss.ha.framework.server.DistributedStateImplMBean.class, registerDirectly=true)</annotation>
+ </bean>
+ </property>
+
+ </bean>
+
+ <bean class="org.jboss.remoting.transport.Connector"
+ name="PassExpConnector">
+
+ <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.remoting:service=PassExpConnector,transport=socket", exposedInterface=org.jboss.remoting.transport.ConnectorMBean.class, registerDirectly=true)</annotation>
+
+ <constructor>
+ <!-- Remember that if you do use more than one param on the uri, will have to include as a CDATA, -->
+ <!-- otherwise, parser will complain. -->
+ <parameter><![CDATA[socket://${jboss.bind.address:localhost}:24446/?datatype=invocation&marshaller=org.jboss.invocation.unified.marshall.InvocationMarshaller&unmarshaller=org.jboss.invocation.unified.marshall.InvocationUnMarshaller&socketTimeout=60000&enableTcpNoDelay=true]]></parameter>
+ <parameter>
+ <map class="java.util.HashMap" keyClass="java.lang.String" valueClass="java.lang.String">
+ <entry><key>dataType</key><value>invocation</value></entry>
+ <entry><key>marshaller</key><value>org.jboss.invocation.unified.marshall.InvocationMarshaller</value></entry>
+ <entry><key>unmarshaller</key><value>org.jboss.invocation.unified.marshall.InvocationUnMarshaller</value></entry>
+ <entry><key>socketTimeout</key><value>600000</value></entry>
+ <entry><key>serverBindAddress</key><value>${jboss.bind.address:localhost}</value></entry>
+ <entry><key>serverBindPort</key><value>24446</value></entry>
+ <entry><key>enableTcpNoDelay</key><value>true</value></entry>
+ </map>
+ </parameter>
+ </constructor>
+
+ <depends>jboss.remoting:service=NetworkRegistry</depends>
+ </bean>
+
+</deployment>
More information about the jboss-cvs-commits
mailing list