perfsonar development work

Author: roman
Date: 2008-04-16 07:59:46 -0400 (Wed, 16 Apr 2008)
New Revision: 3688

Added:
   
branches/GEANT2_JAVA-RRD-MA-STABLE/lib/misc/perfsonar-base-ant-1.0.20080416.jar
Removed:
   
branches/GEANT2_JAVA-RRD-MA-STABLE/lib/misc/perfsonar-base-ant-1.0.20080331.jar
Modified:
   branches/GEANT2_JAVA-RRD-MA-STABLE/ant/const.properties.template
   branches/GEANT2_JAVA-RRD-MA-STABLE/ant/webapp-package-targets.xml
   branches/GEANT2_JAVA-RRD-MA-STABLE/doc/ChangeLog.txt
Log:
Changes from the rev numbers range 3669:3687 merged



Modified: branches/GEANT2_JAVA-RRD-MA-STABLE/ant/const.properties.template
===================================================================
--- branches/GEANT2_JAVA-RRD-MA-STABLE/ant/const.properties.template    
2008-04-16 11:51:47 UTC (rev 3687)
+++ branches/GEANT2_JAVA-RRD-MA-STABLE/ant/const.properties.template    
2008-04-16 11:59:46 UTC (rev 3688)
@@ -8,7 +8,7 @@
 
 target.server=127.0.0.1
 
-service.name=geant2_java-rrd-ma
+service.name=geant2-java-rrd-ma
 
 jarfilename=perfsonar-rrd-ma
 version=3.0rc6
@@ -21,7 +21,7 @@
 wsdd.webservice.name=MeasurementArchiveService
 
 antcontrib.jar=${basedir}/lib/misc/ant-contrib-1.0b3.jar
-antpsbase.jar=${basedir}/lib/misc/perfsonar-base-ant-1.0.20080331.jar
+antpsbase.jar=${basedir}/lib/misc/perfsonar-base-ant-1.0.20080416.jar
 
 #rrdjtool native library
 lib_name=libjrrd.so

Modified: branches/GEANT2_JAVA-RRD-MA-STABLE/ant/webapp-package-targets.xml
===================================================================
--- branches/GEANT2_JAVA-RRD-MA-STABLE/ant/webapp-package-targets.xml   
2008-04-16 11:51:47 UTC (rev 3687)
+++ branches/GEANT2_JAVA-RRD-MA-STABLE/ant/webapp-package-targets.xml   
2008-04-16 11:59:46 UTC (rev 3688)
@@ -27,7 +27,7 @@
 
   <target name="war-package-create"
           depends="webapp-package-directory-prepare">
-    <zip destfile="${service.name}-${version}.war"
+    <zip destfile="${service.name}.war"
          basedir="${tmpdir}/"
          excludes=".svn/**" />
     <delete dir="${tmpdir}"/>
@@ -37,7 +37,7 @@
   <target name="webapp-package-create"
           xmlns:psbase="psbase:/base.perfsonar.org"
           depends="webapp-package-directory-prepare">
-    <move todir="${tmpdir}-webapps/webapps/${service.name}-${version}">
+    <move todir="${tmpdir}-webapps/webapps/${service.name}">
       <fileset dir="${tmpdir}"/>
     </move>
   </target>
@@ -79,13 +79,13 @@
     <property name="service.ma.conf_file" 
value="${basedir}/conf/rrd-database_TEST.xml" />
     <replace file="${service.ma.conf_file}"
              token="__BASEPATH__"
-             
value="/home/perfsonar/webapps/${service.name}-${version}/WEB-INF"/>
+             value="/opt/perfsonar/services/${service.name}/WEB-INF"/>
 
     <!-- copy jar files -->
-    <copy file="${basedir}/${build}/${jarfilename}-${version}.jar" 
todir="${tmpdir}/WEB-INF/lib"/>
+    <copy file="${basedir}/${build}/${jarfilename}-${version}.jar"           
                                     todir="${tmpdir}/WEB-INF/lib"/>
     <copy 
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20071008/nmwg-1.0.20071008.jar" 
                          todir="${tmpdir}/WEB-INF/lib"/>
     <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080310/perfsonar-base-1.0.20080310.jar"
  todir="${tmpdir}/WEB-INF/lib"/>
-    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.8.3b/perfsonar-web-admin-0.8.3b.jar"
        todir="${tmpdir}/WEB-INF/lib"/>
+    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.8.3b/perfsonar-web-admin-0.8.3b.jar"
    todir="${tmpdir}/WEB-INF/lib"/>
     <copy 
file="${basedir}/lib/repository/rrdjtool/rrdjtool/1.0/rrdjtool-1.0.jar"       
                          todir="${tmpdir}/WEB-INF/lib"/>
 
     <!-- copy conf files -->
@@ -107,7 +107,7 @@
           message="# Description=The path to the metadata configuration 
file, including the file's name.${line.separator}"
           append="true" />
     <echo file="${tmpdir}/WEB-INF/classes/perfsonar/conf/service.properties"
-          
message="service.ma.conf_file=/home/perfsonar/webapps/${service.name}-${version}/WEB-INF/classes/perfsonar/conf/rrd-database_TEST.xml${line.separator}"
+          
message="service.ma.conf_file=/opt/perfsonar/services/${service.name}/WEB-INF/classes/perfsonar/conf/rrd-database_TEST.xml${line.separator}"
           append="true" />
 
   </target>

Modified: branches/GEANT2_JAVA-RRD-MA-STABLE/doc/ChangeLog.txt
===================================================================
--- branches/GEANT2_JAVA-RRD-MA-STABLE/doc/ChangeLog.txt        2008-04-16 
11:51:47 UTC (rev 3687)
+++ branches/GEANT2_JAVA-RRD-MA-STABLE/doc/ChangeLog.txt        2008-04-16 
11:59:46 UTC (rev 3688)
@@ -7,10 +7,11 @@
 - New: netutil namespace of datum element in the response containing 
utilization value is used.
 - New: WebAdmin administration (set of servlets) added
 - New: RPM is used as the installation package
-- New: Support of AuthN functionality
+- New: support of AuthN functionality
 - Change: supportedEventTypes parameter in metadata element (in metadata 
cofiguration file) replaced with eventType element (the parameter is still 
supported)
 - Change: LS register component can now take metadata elements from xml 
database directly (not only from XML metadata config file)
 - Change: LS register interval time updated (now it's 12 hours)
+- Change: service name has changed (now it is geant2-java-rrd-ma)
 
 
 2007-11-23 Version 2.3.2

Deleted: 
branches/GEANT2_JAVA-RRD-MA-STABLE/lib/misc/perfsonar-base-ant-1.0.20080331.jar

Copied: 
branches/GEANT2_JAVA-RRD-MA-STABLE/lib/misc/perfsonar-base-ant-1.0.20080416.jar
 (from rev 3687, 
trunk/geant2_java-rrd-ma/lib/misc/perfsonar-base-ant-1.0.20080416.jar)