perfsonar development work

Author: roman
Date: 2008-09-22 08:46:40 -0400 (Mon, 22 Sep 2008)
New Revision: 4525

Modified:
   branches/GEANT2-JAVA-RRD-MA-STABLE/ant/axis-deploy-targets.xml
   branches/GEANT2-JAVA-RRD-MA-STABLE/ant/libs-download-targets.xml
   branches/GEANT2-JAVA-RRD-MA-STABLE/ant/webapp-package-targets.xml
   branches/GEANT2-JAVA-RRD-MA-STABLE/doc/ChangeLog.txt
   branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/changelog
   branches/GEANT2-JAVA-RRD-MA-STABLE/pom.xml
Log:
merged with the trunk (-r 4519:4524)



Modified: branches/GEANT2-JAVA-RRD-MA-STABLE/ant/axis-deploy-targets.xml
===================================================================
--- branches/GEANT2-JAVA-RRD-MA-STABLE/ant/axis-deploy-targets.xml      
2008-09-22 12:33:49 UTC (rev 4524)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/ant/axis-deploy-targets.xml      
2008-09-22 12:46:40 UTC (rev 4525)
@@ -47,7 +47,7 @@
 
     <copy 
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20080630/nmwg-1.0.20080630.jar" 
                          todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
     <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080902/perfsonar-base-1.0.20080902.jar"
  todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
-    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.9.5b/perfsonar-web-admin-0.9.5b.jar"
    todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.9.6b/perfsonar-web-admin-0.9.6b.jar"
    todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
 
     <copy 
file="${basedir}/lib/repository/rrdjtool/rrdjtool/1.0/rrdjtool-1.0.jar"       
                          todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
 
@@ -264,7 +264,7 @@
 
     <copy 
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20080630/nmwg-1.0.20080630.jar" 
                              todir="${tmpdir}/WEB-INF/lib"/>
     <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080902/perfsonar-base-1.0.20080902.jar"
      todir="${tmpdir}/WEB-INF/lib"/>
-    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.9.5b/perfsonar-web-admin-0.9.5b.jar"
        todir="${tmpdir}/WEB-INF/lib"/>
+    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.9.6b/perfsonar-web-admin-0.9.6b.jar"
        todir="${tmpdir}/WEB-INF/lib"/>
 
     <copy 
file="${basedir}/lib/repository/rrdjtool/rrdjtool/1.0/rrdjtool-1.0.jar"       
                              todir="${tmpdir}/WEB-INF/lib"/>
 

Modified: branches/GEANT2-JAVA-RRD-MA-STABLE/ant/libs-download-targets.xml
===================================================================
--- branches/GEANT2-JAVA-RRD-MA-STABLE/ant/libs-download-targets.xml    
2008-09-22 12:33:49 UTC (rev 4524)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/ant/libs-download-targets.xml    
2008-09-22 12:46:40 UTC (rev 4525)
@@ -56,7 +56,7 @@
 
       <dependency groupId="rrdjtool"   artifactId="rrdjtool"             
version="1.0"/>
       <dependency groupId="perfsonar"  artifactId="perfsonar-base"       
version="1.0.20080902"/>
-      <dependency groupId="perfsonar"  artifactId="perfsonar-web-admin"  
version="0.9.5b"/>
+      <dependency groupId="perfsonar"  artifactId="perfsonar-web-admin"  
version="0.9.6b"/>
       <dependency groupId="nmwg"       artifactId="nmwg"                 
version="1.0.20080630"/>
 
       <dependency groupId="Validation" artifactId="msv"                  
version="1.0"/>

Modified: branches/GEANT2-JAVA-RRD-MA-STABLE/ant/webapp-package-targets.xml
===================================================================
--- branches/GEANT2-JAVA-RRD-MA-STABLE/ant/webapp-package-targets.xml   
2008-09-22 12:33:49 UTC (rev 4524)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/ant/webapp-package-targets.xml   
2008-09-22 12:46:40 UTC (rev 4525)
@@ -84,8 +84,8 @@
     <!-- copy jar files -->
     <copy file="${basedir}/${build}/${jarfilename}-${version}.jar"           
                                     todir="${tmpdir}/WEB-INF/lib"/>
     <copy 
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20080630/nmwg-1.0.20080630.jar" 
                          todir="${tmpdir}/WEB-INF/lib"/>
-    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080721/perfsonar-base-1.0.20080721.jar"
  todir="${tmpdir}/WEB-INF/lib"/>
-    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.9.5b/perfsonar-web-admin-0.9.5b.jar"
    todir="${tmpdir}/WEB-INF/lib"/>
+    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080902/perfsonar-base-1.0.20080902.jar"
  todir="${tmpdir}/WEB-INF/lib"/>
+    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.9.6b/perfsonar-web-admin-0.9.6b.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 -->

Modified: branches/GEANT2-JAVA-RRD-MA-STABLE/doc/ChangeLog.txt
===================================================================
--- branches/GEANT2-JAVA-RRD-MA-STABLE/doc/ChangeLog.txt        2008-09-22 
12:33:49 UTC (rev 4524)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/doc/ChangeLog.txt        2008-09-22 
12:46:40 UTC (rev 4525)
@@ -1,6 +1,6 @@
 RRD MA ChangeLog
 
-2008-09-19 Version 3.1
+2008-09-22 Version 3.1
 
 - New: available as deb package
 - New: EchoRequest message allows now checking: if eXist database is running 
and the count the content of metadata configuration file; access data from 
random RRD file. It is also possible to request a self-test including all 
above.
@@ -10,7 +10,7 @@
 - Change: eXist default port is 8180
 - Change: format of log messages changed
 - Change: use of pSbase v1.0.20080902
-- Change: use of web admin library v0.9.5b
+- Change: use of web admin library v0.9.6b
 - Change: obsolete authRealm removed from metadata configuration file
 - Fixed Bug #497: default value of service.r.access_point property
 - Fixed Bug #405: request for ability to define which domain is the 
interface (solved via keyword)

Modified: branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/changelog
===================================================================
--- branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/changelog  2008-09-22 
12:33:49 UTC (rev 4524)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/changelog  2008-09-22 
12:46:40 UTC (rev 4525)
@@ -6,7 +6,7 @@
   * New: performance improvements for MetadataKeyRequest message which 
fetches all metadata elements
   * Change: format of log messages changed
   * Change: use of pSbase v1.0.20080902
-  * Change: use of web admin library v0.9.5b
+  * Change: use of web admin library v0.9.6b
   * Change: eXist default port is 8180
   * Change: obsolete authRealm removed from metadata configuration file
   * Fixed Bug #497: default value of service.r.access_point property

Modified: branches/GEANT2-JAVA-RRD-MA-STABLE/pom.xml
===================================================================
--- branches/GEANT2-JAVA-RRD-MA-STABLE/pom.xml  2008-09-22 12:33:49 UTC (rev 
4524)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/pom.xml  2008-09-22 12:46:40 UTC (rev 
4525)
@@ -144,7 +144,7 @@
     <dependency>
       <groupId>perfsonar</groupId>
       <artifactId>perfsonar-web-admin</artifactId>
-      <version>0.9.5b</version>
+      <version>0.9.6b</version>
     </dependency>
     <dependency>
       <groupId>rrdjtool</groupId>