perfsonar-dev - perfsonar: r4763 - in branches/GEANT2-JAVA-RRD-MA-STABLE: . ant doc packaging/deb packaging/rpm
Subject: perfsonar development work
List archive
perfsonar: r4763 - in branches/GEANT2-JAVA-RRD-MA-STABLE: . ant doc packaging/deb packaging/rpm
Chronological Thread
- From:
- To:
- Subject: perfsonar: r4763 - in branches/GEANT2-JAVA-RRD-MA-STABLE: . ant doc packaging/deb packaging/rpm
- Date: Wed, 10 Dec 2008 05:09:36 -0500
Author: roman
Date: 2008-12-10 05:09:35 -0500 (Wed, 10 Dec 2008)
New Revision: 4763
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/packaging/rpm/geant2-java-rrd-ma.specs
branches/GEANT2-JAVA-RRD-MA-STABLE/pom.xml
Log:
merged with the trunk (-r 4745:4762)
Modified: branches/GEANT2-JAVA-RRD-MA-STABLE/ant/axis-deploy-targets.xml
===================================================================
--- branches/GEANT2-JAVA-RRD-MA-STABLE/ant/axis-deploy-targets.xml
2008-12-10 09:50:58 UTC (rev 4762)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/ant/axis-deploy-targets.xml
2008-12-10 10:09:35 UTC (rev 4763)
@@ -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.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/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.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/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-12-10 09:50:58 UTC (rev 4762)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/ant/libs-download-targets.xml
2008-12-10 10:09:35 UTC (rev 4763)
@@ -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.1c"/>
+ <dependency groupId="perfsonar" artifactId="perfsonar-web-admin"
version="0.9.2c"/>
<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-12-10 09:50:58 UTC (rev 4762)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/ant/webapp-package-targets.xml
2008-12-10 10:09:35 UTC (rev 4763)
@@ -85,7 +85,7 @@
<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.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/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-12-10
09:50:58 UTC (rev 4762)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/doc/ChangeLog.txt 2008-12-10
10:09:35 UTC (rev 4763)
@@ -11,7 +11,7 @@
- Change: new service path /usr/lib/perfsonar/services/geant2-java-rrd-ma/
- Change: format of log messages changed
- Change: use of pSbase v1.0.20080902
-- Change: use of web admin library v0.9.6b
+- Change: use of web admin library v0.9.2c
- 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-12-10
09:50:58 UTC (rev 4762)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/changelog 2008-12-10
10:09:35 UTC (rev 4763)
@@ -7,7 +7,7 @@
* Change: new service path /usr/lib/perfsonar/services/geant2-java-rrd-ma/
* 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: 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/packaging/rpm/geant2-java-rrd-ma.specs
===================================================================
--- branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/rpm/geant2-java-rrd-ma.specs
2008-12-10 09:50:58 UTC (rev 4762)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/rpm/geant2-java-rrd-ma.specs
2008-12-10 10:09:35 UTC (rev 4763)
@@ -137,7 +137,7 @@
- Change: new service path /usr/lib/perfsonar/services/geant2-java-rrd-ma/
- 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: 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-12-10 09:50:58 UTC (rev
4762)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/pom.xml 2008-12-10 10:09:35 UTC (rev
4763)
@@ -144,7 +144,7 @@
<dependency>
<groupId>perfsonar</groupId>
<artifactId>perfsonar-web-admin</artifactId>
- <version>0.9.1c</version>
+ <version>0.9.2c</version>
</dependency>
<dependency>
<groupId>rrdjtool</groupId>
- perfsonar: r4763 - in branches/GEANT2-JAVA-RRD-MA-STABLE: . ant doc packaging/deb packaging/rpm, svnlog, 12/10/2008
Archive powered by MHonArc 2.6.16.