perfsonar development work

Author: mac
Date: 2007-12-13 06:48:12 -0500 (Thu, 13 Dec 2007)
New Revision: 3125

Modified:
   trunk/geant2_java-xml-ls/ant/axis-deploy-targets.xml
   trunk/geant2_java-xml-ls/ant/build.xml
   trunk/geant2_java-xml-ls/ant/configure-targets.xml
   trunk/geant2_java-xml-ls/ant/const.properties.template
   trunk/geant2_java-xml-ls/ant/libs-download-targets.xml
Log:
Libraries version moved to contst.properties.template (from build, 
libs-download, axis-deploy)

Multi LS changed to Distributed LS (configuration targets)



Modified: trunk/geant2_java-xml-ls/ant/axis-deploy-targets.xml
===================================================================
--- trunk/geant2_java-xml-ls/ant/axis-deploy-targets.xml        2007-12-13 
10:53:39 UTC (rev 3124)
+++ trunk/geant2_java-xml-ls/ant/axis-deploy-targets.xml        2007-12-13 
11:48:12 UTC (rev 3125)
@@ -45,8 +45,10 @@
   <target name="copy-dep-service-jars"
           depends="copy-dep-base-service-jars">
 
-    <copy 
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20070704/nmwg-1.0.20070704.jar" 
                          todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
-    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20070704/perfsonar-base-1.0.20070704.jar"
  todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+    <copy 
file="${basedir}/lib/repository/nmwg/nmwg/${nmwg-jar-ver}/nmwg-${nmwg-jar-ver}.jar"
                           
+          todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-base/${ps-antxml-ver}/perfsonar-base-${ps-antxml-ver}.jar"
  
+          todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
 
     <copy file="${basedir}/conf/wsdd/${wsdd.file.deploy}"    
todir="${service.home}/${deploy.root}/wsdd"/>
     <copy file="${basedir}/conf/wsdd/${wsdd.file.undeploy}"  
todir="${service.home}/${deploy.root}/wsdd"/>

Modified: trunk/geant2_java-xml-ls/ant/build.xml
===================================================================
--- trunk/geant2_java-xml-ls/ant/build.xml      2007-12-13 10:53:39 UTC (rev 
3124)
+++ trunk/geant2_java-xml-ls/ant/build.xml      2007-12-13 11:48:12 UTC (rev 
3125)
@@ -21,7 +21,7 @@
 
 
   <property name="antcontrib.jar"  
value="${basedir}/lib/misc/ant-contrib-1.0b3.jar"/>
-  <property name="antpsbase.jar"   
value="${basedir}/lib/misc/perfsonar-base-ant-1.0.20071121.jar"/>
+  <property name="antpsbase.jar"   
value="${basedir}/lib/misc/perfsonar-base-ant-${ps-antxml-ver}.jar"/>
 
 
   <taskdef resource="net/sf/antcontrib/antlib.xml"

Modified: trunk/geant2_java-xml-ls/ant/configure-targets.xml
===================================================================
--- trunk/geant2_java-xml-ls/ant/configure-targets.xml  2007-12-13 10:53:39 
UTC (rev 3124)
+++ trunk/geant2_java-xml-ls/ant/configure-targets.xml  2007-12-13 11:48:12 
UTC (rev 3125)
@@ -95,36 +95,36 @@
    </target>
    
    
-   <target name="ls-multils-properties"
+   <target name="ls-dls-properties"
            xmlns:psbase="psbase:/base.perfsonar.org"
            xmlns:antcontrib="antlib:net.sf.antcontrib">
      
      <echo/>
-     <echo message="Module: Multi LS"/>
+     <echo message="Module: Distributed LS"/>
      <echo message="================"/>
      <echo/>
      
-     <psbase:input2 message="Do you want to use Multidomain LS 
(communication with other Lookup Services)?"
-            addproperty="use.ls_multils"
+     <psbase:input2 message="Do you want to use Distributed LS 
(communication with other Lookup Services)?"
+            addproperty="use.ls_dls"
             defaultvalue="n"
             validargs="y,n"/>
      
      <antcontrib:if>
-       <equals arg1="${use.ls_multils}" arg2="y" />
+       <equals arg1="${use.ls_dls}" arg2="y" />
        <antcontrib:then>
-         <psbase:input2 message="Multi LS -- URL of well-known LS to 
initialize peer list, mandatory:"
+         <psbase:input2 message="dLS -- URL of well-known LS to initialize 
peer list, mandatory:"
                 addproperty="service.r.ls_url" />
-         <psbase:input2 message="Multi LS -- Enter local Lookup Service 
unique name, mandatory"
+         <psbase:input2 message="dLS -- Enter local Lookup Service unique 
name, mandatory"
                 addproperty="service.r.name" />
-         <psbase:input2 message="Multi LS -- enter your host name and domain 
name, but not localhost! This property will be used for sending Lookup 
Information of your Lookup Service:"
+         <psbase:input2 message="dLS -- enter your host name and domain 
name, but not localhost! This property will be used for sending Lookup 
Information of your Lookup Service:"
                 addproperty="service.r.hostname" />
          
-         <psbase:input2 message="Multi LS -- Enter the service description, 
optional"
+         <psbase:input2 message="dLS -- Enter the service description, 
optional"
                 addproperty="service.r.description"/>
-         <psbase:input2 message="Multi LS -- Enter the contact email address 
of service owner, optional"
+         <psbase:input2 message="dLS -- Enter the contact email address of 
service owner, optional"
                 addproperty="service.r.contact.email"
                 defaultvalue=""/>
-         <psbase:input2 message="Multi LS -- Enter the organization name 
where the service is being installed"
+         <psbase:input2 message="dLS -- Enter the organization name where 
the service is being installed"
                 addproperty="service.r.organization.name"
                 defaultvalue=""/>
          
@@ -141,12 +141,12 @@
                   token="#SCHEDULER:"
                   value=""/>
          <replace file="${basedir}/conf/components.properties"
-                  token="#MULTILS:"
+                  token="#dls:"
                   value=""/>
 
        </antcontrib:then>
        <antcontrib:else>
-         <echo message="Multi LS module will be disabled"/>
+         <echo message="dLS module will be disabled"/>
        </antcontrib:else>
      </antcontrib:if>
    </target>
@@ -180,7 +180,7 @@
 
     <antcall target="exist-configure"/>
     <antcall target="ls-cleanup-properties"/>
-    <antcall target="ls-multils-properties"/>
+    <antcall target="ls-dls-properties"/>
    
     <antcall target="set-service-properties"/>
 

Modified: trunk/geant2_java-xml-ls/ant/const.properties.template
===================================================================
--- trunk/geant2_java-xml-ls/ant/const.properties.template      2007-12-13 
10:53:39 UTC (rev 3124)
+++ trunk/geant2_java-xml-ls/ant/const.properties.template      2007-12-13 
11:48:12 UTC (rev 3125)
@@ -23,3 +23,8 @@
 api.title=perfSONAR
 api.windowtitle=perfSONAR
 api.bottom=perfSONAR
+
+nmwg-jar-ver=1.0.20071008
+ps-antxml-ver=1.0.20071121
+ps-jar-ver=1.0.20071121
+

Modified: trunk/geant2_java-xml-ls/ant/libs-download-targets.xml
===================================================================
--- trunk/geant2_java-xml-ls/ant/libs-download-targets.xml      2007-12-13 
10:53:39 UTC (rev 3124)
+++ trunk/geant2_java-xml-ls/ant/libs-download-targets.xml      2007-12-13 
11:48:12 UTC (rev 3125)
@@ -55,8 +55,8 @@
     <artifact:dependencies>
 
       <!-- dependency groupId="rrdjtool"  artifactId="rrdjtool"       
version="1.0"/ -->
-      <dependency groupId="perfsonar" artifactId="perfsonar-base" 
version="1.0.20071121"/>
-      <dependency groupId="nmwg"      artifactId="nmwg"           
version="1.0.20071008"/>
+      <dependency groupId="perfsonar" artifactId="perfsonar-base" 
version="${ps-jar-ver}"/>
+      <dependency groupId="nmwg"      artifactId="nmwg"           
version="${nmwg-jar-ver}"/>
 
       <localRepository  refid="local.repository"/>
       <remoteRepository refid="remote.repository"/>