cmlenz 02/03/21 09:53:07
Modified: . build.xml
Log:
More, minor changes:
- if the admin-webapp doesn't include the core jars, it shouldn't need to
include the slide-roles.jar either
- struts.lib property used instead of ${struts.home}/lib
- jakarta-struts/target/library replaced by jakarta-struts/dist/lib
Revision Changes Path
1.157 +5 -7 jakarta-slide/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/build.xml,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- build.xml 21 Mar 2002 17:16:34 -0000 1.156
+++ build.xml 21 Mar 2002 17:53:06 -0000 1.157
@@ -65,9 +65,9 @@
value="${catalina.dist}/common/lib/naming-resources.jar"/>
<property name="catalina.jar"
value="${catalina.dist}/server/lib/catalina.jar"/>
- <property name="struts.home" value="../jakarta-struts/target"/>
- <property name="struts.jar"
- value="${struts.home}/library/struts.jar"/>
+ <property name="struts.home" value="../jakarta-struts/dist"/>
+ <property name="struts.lib" value="${struts.home}/lib"/>
+ <property name="struts.jar" value="${struts.lib}/struts.jar"/>
<property name="jstl.home"
value="../jakarta-taglibs/dist/standard"/>
<property name="jstl.jar"
@@ -1250,7 +1250,7 @@
<!-- Prepare distribution of the admin-webapp -->
<target name="admin-dist-prepare"
- depends="taglib-common-jar,taglib-struts-jar,admin-compile,dist"
+ depends="taglib-common-jar,taglib-struts-jar,admin-compile"
if="struts.present">
<copy todir="${slide.build}/webapps/slide-admin">
<fileset dir="web/admin"/>
@@ -1258,8 +1258,6 @@
<jar jarfile="${slide.build}/webapps/slide-admin/WEB-INF/lib/slide-admin.jar"
basedir="${slide.build}/classes"
includes="org/apache/slide/admin/**"/>
- <copy file="${slide.dist}/slide/lib/slide-roles.jar"
- todir="${slide.build}/webapps/slide-admin/WEB-INF/lib"/>
<copy file="${slide.dist}/slide/lib/slide-taglib-common.jar"
todir="${slide.build}/webapps/slide-admin/WEB-INF/lib"/>
<copy file="${slide.dist}/slide/lib/slide-taglib-struts.jar"
@@ -1269,7 +1267,7 @@
<copy file="src/taglib/slide-struts.tld"
todir="${slide.build}/webapps/slide-admin/WEB-INF"/>
<copy todir="${slide.build}/webapps/slide-admin/WEB-INF">
- <fileset dir="${struts.home}/lib">
+ <fileset dir="${struts.lib}">
<include name="struts-bean.tld"/>
<include name="struts-html.tld"/>
<include name="struts-logic.tld"/>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
