[jboss-svn-commits] JBL Code SVN: r34835 - in labs/jbosstm/trunk/XTS: WS-C/dev/src11/com/arjuna/webservices11/wscoor/sei and 4 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Mon Aug 23 12:15:43 EDT 2010


Author: adinn
Date: 2010-08-23 12:15:42 -0400 (Mon, 23 Aug 2010)
New Revision: 34835

Modified:
   labs/jbosstm/trunk/XTS/WS-C/build.xml
   labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/sei/ActivationPortTypeImpl.java
   labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/sei/RegistrationPortTypeImpl.java
   labs/jbosstm/trunk/XTS/WS-T/build.xml
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/sei/TerminationCoordinatorPortTypeImpl.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/sei/TerminationParticipantPortTypeImpl.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/sei/CompletionCoordinatorPortTypeImpl.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/sei/CompletionInitiatorPortTypeImpl.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/sei/CoordinatorPortTypeImpl.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/sei/ParticipantPortTypeImpl.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithCoordinatorCompletionCoordinatorPortTypeImpl.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithCoordinatorCompletionParticipantPortTypeImpl.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithParticipantCompletionCoordinatorPortTypeImpl.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithParticipantCompletionParticipantPortTypeImpl.java
Log:
provided different names for installed ws-c and ws-t handler files -- fixes for JBTM-777

Modified: labs/jbosstm/trunk/XTS/WS-C/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/build.xml	2010-08-23 15:41:23 UTC (rev 34834)
+++ labs/jbosstm/trunk/XTS/WS-C/build.xml	2010-08-23 16:15:42 UTC (rev 34835)
@@ -74,7 +74,7 @@
 
     <!-- classes provided for clients via api jar -->
     <property name="ws-c.api.classes" value="com/arjuna/wsc/AlreadyRegisteredException.class"/>
-    <!-- we had to delete the JaxRPC handlers so we export the bist needed to allow clients to create them -->
+    <!-- we had to delete the JaxRPC handlers so we export the bits needed to allow clients to create them -->
     <property name="ws-c10.api.classes" value="com/arjuna/webservices/wscoor/CoordinationConstants.class"/>
 
     <property name="tests.libs" value="junit.jar"/>
@@ -174,11 +174,9 @@
     </target>
 
     <target name="jars11">
+        <copy file="${dd.dir}/ws-c_handlers.xml" tofile="${build.classes11.dir}/ws-c_handlers.xml"/>
         <jar jarfile="${build.lib.dir}/ws-c11.jar">
-            <fileset dir="${build.classes11.dir}">
-                <exclude name="com/arjuna/webservices11/wscoor/sei/**"/>
-                <exclude name="handlers.xml"/>
-            </fileset>
+            <fileset dir="${build.classes11.dir}"/>
         </jar>
     </target>
 
@@ -189,11 +187,9 @@
         <jar jarfile="${build.lib.dir}/ws-c10-api.jar">
             <fileset dir="${build.classes10.dir}" includes="${ws-c10.api.classes}"/>
         </jar>
+        <copy file="${dd.dir}/ws-c_handlers.xml" tofile="${build.classes11.dir}/ws-c_handlers.xml"/>
         <jar jarfile="${build.lib.dir}/ws-c11.jar">
-            <fileset dir="${build.classes11.dir}">
-                <exclude name="com/arjuna/webservices11/wscoor/sei/**"/>
-                <exclude name="handlers.xml"/>
-            </fileset>
+            <fileset dir="${build.classes11.dir}"/>
         </jar>
     </target>
 
@@ -206,11 +202,7 @@
 
     <target name="webapps11" depends="jars11" >
         <copy file="${dd.dir}/ws-c11_web-app.xml" tofile="${build.dd.dir}/web-app11.xml"/>
-        <copy file="${dd.dir}/ws-c_handlers.xml" tofile="${build.classes11.dir}/handlers.xml"/>
-        <war warfile="${build.webapps.dir}/ws-c11.war" webxml="${build.dd.dir}/web-app11.xml">
-            <webinf dir="${build.dir}/classes11" includes="classes/com/arjuna/webservices11/wscoor/sei/* classes/handlers.xml"/>
-            <webinf dir="${build.dd.dir}" includes="wsdl/**"/>
-        </war>
+        <war warfile="${build.webapps.dir}/ws-c11.war" webxml="${build.dd.dir}/web-app11.xml"/>
     </target>
 
     <target name="webapps" depends="jars, webapps11, webapps10"/>

Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/sei/ActivationPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/sei/ActivationPortTypeImpl.java	2010-08-23 15:41:23 UTC (rev 34834)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/sei/ActivationPortTypeImpl.java	2010-08-23 16:15:42 UTC (rev 34835)
@@ -31,7 +31,7 @@
 )
 @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
 // @EndpointConfig(configName = "Standard WSAddressing Endpoint")
- at HandlerChain(file="/handlers.xml")
+ at HandlerChain(file="/ws-c_handlers.xml")
 @Addressing(required=true)
 public class ActivationPortTypeImpl // implements ActivationPortType
 {

Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/sei/RegistrationPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/sei/RegistrationPortTypeImpl.java	2010-08-23 15:41:23 UTC (rev 34834)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/sei/RegistrationPortTypeImpl.java	2010-08-23 16:15:42 UTC (rev 34835)
@@ -34,7 +34,7 @@
 )
 @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
 // @EndpointConfig(configName = "Standard WSAddressing Endpoint")
- at HandlerChain(file="/handlers.xml")
+ at HandlerChain(file="/ws-c_handlers.xml")
 @Addressing(required=true)
 public class RegistrationPortTypeImpl // implements RegistrationPortType
 {

Modified: labs/jbosstm/trunk/XTS/WS-T/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/build.xml	2010-08-23 15:41:23 UTC (rev 34834)
+++ labs/jbosstm/trunk/XTS/WS-T/build.xml	2010-08-23 16:15:42 UTC (rev 34835)
@@ -284,9 +284,9 @@
     </target>
 
     <target name="jars11">
-        <copy file="${dd.dir}/ws-t_handlers.xml" tofile="${build.classes11.dir}/handlers.xml"/>
+        <copy file="${dd.dir}/ws-t_handlers.xml" tofile="${build.classes11.dir}/ws-t_handlers.xml"/>
         <jar jarfile="${build.lib.dir}/ws-t11.jar">
-            <fileset dir="${build.classes11.dir}"/>
+            <fileset dir="${build.classes11.dir}" excludes="${ws-t11.api.classes}"/>
         </jar>
         <jar jarfile="${build.lib.dir}/ws-t11-api.jar">
             <fileset dir="${build.classes11.dir}" includes="${ws-t11.api.classes}"/>

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/sei/TerminationCoordinatorPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/sei/TerminationCoordinatorPortTypeImpl.java	2010-08-23 15:41:23 UTC (rev 34834)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/sei/TerminationCoordinatorPortTypeImpl.java	2010-08-23 16:15:42 UTC (rev 34835)
@@ -33,7 +33,7 @@
         portName = "TerminationCoordinatorPortType"
 )
 @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
- at HandlerChain(file="/handlers.xml")
+ at HandlerChain(file="/ws-t_handlers.xml")
 @Addressing(required=true)
 public class TerminationCoordinatorPortTypeImpl implements TerminationCoordinatorPortType
 {

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/sei/TerminationParticipantPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/sei/TerminationParticipantPortTypeImpl.java	2010-08-23 15:41:23 UTC (rev 34834)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/sei/TerminationParticipantPortTypeImpl.java	2010-08-23 16:15:42 UTC (rev 34835)
@@ -37,7 +37,7 @@
         portName = "TerminationParticipantPortType"
 )
 @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
- at HandlerChain(file="/handlers.xml")
+ at HandlerChain(file="/ws-t_handlers.xml")
 @Addressing(required=true)
 public class TerminationParticipantPortTypeImpl implements TerminationParticipantPortType
 {

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/sei/CompletionCoordinatorPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/sei/CompletionCoordinatorPortTypeImpl.java	2010-08-23 15:41:23 UTC (rev 34834)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/sei/CompletionCoordinatorPortTypeImpl.java	2010-08-23 16:15:42 UTC (rev 34835)
@@ -30,7 +30,7 @@
         portName = "CompletionCoordinatorPortType"
 )
 @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
- at HandlerChain(file="/handlers.xml")
+ at HandlerChain(file="/ws-t_handlers.xml")
 @Addressing(required=true)
 public class CompletionCoordinatorPortTypeImpl // implements CompletionCoordinatorPortType
 {

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/sei/CompletionInitiatorPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/sei/CompletionInitiatorPortTypeImpl.java	2010-08-23 15:41:23 UTC (rev 34834)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/sei/CompletionInitiatorPortTypeImpl.java	2010-08-23 16:15:42 UTC (rev 34835)
@@ -32,7 +32,7 @@
         portName = "CompletionInitiatorPortType"
 )
 @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
- at HandlerChain(file="/handlers.xml")
+ at HandlerChain(file="/ws-t_handlers.xml")
 @Addressing(required=true)
 public class CompletionInitiatorPortTypeImpl // implements CompletionInitiatorPortType
 {

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/sei/CoordinatorPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/sei/CoordinatorPortTypeImpl.java	2010-08-23 15:41:23 UTC (rev 34834)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/sei/CoordinatorPortTypeImpl.java	2010-08-23 16:15:42 UTC (rev 34835)
@@ -32,7 +32,7 @@
         portName = "CoordinatorPortType"
 )
 @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
- at HandlerChain(file="/handlers.xml")
+ at HandlerChain(file="/ws-t_handlers.xml")
 @Addressing(required=true)
 public class CoordinatorPortTypeImpl // implements CoordinatorPortType
 {

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/sei/ParticipantPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/sei/ParticipantPortTypeImpl.java	2010-08-23 15:41:23 UTC (rev 34834)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/sei/ParticipantPortTypeImpl.java	2010-08-23 16:15:42 UTC (rev 34835)
@@ -32,7 +32,7 @@
         portName = "ParticipantPortType"
 )
 @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
- at HandlerChain(file="/handlers.xml")
+ at HandlerChain(file="/ws-t_handlers.xml")
 @Addressing(required=true)
 public class ParticipantPortTypeImpl // implements ParticipantPortType
 {

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithCoordinatorCompletionCoordinatorPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithCoordinatorCompletionCoordinatorPortTypeImpl.java	2010-08-23 15:41:23 UTC (rev 34834)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithCoordinatorCompletionCoordinatorPortTypeImpl.java	2010-08-23 16:15:42 UTC (rev 34835)
@@ -35,7 +35,7 @@
         portName = "BusinessAgreementWithCoordinatorCompletionCoordinatorPortType"
 )
 @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
- at HandlerChain(file="/handlers.xml")
+ at HandlerChain(file="/ws-t_handlers.xml")
 @Addressing(required=true)
 public class BusinessAgreementWithCoordinatorCompletionCoordinatorPortTypeImpl // implements BusinessAgreementWithCoordinatorCompletionCoordinatorPortType
 {

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithCoordinatorCompletionParticipantPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithCoordinatorCompletionParticipantPortTypeImpl.java	2010-08-23 15:41:23 UTC (rev 34834)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithCoordinatorCompletionParticipantPortTypeImpl.java	2010-08-23 16:15:42 UTC (rev 34835)
@@ -35,7 +35,7 @@
         portName = "BusinessAgreementWithCoordinatorCompletionParticipantPortType"
 )
 @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
- at HandlerChain(file="/handlers.xml")
+ at HandlerChain(file="/ws-t_handlers.xml")
 @Addressing(required=true)
 public class BusinessAgreementWithCoordinatorCompletionParticipantPortTypeImpl implements BusinessAgreementWithCoordinatorCompletionParticipantPortType
 {

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithParticipantCompletionCoordinatorPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithParticipantCompletionCoordinatorPortTypeImpl.java	2010-08-23 15:41:23 UTC (rev 34834)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithParticipantCompletionCoordinatorPortTypeImpl.java	2010-08-23 16:15:42 UTC (rev 34835)
@@ -34,7 +34,7 @@
         portName = "BusinessAgreementWithParticipantCompletionCoordinatorPortType"
 )
 @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
- at HandlerChain(file="/handlers.xml")
+ at HandlerChain(file="/ws-t_handlers.xml")
 @Addressing(required=true)
 public class BusinessAgreementWithParticipantCompletionCoordinatorPortTypeImpl // implements BusinessAgreementWithParticipantCompletionCoordinatorPortType
 {

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithParticipantCompletionParticipantPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithParticipantCompletionParticipantPortTypeImpl.java	2010-08-23 15:41:23 UTC (rev 34834)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithParticipantCompletionParticipantPortTypeImpl.java	2010-08-23 16:15:42 UTC (rev 34835)
@@ -34,7 +34,7 @@
         portName = "BusinessAgreementWithParticipantCompletionParticipantPortType"
 )
 @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
- at HandlerChain(file="/handlers.xml")
+ at HandlerChain(file="/ws-t_handlers.xml")
 @Addressing(required=true)
 public class BusinessAgreementWithParticipantCompletionParticipantPortTypeImpl // implements BusinessAgreementWithParticipantCompletionParticipantPortType
 {



More information about the jboss-svn-commits mailing list