[jboss-svn-commits] JBL Code SVN: r34704 - in labs/jbosstm/trunk/XTS: WS-C/dev/dd and 16 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Fri Aug 13 06:21:49 EDT 2010


Author: adinn
Date: 2010-08-13 06:21:48 -0400 (Fri, 13 Aug 2010)
New Revision: 34704

Added:
   labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/wsc11/messaging/deploy/WSCCloseInitialisation.java
   labs/jbosstm/trunk/XTS/WS-C/tests/dd/META-INF/
   labs/jbosstm/trunk/XTS/WS-C/tests/dd/META-INF/jboss-beans.xml
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/deploy/WSTCloseInitialisation.java
   labs/jbosstm/trunk/XTS/WS-T/tests/dd/META-INF/
   labs/jbosstm/trunk/XTS/WS-T/tests/dd/META-INF/jboss-beans.xml
   labs/jbosstm/trunk/XTS/WSCF/classes11/com/arjuna/mw/wsc11/deploy/WSCFCloseInitialisation.java
   labs/jbosstm/trunk/XTS/WSTX/classes11/com/arjuna/mw/wst11/deploy/WSTXCloseInitialisation.java
   labs/jbosstm/trunk/XTS/WSTX/tests/dd/META-INF/
   labs/jbosstm/trunk/XTS/WSTX/tests/dd/META-INF/jboss-beans.xml
Removed:
   labs/jbosstm/trunk/XTS/WSTX/xml/AtomicTransaction.xml
   labs/jbosstm/trunk/XTS/WSTX/xml/AtomicTransaction11.xml
   labs/jbosstm/trunk/XTS/WSTX/xml/BusinessActivity.xml
   labs/jbosstm/trunk/XTS/WSTX/xml/BusinessActivity11.xml
   labs/jbosstm/trunk/XTS/WSTX/xml/TwoPhaseTxManager.xml
   labs/jbosstm/trunk/XTS/WSTX/xml/UserTwoPhaseTx.xml
   labs/jbosstm/trunk/XTS/WSTX/xml/WSCF.xsd
   labs/jbosstm/trunk/XTS/WSTX/xml/tests.xml
Modified:
   labs/jbosstm/trunk/XTS/WS-C/build.xml
   labs/jbosstm/trunk/XTS/WS-C/dev/dd/ws-c11_web-app.xml
   labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/wsc11/messaging/deploy/CoordinationInitialisation.java
   labs/jbosstm/trunk/XTS/WS-T/build.xml
   labs/jbosstm/trunk/XTS/WS-T/dev/dd/ws-t11_web-app.xml
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/deploy/TransactionInitialisation.java
   labs/jbosstm/trunk/XTS/WSCF/classes11/com/arjuna/mw/wsc11/deploy/WSCFInitialisation.java
   labs/jbosstm/trunk/XTS/WSCF/xml/wscf11_web-app.xml
   labs/jbosstm/trunk/XTS/WSTX/build.xml
   labs/jbosstm/trunk/XTS/WSTX/classes11/com/arjuna/mw/wst11/deploy/WSTXInitialisation.java
   labs/jbosstm/trunk/XTS/WSTX/xml/wstx_web-app11.xml
   labs/jbosstm/trunk/XTS/sar/META-INF/xts-jboss-beans.xml
   labs/jbosstm/trunk/XTS/sar/META-INF/xts11-jboss-beans.xml
Log:
tweaked 1.1 init to make it easier to twek to avoid deploying all components, fixed problem with injection of http port and made tests ears depend on XTS sar -- more fixes for JBTM-678

Modified: labs/jbosstm/trunk/XTS/WS-C/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/build.xml	2010-08-13 10:05:00 UTC (rev 34703)
+++ labs/jbosstm/trunk/XTS/WS-C/build.xml	2010-08-13 10:21:48 UTC (rev 34704)
@@ -280,6 +280,7 @@
             <fileset dir="${tests.build.webapps.dir}" includes="ws-c11-tests.war"/>
             <fileset dir="${tests.build.lib.dir}" includes="ws-c-tests.jar"/>
             <fileset dir="${wsas.tests.build.lib.dir}" includes="xts-test-servlet.jar"/>
+            <fileset dir="${tests.dd.dir}" includes="META-INF/**/*"/>
         </ear>
     </target>
 
@@ -289,6 +290,7 @@
             <fileset dir="${tests.build.webapps.dir}" includes="ws-c11-tests.war"/>
             <fileset dir="${tests.build.lib.dir}" includes="ws-c-tests.jar"/>
             <fileset dir="${wsas.tests.build.lib.dir}" includes="xts-test-servlet.jar"/>
+            <fileset dir="${tests.dd.dir}" includes="META-INF/**/*"/>
         </ear>
     </target>
 

Modified: labs/jbosstm/trunk/XTS/WS-C/dev/dd/ws-c11_web-app.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/dd/ws-c11_web-app.xml	2010-08-13 10:05:00 UTC (rev 34703)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/dd/ws-c11_web-app.xml	2010-08-13 10:21:48 UTC (rev 34704)
@@ -40,6 +40,11 @@
         <listener-class>com.arjuna.wsc11.messaging.deploy.CoordinationInitialisation</listener-class>
     </listener>
 
+    <!-- Close the WS-C 1.1 initialisation sequence must be last listener -->
+    <listener>
+        <listener-class>com.arjuna.wsc11.messaging.deploy.WSCCloseInitialisation</listener-class>
+    </listener>
+
     <!-- Define WSCOOR 1.1 JaxWS Server Endpoints -->
     <servlet>
       <servlet-name>ActivationService</servlet-name>

Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/wsc11/messaging/deploy/CoordinationInitialisation.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/wsc11/messaging/deploy/CoordinationInitialisation.java	2010-08-13 10:05:00 UTC (rev 34703)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/wsc11/messaging/deploy/CoordinationInitialisation.java	2010-08-13 10:21:48 UTC (rev 34704)
@@ -47,8 +47,6 @@
                RegistrationCoordinatorProcessor.setCoordinator(new RegistrationCoordinatorProcessorImpl()) ;
            }
         };
-        // this is the last WSC callback to be initialised so close the list
-        Sequencer.close(Sequencer.SEQUENCE_WSCOOR11, Sequencer.WEBAPP_WSC11);
     }
 
     /**

Copied: labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/wsc11/messaging/deploy/WSCCloseInitialisation.java (from rev 34619, labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/wsc11/messaging/deploy/CoordinationInitialisation.java)
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/wsc11/messaging/deploy/WSCCloseInitialisation.java	                        (rev 0)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/wsc11/messaging/deploy/WSCCloseInitialisation.java	2010-08-13 10:21:48 UTC (rev 34704)
@@ -0,0 +1,51 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. 
+ * See the copyright.txt in the distribution for a full listing 
+ * of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ * 
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.arjuna.wsc11.messaging.deploy;
+
+import com.arjuna.services.framework.startup.Sequencer;
+
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+
+/**
+ * Complete initialisation of WS-C component by closing the callback sequence
+ * @author kevin
+ */
+public class WSCCloseInitialisation implements ServletContextListener
+{
+    /**
+     * The context has been initialized.
+     * @param servletContextEvent The servlet context event.
+     */
+    public void contextInitialized(final ServletContextEvent servletContextEvent)
+    {
+        // close the WSC list
+        Sequencer.close(Sequencer.SEQUENCE_WSCOOR11, Sequencer.WEBAPP_WSC11);
+    }
+
+    /**
+     * The context is about to be destroyed.
+     * @param servletContextEvent The servlet context event.
+     */
+    public void contextDestroyed(final ServletContextEvent servletContextEvent)
+    {
+    }
+}
\ No newline at end of file

Added: labs/jbosstm/trunk/XTS/WS-C/tests/dd/META-INF/jboss-beans.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/tests/dd/META-INF/jboss-beans.xml	                        (rev 0)
+++ labs/jbosstm/trunk/XTS/WS-C/tests/dd/META-INF/jboss-beans.xml	2010-08-13 10:21:48 UTC (rev 34704)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+    <!-- bean to declare the dependency of the test code on the XTS code  -->
+    <bean name="WSCTestBean" class="java.lang.Object">
+       <depends>jboss.web:service=WebServer</depends>
+   </bean>
+
+</deployment>
\ No newline at end of file

Modified: labs/jbosstm/trunk/XTS/WS-T/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/build.xml	2010-08-13 10:05:00 UTC (rev 34703)
+++ labs/jbosstm/trunk/XTS/WS-T/build.xml	2010-08-13 10:21:48 UTC (rev 34704)
@@ -384,6 +384,7 @@
             <fileset dir="${tests.build.webapps.dir}" includes="ws-t-tests.war ws-t11-tests.war"/>
             <fileset dir="${tests.build.lib.dir}" includes="ws-t-tests.jar"/>
             <fileset dir="${wsas.tests.build.lib.dir}" includes="xts-test-servlet.jar"/>
+            <fileset dir="${tests.dd.dir}" includes="META-INF/**/*"/>
         </ear>
     </target>
 
@@ -393,6 +394,7 @@
             <fileset dir="${tests.build.webapps.dir}" includes="ws-t11-tests.war"/>
             <fileset dir="${tests.build.lib.dir}" includes="ws-t-tests.jar"/>
             <fileset dir="${wsas.tests.build.lib.dir}" includes="xts-test-servlet.jar"/>
+            <fileset dir="${tests.dd.dir}" includes="META-INF/**/*"/>
         </ear>
     </target>
 

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/dd/ws-t11_web-app.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/dd/ws-t11_web-app.xml	2010-08-13 10:05:00 UTC (rev 34703)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/dd/ws-t11_web-app.xml	2010-08-13 10:21:48 UTC (rev 34704)
@@ -68,6 +68,11 @@
         <listener-class>com.arjuna.wst11.messaging.deploy.TransactionInitialisation</listener-class>
     </listener>
 
+    <!-- Close the WS-T  1.1 initialisation list -->
+    <listener>
+        <listener-class>com.arjuna.wst11.messaging.deploy.WSTCloseInitialisation</listener-class>
+    </listener>
+
     <!-- Define WSAT 1.1 JaxWS Server Endpoints -->
     <servlet>
       <servlet-name>Coordinator</servlet-name>

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/deploy/TransactionInitialisation.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/deploy/TransactionInitialisation.java	2010-08-13 10:05:00 UTC (rev 34703)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/deploy/TransactionInitialisation.java	2010-08-13 10:21:48 UTC (rev 34704)
@@ -58,8 +58,6 @@
                ParticipantCompletionCoordinatorProcessor.setProcessor(new ParticipantCompletionCoordinatorProcessorImpl()) ;
            }
         };
-        // this is the last WST callback to be initialised so close the list
-        Sequencer.close(Sequencer.SEQUENCE_WSCOOR11, Sequencer.WEBAPP_WST11);
     }
 
     /**

Copied: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/deploy/WSTCloseInitialisation.java (from rev 34619, labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/deploy/TransactionInitialisation.java)
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/deploy/WSTCloseInitialisation.java	                        (rev 0)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/deploy/WSTCloseInitialisation.java	2010-08-13 10:21:48 UTC (rev 34704)
@@ -0,0 +1,51 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. 
+ * See the copyright.txt in the distribution for a full listing 
+ * of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ * 
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.arjuna.wst11.messaging.deploy;
+
+import com.arjuna.services.framework.startup.Sequencer;
+
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+
+/**
+ * Initialise the transaction services.
+ * @author kevin
+ */
+public class WSTCloseInitialisation implements ServletContextListener
+{
+    /**
+     * The context has been initialized.
+     * @param servletContextEvent The servlet context event.
+     */
+    public void contextInitialized(final ServletContextEvent servletContextEvent)
+    {
+        // close the WS-T initialisation list
+        Sequencer.close(Sequencer.SEQUENCE_WSCOOR11, Sequencer.WEBAPP_WST11);
+    }
+
+    /**
+     * The context is about to be destroyed.
+     * @param servletContextEvent The servlet context event.
+     */
+    public void contextDestroyed(final ServletContextEvent servletContextEvent)
+    {
+    }
+}
\ No newline at end of file

Added: labs/jbosstm/trunk/XTS/WS-T/tests/dd/META-INF/jboss-beans.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/tests/dd/META-INF/jboss-beans.xml	                        (rev 0)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/dd/META-INF/jboss-beans.xml	2010-08-13 10:21:48 UTC (rev 34704)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+    <!-- bean to declare the dependency of the test code on the XTS code  -->
+    <bean name="WSTTestBean" class="java.lang.Object">
+       <depends>jboss.web:service=WebServer</depends>
+   </bean>
+
+</deployment>
\ No newline at end of file

Copied: labs/jbosstm/trunk/XTS/WSCF/classes11/com/arjuna/mw/wsc11/deploy/WSCFCloseInitialisation.java (from rev 34680, labs/jbosstm/trunk/XTS/WSCF/classes11/com/arjuna/mw/wsc11/deploy/WSCFInitialisation.java)
===================================================================
--- labs/jbosstm/trunk/XTS/WSCF/classes11/com/arjuna/mw/wsc11/deploy/WSCFCloseInitialisation.java	                        (rev 0)
+++ labs/jbosstm/trunk/XTS/WSCF/classes11/com/arjuna/mw/wsc11/deploy/WSCFCloseInitialisation.java	2010-08-13 10:21:48 UTC (rev 34704)
@@ -0,0 +1,53 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. 
+ * See the copyright.txt in the distribution for a full listing 
+ * of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ * 
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.arjuna.mw.wsc11.deploy;
+
+import com.arjuna.services.framework.startup.Sequencer;
+
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+
+/**
+ * Initialise WSCF.
+ * @author kevin
+ */
+public class WSCFCloseInitialisation implements ServletContextListener
+{
+    /**
+     * The context has been initialized.
+     * @param servletContextEvent The servlet context event.
+     *
+     */
+    public void contextInitialized(final ServletContextEvent servletContextEvent)
+    {
+        // close the WSCF initialisation list
+        
+        Sequencer.close(Sequencer.SEQUENCE_WSCOOR11, Sequencer.WEBAPP_WSCF11);
+    }
+
+    /**
+     * The context is about to be destroyed.
+     * @param servletContextEvent The servlet context event.
+     */
+    public void contextDestroyed(final ServletContextEvent servletContextEvent)
+    {
+    }
+}
\ No newline at end of file

Modified: labs/jbosstm/trunk/XTS/WSCF/classes11/com/arjuna/mw/wsc11/deploy/WSCFInitialisation.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSCF/classes11/com/arjuna/mw/wsc11/deploy/WSCFInitialisation.java	2010-08-13 10:05:00 UTC (rev 34703)
+++ labs/jbosstm/trunk/XTS/WSCF/classes11/com/arjuna/mw/wsc11/deploy/WSCFInitialisation.java	2010-08-13 10:21:48 UTC (rev 34704)
@@ -44,9 +44,6 @@
         // ensure we load any required protocol implementations
 
         ProtocolRegistry.sharedManager().initialise();
-        
-        Sequencer.close(Sequencer.SEQUENCE_WSCOOR11, Sequencer.WEBAPP_WSCF11);
-
     }
 
     /**

Modified: labs/jbosstm/trunk/XTS/WSCF/xml/wscf11_web-app.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSCF/xml/wscf11_web-app.xml	2010-08-13 10:05:00 UTC (rev 34703)
+++ labs/jbosstm/trunk/XTS/WSCF/xml/wscf11_web-app.xml	2010-08-13 10:21:48 UTC (rev 34704)
@@ -30,4 +30,9 @@
     <listener>
         <listener-class>com.arjuna.mw.wsc11.deploy.WSCFInitialisation</listener-class>
     </listener>
+
+    <!-- close the initialisation list -->
+    <listener>
+        <listener-class>com.arjuna.mw.wsc11.deploy.WSCFCloseInitialisation</listener-class>
+    </listener>
 </web-app>

Modified: labs/jbosstm/trunk/XTS/WSTX/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/build.xml	2010-08-13 10:05:00 UTC (rev 34703)
+++ labs/jbosstm/trunk/XTS/WSTX/build.xml	2010-08-13 10:21:48 UTC (rev 34704)
@@ -370,6 +370,7 @@
           <fileset dir="${jbossts.build.extlib.dir}" includes="${tests.libs}"/>
           <fileset dir="${tests.build.webapps.dir}" includes="wstx-tests.war wstx11-tests.war wstx-tests.jar"/>
           <fileset dir="${wsas.test.build.lib.dir}" includes="xts-test-servlet.jar"/>
+           <fileset dir="${tests.dd.dir}" includes="META-INF/**/*"/>
         </ear>
     </target>
 
@@ -378,6 +379,7 @@
           <fileset dir="${jbossts.build.extlib.dir}" includes="${tests.libs}"/>
           <fileset dir="${tests.build.webapps.dir}" includes="wstx11-tests.war wstx-tests.jar"/>
           <fileset dir="${wsas.test.build.lib.dir}" includes="xts-test-servlet.jar"/>
+           <fileset dir="${tests.dd.dir}" includes="META-INF/**/*"/>
         </ear>
     </target>
 

Copied: labs/jbosstm/trunk/XTS/WSTX/classes11/com/arjuna/mw/wst11/deploy/WSTXCloseInitialisation.java (from rev 34680, labs/jbosstm/trunk/XTS/WSTX/classes11/com/arjuna/mw/wst11/deploy/WSTXInitialisation.java)
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/classes11/com/arjuna/mw/wst11/deploy/WSTXCloseInitialisation.java	                        (rev 0)
+++ labs/jbosstm/trunk/XTS/WSTX/classes11/com/arjuna/mw/wst11/deploy/WSTXCloseInitialisation.java	2010-08-13 10:21:48 UTC (rev 34704)
@@ -0,0 +1,52 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. 
+ * See the copyright.txt in the distribution for a full listing 
+ * of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ * 
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.arjuna.mw.wst11.deploy;
+
+import com.arjuna.services.framework.startup.Sequencer;
+
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+
+/**
+ * Initialise WSTX.
+ * @author kevin
+ */
+public class WSTXCloseInitialisation implements ServletContextListener
+{
+    /**
+     * The context has been initialized.
+     * @param servletContextEvent The servlet context event.
+     *
+     */
+    public void contextInitialized(final ServletContextEvent servletContextEvent)
+    {
+        // this is the last WST callback to be initialised so close the list
+        Sequencer.close(Sequencer.SEQUENCE_WSCOOR11, Sequencer.WEBAPP_WSTX11);
+    }
+
+    /**
+     * The context is about to be destroyed.
+     * @param servletContextEvent The servlet context event.
+     */
+    public void contextDestroyed(final ServletContextEvent servletContextEvent)
+    {
+    }
+}
\ No newline at end of file

Modified: labs/jbosstm/trunk/XTS/WSTX/classes11/com/arjuna/mw/wst11/deploy/WSTXInitialisation.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/classes11/com/arjuna/mw/wst11/deploy/WSTXInitialisation.java	2010-08-13 10:05:00 UTC (rev 34703)
+++ labs/jbosstm/trunk/XTS/WSTX/classes11/com/arjuna/mw/wst11/deploy/WSTXInitialisation.java	2010-08-13 10:21:48 UTC (rev 34704)
@@ -61,8 +61,6 @@
                }
            }
         };
-        // this is the last WST callback to be initialised so close the list
-        Sequencer.close(Sequencer.SEQUENCE_WSCOOR11, Sequencer.WEBAPP_WSTX11);
     }
 
     /**
@@ -84,7 +82,7 @@
             // only implementation. they will still need to install the API classes but not the implementation
             // code
             if (! (userTx == null && txManager == null && userBa == null && baManager == null)) {
-                throw new FileNotFoundException(wstxLogger.i18NLogger.get_mw_wst_deploy_WSTXI_23());
+                throw new Exception(wstxLogger.i18NLogger.get_mw_wst_deploy_WSTXI_23());
             }
         }
 

Added: labs/jbosstm/trunk/XTS/WSTX/tests/dd/META-INF/jboss-beans.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/tests/dd/META-INF/jboss-beans.xml	                        (rev 0)
+++ labs/jbosstm/trunk/XTS/WSTX/tests/dd/META-INF/jboss-beans.xml	2010-08-13 10:21:48 UTC (rev 34704)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+    <!-- bean to declare the dependency of the test code on the XTS code  -->
+    <bean name="WSTXTestBean" class="java.lang.Object">
+       <depends>jboss.web:service=WebServer</depends>
+   </bean>
+
+</deployment>
\ No newline at end of file

Deleted: labs/jbosstm/trunk/XTS/WSTX/xml/AtomicTransaction.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/xml/AtomicTransaction.xml	2010-08-13 10:05:00 UTC (rev 34703)
+++ labs/jbosstm/trunk/XTS/WSTX/xml/AtomicTransaction.xml	2010-08-13 10:21:48 UTC (rev 34704)
@@ -1,24 +0,0 @@
-<!--
-  JBoss, Home of Professional Open Source
-  Copyright 2006, Red Hat Middleware LLC, and individual contributors
-  as indicated by the @author tags. 
-  See the copyright.txt in the distribution for a full listing 
-  of individual contributors.
-  This copyrighted material is made available to anyone wishing to use,
-  modify, copy, or redistribute it subject to the terms and conditions
-  of the GNU Lesser General Public License, v. 2.1.
-  This program is distributed in the hope that it will be useful, but WITHOUT A
-  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-  PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
-  You should have received a copy of the GNU Lesser General Public License,
-  v.2.1 along with this distribution; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-  MA  02110-1301, USA.
-
-  
-  (C) 2005-2006,
-  @author JBoss Inc.
--->
-<coordination-type xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="C:\Documents and Settings\mlittle\Desktop\standards work\WS architecture\WSCF\0.8.2\xml\WSCF.xsd">
-<coordinator-type>http://schemas.xmlsoap.org/ws/2004/10/wsat</coordinator-type>
-</coordination-type>

Deleted: labs/jbosstm/trunk/XTS/WSTX/xml/AtomicTransaction11.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/xml/AtomicTransaction11.xml	2010-08-13 10:05:00 UTC (rev 34703)
+++ labs/jbosstm/trunk/XTS/WSTX/xml/AtomicTransaction11.xml	2010-08-13 10:21:48 UTC (rev 34704)
@@ -1,24 +0,0 @@
-<!--
-  JBoss, Home of Professional Open Source
-  Copyright 20067, Red Hat Middleware LLC, and individual contributors
-  as indicated by the @author tags. 
-  See the copyright.txt in the distribution for a full listing 
-  of individual contributors.
-  This copyrighted material is made available to anyone wishing to use,
-  modify, copy, or redistribute it subject to the terms and conditions
-  of the GNU Lesser General Public License, v. 2.1.
-  This program is distributed in the hope that it will be useful, but WITHOUT A
-  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-  PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
-  You should have received a copy of the GNU Lesser General Public License,
-  v.2.1 along with this distribution; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-  MA  02110-1301, USA.
-
-  
-  (C) 2005-2006,
-  @author JBoss Inc.
--->
-<coordination-type xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="C:\Documents and Settings\mlittle\Desktop\standards work\WS architecture\WSCF\0.8.2\xml\WSCF.xsd">
-<coordinator-type>http://docs.oasis-open.org/ws-tx/wsat/2006/06</coordinator-type>
-</coordination-type>

Deleted: labs/jbosstm/trunk/XTS/WSTX/xml/BusinessActivity.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/xml/BusinessActivity.xml	2010-08-13 10:05:00 UTC (rev 34703)
+++ labs/jbosstm/trunk/XTS/WSTX/xml/BusinessActivity.xml	2010-08-13 10:21:48 UTC (rev 34704)
@@ -1,24 +0,0 @@
-<!--
-  JBoss, Home of Professional Open Source
-  Copyright 2006, Red Hat Middleware LLC, and individual contributors
-  as indicated by the @author tags. 
-  See the copyright.txt in the distribution for a full listing 
-  of individual contributors.
-  This copyrighted material is made available to anyone wishing to use,
-  modify, copy, or redistribute it subject to the terms and conditions
-  of the GNU Lesser General Public License, v. 2.1.
-  This program is distributed in the hope that it will be useful, but WITHOUT A
-  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-  PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
-  You should have received a copy of the GNU Lesser General Public License,
-  v.2.1 along with this distribution; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-  MA  02110-1301, USA.
-
-  
-  (C) 2005-2006,
-  @author JBoss Inc.
--->
-<coordination-type xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="C:\Documents and Settings\mlittle\Desktop\standards work\WS architecture\WSCF\0.8.2\xml\WSCF.xsd">
-<coordinator-type>http://schemas.xmlsoap.org/ws/2004/10/wsba/AtomicOutcome</coordinator-type>
-</coordination-type>

Deleted: labs/jbosstm/trunk/XTS/WSTX/xml/BusinessActivity11.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/xml/BusinessActivity11.xml	2010-08-13 10:05:00 UTC (rev 34703)
+++ labs/jbosstm/trunk/XTS/WSTX/xml/BusinessActivity11.xml	2010-08-13 10:21:48 UTC (rev 34704)
@@ -1,24 +0,0 @@
-<!--
-  JBoss, Home of Professional Open Source
-  Copyright 2007, Red Hat Middleware LLC, and individual contributors
-  as indicated by the @author tags. 
-  See the copyright.txt in the distribution for a full listing 
-  of individual contributors.
-  This copyrighted material is made available to anyone wishing to use,
-  modify, copy, or redistribute it subject to the terms and conditions
-  of the GNU Lesser General Public License, v. 2.1.
-  This program is distributed in the hope that it will be useful, but WITHOUT A
-  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-  PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
-  You should have received a copy of the GNU Lesser General Public License,
-  v.2.1 along with this distribution; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-  MA  02110-1301, USA.
-
-  
-  (C) 2005-2006,
-  @author JBoss Inc.
--->
-<coordination-type xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="C:\Documents and Settings\mlittle\Desktop\standards work\WS architecture\WSCF\0.8.2\xml\WSCF.xsd">
-<coordinator-type>http://docs.oasis-open.org/ws-tx/wsba/2006/06/AtomicOutcome</coordinator-type>
-</coordination-type>

Deleted: labs/jbosstm/trunk/XTS/WSTX/xml/TwoPhaseTxManager.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/xml/TwoPhaseTxManager.xml	2010-08-13 10:05:00 UTC (rev 34703)
+++ labs/jbosstm/trunk/XTS/WSTX/xml/TwoPhaseTxManager.xml	2010-08-13 10:21:48 UTC (rev 34704)
@@ -1,24 +0,0 @@
-<!--
-  JBoss, Home of Professional Open Source
-  Copyright 2006, Red Hat Middleware LLC, and individual contributors
-  as indicated by the @author tags. 
-  See the copyright.txt in the distribution for a full listing 
-  of individual contributors.
-  This copyrighted material is made available to anyone wishing to use,
-  modify, copy, or redistribute it subject to the terms and conditions
-  of the GNU Lesser General Public License, v. 2.1.
-  This program is distributed in the hope that it will be useful, but WITHOUT A
-  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-  PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
-  You should have received a copy of the GNU Lesser General Public License,
-  v.2.1 along with this distribution; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-  MA  02110-1301, USA.
-
-  
-  (C) 2005-2006,
-  @author JBoss Inc.
--->
-<transaction-type xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="C:\Documents and Settings\mlittle\Desktop\standards work\WS architecture\WSCF\0.8.2\xml\WSCF.xsd">
-<transaction-protocol>urn:tx-two-phase-commit-manager</transaction-protocol>
-</transaction-type>

Deleted: labs/jbosstm/trunk/XTS/WSTX/xml/UserTwoPhaseTx.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/xml/UserTwoPhaseTx.xml	2010-08-13 10:05:00 UTC (rev 34703)
+++ labs/jbosstm/trunk/XTS/WSTX/xml/UserTwoPhaseTx.xml	2010-08-13 10:21:48 UTC (rev 34704)
@@ -1,24 +0,0 @@
-<!--
-  JBoss, Home of Professional Open Source
-  Copyright 2006, Red Hat Middleware LLC, and individual contributors
-  as indicated by the @author tags. 
-  See the copyright.txt in the distribution for a full listing 
-  of individual contributors.
-  This copyrighted material is made available to anyone wishing to use,
-  modify, copy, or redistribute it subject to the terms and conditions
-  of the GNU Lesser General Public License, v. 2.1.
-  This program is distributed in the hope that it will be useful, but WITHOUT A
-  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-  PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
-  You should have received a copy of the GNU Lesser General Public License,
-  v.2.1 along with this distribution; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-  MA  02110-1301, USA.
-
-  
-  (C) 2005-2006,
-  @author JBoss Inc.
--->
-<transaction-type xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="C:\Documents and Settings\mlittle\Desktop\standards work\WS architecture\WSCF\0.8.2\xml\WSCF.xsd">
-<transaction-protocol>urn:user-tx-two-phase-commit</transaction-protocol>
-</transaction-type>

Deleted: labs/jbosstm/trunk/XTS/WSTX/xml/WSCF.xsd
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/xml/WSCF.xsd	2010-08-13 10:05:00 UTC (rev 34703)
+++ labs/jbosstm/trunk/XTS/WSTX/xml/WSCF.xsd	2010-08-13 10:21:48 UTC (rev 34704)
@@ -1,60 +0,0 @@
-<!--
-  JBoss, Home of Professional Open Source
-  Copyright 2006, Red Hat Middleware LLC, and individual contributors
-  as indicated by the @author tags. 
-  See the copyright.txt in the distribution for a full listing 
-  of individual contributors.
-  This copyrighted material is made available to anyone wishing to use,
-  modify, copy, or redistribute it subject to the terms and conditions
-  of the GNU Lesser General Public License, v. 2.1.
-  This program is distributed in the hope that it will be useful, but WITHOUT A
-  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-  PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
-  You should have received a copy of the GNU Lesser General Public License,
-  v.2.1 along with this distribution; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-  MA  02110-1301, USA.
-
-  
-  (C) 2005-2006,
-  @author JBoss Inc.
--->
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
-	<xsd:element name="coordinator-name" type="xsd:anyURI">
-		<xsd:annotation>
-			<xsd:documentation>The unique name for this type of coordinator</xsd:documentation>
-		</xsd:annotation>
-	</xsd:element>
-	<xsd:element name="response">
-		<xsd:annotation>
-			<xsd:documentation>The response that may be returned upon receipt of a specific notification</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexType>
-			<xsd:sequence>
-				<xsd:element name="name" type="xsd:string" maxOccurs="unbounded"/>
-			</xsd:sequence>
-		</xsd:complexType>
-	</xsd:element>
-	<xsd:element name="notification">
-		<xsd:annotation>
-			<xsd:documentation>The notification message that may be sent</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexType>
-			<xsd:sequence>
-				<xsd:element name="name" type="xsd:string"/>
-				<xsd:element ref="response" maxOccurs="unbounded"/>
-			</xsd:sequence>
-		</xsd:complexType>
-	</xsd:element>
-	<xsd:element name="coordination-type">
-		<xsd:annotation>
-			<xsd:documentation>The type of the coordination protocol supported</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexType>
-			<xsd:sequence>
-				<xsd:element ref="coordinator-name"/>
-				<xsd:element ref="notification" maxOccurs="unbounded"/>
-			</xsd:sequence>
-		</xsd:complexType>
-	</xsd:element>
-</xsd:schema>

Deleted: labs/jbosstm/trunk/XTS/WSTX/xml/tests.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/xml/tests.xml	2010-08-13 10:05:00 UTC (rev 34703)
+++ labs/jbosstm/trunk/XTS/WSTX/xml/tests.xml	2010-08-13 10:21:48 UTC (rev 34704)
@@ -1,39 +0,0 @@
-<!--
-  JBoss, Home of Professional Open Source
-  Copyright 2006, Red Hat Middleware LLC, and individual contributors
-  as indicated by the @author tags. 
-  See the copyright.txt in the distribution for a full listing 
-  of individual contributors.
-  This copyrighted material is made available to anyone wishing to use,
-  modify, copy, or redistribute it subject to the terms and conditions
-  of the GNU Lesser General Public License, v. 2.1.
-  This program is distributed in the hope that it will be useful, but WITHOUT A
-  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-  PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
-  You should have received a copy of the GNU Lesser General Public License,
-  v.2.1 along with this distribution; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-  MA  02110-1301, USA.
-
-  
-  (C) 2005-2006,
-  @author JBoss Inc.
--->
-
-<test-definitions>
-	<test name="com.arjuna.wst.tests.junit.basic.NullCommitTransaction">
-		<parameters/>
-	</test>
-	<test name="com.arjuna.wst.tests.junit.basic.NullRollbackTransaction">
-		<parameters/>
-	</test>
-	<test name="com.arjuna.wst.tests.junit.basic.NestedTransaction">
-		<parameters/>
-	</test>
-	<test name="com.arjuna.wst.tests.junit.basic.SingleParticipant">
-		<parameters/>
-	</test>
-	<test name="com.arjuna.wst.tests.junit.basic.SynchronizationTransaction">
-		<parameters/>
-	</test>
-</test-definitions>

Modified: labs/jbosstm/trunk/XTS/WSTX/xml/wstx_web-app11.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/xml/wstx_web-app11.xml	2010-08-13 10:05:00 UTC (rev 34703)
+++ labs/jbosstm/trunk/XTS/WSTX/xml/wstx_web-app11.xml	2010-08-13 10:21:48 UTC (rev 34704)
@@ -30,4 +30,8 @@
     <listener>
         <listener-class>com.arjuna.mw.wst11.deploy.WSTXInitialisation</listener-class>
     </listener>
+
+    <listener>
+        <listener-class>com.arjuna.mw.wst11.deploy.WSTXCloseInitialisation</listener-class>
+    </listener>
 </web-app>

Modified: labs/jbosstm/trunk/XTS/sar/META-INF/xts-jboss-beans.xml
===================================================================
--- labs/jbosstm/trunk/XTS/sar/META-INF/xts-jboss-beans.xml	2010-08-13 10:05:00 UTC (rev 34703)
+++ labs/jbosstm/trunk/XTS/sar/META-INF/xts-jboss-beans.xml	2010-08-13 10:21:48 UTC (rev 34704)
@@ -19,6 +19,9 @@
     <bean name="WSCEnvironmentBean" class="org.jboss.jbossts.xts.environment.WSCEnvironmentBean">
         <constructor factoryClass="org.jboss.jbossts.xts.environment.XTSPropertyManager"
             factoryMethod="getWSCEnvironmentBean"/>
+        <!-- we need the bind address and port from jboss web -->
+        <depends>jboss.web:service=WebServer</depends>
+        <depends>jboss:service=TransactionManager</depends>
         <!--
             the bind address and bind ports must be specified in any container in which XTS is deployed,
             whether it is running clients, transactional web services or the coordinator itself.
@@ -50,7 +53,7 @@
            <value-factory bean="ServiceBindingManager"
                            method="getIntBinding" >
               <parameter>jboss.web:service=WebServer</parameter>
-               <parameter>HttpsConnector</parameter>
+              <parameter>HttpsConnector</parameter>
            </value-factory>
         </property>
 
@@ -61,6 +64,7 @@
            <value-factory bean="ServiceBindingManager"
                            method="getIntBinding" >
               <parameter>jboss.web:service=WebServer</parameter>
+              <parameter>HttpConnector</parameter>
            </value-factory>
         </property>
 
@@ -68,7 +72,7 @@
            <value-factory bean="ServiceBindingManager"
                            method="getIntBinding" >
               <parameter>jboss.web:service=WebServer</parameter>
-               <parameter>HttpConnector</parameter>
+              <parameter>HttpConnector</parameter>
            </value-factory>
         </property>
 
@@ -184,6 +188,7 @@
     <bean name="WSCFEnvironmentBean" class="org.jboss.jbossts.xts.environment.WSCFEnvironmentBean">
         <constructor factoryClass="org.jboss.jbossts.xts.environment.XTSPropertyManager"
             factoryMethod="getWSCFEnvironmentBean"/>
+        <depends>jboss:service=TransactionManager</depends>
         <!--  the protocol implementations property contains a list of classes which implement
             high level services or context factories.
         -->
@@ -210,6 +215,7 @@
     <bean name="WSTEnvironmentBean" class="org.jboss.jbossts.xts.environment.WSTEnvironmentBean">
         <constructor factoryClass="org.jboss.jbossts.xts.environment.XTSPropertyManager"
             factoryMethod="getWSTEnvironmentBean"/>
+        <depends>jboss:service=TransactionManager</depends>
         <!-- the 1.1 client API implementation classes.
         -->
         <property name="userTransaction11">
@@ -247,8 +253,6 @@
     <bean name="XTSService" class="org.jboss.jbossts.XTSService">
         <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.xts:service=XTSService", exposedInterface=com.arjuna.ats.jbossatx.jta.TransactionManagerServiceMBean.class, registerDirectly=true)</annotation>
 
-       <depends>jboss.web:service=WebServer</depends>
-       <depends>jboss:service=TransactionManager</depends>
        <depends>WSCFEnvironmentBean</depends>
        <depends>WSCEnvironmentBean</depends>
        <depends>WSTEnvironmentBean</depends>

Modified: labs/jbosstm/trunk/XTS/sar/META-INF/xts11-jboss-beans.xml
===================================================================
--- labs/jbosstm/trunk/XTS/sar/META-INF/xts11-jboss-beans.xml	2010-08-13 10:05:00 UTC (rev 34703)
+++ labs/jbosstm/trunk/XTS/sar/META-INF/xts11-jboss-beans.xml	2010-08-13 10:21:48 UTC (rev 34704)
@@ -17,6 +17,9 @@
     <bean name="WSCEnvironmentBean" class="org.jboss.jbossts.xts.environment.WSCEnvironmentBean">
         <constructor factoryClass="org.jboss.jbossts.xts.environment.XTSPropertyManager"
             factoryMethod="getWSCEnvironmentBean"/>
+        <!-- we need the bind address and port from jboss web -->
+        <depends>jboss.web:service=WebServer</depends>
+        <depends>jboss:service=TransactionManager</depends>
         <!--
             the bind address and bind ports must be specified in any container in which XTS is deployed,
             whether it is running clients, transactional web services or the coordinator itself.
@@ -48,7 +51,7 @@
            <value-factory bean="ServiceBindingManager"
                            method="getIntBinding" >
               <parameter>jboss.web:service=WebServer</parameter>
-               <parameter>HttpsConnector</parameter>
+              <parameter>HttpsConnector</parameter>
            </value-factory>
         </property>
 
@@ -147,6 +150,7 @@
     <bean name="WSCFEnvironmentBean" class="org.jboss.jbossts.xts.environment.WSCFEnvironmentBean">
         <constructor factoryClass="org.jboss.jbossts.xts.environment.XTSPropertyManager"
             factoryMethod="getWSCFEnvironmentBean"/>
+        <depends>jboss:service=TransactionManager</depends>
         <!--  the protocol implementations property contains a list of classes which implement
             high level services or context factories.
         -->
@@ -168,6 +172,7 @@
     <bean name="WSTEnvironmentBean" class="org.jboss.jbossts.xts.environment.WSTEnvironmentBean">
         <constructor factoryClass="org.jboss.jbossts.xts.environment.XTSPropertyManager"
             factoryMethod="getWSTEnvironmentBean"/>
+        <depends>jboss:service=TransactionManager</depends>
         <!-- the 1.1 client API implementation classes.
         -->
         <property name="userTransaction11">
@@ -189,8 +194,6 @@
     <bean name="XTSService" class="org.jboss.jbossts.XTSService">
         <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.xts:service=XTSService", exposedInterface=com.arjuna.ats.jbossatx.jta.TransactionManagerServiceMBean.class, registerDirectly=true)</annotation>
 
-       <depends>jboss.web:service=WebServer</depends>
-       <depends>jboss:service=TransactionManager</depends>
        <depends>WSCFEnvironmentBean</depends>
        <depends>WSCEnvironmentBean</depends>
        <depends>WSTEnvironmentBean</depends>



More information about the jboss-svn-commits mailing list