perfsonar-dev - perfsonar: r4714 - in branches/GEANT2-JAVA-SQL-MA-STABLE: . ant conf conf/axis-1.4 doc packaging/deb
Subject: perfsonar development work
List archive
perfsonar: r4714 - in branches/GEANT2-JAVA-SQL-MA-STABLE: . ant conf conf/axis-1.4 doc packaging/deb
Chronological Thread
- From:
- To:
- Subject: perfsonar: r4714 - in branches/GEANT2-JAVA-SQL-MA-STABLE: . ant conf conf/axis-1.4 doc packaging/deb
- Date: Fri, 28 Nov 2008 07:15:01 -0500
Author: roman
Date: 2008-11-28 07:15:01 -0500 (Fri, 28 Nov 2008)
New Revision: 4714
Modified:
branches/GEANT2-JAVA-SQL-MA-STABLE/ant/axis-deploy-targets.xml
branches/GEANT2-JAVA-SQL-MA-STABLE/ant/libs-download-targets.xml
branches/GEANT2-JAVA-SQL-MA-STABLE/ant/webapp-package-targets.xml
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/index.jsp
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/liveclock.js
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/welcome.htm
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/ibatis-L2-status-domain.xml
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/ibatis-L2-status-interdomain.xml
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/ibatis-L2-status.xml
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/sql-database_TEST.xml
branches/GEANT2-JAVA-SQL-MA-STABLE/doc/ChangeLog.txt
branches/GEANT2-JAVA-SQL-MA-STABLE/packaging/deb/changelog
branches/GEANT2-JAVA-SQL-MA-STABLE/pom.xml
Log:
merging (-r 4589:4712)
Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/ant/axis-deploy-targets.xml
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/ant/axis-deploy-targets.xml
2008-11-28 12:12:48 UTC (rev 4713)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/ant/axis-deploy-targets.xml
2008-11-28 12:15:01 UTC (rev 4714)
@@ -46,7 +46,7 @@
depends="copy-dep-base-service-jars">
<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/perfsonar/perfsonar-rrd-ma/3.1/perfsonar-rrd-ma-3.1.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20080630/nmwg-1.0.20080630.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
@@ -289,7 +289,7 @@
<copy file="${basedir}/${build}/${jarfilename}-${version}.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/perfsonar/perfsonar-rrd-ma/3.1/perfsonar-rrd-ma-3.1.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"/>
Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/ant/libs-download-targets.xml
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/ant/libs-download-targets.xml
2008-11-28 12:12:48 UTC (rev 4713)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/ant/libs-download-targets.xml
2008-11-28 12:15:01 UTC (rev 4714)
@@ -55,7 +55,7 @@
<artifact:dependencies>
<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="perfsonar" artifactId="perfsonar-rrd-ma"
version="3.1"/>
<dependency groupId="nmwg" artifactId="nmwg"
version="1.0.20080630"/>
Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/ant/webapp-package-targets.xml
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/ant/webapp-package-targets.xml
2008-11-28 12:12:48 UTC (rev 4713)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/ant/webapp-package-targets.xml
2008-11-28 12:15:01 UTC (rev 4714)
@@ -81,7 +81,7 @@
<!-- copy jar files -->
<copy file="${basedir}/${build}/${jarfilename}-${version}.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/perfsonar/perfsonar-rrd-ma/3.1/perfsonar-rrd-ma-3.1.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/rrdjtool/rrdjtool/1.0/rrdjtool-1.0.jar"
todir="${tmpdir}/WEB-INF/lib"/>
Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/index.jsp
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/index.jsp 2008-11-28
12:12:48 UTC (rev 4713)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/index.jsp 2008-11-28
12:15:01 UTC (rev 4714)
@@ -1,167 +1,151 @@
-<%@ page
import="perfSONARWebAdmin.auxiliary.PerfsonarProperties,perfSONARWebAdmin.auxiliary.PerfsonarPropertiesImpl,perfSONARWebAdmin.auxiliary.PerfsonarProperty,java.io.File,java.io.FileInputStream,java.io.FileOutputStream,java.io.IOException"
%>
-
-<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"/>
-
- <style type="text/css">
- <!--
-
- a {
- }
-
- .style3 {
- color: #8585c1;
- font-size: 13px;
- }
-
- .style3 a:link {
- color: #8585C1;
- cursor: pointer;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 12px;
- }
-
- .style3 a:active {
- color: #117721;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 12px;
- }
-
- .style3 a:visited {
- color: #8585C1;
- cursor: auto;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 12px;
- /*font-weight: bold;*/
- }
-
-
- .style3 a:hover {
- color: #8585C1;
- cursor: pointer;
- text-decoration: underline;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 12px;
- }
- -->
- </style>
- </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());
- String confPath = "WEB-INF/classes/perfsonar/conf/";
- String ServicePropertiesPath = confPath+ "service.properties";
- ServletContext sc = getServletContext();
- String ServicePath = sc.getRealPath("/");
- PerfsonarProperty property = new PerfsonarProperty();
- PerfsonarProperties serviceProperties = new PerfsonarPropertiesImpl();
- serviceProperties.loadProperties(new FileInputStream(ServicePath
- + ServicePropertiesPath));
-
- String serviceName=
serviceProperties.getProperty("service.r.service_name").getValue().trim();
- String serviceVersion=
serviceProperties.getProperty("service.r.service_version").getValue().trim();
-
-
- %>
- <div class="adminPanel">
- <div class="banner">
- <table border="0" align="left" cellpadding="0"
cellspacing="0">
- <tr>
- <td>
- <a href="welcome.htm" target="main"><img
src="perfsonar_logo.gif" alt="perfSONAR" width="192" height="94" border="0"
align="right"></a>
- </td>
- <td>
- <table>
- <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 %>
<%=serviceVersion%></td></tr>
- </table>
- </td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
- </div>
- <div class="mainWindow">
- <div class="sidebar">
- <table border="0" cellpadding="0" cellspacing="0">
- <tr>
- <th>
- <a href="welcome.htm" class="button"
target="main">Admin home </a>
- </th>
- </tr>
- <tr>
- <td>
- <p>
- <span class="navtexheading">Basic
- <br>
- Configuration
- </span>
- </p>
- <p>
- <span class="navtex"><a href="Wizard"
target="main">Service</a></span>
- <br>
- <a href="testdepl.jsp"
target="main">Test</a>
- </p>
- </td>
- </tr>
-
- <tr>
- <td>
- <p>
- <span class="navtexheading
style3">Advanced
- <br>
- Configuration
- </span>
- </p>
- <p>
- <span class="navtex style3"><a
href="ServiceAdmin?serviceProperties" target="main">Service</a>
- <br>
- <a
href="ServiceAdmin?loggingProperties" target="main">Logging</a>
- <br>
- <a href="SQLMAdmin"
target="main">SQL MA Administration</a>
- <br>
- <a href="eXistAdmin"
target="main">eXist Database</a>
- <br>
-
- </span>
- </p>
- </td>
- </tr>
- <tr>
- </tr>
- </table>
- <img src="graphics/logos.gif" alt="perfSONAR project
partners" width="117" height="263" border="0" align="top"/>
- </div>
- <div class="centerWindow">
- <object data="welcome.htm" type="text/html" name="main"
width="99%" height="100%">
- </object>
- </div>
- </div>
- <div class="footer">
- PERFormance Service-Oriented Network monitoring ARchitecture
- </div>
- </div>
- </body>
-</html>
+<%@ page
import="perfSONARWebAdmin.auxiliary.PerfsonarProperties,perfSONARWebAdmin.auxiliary.PerfsonarPropertiesImpl,perfSONARWebAdmin.auxiliary.PerfsonarProperty,java.io.File,java.io.FileInputStream,java.io.FileOutputStream,java.io.IOException"
%>
+
+<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>
+
+ <style type="text/css">
+ <!--
+
+ a {
+ }
+
+ .style3 {
+ color: #8585c1;
+ font-size: 13px;
+ }
+
+ .style3 a:link {
+ color: #8585C1;
+ cursor: pointer;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 12px;
+ }
+
+ .style3 a:active {
+ color: #117721;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 12px;
+ }
+
+ .style3 a:visited {
+ color: #8585C1;
+ cursor: auto;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 12px;
+ /*font-weight: bold;*/
+ }
+
+
+ .style3 a:hover {
+ color: #8585C1;
+ cursor: pointer;
+ text-decoration: underline;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 12px;
+ }
+ -->
+ </style>
+ </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());
+ String confPath = "WEB-INF/classes/perfsonar/conf/";
+ String ServicePropertiesPath = confPath+ "service.properties";
+ ServletContext sc = getServletContext();
+ String ServicePath = sc.getRealPath("/");
+ PerfsonarProperty property = new PerfsonarProperty();
+ PerfsonarProperties serviceProperties = new PerfsonarPropertiesImpl();
+ serviceProperties.loadProperties(new FileInputStream(ServicePath
+ + ServicePropertiesPath));
+
+ String serviceName=
serviceProperties.getProperty("service.r.service_name").getValue().trim();
+ String serviceVersion=
serviceProperties.getProperty("service.r.service_version").getValue().trim();
+
+
+ %>
+ <div class="adminPanel">
+ <div class="banner">
+ <table border="0" align="left" cellpadding="0"
cellspacing="0">
+ <tr>
+ <td>
+ <a href="welcome.htm" target="main"><img
src="perfsonar_logo.gif" alt="perfSONAR" width="192" height="94" border="0"
align="right"></a>
+ </td>
+ <td>
+ <table>
+ <tr><td
id="date"><%=date.toString()%></td></tr>
+ <tr><td id="serviceName"><%=serviceName %>
<%=serviceVersion%></td></tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ </div>
+ <div class="mainWindow">
+ <div class="sidebar">
+ <table border="0" cellpadding="0" cellspacing="0">
+ <tr>
+ <th>
+ <a href="welcome.htm" class="button"
target="main">Admin home </a>
+ </th>
+ </tr>
+ <tr>
+ <td>
+ <p>
+ <span class="navtexheading">Basic
+ <br>
+ Configuration
+ </span>
+ </p>
+ <p>
+ <span class="navtex"><a href="Wizard"
target="main">Service</a></span>
+ <br>
+ <a href="testdepl.jsp"
target="main">Test</a>
+ </p>
+ </td>
+ </tr>
+
+ <tr>
+ <td>
+ <p>
+ <span class="navtexheading
style3">Advanced
+ <br>
+ Configuration
+ </span>
+ </p>
+ <p>
+ <span class="navtex style3"><a
href="ServiceAdmin?serviceProperties" target="main">Service</a>
+ <br>
+ <a
href="ServiceAdmin?loggingProperties" target="main">Logging</a>
+ <br>
+ <a href="eXistAdmin"
target="main">eXist Database</a>
+ <br>
+ <a href="SQLMAdmin"
target="main">SQL MA Admin</a>
+ <br>
+ </span>
+ </p>
+ </td>
+ </tr>
+ <tr>
+ </tr>
+ </table>
+ <img src="graphics/logos.gif" alt="perfSONAR project
partners" width="117" height="263" border="0" align="top"/>
+ </div>
+ <div class="centerWindow">
+ <object data="welcome.htm" type="text/html" name="main"
width="99%" height="100%">
+ </object>
+ </div>
+ </div>
+ <div class="footer">
+ PERFormance Service-Oriented Network monitoring ARchitecture
+ </div>
+ </div>
+ </body>
+</html>
Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/liveclock.js
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/liveclock.js
2008-11-28 12:12:48 UTC (rev 4713)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/liveclock.js
2008-11-28 12:15:01 UTC (rev 4714)
@@ -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-SQL-MA-STABLE/conf/axis-1.4/welcome.htm
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/welcome.htm
2008-11-28 12:12:48 UTC (rev 4713)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/welcome.htm
2008-11-28 12:15:01 UTC (rev 4714)
@@ -116,7 +116,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>
Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/conf/ibatis-L2-status-domain.xml
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/conf/ibatis-L2-status-domain.xml
2008-11-28 12:12:48 UTC (rev 4713)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/conf/ibatis-L2-status-domain.xml
2008-11-28 12:15:01 UTC (rev 4714)
@@ -32,7 +32,7 @@
<select id="getResults1"
parameterMap="select-parameters1" resultMap="select-results">
<![CDATA[
- select status_oper, status_admin, unix_timestamp(time) as time
+ select distinct status_oper, status_admin, unix_timestamp(time) as
time
from domain_link
where id = ?
and time >= from_unixtime(?)
@@ -47,7 +47,7 @@
<select id="getResults1"
parameterMap="select-parameters1" resultMap="select-results">
<![CDATA[
- select status_oper, status_admin, date_part('epoch', time) as time
+ select distinct status_oper, status_admin, date_part('epoch', time)
as time
from domain_link
where id = ?
and time >= to_timestamp(?)
@@ -68,7 +68,7 @@
<select id="getResults2"
parameterMap="select-parameters2" resultMap="select-results">
<![CDATA[
- select status_oper, status_admin, unix_timestamp(time) as time
+ select distinct status_oper, status_admin, unix_timestamp(time) as
time
from domain_link
where id = ?
and time = (select MAX(time) from domain_link where id = ?)
@@ -81,7 +81,7 @@
<select id="getResults2"
parameterMap="select-parameters2" resultMap="select-results">
<![CDATA[
- select status_oper, status_admin, date_part('epoch', time) as time
+ select distinct status_oper, status_admin, date_part('epoch', time)
as time
from domain_link
where id = ?
and time = (select MAX(time) from domain_link where id = ?)
Modified:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/ibatis-L2-status-interdomain.xml
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/conf/ibatis-L2-status-interdomain.xml
2008-11-28 12:12:48 UTC (rev 4713)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/conf/ibatis-L2-status-interdomain.xml
2008-11-28 12:15:01 UTC (rev 4714)
@@ -32,7 +32,7 @@
<select id="getResults1"
parameterMap="select-parameters1" resultMap="select-results">
<![CDATA[
- select status_oper, status_admin, unix_timestamp(time) as time
+ select distinct status_oper, status_admin, unix_timestamp(time) as
time
from interdomain_link
where id = ?
and time >= from_unixtime(?)
@@ -47,7 +47,7 @@
<select id="getResults1"
parameterMap="select-parameters1" resultMap="select-results">
<![CDATA[
- select status_oper, status_admin, date_part('epoch', time) as time
+ select distinct status_oper, status_admin, date_part('epoch', time)
as time
from interdomain_link
where id = ?
and time >= to_timestamp(?)
@@ -68,7 +68,7 @@
<select id="getResults2"
parameterMap="select-parameters2" resultMap="select-results">
<![CDATA[
- select status_oper, status_admin, unix_timestamp(time) as time
+ select distinct status_oper, status_admin, unix_timestamp(time) as
time
from interdomain_link
where id = ?
and time = (select MAX(time) from interdomain_link where id = ?)
@@ -81,7 +81,7 @@
<select id="getResults2"
parameterMap="select-parameters2" resultMap="select-results">
<![CDATA[
- select status_oper, status_admin, date_part('epoch', time) as time
+ select distinct status_oper, status_admin, date_part('epoch', time)
as time
from interdomain_link
where id = ?
and time = (select MAX(time) from interdomain_link where id = ?)
Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/conf/ibatis-L2-status.xml
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/conf/ibatis-L2-status.xml
2008-11-28 12:12:48 UTC (rev 4713)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/conf/ibatis-L2-status.xml
2008-11-28 12:15:01 UTC (rev 4714)
@@ -32,7 +32,7 @@
<select id="getResults1"
parameterMap="select-parameters1" resultMap="select-results">
<![CDATA[
- select status_oper, status_admin, unix_timestamp(time) as time
+ select distinct status_oper, status_admin, unix_timestamp(time) as
time
from perfsonar_links
where id = ?
and time >= from_unixtime(?)
@@ -47,7 +47,7 @@
<select id="getResults1"
parameterMap="select-parameters1" resultMap="select-results">
<![CDATA[
- select status_oper, status_admin, date_part('epoch', time) as time
+ select distinct status_oper, status_admin, date_part('epoch', time)
as time
from perfsonar_links
where id = ?
and time >= to_timestamp(?)
@@ -68,7 +68,7 @@
<select id="getResults2"
parameterMap="select-parameters2" resultMap="select-results">
<![CDATA[
- select status_oper, status_admin, unix_timestamp(time) as time
+ select distinct status_oper, status_admin, unix_timestamp(time) as
time
from perfsonar_links
where id = ?
and time = (select MAX(time) from perfsonar_links where id = ?)
@@ -81,7 +81,7 @@
<select id="getResults2"
parameterMap="select-parameters2" resultMap="select-results">
<![CDATA[
- select status_oper, status_admin, date_part('epoch', time) as time
+ select distinct status_oper, status_admin, date_part('epoch', time)
as time
from perfsonar_links
where id = ?
and time = (select MAX(time) from perfsonar_links where id = ?)
Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/conf/sql-database_TEST.xml
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/conf/sql-database_TEST.xml
2008-11-28 12:12:48 UTC (rev 4713)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/conf/sql-database_TEST.xml
2008-11-28 12:15:01 UTC (rev 4714)
@@ -299,7 +299,7 @@
<nmwg:key>
<nmwg:parameters>
<nmwg:parameter name="pathId">DFN-link-1234</nmwg:parameter>
- <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-L2-status-domain.xml</nmwg:parameter>
+ <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-L2-status.xml</nmwg:parameter>
</nmwg:parameters>
</nmwg:key>
</nmwg:data>
@@ -309,7 +309,7 @@
<nmwg:key>
<nmwg:parameters>
<nmwg:parameter
name="pathId">DFN-Surfnet-Link-5678</nmwg:parameter>
- <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-L2-status-domain.xml</nmwg:parameter>
+ <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-L2-status.xml</nmwg:parameter>
</nmwg:parameters>
</nmwg:key>
</nmwg:data>
@@ -319,7 +319,7 @@
<nmwg:key>
<nmwg:parameters>
<nmwg:parameter
name="pathId">PSNC-DFN-MUE-Link-1001</nmwg:parameter>
- <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-L2-status-domain.xml</nmwg:parameter>
+ <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-L2-status.xml</nmwg:parameter>
</nmwg:parameters>
</nmwg:key>
</nmwg:data>
@@ -329,7 +329,7 @@
<nmwg:key>
<nmwg:parameters>
<nmwg:parameter
name="pathId">PSNC-2-DFN-MUE-Link-1002</nmwg:parameter>
- <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-L2-status-interdomain.xml</nmwg:parameter>
+ <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-L2-status.xml</nmwg:parameter>
</nmwg:parameters>
</nmwg:key>
</nmwg:data>
Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/doc/ChangeLog.txt
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/doc/ChangeLog.txt 2008-11-28
12:12:48 UTC (rev 4713)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/doc/ChangeLog.txt 2008-11-28
12:15:01 UTC (rev 4714)
@@ -15,13 +15,14 @@
- Change: default value of service.r.access_point property update to service
URL
- Change: eventType Path.Status used by default in metadata configuration
file
- Change: ibatisConfig parameter in L2 CompleteMetadataStoreRequest in link
metadata is optional
-- Change: use of web admin library v0.9.6b
+- Change: use of web admin library v0.9.1c
- Change: one database table is now used for domain and interdomain links
- Change: eXist default port is 8180
- Change: use of pSbase v1.0.20080902
- Change: new format of log messages
- Change: obsolete authRealm removed from metadata configuration file
- Fixed Bug #508: error in the SQL setup file
+- Fixed Bug #619: publishing duplicates sent by E2EMon MP
2008-04-16 Version 2.0
Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/packaging/deb/changelog
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/packaging/deb/changelog 2008-11-28
12:12:48 UTC (rev 4713)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/packaging/deb/changelog 2008-11-28
12:15:01 UTC (rev 4714)
@@ -14,10 +14,11 @@
* 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.6b
+ * Change: use of web admin library v0.9.1c
* Change: one database table is now used for domain and interdomain links
* Change: obsolete authRealm removed from metadata configuration file
* Fixed Bug #508: error in the SQL setup file
+ * Fixed Bug #619: publishing duplicates sent by E2EMon MP
-- Roman Lapacz
<>
Wed, 01 Oct 2008 12:00:00 +0200
Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/pom.xml
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/pom.xml 2008-11-28 12:12:48 UTC (rev
4713)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/pom.xml 2008-11-28 12:15:01 UTC (rev
4714)
@@ -133,7 +133,7 @@
<dependency>
<groupId>perfsonar</groupId>
<artifactId>perfsonar-web-admin</artifactId>
- <version>0.9.6b</version>
+ <version>0.9.1c</version>
</dependency>
<dependency>
<groupId>perfsonar</groupId>
- perfsonar: r4714 - in branches/GEANT2-JAVA-SQL-MA-STABLE: . ant conf conf/axis-1.4 doc packaging/deb, svnlog, 11/28/2008
Archive powered by MHonArc 2.6.16.