cziegeler 01/12/20 02:32:24
Modified: . build.xml
Removed: webapp.site cocoon.xconf sitemap.xmap
webapp.site/WEB-INF web.xml
Log:
Removing extra site webapp, this is all included in the usual webapp as discussed
Revision Changes Path
1.123 +2 -29 xml-cocoon2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/build.xml,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- build.xml 2001/12/20 09:37:31 1.122
+++ build.xml 2001/12/20 10:32:23 1.123
@@ -167,7 +167,6 @@
<property name="docs.dir" value="./documentation/xdocs"/>
<property name="images.dir" value="./documentation/images"/>
<property name="webapp.dir" value="./webapp"/>
- <property name="webapp.site.dir" value="./webapp.site"/>
<property name="resource.dir" value="./resources"/>
<property name="packages" value="org.apache.*"/>
<property name="context.dir" value="./documentation"/>
@@ -186,7 +185,6 @@
<property name="build.xdocs" value="${build.dir}/xdocs"/>
<property name="build.docs.printer" value="${build.dir}/printer-docs"/>
<property name="build.war" value="${build.dir}/webapp"/>
- <property name="build.sitewebapp" value="${build.dir}/sitewebapp"/>
<property name="build.javadocs" value="${build.dir}/javadocs"/>
<property name="build.context" value="${build.dir}/documentation"/>
<property name="build.scratchpad" value="${build.dir}/scratchpad"/>
@@ -200,7 +198,7 @@
<property name="dist.bin.dir" value="${dist.root}/bin/${dist.name}"/>
<property name="dist.target" value="${dist.root}"/>
- <property name="site" value="../xml-site/targets/${name}2"/>
+ <property name="site" value="../xml-site/targets/${name}"/>
<property name="build.announce" value="${build.dir}/Announcement.xml"/>
<property name="announce2txt"
value="./documentation/stylesheets/announcement2txt.xsl"/>
@@ -733,7 +731,7 @@
<target name="docs_check" depends="init">
<uptodate property="docs.notrequired" targetfile="${build.docs}/index.html" >
<srcfiles dir="." includes="changes.xml,todo.xml"/>
- <srcfiles dir="${context.dir}/xdocs" includes="**/*.xml"
excludes="${site.projfile}"/>
+ <srcfiles dir="${context.dir}/xdocs" includes="**/*.xml"/>
</uptodate>
</target>
@@ -897,35 +895,10 @@
</target>
<!-- =================================================================== -->
- <!-- Prepares the libraries for the site war package -->
- <!-- =================================================================== -->
- <target name="prepare-sitewebapp" depends="prepare-docs, package">
- <mkdir dir="${build.sitewebapp}"/>
- <copy todir="${build.sitewebapp}" filtering="off">
- <fileset dir="${build.context}"/>
- </copy>
- <copy todir="${build.sitewebapp}" filtering="off" overwrite="yes">
- <fileset dir="${webapp.site.dir}"/>
- </copy>
- <copy todir="${build.sitewebapp}/WEB-INF/lib">
- <fileset dir="${lib.dir}"/>
- </copy>
- <copy file="${build.dir}/${name}.jar"
tofile="${build.sitewebapp}/WEB-INF/lib/${name}-${version}.jar"/>
- <copy file="${tools.jar}" tofile="${build.sitewebapp}/WEB-INF/lib/javac.jar"/>
- </target>
-
- <!-- =================================================================== -->
<!-- Creates the war file -->
<!-- =================================================================== -->
<target name="webapp" depends="prepare-webapp, prepare-webapp-libs,
prepare-scratchpad-libs, prepare-xsp" description="* Generates the war package">
<jar jarfile="${build.dir}/${name}.war" basedir="${build.war}" includes="**"/>
- </target>
-
- <!-- =================================================================== -->
- <!-- Creates the war file -->
- <!-- =================================================================== -->
- <target name="sitewebapp" depends="prepare-sitewebapp" description="* Generates
the site war package">
- <jar jarfile="${build.dir}/${name}-site.war" basedir="${build.sitewebapp}"
includes="**"/>
</target>
<!-- =================================================================== -->
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
