Update of /var/cvs/contributions/natmm
In directory james.mmbase.org:/tmp/cvs-serv14363
Modified Files:
build.xml
Log Message:
NMCMS-524 - Every application get its own error-pages. Also removed some not
used directories from WAR file during build.
See also: http://cvs.mmbase.org/viewcvs/contributions/natmm
See also: http://www.mmbase.org/jira/browse/NMCMS-524
Index: build.xml
===================================================================
RCS file: /var/cvs/contributions/natmm/build.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- build.xml 27 Nov 2007 15:01:28 -0000 1.10
+++ build.xml 3 Oct 2008 15:10:05 -0000 1.11
@@ -147,9 +147,11 @@
<antcall target="download.mmbase" />
<antcall target="unzip.mmbase"/>
</target>
+
<target name="download.mmbase" unless="mmbase.downloaded">
<get src="${mmbase.download.url}"
dest="${mmbase.dir}/${mmbase.download.zip}" verbose="on" />
</target>
+
<target name="unzip.mmbase" unless="mmbase.unzipped">
<unwar src="${mmbase.dir}/${mmbase.download.zip}"
dest="${mmbase.dir}" />
</target>
@@ -197,6 +199,24 @@
<!-- delete mysql connector from the lib directory -->
<delete
file="${build.dir}/mmbase-webapp/WEB-INF/lib/mysql-connector-java-5.0.5-bin.jar"/>
+ <!-- Copy the webapp specific error-pages -->
+ <mkdir dir="${build.dir}/mmbase-webapp/404" />
+
+ <copy todir="${build.dir}/mmbase-webapp/404" overwrite="true">
+ <fileset dir="${basedir}/templates/404-internet">
+ </fileset>
+ </copy>
+
+ <delete dir="${build.dir}/mmbase-webapp/404-internet" />
+ <delete dir="${build.dir}/mmbase-webapp/404-intranet" />
+ <!-- End error-pages -->
+
+ <!-- Clean up the directories not needed for internet -->
+ <delete dir="${build.dir}/mmbase-webapp/nmintra" />
+ <delete dir="${build.dir}/mmbase-webapp/elle" />
+ <delete dir="${build.dir}/mmbase-webapp/mmexamples" />
+ <!-- End clean-up -->
+
<mkdir dir="${build.dir}/dist" />
<!-- create war file -->
@@ -247,6 +267,27 @@
<filterset
filtersfile="${conf.dir}/filters.properties"/>
</copy>
+ <!-- Copy the webapp specific error-pages -->
+ <mkdir dir="${build.dir}/mmbase-webapp/404" />
+
+ <copy todir="${build.dir}/mmbase-webapp/404" overwrite="true">
+ <fileset dir="${basedir}/templates/404-intranet">
+ </fileset>
+ </copy>
+
+ <delete dir="${build.dir}/mmbase-webapp/404-internet" />
+ <delete dir="${build.dir}/mmbase-webapp/404-intranet" />
+ <!-- End error-pages -->
+
+ <!-- Clean up the directories not needed for intranet -->
+ <delete dir="${build.dir}/mmbase-webapp/natmm" />
+ <delete dir="${build.dir}/mmbase-webapp/natnh" />
+ <delete dir="${build.dir}/mmbase-webapp/breedveld" />
+ <delete dir="${build.dir}/mmbase-webapp/elle" />
+ <delete dir="${build.dir}/mmbase-webapp/vanham" />
+ <delete dir="${build.dir}/mmbase-webapp/mmexamples" />
+ <!-- End clean-up -->
+
<!-- delete mysql connector from the lib directory -->
<!--<delete
file="${build.dir}/mmbase-webapp/WEB-INF/lib/mysql-connector-java-5.0.5-bin.jar"/>-->
@@ -261,5 +302,4 @@
<jar destfile="${build.dir}/natmm.war"
basedir="${build.dir}/natmm" />
</target>
-
</project>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
