Skip to Content.
Sympa Menu

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

Subject: perfsonar development work

List archive

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


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r4745 - in branches/GEANT2-JAVA-RRD-MA-STABLE: . ant conf conf/axis-1.4 packaging/deb packaging/rpm
  • Date: Mon, 8 Dec 2008 08:02:32 -0500
Author: roman
Date: 2008-12-08 08:02:31 -0500 (Mon, 08 Dec 2008)
New Revision: 4745

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/axis-1.4/liveclock.js
branches/GEANT2-JAVA-RRD-MA-STABLE/conf/axis-1.4/welcome.htm
branches/GEANT2-JAVA-RRD-MA-STABLE/conf/wizard.properties
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 4586:4743)



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-08 12:36:08 UTC (rev 4744)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/ant/axis-deploy-targets.xml
2008-12-08 13:02:31 UTC (rev 4745)
@@ -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.6b/perfsonar-web-admin-0.9.6b.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/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.6b/perfsonar-web-admin-0.9.6b.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/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-08 12:36:08 UTC (rev 4744)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/ant/libs-download-targets.xml
2008-12-08 13:02:31 UTC (rev 4745)
@@ -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.6b"/>
+ <dependency groupId="perfsonar" artifactId="perfsonar-web-admin"
version="0.9.1c"/>
<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-08 12:36:08 UTC (rev 4744)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/ant/webapp-package-targets.xml
2008-12-08 13:02:31 UTC (rev 4745)
@@ -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.6b/perfsonar-web-admin-0.9.6b.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/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-08
12:36:08 UTC (rev 4744)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/conf/axis-1.4/index.jsp 2008-12-08
13:02:31 UTC (rev 4745)
@@ -1,12 +1,30 @@
<%@ page
import="perfSONARWebAdmin.auxiliary.PerfsonarProperties,perfSONARWebAdmin.auxiliary.PerfsonarPropertiesImpl,perfSONARWebAdmin.auxiliary.PerfsonarProperty,java.io.File,java.io.FileInputStream,java.io.FileOutputStream,java.io.IOException"
%>

+<%!
+ private perfSONARWebAdmin.auxiliary.MyDynProperties prop;
+
+ public void jspInit()
+ {
+ super.jspInit();
+ prop =
perfSONARWebAdmin.auxiliary.MyDynProperties.create(getServletContext().getRealPath("/")
,false);
+ prop.reloadAll();
+ prop.updateClientProperties();
+ }
+
+ public void jspDestroy()
+ {
+ super.jspDestroy();
+ prop.reloadAll();
+ prop.updateClientProperties();
+ }
+%>
<html>
<head>
<title>perfSONAR Service Web Administration page</title>
<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"/>
+ <script src="liveclock.js"></script>

<style type="text/css">
<!--
@@ -51,8 +69,9 @@
-->
</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();
java.util.Date date= dateFormat.parse(now.toString());
@@ -82,19 +101,11 @@
<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();
+ show_clock();
//-->
</script>
-
</td></tr>
- <tr><td id="serviceName"><%=serviceName %>
&nbsp;<%=serviceVersion%></td></tr>
+ <tr><td id="serviceName"><%=serviceName %>
&nbsp;<%=serviceVersion%></td></tr>
</table>
</td>
</tr>

Modified: branches/GEANT2-JAVA-RRD-MA-STABLE/conf/axis-1.4/liveclock.js
===================================================================
--- branches/GEANT2-JAVA-RRD-MA-STABLE/conf/axis-1.4/liveclock.js
2008-12-08 12:36:08 UTC (rev 4744)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/conf/axis-1.4/liveclock.js
2008-12-08 13:02:31 UTC (rev 4745)
@@ -146,14 +146,16 @@
myclock += '<font style="color:'+myfont_color+';
font-family:'+myfont_face+'; font-size:'+myfont_size+'pt;">';
myclock += Digital.toGMTString();
myclock += '</font>';
-
+
+ document.getElementById("date").innerHTML = myclock
+ //document.write(myclock);
if (old == "true") {
- document.write(myclock);
old = "die";
return;
}

- // Write the clock to the layer:
+ // Write the clock to the layer:
+ /*
if (ns4) {
clockpos = document.ClockPosNS;
liveclock = clockpos.document.LiveClockNS;
@@ -163,7 +165,9 @@
LiveClockIE.innerHTML = myclock;
} else if (ns6){
document.getElementById("LiveClockIE").innerHTML =
myclock;
- }
+ }
+ */
+

if (myupdate != 0) {
setTimeout("show_clock()",ClockUpdate[myupdate]); }
}

Modified: branches/GEANT2-JAVA-RRD-MA-STABLE/conf/axis-1.4/welcome.htm
===================================================================
--- branches/GEANT2-JAVA-RRD-MA-STABLE/conf/axis-1.4/welcome.htm
2008-12-08 12:36:08 UTC (rev 4744)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/conf/axis-1.4/welcome.htm
2008-12-08 13:02:31 UTC (rev 4745)
@@ -3,11 +3,11 @@
<head>
<meta http-equiv="Content-Type" content="text/html;
charset=iso-8859-1"/>
<title>Untitled Document</title>
- <link rel="stylesheet" type="text/css" href="main.css"/>
+ <link rel="stylesheet" type="text/css" href="main.css"/>
</head>
<body style="background-color: #FFFFFF" >
<div class="centerWindow" >
- <p class="welcometext">Welcome to the perfSONAR service web
admin administration interface</p>
+ <p class="welcometext">Welcome to the perfSONAR service web
admin administration interface</p>
<p class="heading1">
Configuration Settings
</p>
@@ -33,7 +33,7 @@
</p>
</td>
</tr>
- <tr>
+ <tr>
<td >
<p>
&nbsp;
@@ -46,7 +46,7 @@
</p>
</td>
</tr>
- <tr>
+ <tr>
<td >
<p>
&nbsp;
@@ -59,7 +59,7 @@
</p>
</td>
</tr>
- <tr><td> </td></tr>
+ <tr><td> </td></tr>
<tr>
<td>
<img src="graphics/step_1_bottom.gif"
width="350" height="18">
@@ -103,7 +103,7 @@
<tr>
<td class="configheadinglavender">
<p>
- <a href="eXistAdmin"
target="main">eXist Database settings</a>
+ <a href="eXistAdmin"
target="main">eXist Database Settings</a>
</p>
<p>
&nbsp;
@@ -114,19 +114,6 @@
</td>
</tr>
<tr>
- <td class="configheadinglavender">
- <p>
- <a href="MetadataAdmin"
target="main">Metadata Configuration File</a>
- </p>
- <p>
- &nbsp;
- </p>
- <p>
- &nbsp;
- </p>
- </td>
- </tr>
- <tr>
<td>
<img src="graphics/step_2_bottom.gif"
width="350" height="18">
</td>
@@ -137,4 +124,4 @@
</table>
</div>
</body>
-</html>
\ No newline at end of file
+</html>

Modified: branches/GEANT2-JAVA-RRD-MA-STABLE/conf/wizard.properties
===================================================================
--- branches/GEANT2-JAVA-RRD-MA-STABLE/conf/wizard.properties 2008-12-08
12:36:08 UTC (rev 4744)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/conf/wizard.properties 2008-12-08
13:02:31 UTC (rev 4745)
@@ -59,7 +59,7 @@

<property>
<entry key="old_adminpassword_1" required="true" password="true" />
- <Comment>Enter the eXist administration password:</Comment>
+ <Comment>Set an eXist administration password:</Comment>
<ProposedValue />
<Group order="5" dependsOn="4">eXist</Group>
</property>
@@ -82,7 +82,7 @@

<property>
<entry key="component.ma.xmldb.db_adminpassword" required="true"
password="true" />
- <Comment>Enter the eXist administration password:</Comment>
+ <Comment>Set an eXist administration password:</Comment>
<ProposedValue />
<Group order="8" dependsOn="7">eXist</Group>
</property>
@@ -127,7 +127,7 @@

<property>
<entry key="service.r.organization_name">Institution</entry>
- <Comment>Enter the name of the organization running this
service:</Comment>
+ <Comment>Enter the name of the organisation running this
service:</Comment>
<ProposedValue>Institution</ProposedValue>
<Group order="4">LS</Group>
</property>

Modified: branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/changelog
===================================================================
--- branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/changelog 2008-12-08
12:36:08 UTC (rev 4744)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/changelog 2008-12-08
13:02:31 UTC (rev 4745)
@@ -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.6b
+ * Change: use of web admin library v0.9.1c
* 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-08 12:36:08 UTC (rev 4744)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/rpm/geant2-java-rrd-ma.specs
2008-12-08 13:02:31 UTC (rev 4745)
@@ -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.5b
+- Change: use of web admin library v0.9.1c
- 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-08 12:36:08 UTC (rev
4744)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/pom.xml 2008-12-08 13:02:31 UTC (rev
4745)
@@ -144,7 +144,7 @@
<dependency>
<groupId>perfsonar</groupId>
<artifactId>perfsonar-web-admin</artifactId>
- <version>0.9.6b</version>
+ <version>0.9.1c</version>
</dependency>
<dependency>
<groupId>rrdjtool</groupId>


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

Archive powered by MHonArc 2.6.16.

Top of Page