perfsonar development work

Author: roman
Date: 2008-04-16 08:35:41 -0400 (Wed, 16 Apr 2008)
New Revision: 3694

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



Modified: branches/GEANT2_JAVA-SQL-MA-STABLE/ant/const.properties.template
===================================================================
--- branches/GEANT2_JAVA-SQL-MA-STABLE/ant/const.properties.template    
2008-04-16 12:27:37 UTC (rev 3693)
+++ branches/GEANT2_JAVA-SQL-MA-STABLE/ant/const.properties.template    
2008-04-16 12:35:41 UTC (rev 3694)
@@ -8,7 +8,7 @@
 
 target.server=127.0.0.1
 
-service.name=geant2_java-sql-ma
+service.name=geant2-java-sql-ma
 
 jarfilename=perfsonar-sql-ma
 version=2.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
 
 api.location=doc/api
 api.title=perfSONAR

Modified: branches/GEANT2_JAVA-SQL-MA-STABLE/ant/webapp-package-targets.xml
===================================================================
--- branches/GEANT2_JAVA-SQL-MA-STABLE/ant/webapp-package-targets.xml   
2008-04-16 12:27:37 UTC (rev 3693)
+++ branches/GEANT2_JAVA-SQL-MA-STABLE/ant/webapp-package-targets.xml   
2008-04-16 12:35:41 UTC (rev 3694)
@@ -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>
@@ -81,7 +81,7 @@
     <!-- copy jar files -->
     <copy file="${basedir}/${build}/${jarfilename}-${version}.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/perfsonar/perfsonar-rrd-ma/3.0rc2/perfsonar-rrd-ma-3.0rc2.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/rrdjtool/rrdjtool/1.0/rrdjtool-1.0.jar"       
                          todir="${tmpdir}/WEB-INF/lib"/>
@@ -108,7 +108,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/sql-database_TEST.xml${line.separator}"
+          
message="service.ma.conf_file=/opt/perfsonar/services/${service.name}/WEB-INF/classes/perfsonar/conf/sql-database_TEST.xml${line.separator}"
           append="true" />
 
     <!-- prepare ibatis files -->

Modified: branches/GEANT2_JAVA-SQL-MA-STABLE/doc/ChangeLog.txt
===================================================================
--- branches/GEANT2_JAVA-SQL-MA-STABLE/doc/ChangeLog.txt        2008-04-16 
12:27:37 UTC (rev 3693)
+++ branches/GEANT2_JAVA-SQL-MA-STABLE/doc/ChangeLog.txt        2008-04-16 
12:35:41 UTC (rev 3694)
@@ -1,7 +1,7 @@
 Relational Database MA
 
 
-2008-03-12 Version 2.0
+2008-04-16 Version 2.0
 
 - New namespace (netutil) of datum element in the response containing 
utilization value is used
 - supportedEventTypes parameter in metadata element (in metadata 
cofiguration file) replaced with eventType element
@@ -13,6 +13,7 @@
   (not only from xml metadata config file).
 - LS register interval time updated (now it's 12 hours).
 - Support of ErrorResponse message type (use of perfsonar-base library 
version 1.0.20080310)
+- Change: service name has changed (now it is geant2-java-sql-ma)
 
 
 2007-11-08 Version 1.3

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

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