Author: nash
Date: Mon May 17 19:39:11 2010
New Revision: 945328
URL: http://svn.apache.org/viewvc?rev=945328&view=rev
Log:
Fix launcher typos and add missing items to classpaths
Modified:
tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/binaries/src/main/resources/build-clients.xml
tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/binaries/src/main/resources/build-defs-selfcontained.xml
tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/binaries/src/main/resources/build-defs.xml
tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/binaries/src/main/resources/build-launchers.xml
Modified:
tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/binaries/src/main/resources/build-clients.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/binaries/src/main/resources/build-clients.xml?rev=945328&r1=945327&r2=945328&view=diff
==============================================================================
---
tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/binaries/src/main/resources/build-clients.xml
(original)
+++
tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/binaries/src/main/resources/build-clients.xml
Mon May 17 19:39:11 2010
@@ -46,8 +46,8 @@
<java classname="scatours.CurrencyConverterWSClient" fork="true"
failonerror="true">
<classpath>
<pathelement
location="scatours-client-currency-converter-ws-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>
Modified:
tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/binaries/src/main/resources/build-defs-selfcontained.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/binaries/src/main/resources/build-defs-selfcontained.xml?rev=945328&r1=945327&r2=945328&view=diff
==============================================================================
---
tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/binaries/src/main/resources/build-defs-selfcontained.xml
(original)
+++
tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/binaries/src/main/resources/build-defs-selfcontained.xml
Mon May 17 19:39: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"/>
Modified:
tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/binaries/src/main/resources/build-defs.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/binaries/src/main/resources/build-defs.xml?rev=945328&r1=945327&r2=945328&view=diff
==============================================================================
---
tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/binaries/src/main/resources/build-defs.xml
(original)
+++
tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/binaries/src/main/resources/build-defs.xml
Mon May 17 19:39:11 2010
@@ -29,6 +29,13 @@
<fileset dir="${env.TUSCANY_HOME}/modules"
includes="tuscany-node-launcher-*.jar"/>
</path>
+ <path id="scatours.tuscany-openejb">
+ <!-- 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"/>
+ </path>
+
<path id="scatours.openejb-runtime">
<!-- We need the following if the jars were built using ant and have
no manifest classpath -->
<fileset dir="../openejb"/>
Modified:
tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/binaries/src/main/resources/build-launchers.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/binaries/src/main/resources/build-launchers.xml?rev=945328&r1=945327&r2=945328&view=diff
==============================================================================
---
tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/binaries/src/main/resources/build-launchers.xml
(original)
+++
tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/binaries/src/main/resources/build-launchers.xml
Mon May 17 19:39:11 2010
@@ -204,7 +204,7 @@
<java classname="scatours.NotificationEJBLauncher" fork="true"
failonerror="true">
<classpath>
<pathelement
location="scatours-launcher-notification-ejb.jar"/>
- <path refid="scatours.tuscany-manifest"/>
+ <path refid="scatours.tuscany-openejb"/>
</classpath>
</java>
</target>
@@ -275,7 +275,7 @@
<target name="run-payment-java-callback">
<java classname="scatours.payment.PaymentLauncher" fork="true"
failonerror="true">
<classpath>
- <pathelement location="scatours-launcher-payment-java.jar"/>
+ <pathelement
location="scatours-launcher-payment-java-callback.jar"/>
<path refid="scatours.tuscany-manifest"/>
</classpath>
</java>
@@ -284,7 +284,7 @@
<target name="run-payment-java-policy">
<java classname="scatours.payment.PaymentLauncher" fork="true"
failonerror="true">
<classpath>
- <pathelement location="scatours-launcher-java-policy.jar"/>
+ <pathelement
location="scatours-launcher-payment-java-policy.jar"/>
<path refid="scatours.tuscany-manifest"/>
</classpath>
</java>
@@ -293,7 +293,7 @@
<target name="run-payment-java-reference-pass">
<java classname="scatours.payment.PaymentLauncher" fork="true"
failonerror="true">
<classpath>
- <pathelement location="scatours-launcher-payment-java.jar"/>
+ <pathelement
location="scatours-launcher-payment-java-reference-pass.jar"/>
<path refid="scatours.tuscany-manifest"/>
</classpath>
</java>
@@ -311,7 +311,7 @@
<target name="run-payment-spring-scatag">
<java classname="scatours.payment.PaymentLauncher" fork="true"
failonerror="true">
<classpath>
- <pathelement location="scatours-launcher-spring-scatag.jar"/>
+ <pathelement
location="scatours-launcher-payment-spring-scatag.jar"/>
<path refid="scatours.tuscany-manifest"/>
</classpath>
</java>
