diff options
| author | nash <nash@13f79535-47bb-0310-9956-ffa450edef68> | 2010-10-26 10:36:45 +0000 |
|---|---|---|
| committer | nash <nash@13f79535-47bb-0310-9956-ffa450edef68> | 2010-10-26 10:36:45 +0000 |
| commit | 081d279c6cef0590c160e4a1232adf04bddbb16f (patch) | |
| tree | 747be7e60937456205c993b9bf7729422eca8be7 /sca-java-1.x/trunk/tutorials | |
| parent | 6a5482d6bd5d6ed5dfe218ab9cf2fa2aa3463daa (diff) | |
Merge r1002085 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@1027454 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-1.x/trunk/tutorials')
| -rw-r--r-- | sca-java-1.x/trunk/tutorials/store/store-supplier/build.xml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sca-java-1.x/trunk/tutorials/store/store-supplier/build.xml b/sca-java-1.x/trunk/tutorials/store/store-supplier/build.xml index 6e3203cd73..2338125e71 100644 --- a/sca-java-1.x/trunk/tutorials/store/store-supplier/build.xml +++ b/sca-java-1.x/trunk/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>
-->
|