perfsonar development work

Author: roman
Date: 2006-12-04 08:15:50 -0500 (Mon, 04 Dec 2006)
New Revision: 1791

Modified:
   branches/romradz-ant4rel-20061017/ant/axis-deploy-targets.xml
   branches/romradz-ant4rel-20061017/ant/pre-install-targets.xml
   branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-configure-targets.xml
   branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-pre-install-targets.xml
Log:
Using different names of the service one can install the same type of service 
(in this case RRD MA) in one instance of Tomcat.

Modified: branches/romradz-ant4rel-20061017/ant/axis-deploy-targets.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/axis-deploy-targets.xml       
2006-12-01 16:21:38 UTC (rev 1790)
+++ branches/romradz-ant4rel-20061017/ant/axis-deploy-targets.xml       
2006-12-04 13:15:50 UTC (rev 1791)
@@ -261,8 +261,23 @@
     <!-- (un)deploying the service in Axis -->
 
 
-    <target name="deploy-adminclient">
+    <target name="_deploy-adminclient">
 
+        <echo></echo>
+        <echo>The directory with all required service files has been 
created.</echo>
+        <echo>The next step in deploy action is installing the service in 
Tomcat.</echo>
+        <echo>(If you are an expert in Axis and want to install the service 
other way</echo>
+        <echo> than default one use ctrl+c to stop the script in this 
moment)</echo>
+        <echo></echo>
+
+        <input message="Press Return key ..."/>
+
+    </target>
+
+
+    <target name="deploy-adminclient"
+        depends="_deploy-adminclient">
+
         <java classname="org.apache.axis.client.AdminClient">
             <arg line="-l ${adminService} ${deployFile}"/>
             <classpath refid="classpath"/>

Modified: branches/romradz-ant4rel-20061017/ant/pre-install-targets.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/pre-install-targets.xml       
2006-12-01 16:21:38 UTC (rev 1790)
+++ branches/romradz-ant4rel-20061017/ant/pre-install-targets.xml       
2006-12-04 13:15:50 UTC (rev 1791)
@@ -93,6 +93,30 @@
     </target>
 
 
+    <!-- getting the service name -->
+
+
+    <target name="_get-service-name">
+
+        <input message="Enter the name of the service [${service.name}]:"
+            addproperty="_service.name"
+            defaultvalue="${service.name}" />
+
+    </target>
+
+
+    <target name="get-service-name" depends="_get-service-name">
+
+        <propertyfile file="ant/const.properties"
+            comment="This file was created by the ant script.">
+
+            <entry  key="service.name" value="${_service.name}"/>
+
+        </propertyfile>
+
+    </target>
+
+
     <!-- downloading Tomcat -->
 
 

Modified: 
branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-configure-targets.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-configure-targets.xml   
  2006-12-01 16:21:38 UTC (rev 1790)
+++ branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-configure-targets.xml   
  2006-12-04 13:15:50 UTC (rev 1791)
@@ -16,11 +16,11 @@
 
 
 
-    <property name="service.name" value="perfSONAR-RRDMA-1.1-beta" />
+    <property file="ant/const.properties" />
+
     <property name="deploy.root" value="${service.name}" />
 
 
-
     <!-- getting the rrd metadata configuration file -->
 
 

Modified: 
branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-pre-install-targets.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-pre-install-targets.xml 
  2006-12-01 16:21:38 UTC (rev 1790)
+++ branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-pre-install-targets.xml 
  2006-12-04 13:15:50 UTC (rev 1791)
@@ -17,6 +17,9 @@
 <project name="rrdma-pre-install-targets">
 
 
+
+    <property name="service.name" value="perfSONAR-RRDMA-1.1-beta" />
+
     <property name="exist.war.file" value="exist-1.0.1.war" />
 
     <property file="ant/const.properties" />
@@ -474,12 +477,13 @@
 
     <target name="pre-install">
 
-        <echo>Preparing the installation of ${service.name}...</echo>
+        <echo>Preparing the installation of RRD MA...</echo>
 
         <echo></echo>
         <echo>Answer to all questions. If you go wrong, cancel (ctrl-c) and 
start again.</echo>
         <echo></echo>
 
+        <antcall target="get-service-name"/>
         <antcall target="get-service-home"/>
 
         <antcall target="webservice-container-download"/>