perfsonar development work

Author: roman
Date: 2006-11-28 06:39:01 -0500 (Tue, 28 Nov 2006)
New Revision: 1780

Modified:
   branches/romradz-ant4rel-20061017/ant/configure-targets.xml
   branches/romradz-ant4rel-20061017/ant/pre-install-targets.xml
   branches/romradz-ant4rel-20061017/ant/rrdma/rrdjtool-compile-targets.xml
   branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-pre-install-targets.xml
Log:
more descriptive pre-install step

Modified: branches/romradz-ant4rel-20061017/ant/configure-targets.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/configure-targets.xml 2006-11-27 
21:56:33 UTC (rev 1779)
+++ branches/romradz-ant4rel-20061017/ant/configure-targets.xml 2006-11-28 
11:39:01 UTC (rev 1780)
@@ -18,33 +18,6 @@
     <property file="ant/const.properties" />
 
 
-    <!-- getting the java path -->
-
-
-    <target name="_get-java-path">
-
-        <exec executable="which"
-            os="Linux"
-            errorproperty="java.path.error"
-            outputproperty="full.java.path">
-            <arg line="java"/>
-        </exec>
-
-    </target>
-
-
-    <target name="get-java-path" depends="_get-java-path">
-
-        <dirname property="__java.path" file="${full.java.path}"/>
-        <dirname property="_java.path" file="${__java.path}"/>
-        <input message="Enter the path of Java [${_java.path}]:"
-            addproperty="java.path"
-            defaultvalue="${_java.path}"
-            />
-
-    </target>
-
-
     <!-- getting the server address -->
 
 
@@ -115,20 +88,6 @@
     </target>
 
 
-    <!-- getting the service directory -->
-
-
-    <target name="get-service-directory">
-
-        <dirname property="_service.home" file="${basedir}"/>
-
-        <input message="Enter the path where you want to install the service 
[${_service.home}]:"
-            addproperty="service.home"
-            defaultvalue="${_service.home}" />
-
-    </target>
-
-
     <!-- creating log4j.properties file -->
 
 

Modified: branches/romradz-ant4rel-20061017/ant/pre-install-targets.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/pre-install-targets.xml       
2006-11-27 21:56:33 UTC (rev 1779)
+++ branches/romradz-ant4rel-20061017/ant/pre-install-targets.xml       
2006-11-28 11:39:01 UTC (rev 1780)
@@ -25,14 +25,56 @@
 
     <property name="exist.war.file" value="exist-1.0.1.war" />
 
+    <property file="ant/const.properties" />
 
 
-    <target name="get-service-home" depends="get-service-directory">
+    <!-- getting the java path -->
 
+
+    <target name="_get-java-path">
+
+        <exec executable="which"
+            os="Linux"
+            errorproperty="java.path.error"
+            outputproperty="full.java.path">
+            <arg line="java"/>
+        </exec>
+
+    </target>
+
+
+    <target name="get-java-path" depends="_get-java-path">
+
+        <dirname property="__java.path" file="${full.java.path}"/>
+        <dirname property="_java.path" file="${__java.path}"/>
+        <input message="Enter the home directory where the Java is installed 
(I need the home directory and not the directory where the executable binary 
is present) [${_java.path}]:"
+            addproperty="java.path"
+            defaultvalue="${_java.path}"
+        />
+
+    </target>
+
+
+    <!-- getting the service directory -->
+
+
+    <target name="_get-service-home">
+
+        <dirname property="__service.home" file="${basedir}"/>
+
+        <input message="Enter the path where you want to install the service 
[${__service.home}]:"
+            addproperty="_service.home"
+            defaultvalue="${__service.home}" />
+
+    </target>
+
+
+    <target name="get-service-home" depends="_get-service-home">
+
         <propertyfile file="ant/const.properties"
             comment="This file was created by the ant script.">
 
-            <entry  key="service.home" value="${service.home}"/>
+            <entry  key="service.home" value="${_service.home}"/>
 
         </propertyfile>
 
@@ -119,7 +161,7 @@
 
     <target name="exist-war-question">
 
-        <input message="Do you want to use the xml database eXist configured 
as a web application in your Tomcat? "
+        <input message="Usage of eXist xml database is recommended for the 
service. Installing this database as a web application in your Tomcat is also 
suggested. Do you want me to do this for you? "
             addproperty="_exist.war.install.decision"
             validargs="y,n"
             defaultvalue="n" />
@@ -172,7 +214,7 @@
 
     <target name="exist-install-question">
 
-        <input message="Do you want to install the xml database eXist as a 
stand-alone application? "
+        <input message="Usage of eXist xml database is recommended for the 
service. If you don't want to have it as a web application in your Tomcat 
then do you want to install eXist as a stand-alone application? "
             addproperty="_exist.install.decision"
             validargs="y,n"
             defaultvalue="n" />

Modified: 
branches/romradz-ant4rel-20061017/ant/rrdma/rrdjtool-compile-targets.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/rrdma/rrdjtool-compile-targets.xml  
  2006-11-27 21:56:33 UTC (rev 1779)
+++ branches/romradz-ant4rel-20061017/ant/rrdma/rrdjtool-compile-targets.xml  
  2006-11-28 11:39:01 UTC (rev 1780)
@@ -110,12 +110,13 @@
                         -lc -lrrd"/>
         </exec>
 
+        <!--
         <echo message="" />
         <echo message="" />
-        <echo 
message="-----------------------------------------------------------" />
         <echo message="Now you need to setup LD_LIBRARY_PATH env variable 
which should contain" />
         <echo message="${rrd_lib_path}:${rrdjdir}/build" />
-        <echo 
message="-----------------------------------------------------------" />
+        <echo message="" />
+        -->
 
     </target>
 
@@ -136,12 +137,13 @@
                         -lc -lrrd"/>
         </exec>
 
+        <!--
         <echo message="" />
         <echo message="" />
-        <echo 
message="-----------------------------------------------------------" />
         <echo message="Now you need to setup LD_LIBRARY_PATH env variable 
which should contain" />
         <echo message="${rrd_lib_path}:${rrdjdir}/build" />
-        <echo 
message="-----------------------------------------------------------" />
+        <echo message="" />
+        -->
 
     </target>
 

Modified: 
branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-pre-install-targets.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-pre-install-targets.xml 
  2006-11-27 21:56:33 UTC (rev 1779)
+++ branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-pre-install-targets.xml 
  2006-11-28 11:39:01 UTC (rev 1780)
@@ -50,12 +50,12 @@
     <target name="rrdjtool-question"
         depends="get-rrdtool-path">
 
-        <input message="What OS platform do you use: "
+        <input message="Which OS platform do you use: "
             addproperty="_os.platform"
             validargs="linux,freebsd,solaris"
             defaultvalue="linux" />
 
-        <input message="Enter the directory where the rrdtool application is 
installed [${rrdtool.path}]: "
+        <input message="Enter the home directory where the rrdtool is 
installed (I need the home directory and not the directory where the 
executable binary is present) [${rrdtool.path}]: "
             addproperty="_rrdtool_path"
             defaultvalue="${rrdtool.path}" />
 
@@ -131,6 +131,10 @@
 
         <echo>Preparing the installation of ${service.name}...</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-home"/>
 
         <antcall target="webservice-container-download"/>