perfsonar development work

Author: roman
Date: 2006-10-19 04:13:31 -0400 (Thu, 19 Oct 2006)
New Revision: 1693

Modified:
   branches/romradz-ant4rel-20061017/ant/axis-deploy-targets.xml
Log:
tomcat startup and shutdown updated in deploy targets

Modified: branches/romradz-ant4rel-20061017/ant/axis-deploy-targets.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/axis-deploy-targets.xml       
2006-10-19 04:56:50 UTC (rev 1692)
+++ branches/romradz-ant4rel-20061017/ant/axis-deploy-targets.xml       
2006-10-19 08:13:31 UTC (rev 1693)
@@ -145,37 +145,52 @@
 
     </target>
 
+
+    <!-- adding/removing a new listener to/from the Axis file web.xml --> 
     
     <!-- Add service (un)initialization context listener class to AXIS 
web.xml -->
     <target name="add-context-listener">
-    
+        
         <copy file="${axisWebXml}" tofile="${axisWebXml}.bak" 
overwrite="yes" />
-        
         <style in="${axisWebXml}" out="${axisWebXml}.out" 
style="ant/add-context-listener.xsl" />
-        
         <copy file="${axisWebXml}.out" tofile="${axisWebXml}" 
overwrite="yes" />
-        
-        
+
     </target>
 
 
     <!-- Remove service (un)initialization context listener class from AXIS 
web.xml -->
     <target name="rem-context-listener">
-    
+
         <copy file="${axisWebXml}" tofile="${axisWebXml}.bak" 
overwrite="yes" />
-        
         <style in="${axisWebXml}" out="${axisWebXml}.out" 
style="ant/rem-context-listener.xsl" />
-        
         <copy file="${axisWebXml}.out" tofile="${axisWebXml}" 
overwrite="yes" />
-        
+
     </target>
 
 
     <!-- running and stopping the Tomcat -->
 
     <property environment="env"/>
-    
-    <target name="tomcat-start">
+
+
+    <target name="tomcat-start-question">
+
+        <input message="Do you want to start the application server Tomcat? "
+            addproperty="_tomcat.start.decision"
+            validargs="y,n"
+            defaultvalue="y" />
+
+        <condition property="tomcat.start.decision">
+            <equals arg1="y" arg2="${_tomcat.start.decision}"/>
+        </condition>
+
+    </target>
+
+
+    <target name="tomcat-start"
+            depends="tomcat-start-question"
+            if="tomcat.start.decision">
+
         <exec dir="${tomcat.home}/bin"
             executable="sh"
             output="${basedir}/log/tomcat.log"
@@ -183,10 +198,28 @@
             <arg line="startup.sh"/>
             <env key="PATH" path="${env.PATH}:${tomcat.home}/bin:."/>
         </exec>
+
     </target>
-    
-    
-    <target name="tomcat-shutdown">
+
+
+    <target name="tomcat-shutdown-question">
+
+        <input message="Do you want to shutdown the application server 
Tomcat? "
+            addproperty="_tomcat.shutdown.decision"
+            validargs="y,n"
+            defaultvalue="y" />
+
+        <condition property="tomcat.shutdown.decision">
+            <equals arg1="y" arg2="${_tomcat.shutdown.decision}"/>
+        </condition>
+
+    </target>
+
+
+    <target name="tomcat-shutdown"
+            depends="tomcat-shutdown-question"
+            if="tomcat.shutdown.decision">
+
         <exec dir="${tomcat.home}/bin"
             executable="sh"
             output="${basedir}/log/tomcat.log"
@@ -194,6 +227,7 @@
             <arg line="shutdown.sh"/>
             <env key="PATH" path="${env.PATH}:${tomcat.home}/bin:."/>
         </exec>
+
     </target>