martinc 02/02/20 22:33:07
Modified: contrib/tiles build-webapp.xml build.xml
Log:
Include Commons libraries from their independent locations, as is the
Jakarta build custom, instead of requiring that the developer collect
them into one location. This should also fix the Gump problem.
Revision Changes Path
1.3 +18 -5 jakarta-struts/contrib/tiles/build-webapp.xml
Index: build-webapp.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/contrib/tiles/build-webapp.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build-webapp.xml 18 Feb 2002 14:52:21 -0000 1.2
+++ build-webapp.xml 21 Feb 2002 06:33:07 -0000 1.3
@@ -248,10 +248,16 @@
<fileset dir="${struts.libs}" includes="*.tld"/>
</copy>
<mkdir dir="${webapp.target}/WEB-INF/lib"/>
- <copy todir="${webapp.target}/WEB-INF/lib">
- <fileset dir="${commons-lib.home}" includes="commons-*.jar"/>
- <fileset dir="${struts.libs}" includes="struts.jar"/>
- </copy>
+ <copy file="${struts.libs}/struts.jar"
+ tofile="${webapp.target}/WEB-INF/lib/struts.jar"/>
+ <copy file="${commons-beanutils.jar}"
+ tofile="${webapp.target}/WEB-INF/lib/commons-beanutils.jar"/>
+ <copy file="${commons-collections.jar}"
+ tofile="${webapp.target}/WEB-INF/lib/commons-collections.jar"/>
+ <copy file="${commons-digester.jar}"
+ tofile="${webapp.target}/WEB-INF/lib/commons-digester.jar"/>
+ <copy file="${commons-logging.jar}"
+ tofile="${webapp.target}/WEB-INF/lib/commons-logging.jar"/>
</target>
<!--
@@ -265,8 +271,15 @@
<fileset dir="${tiles.libs}" includes="*.tld"/>
</copy>
<mkdir dir="${webapp.target}/WEB-INF/lib"/>
+ <copy file="${commons-beanutils.jar}"
+ tofile="${webapp.target}/WEB-INF/lib/commons-beanutils.jar"/>
+ <copy file="${commons-collections.jar}"
+ tofile="${webapp.target}/WEB-INF/lib/commons-collections.jar"/>
+ <copy file="${commons-digester.jar}"
+ tofile="${webapp.target}/WEB-INF/lib/commons-digester.jar"/>
+ <copy file="${commons-logging.jar}"
+ tofile="${webapp.target}/WEB-INF/lib/commons-logging.jar"/>
<copy todir="${webapp.target}/WEB-INF/lib">
- <fileset dir="${commons-lib.home}" includes="commons-*.jar"/>
<fileset dir="${tiles.libs}" includes="*.jar"/>
</copy>
</target>
1.4 +4 -4 jakarta-struts/contrib/tiles/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/contrib/tiles/build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.xml 18 Feb 2002 14:52:21 -0000 1.3
+++ build.xml 21 Feb 2002 06:33:07 -0000 1.4
@@ -113,10 +113,10 @@
<!-- Compilation Classpath -->
<path id="compile.classpath">
<pathelement location="${servlet.jar}"/>
- <fileset dir="${commons-lib.home}">
- <include name="commons-*.jar"/>
- </fileset>
- <pathelement location="${commons-lib.home}"/>
+ <pathelement location="${commons-beanutils.jar}"/>
+ <pathelement location="${commons-collections.jar}"/>
+ <pathelement location="${commons-digester.jar}"/>
+ <pathelement location="${commons-logging.jar}"/>
</path>
<path id="compile.classpath.struts1.1">
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
