perfsonar development work

Author: roman
Date: 2008-12-10 06:38:21 -0500 (Wed, 10 Dec 2008)
New Revision: 4767

Modified:
   trunk/geant2-java-sql-ma/ant/axis-deploy-targets.xml
   trunk/geant2-java-sql-ma/ant/libs-download-targets.xml
   trunk/geant2-java-sql-ma/ant/webapp-package-targets.xml
   trunk/geant2-java-sql-ma/doc/ChangeLog.txt
   trunk/geant2-java-sql-ma/packaging/deb/changelog
   trunk/geant2-java-sql-ma/packaging/rpm/geant2-java-sql-ma.specs
   trunk/geant2-java-sql-ma/pom.xml
Log:
use of web admin library v.0.9.2c



Modified: trunk/geant2-java-sql-ma/ant/axis-deploy-targets.xml
===================================================================
--- trunk/geant2-java-sql-ma/ant/axis-deploy-targets.xml        2008-12-10 
10:38:02 UTC (rev 4766)
+++ trunk/geant2-java-sql-ma/ant/axis-deploy-targets.xml        2008-12-10 
11:38:21 UTC (rev 4767)
@@ -46,7 +46,7 @@
           depends="copy-dep-base-service-jars">
 
     <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.1c/perfsonar-web-admin-0.9.1c.jar"
        todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.9.2c/perfsonar-web-admin-0.9.2c.jar"
        todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
     <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-rrd-ma/3.1/perfsonar-rrd-ma-3.1.jar"
                    todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
     <copy 
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20080630/nmwg-1.0.20080630.jar" 
                              
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
 
@@ -289,7 +289,7 @@
     <copy file="${basedir}/${build}/${jarfilename}-${version}.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.1c/perfsonar-web-admin-0.9.1c.jar"
        todir="${tmpdir}/WEB-INF/lib"/>
+    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.9.2c/perfsonar-web-admin-0.9.2c.jar"
        todir="${tmpdir}/WEB-INF/lib"/>
     <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-rrd-ma/3.1/perfsonar-rrd-ma-3.1.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"/>
 

Modified: trunk/geant2-java-sql-ma/ant/libs-download-targets.xml
===================================================================
--- trunk/geant2-java-sql-ma/ant/libs-download-targets.xml      2008-12-10 
10:38:02 UTC (rev 4766)
+++ trunk/geant2-java-sql-ma/ant/libs-download-targets.xml      2008-12-10 
11:38:21 UTC (rev 4767)
@@ -55,7 +55,7 @@
     <artifact:dependencies>
 
       <dependency groupId="perfsonar"  artifactId="perfsonar-base"       
version="1.0.20080902"/>
-      <dependency groupId="perfsonar"  artifactId="perfsonar-web-admin"  
version="0.9.1c"/>
+      <dependency groupId="perfsonar"  artifactId="perfsonar-web-admin"  
version="0.9.2c"/>
       <dependency groupId="perfsonar"  artifactId="perfsonar-rrd-ma"     
version="3.1"/>
       <dependency groupId="nmwg"       artifactId="nmwg"                 
version="1.0.20080630"/>
 

Modified: trunk/geant2-java-sql-ma/ant/webapp-package-targets.xml
===================================================================
--- trunk/geant2-java-sql-ma/ant/webapp-package-targets.xml     2008-12-10 
10:38:02 UTC (rev 4766)
+++ trunk/geant2-java-sql-ma/ant/webapp-package-targets.xml     2008-12-10 
11:38:21 UTC (rev 4767)
@@ -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.20080902/perfsonar-base-1.0.20080902.jar"
  todir="${tmpdir}/WEB-INF/lib"/>
-    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.9.1c/perfsonar-web-admin-0.9.1c.jar"
    todir="${tmpdir}/WEB-INF/lib"/>
+    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.9.2c/perfsonar-web-admin-0.9.2c.jar"
    todir="${tmpdir}/WEB-INF/lib"/>
     <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-rrd-ma/3.1/perfsonar-rrd-ma-3.1.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/rrdjtool/rrdjtool/1.0/rrdjtool-1.0.jar"       
                          todir="${tmpdir}/WEB-INF/lib"/>

Modified: trunk/geant2-java-sql-ma/doc/ChangeLog.txt
===================================================================
--- trunk/geant2-java-sql-ma/doc/ChangeLog.txt  2008-12-10 10:38:02 UTC (rev 
4766)
+++ trunk/geant2-java-sql-ma/doc/ChangeLog.txt  2008-12-10 11:38:21 UTC (rev 
4767)
@@ -15,7 +15,7 @@
 - Change: default value of service.r.access_point property update to service 
URL
 - Change: eventType Path.Status used by default in metadata configuration 
file
 - Change: ibatisConfig parameter in L2 CompleteMetadataStoreRequest in link 
metadata is optional
-- Change: use of web admin library v0.9.1c
+- Change: use of web admin library v0.9.2c
 - Change: one database table is now used for domain and interdomain links
 - Change: eXist default port is 8180
 - Change: use of pSbase v1.0.20080902

Modified: trunk/geant2-java-sql-ma/packaging/deb/changelog
===================================================================
--- trunk/geant2-java-sql-ma/packaging/deb/changelog    2008-12-10 10:38:02 
UTC (rev 4766)
+++ trunk/geant2-java-sql-ma/packaging/deb/changelog    2008-12-10 11:38:21 
UTC (rev 4767)
@@ -14,7 +14,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.1c
+  * Change: use of web admin library v0.9.2c
   * Change: one database table is now used for domain and interdomain links
   * Change: obsolete authRealm removed from metadata configuration file
   * Fixed Bug #508: error in the SQL setup file

Modified: trunk/geant2-java-sql-ma/packaging/rpm/geant2-java-sql-ma.specs
===================================================================
--- trunk/geant2-java-sql-ma/packaging/rpm/geant2-java-sql-ma.specs     
2008-12-10 10:38:02 UTC (rev 4766)
+++ trunk/geant2-java-sql-ma/packaging/rpm/geant2-java-sql-ma.specs     
2008-12-10 11:38:21 UTC (rev 4767)
@@ -129,7 +129,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.1c
+- Change: use of web admin library v0.9.2c
 - Change: one database table is now used for domain and interdomain links
 - Change: obsolete authRealm removed from metadata configuration file
 - Fixed Bug #508: error in the SQL setup file

Modified: trunk/geant2-java-sql-ma/pom.xml
===================================================================
--- trunk/geant2-java-sql-ma/pom.xml    2008-12-10 10:38:02 UTC (rev 4766)
+++ trunk/geant2-java-sql-ma/pom.xml    2008-12-10 11:38:21 UTC (rev 4767)
@@ -133,7 +133,7 @@
     <dependency>
       <groupId>perfsonar</groupId>
       <artifactId>perfsonar-web-admin</artifactId>
-      <version>0.9.1c</version>
+      <version>0.9.2c</version>
     </dependency>
     <dependency>
       <groupId>perfsonar</groupId>