You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by na...@apache.org on 2010/10/26 14:34:47 UTC

svn commit: r1027512 - /tuscany/sca-java-1.x/trunk/samples/photo-gallery/build.xml

Author: nash
Date: Tue Oct 26 12:34:47 2010
New Revision: 1027512

URL: http://svn.apache.org/viewvc?rev=1027512&view=rev
Log:
Merge r1003117 Fix run target problem with using classes directory instead of jar file, and remove redundant saxon dependency

Modified:
    tuscany/sca-java-1.x/trunk/samples/photo-gallery/build.xml

Modified: tuscany/sca-java-1.x/trunk/samples/photo-gallery/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/samples/photo-gallery/build.xml?rev=1027512&r1=1027511&r2=1027512&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/samples/photo-gallery/build.xml (original)
+++ tuscany/sca-java-1.x/trunk/samples/photo-gallery/build.xml Tue Oct 26 12:34:47 2010
@@ -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>