perfsonar development work

Author: roman
Date: 2006-07-18 04:33:37 -0400 (Tue, 18 Jul 2006)
New Revision: 1432

Modified:
   trunk/perfsonar/ant/sqlma/sqlma-configure-targets.xml
Log:
eXist Ant targets have to use xmlrpc access (instead of simple http) and now 
it is hardcoded

Modified: trunk/perfsonar/ant/sqlma/sqlma-configure-targets.xml
===================================================================
--- trunk/perfsonar/ant/sqlma/sqlma-configure-targets.xml       2006-07-18 
08:33:01 UTC (rev 1431)
+++ trunk/perfsonar/ant/sqlma/sqlma-configure-targets.xml       2006-07-18 
08:33:37 UTC (rev 1432)
@@ -17,14 +17,22 @@
 
 
     <target name="get-xmldb-address">
-        <input message="Enter the address of xmldb eXist 
[http://localhost:8090/exist/rest/db/sqlmaconfig]:";
+        <input message="Enter the address of xmldb eXist [localhost]:"
                addproperty="xmldb.address"
-               defaultvalue="http://localhost:8090/exist/rest/db/sqlmaconfig";
+               defaultvalue="localhost"
         />
-        <echo message="Accepted server address: ${xmldb.address}"/>
+        <input message="Enter the port of xmldb eXist [8090]:"
+            addproperty="xmldb.port"
+            defaultvalue="8090"
+        />
+        <input message="Enter the type of access to xmldb eXist [http]:"
+            addproperty="xmldb.access"
+            defaultvalue="http"
+        />
+        <echo message="Accepted xmldb server is 
${xmldb.access}://${xmldb.address}:${xmldb.port}/exist/rest/db/sqlmaconfig"/>
     </target>
+    <!--http://localhost:8090/exist/rest/db/sqlmaconfig -->
 
-
     <target name="__get-sql-config-file">
         <input message="Enter the path of sql metadata config file 
[${basedir}/conf/sql-database_TEST.xml]:"
                addproperty="sql.config.file"
@@ -107,7 +115,8 @@
             <entry  key="service.ma.class_name" 
value="org.perfsonar.service.measurementArchive.sqlType.SQLTypeMAServiceEngine"/>
 
             <entry  key="component.ma.xmldb.db_status" value="on"/>
-            <entry  key="component.ma.xmldb.db_uri" 
value="${xmldb.address}"/>
+            <entry  key="component.ma.xmldb.db_uri" 
value="${xmldb.access}://${xmldb.address}:${xmldb.port}/exist/rest/db/sqlmaconfig"/>
+            <entry  key="component.ma.xmldb.db_uri.xmlrpc" 
value="xmldb:exist://${xmldb.address}:${xmldb.port}/exist/xmlrpc/db/sqlmaconfig"/>
             <entry  key="component.ma.xmldb.db_username" 
value="sqlmaservice"/>
             <entry  key="component.ma.xmldb.db_password" 
value="sqlmaservice"/>
             <entry  key="component.ma.xmldb.db_access" value="http"/>