From 864162562b43defc6d3a5715006afb364e8b50ad Mon Sep 17 00:00:00 2001
From: nash <nash@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 28 Sep 2010 09:59:38 +0000
Subject: Add explicit ${basedir} references to ensure paths are correct when
 running from a top-level build

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1002085 13f79535-47bb-0310-9956-ffa450edef68
---
 .../sca-java-1.6.1/tutorials/store/store-supplier/build.xml  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-supplier')

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-supplier/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-supplier/build.xml
index 6e3203cd73..2338125e71 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-supplier/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-supplier/build.xml
@@ -22,7 +22,7 @@
     <target name="compile">
         <mkdir dir="target/classes"/>
         <copy todir="target/classes">
-            <fileset dir="." excludes="**/*.java, pom.xml, build.xml, derby.log, target/**"/>
+            <fileset dir="." excludes="**/*.java, **/.*/**, pom.xml, build*.xml, target/**, derby.log"/>
         </copy>
         <jar destfile="target/tutorial-store-supplier.jar" basedir="target/classes">
             <manifest>
@@ -34,13 +34,13 @@
            in ../store-test.
         -->
         <sql driver="org.apache.derby.jdbc.EmbeddedDriver"
-             url="jdbc:derby:target/cart-db;create=true"
+             url="jdbc:derby:${basedir}/target/cart-db;create=true"
              userid=""
              password=""
              autocommit="true"
              onerror="continue"
-             src="../assets/services/db/cart.sql"
-             classpath="../../../lib/derby-10.3.1.4.jar"/>
+             src="${basedir}/../assets/services/db/cart.sql"
+             classpath="${basedir}/../../../lib/derby-10.3.1.4.jar"/>
         
         <!--
            Shutdown the example database.  This is commented out for now because
@@ -52,11 +52,11 @@
            and this test would have problems if the database isn't shut down first.
 
         <sql driver="org.apache.derby.jdbc.EmbeddedDriver"
-             url="jdbc:derby:target/cart-db;shutdown=true"
+             url="jdbc:derby:${basedir}/target/cart-db;shutdown=true"
              userid=""
              password=""
              failOnConnectionError="true"
-             classpath="../../../lib/derby-10.3.1.4.jar">
+             classpath="${basedir}/../../../lib/derby-10.3.1.4.jar">
             NONE
         </sql>
         -->
-- 
cgit v1.2.3