perfsonar development work

Author: roman
Date: 2007-08-27 10:24:50 -0400 (Mon, 27 Aug 2007)
New Revision: 2732

Modified:
   branches/new-structure/trunk/geant2_java-rrd-ma/ant/pre-install-targets.xml
   
branches/new-structure/trunk/geant2_java-rrd-ma/conf/service.properties.template
Log:
defualt type of accessing the xml db has been changed from 'xmlrpc' to 'http'




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-08-27 13:52:59 UTC (rev 2731)
+++ 
branches/new-structure/trunk/geant2_java-rrd-ma/ant/pre-install-targets.xml 
2007-08-27 14:24:50 UTC (rev 2732)
@@ -234,7 +234,8 @@
 
     <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="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"/>
       <entry  key="component.ma.xmldb.db_uri.xmlrpc" 
value="xmldb:exist://localhost:${target.port}/exist/xmlrpc/db/rrdmaconfig"/>
       <entry  key="component.ma.xmldb.type"          value="webapp"/>
     </propertyfile>
@@ -383,7 +384,8 @@
 
     <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="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"/>
     </propertyfile>
 
@@ -393,7 +395,8 @@
   <target name="exist-main-properties">
      <propertyfile file="${basedir}/conf/service.properties">
        <entry  key="component.ma.xmldb.db_status" value="on"/>
-       <entry  key="component.ma.xmldb.db_access" value="xmlrpc"/>
+       <!-- <entry  key="component.ma.xmldb.db_access" value="xmlrpc"/> -->
+       <entry  key="component.ma.xmldb.db_access" value="http"/>
      </propertyfile>
   </target>
 
@@ -477,7 +480,8 @@
 
     <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="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"/>
     </propertyfile>
 

Modified: 
branches/new-structure/trunk/geant2_java-rrd-ma/conf/service.properties.template
===================================================================
--- 
branches/new-structure/trunk/geant2_java-rrd-ma/conf/service.properties.template
    2007-08-27 13:52:59 UTC (rev 2731)
+++ 
branches/new-structure/trunk/geant2_java-rrd-ma/conf/service.properties.template
    2007-08-27 14:24:50 UTC (rev 2732)
@@ -6,7 +6,8 @@
 
 
 component.ma.xmldb.db_status=off
-component.ma.xmldb.db_access=xmlrpc
+#component.ma.xmldb.db_access=xmlrpc
+component.ma.xmldb.db_access=http
 component.ma.xmldb.db_uri=
 component.ma.xmldb.db_uri.xmlrpc=
 component.ma.xmldb.db_username=rrdmaservice