perfsonar-dev - perfsonar: r4499 - in branches/WebAdmin: . ant perfSONARWebAdmin/auxiliary
Subject: perfsonar development work
List archive
- From:
- To:
- Subject: perfsonar: r4499 - in branches/WebAdmin: . ant perfSONARWebAdmin/auxiliary
- Date: Thu, 18 Sep 2008 13:47:24 -0400
Author: pgerakios
Date: 2008-09-18 13:47:23 -0400 (Thu, 18 Sep 2008)
New Revision: 4499
Added:
branches/WebAdmin/perfSONARWebAdmin/auxiliary/DynFile.java
branches/WebAdmin/perfSONARWebAdmin/auxiliary/DynFileListener.java
branches/WebAdmin/perfSONARWebAdmin/auxiliary/DynProperties.java
branches/WebAdmin/perfSONARWebAdmin/auxiliary/FileListing.java
branches/WebAdmin/perfSONARWebAdmin/auxiliary/FileMonitor.java
branches/WebAdmin/perfSONARWebAdmin/auxiliary/MyDynProperties.java
Modified:
branches/WebAdmin/ant/compile.xml
branches/WebAdmin/ant/const.properties
branches/WebAdmin/index.jsp
branches/WebAdmin/perfSONARWebAdmin/auxiliary/ServicePropertiesImpl.java
Log:
Modified: branches/WebAdmin/ant/compile.xml
===================================================================
--- branches/WebAdmin/ant/compile.xml 2008-09-18 14:24:20 UTC (rev 4498)
+++ branches/WebAdmin/ant/compile.xml 2008-09-18 17:47:23 UTC (rev 4499)
@@ -37,10 +37,15 @@
</target>
<!--.${DSTAMP}.jar" -->
- <target name="build-web-admin" depends="compile">
+ <target name="build-web-admin" depends="compile,cleanjar">
<jar jarfile="${build}/${jarfilename}-${version}.jar"
basedir="${build}/"/>
</target>
+<target name="cleanjar">
+ <delete>
+ <fileset dir="${build}" includes="${jarfilename}-*.jar" />
+ </delete>
+</target>
<target name="clean"
description="clean up" >
Modified: branches/WebAdmin/ant/const.properties
===================================================================
--- branches/WebAdmin/ant/const.properties 2008-09-18 14:24:20 UTC (rev
4498)
+++ branches/WebAdmin/ant/const.properties 2008-09-18 17:47:23 UTC (rev
4499)
@@ -9,7 +9,7 @@
target.server=127.0.0.1
service.name=perfsonar-web-admin
jarfilename=perfsonar-web-admin
-version=0.9.3b
+version=0.9.4b
antcontrib.jar=${basedir}/lib/misc/ant-contrib-1.0b3.jar
antpsbase.jar=${basedir}/lib/misc/perfsonar-base-ant-1.0.20080303.jar
Modified: branches/WebAdmin/index.jsp
===================================================================
--- branches/WebAdmin/index.jsp 2008-09-18 14:24:20 UTC (rev 4498)
+++ branches/WebAdmin/index.jsp 2008-09-18 17:47:23 UTC (rev 4499)
@@ -53,6 +53,7 @@
</head>
<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());
@@ -65,6 +66,8 @@
serviceProperties.loadProperties(new FileInputStream(ServicePath
+ ServicePropertiesPath));
+ perfSONARWebAdmin.auxiliary.MyDynProperties.register(ServicePath); //
start monitoring
+
String serviceName=
serviceProperties.getProperty("service.r.service_name").getValue().trim();
String serviceVersion=
serviceProperties.getProperty("service.r.service_version").getValue().trim();
@@ -86,7 +89,7 @@
//-->
</script>
</td></tr>
- <tr><td id="serviceName"><%=serviceName %>
<%=serviceVersion%></td></tr>
+ <tr><td id="serviceName"><%=serviceName %>
<%=serviceVersion%></td></tr>
</table>
</td>
</tr>
Added: branches/WebAdmin/perfSONARWebAdmin/auxiliary/DynFile.java
Added: branches/WebAdmin/perfSONARWebAdmin/auxiliary/DynFileListener.java
Added: branches/WebAdmin/perfSONARWebAdmin/auxiliary/DynProperties.java
Added: branches/WebAdmin/perfSONARWebAdmin/auxiliary/FileListing.java
Added: branches/WebAdmin/perfSONARWebAdmin/auxiliary/FileMonitor.java
Added: branches/WebAdmin/perfSONARWebAdmin/auxiliary/MyDynProperties.java
Modified:
branches/WebAdmin/perfSONARWebAdmin/auxiliary/ServicePropertiesImpl.java
===================================================================
--- branches/WebAdmin/perfSONARWebAdmin/auxiliary/ServicePropertiesImpl.java
2008-09-18 14:24:20 UTC (rev 4498)
+++ branches/WebAdmin/perfSONARWebAdmin/auxiliary/ServicePropertiesImpl.java
2008-09-18 17:47:23 UTC (rev 4499)
@@ -21,6 +21,9 @@
private Properties properties;
+ private String existPropertiesFile;
+
+
//
-----------------------------------------------------------------------
// public methods
- perfsonar: r4499 - in branches/WebAdmin: . ant perfSONARWebAdmin/auxiliary, svnlog, 09/18/2008
Archive powered by MHonArc 2.6.16.