You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2006/06/18 14:55:09 UTC
svn commit: r415130 -
/incubator/roller/branches/roller_2.4_appd9/sandbox/standalone/build.xml
Author: snoopdave
Date: Sun Jun 18 05:55:08 2006
New Revision: 415130
URL: http://svn.apache.org/viewvc?rev=415130&view=rev
Log:
Unzip JSPWiki first to get jar
Modified:
incubator/roller/branches/roller_2.4_appd9/sandbox/standalone/build.xml
Modified: incubator/roller/branches/roller_2.4_appd9/sandbox/standalone/build.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_2.4_appd9/sandbox/standalone/build.xml?rev=415130&r1=415129&r2=415130&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.4_appd9/sandbox/standalone/build.xml (original)
+++ incubator/roller/branches/roller_2.4_appd9/sandbox/standalone/build.xml Sun Jun 18 05:55:08 2006
@@ -23,6 +23,12 @@
<target name="roller_demo" depends="create_bundle" >
</target>
+<!-- unzip JSPWiki, unjar its WAR into ./build/roller-demo/webapps -->
+<mkdir dir="./build/wiki" />
+<unzip src="${jspwiki.filename}" dest="./build" />
+<unjar src="./build/JSPWiki/JSPWiki.war"
+ dest="./build/wiki" />
+
<target name="plugins"
description="Build HSQLDB startup listener and JSPWiki page provider">
@@ -32,7 +38,7 @@
<fileset dir="./lib">
<include name="*.jar" />
</fileset>
- <fileset dir="${roller.srcdir}/build/roller/WEB-INF/lib">
+ <fileset dir="./build/wiki/WEB-INF/lib">
<include name="JSPWiki.jar" />
</fileset>
<fileset dir="${roller.srcdir}/tools/buildtime">
@@ -54,6 +60,9 @@
<!-- untar Tomcat, put it in ./build/roller-demo -->
<untar src="${tomcat.filename}" dest="./build" compression="gzip" />
<rename src="./build/${tomcat.basename}" dest="./build/roller-demo" />
+ <move todir="./build/roller-demo/webapps">
+ <fileset dir="./build" includes="wiki/**" />
+ </move>
<!--
<delete dir="./build/roller-demo/webapps/tomcat-docs" />
@@ -62,12 +71,6 @@
<delete dir="./build/roller-demo/webapps/webdav" />
-->
- <!-- unzip JSPWiki, unjar its WAR into ./build/roller-demo/webapps -->
- <mkdir dir="./build/roller-demo/webapps/wiki" />
- <unzip src="${jspwiki.filename}" dest="./build" />
- <unjar src="./build/JSPWiki/JSPWiki.war"
- dest="./build/roller-demo/webapps/wiki" />
-
<!-- Standalone demo wiki plugin goes in JSPWiki webapp -->
<copy file="./build/roller-jspwiki.jar"
todir="./build/roller-demo/webapps/wiki/WEB-INF/lib" />