perfsonar development work

Author: roman
Date: 2007-08-27 09:43:19 -0400 (Mon, 27 Aug 2007)
New Revision: 2730

Modified:
   
branches/new-structure/trunk/geant2_java-sql-ma/ant/const.properties.template
   branches/new-structure/trunk/geant2_java-sql-ma/ant/pre-install-targets.xml
Log:

defualt type of accessing the xml db has been changed from 'xmlrpc' to 'http'



Modified: 
branches/new-structure/trunk/geant2_java-sql-ma/ant/const.properties.template
===================================================================
--- 
branches/new-structure/trunk/geant2_java-sql-ma/ant/const.properties.template 
      2007-08-27 12:29:20 UTC (rev 2729)
+++ 
branches/new-structure/trunk/geant2_java-sql-ma/ant/const.properties.template 
      2007-08-27 13:43:19 UTC (rev 2730)
@@ -6,7 +6,7 @@
 service.name=perfSONAR-SQL-MA
 
 jarfilename=perfsonar-sql-ma
-version=1.4-dev
+version=pre-1.4-20070827
 
 exist.war.file=exist-1.0.1.war
 
exist.war.download.url=http://www.perfsonar.net/download/dependencies/preinstall_download.php?product=exist-war&version=1.0.1

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-08-27 12:29:20 UTC (rev 2729)
+++ 
branches/new-structure/trunk/geant2_java-sql-ma/ant/pre-install-targets.xml 
2007-08-27 13:43:19 UTC (rev 2730)
@@ -76,7 +76,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/sqlmaconfig"/>
+      <!-- <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"/>
       <entry  key="component.ma.xmldb.db_uri.xmlrpc" 
value="xmldb:exist://localhost:${target.port}/exist/xmlrpc/db/sqlmaconfig"/>
       <entry  key="component.ma.xmldb.type"          value="webapp"/>
     </propertyfile>
@@ -223,7 +224,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/sqlmaconfig"/>
+      <!-- <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"/>
     </propertyfile>
 
@@ -233,7 +235,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>
 
@@ -315,7 +318,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/sqlmaconfig"/>
+      <!-- <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"/>
     </propertyfile>