perfsonar development work

Author: mac
Date: 2006-07-20 10:49:09 -0400 (Thu, 20 Jul 2006)
New Revision: 1475

Modified:
   trunk/perfsonar/ant/xmlls/xmlls-configure-targets.xml
   trunk/perfsonar/ant/xmlls/xmlls-java-compile-targets.xml
   trunk/perfsonar/ant/xmlls/xmlls-test-run-targets.xml
Log:
changes in configuration and compilation targets



Modified: trunk/perfsonar/ant/xmlls/xmlls-configure-targets.xml
===================================================================
--- trunk/perfsonar/ant/xmlls/xmlls-configure-targets.xml       2006-07-20 
14:45:44 UTC (rev 1474)
+++ trunk/perfsonar/ant/xmlls/xmlls-configure-targets.xml       2006-07-20 
14:49:09 UTC (rev 1475)
@@ -36,8 +36,10 @@
                  value="LS"/>
         <property name="default_in.r_description" 
                  value="Test Lookup Service, perfSONAR"/>
+
         <property name="default_in.ls_storage_uri" 
-                 value="xmldb:exist://localhost:8680/exist/xmlrpc/db/ls"/>
+                 value="http://localhost:8680/exist/rest/db/ls"/>
+                 
         <property name="default_in.ls_storage_username" 
                  value="lookupservice"/>
         <property name="default_in.ls_storage_password" 
@@ -110,9 +112,17 @@
         <replace file="${template_file_service}" 
                 token="%R_LOOKUP_SERVICE%"      
                 value="${in.r_lookup_service}"/>
+
         <replace file="${template_file_service}" 
+                token="%LS_STORAGE_TYPE%" 
+                value="${in.ls_storage_type}"/>
+
+        <replace file="${template_file_service}" 
                 token="%LS_STORAGE_URI%" 
                 value="${in.ls_storage_uri}"/>
+                
+                
+                
         <replace file="${template_file_service}" 
                 token="%LS_STORAGE_USERNAME%" 
                 value="${in.ls_storage_username}"/>
@@ -231,9 +241,14 @@
               addproperty="in.r_lookup_service" 
               
defaultvalue="http://${hostname}:8080/axis/services/LookupService"; />
               
+        <input message="LS Storage -- XML database type]"
+              addproperty="in.ls_storage_type" 
+              validargs="http,xmlrpc" 
+              defaultvalue="http"/>
+              
         <input message="LS Storage -- XML database collection 
[${default_in.ls_storage_uri}]"
               addproperty="in.ls_storage_uri" 
-              defaultvalue="${default_in.ls_storage_uri}" />
+              defaultvalue="${default_in.ls_storage_uri}" />                 
 
               
         <input message="LS Storage -- XML database username 
[${default_in.ls_storage_username}]"
               addproperty="in.ls_storage_username" 
@@ -278,6 +293,7 @@
         <echo message="LI-service type [${in.r_service_type}]" />            
 
         <echo message="LI-service description [${in.r_description}]" />
         <echo message="LS to register with [${in.r_lookup_service}]" />
+        <echo message="XML database type [${in.ls_storage_type}]" />         
 
         <echo message="XML database collection [${in.ls_storage_uri}]" />    
         
         <echo message="XML database username [${in.ls_storage_username}]" /> 
         
         <echo message="XML database password [${in.ls_storage_password}]" />

Modified: trunk/perfsonar/ant/xmlls/xmlls-java-compile-targets.xml
===================================================================
--- trunk/perfsonar/ant/xmlls/xmlls-java-compile-targets.xml    2006-07-20 
14:45:44 UTC (rev 1474)
+++ trunk/perfsonar/ant/xmlls/xmlls-java-compile-targets.xml    2006-07-20 
14:49:09 UTC (rev 1475)
@@ -30,8 +30,8 @@
         <javac srcdir="src" destdir="${build}" deprecation="yes">
 
             <!-- ls service -->
-           <!-- include name="org/perfsonar/service/measurementArchive/**" / 
-->
-            <include name="org/perfsonar/service/testHarness/**" />
+           <!-- include name="org/perfsonar/service/measurementArchive/**"/ 
-->
+            <!-- include name="org/perfsonar/service/testHarness/**" -->
            
             <include name="org/perfsonar/service/lookupService/**" />
             <include name="org/perfsonar/service/web/**" />
@@ -59,7 +59,7 @@
 
                 <!--include 
name="org/perfsonar/service/measurementArchive/**" / -->
 
-                <include name="org/perfsonar/service/testHarness/**" />
+                <!-- include name="org/perfsonar/service/testHarness/**"/ -->
                 <include name="org/perfsonar/service/lookupService/**" />
                 <include name="org/perfsonar/service/web/**" />
 

Modified: trunk/perfsonar/ant/xmlls/xmlls-test-run-targets.xml
===================================================================
--- trunk/perfsonar/ant/xmlls/xmlls-test-run-targets.xml        2006-07-20 
14:45:44 UTC (rev 1474)
+++ trunk/perfsonar/ant/xmlls/xmlls-test-run-targets.xml        2006-07-20 
14:49:09 UTC (rev 1475)
@@ -27,7 +27,7 @@
     <!-- TESTS -->
 
     <target name="y" description="y">
-        <java 
classname="org.perfsonar.service.commons.storage.xmldb.existrest.ExistXmlDbHTTPAccess"
 classpathref="classpath" fork="true">
+        <java 
classname="org.perfsonar.service.commons.storage.xmldb.exist.rest.ExistDbHTTPAccess"
 classpathref="classpath" fork="true">
         </java>
     </target>