diff options
| author | nash <nash@13f79535-47bb-0310-9956-ffa450edef68> | 2010-10-26 12:38:55 +0000 |
|---|---|---|
| committer | nash <nash@13f79535-47bb-0310-9956-ffa450edef68> | 2010-10-26 12:38:55 +0000 |
| commit | 528bc1314fe30a74690987112f5ac3b7068fbb90 (patch) | |
| tree | 852036d75b26788a866d88f4d2ec3819e5ac5865 /sca-java-1.x/trunk/samples/helloworld-ws-sdo | |
| parent | f25c303c2354a3ef74d7eb48b2cb1f493de83883 (diff) | |
Merge r1003122 Remove redundant classpath dependencies
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1027515 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-1.x/trunk/samples/helloworld-ws-sdo')
| -rw-r--r-- | sca-java-1.x/trunk/samples/helloworld-ws-sdo/build.xml | 33 |
1 files changed, 17 insertions, 16 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> |