perfsonar development work

Author: roman
Date: 2007-10-15 07:27:12 -0400 (Mon, 15 Oct 2007)
New Revision: 2953

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:

Switch to xmlrpc type of communication with eXist database. Simple http fails 
when there are a lot of data to fetch (for example in the case 
of getting all metadata from the service)




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-15 11:22:34 UTC (rev 2952)
+++ 
branches/new-structure/trunk/geant2_java-rrd-ma/ant/pre-install-targets.xml 
2007-10-15 11:27:12 UTC (rev 2953)
@@ -234,8 +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="http://localhost:${target.port}/exist/rest/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>
@@ -384,8 +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="http://${exist.hostname}:${exist.port}/exist/rest/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>
 
@@ -395,8 +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="http"/>
+       <entry  key="component.ma.xmldb.db_access" value="xmlrpc"/>
+       <!-- <entry  key="component.ma.xmldb.db_access" value="http"/> -->
      </propertyfile>
   </target>
 
@@ -480,8 +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="http://${_exist.hostname}:${_exist.port}/exist/rest/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-10-15 11:22:34 UTC (rev 2952)
+++ 
branches/new-structure/trunk/geant2_java-rrd-ma/conf/service.properties.template
    2007-10-15 11:27:12 UTC (rev 2953)
@@ -7,8 +7,8 @@
 
service.ma.base_chaining_mergers=org.perfsonar.service.measurementArchive.rrdType.NMWGInterfaceBaseChaining
 
 component.ma.xmldb.db_status=off
-#component.ma.xmldb.db_access=xmlrpc
-component.ma.xmldb.db_access=http
+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