You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by ni...@apache.org on 2002/11/28 21:26:40 UTC
cvs commit: xml-cocoon2/tools/src JTidyTask.java UserInputTask.java
nicolaken 2002/11/28 12:26:39
Modified: . build.xml
Removed: tools/src JTidyTask.java UserInputTask.java
Log:
Removed JTidyTask that was not used and switched to using the Ant input task from UserInputTask.
Revision Changes Path
1.286 +23 -11 xml-cocoon2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/build.xml,v
retrieving revision 1.285
retrieving revision 1.286
diff -u -r1.285 -r1.286
--- build.xml 28 Nov 2002 16:25:19 -0000 1.285
+++ build.xml 28 Nov 2002 20:26:39 -0000 1.286
@@ -284,15 +284,24 @@
<!-- =================================================================== -->
<target name="installwar" depends="init"
description="Installs the WAR package (without the scratchpad) in a specified directory">
- <taskdef name="user-input" classname="UserInputTask"
- classpath="./tools/anttasks"/>
+
+ <!-- Ask the user for the destination path for the war -->
+ <input message="Please select an installation directory"
+ addproperty="install.war"/>
+
+ <!-- If he hits enter, abort -->
+ <condition property="do.abort">
+ <equals arg1="" arg2="${install.war}" />
+ </condition>
+ <fail if="do.abort">Build aborted by user.</fail>
+
+ <!-- tell the install target to include webapp libs in dist -->
<property name="include.webapp.libs" value="true"/>
- <property name="install.war" value=""/>
- <user-input name="install.war">Please select an installation directory</user-input>
+
+ <!-- call install target -->
<antcall target="install"/>
</target>
-
-
+
<!-- =================================================================== -->
<!-- Installs Cocoon war with scratchpad stuff in a specified directory -->
<!-- =================================================================== -->
@@ -302,11 +311,14 @@
<echo message=" You have been warned. "/>
<!-- Ask the user for the destination path for the war -->
- <taskdef name="user-input" classname="UserInputTask"
- classpath="./tools/anttasks"/>
-
- <property name="install.war" value=""/>
- <user-input name="install.war">Please select an installation directory</user-input>
+ <input message="Please select an installation directory"
+ addproperty="install.war"/>
+
+ <!-- If he hits enter, abort -->
+ <condition property="do.abort">
+ <equals arg1="" arg2="${install.war}" />
+ </condition>
+ <fail if="do.abort">Build aborted by user.</fail>
<!-- tell the install target to include all libs in dist -->
<property name="include.webapp.libs" value="true"/>
----------------------------------------------------------------------
In case of troubles, e-mail: webmaster@xml.apache.org
To unsubscribe, e-mail: cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org