perfsonar development work

Author: roman
Date: 2007-10-26 07:33:13 -0400 (Fri, 26 Oct 2007)
New Revision: 2994

Modified:
   branches/new-structure/trunk/geant2_java-rrd-ma/ant/pre-install-targets.xml
Log:

When a user wanted to use eXist instance, which was installed before the 
installation precedure of the service, there might have been a 
problem. The installation precedure were using default context name of eXist 
database but it was possible that the name could be different (so 
eXist URL created by the installation script might have been wrong).

default name: exist (it was used in URL name this way: 
http://localhost:8080/exist)
other possible name: exist-1.0.1 (http://localhost:8080/exist-1.0.1)

Problem Fixed. Instatallation script asks for this context name.





Modified: 
branches/new-structure/trunk/geant2_java-rrd-ma/ant/pre-install-targets.xml
===================================================================
--- 
branches/new-structure/trunk/geant2_java-rrd-ma/ant/pre-install-targets.xml 
2007-10-25 08:56:18 UTC (rev 2993)
+++ 
branches/new-structure/trunk/geant2_java-rrd-ma/ant/pre-install-targets.xml 
2007-10-26 11:33:13 UTC (rev 2994)
@@ -384,9 +384,9 @@
 
     <property file="${basedir}/ant/const.properties" />
     <propertyfile file="${basedir}/conf/service.properties">
-      <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"        
value="http://${exist.hostname}:${exist.port}/exist/rest/db/rrdmaconfig"/>  
-->
-      <entry  key="component.ma.xmldb.db_uri.xmlrpc" 
value="xmldb:exist://${exist.hostname}:${exist.port}/exist/xmlrpc/db/rrdmaconfig"/>
+      <entry  key="component.ma.xmldb.db_uri"        
value="xmldb:exist://${exist.hostname}:${exist.port}/${exist.contextname}/xmlrpc/db/rrdmaconfig"/>
+      <!-- <entry  key="component.ma.xmldb.db_uri"        
value="http://${exist.hostname}:${exist.port}/${exist.contextname}/rest/db/rrdmaconfig"/>
  -->
+      <entry  key="component.ma.xmldb.db_uri.xmlrpc" 
value="xmldb:exist://${exist.hostname}:${exist.port}/${exist.contextname}/xmlrpc/db/rrdmaconfig"/>
     </propertyfile>
 
   </target>
@@ -434,6 +434,11 @@
                    addproperty="_exist.hostname"
                    defaultvalue="${exist.default.hostname}" />
 
+    <property name="exist.default.contextname" value="exist"/>
+    <psbase:input2 message="Enter the context name of xml database eXist 
used in URL (example of such URL: http://localhost:8080/[exist-context-name])"
+                   addproperty="_exist.contextname"
+                   defaultvalue="${exist.default.contextname}" />
+
     <property name="exist.default.port" value="8080"/>
     <psbase:input2 message="Enter the port number of xml database eXist"
                    addproperty="_exist.port"
@@ -446,8 +451,9 @@
                    defaultvalue=""/>
 
     <propertyfile file="${basedir}/ant/const.properties">
-      <entry  key="exist.hostname" value="${_exist.hostname}"/>
-      <entry  key="exist.port"     value="${_exist.port}"/>
+      <entry  key="exist.hostname"    value="${_exist.hostname}"/>
+      <entry  key="exist.port"        value="${_exist.port}"/>
+      <entry  key="exist.contextname" value="${_exist.contextname}"/>
     </propertyfile>
 
     <propertyfile file="${basedir}/conf/service.properties">
@@ -468,6 +474,10 @@
                    addproperty="_exist.hostname"
                    defaultvalue="${exist.default.hostname}" />
 
+    <psbase:input2 message="Enter the context name of xml database eXist 
used in URL (example of such URL: http://localhost:8080/[exist-context-name])"
+                   addproperty="_exist.contextname"
+                   defaultvalue="exist" />
+
     <property name="exist.default.port" value="8080"/>
     <psbase:input2 message="Enter the port number of xml database eXist"
                    addproperty="_exist.port"
@@ -480,9 +490,9 @@
 
     <propertyfile file="${basedir}/conf/service.properties">
       <entry  key="component.ma.xmldb.type"          value="webapp"/>
-      <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"        
value="http://${_exist.hostname}:${_exist.port}/exist/rest/db/rrdmaconfig"/>  
-->
-      <entry  key="component.ma.xmldb.db_uri.xmlrpc" 
value="xmldb:exist://${_exist.hostname}:${_exist.port}/exist/xmlrpc/db/rrdmaconfig"/>
+      <entry  key="component.ma.xmldb.db_uri"        
value="xmldb:exist://${_exist.hostname}:${_exist.port}/${_exist.contextname}/xmlrpc/db/rrdmaconfig"/>
+      <!-- <entry  key="component.ma.xmldb.db_uri"        
value="http://${_exist.hostname}:${_exist.port}/${_exist.contextname}/rest/db/rrdmaconfig"/>
  -->
+      <entry  key="component.ma.xmldb.db_uri.xmlrpc" 
value="xmldb:exist://${_exist.hostname}:${_exist.port}/${_exist.contextname}/xmlrpc/db/rrdmaconfig"/>
     </propertyfile>
 
     <antcall target="exist-add-new-user"/>