perfsonar development work

Author: roman
Date: 2006-11-29 07:50:58 -0500 (Wed, 29 Nov 2006)
New Revision: 1782

Modified:
   branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-axis-deploy-targets.xml
   branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-configure-targets.xml
   branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-exist-xmldb-targets.xml
   branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-pre-install-targets.xml
Log:
some improvements in the installation scripts for the next release
- mainly in deployment step

Modified: 
branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-axis-deploy-targets.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-axis-deploy-targets.xml 
  2006-11-28 15:44:13 UTC (rev 1781)
+++ branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-axis-deploy-targets.xml 
  2006-11-29 12:50:58 UTC (rev 1782)
@@ -149,7 +149,7 @@
 
         <echo>${line.separator}Example:</echo>
         <echo>  export 
LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${rrdtool_path}/lib:${rrdjdir}/build</echo>
-        <echo>${line.separator} Please, do it now.</echo>
+        <echo>${line.separator} Please, do it now. I will wait for 
you.</echo>
 
         <input message="Press Return key ..."/>
 

Modified: 
branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-configure-targets.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-configure-targets.xml   
  2006-11-28 15:44:13 UTC (rev 1781)
+++ branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-configure-targets.xml   
  2006-11-29 12:50:58 UTC (rev 1782)
@@ -213,7 +213,7 @@
     <!-- initializing xml database eXist -->
 
 
-    <target name="_exist-init">
+    <target name="__exist-init">
 
         <property file="conf/service.properties" />
 
@@ -224,10 +224,23 @@
     </target>
 
 
+    <target name="_exist-init"
+        depends="__exist-init"
+        if="component.ma.xmldb.db_status.present">
+
+        <condition property="component.ma.xmldb.db_status.type_standalone">
+            <equals arg1="stand-alone" arg2="${component.ma.xmldb.type}"/>
+        </condition>
+
+    </target>
+
+
     <target name="exist-init"
         depends="_exist-init"
-        if="component.ma.xmldb.db_status.present">
+        if="component.ma.xmldb.db_status.type_standalone">
 
+        <echo>Initializing the xml database eXist...</echo>
+
         <antcall target="xmldb-init-rrdma"/>
 
     </target>

Modified: 
branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-exist-xmldb-targets.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-exist-xmldb-targets.xml 
  2006-11-28 15:44:13 UTC (rev 1781)
+++ branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-exist-xmldb-targets.xml 
  2006-11-29 12:50:58 UTC (rev 1782)
@@ -194,7 +194,10 @@
     <target name="xmldb-check-status">
 
         <condition property="exist.check.status">
-            <equals arg1="on" arg2="${component.ma.xmldb.db_status}"/>
+            <and>
+                <equals arg1="on" arg2="${component.ma.xmldb.db_status}"/>
+                <equals arg1="webapp" arg2="${component.ma.xmldb.type}"/>
+            </and>
         </condition>
 
     </target>
@@ -204,7 +207,7 @@
         depends="xmldb-check-status"
         if="exist.check.status">
 
-        <input message="Do you want me to add new user 
${component.ma.xmldb.db_username} (provided in the pre-install step) and 
initiate the xml database eXist (if your eXist is already configured and 
initialized for RRD MA answer 'n')? "
+        <input message="Do you want me to add new user 
${component.ma.xmldb.db_username} (provided in the pre-install step) and 
initiate the xml database eXist (If your eXist is already configured and 
initialized for RRD MA answer 'n'.  But probably it's your first run of this 
installation script so you have not added this user and initialized the 
database yet.) ? "
             addproperty="_exist.adduser.init"
             validargs="y,n"
             defaultvalue="y" />

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-28 15:44:13 UTC (rev 1781)
+++ branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-pre-install-targets.xml 
  2006-11-29 12:50:58 UTC (rev 1782)
@@ -168,7 +168,7 @@
 
     <target name="exist-war-question">
 
-        <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? "
+        <input message="Usage of eXist xml database is recommended for the 
service. Installing/configuring 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" />
@@ -266,29 +266,34 @@
 
         <antcall target="exist-war-rrdma"/>
 
+        <propertyfile file="conf/service.properties" 
+            comment="This file was created by the Ant configuration script.">
+            <entry  key="component.ma.xmldb.type" value="webapp"/>
+        </propertyfile>
+
     </target>
 
 
     <!-- downloading eXist jar (stand-alone application) -->
 
 
-    <target name="exist-install-question">
+    <target name="exist-jar-install-question">
 
-        <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"
+        <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/configure eXist as a stand-alone application? "
+            addproperty="_exist.jar.install.decision"
             validargs="y,n"
             defaultvalue="n" />
 
-        <condition property="exist.install.decision">
-            <equals arg1="y" arg2="${_exist.install.decision}"/>
+        <condition property="exist.jar.install.decision">
+            <equals arg1="y" arg2="${_exist.jar.install.decision}"/>
         </condition>
 
     </target>
 
 
-    <target name="exist-install"
-        depends="exist-install-question"
-        if="exist.install.decision">
+    <target name="exist-jar-install"
+        depends="exist-jar-install-question"
+        if="exist.jar.install.decision">
 
         <echo>Visit the download page 
http://prdownloads.sourceforge.net/exist</echo>
         <echo>and download the file eXist-1.0.jar. </echo>
@@ -309,12 +314,17 @@
         <echo></echo>
         <echo>(port number 8585 is only an example).</echo>
         <echo></echo>
-        <echo>When installed run the application executing</echo>
+        <echo>Once you have installed run the application executing</echo>
         <echo>the script startup.sh .</echo>
         <echo></echo>
         <echo>Please, do it now. I will wait for you.</echo>
         <input message="Press Return key ..."/>
 
+        <propertyfile file="conf/service.properties" 
+            comment="This file was created by the Ant configuration script.">
+            <entry  key="component.ma.xmldb.type" value="stand-alone"/>
+        </propertyfile>
+
     </target>
 
 
@@ -421,7 +431,7 @@
         depends="exist-clean-properties, exist-war-install"
         unless="exist.war.install.decision">
 
-        <antcall target="exist-install"/>
+        <antcall target="exist-jar-install"/>
 
         <antcall target="exist-location-question"/>
         <antcall target="exist-use-rrdma"/>