remm 01/10/10 19:02:56
Modified: . build.xml
Log:
- The webapp paths are now based on catalinaBase, which should solve the
problems reported when running from a directory other
that $SLIDE_HOME/server.
- The slide specific webapps are now in /slide/slide-*.war.
Revision Changes Path
1.130 +4 -5 jakarta-slide/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/build.xml,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- build.xml 2001/10/07 18:13:26 1.129
+++ build.xml 2001/10/11 02:02:56 1.130
@@ -1247,6 +1247,7 @@
<mkdir dir="${slide.dist}/server/logs" />
<mkdir dir="${slide.dist}/server/work" />
<mkdir dir="${slide.dist}/server/blank" />
+ <mkdir dir="${slide.dist}/server/slide" />
<!-- Sepcial handling for JAXP to avoid sealing violations with Jasper -->
<copy todir="${slide.dist}/server/common/lib">
@@ -1269,7 +1270,7 @@
</delete>
<!-- Welcome web application -->
- <war warfile="${slide.dist}/server/webapps/ROOT.war"
+ <war warfile="${slide.dist}/server/slide/slide-welcome.war"
webxml="src/wrappers/catalina/root/WEB-INF/web.xml"
basedir="src/wrappers/catalina/root">
<zipfileset dir="${struts.home}/lib" prefix="WEB-INF">
@@ -1299,15 +1300,13 @@
tofile="${slide.dist}/server/webapps/slide-doc.war" />
<!-- WebDAV view of the server -->
- <mkdir dir="${slide.dist}/server/webdav" />
- <war warfile="${slide.dist}/server/webdav/webdav.war"
+ <war warfile="${slide.dist}/server/slide/slide-webdav.war"
webxml="src/wrappers/catalina/web.xml">
</war>
<!-- Slide manager -->
- <mkdir dir="${slide.dist}/server/admin" />
<copy file="${slide.dist}/slide/webapp/slide-admin.war"
- tofile="${slide.dist}/server/admin/slide-admin.war" />
+ tofile="${slide.dist}/server/slide/slide-admin.war" />
<!-- hSQL DB -->
<copy file="${hsqldb.jar}"