Author: nash
Date: Wed May 19 21:38:11 2010
New Revision: 946413
URL: http://svn.apache.org/viewvc?rev=946413&view=rev
Log:
Merge revision r944930 from 1.0 release branch
Modified:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/resources/build-defs-selfcontained.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/resources/build-defs.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/resources/build-services.xml
Modified:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/resources/build-defs-selfcontained.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/resources/build-defs-selfcontained.xml?rev=946413&r1=946412&r2=946413&view=diff
==============================================================================
---
tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/resources/build-defs-selfcontained.xml
(original)
+++
tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/resources/build-defs-selfcontained.xml
Wed May 19 21:38:11 2010
@@ -25,6 +25,8 @@
<path id="scatours.tuscany-node-launcher"/>
- <path id="scatours.tuscany-openejb"/>
+ <path id="scatours.openejb-runtime"/>
+
+ <path id="scatours.jaxws-runtime"/>
</project>
Modified:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/resources/build-defs.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/resources/build-defs.xml?rev=946413&r1=946412&r2=946413&view=diff
==============================================================================
---
tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/resources/build-defs.xml
(original)
+++
tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/resources/build-defs.xml
Wed May 19 21:38:11 2010
@@ -29,7 +29,10 @@
<fileset dir="${env.TUSCANY_HOME}/modules"
includes="tuscany-node-launcher-*.jar"/>
</path>
- <path id="scatours.tuscany-openejb">
+ <path id="scatours.openejb-runtime">
+ <!-- We need the following if the jars were built using ant and have
no manifest classpath -->
+ <fileset dir="../openejb"/>
+ <!-- The openejb directory doesn't include all dependencies, so bring
these in from Tuscany -->
<fileset dir="${env.TUSCANY_HOME}/lib">
<!-- exclude some jars to prevent them being loaded by OpenEJB -->
<exclude name="tuscany-sca-manifest.jar"/>
@@ -43,4 +46,11 @@
</fileset>
</path>
+ <path id="scatours.jaxws-runtime">
+ <!-- We need the following if the jars were built using ant and have
no manifest classpath -->
+ <fileset dir="../jaxws"/>
+ <!-- The jaxws directory doesn't include all dependencies, so bring
these in from Tuscany -->
+ <pathelement
location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
+ </path>
+
</project>
Modified:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/resources/build-services.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/resources/build-services.xml?rev=946413&r1=946412&r2=946413&view=diff
==============================================================================
---
tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/resources/build-services.xml
(original)
+++
tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/resources/build-services.xml
Wed May 19 21:38:11 2010
@@ -30,8 +30,8 @@
<java
classname="com.tuscanyscatours.smsgateway.SMSGatewayEJBServiceBootstrap"
fork="true" failonerror="true">
<classpath>
<pathelement location="scatours-service-smsgateway-ejb.jar"/>
- <!-- The following is used to bring in additional dependencies
of the OpenEJB runtime. -->
- <path refid="scatours.tuscany-openejb"/>
+ <!-- The following is used to bring in the OpenEJB runtime and
its dependencies. -->
+ <path refid="scatours.openejb-runtime"/>
</classpath>
</java>
</target>
@@ -40,8 +40,8 @@
<java
classname="com.tuscanyscatours.smsgateway.SMSGatewayServiceBootstrap"
fork="true">
<classpath>
<pathelement location="scatours-service-smsgateway-jaxws.jar"/>
- <!-- The following is used to bring in additional dependencies
of the JAX-WS runtime. -->
- <path refid="scatours.tuscany-manifest"/>
+ <!-- The following is used to bring in the JAX-WS runtime and
its dependencies. -->
+ <path refid="scatours.jaxws-runtime"/>
</classpath>
</java>
</target>
