[jboss-cvs] JBossAS SVN: r81221 - in branches/JBPAPP_4_2_0_GA_CP: ejb3/src/resources/test-configs/cc/conf and 7 other directories.

Tue Nov 18 08:03:53 EST 2008

Author: pskopek at redhat.com
Date: 2008-11-18 08:03:52 -0500 (Tue, 18 Nov 2008)
New Revision: 81221

Added:
   branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/cluster-service.xml
   branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/ejb-deployer.xml
   branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/hajndi-jms-ds.xml
   branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/jboss-messaging.sar/
   branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/jboss-messaging.sar/oracle-persistence-service.xml
   branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/oracle-ds.xml
   branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/test-configs/cc/conf/jboss-log4j.xml
   branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/test-configs/cc/deploy/cluster-service.xml
   branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/test-configs/cc/deploy/ejb-deployer.xml
   branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/test-configs/cc/deploy/hajndi-jms-ds.xml
   branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/test-configs/cc/deploy/jboss-messaging.sar/
   branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/test-configs/cc/deploy/jboss-messaging.sar/oracle-persistence-service.xml
   branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/test-configs/cc/deploy/oracle-ds.xml
Modified:
   branches/JBPAPP_4_2_0_GA_CP/ejb3/build-test.xml
   branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/conf/login-config.xml
   branches/JBPAPP_4_2_0_GA_CP/system/src/bin/security_cc.policy
   branches/JBPAPP_4_2_0_GA_CP/testsuite/build.xml
   branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/test-configs/cc/conf/login-config.xml
Log:
JBOSSCC-25: Disable use of HSQLDB in evaluation configurations

Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/build-test.xml
===================================================================

--- branches/JBPAPP_4_2_0_GA_CP/ejb3/build-test.xml	2008-11-18 12:59:56 UTC (rev 81220)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/build-test.xml	2008-11-18 13:03:52 UTC (rev 81221)
@@ -5231,18 +5231,32 @@
          </patternset>
       </create-config>
 
-      <!-- delete SNMP adapter, because it is not allowed in CC config -->
+      <!-- delete SNMP adapter, because it is not allowed in CC config --> 
       <delete dir="${jboss.dist}/server/cc/deploy/snmp-adaptor.sar"/>
+      
+      <!-- delete HSQL DB which is not allowed in CC config 
+           Alternate configuration at test-configs/cc/deploy contains DefaultDS 
+           file called oracle-ds.xml for default Oracle DB. 
+      --> 
+      <delete file="${jboss.dist}/server/cc/lib/hsqldb.jar"/>
+      <delete file="${jboss.dist}/server/cc/lib/hsqldb-plugin.jar"/>
+      <delete file="${jboss.dist}/server/cc/deploy/hsqldb-ds.xml"/>
+      <delete file="${jboss.dist}/server/cc/deploy/jboss-messaging.sar/clustered-hsqldb-persistence-service.xml"/>
 
-      <!-- copy alternate part of configuration (cc-none, cc-db, cc-ldap) -->
-      <!--
-   	 <copy todir="${jboss.dist}/server/cc" overwrite="true">
-       <fileset dir="${build.resources}/test-configs/${alternate-config}">
-         <include name="**/*"/>
-       </fileset>
-     </copy>
-     -->
+    	<!-- copy alternate part of configuration (cc-none, cc-db, cc-ldap) -->
+      <copy todir="${jboss.dist}/server/cc" overwrite="true">
+        <fileset dir="${build.resources}/test-configs/${alternate-config}">
+          <include name="**/*"/>
+        </fileset>
+      </copy>
 
+    	<!-- DB config patch (copy JDBC driver library) -->    
+      <copy todir="${jboss.dist}/server/cc/lib" overwrite="true" failonerror="false">
+        <fileset dir="/qa/tools/opt/opt/jdbc-drivers">
+          <include name="${jdbc-driver.pattern}"/>
+        </fileset>
+      </copy>
+
    </target>
 
    <target name="no-start-jboss-cc-tests" depends="init" description="Execute CC tests">

Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/conf/login-config.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/conf/login-config.xml	2008-11-18 12:59:56 UTC (rev 81220)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/conf/login-config.xml	2008-11-18 13:03:52 UTC (rev 81221)
@@ -43,19 +43,20 @@
     </application-policy>
     -->
 
-    <!-- Security domains for testing new jca framework -->
+    <!-- Security domains for testing new jca framework 
     <application-policy name = "HsqlDbRealm">
        <authentication>
           <login-module code = "org.jboss.resource.security.ConfiguredIdentityLoginModule"
              flag = "required">
              <module-option name = "principal">sa</module-option>
-             <module-option name = "userName">sa</module-option>
-             <module-option name = "password"></module-option>
+             <module-option name = "userName">cctest</module-option>
+             <module-option name = "password">cc1248</module-option>
              <module-option name = "managedConnectionFactoryName">jboss.jca:service=LocalTxCM,name=DefaultDS</module-option>
           </login-module>
        </authentication>
     </application-policy>
-
+    -->
+    
     <application-policy name = "JmsXARealm">
        <authentication>
           <login-module code = "org.jboss.resource.security.ConfiguredIdentityLoginModule"

Added: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/cluster-service.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/cluster-service.xml	                        (rev 0)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/cluster-service.xml	2008-11-18 13:03:52 UTC (rev 81221)
@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  Sample Clustering Service Configuration                              -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<server>
+
+   <!-- ==================================================================== -->
+   <!-- Cluster Partition: defines cluster                                   -->
+   <!-- ==================================================================== -->
+
+   <mbean code="org.jboss.ha.framework.server.ClusterPartition"
+      name="jboss:service=${jboss.partition.name:DefaultPartition}">
+
+      <!-- Name of the partition being built -->
+      <attribute name="PartitionName">${jboss.partition.name:DefaultPartition}</attribute>
+
+      <!-- The address used to determine the node name -->
+      <attribute name="NodeAddress">${jboss.bind.address}</attribute>
+
+      <!-- Determine if deadlock detection is enabled -->
+      <attribute name="DeadlockDetection">False</attribute>
+
+      <!-- Max time (in ms) to wait for state transfer to complete. Increase for large states -->
+      <attribute name="StateTransferTimeout">30000</attribute>
+
+      <!-- The JGroups protocol configuration -->
+      <attribute name="PartitionConfig">
+         <!--
+         The default UDP stack:
+         - If you have a multihomed machine, set the UDP protocol's bind_addr attribute to the
+         appropriate NIC IP address, e.g bind_addr="192.168.0.2".
+         - On Windows machines, because of the media sense feature being broken with multicast
+         (even after disabling media sense) set the UDP protocol's loopback attribute to true
+         -->
+         <Config>
+            <UDP mcast_addr="${jboss.partition.udpGroup:228.1.2.3}" 
+                 mcast_port="${jboss.hapartition.mcast_port:45566}"
+                 tos="8"
+                 ucast_recv_buf_size="20000000"
+                 ucast_send_buf_size="640000"
+                 mcast_recv_buf_size="25000000"
+                 mcast_send_buf_size="640000"
+                 loopback="false"
+                 discard_incompatible_packets="true"
+                 enable_bundling="false"
+                 max_bundle_size="64000"
+                 max_bundle_timeout="30"
+                 use_incoming_packet_handler="true"
+                 use_outgoing_packet_handler="false"
+                 ip_ttl="${jgroups.udp.ip_ttl:2}"
+                 down_thread="false" up_thread="false"/>
+            <PING timeout="2000"
+                  down_thread="false" up_thread="false" num_initial_members="3"/>
+            <MERGE2 max_interval="100000"
+                    down_thread="false" up_thread="false" min_interval="20000"/>
+            <FD_SOCK down_thread="false" up_thread="false"/>
+            <FD timeout="10000" max_tries="5" down_thread="false" up_thread="false" shun="true"/>
+            <VERIFY_SUSPECT timeout="1500" down_thread="false" up_thread="false"/>
+            <pbcast.NAKACK max_xmit_size="60000"
+                    use_mcast_xmit="false" gc_lag="0"
+                    retransmit_timeout="300,600,1200,2400,4800"
+                    down_thread="false" up_thread="false"
+                    discard_delivered_msgs="true"/>
+            <UNICAST timeout="300,600,1200,2400,3600"
+                    down_thread="false" up_thread="false"/>
+            <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
+                    down_thread="false" up_thread="false"
+                    max_bytes="400000"/>
+            <pbcast.GMS print_local_addr="true" join_timeout="3000"
+                    down_thread="false" up_thread="false"
+                    join_retry_timeout="2000" shun="true"
+                    view_bundling="true"/>
+            <FRAG2 frag_size="60000" down_thread="false" up_thread="false"/>
+            <pbcast.STATE_TRANSFER down_thread="false" up_thread="false" use_flush="false"/>
+         </Config>
+
+         <!-- Alternate TCP stack: customize it for your environment, change bind_addr and initial_hosts -->
+         <!--
+         <Config>
+            <TCP bind_addr="thishost" start_port="7800" loopback="true"
+                 tcp_nodelay="true"
+                 recv_buf_size="20000000"
+                 send_buf_size="640000"
+                 discard_incompatible_packets="true"
+                 enable_bundling="false"
+                 max_bundle_size="64000"
+                 max_bundle_timeout="30"
+                 use_incoming_packet_handler="true"
+                 use_outgoing_packet_handler="false"
+                 down_thread="false" up_thread="false"
+                 use_send_queues="false"
+                 sock_conn_timeout="300"
+                 skip_suspected_members="true"/>
+            <TCPPING initial_hosts="thishost[7800],otherhost[7800]" port_range="3"
+                     timeout="3000"
+                     down_thread="false" up_thread="false"
+                     num_initial_members="3"/>
+            <MERGE2 max_interval="100000"
+                    down_thread="false" up_thread="false" min_interval="20000"/>
+            <FD_SOCK down_thread="false" up_thread="false"/>
+            <FD timeout="10000" max_tries="5" down_thread="false" up_thread="false" shun="true"/>
+            <VERIFY_SUSPECT timeout="1500" down_thread="false" up_thread="false"/>
+            <pbcast.NAKACK max_xmit_size="60000"
+                           use_mcast_xmit="false" gc_lag="0"
+                           retransmit_timeout="300,600,1200,2400,4800"
+                           down_thread="false" up_thread="false"
+                           discard_delivered_msgs="true"/>
+            <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
+                           down_thread="false" up_thread="false"
+                           max_bytes="400000"/>
+            <pbcast.GMS print_local_addr="true" join_timeout="3000"
+                        down_thread="false" up_thread="false"
+                        join_retry_timeout="2000" shun="true"
+                        view_bundling="true"/>
+            <pbcast.STATE_TRANSFER down_thread="false" up_thread="false" use_flush="false"/>
+         </Config>
+         -->
+      </attribute>
+      <depends>jboss:service=Naming</depends>
+   </mbean>
+
+   <!-- ==================================================================== -->
+   <!-- HA Session State Service for SFSB                                    -->
+   <!-- ==================================================================== -->
+
+   <mbean code="org.jboss.ha.hasessionstate.server.HASessionStateService"
+      name="jboss:service=HASessionState">
+      <depends>jboss:service=Naming</depends>
+      <!-- We now inject the partition into the HAJNDI service instead
+           of requiring that the partition name be passed -->
+      <depends optional-attribute-name="ClusterPartition"
+         proxy-type="attribute">jboss:service=${jboss.partition.name:DefaultPartition}</depends>
+      <!-- JNDI name under which the service is bound -->
+      <attribute name="JndiName">/HASessionState/Default</attribute>
+      <!-- Max delay before cleaning unreclaimed state.
+           Defaults to 30*60*1000 => 30 minutes -->
+      <attribute name="BeanCleaningDelay">0</attribute>
+   </mbean>
+
+   <!-- ==================================================================== -->
+   <!-- HA JNDI                                                              -->
+   <!-- ==================================================================== -->
+
+
+   <!-- ==================================================================== -->
+   <!-- HA Invokers                                                          -->
+   <!-- ==================================================================== -->
+
+
+   <mbean code="org.jboss.invocation.jrmp.server.JRMPInvokerHA"
+      name="jboss:service=invoker,type=jrmpha">
+      <attribute name="ServerAddress">${jboss.bind.address}</attribute>
+      <attribute name="RMIObjectPort">4447</attribute>
+      <!--
+      <attribute name="RMIClientSocketFactory">custom</attribute>
+      <attribute name="RMIServerSocketFactory">custom</attribute>
+      -->
+      <depends>jboss:service=Naming</depends>
+   </mbean>
+
+
+</server>

Added: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/ejb-deployer.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/ejb-deployer.xml	                        (rev 0)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/ejb-deployer.xml	2008-11-18 13:03:52 UTC (rev 81221)
@@ -0,0 +1,311 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  The JBoss service configuration file for the EJB deployer service.
+  
+  $Id: ejb-deployer.xml 62317 2007-04-13 10:39:22Z dimitris at jboss.org $
+-->
+<server>
+
+  <!-- ==================================================================== -->
+  <!-- J2EE Timer Service                                                   -->
+  <!-- ==================================================================== -->
+
+  <!-- An EJB Timer Service that is Tx aware -->
+  <mbean code="org.jboss.ejb.txtimer.EJBTimerServiceImpl"
+    name="jboss.ejb:service=EJBTimerService">
+    <attribute name="RetryPolicy">jboss.ejb:service=EJBTimerService,retryPolicy=fixedDelay</attribute>
+    <attribute name="PersistencePolicy">jboss.ejb:service=EJBTimerService,persistencePolicy=database</attribute>
+    <attribute name="TimerIdGeneratorClassName">org.jboss.ejb.txtimer.BigIntegerTimerIdGenerator</attribute>
+    <attribute name="TimedObjectInvokerClassName">org.jboss.ejb.txtimer.TimedObjectInvokerImpl</attribute>
+    <depends optional-attribute-name="TransactionManagerFactory" proxy-type="org.jboss.tm.TransactionManagerFactory">
+      jboss:service=TransactionManager
+    </depends>
+  </mbean>
+
+  <!-- A retry policy that uses a fixed interval in milli seconds -->
+  <mbean code="org.jboss.ejb.txtimer.FixedDelayRetryPolicy" name="jboss.ejb:service=EJBTimerService,retryPolicy=fixedDelay">
+    <attribute name="Delay">100</attribute>
+  </mbean>
+
+  <!-- A persistence policy that does not persist the timers
+  <mbean code="org.jboss.ejb.txtimer.NoopPersistencePolicy" name="jboss.ejb:service=EJBTimerService,persistencePolicy=noop"/>
+  -->
+
+  <!--
+    A persistence policy that persists timers to a database.
+    
+    The 2 supported db persistence plugins are:
+      org.jboss.ejb.txtimer.GeneralPurposeDatabasePersistencePlugin
+      org.jboss.ejb.txtimer.OracleDatabasePersistencePlugin
+      
+    The table name defaults to "TIMERS". It can be overriden using the
+    'TimersTable' attribute if the persistence plugin supports it.
+    When overriding the timers table, an optional schema can be specified
+    using the syntax [schema.]table
+  -->
+  <mbean code="org.jboss.ejb.txtimer.DatabasePersistencePolicy" name="jboss.ejb:service=EJBTimerService,persistencePolicy=database">
+    <!-- DataSourceBinding ObjectName -->
+    <depends optional-attribute-name="DataSource">jboss.jca:service=DataSourceBinding,name=DefaultDS</depends>
+    <!-- The plugin that handles database persistence -->
+    <attribute name="DatabasePersistencePlugin">org.jboss.ejb.txtimer.OracleDatabasePersistencePlugin</attribute>
+    <!-- The timers table name -->
+    <attribute name="TimersTable">TIMERS</attribute>
+  </mbean>
+
+  <!-- ==================================================================== -->
+  <!-- EJB Deployer                                                         -->
+  <!-- ==================================================================== -->
+
+  <!-- EJB deployer, remove to disable EJB behavior-->
+  <mbean code="org.jboss.ejb.EJBDeployer" name="jboss.ejb:service=EJBDeployer" xmbean-dd="">
+  
+    <!-- Inline XMBean Descriptor BEGIN -->
+    <xmbean>
+      <description>The EJBDeployer responsible for ejb jar deployment</description>
+      <descriptors>
+        <interceptors>
+          <!-- comment out DynamicInterceptor to disable dynamic addition of interceptors -->
+          <interceptor code="org.jboss.mx.interceptor.DynamicInterceptor"/>
+        </interceptors>
+      </descriptors>
+      <class>org.jboss.ejb.EJBDeployer</class>
+
+      <!-- ServiceMBean attributes -->
+      <attribute access="read-only" getMethod="getName">
+        <description>The class name of the MBean</description>
+        <name>Name</name>
+        <type>java.lang.String</type>
+      </attribute>
+
+      <attribute access="read-only" getMethod="getState">
+        <description>The status of the MBean</description>
+        <name>State</name>
+        <type>int</type>
+      </attribute>
+
+      <attribute access="read-only" getMethod="getStateString">
+        <description>The status of the MBean in text form</description>
+        <name>StateString</name>
+        <type>java.lang.String</type>
+      </attribute>
+
+      <!-- SubDeployerMBean attributes -->
+      <attribute access="read-only" getMethod="getServiceName">
+         <description>The JMX ObjectName of the service that provides the SubDeployer</description>
+         <name>ServiceName</name>
+         <type>javax.management.ObjectName</type>
+      </attribute>
+      
+      <attribute access="read-only" getMethod="getSuffixes">
+         <description>An array of suffixes of interest to this subdeployer</description>
+         <name>Suffixes</name>
+         <type>[Ljava.lang.String;</type>
+      </attribute>
+      
+      <attribute access="read-only" getMethod="getRelativeOrder">
+         <description>The relative order of the specified suffixes</description>
+         <name>RelativeOrder</name>
+         <type>int</type>
+      </attribute>
+
+      <!-- SubDeployerExtMBean attribute -->
+      <attribute access="read-write" getMethod="getEnhancedSuffixes" setMethod="setEnhancedSuffixes">
+         <description>Allow the override of supported suffixes and relative order</description>
+         <name>EnhancedSuffixes</name>
+         <type>[Ljava.lang.String;</type>
+      </attribute>
+      
+      <!-- EJBDeployerMBean attributes -->
+      <attribute access="read-write" getMethod="getWebServiceName" setMethod="setWebServiceName">
+        <description>The dynamic class loading simple web server</description>
+        <name>WebServiceName</name>
+        <type>javax.management.ObjectName</type>
+      </attribute>
+
+      <attribute access="read-write" getMethod="getVerifyDeployments" setMethod="setVerifyDeployments">
+        <description>Control the bean verifier (on/off)</description>
+        <name>VerifyDeployments</name>
+        <type>boolean</type>
+      </attribute>
+
+      <attribute access="read-write" getMethod="getVerifierVerbose" setMethod="setVerifierVerbose">
+        <description>Control the verbose mode of the bean verifier</description>
+        <name>VerifierVerbose</name>
+        <type>boolean</type>
+      </attribute>
+
+      <attribute access="read-write" getMethod="getStrictVerifier" setMethod="setStrictVerifier">
+        <description>Control the strictness of the bean verifier</description>
+        <name>StrictVerifier</name>
+        <type>boolean</type>
+      </attribute>
+
+      <attribute access="read-write" getMethod="isCallByValue" setMethod="setCallByValue">
+        <description>Enable/disable call-by-value semantics</description>
+        <name>CallByValue</name>
+        <type>boolean</type>
+      </attribute>
+
+      <attribute access="read-write" getMethod="getValidateDTDs" setMethod="setValidateDTDs">
+        <description>Enable/disable the validation of deployment descriptors</description>
+        <name>ValidateDTDs</name>
+        <type>boolean</type>
+      </attribute>
+
+      <attribute access="read-write" getMethod="isMetricsEnabled" setMethod="setMetricsEnabled">
+        <description>Enable/disable the metrics interceptor for containers</description>
+        <name>MetricsEnabled</name>
+        <type>boolean</type>
+      </attribute>
+
+      <attribute access="read-write" getMethod="getTransactionManagerServiceName" setMethod="setTransactionManagerServiceName">
+        <description>The transaction manager service to use</description>
+        <name>TransactionManagerServiceName</name>
+        <type>javax.management.ObjectName</type>
+      </attribute>
+
+      <!-- EJBDeployerMBean operations -->
+      <operation>
+        <description>List the deployed applications</description>
+        <name>listDeployedApplications</name>
+        <return-type>java.util.Iterator</return-type>
+      </operation>
+
+      <!-- ServiceMBean operations -->
+      <operation>
+        <description>Standard MBean lifecycle method</description>
+        <name>create</name>
+      </operation>
+
+      <operation>
+        <description>The start lifecycle operation</description>
+        <name>start</name>
+      </operation>
+
+      <operation>
+        <description>The stop lifecycle operation</description>
+        <name>stop</name>
+      </operation>
+
+      <operation>
+        <description>The destroy lifecycle operation</description>
+        <name>destroy</name>
+      </operation>
+
+      <operation>
+        <description>The detyped lifecycle operation (for internal use only)</description>
+        <name>jbossInternalLifecycle</name>
+        <parameter>
+          <description>The lifecycle operation</description>
+          <name>method</name>
+          <type>java.lang.String</type>
+        </parameter>
+        <return-type>void</return-type>
+      </operation>
+
+      <!-- SubDeployerMBean operations -->
+      <operation>
+        <description>Accept a module for deployment</description>
+        <name>accepts</name>
+        <parameter>
+          <name>info</name>
+          <type>org.jboss.deployment.DeploymentInfo</type>
+        </parameter>
+        <return-type>boolean</return-type>
+      </operation>
+
+      <operation>
+        <description>Initialize deployment step</description>
+        <name>init</name>
+        <parameter>
+          <name>info</name>
+          <type>org.jboss.deployment.DeploymentInfo</type>
+        </parameter>
+      </operation>
+
+      <operation>
+        <description>Create deployment step</description>
+        <name>create</name>
+        <parameter>
+          <name>info</name>
+          <type>org.jboss.deployment.DeploymentInfo</type>
+        </parameter>
+      </operation>
+
+      <operation>
+        <description>Start deployment step</description>
+        <name>start</name>
+        <parameter>
+          <name>info</name>
+          <type>org.jboss.deployment.DeploymentInfo</type>
+        </parameter>
+      </operation>
+
+      <operation>
+        <description>Stop deployment step</description>
+        <name>stop</name>
+        <parameter>
+          <name>info</name>
+          <type>org.jboss.deployment.DeploymentInfo</type>
+        </parameter>
+      </operation>
+
+      <operation>
+        <description>Destroy deployment step</description>
+        <name>destroy</name>
+        <parameter>
+          <name>info</name>
+          <type>org.jboss.deployment.DeploymentInfo</type>
+        </parameter>
+      </operation>
+
+      <!-- Interceptable operations -->
+      <operation>
+        <description>Add dynamically an operation interceptor</description>
+        <name>addOperationInterceptor</name>
+        <parameter>
+          <description>The Interceptor</description>
+          <name>interceptor</name>
+          <type>org.jboss.mx.interceptor.Interceptor</type>
+        </parameter>
+      </operation>
+
+      <operation>
+        <description>Remove dynamically an operation interceptor</description>
+        <name>removeOperationInterceptor</name>
+        <parameter>
+          <description>The Interceptor</description>
+          <name>interceptor</name>
+          <type>org.jboss.mx.interceptor.Interceptor</type>
+        </parameter>
+      </operation>      
+    </xmbean>
+    <!-- Inline XMBean Descriptor END -->
+      
+    <!-- A flag indicating if the deployer should validate the
+    ejb-jar.xml/jboss.xml descriptors and components
+    -->
+    <attribute name="VerifyDeployments">true</attribute>
+    <!-- A flag indicating if the xml parser should validate the descriptor
+    DTDs
+    -->
+    <attribute name="ValidateDTDs">false</attribute>
+    <!-- A flag indicating if the verifier should be verbose about its
+    operation
+    -->
+    <attribute name="VerifierVerbose">true</attribute>
+    <!-- Setting this to 'true' will cause all deployments
+     to fail when the Verifier detected a problem with the contained
+     Beans. If false, warnings/errors will be logged but the deployment
+     will not fail.
+    -->
+    <attribute name="StrictVerifier">true</attribute>
+
+    <!-- The EJBDeployer needs the JTA transaction manager service -->
+    <depends optional-attribute-name="TransactionManagerServiceName">jboss:service=TransactionManager</depends>
+    <!-- The dynamic class loading simple web server -->
+    <depends optional-attribute-name="WebServiceName">jboss:service=WebService</depends>
+    
+  </mbean>
+
+</server>

Added: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/hajndi-jms-ds.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/hajndi-jms-ds.xml	                        (rev 0)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/hajndi-jms-ds.xml	2008-11-18 13:03:52 UTC (rev 81221)
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<connection-factories>
+ 
+  <!-- ==================================================================== -->
+  <!-- JMS Stuff                                                            -->
+  <!-- ==================================================================== -->
+
+  <!-- The JMS provider loader -->
+  <mbean code="org.jboss.jms.jndi.JMSProviderLoader"
+	 name="jboss.jms:service=JMSProviderLoader,name=JMSProvider">
+    <attribute name="ProviderName">DefaultJMSProvider</attribute>
+    <attribute name="ProviderAdapterClass">
+      org.jboss.jms.jndi.JNDIProviderAdapter
+    </attribute>
+    <!-- The combined connection factory -->
+    <attribute name="FactoryRef">java:/XAConnectionFactory</attribute>
+    <!-- The queue connection factory -->
+    <attribute name="QueueFactoryRef">java:/XAConnectionFactory</attribute>
+    <!-- The topic factory -->
+    <attribute name="TopicFactoryRef">java:/XAConnectionFactory</attribute>
+    <!-- Uncomment to use HAJNDI to access JMS
+    <attribute name="Properties">
+       java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+       java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
+       java.naming.provider.url=localhost:1100
+    </attribute>
+    -->
+  </mbean>
+
+  <!-- The server session pool for Message Driven Beans -->
+  <mbean code="org.jboss.jms.asf.ServerSessionPoolLoader"
+	 name="jboss.jms:service=ServerSessionPoolMBean,name=StdJMSPool">
+    <depends optional-attribute-name="XidFactory">jboss:service=XidFactory</depends>
+    <attribute name="PoolName">StdJMSPool</attribute>
+    <attribute name="PoolFactoryClass">
+      org.jboss.jms.asf.StdServerSessionPoolFactory
+    </attribute>
+  </mbean>
+
+  <!-- JMS XA Resource adapter, use this to get transacted JMS in beans -->
+  <tx-connection-factory>
+    <jndi-name>JmsXA</jndi-name>
+    <xa-transaction/>
+    <rar-name>jms-ra.rar</rar-name>
+    <connection-definition>org.jboss.resource.adapter.jms.JmsConnectionFactory</connection-definition>
+    <config-property name="SessionDefaultType" type="java.lang.String">javax.jms.Topic</config-property>
+    <config-property name="JmsProviderAdapterJNDI" type="java.lang.String">java:/DefaultJMSProvider</config-property>
+    <security-domain-and-application>JmsXARealm</security-domain-and-application>
+    <max-pool-size>20</max-pool-size>
+  </tx-connection-factory>
+
+</connection-factories>

Added: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/jboss-messaging.sar/oracle-persistence-service.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/jboss-messaging.sar/oracle-persistence-service.xml	                        (rev 0)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/jboss-messaging.sar/oracle-persistence-service.xml	2008-11-18 13:03:52 UTC (rev 81221)
@@ -0,0 +1,284 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+     Oracle persistence deployment descriptor.
+
+     Tested with Oracle 10.2.0.1
+
+     $Id$
+ -->
+
+<server>
+
+   <!-- Persistence Manager MBean configuration
+       ======================================== -->
+
+   <mbean code="org.jboss.messaging.core.jmx.JDBCPersistenceManagerService"
+      name="jboss.messaging:service=PersistenceManager"
+      xmbean-dd="xmdesc/JDBCPersistenceManager-xmbean.xml">
+
+      <depends>jboss.jca:service=DataSourceBinding,name=DefaultDS</depends>
+
+      <depends optional-attribute-name="TransactionManager">jboss:service=TransactionManager</depends>
+
+      <!-- The datasource to use for the persistence manager -->
+
+      <attribute name="DataSource">java:/DefaultDS</attribute>
+
+      <!-- If true will attempt to create tables and indexes on every start-up -->
+
+      <attribute name="CreateTablesOnStartup">true</attribute>
+
+      <!-- If true then we will automatically detect and reject duplicate messages sent during failover -->
+
+      <attribute name="DetectDuplicates">true</attribute>
+
+      <!-- The size of the id cache to use when detecting duplicate messages -->
+
+      <attribute name="IDCacheSize">500</attribute>
+
+      <!-- Some databases don't support inserting blobs using INSERT INTO ... SELECT FROM -->
+
+      <attribute name="SupportsBlobOnSelect">false</attribute>
+
+      <attribute name="SqlProperties"><![CDATA[
+   CREATE_DUAL=CREATE TABLE JBM_DUAL (DUMMY INTEGER, PRIMARY KEY (DUMMY))
+   CREATE_MESSAGE_REFERENCE=CREATE TABLE JBM_MSG_REF (MESSAGE_ID INTEGER, CHANNEL_ID INTEGER, TRANSACTION_ID INTEGER, STATE CHAR(1), ORD INTEGER, PAGE_ORD INTEGER, DELIVERY_COUNT INTEGER, SCHED_DELIVERY INTEGER, PRIMARY KEY(MESSAGE_ID, CHANNEL_ID))
+   CREATE_IDX_MESSAGE_REF_TX=CREATE INDEX JBM_MSG_REF_TX ON JBM_MSG_REF (TRANSACTION_ID, STATE)
+   CREATE_MESSAGE=CREATE TABLE JBM_MSG (MESSAGE_ID INTEGER, RELIABLE CHAR(1), EXPIRATION INTEGER, TIMESTAMP INTEGER, PRIORITY INTEGER, TYPE INTEGER, HEADERS BLOB, PAYLOAD BLOB, PRIMARY KEY (MESSAGE_ID))
+   CREATE_TRANSACTION=CREATE TABLE JBM_TX (NODE_ID INTEGER, TRANSACTION_ID INTEGER, BRANCH_QUAL RAW(254), FORMAT_ID INTEGER, GLOBAL_TXID RAW(254), PRIMARY KEY (TRANSACTION_ID))
+   CREATE_COUNTER=CREATE TABLE JBM_COUNTER (NAME VARCHAR2(255), NEXT_ID INTEGER, PRIMARY KEY(NAME))
+   CREATE_ID_CACHE=CREATE TABLE JBM_ID_CACHE (NODE_ID INTEGER, CNTR INTEGER, JBM_ID VARCHAR2(255), PRIMARY KEY(NODE_ID, CNTR))
+   INSERT_DUAL=INSERT INTO JBM_DUAL VALUES (1)
+   CHECK_DUAL=SELECT 1 FROM JBM_DUAL
+   INSERT_MESSAGE_REF=INSERT INTO JBM_MSG_REF (CHANNEL_ID, MESSAGE_ID, TRANSACTION_ID, STATE, ORD, PAGE_ORD, DELIVERY_COUNT, SCHED_DELIVERY) VALUES (?, ?, ?, ?, ?, ?, ?, ?)
+   DELETE_MESSAGE_REF=DELETE FROM JBM_MSG_REF WHERE MESSAGE_ID=? AND CHANNEL_ID=? AND STATE='C'
+   UPDATE_MESSAGE_REF=UPDATE JBM_MSG_REF SET TRANSACTION_ID=?, STATE='-' WHERE MESSAGE_ID=? AND CHANNEL_ID=? AND STATE='C'
+   UPDATE_PAGE_ORDER=UPDATE JBM_MSG_REF SET PAGE_ORD = ? WHERE MESSAGE_ID=? AND CHANNEL_ID=?
+   COMMIT_MESSAGE_REF1=UPDATE JBM_MSG_REF SET STATE='C', TRANSACTION_ID = NULL WHERE TRANSACTION_ID=? AND STATE='+'
+   COMMIT_MESSAGE_REF2=DELETE FROM JBM_MSG_REF WHERE TRANSACTION_ID=? AND STATE='-'
+   ROLLBACK_MESSAGE_REF1=DELETE FROM JBM_MSG_REF WHERE TRANSACTION_ID=? AND STATE='+'
+   ROLLBACK_MESSAGE_REF2=UPDATE JBM_MSG_REF SET STATE='C', TRANSACTION_ID = NULL WHERE TRANSACTION_ID=? AND STATE='-'
+   LOAD_PAGED_REFS=SELECT MESSAGE_ID, DELIVERY_COUNT, PAGE_ORD, SCHED_DELIVERY FROM JBM_MSG_REF WHERE CHANNEL_ID = ? AND PAGE_ORD BETWEEN ? AND ? ORDER BY PAGE_ORD
+   LOAD_UNPAGED_REFS=SELECT MESSAGE_ID, DELIVERY_COUNT, SCHED_DELIVERY FROM JBM_MSG_REF WHERE STATE = 'C' AND CHANNEL_ID = ? AND PAGE_ORD IS NULL ORDER BY ORD
+   LOAD_REFS=SELECT MESSAGE_ID, DELIVERY_COUNT, SCHED_DELIVERY FROM JBM_MSG_REF WHERE STATE = 'C' AND CHANNEL_ID = ? ORDER BY ORD
+   UPDATE_REFS_NOT_PAGED=UPDATE JBM_MSG_REF SET PAGE_ORD = NULL WHERE PAGE_ORD BETWEEN ? AND ? AND CHANNEL_ID=?
+   SELECT_MIN_MAX_PAGE_ORD=SELECT MIN(PAGE_ORD), MAX(PAGE_ORD) FROM JBM_MSG_REF WHERE CHANNEL_ID = ?
+   UPDATE_DELIVERY_COUNT=UPDATE JBM_MSG_REF SET DELIVERY_COUNT = ? WHERE MESSAGE_ID = ? AND CHANNEL_ID = ?
+   UPDATE_CHANNEL_ID=UPDATE JBM_MSG_REF SET CHANNEL_ID = ? WHERE CHANNEL_ID = ?
+   MOVE_REFERENCE=UPDATE JBM_MSG_REF SET CHANNEL_ID = ? WHERE MESSAGE_ID = ? AND CHANNEL_ID = ?
+   LOAD_MESSAGES=SELECT MESSAGE_ID, RELIABLE, EXPIRATION, TIMESTAMP, PRIORITY, HEADERS, PAYLOAD, TYPE FROM JBM_MSG
+   INSERT_MESSAGE=INSERT INTO JBM_MSG (MESSAGE_ID, RELIABLE, EXPIRATION, TIMESTAMP, PRIORITY, TYPE, HEADERS, PAYLOAD) VALUES (?, ?, ?, ?, ?, ?, ?, ?)
+   INSERT_MESSAGE_CONDITIONAL=INSERT INTO JBM_MSG (MESSAGE_ID, RELIABLE, EXPIRATION, TIMESTAMP, PRIORITY, TYPE) SELECT ?, ?, ?, ?, ?, ? FROM JBM_DUAL WHERE NOT EXISTS (SELECT MESSAGE_ID FROM JBM_MSG WHERE MESSAGE_ID = ?)
+   UPDATE_MESSAGE_4CONDITIONAL=UPDATE JBM_MSG SET HEADERS=?, PAYLOAD=? WHERE MESSAGE_ID=?
+   INSERT_MESSAGE_CONDITIONAL_FULL=INSERT INTO JBM_MSG (MESSAGE_ID, RELIABLE, EXPIRATION, TIMESTAMP, PRIORITY, TYPE, HEADERS, PAYLOAD) SELECT ?, ?, ?, ?, ?, ?, ?, ? FROM JBM_DUAL WHERE NOT EXISTS (SELECT MESSAGE_ID FROM JBM_MSG WHERE MESSAGE_ID = ?)
+   MESSAGE_ID_COLUMN=MESSAGE_ID
+   DELETE_MESSAGE=DELETE FROM JBM_MSG WHERE MESSAGE_ID = ? AND NOT EXISTS (SELECT JBM_MSG_REF.MESSAGE_ID FROM JBM_MSG_REF WHERE JBM_MSG_REF.MESSAGE_ID = ?)
+   INSERT_TRANSACTION=INSERT INTO JBM_TX (NODE_ID, TRANSACTION_ID, BRANCH_QUAL, FORMAT_ID, GLOBAL_TXID) VALUES(?, ?, ?, ?, ?)
+   DELETE_TRANSACTION=DELETE FROM JBM_TX WHERE NODE_ID = ? AND TRANSACTION_ID = ?
+   SELECT_PREPARED_TRANSACTIONS=SELECT TRANSACTION_ID, BRANCH_QUAL, FORMAT_ID, GLOBAL_TXID FROM JBM_TX WHERE NODE_ID = ?
+   SELECT_MESSAGE_ID_FOR_REF=SELECT MESSAGE_ID, CHANNEL_ID FROM JBM_MSG_REF WHERE TRANSACTION_ID = ? AND STATE = '+' ORDER BY ORD
+   SELECT_MESSAGE_ID_FOR_ACK=SELECT MESSAGE_ID, CHANNEL_ID FROM JBM_MSG_REF WHERE TRANSACTION_ID = ? AND STATE = '-' ORDER BY ORD
+   UPDATE_COUNTER=UPDATE JBM_COUNTER SET NEXT_ID = ? WHERE NAME=?
+   SELECT_COUNTER=SELECT NEXT_ID FROM JBM_COUNTER WHERE NAME=? FOR UPDATE
+   INSERT_COUNTER=INSERT INTO JBM_COUNTER (NAME, NEXT_ID) VALUES (?, ?)
+   SELECT_ALL_CHANNELS=SELECT DISTINCT(CHANNEL_ID) FROM JBM_MSG_REF
+   UPDATE_TX=UPDATE JBM_TX SET NODE_ID=? WHERE NODE_ID=?
+   UPDATE_ID_IN_CACHE=UPDATE JBM_ID_CACHE SET JBM_ID = ? WHERE NODE_ID = ? AND CNTR = ?
+   INSERT_ID_IN_CACHE=INSERT INTO JBM_ID_CACHE (NODE_ID, CNTR, JBM_ID) VALUES (?, ?, ?)
+   LOAD_ID_CACHE=SELECT CNTR, JBM_ID FROM JBM_ID_CACHE WHERE NODE_ID = ?
+      ]]></attribute>
+
+      <!-- The maximum number of parameters to include in a prepared statement -->
+
+      <attribute name="MaxParams">500</attribute>
+
+   </mbean>
+
+   <!-- Messaging Post Office MBean configuration
+        ========================================= -->
+
+   <mbean code="org.jboss.messaging.core.jmx.MessagingPostOfficeService"
+      name="jboss.messaging:service=PostOffice"
+      xmbean-dd="xmdesc/MessagingPostOffice-xmbean.xml">
+
+      <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+
+      <depends>jboss.jca:service=DataSourceBinding,name=DefaultDS</depends>
+
+      <depends optional-attribute-name="TransactionManager">jboss:service=TransactionManager</depends>
+
+      <!-- The name of the post office -->
+
+      <attribute name="PostOfficeName">JMS post office</attribute>
+
+      <!-- The datasource used by the post office to access it's binding information -->
+
+      <attribute name="DataSource">java:/DefaultDS</attribute>
+
+      <!-- If true will attempt to create tables and indexes on every start-up -->
+
+      <attribute name="CreateTablesOnStartup">true</attribute>
+
+      <attribute name="SqlProperties"><![CDATA[
+CREATE_POSTOFFICE_TABLE=CREATE TABLE JBM_POSTOFFICE (POSTOFFICE_NAME VARCHAR2(255), NODE_ID INTEGER, QUEUE_NAME VARCHAR2(255), COND VARCHAR2(1023), SELECTOR VARCHAR2(1023), CHANNEL_ID INTEGER, CLUSTERED CHAR(1), ALL_NODES CHAR(1), PRIMARY KEY(POSTOFFICE_NAME, NODE_ID, QUEUE_NAME))
+INSERT_BINDING=INSERT INTO JBM_POSTOFFICE (POSTOFFICE_NAME, NODE_ID, QUEUE_NAME, COND, SELECTOR, CHANNEL_ID, CLUSTERED, ALL_NODES) VALUES (?, ?, ?, ?, ?, ?, ?, ?)
+DELETE_BINDING=DELETE FROM JBM_POSTOFFICE WHERE POSTOFFICE_NAME=? AND NODE_ID=? AND QUEUE_NAME=?
+LOAD_BINDINGS=SELECT QUEUE_NAME, COND, SELECTOR, CHANNEL_ID, CLUSTERED, ALL_NODES FROM JBM_POSTOFFICE WHERE POSTOFFICE_NAME=? AND NODE_ID=?
+      ]]></attribute>
+
+      <!-- This post office is non clustered. If you want a clustered post office then set to true -->
+      
+      <attribute name="Clustered">false</attribute>
+
+      <!-- All the remaining properties only have to be specified if the post office is clustered.
+           You can safely comment them out if your post office is non clustered -->
+
+      <!-- The JGroups group name that the post office will use -->
+
+      <attribute name="GroupName">${jboss.messaging.groupname:MessagingPostOffice}</attribute>
+
+      <!-- Max time to wait for state to arrive when the post office joins the cluster -->
+
+      <attribute name="StateTimeout">30000</attribute>
+
+      <!-- Max time to wait for a synchronous call to node members using the MessageDispatcher -->
+
+      <attribute name="CastTimeout">30000</attribute>
+      
+      <!-- Set this to true if you want failover of connections to occur when a node is shut down -->
+      
+      <attribute name="FailoverOnNodeLeave">false</attribute>
+      
+      <!-- JGroups stack configuration for the data channel - used for sending data across the cluster -->
+
+      <!-- By default we use the TCP stack for data -->
+      <attribute name="DataChannelConfig">
+         <config>
+            <TCP start_port="7900"
+                 loopback="true"
+                 recv_buf_size="20000000"
+                 send_buf_size="640000"
+                 discard_incompatible_packets="true"
+                 max_bundle_size="64000"
+                 max_bundle_timeout="30"
+                 use_incoming_packet_handler="true"
+                 use_outgoing_packet_handler="false"
+                 down_thread="false" up_thread="false"
+                 enable_bundling="false"
+                 use_send_queues="false"
+                 sock_conn_timeout="300"
+                 skip_suspected_members="true"/>
+            <MPING timeout="4000"
+		         mcast_addr="${jboss.messaging.datachanneludpaddress,jboss.partition.udpGroup:228.6.6.6}"
+		         mcast_port="${jboss.messaging.datachanneludpport:45567}"
+		         ip_ttl="${jboss.messaging.ipttl:8}"
+		         num_initial_members="2"
+		         num_ping_requests="1"/>
+            <MERGE2 max_interval="100000"
+                    down_thread="false" up_thread="false" min_interval="20000"/>
+            <FD timeout="10000" max_tries="5" down_thread="false" up_thread="false" shun="true"/>
+            <FD_SOCK down_thread="false" up_thread="false"/>
+            <VERIFY_SUSPECT timeout="1500" down_thread="false" up_thread="false"/>
+            <pbcast.NAKACK max_xmit_size="60000"
+                           use_mcast_xmit="false" gc_lag="0"
+                           retransmit_timeout="300,600,1200,2400,4800"
+                           down_thread="false" up_thread="false"
+                           discard_delivered_msgs="true"/>
+            <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
+                           down_thread="false" up_thread="false"
+                           max_bytes="400000"/>
+            <pbcast.GMS print_local_addr="true" join_timeout="3000"
+                        down_thread="false" up_thread="false"
+                        join_retry_timeout="2000" shun="false"
+                        view_bundling="true"/>
+        </config>
+      </attribute>
+
+      <!-- JGroups stack configuration to use for the control channel - used for control messages -->
+
+      <!-- We use udp stack for the control channel -->
+      <attribute name="ControlChannelConfig">
+         <config>
+            <UDP
+                 mcast_addr="${jboss.messaging.controlchanneludpaddress,jboss.partition.udpGroup:228.7.7.7}"
+                 mcast_port="${jboss.messaging.controlchanneludpport:45568}"
+                 tos="8"
+                 ucast_recv_buf_size="20000000"
+                 ucast_send_buf_size="640000"
+                 mcast_recv_buf_size="25000000"
+                 mcast_send_buf_size="640000"
+                 loopback="false"
+                 discard_incompatible_packets="true"
+                 max_bundle_size="64000"
+                 max_bundle_timeout="30"
+                 use_incoming_packet_handler="true"
+                 use_outgoing_packet_handler="false"
+                 ip_ttl="${jboss.messaging.ipttl:8}"
+                 down_thread="false" up_thread="false"
+                 enable_bundling="false"/>
+            <PING timeout="2000"
+                  down_thread="false" up_thread="false" num_initial_members="3"/>
+            <MERGE2 max_interval="100000"
+                    down_thread="false" up_thread="false" min_interval="20000"/>
+            <FD_SOCK down_thread="false" up_thread="false"/>
+            <FD timeout="10000" max_tries="5" down_thread="false" up_thread="false" shun="true"/>
+            <VERIFY_SUSPECT timeout="1500" down_thread="false" up_thread="false"/>
+            <pbcast.NAKACK max_xmit_size="60000"
+                           use_mcast_xmit="false" gc_lag="0"
+                           retransmit_timeout="300,600,1200,2400,4800"
+                           down_thread="false" up_thread="false"
+                           discard_delivered_msgs="true"/>
+            <UNICAST timeout="300,600,1200,2400,3600"
+                     down_thread="false" up_thread="false"/>
+            <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
+                           down_thread="false" up_thread="false"
+                           max_bytes="400000"/>
+            <pbcast.GMS print_local_addr="true" join_timeout="3000" use_flush="true" flush_timeout="3000"
+                        down_thread="false" up_thread="false"
+                        join_retry_timeout="2000" shun="false"
+                        view_bundling="true"/>
+            <FRAG2 frag_size="60000" down_thread="false" up_thread="false"/>
+            <pbcast.STATE_TRANSFER down_thread="false" up_thread="false" use_flush="true" flush_timeout="3000"/>
+            <pbcast.FLUSH down_thread="false" up_thread="false" timeout="20000" auto_flush_conf="false"/>
+        </config>
+     </attribute>
+   </mbean>
+
+   <!-- Messaging JMS User Manager MBean config
+        ======================================= -->
+
+   <mbean code="org.jboss.jms.server.plugin.JDBCJMSUserManagerService"
+      name="jboss.messaging:service=JMSUserManager"
+      xmbean-dd="xmdesc/JMSUserManager-xmbean.xml">
+
+      <depends>jboss.jca:service=DataSourceBinding,name=DefaultDS</depends>
+
+      <depends optional-attribute-name="TransactionManager">jboss:service=TransactionManager</depends>
+
+      <attribute name="DataSource">java:/DefaultDS</attribute>
+
+      <attribute name="CreateTablesOnStartup">true</attribute>
+
+      <attribute name="SqlProperties"><![CDATA[
+CREATE_USER_TABLE=CREATE TABLE JBM_USER (USER_ID VARCHAR2(32) NOT NULL, PASSWD VARCHAR2(32) NOT NULL, CLIENTID VARCHAR2(128), PRIMARY KEY(USER_ID))
+CREATE_ROLE_TABLE=CREATE TABLE JBM_ROLE (ROLE_ID VARCHAR2(32) NOT NULL, USER_ID VARCHAR2(32) NOT NULL, PRIMARY KEY(USER_ID, ROLE_ID))
+SELECT_PRECONF_CLIENTID=SELECT CLIENTID FROM JBM_USER WHERE USER_ID=?
+POPULATE.TABLES.1  = INSERT INTO JBM_USER (USER_ID, PASSWD) VALUES ('guest', 'guest')
+POPULATE.TABLES.2  = INSERT INTO JBM_USER (USER_ID, PASSWD) VALUES ('j2ee', 'j2ee')
+POPULATE.TABLES.3  = INSERT INTO JBM_USER (USER_ID, PASSWD, CLIENTID) VALUES ('john', 'needle', 'DurableSubscriberExample')
+POPULATE.TABLES.4  = INSERT INTO JBM_USER (USER_ID, PASSWD) VALUES ('nobody', 'nobody')
+POPULATE.TABLES.5  = INSERT INTO JBM_USER (USER_ID, PASSWD) VALUES ('dynsub', 'dynsub')
+POPULATE.TABLES.6  = INSERT INTO JBM_ROLE (ROLE_ID, USER_ID) VALUES ('guest','guest')
+POPULATE.TABLES.7  = INSERT INTO JBM_ROLE (ROLE_ID, USER_ID) VALUES ('j2ee','guest')
+POPULATE.TABLES.8  = INSERT INTO JBM_ROLE (ROLE_ID, USER_ID) VALUES ('john','guest')
+POPULATE.TABLES.9  = INSERT INTO JBM_ROLE (ROLE_ID, USER_ID) VALUES ('subscriber','john')
+POPULATE.TABLES.10 = INSERT INTO JBM_ROLE (ROLE_ID, USER_ID) VALUES ('publisher','john')
+POPULATE.TABLES.11 = INSERT INTO JBM_ROLE (ROLE_ID, USER_ID) VALUES ('publisher','dynsub')
+POPULATE.TABLES.12 = INSERT INTO JBM_ROLE (ROLE_ID, USER_ID) VALUES ('durpublisher','john')
+POPULATE.TABLES.13 = INSERT INTO JBM_ROLE (ROLE_ID, USER_ID) VALUES ('durpublisher','dynsub')
+POPULATE.TABLES.14 = INSERT INTO JBM_ROLE (ROLE_ID, USER_ID) VALUES ('noacc','nobody')
+      ]]></attribute>
+   </mbean>
+
+</server>

Added: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/oracle-ds.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/oracle-ds.xml	                        (rev 0)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/oracle-ds.xml	2008-11-18 13:03:52 UTC (rev 81221)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  JBoss Server Configuration                                           -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<!-- ==================================================================== -->
+<!--  Datasource config for Oracle originally from Steven Coy             -->
+<!-- ==================================================================== -->
+
+
+<datasources>
+  <local-tx-datasource>
+    <jndi-name>DefaultDS</jndi-name>
+    <!-- <connection-url>jdbc:oracle:thin:@//localhost:1521/dev.db</connection-url> -->
+    <connection-url>jdbc:oracle:thin:@//dev68.qa.atl2.redhat.com:1521/qadb01.qa</connection-url>
+
+    <driver-class>oracle.jdbc.OracleDriver</driver-class>
+    <user-name>cctestdef</user-name>
+    <password>cc8421</password>
+
+    <!-- Uses the pingDatabase method to check a connection is still valid before handing it out from the pool -->
+    <!--valid-connection-checker-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleValidConnectionChecker</valid-connection-checker-class-name-->
+    <!-- Checks the Oracle error codes and messages for fatal errors -->
+    <exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleExceptionSorter</exception-sorter-class-name>
+
+        <!-- sql to call when connection is created
+        <new-connection-sql>some arbitrary sql</new-connection-sql>
+        -->
+
+        <!-- sql to call on an existing pooled connection when it is obtained from pool - the OracleValidConnectionChecker is prefered
+        <check-valid-connection-sql>some arbitrary sql</check-valid-connection-sql>
+        -->
+
+    <!-- corresponding type-mapping in the standardjbosscmp-jdbc.xml (optional) -->
+    <metadata>
+       <type-mapping>Oracle9i</type-mapping>
+    </metadata>
+  </local-tx-datasource>
+
+</datasources>

Modified: branches/JBPAPP_4_2_0_GA_CP/system/src/bin/security_cc.policy
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/system/src/bin/security_cc.policy	2008-11-18 12:59:56 UTC (rev 81220)
+++ branches/JBPAPP_4_2_0_GA_CP/system/src/bin/security_cc.policy	2008-11-18 13:03:52 UTC (rev 81221)
@@ -589,6 +589,7 @@
    permission java.util.PropertyPermission "oracle.net.tns_admin", "read";
    permission java.util.PropertyPermission "line.separator", "read";
    permission java.util.PropertyPermission "user.name", "read";
+   permission java.util.PropertyPermission "java.version", "read";
 };
 
 //*******************End JBoss EAP Testsuite Permissions*********

Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/build.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/build.xml	2008-11-18 12:59:56 UTC (rev 81220)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/build.xml	2008-11-18 13:03:52 UTC (rev 81221)
@@ -876,6 +876,16 @@
     <!-- delete SNMP adapter, because it is not allowed in CC config --> 
     <delete dir="${jboss.dist}/server/cc/deploy/snmp-adaptor.sar"/>
     
+    <!-- delete HSQL DB which is not allowed in CC config 
+         Alternate configuration at test-configs/cc/deploy contains DefaultDS 
+         file called oracle-ds.xml for default Oracle DB. 
+    --> 
+    <delete file="${jboss.dist}/server/cc/lib/hsqldb.jar"/>
+    <delete file="${jboss.dist}/server/cc/lib/hsqldb-plugin.jar"/>
+    <delete file="${jboss.dist}/server/cc/deploy/hsqldb-ds.xml"/>
+    <delete file="${jboss.dist}/server/cc/deploy/jboss-messaging.sar/clustered-hsqldb-persistence-service.xml"/>
+       
+     
   	<!-- copy alternate part of configuration (cc-none, cc-db, cc-ldap) -->
     <copy todir="${jboss.dist}/server/cc" overwrite="true">
       <fileset dir="${build.resources}/test-configs/${alternate-config}">

Added: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/test-configs/cc/conf/jboss-log4j.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/test-configs/cc/conf/jboss-log4j.xml	                        (rev 0)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/test-configs/cc/conf/jboss-log4j.xml	2008-11-18 13:03:52 UTC (rev 81221)
@@ -0,0 +1,330 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  Log4j Configuration                                                  -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<!-- $Id: jboss-log4j.xml 79553 2008-10-15 20:31:41Z rrajesh $ -->
+
+<!--
+   | For more configuration infromation and examples see the Jakarta Log4j
+   | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+
+   <!-- ================================= -->
+   <!-- Preserve messages in a local file -->
+   <!-- ================================= -->
+
+   <!-- A time/date based rolling appender -->
+   <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
+      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+      <param name="File" value="${jboss.server.log.dir}/server.log"/>
+      <param name="Append" value="false"/>
+
+      <!-- Rollover at midnight each day -->
+      <param name="DatePattern" value="'.'yyyy-MM-dd"/>
+
+      <!-- Rollover at the top of each hour
+      <param name="DatePattern" value="'.'yyyy-MM-dd-HH"/>
+      -->
+
+      <layout class="org.apache.log4j.PatternLayout">
+         <!-- The default pattern: Date Priority [Category] Message\n 
+         <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
+         -->
+         <!-- The full pattern: Date MS Priority [Category] (Thread:NDC) Message\n --> 
+         <param name="ConversionPattern" value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
+	
+      </layout>
+   </appender>
+
+   <!-- A size based file rolling appender
+   <appender name="FILE" class="org.jboss.logging.appender.RollingFileAppender">
+     <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+     <param name="File" value="${jboss.server.log.dir}/server.log"/>
+     <param name="Append" value="false"/>
+     <param name="MaxFileSize" value="500KB"/>
+     <param name="MaxBackupIndex" value="1"/>
+
+     <layout class="org.apache.log4j.PatternLayout">
+       <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
+     </layout>	    
+   </appender>
+   -->
+
+   <!-- ============================== -->
+   <!-- Append messages to the console -->
+   <!-- ============================== -->
+
+   <!--
+   <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+      <param name="Target" value="System.out"/>
+      <param name="Threshold" value="INFO"/>
+
+      <layout class="org.apache.log4j.PatternLayout">
+         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+      </layout>
+   </appender>
+   -->
+  
+   <!-- ====================== -->
+   <!-- More Appender examples -->
+   <!-- ====================== -->
+
+   <!-- Buffer events and log them asynchronously -->
+   <appender name="ASYNC" class="org.apache.log4j.AsyncAppender">
+     <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+     <appender-ref ref="FILE"/>
+     <!--
+     <appender-ref ref="CONSOLE"/>
+     <appender-ref ref="SMTP"/>
+     -->
+   </appender>
+
+   <!-- EMail events to an administrator
+   <appender name="SMTP" class="org.apache.log4j.net.SMTPAppender">
+     <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+     <param name="Threshold" value="ERROR"/>
+     <param name="To" value="admin at myhost.domain.com"/>
+     <param name="From" value="nobody at myhost.domain.com"/>
+     <param name="Subject" value="JBoss Sever Errors"/>
+     <param name="SMTPHost" value="localhost"/>
+     <param name="BufferSize" value="10"/>
+     <layout class="org.apache.log4j.PatternLayout">
+       <param name="ConversionPattern" value="[%d{ABSOLUTE},%c{1}] %m%n"/>
+     </layout>
+   </appender>
+   -->
+
+   <!-- Syslog events
+   <appender name="SYSLOG" class="org.apache.log4j.net.SyslogAppender">
+     <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+     <param name="Facility" value="LOCAL7"/>
+     <param name="FacilityPrinting" value="true"/>
+     <param name="SyslogHost" value="localhost"/>
+     <layout class="org.apache.log4j.PatternLayout">
+       <param name="ConversionPattern" value="[%d{ABSOLUTE},%c{1}] %m%n"/>
+     </layout>
+   </appender>
+   -->
+
+   <!-- Log events to JMS (requires a topic to be created)
+   <appender name="JMS" class="org.apache.log4j.net.JMSAppender">
+     <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+     <param name="Threshold" value="ERROR"/>
+     <param name="TopicConnectionFactoryBindingName" value="java:/ConnectionFactory"/>
+     <param name="TopicBindingName" value="topic/MyErrorsTopic"/>
+   </appender>
+   -->
+
+   <!-- Log events through SNMP
+   <appender name="TRAP_LOG" class="org.apache.log4j.ext.SNMPTrapAppender">
+     <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+     <param name="ImplementationClassName" value="org.apache.log4j.ext.JoeSNMPTrapSender"/>
+     <param name="ManagementHost" value="127.0.0.1"/>
+     <param name="ManagementHostTrapListenPort" value="162"/>
+     <param name="EnterpriseOID" value="1.3.6.1.4.1.24.0"/>
+     <param name="LocalIPAddress" value="127.0.0.1"/>
+     <param name="LocalTrapSendPort" value="161"/>
+     <param name="GenericTrapType" value="6"/>
+     <param name="SpecificTrapType" value="12345678"/>
+     <param name="CommunityString" value="public"/>
+     <param name="ForwardStackTraceWithTrap" value="true"/>
+     <param name="Threshold" value="DEBUG"/>
+     <param name="ApplicationTrapOID" value="1.3.6.1.4.1.24.12.10.22.64"/>
+     <layout class="org.apache.log4j.PatternLayout">
+            <param name="ConversionPattern" value="%d,%p,[%t],[%c],%m%n"/>
+     </layout>
+   </appender>
+   -->
+
+   <!--  Emit events as JMX notifications
+   <appender name="JMX" class="org.jboss.monitor.services.JMXNotificationAppender">
+      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+      
+      <param name="Threshold" value="WARN"/>
+      <param name="ObjectName" value="jboss.system:service=Logging,type=JMXNotificationAppender"/>
+      
+      <layout class="org.apache.log4j.PatternLayout">
+         <param name="ConversionPattern" value="%d %-5p [%c] %m"/>
+      </layout>
+   </appender>
+   -->
+
+   <!-- Clustering logging -->
+   <!-- Uncomment the following to redirect the org.jgroups and
+      org.jboss.ha categories to a cluster.log file. -->
+   <!--
+   <appender name="CLUSTER" class="org.jboss.logging.appender.RollingFileAppender">
+     <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+     <param name="File" value="${jboss.server.log.dir}/cluster.log"/>
+     <param name="Append" value="false"/>
+     <param name="MaxFileSize" value="500KB"/>
+     <param name="MaxBackupIndex" value="1"/>
+
+     <layout class="org.apache.log4j.PatternLayout">
+       <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
+     </layout>
+   </appender>
+   -->
+
+   <!-- ================ -->
+   <!-- Limit categories -->
+   <!-- ================ -->
+
+   <category name="org.jboss.web">
+     <priority value="INFO" />
+   </category>
+
+   <category name="org.jboss.ha">
+     <priority value="INFO" />
+   </category>
+
+   <category name="com.arjuna">
+     <priority value="INFO" />
+   </category>
+
+   <category name="org.hibernate">
+     <priority value="INFO" />
+   </category>
+
+   <!-- Limit JSF logging to DEBUG.  FINER and FINEST will not be logged -->
+   <category name="javax.enterprise.resource.webcontainer">
+     <priority value="INFO" />
+   </category>
+   
+   <!-- Limit org.ajax4jsf to INFO as DEBUG is too verbose -->
+   <category name="org.ajax4jsf">
+     <priority value="INFO" />
+   </category>
+
+   <!-- Enable this to obtain EJB Based Applications Access Log Entries 
+   <category name="org.jboss.ejb.plugins.SecurityInterceptor">
+      <priority value="TRACE"/>
+   </category>
+   -->
+
+   
+   <!-- Limit the org.apache category to INFO as its DEBUG is verbose -->
+   <category name="org.apache">
+   
+      <priority value="WARN"/>
+   </category>
+
+   <!-- Limit the org.jboss.serial (jboss-serialization) to INFO as its DEBUG is verbose -->
+   <category name="org.jboss.serial">
+      <priority value="WARN"/>
+   </category>
+
+   <!-- Limit the org.jgroups category to WARN as its INFO is verbose -->
+   <category name="org.jgroups">
+      <priority value="WARN"/>
+   </category>
+
+   <!-- Limit the jacorb category to WARN as its INFO is verbose -->
+   <category name="jacorb">
+      <priority value="WARN"/>
+   </category>
+
+   <!-- Limit JBoss categories
+   <category name="org.jboss">
+      <priority value="INFO"/>
+   </category>
+   -->
+
+   <!-- Limit the JSR77 categories -->
+   <category name="org.jboss.management">
+      <priority value="WARN"/>
+   </category>
+
+   <!-- Limit seam logging -->
+   <category name="org.jboss.seam">
+      <priority value="WARN"/>
+   </category>
+
+   <!-- Enable JBossWS message tracing
+   <category name="org.jboss.ws.core.MessageTrace">
+    <priority value="TRACE"/>
+   </category>
+   -->
+
+   <!-- Decrease the priority threshold for the org.jboss.varia category
+   <category name="org.jboss.varia">
+     <priority value="DEBUG"/>
+   </category>
+   -->
+
+   <!-- Show the evolution of the DataSource pool in the logs [inUse/Available/Max]
+   <category name="org.jboss.resource.connectionmanager.JBossManagedConnectionPool">
+     <priority value="TRACE"/>
+   </category>
+   -->
+
+   <!--
+      | An example of enabling the custom TRACE level priority that is used
+      | by the JBoss internals to diagnose low level details. This example
+      | turns on TRACE level msgs for the org.jboss.ejb.plugins package and its
+      | subpackages. This will produce A LOT of logging output.
+      |
+      | Note: since jboss AS 4.2.x, the trace level is supported natively by
+      | log4j, so although the custom org.jboss.logging.XLevel priority will
+      | still work, there is no need to use it. The two examples that follow
+      | will both enable trace logging.
+   <category name="org.jboss.system">
+     <priority value="TRACE" class="org.jboss.logging.XLevel"/>
+   </category>
+   <category name="org.jboss.ejb.plugins">
+     <priority value="TRACE"/>
+   </category>
+   -->
+  
+   <!--
+       | Logs these events to SNMP:
+           - server starts/stops
+           - cluster evolution (node death/startup)
+           - When an EJB archive is deployed (and associated verified messages)
+           - When an EAR archive is deployed
+      	 
+   <category name="org.jboss.system.server.Server">
+     <priority value="INFO" />
+     <appender-ref ref="TRAP_LOG"/>
+   </category>
+  
+   <category name="org.jboss.ha.framework.interfaces.HAPartition.lifecycle">
+     <priority value="INFO" />
+     <appender-ref ref="TRAP_LOG"/>
+   </category>
+
+   <category name="org.jboss.deployment.MainDeployer">
+     <priority value="ERROR" />
+     <appender-ref ref="TRAP_LOG"/>
+   </category>
+   
+   <category name="org.jboss.ejb.EJBDeployer">
+     <priority value="INFO" />
+     <appender-ref ref="TRAP_LOG"/>
+   </category>
+   
+   <category name="org.jboss.deployment.EARDeployer">
+     <priority value="INFO" />
+     <appender-ref ref="TRAP_LOG"/>
+   </category>
+  
+   -->
+
+   <!-- ======================= -->
+   <!-- Setup the Root category -->
+   <!-- ======================= -->
+
+   <root>
+      <!-- <appender-ref ref="CONSOLE"/> -->
+      <appender-ref ref="ASYNC"/>
+   </root>
+
+</log4j:configuration>

Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/test-configs/cc/conf/login-config.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/test-configs/cc/conf/login-config.xml	2008-11-18 12:59:56 UTC (rev 81220)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/test-configs/cc/conf/login-config.xml	2008-11-18 13:03:52 UTC (rev 81221)
@@ -43,19 +43,20 @@
     </application-policy>
     -->
 
-    <!-- Security domains for testing new jca framework -->
+    <!-- Security domains for testing new jca framework 
     <application-policy name = "HsqlDbRealm">
        <authentication>
           <login-module code = "org.jboss.resource.security.ConfiguredIdentityLoginModule"
              flag = "required">
              <module-option name = "principal">sa</module-option>
-             <module-option name = "userName">sa</module-option>
-             <module-option name = "password"></module-option>
+             <module-option name = "userName">cctest</module-option>
+             <module-option name = "password">cc1248</module-option>
              <module-option name = "managedConnectionFactoryName">jboss.jca:service=LocalTxCM,name=DefaultDS</module-option>
           </login-module>
        </authentication>
     </application-policy>
-
+    -->
+    
     <application-policy name = "JmsXARealm">
        <authentication>
           <login-module code = "org.jboss.resource.security.ConfiguredIdentityLoginModule"

Added: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/test-configs/cc/deploy/cluster-service.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/test-configs/cc/deploy/cluster-service.xml	                        (rev 0)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/test-configs/cc/deploy/cluster-service.xml	2008-11-18 13:03:52 UTC (rev 81221)
@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  Sample Clustering Service Configuration                              -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<server>
+
+   <!-- ==================================================================== -->
+   <!-- Cluster Partition: defines cluster                                   -->
+   <!-- ==================================================================== -->
+
+   <mbean code="org.jboss.ha.framework.server.ClusterPartition"
+      name="jboss:service=${jboss.partition.name:DefaultPartition}">
+
+      <!-- Name of the partition being built -->
+      <attribute name="PartitionName">${jboss.partition.name:DefaultPartition}</attribute>
+
+      <!-- The address used to determine the node name -->
+      <attribute name="NodeAddress">${jboss.bind.address}</attribute>
+
+      <!-- Determine if deadlock detection is enabled -->
+      <attribute name="DeadlockDetection">False</attribute>
+
+      <!-- Max time (in ms) to wait for state transfer to complete. Increase for large states -->
+      <attribute name="StateTransferTimeout">30000</attribute>
+
+      <!-- The JGroups protocol configuration -->
+      <attribute name="PartitionConfig">
+         <!--
+         The default UDP stack:
+         - If you have a multihomed machine, set the UDP protocol's bind_addr attribute to the
+         appropriate NIC IP address, e.g bind_addr="192.168.0.2".
+         - On Windows machines, because of the media sense feature being broken with multicast
+         (even after disabling media sense) set the UDP protocol's loopback attribute to true
+         -->
+         <Config>
+            <UDP mcast_addr="${jboss.partition.udpGroup:228.1.2.3}" 
+                 mcast_port="${jboss.hapartition.mcast_port:45566}"
+                 tos="8"
+                 ucast_recv_buf_size="20000000"
+                 ucast_send_buf_size="640000"
+                 mcast_recv_buf_size="25000000"
+                 mcast_send_buf_size="640000"
+                 loopback="false"
+                 discard_incompatible_packets="true"
+                 enable_bundling="false"
+                 max_bundle_size="64000"
+                 max_bundle_timeout="30"
+                 use_incoming_packet_handler="true"
+                 use_outgoing_packet_handler="false"
+                 ip_ttl="${jgroups.udp.ip_ttl:2}"
+                 down_thread="false" up_thread="false"/>
+            <PING timeout="2000"
+                  down_thread="false" up_thread="false" num_initial_members="3"/>
+            <MERGE2 max_interval="100000"
+                    down_thread="false" up_thread="false" min_interval="20000"/>
+            <FD_SOCK down_thread="false" up_thread="false"/>
+            <FD timeout="10000" max_tries="5" down_thread="false" up_thread="false" shun="true"/>
+            <VERIFY_SUSPECT timeout="1500" down_thread="false" up_thread="false"/>
+            <pbcast.NAKACK max_xmit_size="60000"
+                    use_mcast_xmit="false" gc_lag="0"
+                    retransmit_timeout="300,600,1200,2400,4800"
+                    down_thread="false" up_thread="false"
+                    discard_delivered_msgs="true"/>
+            <UNICAST timeout="300,600,1200,2400,3600"
+                    down_thread="false" up_thread="false"/>
+            <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
+                    down_thread="false" up_thread="false"
+                    max_bytes="400000"/>
+            <pbcast.GMS print_local_addr="true" join_timeout="3000"
+                    down_thread="false" up_thread="false"
+                    join_retry_timeout="2000" shun="true"
+                    view_bundling="true"/>
+            <FRAG2 frag_size="60000" down_thread="false" up_thread="false"/>
+            <pbcast.STATE_TRANSFER down_thread="false" up_thread="false" use_flush="false"/>
+         </Config>
+
+         <!-- Alternate TCP stack: customize it for your environment, change bind_addr and initial_hosts -->
+         <!--
+         <Config>
+            <TCP bind_addr="thishost" start_port="7800" loopback="true"
+                 tcp_nodelay="true"
+                 recv_buf_size="20000000"
+                 send_buf_size="640000"
+                 discard_incompatible_packets="true"
+                 enable_bundling="false"
+                 max_bundle_size="64000"
+                 max_bundle_timeout="30"
+                 use_incoming_packet_handler="true"
+                 use_outgoing_packet_handler="false"
+                 down_thread="false" up_thread="false"
+                 use_send_queues="false"
+                 sock_conn_timeout="300"
+                 skip_suspected_members="true"/>
+            <TCPPING initial_hosts="thishost[7800],otherhost[7800]" port_range="3"
+                     timeout="3000"
+                     down_thread="false" up_thread="false"
+                     num_initial_members="3"/>
+            <MERGE2 max_interval="100000"
+                    down_thread="false" up_thread="false" min_interval="20000"/>
+            <FD_SOCK down_thread="false" up_thread="false"/>
+            <FD timeout="10000" max_tries="5" down_thread="false" up_thread="false" shun="true"/>
+            <VERIFY_SUSPECT timeout="1500" down_thread="false" up_thread="false"/>
+            <pbcast.NAKACK max_xmit_size="60000"
+                           use_mcast_xmit="false" gc_lag="0"
+                           retransmit_timeout="300,600,1200,2400,4800"
+                           down_thread="false" up_thread="false"
+                           discard_delivered_msgs="true"/>
+            <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
+                           down_thread="false" up_thread="false"
+                           max_bytes="400000"/>
+            <pbcast.GMS print_local_addr="true" join_timeout="3000"
+                        down_thread="false" up_thread="false"
+                        join_retry_timeout="2000" shun="true"
+                        view_bundling="true"/>
+            <pbcast.STATE_TRANSFER down_thread="false" up_thread="false" use_flush="false"/>
+         </Config>
+         -->
+      </attribute>
+      <depends>jboss:service=Naming</depends>
+   </mbean>
+
+   <!-- ==================================================================== -->
+   <!-- HA Session State Service for SFSB                                    -->
+   <!-- ==================================================================== -->
+
+   <mbean code="org.jboss.ha.hasessionstate.server.HASessionStateService"
+      name="jboss:service=HASessionState">
+      <depends>jboss:service=Naming</depends>
+      <!-- We now inject the partition into the HAJNDI service instead
+           of requiring that the partition name be passed -->
+      <depends optional-attribute-name="ClusterPartition"
+         proxy-type="attribute">jboss:service=${jboss.partition.name:DefaultPartition}</depends>
+      <!-- JNDI name under which the service is bound -->
+      <attribute name="JndiName">/HASessionState/Default</attribute>
+      <!-- Max delay before cleaning unreclaimed state.
+           Defaults to 30*60*1000 => 30 minutes -->
+      <attribute name="BeanCleaningDelay">0</attribute>
+   </mbean>
+
+   <!-- ==================================================================== -->
+   <!-- HA JNDI                                                              -->
+   <!-- ==================================================================== -->
+
+
+   <!-- ==================================================================== -->
+   <!-- HA Invokers                                                          -->
+   <!-- ==================================================================== -->
+
+
+   <mbean code="org.jboss.invocation.jrmp.server.JRMPInvokerHA"
+      name="jboss:service=invoker,type=jrmpha">
+      <attribute name="ServerAddress">${jboss.bind.address}</attribute>
+      <attribute name="RMIObjectPort">4447</attribute>
+      <!--
+      <attribute name="RMIClientSocketFactory">custom</attribute>
+      <attribute name="RMIServerSocketFactory">custom</attribute>
+      -->
+      <depends>jboss:service=Naming</depends>
+   </mbean>
+
+
+</server>

Added: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/test-configs/cc/deploy/ejb-deployer.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/test-configs/cc/deploy/ejb-deployer.xml	                        (rev 0)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/test-configs/cc/deploy/ejb-deployer.xml	2008-11-18 13:03:52 UTC (rev 81221)
@@ -0,0 +1,311 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  The JBoss service configuration file for the EJB deployer service.
+  
+  $Id: ejb-deployer.xml 62317 2007-04-13 10:39:22Z dimitris at jboss.org $
+-->
+<server>
+
+  <!-- ==================================================================== -->
+  <!-- J2EE Timer Service                                                   -->
+  <!-- ==================================================================== -->
+
+  <!-- An EJB Timer Service that is Tx aware -->
+  <mbean code="org.jboss.ejb.txtimer.EJBTimerServiceImpl"
+    name="jboss.ejb:service=EJBTimerService">
+    <attribute name="RetryPolicy">jboss.ejb:service=EJBTimerService,retryPolicy=fixedDelay</attribute>
+    <attribute name="PersistencePolicy">jboss.ejb:service=EJBTimerService,persistencePolicy=database</attribute>
+    <attribute name="TimerIdGeneratorClassName">org.jboss.ejb.txtimer.BigIntegerTimerIdGenerator</attribute>
+    <attribute name="TimedObjectInvokerClassName">org.jboss.ejb.txtimer.TimedObjectInvokerImpl</attribute>
+    <depends optional-attribute-name="TransactionManagerFactory" proxy-type="org.jboss.tm.TransactionManagerFactory">
+      jboss:service=TransactionManager
+    </depends>
+  </mbean>
+
+  <!-- A retry policy that uses a fixed interval in milli seconds -->
+  <mbean code="org.jboss.ejb.txtimer.FixedDelayRetryPolicy" name="jboss.ejb:service=EJBTimerService,retryPolicy=fixedDelay">
+    <attribute name="Delay">100</attribute>
+  </mbean>
+
+  <!-- A persistence policy that does not persist the timers
+  <mbean code="org.jboss.ejb.txtimer.NoopPersistencePolicy" name="jboss.ejb:service=EJBTimerService,persistencePolicy=noop"/>
+  -->
+
+  <!--
+    A persistence policy that persists timers to a database.
+    
+    The 2 supported db persistence plugins are:
+      org.jboss.ejb.txtimer.GeneralPurposeDatabasePersistencePlugin
+      org.jboss.ejb.txtimer.OracleDatabasePersistencePlugin
+      
+    The table name defaults to "TIMERS". It can be overriden using the
+    'TimersTable' attribute if the persistence plugin supports it.
+    When overriding the timers table, an optional schema can be specified
+    using the syntax [schema.]table
+  -->
+  <mbean code="org.jboss.ejb.txtimer.DatabasePersistencePolicy" name="jboss.ejb:service=EJBTimerService,persistencePolicy=database">
+    <!-- DataSourceBinding ObjectName -->
+    <depends optional-attribute-name="DataSource">jboss.jca:service=DataSourceBinding,name=DefaultDS</depends>
+    <!-- The plugin that handles database persistence -->
+    <attribute name="DatabasePersistencePlugin">org.jboss.ejb.txtimer.OracleDatabasePersistencePlugin</attribute>
+    <!-- The timers table name -->
+    <attribute name="TimersTable">TIMERS</attribute>
+  </mbean>
+
+  <!-- ==================================================================== -->
+  <!-- EJB Deployer                                                         -->
+  <!-- ==================================================================== -->
+
+  <!-- EJB deployer, remove to disable EJB behavior-->
+  <mbean code="org.jboss.ejb.EJBDeployer" name="jboss.ejb:service=EJBDeployer" xmbean-dd="">
+  
+    <!-- Inline XMBean Descriptor BEGIN -->
+    <xmbean>
+      <description>The EJBDeployer responsible for ejb jar deployment</description>
+      <descriptors>
+        <interceptors>
+          <!-- comment out DynamicInterceptor to disable dynamic addition of interceptors -->
+          <interceptor code="org.jboss.mx.interceptor.DynamicInterceptor"/>
+        </interceptors>
+      </descriptors>
+      <class>org.jboss.ejb.EJBDeployer</class>
+
+      <!-- ServiceMBean attributes -->
+      <attribute access="read-only" getMethod="getName">
+        <description>The class name of the MBean</description>
+        <name>Name</name>
+        <type>java.lang.String</type>
+      </attribute>
+
+      <attribute access="read-only" getMethod="getState">
+        <description>The status of the MBean</description>
+        <name>State</name>
+        <type>int</type>
+      </attribute>
+
+      <attribute access="read-only" getMethod="getStateString">
+        <description>The status of the MBean in text form</description>
+        <name>StateString</name>
+        <type>java.lang.String</type>
+      </attribute>
+
+      <!-- SubDeployerMBean attributes -->
+      <attribute access="read-only" getMethod="getServiceName">
+         <description>The JMX ObjectName of the service that provides the SubDeployer</description>
+         <name>ServiceName</name>
+         <type>javax.management.ObjectName</type>
+      </attribute>
+      
+      <attribute access="read-only" getMethod="getSuffixes">
+         <description>An array of suffixes of interest to this subdeployer</description>
+         <name>Suffixes</name>
+         <type>[Ljava.lang.String;</type>
+      </attribute>
+      
+      <attribute access="read-only" getMethod="getRelativeOrder">
+         <description>The relative order of the specified suffixes</description>
+         <name>RelativeOrder</name>
+         <type>int</type>
+      </attribute>
+
+      <!-- SubDeployerExtMBean attribute -->
+      <attribute access="read-write" getMethod="getEnhancedSuffixes" setMethod="setEnhancedSuffixes">
+         <description>Allow the override of supported suffixes and relative order</description>
+         <name>EnhancedSuffixes</name>
+         <type>[Ljava.lang.String;</type>
+      </attribute>
+      
+      <!-- EJBDeployerMBean attributes -->
+      <attribute access="read-write" getMethod="getWebServiceName" setMethod="setWebServiceName">
+        <description>The dynamic class loading simple web server</description>
+        <name>WebServiceName</name>
+        <type>javax.management.ObjectName</type>
+      </attribute>
+
+      <attribute access="read-write" getMethod="getVerifyDeployments" setMethod="setVerifyDeployments">
+        <description>Control the bean verifier (on/off)</description>
+        <name>VerifyDeployments</name>
+        <type>boolean</type>
+      </attribute>
+
+      <attribute access="read-write" getMethod="getVerifierVerbose" setMethod="setVerifierVerbose">
+        <description>Control the verbose mode of the bean verifier</description>
+        <name>VerifierVerbose</name>
+        <type>boolean</type>
+      </attribute>
+
+      <attribute access="read-write" getMethod="getStrictVerifier" setMethod="setStrictVerifier">
+        <description>Control the strictness of the bean verifier</description>
+        <name>StrictVerifier</name>
+        <type>boolean</type>
+      </attribute>
+
+      <attribute access="read-write" getMethod="isCallByValue" setMethod="setCallByValue">
+        <description>Enable/disable call-by-value semantics</description>
+        <name>CallByValue</name>
+        <type>boolean</type>
+      </attribute>
+
+      <attribute access="read-write" getMethod="getValidateDTDs" setMethod="setValidateDTDs">
+        <description>Enable/disable the validation of deployment descriptors</description>
+        <name>ValidateDTDs</name>
+        <type>boolean</type>
+      </attribute>
+
+      <attribute access="read-write" getMethod="isMetricsEnabled" setMethod="setMetricsEnabled">
+        <description>Enable/disable the metrics interceptor for containers</description>
+        <name>MetricsEnabled</name>
+        <type>boolean</type>
+      </attribute>
+
+      <attribute access="read-write" getMethod="getTransactionManagerServiceName" setMethod="setTransactionManagerServiceName">
+        <description>The transaction manager service to use</description>
+        <name>TransactionManagerServiceName</name>
+        <type>javax.management.ObjectName</type>
+      </attribute>
+
+      <!-- EJBDeployerMBean operations -->
+      <operation>
+        <description>List the deployed applications</description>
+        <name>listDeployedApplications</name>
+        <return-type>java.util.Iterator</return-type>
+      </operation>
+
+      <!-- ServiceMBean operations -->
+      <operation>
+        <description>Standard MBean lifecycle method</description>
+        <name>create</name>
+      </operation>
+
+      <operation>
+        <description>The start lifecycle operation</description>
+        <name>start</name>
+      </operation>
+
+      <operation>
+        <description>The stop lifecycle operation</description>
+        <name>stop</name>
+      </operation>
+
+      <operation>
+        <description>The destroy lifecycle operation</description>
+        <name>destroy</name>
+      </operation>
+
+      <operation>
+        <description>The detyped lifecycle operation (for internal use only)</description>
+        <name>jbossInternalLifecycle</name>
+        <parameter>
+          <description>The lifecycle operation</description>
+          <name>method</name>
+          <type>java.lang.String</type>
+        </parameter>
+        <return-type>void</return-type>
+      </operation>
+
+      <!-- SubDeployerMBean operations -->
+      <operation>
+        <description>Accept a module for deployment</description>
+        <name>accepts</name>
+        <parameter>
+          <name>info</name>
+          <type>org.jboss.deployment.DeploymentInfo</type>
+        </parameter>
+        <return-type>boolean</return-type>
+      </operation>
+
+      <operation>
+        <description>Initialize deployment step</description>
+        <name>init</name>
+        <parameter>
+          <name>info</name>
+          <type>org.jboss.deployment.DeploymentInfo</type>
+        </parameter>
+      </operation>
+
+      <operation>
+        <description>Create deployment step</description>
+        <name>create</name>
+        <parameter>
+          <name>info</name>
+          <type>org.jboss.deployment.DeploymentInfo</type>
+        </parameter>
+      </operation>
+
+      <operation>
+        <description>Start deployment step</description>
+        <name>start</name>
+        <parameter>
+          <name>info</name>
+          <type>org.jboss.deployment.DeploymentInfo</type>
+        </parameter>
+      </operation>
+
+      <operation>
+        <description>Stop deployment step</description>
+        <name>stop</name>
+        <parameter>
+          <name>info</name>
+          <type>org.jboss.deployment.DeploymentInfo</type>
+        </parameter>
+      </operation>
+
+      <operation>
+        <description>Destroy deployment step</description>
+        <name>destroy</name>
+        <parameter>
+          <name>info</name>
+          <type>org.jboss.deployment.DeploymentInfo</type>
+        </parameter>
+      </operation>
+
+      <!-- Interceptable operations -->
+      <operation>
+        <description>Add dynamically an operation interceptor</description>
+        <name>addOperationInterceptor</name>
+        <parameter>
+          <description>The Interceptor</description>
+          <name>interceptor</name>
+          <type>org.jboss.mx.interceptor.Interceptor</type>
+        </parameter>
+      </operation>
+
+      <operation>
+        <description>Remove dynamically an operation interceptor</description>
+        <name>removeOperationInterceptor</name>
+        <parameter>
+          <description>The Interceptor</description>
+          <name>interceptor</name>
+          <type>org.jboss.mx.interceptor.Interceptor</type>
+        </parameter>
+      </operation>      
+    </xmbean>
+    <!-- Inline XMBean Descriptor END -->
+      
+    <!-- A flag indicating if the deployer should validate the
+    ejb-jar.xml/jboss.xml descriptors and components
+    -->
+    <attribute name="VerifyDeployments">true</attribute>
+    <!-- A flag indicating if the xml parser should validate the descriptor
+    DTDs
+    -->
+    <attribute name="ValidateDTDs">false</attribute>
+    <!-- A flag indicating if the verifier should be verbose about its
+    operation
+    -->
+    <attribute name="VerifierVerbose">true</attribute>
+    <!-- Setting this to 'true' will cause all deployments
+     to fail when the Verifier detected a problem with the contained
+     Beans. If false, warnings/errors will be logged but the deployment
+     will not fail.
+    -->
+    <attribute name="StrictVerifier">true</attribute>
+
+    <!-- The EJBDeployer needs the JTA transaction manager service -->
+    <depends optional-attribute-name="TransactionManagerServiceName">jboss:service=TransactionManager</depends>
+    <!-- The dynamic class loading simple web server -->
+    <depends optional-attribute-name="WebServiceName">jboss:service=WebService</depends>
+    
+  </mbean>
+
+</server>

Added: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/test-configs/cc/deploy/hajndi-jms-ds.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/test-configs/cc/deploy/hajndi-jms-ds.xml	                        (rev 0)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/test-configs/cc/deploy/hajndi-jms-ds.xml	2008-11-18 13:03:52 UTC (rev 81221)
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<connection-factories>
+ 
+  <!-- ==================================================================== -->
+  <!-- JMS Stuff                                                            -->
+  <!-- ==================================================================== -->
+
+  <!-- The JMS provider loader -->
+  <mbean code="org.jboss.jms.jndi.JMSProviderLoader"
+	 name="jboss.jms:service=JMSProviderLoader,name=JMSProvider">
+    <attribute name="ProviderName">DefaultJMSProvider</attribute>
+    <attribute name="ProviderAdapterClass">
+      org.jboss.jms.jndi.JNDIProviderAdapter
+    </attribute>
+    <!-- The combined connection factory -->
+    <attribute name="FactoryRef">java:/XAConnectionFactory</attribute>
+    <!-- The queue connection factory -->
+    <attribute name="QueueFactoryRef">java:/XAConnectionFactory</attribute>
+    <!-- The topic factory -->
+    <attribute name="TopicFactoryRef">java:/XAConnectionFactory</attribute>
+    <!-- Uncomment to use HAJNDI to access JMS
+    <attribute name="Properties">
+       java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+       java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
+       java.naming.provider.url=localhost:1100
+    </attribute>
+    -->
+  </mbean>
+
+  <!-- The server session pool for Message Driven Beans -->
+  <mbean code="org.jboss.jms.asf.ServerSessionPoolLoader"
+	 name="jboss.jms:service=ServerSessionPoolMBean,name=StdJMSPool">
+    <depends optional-attribute-name="XidFactory">jboss:service=XidFactory</depends>
+    <attribute name="PoolName">StdJMSPool</attribute>
+    <attribute name="PoolFactoryClass">
+      org.jboss.jms.asf.StdServerSessionPoolFactory
+    </attribute>
+  </mbean>
+
+  <!-- JMS XA Resource adapter, use this to get transacted JMS in beans -->
+  <tx-connection-factory>
+    <jndi-name>JmsXA</jndi-name>
+    <xa-transaction/>
+    <rar-name>jms-ra.rar</rar-name>
+    <connection-definition>org.jboss.resource.adapter.jms.JmsConnectionFactory</connection-definition>
+    <config-property name="SessionDefaultType" type="java.lang.String">javax.jms.Topic</config-property>
+    <config-property name="JmsProviderAdapterJNDI" type="java.lang.String">java:/DefaultJMSProvider</config-property>
+    <security-domain-and-application>JmsXARealm</security-domain-and-application>
+    <max-pool-size>20</max-pool-size>
+  </tx-connection-factory>
+
+</connection-factories>

Added: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/test-configs/cc/deploy/jboss-messaging.sar/oracle-persistence-service.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/test-configs/cc/deploy/jboss-messaging.sar/oracle-persistence-service.xml	                        (rev 0)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/test-configs/cc/deploy/jboss-messaging.sar/oracle-persistence-service.xml	2008-11-18 13:03:52 UTC (rev 81221)
@@ -0,0 +1,284 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+     Oracle persistence deployment descriptor.
+
+     Tested with Oracle 10.2.0.1
+
+     $Id$
+ -->
+
+<server>
+
+   <!-- Persistence Manager MBean configuration
+       ======================================== -->
+
+   <mbean code="org.jboss.messaging.core.jmx.JDBCPersistenceManagerService"
+      name="jboss.messaging:service=PersistenceManager"
+      xmbean-dd="xmdesc/JDBCPersistenceManager-xmbean.xml">
+
+      <depends>jboss.jca:service=DataSourceBinding,name=DefaultDS</depends>
+
+      <depends optional-attribute-name="TransactionManager">jboss:service=TransactionManager</depends>
+
+      <!-- The datasource to use for the persistence manager -->
+
+      <attribute name="DataSource">java:/DefaultDS</attribute>
+
+      <!-- If true will attempt to create tables and indexes on every start-up -->
+
+      <attribute name="CreateTablesOnStartup">true</attribute>
+
+      <!-- If true then we will automatically detect and reject duplicate messages sent during failover -->
+
+      <attribute name="DetectDuplicates">true</attribute>
+
+      <!-- The size of the id cache to use when detecting duplicate messages -->
+
+      <attribute name="IDCacheSize">500</attribute>
+
+      <!-- Some databases don't support inserting blobs using INSERT INTO ... SELECT FROM -->
+
+      <attribute name="SupportsBlobOnSelect">false</attribute>
+
+      <attribute name="SqlProperties"><![CDATA[
+   CREATE_DUAL=CREATE TABLE JBM_DUAL (DUMMY INTEGER, PRIMARY KEY (DUMMY))
+   CREATE_MESSAGE_REFERENCE=CREATE TABLE JBM_MSG_REF (MESSAGE_ID INTEGER, CHANNEL_ID INTEGER, TRANSACTION_ID INTEGER, STATE CHAR(1), ORD INTEGER, PAGE_ORD INTEGER, DELIVERY_COUNT INTEGER, SCHED_DELIVERY INTEGER, PRIMARY KEY(MESSAGE_ID, CHANNEL_ID))
+   CREATE_IDX_MESSAGE_REF_TX=CREATE INDEX JBM_MSG_REF_TX ON JBM_MSG_REF (TRANSACTION_ID, STATE)
+   CREATE_MESSAGE=CREATE TABLE JBM_MSG (MESSAGE_ID INTEGER, RELIABLE CHAR(1), EXPIRATION INTEGER, TIMESTAMP INTEGER, PRIORITY INTEGER, TYPE INTEGER, HEADERS BLOB, PAYLOAD BLOB, PRIMARY KEY (MESSAGE_ID))
+   CREATE_TRANSACTION=CREATE TABLE JBM_TX (NODE_ID INTEGER, TRANSACTION_ID INTEGER, BRANCH_QUAL RAW(254), FORMAT_ID INTEGER, GLOBAL_TXID RAW(254), PRIMARY KEY (TRANSACTION_ID))
+   CREATE_COUNTER=CREATE TABLE JBM_COUNTER (NAME VARCHAR2(255), NEXT_ID INTEGER, PRIMARY KEY(NAME))
+   CREATE_ID_CACHE=CREATE TABLE JBM_ID_CACHE (NODE_ID INTEGER, CNTR INTEGER, JBM_ID VARCHAR2(255), PRIMARY KEY(NODE_ID, CNTR))
+   INSERT_DUAL=INSERT INTO JBM_DUAL VALUES (1)
+   CHECK_DUAL=SELECT 1 FROM JBM_DUAL
+   INSERT_MESSAGE_REF=INSERT INTO JBM_MSG_REF (CHANNEL_ID, MESSAGE_ID, TRANSACTION_ID, STATE, ORD, PAGE_ORD, DELIVERY_COUNT, SCHED_DELIVERY) VALUES (?, ?, ?, ?, ?, ?, ?, ?)
+   DELETE_MESSAGE_REF=DELETE FROM JBM_MSG_REF WHERE MESSAGE_ID=? AND CHANNEL_ID=? AND STATE='C'
+   UPDATE_MESSAGE_REF=UPDATE JBM_MSG_REF SET TRANSACTION_ID=?, STATE='-' WHERE MESSAGE_ID=? AND CHANNEL_ID=? AND STATE='C'
+   UPDATE_PAGE_ORDER=UPDATE JBM_MSG_REF SET PAGE_ORD = ? WHERE MESSAGE_ID=? AND CHANNEL_ID=?
+   COMMIT_MESSAGE_REF1=UPDATE JBM_MSG_REF SET STATE='C', TRANSACTION_ID = NULL WHERE TRANSACTION_ID=? AND STATE='+'
+   COMMIT_MESSAGE_REF2=DELETE FROM JBM_MSG_REF WHERE TRANSACTION_ID=? AND STATE='-'
+   ROLLBACK_MESSAGE_REF1=DELETE FROM JBM_MSG_REF WHERE TRANSACTION_ID=? AND STATE='+'
+   ROLLBACK_MESSAGE_REF2=UPDATE JBM_MSG_REF SET STATE='C', TRANSACTION_ID = NULL WHERE TRANSACTION_ID=? AND STATE='-'
+   LOAD_PAGED_REFS=SELECT MESSAGE_ID, DELIVERY_COUNT, PAGE_ORD, SCHED_DELIVERY FROM JBM_MSG_REF WHERE CHANNEL_ID = ? AND PAGE_ORD BETWEEN ? AND ? ORDER BY PAGE_ORD
+   LOAD_UNPAGED_REFS=SELECT MESSAGE_ID, DELIVERY_COUNT, SCHED_DELIVERY FROM JBM_MSG_REF WHERE STATE = 'C' AND CHANNEL_ID = ? AND PAGE_ORD IS NULL ORDER BY ORD
+   LOAD_REFS=SELECT MESSAGE_ID, DELIVERY_COUNT, SCHED_DELIVERY FROM JBM_MSG_REF WHERE STATE = 'C' AND CHANNEL_ID = ? ORDER BY ORD
+   UPDATE_REFS_NOT_PAGED=UPDATE JBM_MSG_REF SET PAGE_ORD = NULL WHERE PAGE_ORD BETWEEN ? AND ? AND CHANNEL_ID=?
+   SELECT_MIN_MAX_PAGE_ORD=SELECT MIN(PAGE_ORD), MAX(PAGE_ORD) FROM JBM_MSG_REF WHERE CHANNEL_ID = ?
+   UPDATE_DELIVERY_COUNT=UPDATE JBM_MSG_REF SET DELIVERY_COUNT = ? WHERE MESSAGE_ID = ? AND CHANNEL_ID = ?
+   UPDATE_CHANNEL_ID=UPDATE JBM_MSG_REF SET CHANNEL_ID = ? WHERE CHANNEL_ID = ?
+   MOVE_REFERENCE=UPDATE JBM_MSG_REF SET CHANNEL_ID = ? WHERE MESSAGE_ID = ? AND CHANNEL_ID = ?
+   LOAD_MESSAGES=SELECT MESSAGE_ID, RELIABLE, EXPIRATION, TIMESTAMP, PRIORITY, HEADERS, PAYLOAD, TYPE FROM JBM_MSG
+   INSERT_MESSAGE=INSERT INTO JBM_MSG (MESSAGE_ID, RELIABLE, EXPIRATION, TIMESTAMP, PRIORITY, TYPE, HEADERS, PAYLOAD) VALUES (?, ?, ?, ?, ?, ?, ?, ?)
+   INSERT_MESSAGE_CONDITIONAL=INSERT INTO JBM_MSG (MESSAGE_ID, RELIABLE, EXPIRATION, TIMESTAMP, PRIORITY, TYPE) SELECT ?, ?, ?, ?, ?, ? FROM JBM_DUAL WHERE NOT EXISTS (SELECT MESSAGE_ID FROM JBM_MSG WHERE MESSAGE_ID = ?)
+   UPDATE_MESSAGE_4CONDITIONAL=UPDATE JBM_MSG SET HEADERS=?, PAYLOAD=? WHERE MESSAGE_ID=?
+   INSERT_MESSAGE_CONDITIONAL_FULL=INSERT INTO JBM_MSG (MESSAGE_ID, RELIABLE, EXPIRATION, TIMESTAMP, PRIORITY, TYPE, HEADERS, PAYLOAD) SELECT ?, ?, ?, ?, ?, ?, ?, ? FROM JBM_DUAL WHERE NOT EXISTS (SELECT MESSAGE_ID FROM JBM_MSG WHERE MESSAGE_ID = ?)
+   MESSAGE_ID_COLUMN=MESSAGE_ID
+   DELETE_MESSAGE=DELETE FROM JBM_MSG WHERE MESSAGE_ID = ? AND NOT EXISTS (SELECT JBM_MSG_REF.MESSAGE_ID FROM JBM_MSG_REF WHERE JBM_MSG_REF.MESSAGE_ID = ?)
+   INSERT_TRANSACTION=INSERT INTO JBM_TX (NODE_ID, TRANSACTION_ID, BRANCH_QUAL, FORMAT_ID, GLOBAL_TXID) VALUES(?, ?, ?, ?, ?)
+   DELETE_TRANSACTION=DELETE FROM JBM_TX WHERE NODE_ID = ? AND TRANSACTION_ID = ?
+   SELECT_PREPARED_TRANSACTIONS=SELECT TRANSACTION_ID, BRANCH_QUAL, FORMAT_ID, GLOBAL_TXID FROM JBM_TX WHERE NODE_ID = ?
+   SELECT_MESSAGE_ID_FOR_REF=SELECT MESSAGE_ID, CHANNEL_ID FROM JBM_MSG_REF WHERE TRANSACTION_ID = ? AND STATE = '+' ORDER BY ORD
+   SELECT_MESSAGE_ID_FOR_ACK=SELECT MESSAGE_ID, CHANNEL_ID FROM JBM_MSG_REF WHERE TRANSACTION_ID = ? AND STATE = '-' ORDER BY ORD
+   UPDATE_COUNTER=UPDATE JBM_COUNTER SET NEXT_ID = ? WHERE NAME=?
+   SELECT_COUNTER=SELECT NEXT_ID FROM JBM_COUNTER WHERE NAME=? FOR UPDATE
+   INSERT_COUNTER=INSERT INTO JBM_COUNTER (NAME, NEXT_ID) VALUES (?, ?)
+   SELECT_ALL_CHANNELS=SELECT DISTINCT(CHANNEL_ID) FROM JBM_MSG_REF
+   UPDATE_TX=UPDATE JBM_TX SET NODE_ID=? WHERE NODE_ID=?
+   UPDATE_ID_IN_CACHE=UPDATE JBM_ID_CACHE SET JBM_ID = ? WHERE NODE_ID = ? AND CNTR = ?
+   INSERT_ID_IN_CACHE=INSERT INTO JBM_ID_CACHE (NODE_ID, CNTR, JBM_ID) VALUES (?, ?, ?)
+   LOAD_ID_CACHE=SELECT CNTR, JBM_ID FROM JBM_ID_CACHE WHERE NODE_ID = ?
+      ]]></attribute>
+
+      <!-- The maximum number of parameters to include in a prepared statement -->
+
+      <attribute name="MaxParams">500</attribute>
+
+   </mbean>
+
+   <!-- Messaging Post Office MBean configuration
+        ========================================= -->
+
+   <mbean code="org.jboss.messaging.core.jmx.MessagingPostOfficeService"
+      name="jboss.messaging:service=PostOffice"
+      xmbean-dd="xmdesc/MessagingPostOffice-xmbean.xml">
+
+      <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+
+      <depends>jboss.jca:service=DataSourceBinding,name=DefaultDS</depends>
+
+      <depends optional-attribute-name="TransactionManager">jboss:service=TransactionManager</depends>
+
+      <!-- The name of the post office -->
+
+      <attribute name="PostOfficeName">JMS post office</attribute>
+
+      <!-- The datasource used by the post office to access it's binding information -->
+
+      <attribute name="DataSource">java:/DefaultDS</attribute>
+
+      <!-- If true will attempt to create tables and indexes on every start-up -->
+
+      <attribute name="CreateTablesOnStartup">true</attribute>
+
+      <attribute name="SqlProperties"><![CDATA[
+CREATE_POSTOFFICE_TABLE=CREATE TABLE JBM_POSTOFFICE (POSTOFFICE_NAME VARCHAR2(255), NODE_ID INTEGER, QUEUE_NAME VARCHAR2(255), COND VARCHAR2(1023), SELECTOR VARCHAR2(1023), CHANNEL_ID INTEGER, CLUSTERED CHAR(1), ALL_NODES CHAR(1), PRIMARY KEY(POSTOFFICE_NAME, NODE_ID, QUEUE_NAME))
+INSERT_BINDING=INSERT INTO JBM_POSTOFFICE (POSTOFFICE_NAME, NODE_ID, QUEUE_NAME, COND, SELECTOR, CHANNEL_ID, CLUSTERED, ALL_NODES) VALUES (?, ?, ?, ?, ?, ?, ?, ?)
+DELETE_BINDING=DELETE FROM JBM_POSTOFFICE WHERE POSTOFFICE_NAME=? AND NODE_ID=? AND QUEUE_NAME=?
+LOAD_BINDINGS=SELECT QUEUE_NAME, COND, SELECTOR, CHANNEL_ID, CLUSTERED, ALL_NODES FROM JBM_POSTOFFICE WHERE POSTOFFICE_NAME=? AND NODE_ID=?
+      ]]></attribute>
+
+      <!-- This post office is non clustered. If you want a clustered post office then set to true -->
+      
+      <attribute name="Clustered">false</attribute>
+
+      <!-- All the remaining properties only have to be specified if the post office is clustered.
+           You can safely comment them out if your post office is non clustered -->
+
+      <!-- The JGroups group name that the post office will use -->
+
+      <attribute name="GroupName">${jboss.messaging.groupname:MessagingPostOffice}</attribute>
+
+      <!-- Max time to wait for state to arrive when the post office joins the cluster -->
+
+      <attribute name="StateTimeout">30000</attribute>
+
+      <!-- Max time to wait for a synchronous call to node members using the MessageDispatcher -->
+
+      <attribute name="CastTimeout">30000</attribute>
+      
+      <!-- Set this to true if you want failover of connections to occur when a node is shut down -->
+      
+      <attribute name="FailoverOnNodeLeave">false</attribute>
+      
+      <!-- JGroups stack configuration for the data channel - used for sending data across the cluster -->
+
+      <!-- By default we use the TCP stack for data -->
+      <attribute name="DataChannelConfig">
+         <config>
+            <TCP start_port="7900"
+                 loopback="true"
+                 recv_buf_size="20000000"
+                 send_buf_size="640000"
+                 discard_incompatible_packets="true"
+                 max_bundle_size="64000"
+                 max_bundle_timeout="30"
+                 use_incoming_packet_handler="true"
+                 use_outgoing_packet_handler="false"
+                 down_thread="false" up_thread="false"
+                 enable_bundling="false"
+                 use_send_queues="false"
+                 sock_conn_timeout="300"
+                 skip_suspected_members="true"/>
+            <MPING timeout="4000"
+		         mcast_addr="${jboss.messaging.datachanneludpaddress,jboss.partition.udpGroup:228.6.6.6}"
+		         mcast_port="${jboss.messaging.datachanneludpport:45567}"
+		         ip_ttl="${jboss.messaging.ipttl:8}"
+		         num_initial_members="2"
+		         num_ping_requests="1"/>
+            <MERGE2 max_interval="100000"
+                    down_thread="false" up_thread="false" min_interval="20000"/>
+            <FD timeout="10000" max_tries="5" down_thread="false" up_thread="false" shun="true"/>
+            <FD_SOCK down_thread="false" up_thread="false"/>
+            <VERIFY_SUSPECT timeout="1500" down_thread="false" up_thread="false"/>
+            <pbcast.NAKACK max_xmit_size="60000"
+                           use_mcast_xmit="false" gc_lag="0"
+                           retransmit_timeout="300,600,1200,2400,4800"
+                           down_thread="false" up_thread="false"
+                           discard_delivered_msgs="true"/>
+            <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
+                           down_thread="false" up_thread="false"
+                           max_bytes="400000"/>
+            <pbcast.GMS print_local_addr="true" join_timeout="3000"
+                        down_thread="false" up_thread="false"
+                        join_retry_timeout="2000" shun="false"
+                        view_bundling="true"/>
+        </config>
+      </attribute>
+
+      <!-- JGroups stack configuration to use for the control channel - used for control messages -->
+
+      <!-- We use udp stack for the control channel -->
+      <attribute name="ControlChannelConfig">
+         <config>
+            <UDP
+                 mcast_addr="${jboss.messaging.controlchanneludpaddress,jboss.partition.udpGroup:228.7.7.7}"
+                 mcast_port="${jboss.messaging.controlchanneludpport:45568}"
+                 tos="8"
+                 ucast_recv_buf_size="20000000"
+                 ucast_send_buf_size="640000"
+                 mcast_recv_buf_size="25000000"
+                 mcast_send_buf_size="640000"
+                 loopback="false"
+                 discard_incompatible_packets="true"
+                 max_bundle_size="64000"
+                 max_bundle_timeout="30"
+                 use_incoming_packet_handler="true"
+                 use_outgoing_packet_handler="false"
+                 ip_ttl="${jboss.messaging.ipttl:8}"
+                 down_thread="false" up_thread="false"
+                 enable_bundling="false"/>
+            <PING timeout="2000"
+                  down_thread="false" up_thread="false" num_initial_members="3"/>
+            <MERGE2 max_interval="100000"
+                    down_thread="false" up_thread="false" min_interval="20000"/>
+            <FD_SOCK down_thread="false" up_thread="false"/>
+            <FD timeout="10000" max_tries="5" down_thread="false" up_thread="false" shun="true"/>
+            <VERIFY_SUSPECT timeout="1500" down_thread="false" up_thread="false"/>
+            <pbcast.NAKACK max_xmit_size="60000"
+                           use_mcast_xmit="false" gc_lag="0"
+                           retransmit_timeout="300,600,1200,2400,4800"
+                           down_thread="false" up_thread="false"
+                           discard_delivered_msgs="true"/>
+            <UNICAST timeout="300,600,1200,2400,3600"
+                     down_thread="false" up_thread="false"/>
+            <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
+                           down_thread="false" up_thread="false"
+                           max_bytes="400000"/>
+            <pbcast.GMS print_local_addr="true" join_timeout="3000" use_flush="true" flush_timeout="3000"
+                        down_thread="false" up_thread="false"
+                        join_retry_timeout="2000" shun="false"
+                        view_bundling="true"/>
+            <FRAG2 frag_size="60000" down_thread="false" up_thread="false"/>
+            <pbcast.STATE_TRANSFER down_thread="false" up_thread="false" use_flush="true" flush_timeout="3000"/>
+            <pbcast.FLUSH down_thread="false" up_thread="false" timeout="20000" auto_flush_conf="false"/>
+        </config>
+     </attribute>
+   </mbean>
+
+   <!-- Messaging JMS User Manager MBean config
+        ======================================= -->
+
+   <mbean code="org.jboss.jms.server.plugin.JDBCJMSUserManagerService"
+      name="jboss.messaging:service=JMSUserManager"
+      xmbean-dd="xmdesc/JMSUserManager-xmbean.xml">
+
+      <depends>jboss.jca:service=DataSourceBinding,name=DefaultDS</depends>
+
+      <depends optional-attribute-name="TransactionManager">jboss:service=TransactionManager</depends>
+
+      <attribute name="DataSource">java:/DefaultDS</attribute>
+
+      <attribute name="CreateTablesOnStartup">true</attribute>
+
+      <attribute name="SqlProperties"><![CDATA[
+CREATE_USER_TABLE=CREATE TABLE JBM_USER (USER_ID VARCHAR2(32) NOT NULL, PASSWD VARCHAR2(32) NOT NULL, CLIENTID VARCHAR2(128), PRIMARY KEY(USER_ID))
+CREATE_ROLE_TABLE=CREATE TABLE JBM_ROLE (ROLE_ID VARCHAR2(32) NOT NULL, USER_ID VARCHAR2(32) NOT NULL, PRIMARY KEY(USER_ID, ROLE_ID))
+SELECT_PRECONF_CLIENTID=SELECT CLIENTID FROM JBM_USER WHERE USER_ID=?
+POPULATE.TABLES.1  = INSERT INTO JBM_USER (USER_ID, PASSWD) VALUES ('guest', 'guest')
+POPULATE.TABLES.2  = INSERT INTO JBM_USER (USER_ID, PASSWD) VALUES ('j2ee', 'j2ee')
+POPULATE.TABLES.3  = INSERT INTO JBM_USER (USER_ID, PASSWD, CLIENTID) VALUES ('john', 'needle', 'DurableSubscriberExample')
+POPULATE.TABLES.4  = INSERT INTO JBM_USER (USER_ID, PASSWD) VALUES ('nobody', 'nobody')
+POPULATE.TABLES.5  = INSERT INTO JBM_USER (USER_ID, PASSWD) VALUES ('dynsub', 'dynsub')
+POPULATE.TABLES.6  = INSERT INTO JBM_ROLE (ROLE_ID, USER_ID) VALUES ('guest','guest')
+POPULATE.TABLES.7  = INSERT INTO JBM_ROLE (ROLE_ID, USER_ID) VALUES ('j2ee','guest')
+POPULATE.TABLES.8  = INSERT INTO JBM_ROLE (ROLE_ID, USER_ID) VALUES ('john','guest')
+POPULATE.TABLES.9  = INSERT INTO JBM_ROLE (ROLE_ID, USER_ID) VALUES ('subscriber','john')
+POPULATE.TABLES.10 = INSERT INTO JBM_ROLE (ROLE_ID, USER_ID) VALUES ('publisher','john')
+POPULATE.TABLES.11 = INSERT INTO JBM_ROLE (ROLE_ID, USER_ID) VALUES ('publisher','dynsub')
+POPULATE.TABLES.12 = INSERT INTO JBM_ROLE (ROLE_ID, USER_ID) VALUES ('durpublisher','john')
+POPULATE.TABLES.13 = INSERT INTO JBM_ROLE (ROLE_ID, USER_ID) VALUES ('durpublisher','dynsub')
+POPULATE.TABLES.14 = INSERT INTO JBM_ROLE (ROLE_ID, USER_ID) VALUES ('noacc','nobody')
+      ]]></attribute>
+   </mbean>
+
+</server>

Added: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/test-configs/cc/deploy/oracle-ds.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/test-configs/cc/deploy/oracle-ds.xml	                        (rev 0)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/test-configs/cc/deploy/oracle-ds.xml	2008-11-18 13:03:52 UTC (rev 81221)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  JBoss Server Configuration                                           -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<!-- ==================================================================== -->
+<!--  Datasource config for Oracle originally from Steven Coy             -->
+<!-- ==================================================================== -->
+
+
+<datasources>
+  <local-tx-datasource>
+    <jndi-name>DefaultDS</jndi-name>
+    <!-- <connection-url>jdbc:oracle:thin:@//localhost:1521/dev.db</connection-url> -->
+    <connection-url>jdbc:oracle:thin:@//dev68.qa.atl2.redhat.com:1521/qadb01.qa</connection-url>
+
+    <driver-class>oracle.jdbc.OracleDriver</driver-class>
+    <user-name>cctestdef</user-name>
+    <password>cc8421</password>
+
+    <!-- Uses the pingDatabase method to check a connection is still valid before handing it out from the pool -->
+    <!--valid-connection-checker-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleValidConnectionChecker</valid-connection-checker-class-name-->
+    <!-- Checks the Oracle error codes and messages for fatal errors -->
+    <exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleExceptionSorter</exception-sorter-class-name>
+
+        <!-- sql to call when connection is created
+        <new-connection-sql>some arbitrary sql</new-connection-sql>
+        -->
+
+        <!-- sql to call on an existing pooled connection when it is obtained from pool - the OracleValidConnectionChecker is prefered
+        <check-valid-connection-sql>some arbitrary sql</check-valid-connection-sql>
+        -->
+
+    <!-- corresponding type-mapping in the standardjbosscmp-jdbc.xml (optional) -->
+    <metadata>
+       <type-mapping>Oracle9i</type-mapping>
+    </metadata>
+  </local-tx-datasource>
+
+</datasources>


