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

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Thu Jul 1 09:59:58 EDT 2010


Author: adinn
Date: 2010-07-01 09:59:57 -0400 (Thu, 01 Jul 2010)
New Revision: 33717

Modified:
   labs/jbosstm/trunk/XTS/WS-C/build.xml
   labs/jbosstm/trunk/XTS/WS-C/dev/dd/soapfault/wsdl/soapfault.wsdl
   labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/client/SoapFaultClient.java
   labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/client/WSCOORClient.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/client/WSARJTXClient.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/WSATClient.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/WSBAClient.java
Log:
restored use of wsdl on client side as it is needed to make Native work even though CXF will create a client port without it - fixes for JBTM-755

Modified: labs/jbosstm/trunk/XTS/WS-C/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/build.xml	2010-07-01 11:47:36 UTC (rev 33716)
+++ labs/jbosstm/trunk/XTS/WS-C/build.xml	2010-07-01 13:59:57 UTC (rev 33717)
@@ -163,6 +163,7 @@
         <copy file="${dd.dir}/wscoor1.1/wsdl/wscoor-activation-binding.wsdl" tofile="${build.classes11.dir}/org/oasis_open/docs/ws_tx/wscoor/_2006/_06/wsdl/wscoor-activation-binding.wsdl"/>
         <copy file="${dd.dir}/wscoor1.1/wsdl/wscoor-registration-binding.wsdl" tofile="${build.classes11.dir}/org/oasis_open/docs/ws_tx/wscoor/_2006/_06/wsdl/wscoor-registration-binding.wsdl"/>
         <copy file="${dd.dir}/soapfault/wsdl/soapfault.wsdl" tofile="${build.classes11.dir}/org/jboss/jbossts/xts/soapfault/wsdl/soapfault.wsdl"/>
+        <copy file="${dd.dir}/soapfault/wsdl/envelope.xsd" tofile="${build.classes11.dir}/org/jboss/jbossts/xts/soapfault/wsdl/envelope.xsd"/>
     </target>
 
     <target name="jars-generic">

Modified: labs/jbosstm/trunk/XTS/WS-C/dev/dd/soapfault/wsdl/soapfault.wsdl
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/dd/soapfault/wsdl/soapfault.wsdl	2010-07-01 11:47:36 UTC (rev 33716)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/dd/soapfault/wsdl/soapfault.wsdl	2010-07-01 13:59:57 UTC (rev 33717)
@@ -13,8 +13,15 @@
     xmlns="http://schemas.xmlsoap.org/wsdl/">
     <types>
         <s:schema>
+<!--
             <s:import namespace="http://schemas.xmlsoap.org/soap/envelope/"
-                      schemaLocation="http://schemas.xmlsoap.org/soap/envelope/"/>
+                      schemaLocation="http://schemas.xmlsoap.org/soap/envelope/"
+            />
+-->
+            <s:import namespace="http://schemas.xmlsoap.org/soap/envelope/"
+                      schemaLocation="envelope.xsd"
+            />
+
         </s:schema>
     </types>
     <message name="SoapFault">

Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/client/SoapFaultClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/client/SoapFaultClient.java	2010-07-01 11:47:36 UTC (rev 33716)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/client/SoapFaultClient.java	2010-07-01 13:59:57 UTC (rev 33717)
@@ -100,7 +100,8 @@
             // different versions of the service which bind the fault WebMethod using different
             // soap actions. the annotations on the service and port supply all the info needed
             // to create the service and port on the client side.
-            soapFaultService.set(new SoapFaultService(null, new QName("http://jbossts.jboss.org/xts/soapfault", "SoapFaultService")));
+            // soapFaultService.set(new SoapFaultService(null, new QName("http://jbossts.jboss.org/xts/soapfault", "SoapFaultService")));
+            soapFaultService.set(new SoapFaultService());
         }
         return soapFaultService.get();
     }

Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/client/WSCOORClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/client/WSCOORClient.java	2010-07-01 11:47:36 UTC (rev 33716)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/client/WSCOORClient.java	2010-07-01 13:59:57 UTC (rev 33717)
@@ -40,7 +40,8 @@
     private static synchronized ActivationService getActivationService()
     {
         if (activationService.get() == null) {
-            activationService.set(new ActivationService(null, new QName("http://docs.oasis-open.org/ws-tx/wscoor/2006/06", "ActivationService")));
+            // activationService.set(new ActivationService(null, new QName("http://docs.oasis-open.org/ws-tx/wscoor/2006/06", "ActivationService")));
+            activationService.set(new ActivationService());
         }
         return activationService.get();
     }
@@ -52,7 +53,8 @@
     private static synchronized RegistrationService getRegistrationService()
     {
         if (registrationService.get() == null) {
-            registrationService.set(new RegistrationService(null, new QName("http://docs.oasis-open.org/ws-tx/wscoor/2006/06", "RegistrationService")));
+            // registrationService.set(new RegistrationService(null, new QName("http://docs.oasis-open.org/ws-tx/wscoor/2006/06", "RegistrationService")));
+            registrationService.set(new RegistrationService());
         }
         return registrationService.get();
     }

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/client/WSARJTXClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/client/WSARJTXClient.java	2010-07-01 11:47:36 UTC (rev 33716)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/client/WSARJTXClient.java	2010-07-01 13:59:57 UTC (rev 33717)
@@ -49,7 +49,8 @@
     private static synchronized TerminationCoordinatorService getTerminationCoordinatorService()
     {
         if (terminationCoordinatorService.get() == null) {
-            terminationCoordinatorService.set(new TerminationCoordinatorService(null, new QName("http://schemas.arjuna.com/ws/2005/10/wsarjtx", "TerminationCoordinatorService")));
+            //terminationCoordinatorService.set(new TerminationCoordinatorService(null, new QName("http://schemas.arjuna.com/ws/2005/10/wsarjtx", "TerminationCoordinatorService")));
+            terminationCoordinatorService.set(new TerminationCoordinatorService());
         }
         return terminationCoordinatorService.get();
     }
@@ -61,7 +62,8 @@
     private static synchronized TerminationParticipantService getTerminationParticipantService()
     {
         if (terminationParticipantService.get() == null) {
-            terminationParticipantService.set(new TerminationParticipantService(null, new QName("http://schemas.arjuna.com/ws/2005/10/wsarjtx", "TerminationParticipantService")));
+            //terminationParticipantService.set(new TerminationParticipantService(null, new QName("http://schemas.arjuna.com/ws/2005/10/wsarjtx", "TerminationParticipantService")));
+            terminationParticipantService.set(new TerminationParticipantService());
         }
         return terminationParticipantService.get();
     }

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/WSATClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/WSATClient.java	2010-07-01 11:47:36 UTC (rev 33716)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/WSATClient.java	2010-07-01 13:59:57 UTC (rev 33717)
@@ -54,7 +54,8 @@
     private static synchronized CoordinatorService getCoordinatorService()
     {
         if (coordinatorService.get() == null) {
-            coordinatorService.set(new CoordinatorService(null, new QName("http://docs.oasis-open.org/ws-tx/wsat/2006/06", "CoordinatorService")));
+            //coordinatorService.set(new CoordinatorService(null, new QName("http://docs.oasis-open.org/ws-tx/wsat/2006/06", "CoordinatorService")));
+            coordinatorService.set(new CoordinatorService());
         }
         return coordinatorService.get();
     }
@@ -66,7 +67,8 @@
     private static synchronized ParticipantService getParticipantService()
     {
         if (participantService.get() == null) {
-            participantService.set(new ParticipantService(null, new QName("http://docs.oasis-open.org/ws-tx/wsat/2006/06", "ParticipantService")));
+            //participantService.set(new ParticipantService(null, new QName("http://docs.oasis-open.org/ws-tx/wsat/2006/06", "ParticipantService")));
+            participantService.set(new ParticipantService());
         }
         return participantService.get();
     }
@@ -78,7 +80,8 @@
     private static synchronized CompletionCoordinatorService getCompletionCoordinatorService()
     {
         if (completionCoordinatorService.get() == null) {
-            completionCoordinatorService.set(new CompletionCoordinatorService(null, new QName("http://docs.oasis-open.org/ws-tx/wsat/2006/06", "CompletionCoordinatorService")));
+            //completionCoordinatorService.set(new CompletionCoordinatorService(null, new QName("http://docs.oasis-open.org/ws-tx/wsat/2006/06", "CompletionCoordinatorService")));
+            completionCoordinatorService.set(new CompletionCoordinatorService());
         }
         return completionCoordinatorService.get();
     }
@@ -90,7 +93,8 @@
     private static synchronized CompletionInitiatorService getCompletionInitiatorService()
     {
         if (completionInitiatorService.get() == null) {
-            completionInitiatorService.set(new CompletionInitiatorService(null, new QName("http://docs.oasis-open.org/ws-tx/wsat/2006/06", "CompletionInitiatorService")));
+            //completionInitiatorService.set(new CompletionInitiatorService(null, new QName("http://docs.oasis-open.org/ws-tx/wsat/2006/06", "CompletionInitiatorService")));
+            completionInitiatorService.set(new CompletionInitiatorService());
         }
         return completionInitiatorService.get();
     }

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/WSBAClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/WSBAClient.java	2010-07-01 11:47:36 UTC (rev 33716)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/WSBAClient.java	2010-07-01 13:59:57 UTC (rev 33717)
@@ -54,7 +54,8 @@
     private static synchronized BusinessAgreementWithParticipantCompletionCoordinatorService getParticipantCompletionCoordinatorService()
     {
         if (participantCompletionCoordinatorService.get() == null) {
-            participantCompletionCoordinatorService.set(new BusinessAgreementWithParticipantCompletionCoordinatorService(null, new QName("http://docs.oasis-open.org/ws-tx/wsba/2006/06", "BusinessAgreementWithParticipantCompletionCoordinatorService")));
+            //participantCompletionCoordinatorService.set(new BusinessAgreementWithParticipantCompletionCoordinatorService(null, new QName("http://docs.oasis-open.org/ws-tx/wsba/2006/06", "BusinessAgreementWithParticipantCompletionCoordinatorService")));
+            participantCompletionCoordinatorService.set(new BusinessAgreementWithParticipantCompletionCoordinatorService());
         }
         return participantCompletionCoordinatorService.get();
     }
@@ -66,7 +67,8 @@
     private static synchronized BusinessAgreementWithParticipantCompletionParticipantService getParticipantCompletionParticipantService()
     {
         if (participantCompletionParticipantService.get() == null) {
-            participantCompletionParticipantService.set(new BusinessAgreementWithParticipantCompletionParticipantService(null, new QName("http://docs.oasis-open.org/ws-tx/wsba/2006/06", "BusinessAgreementWithParticipantCompletionParticipantService")));
+            //participantCompletionParticipantService.set(new BusinessAgreementWithParticipantCompletionParticipantService(null, new QName("http://docs.oasis-open.org/ws-tx/wsba/2006/06", "BusinessAgreementWithParticipantCompletionParticipantService")));
+            participantCompletionParticipantService.set(new BusinessAgreementWithParticipantCompletionParticipantService());
         }
         return participantCompletionParticipantService.get();
     }
@@ -78,7 +80,8 @@
     private static synchronized BusinessAgreementWithCoordinatorCompletionCoordinatorService getCoordinatorCompletionCoordinatorService()
     {
         if (coordinatorCompletionCoordinatorService.get() == null) {
-            coordinatorCompletionCoordinatorService.set(new BusinessAgreementWithCoordinatorCompletionCoordinatorService(null, new QName("http://docs.oasis-open.org/ws-tx/wsba/2006/06", "BusinessAgreementWithCoordinatorCompletionCoordinatorService")));
+            //coordinatorCompletionCoordinatorService.set(new BusinessAgreementWithCoordinatorCompletionCoordinatorService(null, new QName("http://docs.oasis-open.org/ws-tx/wsba/2006/06", "BusinessAgreementWithCoordinatorCompletionCoordinatorService")));
+            coordinatorCompletionCoordinatorService.set(new BusinessAgreementWithCoordinatorCompletionCoordinatorService());
         }
         return coordinatorCompletionCoordinatorService.get();
     }
@@ -90,7 +93,8 @@
     private static synchronized BusinessAgreementWithCoordinatorCompletionParticipantService getCoordinatorCompletionParticipantService()
     {
         if (coordinatorCompletionParticipantService.get() == null) {
-            coordinatorCompletionParticipantService.set(new BusinessAgreementWithCoordinatorCompletionParticipantService(null, new QName("http://docs.oasis-open.org/ws-tx/wsba/2006/06", "BusinessAgreementWithCoordinatorCompletionParticipantService")));
+            //coordinatorCompletionParticipantService.set(new BusinessAgreementWithCoordinatorCompletionParticipantService(null, new QName("http://docs.oasis-open.org/ws-tx/wsba/2006/06", "BusinessAgreementWithCoordinatorCompletionParticipantService")));
+            coordinatorCompletionParticipantService.set(new BusinessAgreementWithCoordinatorCompletionParticipantService());
         }
         return coordinatorCompletionParticipantService.get();
     }



More information about the jboss-svn-commits mailing list