[jboss-svn-commits] JBL Code SVN: r37273 - in labs/jbosstm/trunk/XTS: demo and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Jul 20 06:49:43 EDT 2011
Author: adinn
Date: 2011-07-20 06:49:43 -0400 (Wed, 20 Jul 2011)
New Revision: 37273
Modified:
labs/jbosstm/trunk/XTS/WSTX/classes11/com/arjuna/mw/wst11/common/CoordinationContextHelper.java
labs/jbosstm/trunk/XTS/demo/src/com/jboss/jbosstm/xts/demo/client/BasicClient.java
labs/jbosstm/trunk/XTS/demo/src/com/jboss/jbosstm/xts/demo/services/restaurant/RestaurantServiceAT.java
labs/jbosstm/trunk/XTS/demo/src/com/jboss/jbosstm/xts/demo/services/restaurant/RestaurantServiceBA.java
labs/jbosstm/trunk/XTS/demo/src/com/jboss/jbosstm/xts/demo/services/taxi/TaxiServiceAT.java
labs/jbosstm/trunk/XTS/demo/src/com/jboss/jbosstm/xts/demo/services/taxi/TaxiServiceBA.java
labs/jbosstm/trunk/XTS/demo/src/com/jboss/jbosstm/xts/demo/services/theatre/TheatreServiceAT.java
labs/jbosstm/trunk/XTS/demo/src/com/jboss/jbosstm/xts/demo/services/theatre/TheatreServiceBA.java
labs/jbosstm/trunk/XTS/demo/xts-build.xml
Log:
modified demo to work on AS7. required adding dependencies, moving WSDL and handler files around (which should have just worked) and fixing the context serialise/deserialise to use the XTS module loader as th ethread context loader so it finds the JAXB factory -- fixes for JBTM-848
Modified: labs/jbosstm/trunk/XTS/WSTX/classes11/com/arjuna/mw/wst11/common/CoordinationContextHelper.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/classes11/com/arjuna/mw/wst11/common/CoordinationContextHelper.java 2011-07-20 10:45:52 UTC (rev 37272)
+++ labs/jbosstm/trunk/XTS/WSTX/classes11/com/arjuna/mw/wst11/common/CoordinationContextHelper.java 2011-07-20 10:49:43 UTC (rev 37273)
@@ -45,7 +45,11 @@
public static CoordinationContextType deserialise(final Element headerElement)
throws JAXBException
{
+ Thread current =Thread.currentThread();
+ ClassLoader loader = current.getContextClassLoader();
try {
+ // use the XTS module loader so that JAXB can find its factory
+ current.setContextClassLoader(CoordinationContextHelper.class.getClassLoader());
JAXBContext jaxbContext = JAXBContext.newInstance("org.oasis_open.docs.ws_tx.wscoor._2006._06");
Unmarshaller unmarshaller;
unmarshaller = jaxbContext.createUnmarshaller();
@@ -57,6 +61,9 @@
return coordinationContextType;
} catch (JAXBException jaxbe) {
return null;
+ } finally {
+ // restore the original loader
+ current.setContextClassLoader(loader);
}
}
@@ -73,7 +80,11 @@
// only generate a Node and we need to add a SOAPHeaderElement. So, we cheat by serialising the
// coordinationContextType into a header created by the caller, moving all its children into the
// header element and then deleting it.
+ Thread current =Thread.currentThread();
+ ClassLoader loader = current.getContextClassLoader();
try {
+ // use the XTS module loader so that JAXB can find its factory
+ current.setContextClassLoader(CoordinationContextHelper.class.getClassLoader());
JAXBContext jaxbContext = JAXBContext.newInstance("org.oasis_open.docs.ws_tx.wscoor._2006._06");
Marshaller marshaller;
marshaller = jaxbContext.createMarshaller();
@@ -105,6 +116,9 @@
}
headerElement.removeChild(element);
} catch (JAXBException jaxbe) {
+ } finally {
+ // restore the original loader
+ current.setContextClassLoader(loader);
}
}
}
\ No newline at end of file
Modified: labs/jbosstm/trunk/XTS/demo/src/com/jboss/jbosstm/xts/demo/client/BasicClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/demo/src/com/jboss/jbosstm/xts/demo/client/BasicClient.java 2011-07-20 10:45:52 UTC (rev 37272)
+++ labs/jbosstm/trunk/XTS/demo/src/com/jboss/jbosstm/xts/demo/client/BasicClient.java 2011-07-20 10:49:43 UTC (rev 37273)
@@ -589,7 +589,7 @@
final String address, final String wsdlURL, final Class<T> clazz)
throws MalformedURLException
{
- URL url = BasicClient.class.getResource("../../../../../../../" + wsdlURL);
+ URL url = BasicClient.class.getResource("/" + wsdlURL);
Service service = Service.create(url, serviceName);
T port = service.getPort(endpointName, clazz);
BindingProvider bindingProvider = ((BindingProvider) port);
Modified: labs/jbosstm/trunk/XTS/demo/src/com/jboss/jbosstm/xts/demo/services/restaurant/RestaurantServiceAT.java
===================================================================
--- labs/jbosstm/trunk/XTS/demo/src/com/jboss/jbosstm/xts/demo/services/restaurant/RestaurantServiceAT.java 2011-07-20 10:45:52 UTC (rev 37272)
+++ labs/jbosstm/trunk/XTS/demo/src/com/jboss/jbosstm/xts/demo/services/restaurant/RestaurantServiceAT.java 2011-07-20 10:49:43 UTC (rev 37273)
@@ -50,7 +50,7 @@
@WebService(serviceName="RestaurantServiceATService", portName="RestaurantServiceAT",
name = "IRestaurantServiceAT", targetNamespace = "http://www.jboss.com/jbosstm/xts/demo/Restaurant",
wsdlLocation = "/WEB-INF/wsdl/RestaurantServiceAT.wsdl")
- at HandlerChain(file = "../context-handlers.xml", name = "Context Handlers")
+ at HandlerChain(file = "/context-handlers.xml", name = "Context Handlers")
@SOAPBinding(style=SOAPBinding.Style.RPC)
public class RestaurantServiceAT implements IRestaurantServiceAT
{
Modified: labs/jbosstm/trunk/XTS/demo/src/com/jboss/jbosstm/xts/demo/services/restaurant/RestaurantServiceBA.java
===================================================================
--- labs/jbosstm/trunk/XTS/demo/src/com/jboss/jbosstm/xts/demo/services/restaurant/RestaurantServiceBA.java 2011-07-20 10:45:52 UTC (rev 37272)
+++ labs/jbosstm/trunk/XTS/demo/src/com/jboss/jbosstm/xts/demo/services/restaurant/RestaurantServiceBA.java 2011-07-20 10:49:43 UTC (rev 37273)
@@ -49,7 +49,7 @@
@WebService(serviceName="RestaurantServiceBAService", portName="RestaurantServiceBA",
name = "IRestaurantServiceBA", targetNamespace = "http://www.jboss.com/jbosstm/xts/demo/Restaurant",
wsdlLocation = "/WEB-INF/wsdl/RestaurantServiceBA.wsdl")
- at HandlerChain(file = "../context-handlers.xml", name = "Context Handlers")
+ at HandlerChain(file = "/context-handlers.xml", name = "Context Handlers")
@SOAPBinding(style=SOAPBinding.Style.RPC)
public class RestaurantServiceBA implements IRestaurantServiceBA
{
Modified: labs/jbosstm/trunk/XTS/demo/src/com/jboss/jbosstm/xts/demo/services/taxi/TaxiServiceAT.java
===================================================================
--- labs/jbosstm/trunk/XTS/demo/src/com/jboss/jbosstm/xts/demo/services/taxi/TaxiServiceAT.java 2011-07-20 10:45:52 UTC (rev 37272)
+++ labs/jbosstm/trunk/XTS/demo/src/com/jboss/jbosstm/xts/demo/services/taxi/TaxiServiceAT.java 2011-07-20 10:49:43 UTC (rev 37273)
@@ -49,7 +49,7 @@
@WebService(serviceName="TaxiServiceATService", portName="TaxiServiceAT",
name = "ITaxiServiceAT", targetNamespace = "http://www.jboss.com/jbosstm/xts/demo/Taxi",
wsdlLocation = "/WEB-INF/wsdl/TaxiServiceAT.wsdl")
- at HandlerChain(file = "../context-handlers.xml", name = "Context Handlers")
+ at HandlerChain(file = "/context-handlers.xml", name = "Context Handlers")
@SOAPBinding(style=SOAPBinding.Style.RPC)
public class TaxiServiceAT implements ITaxiServiceAT
{
Modified: labs/jbosstm/trunk/XTS/demo/src/com/jboss/jbosstm/xts/demo/services/taxi/TaxiServiceBA.java
===================================================================
--- labs/jbosstm/trunk/XTS/demo/src/com/jboss/jbosstm/xts/demo/services/taxi/TaxiServiceBA.java 2011-07-20 10:45:52 UTC (rev 37272)
+++ labs/jbosstm/trunk/XTS/demo/src/com/jboss/jbosstm/xts/demo/services/taxi/TaxiServiceBA.java 2011-07-20 10:49:43 UTC (rev 37273)
@@ -52,7 +52,7 @@
@WebService(serviceName="TaxiServiceBAService", portName="TaxiServiceBA",
name = "ITaxiServiceBA", targetNamespace = "http://www.jboss.com/jbosstm/xts/demo/Taxi",
wsdlLocation = "/WEB-INF/wsdl/TaxiServiceBA.wsdl")
- at HandlerChain(file = "../context-handlers.xml", name = "Context Handlers")
+ at HandlerChain(file = "/context-handlers.xml", name = "Context Handlers")
@SOAPBinding(style=SOAPBinding.Style.RPC)
public class TaxiServiceBA implements ITaxiServiceBA
{
Modified: labs/jbosstm/trunk/XTS/demo/src/com/jboss/jbosstm/xts/demo/services/theatre/TheatreServiceAT.java
===================================================================
--- labs/jbosstm/trunk/XTS/demo/src/com/jboss/jbosstm/xts/demo/services/theatre/TheatreServiceAT.java 2011-07-20 10:45:52 UTC (rev 37272)
+++ labs/jbosstm/trunk/XTS/demo/src/com/jboss/jbosstm/xts/demo/services/theatre/TheatreServiceAT.java 2011-07-20 10:49:43 UTC (rev 37273)
@@ -51,7 +51,7 @@
@WebService(serviceName="TheatreServiceATService", portName="TheatreServiceAT",
name = "ITheatreServiceAT", targetNamespace = "http://www.jboss.com/jbosstm/xts/demo/Theatre",
wsdlLocation = "/WEB-INF/wsdl/TheatreServiceAT.wsdl")
- at HandlerChain(file = "../context-handlers.xml", name = "Context Handlers")
+ at HandlerChain(file = "/context-handlers.xml", name = "Context Handlers")
@SOAPBinding(style=SOAPBinding.Style.RPC)
public class TheatreServiceAT implements ITheatreServiceAT
{
Modified: labs/jbosstm/trunk/XTS/demo/src/com/jboss/jbosstm/xts/demo/services/theatre/TheatreServiceBA.java
===================================================================
--- labs/jbosstm/trunk/XTS/demo/src/com/jboss/jbosstm/xts/demo/services/theatre/TheatreServiceBA.java 2011-07-20 10:45:52 UTC (rev 37272)
+++ labs/jbosstm/trunk/XTS/demo/src/com/jboss/jbosstm/xts/demo/services/theatre/TheatreServiceBA.java 2011-07-20 10:49:43 UTC (rev 37273)
@@ -51,7 +51,7 @@
name = "ITheatreServiceBA", targetNamespace = "http://www.jboss.com/jbosstm/xts/demo/Theatre",
wsdlLocation = "/WEB-INF/wsdl/TheatreServiceBA.wsdl")
@SOAPBinding(style=SOAPBinding.Style.RPC)
- at HandlerChain(file = "../context-handlers.xml", name = "Context Handlers")
+ at HandlerChain(file = "/context-handlers.xml", name = "Context Handlers")
public class TheatreServiceBA implements ITheatreServiceBA
{
/**
Modified: labs/jbosstm/trunk/XTS/demo/xts-build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/demo/xts-build.xml 2011-07-20 10:45:52 UTC (rev 37272)
+++ labs/jbosstm/trunk/XTS/demo/xts-build.xml 2011-07-20 10:49:43 UTC (rev 37273)
@@ -120,7 +120,7 @@
<!--
<fileset dir="${jbossts.lib.dir}" includes="${ext.libs}"/>
-->
- <fileset dir="${jboss.home}/modules/org/jboss/jts/main/" includes="jbossjts-4.14.0.Final.jar"/>
+ <fileset dir="${jboss.home}/modules/org/jboss/jts/main/" includes="jbossjts-*.jar"/>
</path>
<path id="jboss.client.path">
@@ -231,7 +231,7 @@
<!-- the server side elements -->
<target name="jboss-webservices" depends="compile">
- <copy tofile="${build.dir}/classes/com/jboss/jbosstm/xts/demo/services/context-handlers.xml"
+ <copy tofile="${build.dir}/classes/context-handlers.xml"
file="${jboss.dd.dir}/context-handlers.xml"/>
<war destfile="${build.dir}/xts-demo-webservices.war" webxml="${jboss.dd.dir}/service-web-app.xml" >
<!-- include app wsdl -->
@@ -240,6 +240,9 @@
<classes dir="${build.dir}/classes">
<include name="com/jboss/jbosstm/xts/demo/services/**/*"/>
</classes>
+ <classes dir="${build.dir}/classes">
+ <include name="context-handlers.xml"/>
+ </classes>
<!-- generated server interfaces -->
<classes dir="${build.dir}/classes/"
includes="com/jboss/jbosstm/xts/demo/restaurant/IRestaurantServiceAT.class"/>
@@ -253,6 +256,9 @@
includes="com/jboss/jbosstm/xts/demo/taxi/ITaxiServiceAT.class"/>
<classes dir="${build.dir}/classes/"
includes="com/jboss/jbosstm/xts/demo/taxi/ITaxiServiceBA.class"/>
+ <manifest>
+ <attribute name="Dependencies" value="org.jboss.xts,org.jboss.jts"/>
+ </manifest>
</war>
</target>
@@ -263,6 +269,9 @@
<include name="com/arjuna/xts/nightout/services/**"/>
<include name="com/arjuna/mw/wst/service/**/*"/>
</classes>
+ <manifest>
+ <attribute name="Dependencies" value="org.jboss.xts,org.jboss.jts"/>
+ </manifest>
</war>
</target>
@@ -274,7 +283,10 @@
<war warfile="${build.dir}/xts-demo.war" webxml="${build.dir}/client-web-app.xml">
<!-- include app wsdl and wscoor wsdl -->
+ <!--
<webinf dir="${jboss.dd.dir}" includes="wsdl/*.wsdl"/>
+ -->
+ <classes dir="${jboss.dd.dir}" includes="wsdl/*.wsdl"/>
<!-- impl classes -->
<classes dir="${build.dir}/classes"
includes="com/jboss/jbosstm/xts/demo/client/**"/>
@@ -293,6 +305,9 @@
includes="com/jboss/jbosstm/xts/demo/taxi/ITaxiServiceBA.class"/>
<!-- jsp files -->
<fileset dir="${web.dir}" excludes="indexrpc.jsp"/>
+ <manifest>
+ <attribute name="Dependencies" value="org.jboss.xts"/>
+ </manifest>
</war>
</target>
@@ -313,6 +328,9 @@
<fileset dir="${web.dir}" excludes="index.jsp indexrpc.jsp"/>
<fileset dir="${build.web.dir}" includes="index.jsp"/>
<webinf dir="${jboss.ddrpc.dir}" includes="client-jaxrpc-mapping.xml wsdl/**"/>
+ <manifest>
+ <attribute name="Dependencies" value="org.jboss.xts"/>
+ </manifest>
</war>
</target>
More information about the jboss-svn-commits
mailing list