perfsonar development work

Author: roman
Date: 2007-11-07 08:17:40 -0500 (Wed, 07 Nov 2007)
New Revision: 3018

Modified:
   branches/new-structure/trunk/geant2_java-sql-ma/ant/exist-targets.xml
   branches/new-structure/trunk/geant2_java-sql-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-sql-ma/ant/exist-targets.xml
===================================================================
--- branches/new-structure/trunk/geant2_java-sql-ma/ant/exist-targets.xml     
  2007-11-07 10:36:08 UTC (rev 3017)
+++ branches/new-structure/trunk/geant2_java-sql-ma/ant/exist-targets.xml     
  2007-11-07 13:17:40 UTC (rev 3018)
@@ -177,7 +177,7 @@
     <antcontrib:if>
       <equals arg1="${exist.adduser}" arg2="y" />
         <antcontrib:then>
-          <psbase:exist-xquery 
uri="xmldb:exist://${target.server}:${target.port}/exist/xmlrpc/db"
+          <psbase:exist-xquery 
uri="xmldb:exist://${target.server}:${target.port}/${exist.contextname}/xmlrpc/db"
                                user="admin"
                                
password="${component.ma.xmldb.db_adminpassword}"
                                
query="xmldb:create-user('${component.ma.xmldb.db_username}', 
'${component.ma.xmldb.db_password}', 'dba', '/db')" />
@@ -201,7 +201,7 @@
                    defaultvalue=""/>
     <psbase:input2 message="Enter the URL of eXist?"
                    addproperty="url"
-                   
defaultvalue="xmldb:exist://${target.server}:${target.port}/exist/xmlrpc/db"/>
+                   
defaultvalue="xmldb:exist://${target.server}:${target.port}/${exist.contextname}/xmlrpc/db"/>
 
     <psbase:exist-xquery uri="${url}"
                          user="admin"

Modified: 
branches/new-structure/trunk/geant2_java-sql-ma/ant/pre-install-targets.xml
===================================================================
--- 
branches/new-structure/trunk/geant2_java-sql-ma/ant/pre-install-targets.xml 
2007-11-07 10:36:08 UTC (rev 3017)
+++ 
branches/new-structure/trunk/geant2_java-sql-ma/ant/pre-install-targets.xml 
2007-11-07 13:17:40 UTC (rev 3018)
@@ -74,7 +74,12 @@
     <antcall target="exist-main-properties"/>
     <antcall target="exist-tomcat-context"/>
 
+    <propertyfile file="${basedir}/ant/const.properties">
+          <entry  key="exist.contextname" value="exist"/>
+    </propertyfile>
+
     <property file="${basedir}/ant/const.properties" />
+
     <propertyfile file="${basedir}/conf/service.properties">
       <entry  key="component.ma.xmldb.db_uri"        
value="xmldb:exist://localhost:${target.port}/exist/xmlrpc/db/sqlmaconfig"/>
       <!-- <entry  key="component.ma.xmldb.db_uri"        
value="http://localhost:${target.port}/exist/rest/db/sqlmaconfig"/> -->
@@ -224,9 +229,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/sqlmaconfig"/>
-      <!-- <entry  key="component.ma.xmldb.db_uri"        
value="http://${exist.hostname}:${exist.port}/exist/rest/db/sqlmaconfig"/> -->
-      <entry  key="component.ma.xmldb.db_uri.xmlrpc" 
value="xmldb:exist://${exist.hostname}:${exist.port}/exist/xmlrpc/db/sqlmaconfig"/>
+      <entry  key="component.ma.xmldb.db_uri"        
value="xmldb:exist://${exist.hostname}:${exist.port}/${exist.contextname}/xmlrpc/db/sqlmaconfig"/>
+      <!-- <entry  key="component.ma.xmldb.db_uri"        
value="http://${exist.hostname}:${exist.port}/${exist.contextname}/rest/db/sqlmaconfig"/>
 -->
+      <entry  key="component.ma.xmldb.db_uri.xmlrpc" 
value="xmldb:exist://${exist.hostname}:${exist.port}/${exist.contextname}/xmlrpc/db/sqlmaconfig"/>
     </propertyfile>
 
   </target>
@@ -274,18 +279,26 @@
                    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"
                    defaultvalue="${exist.default.port}" />
     <psbase:input2 message="Enter the eXist user name you have created"
-                   addproperty="_exist.username"/>
+                   addproperty="_exist.username"
+                   defaultvalue=""/>
     <psbase:input2 message="Enter the pasword for eXist user name 
${_exist.username}"
-                   addproperty="_exist.password"/>
+                   addproperty="_exist.password"
+                   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">
@@ -306,6 +319,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"
@@ -314,13 +331,14 @@
     <propertyfile file="${basedir}/ant/const.properties">
       <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">
       <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/sqlmaconfig"/>
-      <!-- <entry  key="component.ma.xmldb.db_uri"        
value="http://${_exist.hostname}:${_exist.port}/exist/rest/db/sqlmaconfig"/> 
-->
-      <entry  key="component.ma.xmldb.db_uri.xmlrpc" 
value="xmldb:exist://${_exist.hostname}:${_exist.port}/exist/xmlrpc/db/sqlmaconfig"/>
+      <entry  key="component.ma.xmldb.db_uri"        
value="xmldb:exist://${_exist.hostname}:${_exist.port}/${_exist.contextname}/xmlrpc/db/sqlmaconfig"/>
+      <!-- <entry  key="component.ma.xmldb.db_uri"        
value="http://${_exist.hostname}:${_exist.port}/${_exist.contextname}/rest/db/sqlmaconfig"/>
 -->
+      <entry  key="component.ma.xmldb.db_uri.xmlrpc" 
value="xmldb:exist://${_exist.hostname}:${_exist.port}/${_exist.contextname}/xmlrpc/db/sqlmaconfig"/>
     </propertyfile>
 
     <antcall target="exist-add-new-user"/>