From ef380f54f3c828ffa7a3b35a1717583749641b78 Mon Sep 17 00:00:00 2001
From: nash <nash@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 26 Oct 2010 12:34:47 +0000
Subject: Merge r1003117 Fix run target problem with using classes directory
 instead of jar file, and remove redundant saxon dependency

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1027512 13f79535-47bb-0310-9956-ffa450edef68
---
 sca-java-1.x/trunk/samples/photo-gallery/build.xml | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

(limited to 'sca-java-1.x/trunk/samples/photo-gallery/build.xml')

diff --git a/sca-java-1.x/trunk/samples/photo-gallery/build.xml b/sca-java-1.x/trunk/samples/photo-gallery/build.xml
index b75baac6da..366b7fdc98 100644
--- a/sca-java-1.x/trunk/samples/photo-gallery/build.xml
+++ b/sca-java-1.x/trunk/samples/photo-gallery/build.xml
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<project name="photo-gallary" default="compile">
+<project name="photo-gallery" default="compile">
     <property name="test.class" value="launch.LaunchGallery" />
-	<property name="test.jar"   value="sample-photo-gallary.jar" />
+	<property name="test.jar"   value="sample-photo-gallery.jar" />
 	
     <target name="init">
         <mkdir dir="target/classes"/>
@@ -32,7 +32,6 @@
                target="1.5">
             <classpath>
             	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            	<fileset refid="3rdparty.jars"/>
             </classpath>
         </javac> 
         <copy todir="target/classes">
@@ -51,7 +50,6 @@
             <classpath>
                 <pathelement path="target/classes"/>
             	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            	<fileset refid="3rdparty.jars"/>
             </classpath>
         </java>
     </target>
@@ -60,9 +58,8 @@
         <java classname="${test.class}"
               fork="true">
             <classpath>
-                <pathelement path="target/classes"/>
+                <pathelement path="target/${test.jar}"/>
             	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            	<fileset refid="3rdparty.jars"/>
             </classpath>
         </java>    	
     </target>	
@@ -70,8 +67,4 @@
     <target name="clean">
         <delete dir="target" includeemptydirs="true"/>
     </target>
-    
-    <fileset id="3rdparty.jars" dir="../../lib">
-        <include name="saxon-8.7.jar"/>
-    </fileset>
 </project>
-- 
cgit v1.2.3