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 12:36:45 UTC
svn commit: r1027454 -
/tuscany/sca-java-1.x/trunk/tutorials/store/store-supplier/build.xml
Author: nash
Date: Tue Oct 26 10:36:45 2010
New Revision: 1027454
URL: http://svn.apache.org/viewvc?rev=1027454&view=rev
Log:
Merge r1002085 Add explicit ${basedir} references to ensure paths are correct when running from a top-level build
Modified:
tuscany/sca-java-1.x/trunk/tutorials/store/store-supplier/build.xml
Modified: tuscany/sca-java-1.x/trunk/tutorials/store/store-supplier/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/store/store-supplier/build.xml?rev=1027454&r1=1027453&r2=1027454&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/store/store-supplier/build.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/store/store-supplier/build.xml Tue Oct 26 10:36:45 2010
@@ -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>
-->