Skip to Content.
Sympa Menu

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

Subject: perfsonar development work

List archive

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


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r4515 - in branches/GEANT2-JAVA-RRD-MA-STABLE: . ant conf conf/axis-1.4 doc packaging/deb packaging/rpm
  • Date: Mon, 22 Sep 2008 05:45:45 -0400
Author: roman
Date: 2008-09-22 05:45:45 -0400 (Mon, 22 Sep 2008)
New Revision: 4515

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/conf/service.properties
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/deb/control
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 4492:4514)



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 09:11:50 UTC (rev 4514)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/ant/axis-deploy-targets.xml
2008-09-22 09:45:45 UTC (rev 4515)
@@ -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.2b/perfsonar-web-admin-0.9.2b.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/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.2b/perfsonar-web-admin-0.9.2b.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/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 09:11:50 UTC (rev 4514)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/ant/libs-download-targets.xml
2008-09-22 09:45:45 UTC (rev 4515)
@@ -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.2b"/>
+ <dependency groupId="perfsonar" artifactId="perfsonar-web-admin"
version="0.9.5b"/>
<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 09:11:50 UTC (rev 4514)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/ant/webapp-package-targets.xml
2008-09-22 09:45:45 UTC (rev 4515)
@@ -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.20080721/perfsonar-base-1.0.20080721.jar"
todir="${tmpdir}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.9.2b/perfsonar-web-admin-0.9.2b.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/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-09-22
09:11:50 UTC (rev 4514)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/conf/axis-1.4/index.jsp 2008-09-22
09:45:45 UTC (rev 4515)
@@ -6,6 +6,7 @@
<link rel="stylesheet" type="text/css" href="main.css"/>
<meta http-equiv="Content-Type" content="text/html;
charset=iso-8859-1">
<script src="Service_Admin.js"></script>
+ <script language="javascript" src="liveclock.js"/>

<style type="text/css">
<!--
@@ -50,7 +51,7 @@
-->
</style>
</head>
- <body>
+ <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();
@@ -78,7 +79,21 @@
</td>
<td>
<table>
- <tr><td
id="date"><%=date.toString()%></td></tr>
+ <tr><td id="date">
+ <script
type="text/javascript">
+ <!--
+ // For Version 4+
browsers, write the appropriate HTML to the
+ // page for
the clock, otherwise, attempt to write a static
+ // date to the page.
+ if (ie4||ns6)
{
+ document.write('<span
id="LiveClockIE" style="width:'+mywidth+'px" ></span>'); }
+ else if (document.layers) { document.write('<ilayer
bgColor="'+myback_color+'" id="ClockPosNS" visibility="hide"><layer
width="'+mywidth+'" id="LiveClockNS"></layer></ilayer>'); }
+ else { old = "true"; show_clock(); }
+ show_clock();
+ //-->
+ </script>
+
+ </td></tr>
<tr><td id="serviceName"><%=serviceName %>
&nbsp;<%=serviceVersion%></td></tr>
</table>
</td>

Modified: branches/GEANT2-JAVA-RRD-MA-STABLE/conf/service.properties
===================================================================
--- branches/GEANT2-JAVA-RRD-MA-STABLE/conf/service.properties 2008-09-22
09:11:50 UTC (rev 4514)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/conf/service.properties 2008-09-22
09:45:45 UTC (rev 4515)
@@ -91,7 +91,7 @@

# Group=LS
# Description=The URL address of the service configured by this
configuration file.
-service.r.access_point=http://somewhere
+service.r.access_point=http://somewhere:8180/geant2-java-rrd-ma/services/MeasurementArchiveService

# Group=LS
# Description=The name of the organisation who is deploying the service.

Modified: branches/GEANT2-JAVA-RRD-MA-STABLE/doc/ChangeLog.txt
===================================================================
--- branches/GEANT2-JAVA-RRD-MA-STABLE/doc/ChangeLog.txt 2008-09-22
09:11:50 UTC (rev 4514)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/doc/ChangeLog.txt 2008-09-22
09:45:45 UTC (rev 4515)
@@ -1,6 +1,6 @@
RRD MA ChangeLog

-2008-09-03 Version 3.1
+2008-09-19 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,8 +10,9 @@
- 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.2b
+- Change: use of web admin library v0.9.5b
- 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)

2008-03-10 Version 3.0

Modified: branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/changelog
===================================================================
--- branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/changelog 2008-09-22
09:11:50 UTC (rev 4514)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/changelog 2008-09-22
09:45:45 UTC (rev 4515)
@@ -7,7 +7,10 @@
* Change: format of log messages changed
* Change: use of pSbase v1.0.20080902
* Change: use of web admin library v0.9.2b
+ * 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
+ * Fixed Bug #405: request for ability to define which domain is the
interface (solved via keyword)

-- Roman Lapacz
<>
Wed, 05 Sep 2008 12:00:00 +0200


Modified: branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/control
===================================================================
--- branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/control 2008-09-22
09:11:50 UTC (rev 4514)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/control 2008-09-22
09:45:45 UTC (rev 4515)
@@ -7,6 +7,6 @@

Package: geant2-java-rrd-ma
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, tomcat5.5, tomcat5.5-exist,
rrdtool, librrd2, rrdjtool, geant2-tomcat5.5-runscript
+Depends: ${shlibs:Depends}, ${misc:Depends}, tomcat5.5-exist, rrdtool,
librrd2, rrdjtool, geant2-tomcat5.5-runscript
Description: perfSONAR Round Robin Database


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-09-22 09:11:50 UTC (rev 4514)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/rpm/geant2-java-rrd-ma.specs
2008-09-22 09:45:45 UTC (rev 4515)
@@ -10,7 +10,6 @@
Group: Network/Web service
packager: Roman Lapacz
<>
URL: http://www.perfsonar.org
-Requires: tomcat5
Requires: tomcat5-exist
Requires: rrdjtool
BuildArch: noarch
@@ -121,7 +120,7 @@


%changelog
-* Wed Sep 03 2008 Roman Lapacz
<>
3.1-1
+* Wed Sep 19 2008 Roman Lapacz
<>
3.1-1
- 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.
- New: parameter keyword introduced in metadata block to indicate
project/organisation name
- New: new request MeasurementArchiveStoreRequest switched off by default
@@ -131,6 +130,7 @@
- Change: use of web admin library v0.9.2b
- 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
- Fixed Bug #405: request for ability to define which domain is the
interface (solved via keyword)

* Mon Mar 10 2008 Roman Lapacz
<>
3.0-1

Modified: branches/GEANT2-JAVA-RRD-MA-STABLE/pom.xml
===================================================================
--- branches/GEANT2-JAVA-RRD-MA-STABLE/pom.xml 2008-09-22 09:11:50 UTC (rev
4514)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/pom.xml 2008-09-22 09:45:45 UTC (rev
4515)
@@ -144,7 +144,7 @@
<dependency>
<groupId>perfsonar</groupId>
<artifactId>perfsonar-web-admin</artifactId>
- <version>0.9.2b</version>
+ <version>0.9.5b</version>
</dependency>
<dependency>
<groupId>rrdjtool</groupId>


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

Archive powered by MHonArc 2.6.16.

Top of Page