Author: wsmoak
Date: Sat Mar 18 19:31:29 2006
New Revision: 386921
URL: http://svn.apache.org/viewcvs?rev=386921&view=rev
Log:
Retrieve the Derby jar from ibiblio and exclude unnecessary jars from
WEB-INF/lib.
It is no longer necessary to set the 'derby.dir' property.
Bug: 39028
Modified:
struts/shale/trunk/blank/build.xml
struts/shale/trunk/build.xml
struts/shale/trunk/mailreader/build.xml
struts/shale/trunk/sql-browser/build.xml
struts/shale/trunk/sql-browser/default.properties
Modified: struts/shale/trunk/blank/build.xml
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/blank/build.xml?rev=386921&r1=386920&r2=386921&view=diff
==============================================================================
--- struts/shale/trunk/blank/build.xml (original)
+++ struts/shale/trunk/blank/build.xml Sat Mar 18 19:31:29 2006
@@ -208,6 +208,7 @@
<exclude name="**/taglibrarydoc.jar"/>
<exclude name="creator2/**"/>
<exclude name="cargo/**"/>
+ <exclude name="derby/**"/>
</fileset>
</copy>
Modified: struts/shale/trunk/build.xml
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/build.xml?rev=386921&r1=386920&r2=386921&view=diff
==============================================================================
--- struts/shale/trunk/build.xml (original)
+++ struts/shale/trunk/build.xml Sat Mar 18 19:31:29 2006
@@ -610,6 +610,11 @@
ignoreerrors="true"
src="${maven.repo}/cargo/jars/cargo-core-uberjar-0.7.jar"/>
+ <mkdir dir="${lib.dir}/derby"/>
+ <get dest="${lib.dir}/derby/derby.jar"
+ ignoreerrors="true"
+
src="${maven.repo}/org.apache.derby/jars/derby-10.1.2.1.jar"/>
+
</target>
Modified: struts/shale/trunk/mailreader/build.xml
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/mailreader/build.xml?rev=386921&r1=386920&r2=386921&view=diff
==============================================================================
--- struts/shale/trunk/mailreader/build.xml (original)
+++ struts/shale/trunk/mailreader/build.xml Sat Mar 18 19:31:29 2006
@@ -208,6 +208,7 @@
<exclude name="**/taglibrarydoc.jar"/>
<exclude name="creator2/**"/>
<exclude name="cargo/**"/>
+ <exclude name="derby/**"/>
</fileset>
</copy>
Modified: struts/shale/trunk/sql-browser/build.xml
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/sql-browser/build.xml?rev=386921&r1=386920&r2=386921&view=diff
==============================================================================
--- struts/shale/trunk/sql-browser/build.xml (original)
+++ struts/shale/trunk/sql-browser/build.xml Sat Mar 18 19:31:29 2006
@@ -197,6 +197,8 @@
<exclude name="**/struts-mailreader-dao.jar"/>
<exclude name="**/taglibrarydoc.jar"/>
<exclude name="**/tiles-core.jar"/>
+ <exclude name="creator2/**"/>
+ <exclude name="cargo/**"/>
</fileset>
</copy>
@@ -214,6 +216,7 @@
<exclude name="shale-tiles.jar"
unless="tiles.present"/>
<exclude name="shale-clay.jar"/>
+ <exclude name="shale-designtime.jar"/>
<exclude name="shale-remoting.jar"/>
<exclude name="shale-spring.jar"/>
<exclude name="shale-tiles.jar"/>
Modified: struts/shale/trunk/sql-browser/default.properties
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/sql-browser/default.properties?rev=386921&r1=386920&r2=386921&view=diff
==============================================================================
--- struts/shale/trunk/sql-browser/default.properties (original)
+++ struts/shale/trunk/sql-browser/default.properties Sat Mar 18 19:31:29 2006
@@ -165,8 +165,5 @@
# Derby Integration
#
------------------------------------------------------------------------------
-# The full pathname to the Derby binary distribution (version 10.1.2.1 or
later)
-derby.dir=/usr/local/db-derby-10.1.2.1-bin
-
# The pathname to the embedded Derby JAR file
-derby.jar=${derby.dir}/lib/derby.jar
+derby.jar=${lib.dir}/derby/derby.jar
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
