diff options
Diffstat (limited to 'sca-java-1.x/trunk')
| -rw-r--r-- | sca-java-1.x/trunk/samples/helloworld-ws-sdo/build.xml | 33 | ||||
| -rw-r--r-- | sca-java-1.x/trunk/samples/quote-xquery/build.xml | 22 |
2 files changed, 25 insertions, 30 deletions
diff --git a/sca-java-1.x/trunk/samples/helloworld-ws-sdo/build.xml b/sca-java-1.x/trunk/samples/helloworld-ws-sdo/build.xml index 2439a35b35..0cc2b78355 100644 --- a/sca-java-1.x/trunk/samples/helloworld-ws-sdo/build.xml +++ b/sca-java-1.x/trunk/samples/helloworld-ws-sdo/build.xml @@ -31,12 +31,6 @@ <mkdir dir="target/sdo-source"/> </target> - <path id="project.classpath"> - <pathelement path="target/classes"/> - <pathelement path="target/sdo-source"/> - <pathelement location="${tuscany.sca.manifest.location}"/> - </path> - <target name="generate-sdo" depends="init"> <java classname="org.apache.tuscany.sdo.generate.XSD2JavaGenerator" fork="true"> <arg value="-targetDirectory"/> @@ -50,7 +44,7 @@ <arg value="-noUnsettable"/> <arg value="src/main/resources/wsdl/helloworld.wsdl"/> - <classpath refid="project.classpath"/> + <classpath location="${tuscany.sca.manifest.location}"/> </java> <java classname="org.apache.tuscany.sdo.generate.XSD2JavaGenerator" fork="true"> <arg value="-targetDirectory"/> @@ -64,7 +58,7 @@ <arg value="-noUnsettable"/> <arg value="src/main/resources/test.xsd"/> - <classpath refid="project.classpath"/> + <classpath location="${tuscany.sca.manifest.location}"/> </java> </target> @@ -75,35 +69,42 @@ target="1.5"> <src location="src/main/java"/> <src location="target/sdo-source"/> - <classpath refid="project.classpath"/> + <classpath location="${tuscany.sca.manifest.location}"/> </javac> <copy todir="target/classes"> <fileset dir="src/main/resources"/> - <fileset dir="target/sdo-source"/> </copy> <jar destfile="target/${test.jar}" basedir="target/classes"> <manifest> - <attribute name="Main-Class" value="${test.class}" /> + <attribute name="Main-Class" value="${client.class}" /> </manifest> </jar> </target> <target name="run-classes"> <java classname="${client.class}" fork="true"> - <classpath refid="project.classpath"/> </java> += <classpath> + <pathelement path="target/classes"/> + <pathelement location="${tuscany.sca.manifest.location}"/> + </classpath> + </java> </target> <target name="run-server"> <java classname="${server.class}" fork="true"> - <classpath path="target/${test.jar}"/> - <classpath refid="project.classpath"/> + <classpath> + <pathelement path="target/${test.jar}"/> + <pathelement location="${tuscany.sca.manifest.location}"/> + </classpath> </java> </target> <target name="run"> <java classname="${client.class}" fork="true"> - <classpath path="target/${test.jar}"/> - <classpath refid="project.classpath"/> + <classpath> + <pathelement path="target/${test.jar}"/> + <pathelement location="${tuscany.sca.manifest.location}"/> + </classpath> </java> </target> diff --git a/sca-java-1.x/trunk/samples/quote-xquery/build.xml b/sca-java-1.x/trunk/samples/quote-xquery/build.xml index ef76c20f72..2e7ffb9c8a 100644 --- a/sca-java-1.x/trunk/samples/quote-xquery/build.xml +++ b/sca-java-1.x/trunk/samples/quote-xquery/build.xml @@ -27,12 +27,6 @@ <property name="tuscany.sca.manifest.location" value="../../lib/tuscany-sca-manifest.jar" />
- <path id="project.classpath">
- <pathelement path="target/classes" />
- <pathelement path="target/sdo-source" />
- <pathelement location="${tuscany.sca.manifest.location}" />
- </path>
-
<target name="generate-sdo" depends="init">
<java classname="org.apache.tuscany.sdo.generate.XSD2JavaGenerator" fork="true">
<arg value="-targetDirectory" />
@@ -42,7 +36,7 @@ properly transformed to Node as some properties are treated as unset -->
<arg value="src/main/resources/wsdl/quotejoin.wsdl" />
- <classpath refid="project.classpath" />
+ <classpath location="${tuscany.sca.manifest.location}" />
</java>
<java classname="org.apache.tuscany.sdo.generate.XSD2JavaGenerator" fork="true">
<arg value="-targetDirectory" />
@@ -52,7 +46,7 @@ properly transformed to Node as some properties are treated as unset -->
<arg value="src/main/resources/wsdl/Quote.xsd" />
- <classpath refid="project.classpath" />
+ <classpath location="${tuscany.sca.manifest.location}" />
</java>
<java classname="org.apache.tuscany.sdo.generate.XSD2JavaGenerator" fork="true">
<arg value="-targetDirectory" />
@@ -62,7 +56,7 @@ properly transformed to Node as some properties are treated as unset -->
<arg value="src/main/resources/wsdl/AvailQuote.xsd" />
- <classpath refid="project.classpath" />
+ <classpath location="${tuscany.sca.manifest.location}" />
</java>
<java classname="org.apache.tuscany.sdo.generate.XSD2JavaGenerator" fork="true">
<arg value="-targetDirectory" />
@@ -72,7 +66,7 @@ properly transformed to Node as some properties are treated as unset -->
<arg value="src/main/resources/wsdl/PriceQuote.xsd" />
- <classpath refid="project.classpath" />
+ <classpath location="${tuscany.sca.manifest.location}" />
</java>
</target>
@@ -82,7 +76,7 @@ <javac destdir="target/classes" debug="on" source="1.5" target="1.5">
<src path="target/sdo-source"/>
<src path="src/main/java"/>
- <classpath refid="project.classpath" />
+ <classpath location="${tuscany.sca.manifest.location}" />
</javac>
<copy todir="target/classes">
<fileset dir="src/main/resources" />
@@ -99,8 +93,8 @@ <java classname="${test.class}" fork="true">
<classpath>
<pathelement path="target/classes" />
+ <pathelement location="${tuscany.sca.manifest.location}" />
</classpath>
- <classpath refid="project.classpath" />
</java>
</target>
@@ -108,8 +102,8 @@ <java classname="${test.class}" fork="true">
<classpath>
<pathelement path="target/${test.jar}" />
+ <pathelement location="${tuscany.sca.manifest.location}" />
</classpath>
- <classpath refid="project.classpath" />
</java>
</target>
@@ -117,8 +111,8 @@ <java classname="${test.server.class}" fork="true">
<classpath>
<pathelement path="target/${test.jar}" />
+ <pathelement location="${tuscany.sca.manifest.location}" />
</classpath>
- <classpath refid="project.classpath" />
</java>
</target>
|