Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r4514 - in trunk/geant2-java-rrd-ma: . ant conf/axis-1.4

Subject: perfsonar development work

List archive

perfsonar: r4514 - in trunk/geant2-java-rrd-ma: . ant conf/axis-1.4


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r4514 - in trunk/geant2-java-rrd-ma: . ant conf/axis-1.4
  • Date: Mon, 22 Sep 2008 05:11:50 -0400
Author: roman
Date: 2008-09-22 05:11:50 -0400 (Mon, 22 Sep 2008)
New Revision: 4514

Modified:
trunk/geant2-java-rrd-ma/ant/axis-deploy-targets.xml
trunk/geant2-java-rrd-ma/ant/libs-download-targets.xml
trunk/geant2-java-rrd-ma/ant/webapp-package-targets.xml
trunk/geant2-java-rrd-ma/conf/axis-1.4/index.jsp
trunk/geant2-java-rrd-ma/pom.xml
Log:
new version of web admin library (0.9.5b)



Modified: trunk/geant2-java-rrd-ma/ant/axis-deploy-targets.xml
===================================================================
--- trunk/geant2-java-rrd-ma/ant/axis-deploy-targets.xml 2008-09-19
15:08:32 UTC (rev 4513)
+++ trunk/geant2-java-rrd-ma/ant/axis-deploy-targets.xml 2008-09-22
09:11:50 UTC (rev 4514)
@@ -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"/>

@@ -247,7 +247,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: trunk/geant2-java-rrd-ma/ant/libs-download-targets.xml
===================================================================
--- trunk/geant2-java-rrd-ma/ant/libs-download-targets.xml 2008-09-19
15:08:32 UTC (rev 4513)
+++ trunk/geant2-java-rrd-ma/ant/libs-download-targets.xml 2008-09-22
09:11:50 UTC (rev 4514)
@@ -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: trunk/geant2-java-rrd-ma/ant/webapp-package-targets.xml
===================================================================
--- trunk/geant2-java-rrd-ma/ant/webapp-package-targets.xml 2008-09-19
15:08:32 UTC (rev 4513)
+++ trunk/geant2-java-rrd-ma/ant/webapp-package-targets.xml 2008-09-22
09:11:50 UTC (rev 4514)
@@ -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: trunk/geant2-java-rrd-ma/conf/axis-1.4/index.jsp
===================================================================
--- trunk/geant2-java-rrd-ma/conf/axis-1.4/index.jsp 2008-09-19 15:08:32
UTC (rev 4513)
+++ trunk/geant2-java-rrd-ma/conf/axis-1.4/index.jsp 2008-09-22 09:11:50
UTC (rev 4514)
@@ -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: trunk/geant2-java-rrd-ma/pom.xml
===================================================================
--- trunk/geant2-java-rrd-ma/pom.xml 2008-09-19 15:08:32 UTC (rev 4513)
+++ trunk/geant2-java-rrd-ma/pom.xml 2008-09-22 09:11:50 UTC (rev 4514)
@@ -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: r4514 - in trunk/geant2-java-rrd-ma: . ant conf/axis-1.4, svnlog, 09/22/2008

Archive powered by MHonArc 2.6.16.

Top of Page