perfsonar development work

Author: roman
Date: 2007-10-26 08:16:07 -0400 (Fri, 26 Oct 2007)
New Revision: 2995

Modified:
   branches/new-structure/trunk/geant2_java-rrd-ma/ant/exist-targets.xml
   branches/new-structure/trunk/geant2_java-rrd-ma/ant/pre-install-targets.xml
Log:
few more updates to fix the problem with eXist context name in URL address




Modified: 
branches/new-structure/trunk/geant2_java-rrd-ma/ant/exist-targets.xml
===================================================================
--- branches/new-structure/trunk/geant2_java-rrd-ma/ant/exist-targets.xml     
  2007-10-26 11:33:13 UTC (rev 2994)
+++ branches/new-structure/trunk/geant2_java-rrd-ma/ant/exist-targets.xml     
  2007-10-26 12:16:07 UTC (rev 2995)
@@ -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-rrd-ma/ant/pre-install-targets.xml
===================================================================
--- 
branches/new-structure/trunk/geant2_java-rrd-ma/ant/pre-install-targets.xml 
2007-10-26 11:33:13 UTC (rev 2994)
+++ 
branches/new-structure/trunk/geant2_java-rrd-ma/ant/pre-install-targets.xml 
2007-10-26 12:16:07 UTC (rev 2995)
@@ -232,7 +232,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/rrdmaconfig"/>
       <!-- <entry  key="component.ma.xmldb.db_uri"        
value="http://localhost:${target.port}/exist/rest/db/rrdmaconfig"/> -->
@@ -486,6 +491,7 @@
     <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">