[jboss-svn-commits] JBL Code SVN: r26562 - in labs/jbosstm/trunk/XTS: WS-T and 9 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri May 15 09:34:01 EDT 2009
Author: adinn
Date: 2009-05-15 09:34:01 -0400 (Fri, 15 May 2009)
New Revision: 26562
Added:
labs/jbosstm/trunk/XTS/demo/srcrpc/com/arjuna/mw/wst/service/
Removed:
labs/jbosstm/trunk/XTS/demo/srcrpc/com/arjuna/mw/wst/server/
Modified:
labs/jbosstm/trunk/XTS/WS-C/build.xml
labs/jbosstm/trunk/XTS/WS-T/build.xml
labs/jbosstm/trunk/XTS/WSCF/build.xml
labs/jbosstm/trunk/XTS/WSTX/build.xml
labs/jbosstm/trunk/XTS/WSTX/classes10/com/arjuna/mw/wst/client/JaxBaseHeaderContextProcessor.java
labs/jbosstm/trunk/XTS/WSTX/classes10/com/arjuna/mw/wst/service/JaxBaseHeaderContextProcessor.java
labs/jbosstm/trunk/XTS/demo/ddrpc/jboss/webservices.xml
labs/jbosstm/trunk/XTS/demo/srcrpc/com/arjuna/mw/wst/service/JaxRPCHeaderContextProcessor.java
labs/jbosstm/trunk/XTS/demo/srcrpc/com/arjuna/mw/wst/service/JaxRPCSubordinateHeaderContextProcessor.java
labs/jbosstm/trunk/XTS/demo/xts-build.xml
labs/jbosstm/trunk/XTS/sar/build.xml
Log:
fixed up XTS exports so demorpc code can define its own JaxRPC context handlers -- these were deleted in order to port to CXF and thismeans the demorpc version can only be built on JBossWS Native -- fixes JBTM-265
Modified: labs/jbosstm/trunk/XTS/WS-C/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/build.xml 2009-05-15 13:00:05 UTC (rev 26561)
+++ labs/jbosstm/trunk/XTS/WS-C/build.xml 2009-05-15 13:34:01 UTC (rev 26562)
@@ -75,7 +75,9 @@
<!-- 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 -->
+ <property name="ws-c10.api.classes" value="com/arjuna/webservices/wscoor/CoordinationConstants.class"/>
+
<property name="com.arjuna.buildsystem.dir" location="../../antbuildsystem"/>
<property name="com.arjuna.jta.install" location="../../install"/>
@@ -255,8 +257,11 @@
<fileset dir="${build.dev.classes.dir}" includes="${ws-c.api.classes}"/>
</jar>
<jar jarfile="${build.dev.lib.dir}/ws-c10.jar">
- <fileset dir="${build.dev.classes10.dir}"/>
+ <fileset dir="${build.dev.classes10.dir}" excludes="${ws-c10.api.classes}"/>
</jar>
+ <jar jarfile="${build.dev.lib.dir}/ws-c10-api.jar">
+ <fileset dir="${build.dev.classes10.dir}" includes="${ws-c10.api.classes}"/>
+ </jar>
<jar jarfile="${build.dev.lib.dir}/ws-c11.jar">
<fileset dir="${build.dev.classes11.dir}">
<exclude name="com/arjuna/webservices11/wscoor/sei/**"/>
@@ -285,6 +290,7 @@
<pathelement path="${build.dev.lib.dir}/ws-c.jar"/>
<pathelement path="${build.dev.lib.dir}/ws-c-api.jar"/>
<pathelement path="${build.dev.lib.dir}/ws-c10.jar"/>
+ <pathelement path="${build.dev.lib.dir}/ws-c10-api.jar"/>
<pathelement path="${build.dev.lib.dir}/ws-c11.jar"/>
<path refid="tests.lib.path"/>
<path refid="lib.ext.path"/>
Modified: labs/jbosstm/trunk/XTS/WS-T/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/build.xml 2009-05-15 13:00:05 UTC (rev 26561)
+++ labs/jbosstm/trunk/XTS/WS-T/build.xml 2009-05-15 13:34:01 UTC (rev 26562)
@@ -113,6 +113,7 @@
<property name="ws-c.libs" value="ws-c.jar"/>
<property name="ws-c.api.libs" value="ws-c-api.jar"/>
<property name="ws-c10.libs" value="ws-c10.jar"/>
+ <property name="ws-c10.api.libs" value="ws-c10-api.jar"/>
<property name="ws-c11.libs" value="ws-c11.jar"/>
<property name="wscf.libs" value="wscf.jar"/>
<property name="wscf10.libs" value="wscf10.jar"/>
@@ -125,7 +126,7 @@
<fileset dir="${ws-c.build.dev.lib.dir}" includes="${ws-c.libs} ${ws-c.api.libs}"/>
</path>
<path id="ws-c10.path">
- <fileset dir="${ws-c.build.dev.lib.dir}" includes="${ws-c10.libs}"/>
+ <fileset dir="${ws-c.build.dev.lib.dir}" includes="${ws-c10.libs} ${ws-c10.api.libs}"/>
</path>
<path id="ws-c11.path">
<fileset dir="${ws-c.build.dev.lib.dir}" includes="${ws-c11.libs}"/>
Modified: labs/jbosstm/trunk/XTS/WSCF/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSCF/build.xml 2009-05-15 13:00:05 UTC (rev 26561)
+++ labs/jbosstm/trunk/XTS/WSCF/build.xml 2009-05-15 13:34:01 UTC (rev 26562)
@@ -90,6 +90,7 @@
<property name="wsc.libs" value="ws-c.jar"/>
<property name="wsc.api.libs" value="ws-c-api.jar"/>
<property name="wsc10.libs" value="ws-c10.jar"/>
+ <property name="wsc10.api.libs" value="ws-c10-api.jar"/>
<property name="wsc11.libs" value="ws-c11.jar"/>
<property name="com.arjuna.mwlabs.wscf.resourcebundle"
@@ -171,6 +172,7 @@
<path>
<pathelement path="${com.arjuna.mwlabs.wscf.dest}"/>
<pathelement path="${com.arjuna.mwlabs.wsc.jar.dest}/${wsc10.libs}"/>
+ <pathelement path="${com.arjuna.mwlabs.wsc.jar.dest}/${wsc10.api.libs}"/>
</path>
<path refid="com.arjuna.mwlabs.wscf.lib.classpath"/>
</classpath>
@@ -320,6 +322,7 @@
<pathelement path="${com.arjuna.mwlabs.wscf.jar.dest}/${com.arjuna.mwlabs.ts.modulename}10.jar"/>
<pathelement path="${com.arjuna.mwlabs.wscf.jar.dest}/${com.arjuna.mwlabs.ts.modulename}11.jar"/>
<pathelement path="${com.arjuna.mwlabs.wsc.jar.dest}/${wsc10.libs}"/>
+ <pathelement path="${com.arjuna.mwlabs.wsc.jar.dest}/${wsc10.api.libs}"/>
<pathelement path="${com.arjuna.mwlabs.wsc.jar.dest}/${wsc11.libs}"/>
<path refid="com.arjuna.mwlabs.wscf.tests.lib.path"/>
<path refid="com.arjuna.mwlabs.wscf.lib.classpath"/>
Modified: labs/jbosstm/trunk/XTS/WSTX/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/build.xml 2009-05-15 13:00:05 UTC (rev 26561)
+++ labs/jbosstm/trunk/XTS/WSTX/build.xml 2009-05-15 13:34:01 UTC (rev 26562)
@@ -113,6 +113,7 @@
<property name="wsc.libs" value="ws-c.jar"/>
<property name="wsc-api.libs" value="ws-c-api.jar"/>
<property name="wsc10.libs" value="ws-c10.jar"/>
+ <property name="wsc10-api.libs" value="ws-c10-api.jar"/>
<property name="wsc11.libs" value="ws-c11.jar"/>
<property name="wsc.all.libs" value="${wsc.libs} ${wsc10.libs} ${wsc11.libs}"/>
<property name="wscf.libs" value="wscf.jar"/>
@@ -174,7 +175,7 @@
</path>
<path id="com.arjuna.mwlabs.wstx.lib.classpath10">
- <fileset dir="${com.arjuna.mwlabs.wsc.jar.dest}" includes="${wsc10.libs}"/>
+ <fileset dir="${com.arjuna.mwlabs.wsc.jar.dest}" includes="${wsc10.libs} ${wsc10-api.libs}"/>
<fileset dir="${com.arjuna.mwlabs.wscf.jar.dest}" includes="${wscf10.libs}"/>
<fileset dir="${com.arjuna.mwlabs.wst.jar.dest}" includes="${wst10.libs} ${wst10-api.libs}"/>
</path>
Modified: labs/jbosstm/trunk/XTS/WSTX/classes10/com/arjuna/mw/wst/client/JaxBaseHeaderContextProcessor.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/classes10/com/arjuna/mw/wst/client/JaxBaseHeaderContextProcessor.java 2009-05-15 13:00:05 UTC (rev 26561)
+++ labs/jbosstm/trunk/XTS/WSTX/classes10/com/arjuna/mw/wst/client/JaxBaseHeaderContextProcessor.java 2009-05-15 13:34:01 UTC (rev 26562)
@@ -46,7 +46,7 @@
* @message com.arjuna.mw.wst.client.JaxHCP_1 [com.arjuna.mw.wst.client.JaxHCP_1] - Error in:
* @message com.arjuna.mw.wst.client.JaxHCP_2 [com.arjuna.mw.wst.client.JacHCP_2] - Stack trace:
*/
-class JaxBaseHeaderContextProcessor
+public class JaxBaseHeaderContextProcessor
{
/**
* Handle the request.
Modified: labs/jbosstm/trunk/XTS/WSTX/classes10/com/arjuna/mw/wst/service/JaxBaseHeaderContextProcessor.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/classes10/com/arjuna/mw/wst/service/JaxBaseHeaderContextProcessor.java 2009-05-15 13:00:05 UTC (rev 26561)
+++ labs/jbosstm/trunk/XTS/WSTX/classes10/com/arjuna/mw/wst/service/JaxBaseHeaderContextProcessor.java 2009-05-15 13:34:01 UTC (rev 26562)
@@ -41,7 +41,7 @@
* @message com.arjuna.mw.wst.service.JaxHCP_2 [com.arjuna.mw.wst.service.JaxHCP_2] - Stack trace:
* @message com.arjuna.mw.wst.service.JaxHCP_3 [com.arjuna.mw.wst.service.JaxHCP_3] - Unknown context type:
*/
-class JaxBaseHeaderContextProcessor
+public class JaxBaseHeaderContextProcessor
{
/**
* Handle the request.
Modified: labs/jbosstm/trunk/XTS/demo/ddrpc/jboss/webservices.xml
===================================================================
--- labs/jbosstm/trunk/XTS/demo/ddrpc/jboss/webservices.xml 2009-05-15 13:00:05 UTC (rev 26561)
+++ labs/jbosstm/trunk/XTS/demo/ddrpc/jboss/webservices.xml 2009-05-15 13:34:01 UTC (rev 26562)
@@ -38,7 +38,7 @@
</service-impl-bean>
<handler>
<handler-name>serverHandler</handler-name>
- <handler-class>com.arjuna.mw.wst.server.JaxRPCHeaderContextProcessor</handler-class>
+ <handler-class>com.arjuna.mw.wst.service.JaxRPCHeaderContextProcessor</handler-class>
</handler>
</port-component>
</webservice-description>
@@ -57,7 +57,7 @@
</service-impl-bean>
<handler>
<handler-name>serverHandler</handler-name>
- <handler-class>com.arjuna.mw.wst.server.JaxRPCHeaderContextProcessor</handler-class>
+ <handler-class>com.arjuna.mw.wst.service.JaxRPCHeaderContextProcessor</handler-class>
</handler>
</port-component>
</webservice-description>
@@ -76,7 +76,7 @@
</service-impl-bean>
<handler>
<handler-name>serverHandler</handler-name>
- <handler-class>com.arjuna.mw.wst.server.JaxRPCHeaderContextProcessor</handler-class>
+ <handler-class>com.arjuna.mw.wst.service.JaxRPCHeaderContextProcessor</handler-class>
</handler>
</port-component>
</webservice-description>
@@ -95,7 +95,7 @@
</service-impl-bean>
<handler>
<handler-name>serverHandler</handler-name>
- <handler-class>com.arjuna.mw.wst.server.JaxRPCHeaderContextProcessor</handler-class>
+ <handler-class>com.arjuna.mw.wst.service.JaxRPCHeaderContextProcessor</handler-class>
</handler>
</port-component>
</webservice-description>
@@ -114,7 +114,7 @@
</service-impl-bean>
<handler>
<handler-name>serverHandler</handler-name>
- <handler-class>com.arjuna.mw.wst.server.JaxRPCHeaderContextProcessor</handler-class>
+ <handler-class>com.arjuna.mw.wst.service.JaxRPCHeaderContextProcessor</handler-class>
</handler>
</port-component>
</webservice-description>
@@ -133,7 +133,7 @@
</service-impl-bean>
<handler>
<handler-name>serverHandler</handler-name>
- <handler-class>com.arjuna.mw.wst.server.JaxRPCHeaderContextProcessor</handler-class>
+ <handler-class>com.arjuna.mw.wst.service.JaxRPCHeaderContextProcessor</handler-class>
</handler>
</port-component>
</webservice-description>
Copied: labs/jbosstm/trunk/XTS/demo/srcrpc/com/arjuna/mw/wst/service (from rev 26502, labs/jbosstm/trunk/XTS/demo/srcrpc/com/arjuna/mw/wst/server)
Modified: labs/jbosstm/trunk/XTS/demo/srcrpc/com/arjuna/mw/wst/service/JaxRPCHeaderContextProcessor.java
===================================================================
--- labs/jbosstm/trunk/XTS/demo/srcrpc/com/arjuna/mw/wst/server/JaxRPCHeaderContextProcessor.java 2009-05-13 10:55:49 UTC (rev 26502)
+++ labs/jbosstm/trunk/XTS/demo/srcrpc/com/arjuna/mw/wst/service/JaxRPCHeaderContextProcessor.java 2009-05-15 13:34:01 UTC (rev 26562)
@@ -29,24 +29,17 @@
* $Id$
*/
-package com.arjuna.mw.wst.server;
+package com.arjuna.mw.wst.service;
import javax.xml.namespace.QName;
import javax.xml.rpc.handler.Handler;
import javax.xml.rpc.handler.HandlerInfo;
import javax.xml.rpc.handler.MessageContext;
import javax.xml.rpc.handler.soap.SOAPMessageContext;
-import javax.xml.soap.Name;
-import javax.xml.soap.SOAPEnvelope;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPFactory;
-import javax.xml.soap.SOAPHeader;
-import javax.xml.soap.SOAPHeaderElement;
import javax.xml.soap.SOAPMessage;
import com.arjuna.webservices.wscoor.CoordinationConstants;
-import com.arjuna.mw.wst.service.JaxBaseHeaderContextProcessor;
/**
* The class is used to perform WS-Transaction context insertion
Modified: labs/jbosstm/trunk/XTS/demo/srcrpc/com/arjuna/mw/wst/service/JaxRPCSubordinateHeaderContextProcessor.java
===================================================================
--- labs/jbosstm/trunk/XTS/demo/srcrpc/com/arjuna/mw/wst/server/JaxRPCSubordinateHeaderContextProcessor.java 2009-05-13 10:55:49 UTC (rev 26502)
+++ labs/jbosstm/trunk/XTS/demo/srcrpc/com/arjuna/mw/wst/service/JaxRPCSubordinateHeaderContextProcessor.java 2009-05-15 13:34:01 UTC (rev 26562)
@@ -29,7 +29,7 @@
* $Id$
*/
-package com.arjuna.mw.wst.server;
+package com.arjuna.mw.wst.service;
import javax.xml.rpc.handler.Handler;
import javax.xml.rpc.handler.MessageContext;
Modified: labs/jbosstm/trunk/XTS/demo/xts-build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/demo/xts-build.xml 2009-05-15 13:00:05 UTC (rev 26561)
+++ labs/jbosstm/trunk/XTS/demo/xts-build.xml 2009-05-15 13:34:01 UTC (rev 26562)
@@ -188,6 +188,8 @@
<patternset>
<include name="com/arjuna/xts/nightout/clients/jboss/**"/>
<include name="com/arjuna/xts/nightout/services/**"/>
+ <!-- JaxRPC handlers have been removed from the XTS src as part of CXF port -->
+ <include name="com/arjuna/mw/**"/>
</patternset>
</javac>
</target>
@@ -244,6 +246,7 @@
<webinf dir="${jboss.ddrpc.dir}" excludes="client-web-app.xml service-web-app.xml application.xml client-jaxrpc-mapping.xml"/>
<classes dir="${buildrpc.dir}/classes">
<include name="com/arjuna/xts/nightout/services/**"/>
+ <include name="com/arjuna/mw/wst/service/**/*"/>
</classes>
</war>
</target>
@@ -290,6 +293,7 @@
<war warfile="${buildrpc.dir}/xts-demorpc.war" webxml="${buildrpc.dir}/client-web-app.xml">
<classes dir="${buildrpc.dir}/classes">
<exclude name="com/arjuna/xts/nightout/services/**/*"/>
+ <exclude name="com/arjuna/mw/wst/service/**/*"/>
</classes>
<fileset dir="${web.dir}" excludes="index.jsp indexrpc.jsp"/>
<fileset dir="${build.web.dir}" includes="index.jsp"/>
Modified: labs/jbosstm/trunk/XTS/sar/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/sar/build.xml 2009-05-15 13:00:05 UTC (rev 26561)
+++ labs/jbosstm/trunk/XTS/sar/build.xml 2009-05-15 13:34:01 UTC (rev 26562)
@@ -78,6 +78,7 @@
<property name="jboss.client.lib.jars" value="jaxb-api.jar jboss-javaee.jar jbossws-native-jaxrpc.jar
jbossws-native-jaxws.jar jbossws-client.jar stax-api.jar jbossws-native-saaj.jar
jbossws-native-jaxws-ext.jar jbossws-native-core.jar jbossws-common.jar jboss-logging-spi.jar ${cxf.client.lib.jars}"/>
+
<property name="jboss.client.lib.dir" value="${jbossas.home}/client"/>
<!-- enable debugging of XTS service code -->
@@ -164,6 +165,7 @@
<target name="api-both-jar">
<mkdir dir="${build.dir}/tmp/api"/>
<unjar src="${lib.dir}/ws-c-api.jar" dest="${build.dir}/tmp/api"/>
+ <unjar src="${lib.dir}/ws-c10-api.jar" dest="${build.dir}/tmp/api"/>
<unjar src="${lib.dir}/ws-t-api.jar" dest="${build.dir}/tmp/api"/>
<unjar src="${lib.dir}/ws-t10-api.jar" dest="${build.dir}/tmp/api"/>
<unjar src="${lib.dir}/ws-t11-api.jar" dest="${build.dir}/tmp/api"/>
@@ -198,6 +200,7 @@
<target name="api10-jar">
<mkdir dir="${build.dir}/tmp/api"/>
<unjar src="${lib.dir}/ws-c-api.jar" dest="${build.dir}/tmp/api"/>
+ <unjar src="${lib.dir}/ws-c10-api.jar" dest="${build.dir}/tmp/api"/>
<unjar src="${lib.dir}/ws-t-api.jar" dest="${build.dir}/tmp/api"/>
<unjar src="${lib.dir}/ws-t10-api.jar" dest="${build.dir}/tmp/api"/>
<unjar src="${lib.dir}/wstx-api.jar" dest="${build.dir}/tmp/api"/>
More information about the jboss-svn-commits
mailing list