Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r4798 - in branches/GEANT2-JAVA-RRD-MA-STABLE: . ant conf/axis-1.4 doc packaging/deb packaging/rpm

Subject: perfsonar development work

List archive

perfsonar: r4798 - in branches/GEANT2-JAVA-RRD-MA-STABLE: . ant conf/axis-1.4 doc packaging/deb packaging/rpm


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r4798 - in branches/GEANT2-JAVA-RRD-MA-STABLE: . ant conf/axis-1.4 doc packaging/deb packaging/rpm
  • Date: Tue, 16 Dec 2008 04:35:02 -0500
Author: roman
Date: 2008-12-16 04:35:01 -0500 (Tue, 16 Dec 2008)
New Revision: 4798

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/conf/axis-1.4/index.jsp
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 4764:4797)



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-16 09:27:08 UTC (rev 4797)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/ant/axis-deploy-targets.xml
2008-12-16 09:35:01 UTC (rev 4798)
@@ -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.2c/perfsonar-web-admin-0.9.2c.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.9.3c/perfsonar-web-admin-0.9.3c.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.2c/perfsonar-web-admin-0.9.2c.jar"
todir="${tmpdir}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.9.3c/perfsonar-web-admin-0.9.3c.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-16 09:27:08 UTC (rev 4797)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/ant/libs-download-targets.xml
2008-12-16 09:35:01 UTC (rev 4798)
@@ -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.2c"/>
+ <dependency groupId="perfsonar" artifactId="perfsonar-web-admin"
version="0.9.3c"/>
<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-16 09:27:08 UTC (rev 4797)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/ant/webapp-package-targets.xml
2008-12-16 09:35:01 UTC (rev 4798)
@@ -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.2c/perfsonar-web-admin-0.9.2c.jar"
todir="${tmpdir}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.9.3c/perfsonar-web-admin-0.9.3c.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/conf/axis-1.4/index.jsp
===================================================================
--- branches/GEANT2-JAVA-RRD-MA-STABLE/conf/axis-1.4/index.jsp 2008-12-16
09:27:08 UTC (rev 4797)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/conf/axis-1.4/index.jsp 2008-12-16
09:35:01 UTC (rev 4798)
@@ -72,9 +72,6 @@
<body>
<%

- java.text.DateFormat dateFormat = new java.text.SimpleDateFormat("EEE
MMM dd HH:mm:ss zzz yyyy");
- java.util.Date now= new java.util.Date();
- java.util.Date date= dateFormat.parse(now.toString());
String confPath = "WEB-INF/classes/perfsonar/conf/";
String ServicePropertiesPath = confPath+ "service.properties";
ServletContext sc = getServletContext();

Modified: branches/GEANT2-JAVA-RRD-MA-STABLE/doc/ChangeLog.txt
===================================================================
--- branches/GEANT2-JAVA-RRD-MA-STABLE/doc/ChangeLog.txt 2008-12-16
09:27:08 UTC (rev 4797)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/doc/ChangeLog.txt 2008-12-16
09:35:01 UTC (rev 4798)
@@ -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.2c
+- Change: use of web admin library v0.9.3c
- 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-16
09:27:08 UTC (rev 4797)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/changelog 2008-12-16
09:35:01 UTC (rev 4798)
@@ -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.2c
+ * Change: use of web admin library v0.9.3c
* 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-16 09:27:08 UTC (rev 4797)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/rpm/geant2-java-rrd-ma.specs
2008-12-16 09:35:01 UTC (rev 4798)
@@ -75,16 +75,13 @@

%post
## make symlink for easy access to conf
-%{__ln_s} %{prefix}/WEB-INF/classes/perfsonar/conf/*.properties
%{_sysconfdir}/%{name}
-%{__ln_s} %{prefix}/WEB-INF/classes/perfsonar/conf/objects.config
%{_sysconfdir}/%{name}
-%{__ln_s} %{prefix}/WEB-INF/classes/perfsonar/conf/*.xml
%{_sysconfdir}/%{name}
-%{__ln_s} %{prefix}/WEB-INF/classes/perfsonar/conf/*.rng
%{_sysconfdir}/%{name}
-%{__ln_s} %{prefix}/WEB-INF/log %{_var}/log/%{name}
-%{__ln_s} %{prefix} %{_var}/lib/tomcat5/webapps/%{name}
+%{__ln_s} -f %{prefix}/WEB-INF/classes/perfsonar/conf/*.properties
%{_sysconfdir}/%{name}
+%{__ln_s} -f %{prefix}/WEB-INF/classes/perfsonar/conf/objects.config
%{_sysconfdir}/%{name}
+%{__ln_s} -f %{prefix}/WEB-INF/classes/perfsonar/conf/*.xml
%{_sysconfdir}/%{name}
+%{__ln_s} -f %{prefix}/WEB-INF/classes/perfsonar/conf/*.rng
%{_sysconfdir}/%{name}
+%{__ln_s} -f %{prefix}/WEB-INF/log %{_var}/log/%{name}
+%{__ln_s} -f %{prefix} %{_var}/lib/tomcat5/webapps/%{name}

-
-
-
## restart tomcat
/sbin/service tomcat5 restart

@@ -92,12 +89,14 @@

%preun
## remove symlink
-%{__rm} -rf %{_sysconfdir}/%{name}/*.properties
-%{__rm} -rf %{_sysconfdir}/%{name}/objects.config
-%{__rm} -rf %{_sysconfdir}/%{name}/*.xml
-%{__rm} -rf %{_sysconfdir}/%{name}/*.rng
-%{__rm} -rf %{_var}/log/%{name}
-%{__rm} -rf %{_var}/lib/tomcat5/webapps/%{name}
+if [ ! -e %{prefix}/WEB-INF/classes/perfsonar/conf/service.properties ]; then
+ %{__rm} -rf %{_sysconfdir}/%{name}/*.properties || true
+ %{__rm} -rf %{_sysconfdir}/%{name}/objects.config || true
+ %{__rm} -rf %{_sysconfdir}/%{name}/*.xml || true
+ %{__rm} -rf %{_sysconfdir}/%{name}/*.rng || true
+ %{__rm} -rf %{_var}/log/%{name} || true
+ %{__rm} -rf %{_var}/lib/tomcat5/webapps/%{name} || true
+fi



@@ -137,7 +136,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.2c
+- Change: use of web admin library v0.9.3c
- 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-16 09:27:08 UTC (rev
4797)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/pom.xml 2008-12-16 09:35:01 UTC (rev
4798)
@@ -144,7 +144,7 @@
<dependency>
<groupId>perfsonar</groupId>
<artifactId>perfsonar-web-admin</artifactId>
- <version>0.9.2c</version>
+ <version>0.9.3c</version>
</dependency>
<dependency>
<groupId>rrdjtool</groupId>


  • perfsonar: r4798 - in branches/GEANT2-JAVA-RRD-MA-STABLE: . ant conf/axis-1.4 doc packaging/deb packaging/rpm, svnlog, 12/16/2008

Archive powered by MHonArc 2.6.16.

Top of Page