perfsonar development work

Author: roman
Date: 2006-10-31 07:16:58 -0500 (Tue, 31 Oct 2006)
New Revision: 1727

Modified:
   branches/romradz-ant4rel-20061017/ant/configure-targets.xml
   branches/romradz-ant4rel-20061017/ant/pre-install-targets.xml
   branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-exist-xmldb-targets.xml
Log:
small changes to improve future release installation procedure

Modified: branches/romradz-ant4rel-20061017/ant/configure-targets.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/configure-targets.xml 2006-10-31 
10:33:00 UTC (rev 1726)
+++ branches/romradz-ant4rel-20061017/ant/configure-targets.xml 2006-10-31 
12:16:58 UTC (rev 1727)
@@ -319,7 +319,7 @@
         <echo>(user name, hostname and port number 8585 are only 
examples)</echo>
         <echo></echo>
 
-        <echo>Please, do it now.</echo>
+        <echo>Please, do it now and make sure the xml database is running. I 
will wait for you.</echo>
         <input message="Press Return key ..."/>
 
     </target>

Modified: branches/romradz-ant4rel-20061017/ant/pre-install-targets.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/pre-install-targets.xml       
2006-10-31 10:33:00 UTC (rev 1726)
+++ branches/romradz-ant4rel-20061017/ant/pre-install-targets.xml       
2006-10-31 12:16:58 UTC (rev 1727)
@@ -24,7 +24,6 @@
     <property name="tomcat.dir" value="apache-tomcat-5.5.20" />
 
     <property name="exist.war.file" value="exist-1.0.1.war" />
-    <property name="exist.war.dir" value="exist" />
 
 
 
@@ -120,7 +119,7 @@
 
     <target name="exist-war-question">
 
-        <input message="Do you want to use the xml database eXist as a web 
application in your Tomcat? "
+        <input message="Do you want to use the xml database eXist configured 
as a web application in your Tomcat? "
             addproperty="_exist.war.install.decision"
             validargs="y,n"
             defaultvalue="n" />
@@ -156,9 +155,9 @@
 
         <dirname property="_exist.war.install.location" file="${basedir}"/>
 
-        <input message="Enter the path of directory where downloaded eXist 
war file is located [${_exist.war.install.location}/${exist.war.dir}]:"
+        <input message="Enter the path of directory where downloaded eXist 
war file is located [${_exist.war.install.location}]:"
             addproperty="exist.war.install.location"
-            defaultvalue="${_exist.war.install.location}/${exist.war.dir}" />
+            defaultvalue="${_exist.war.install.location}" />
 
         <propertyfile file="ant/const.properties" 
             comment="This file was created by the Ant configuration script.">
@@ -211,9 +210,7 @@
         <echo>When installed run the application executing</echo>
         <echo>the script startup.sh .</echo>
         <echo></echo>
-        <echo>Please, do it now.</echo>
-
-        <echo></echo>
+        <echo>Please, do it now. I will wait for you.</echo>
         <input message="Press Return key ..."/>
 
     </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-10-31 10:33:00 UTC (rev 1726)
+++ branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-exist-xmldb-targets.xml 
  2006-10-31 12:16:58 UTC (rev 1727)
@@ -201,7 +201,7 @@
         <propertyfile file="conf/service.properties" 
             comment="This file was created by the Ant configuration script.">
 
-            <entry  key="component.ma.xmldb.db_uri" 
value="http://${exist.hostname}:${exist.port}/exist/xmlrpc/db/rrdmaconfig"/>
+            <entry  key="component.ma.xmldb.db_uri" 
value="xmldb:exist://${exist.hostname}:${exist.port}/exist/xmlrpc/db/rrdmaconfig"/>
             <entry  key="component.ma.xmldb.db_uri.xmlrpc" 
value="xmldb:exist://${exist.hostname}:${exist.port}/exist/xmlrpc/db/rrdmaconfig"/>
 
         </propertyfile>
@@ -245,7 +245,7 @@
         depends="_exist-rrdma"
         if="exist.type.A.decision">
 
-        <echo>Make sure that you have downloaded war file of eXist in 
pre-install step.</echo>
+        <echo>Make sure that you have downloaded war file of eXist in the 
pre-install step.</echo>
         <input message="Press Return key ..."/>
 
         <echo>Please, insert now the following xml tag Context</echo>
@@ -253,7 +253,7 @@
         <echo>(${tomcat.home}/conf/server.xml)</echo>
         <echo>inside existing xml tag Host:</echo>
         <echo></echo>
-        <echo message="    &lt;Context path='/${exist.war.dir}'"/>
+        <echo message="    &lt;Context path='/exist'"/>
         <echo message="        
docBase='${exist.home}/${exist.war.file}'&gt;"/>
         <echo message="    &lt;/Context&gt;"/>
         <echo></echo>