Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r3383 - in branches/GEANT2_JAVA-SQL-MA-STABLE: . ant conf conf/axis-1.4 conf/axis-1.4/WEB-INF doc lib/misc src/main/java/org/perfsonar/service/measurementArchive/sqlType src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch src/main/java/org/perfsonar/service/measurementArchive/sqlType/store

Subject: perfsonar development work

List archive

perfsonar: r3383 - in branches/GEANT2_JAVA-SQL-MA-STABLE: . ant conf conf/axis-1.4 conf/axis-1.4/WEB-INF doc lib/misc src/main/java/org/perfsonar/service/measurementArchive/sqlType src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch src/main/java/org/perfsonar/service/measurementArchive/sqlType/store


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r3383 - in branches/GEANT2_JAVA-SQL-MA-STABLE: . ant conf conf/axis-1.4 conf/axis-1.4/WEB-INF doc lib/misc src/main/java/org/perfsonar/service/measurementArchive/sqlType src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch src/main/java/org/perfsonar/service/measurementArchive/sqlType/store
  • Date: Thu, 21 Feb 2008 08:44:32 -0500
Author: roman
Date: 2008-02-21 08:44:32 -0500 (Thu, 21 Feb 2008)
New Revision: 3383

Added:
branches/GEANT2_JAVA-SQL-MA-STABLE/conf/axis-1.4/WEB-INF/server-config.wsdd
branches/GEANT2_JAVA-SQL-MA-STABLE/conf/axis-1.4/default.css
branches/GEANT2_JAVA-SQL-MA-STABLE/conf/axis-1.4/main.css
branches/GEANT2_JAVA-SQL-MA-STABLE/conf/axis-1.4/partners.gif
branches/GEANT2_JAVA-SQL-MA-STABLE/conf/axis-1.4/perfsonar_logo.gif
branches/GEANT2_JAVA-SQL-MA-STABLE/conf/axis-1.4/sqlma_admin_script.js

branches/GEANT2_JAVA-SQL-MA-STABLE/conf/ibatis-SqlMapConfig-clmp-bwctl.template.xml

branches/GEANT2_JAVA-SQL-MA-STABLE/conf/ibatis-SqlMapConfig-clmp-owamp.template.xml

branches/GEANT2_JAVA-SQL-MA-STABLE/conf/ibatis-SqlMapConfig-clmp-ping.template.xml
branches/GEANT2_JAVA-SQL-MA-STABLE/conf/ibatis-clmp-bwctl.xml
branches/GEANT2_JAVA-SQL-MA-STABLE/conf/ibatis-clmp-ping.xml
branches/GEANT2_JAVA-SQL-MA-STABLE/conf/service.properties.template-2
branches/GEANT2_JAVA-SQL-MA-STABLE/conf/servlet.properties
branches/GEANT2_JAVA-SQL-MA-STABLE/conf/wizard.properties
branches/GEANT2_JAVA-SQL-MA-STABLE/conf/wizardproperties.dtd
branches/GEANT2_JAVA-SQL-MA-STABLE/doc/Functional_Testing_Specification.doc

branches/GEANT2_JAVA-SQL-MA-STABLE/lib/misc/perfsonar-base-ant-1.0.20080204.jar

branches/GEANT2_JAVA-SQL-MA-STABLE/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/BwctlResponseGenerator.java

branches/GEANT2_JAVA-SQL-MA-STABLE/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/PingResponseGenerator.java

branches/GEANT2_JAVA-SQL-MA-STABLE/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/BwctlStoreRequestProcess.java

branches/GEANT2_JAVA-SQL-MA-STABLE/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/PingStoreRequestProcess.java
Removed:
branches/GEANT2_JAVA-SQL-MA-STABLE/conf/ibatis-SqlMapConfig-clmp-owamp.xml
Modified:
branches/GEANT2_JAVA-SQL-MA-STABLE/
branches/GEANT2_JAVA-SQL-MA-STABLE/ant/axis-deploy-targets.xml
branches/GEANT2_JAVA-SQL-MA-STABLE/ant/const.properties.template
branches/GEANT2_JAVA-SQL-MA-STABLE/ant/libs-download-targets.xml
branches/GEANT2_JAVA-SQL-MA-STABLE/conf/axis-1.4/WEB-INF/web.xml
branches/GEANT2_JAVA-SQL-MA-STABLE/conf/axis-1.4/index.html
branches/GEANT2_JAVA-SQL-MA-STABLE/conf/eventType-map.xml
branches/GEANT2_JAVA-SQL-MA-STABLE/conf/mysql-sqlma-dbremove.sql
branches/GEANT2_JAVA-SQL-MA-STABLE/conf/mysql-sqlma-dbsetup.sql
branches/GEANT2_JAVA-SQL-MA-STABLE/conf/service.properties.template
branches/GEANT2_JAVA-SQL-MA-STABLE/doc/ChangeLog.txt

branches/GEANT2_JAVA-SQL-MA-STABLE/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLTypeMAServiceEngine.java

branches/GEANT2_JAVA-SQL-MA-STABLE/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/OwampResponseGenerator.java

branches/GEANT2_JAVA-SQL-MA-STABLE/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/OwampStoreRequestProcess.java
Log:
updated to include recent changes in the trunk




Property changes on: branches/GEANT2_JAVA-SQL-MA-STABLE
___________________________________________________________________
Name: svn:ignore
+ .project


Modified: branches/GEANT2_JAVA-SQL-MA-STABLE/ant/axis-deploy-targets.xml
===================================================================
--- branches/GEANT2_JAVA-SQL-MA-STABLE/ant/axis-deploy-targets.xml
2008-02-21 13:20:31 UTC (rev 3382)
+++ branches/GEANT2_JAVA-SQL-MA-STABLE/ant/axis-deploy-targets.xml
2008-02-21 13:44:32 UTC (rev 3383)
@@ -45,8 +45,9 @@
<target name="copy-dep-service-jars"
depends="copy-dep-base-service-jars">

- <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20071016/perfsonar-base-1.0.20071016.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-rrd-ma/2.3.20071009/perfsonar-rrd-ma-2.3.20071009.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080207/perfsonar-base-1.0.20080207.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.6b/perfsonar-web-admin-0.6b.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-rrd-ma/3.0rc2/perfsonar-rrd-ma-3.0rc2.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20071008/nmwg-1.0.20071008.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"/>
@@ -219,6 +220,118 @@


<!--
===================================================================================
-->
+ <!-- targets for web admin installation stuff -->
+
+ <!-- it is assumed that the installation location is /home/perfsonar
directory (user) -->
+
+
+ <property name="tmpdir" value="tmp" />
+
+ <target name="webapp-directory-prepare"
+ xmlns:psbase="psbase:/base.perfsonar.org">
+
+ <delete dir="${tmpdir}"/>
+ <delete dir="${tmpdir}-webapps"/>
+ <mkdir dir="${tmpdir}"/>
+
+
+ <copy file="${basedir}/conf/service.properties.template-2"
tofile="${basedir}/conf/service.properties"/>
+ <copy file="${basedir}/conf/components.properties.template"
tofile="${basedir}/conf/components.properties"/>
+ <copy file="${basedir}/conf/log4j.properties.template"
tofile="${basedir}/conf/log4j.properties"/>
+
+ <copy file="${basedir}/${build}/${jarfilename}-${version}.jar"
todir="${tmpdir}/WEB-INF/lib"/>
+
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080207/perfsonar-base-1.0.20080207.jar"
todir="${tmpdir}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.6b/perfsonar-web-admin-0.6b.jar"
todir="${tmpdir}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-rrd-ma/3.0rc2/perfsonar-rrd-ma-3.0rc2.jar"
todir="${tmpdir}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20071008/nmwg-1.0.20071008.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
file="${basedir}/lib/repository/com/ibatis/ibatis-sqlmap/2.1.7.597/ibatis-sqlmap-2.1.7.597.jar"
todir="${tmpdir}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/mysql/mysql-connector-java/5.0.3/mysql-connector-java-5.0.3.jar"
todir="${tmpdir}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/postgresql/postgresql/8.1-407.jdbc3/postgresql-8.1-407.jdbc3.jar"
todir="${tmpdir}/WEB-INF/lib"/>
+
+ <copy todir="${tmpdir}/WEB-INF/classes">
+ <fileset dir="${basedir}/conf">
+ <include name="ibatis-*.xml"/>
+ </fileset>
+ </copy>
+
+ <copy file="${basedir}/conf/eventType-map.xml"
todir="${tmpdir}/WEB-INF/classes/perfsonar/conf"/>
+ <copy file="${basedir}/conf/eventType-rules.xml"
todir="${tmpdir}/WEB-INF/classes/perfsonar/conf"/>
+
+
+ <property name="service.ma.conf_file"
value="${basedir}/conf/sql-database_TEST.xml" />
+ <copy file="${service.ma.conf_file}"
todir="${tmpdir}/WEB-INF/classes/perfsonar/conf"/>
+
+ <copy file="${basedir}/conf/wsdd/${wsdd.file.deploy}"
todir="${tmpdir}/wsdd"/>
+ <copy file="${basedir}/conf/wsdd/${wsdd.file.undeploy}"
todir="${tmpdir}/wsdd"/>
+
+ <copy todir="${tmpdir}/WEB-INF/samples">
+ <fileset dir="${basedir}/samples"/>
+ </copy>
+
+ <copy todir="${tmpdir}/WEB-INF/doc">
+ <fileset dir="${basedir}/doc"/>
+ </copy>
+
+
+ <psbase:copy-dep-base-service-jars dest-jars-path="${tmpdir}"/>
+ <psbase:copy-axis-config dest-conf-path="${tmpdir}"/>
+
+
+ <copy file="${basedir}/conf/axis-1.4/WEB-INF/server-config.wsdd"
todir="${tmpdir}/WEB-INF"/>
+ <copy file="${basedir}/conf/axis-1.4/sqlma_admin_script.js"
todir="${tmpdir}" />
+
+ <replace
file="${tmpdir}/WEB-INF/classes/perfsonar/conf/wizard.properties"
+ token="__BASEPATH__"
+
value="/home/perfsonar/webapps/${service.name}-${version}/WEB-INF" />
+
+ <replace file="${tmpdir}/WEB-INF/classes/perfsonar/conf/log4j.properties"
+ token="_LOGPATH_"
+
value="/home/perfsonar/webapps/${service.name}-${version}/WEB-INF/logs"/>
+
+ <echo file="${tmpdir}/WEB-INF/classes/perfsonar/conf/service.properties"
+
message="service.sax_parser.config=/home/perfsonar/webapps/${service.name}-${version}/WEB-INF/classes/perfsonar/conf/objects.config${line.separator}"
+ append="true" />
+
+ <echo file="${tmpdir}/WEB-INF/classes/perfsonar/conf/service.properties"
+
message="service.ma.conf_file=/home/perfsonar/webapps/${service.name}-${version}/WEB-INF/classes/perfsonar/conf/rrd-database_TEST.xml${line.separator}"
+ append="true" />
+
+ <echo file="${tmpdir}/WEB-INF/classes/perfsonar/conf/service.properties"
+
message="service.log.log4j.config=/home/perfsonar/webapps/${service.name}-${version}/WEB-INF/classes/perfsonar/conf/log4j.properties"
+ append="true" />
+
+ <mkdir dir="${tmpdir}/WEB-INF/logs"/>
+
+ </target>
+
+
+ <target name="war-create"
+ depends="webapp-directory-prepare">
+
+ <zip destfile="${service.name}-${version}.war"
+ basedir="${tmpdir}/"
+ excludes=".svn/**" />
+
+ <delete dir="${tmpdir}"/>
+
+ </target>
+
+
+ <target name="webapp-create"
+ xmlns:psbase="psbase:/base.perfsonar.org"
+ depends="webapp-directory-prepare">
+
+ <move todir="${tmpdir}-webapps/webapps/${service.name}-${version}">
+ <fileset dir="${tmpdir}"/>
+ </move>
+
+ </target>
+
+
+ <!--
===================================================================================
-->
<!-- main targets -->



Modified: branches/GEANT2_JAVA-SQL-MA-STABLE/ant/const.properties.template
===================================================================
--- branches/GEANT2_JAVA-SQL-MA-STABLE/ant/const.properties.template
2008-02-21 13:20:31 UTC (rev 3382)
+++ branches/GEANT2_JAVA-SQL-MA-STABLE/ant/const.properties.template
2008-02-21 13:44:32 UTC (rev 3383)
@@ -21,7 +21,7 @@
wsdd.webservice.name=MeasurementArchiveService

antcontrib.jar=${basedir}/lib/misc/ant-contrib-1.0b3.jar
-antpsbase.jar=${basedir}/lib/misc/perfsonar-base-ant-1.0.20071008.jar
+antpsbase.jar=${basedir}/lib/misc/perfsonar-base-ant-1.0.20080204.jar

api.location=doc/api
api.title=perfSONAR

Modified: branches/GEANT2_JAVA-SQL-MA-STABLE/ant/libs-download-targets.xml
===================================================================
--- branches/GEANT2_JAVA-SQL-MA-STABLE/ant/libs-download-targets.xml
2008-02-21 13:20:31 UTC (rev 3382)
+++ branches/GEANT2_JAVA-SQL-MA-STABLE/ant/libs-download-targets.xml
2008-02-21 13:44:32 UTC (rev 3383)
@@ -54,8 +54,9 @@

<artifact:dependencies>

- <dependency groupId="perfsonar" artifactId="perfsonar-base"
version="1.0.20071016"/>
- <dependency groupId="perfsonar" artifactId="perfsonar-rrd-ma"
version="2.3.20071009"/>
+ <dependency groupId="perfsonar" artifactId="perfsonar-base"
version="1.0.20080207"/>
+ <dependency groupId="perfsonar" artifactId="perfsonar-web-admin"
version="0.6b"/>
+ <dependency groupId="perfsonar" artifactId="perfsonar-rrd-ma"
version="3.0rc2"/>
<dependency groupId="nmwg" artifactId="nmwg"
version="1.0.20071008"/>

<dependency groupId="rrdjtool" artifactId="rrdjtool"
version="1.0"/>

Copied:
branches/GEANT2_JAVA-SQL-MA-STABLE/conf/axis-1.4/WEB-INF/server-config.wsdd
(from rev 3382,
trunk/geant2_java-sql-ma/conf/axis-1.4/WEB-INF/server-config.wsdd)

Modified: branches/GEANT2_JAVA-SQL-MA-STABLE/conf/axis-1.4/WEB-INF/web.xml
===================================================================
--- branches/GEANT2_JAVA-SQL-MA-STABLE/conf/axis-1.4/WEB-INF/web.xml
2008-02-21 13:20:31 UTC (rev 3382)
+++ branches/GEANT2_JAVA-SQL-MA-STABLE/conf/axis-1.4/WEB-INF/web.xml
2008-02-21 13:44:32 UTC (rev 3383)
@@ -44,7 +44,91 @@
<load-on-startup>100</load-on-startup>
</servlet>

+
+
+ <!-- pS extension -->
+ <!-- begin -->
+
+ <servlet>
+ <servlet-name>
+ ServiceAdmin
+ </servlet-name>
+ <servlet-class>
+ perfSONARWebAdmin.admin.service.Admin
+ </servlet-class>
+ </servlet>
+
<servlet-mapping>
+ <servlet-name>
+ ServiceAdmin
+ </servlet-name>
+ <url-pattern>
+ /ServiceAdmin
+ </url-pattern>
+ </servlet-mapping>
+
+
+ <servlet>
+ <servlet-name>
+ eXistAdmin
+ </servlet-name>
+ <servlet-class>
+ perfSONARWebAdmin.admin.exist.eXistAdmin
+ </servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>
+ eXistAdmin
+ </servlet-name>
+ <url-pattern>
+ /eXistAdmin
+ </url-pattern>
+ </servlet-mapping>
+
+
+ <servlet>
+ <servlet-name>
+ Wizard
+ </servlet-name>
+ <servlet-class>
+ perfSONARWebAdmin.admin.wizard.Wizard
+ </servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>
+ Wizard
+ </servlet-name>
+ <url-pattern>
+ /Wizard
+ </url-pattern>
+ </servlet-mapping>
+
+
+ <servlet>
+ <servlet-name>
+ SQLMAdmin
+ </servlet-name>
+ <servlet-class>
+ perfSONARWebAdmin.admin.sqlma.SQLMAdmin
+ </servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>
+ SQLMAdmin
+ </servlet-name>
+ <url-pattern>
+ /SQLMAdmin
+ </url-pattern>
+ </servlet-mapping>
+
+ <!-- end -->
+ <!-- pS extension -->
+
+
+ <servlet-mapping>
<servlet-name>AxisServlet</servlet-name>
<url-pattern>/servlet/AxisServlet</url-pattern>
</servlet-mapping>
@@ -84,16 +168,16 @@
<extension>wsdl</extension>
<mime-type>text/xml</mime-type>
</mime-mapping>
-

+
<mime-mapping>
<extension>xsd</extension>
<mime-type>text/xml</mime-type>
</mime-mapping>

<welcome-file-list id="WelcomeFileList">
+ <welcome-file>index.html</welcome-file>
<welcome-file>index.jsp</welcome-file>
- <welcome-file>index.html</welcome-file>
<welcome-file>index.jws</welcome-file>
</welcome-file-list>


Copied: branches/GEANT2_JAVA-SQL-MA-STABLE/conf/axis-1.4/default.css (from
rev 3382, trunk/geant2_java-sql-ma/conf/axis-1.4/default.css)

Modified: branches/GEANT2_JAVA-SQL-MA-STABLE/conf/axis-1.4/index.html
===================================================================
--- branches/GEANT2_JAVA-SQL-MA-STABLE/conf/axis-1.4/index.html 2008-02-21
13:20:31 UTC (rev 3382)
+++ branches/GEANT2_JAVA-SQL-MA-STABLE/conf/axis-1.4/index.html 2008-02-21
13:44:32 UTC (rev 3383)
@@ -1,21 +1,81 @@
-<html>
-
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <meta http-equiv="Refresh" content="5;url=index.jsp">
- <title>Apache-Axis</title>
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<h1 align="center">Apache-AXIS</h1>
-
-<blockquote>
- We've moved to an internationalized <a href="index.jsp">top page</a>. The
new URL should be automatically loaded after 5 seconds.<br>
-If you want to visit the new site immediately, please click the above link.
-</blockquote>
-
-<hr>
-Copyright &copy 2005 The Apache Software Foundation. All rights reserved.
-</body>
-</html>
+<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"><style type="text/css">
+<!--
+body,td,th {
+ font-family: arial;
+}
+a:hover {
+ color: #000000;
+}
+-->
+</style></head>
+ <body>
+<div class="adminPanel" >
+
+<div class="banner">
+<table border="0" align="left" cellpadding="0" cellspacing="0">
+<tr>
+ <td><img src="perfsonar_logo.gif" alt="perfSONAR" width="192" height="94"
border="0" align="right"></td>
+</tr>
+</table>
+
+</div>
+
+<div class="mainWindow" >
+
+<div class="sidebar" >
+<table border="0" cellpadding="0" cellspacing="0">
+<tr >
+<th>Administration</th>
+</tr>
+<tr>
+ <td><p><a href="Wizard" target="main" class="navtex" >Service</a></p>
+ <p><a href="Wizard" target="main" class="navtex" >Configuration</a></p>
+ <p><a href="Wizard" target="main" class="navtex" >Wizard</a></p></td>
+</tr>
+<tr>
+ <td><p><a href="ServiceAdmin?serviceProperties" target="main"
class="navtex" >Service</a></p>
+ <p><a href="ServiceAdmin?serviceProperties" target="main" class="navtex"
>configuration</a></p></td>
+</tr>
+<tr>
+ <td>
+ <p><a href="ServiceAdmin?loggingProperties" target="main" class="navtex"
>logging</a></p>
+ <p><a href="ServiceAdmin?loggingProperties" target="main" class="navtex"
>configuration</a>
+ </p>
+ </p></td>
+</tr>
+<tr><td><p><a href="eXistAdmin" target="main" class="navtex" >eXist
Database</a></p>
+ <p><a href="eXistAdmin" target="main" class="navtex"
>Administration</a></p></td>
+</tr>
+<tr><td><p><a href="SQLMAdmin" target="main" class="navtex" >iBatis File
Configuration</a></p></td>
+</tr>
+</table>
+<a href="http://www.perfsonar.net/partners.html";></a> <br>
+<img src="partners.gif" alt="perfSONAR project partners" border="0"/>
</a></div>
+
+<div class="centerWindow" >
+ <object data="http://www.perfsonar.net"; type="text/html" name="main"
width="101%" height="106%" class="main" >
+ <p>Sorry for the inconvenience we are having connectiong to the main
page...</p>
+ </object>
+</div>
+
+
+</div>
+
+<div class="footer" >PERFormance Service-Oriented Network monitoring
ARchitecture &nbsp;</div>
+
+
+
+
+
+</div>
+
+
+ </body>
+</html>
+
+

Copied: branches/GEANT2_JAVA-SQL-MA-STABLE/conf/axis-1.4/main.css (from rev
3382, trunk/geant2_java-sql-ma/conf/axis-1.4/main.css)

Copied: branches/GEANT2_JAVA-SQL-MA-STABLE/conf/axis-1.4/partners.gif (from
rev 3382, trunk/geant2_java-sql-ma/conf/axis-1.4/partners.gif)

Copied: branches/GEANT2_JAVA-SQL-MA-STABLE/conf/axis-1.4/perfsonar_logo.gif
(from rev 3382, trunk/geant2_java-sql-ma/conf/axis-1.4/perfsonar_logo.gif)

Copied:
branches/GEANT2_JAVA-SQL-MA-STABLE/conf/axis-1.4/sqlma_admin_script.js (from
rev 3382, trunk/geant2_java-sql-ma/conf/axis-1.4/sqlma_admin_script.js)

Modified: branches/GEANT2_JAVA-SQL-MA-STABLE/conf/eventType-map.xml
===================================================================
--- branches/GEANT2_JAVA-SQL-MA-STABLE/conf/eventType-map.xml 2008-02-21
13:20:31 UTC (rev 3382)
+++ branches/GEANT2_JAVA-SQL-MA-STABLE/conf/eventType-map.xml 2008-02-21
13:44:32 UTC (rev 3383)
@@ -43,10 +43,24 @@
</eventType>

<eventType>
- <name>owamp</name>
+ <name>http://ggf.org/ns/nmwg/tools/owamp/2.0</name>

<metadataQueryGenerator>org.perfsonar.service.measurementArchive.metadataConfig.queryGenerator.OwampQueryGenerator</metadataQueryGenerator>

<responseGenerator>org.perfsonar.service.measurementArchive.sqlType.fetch.OwampResponseGenerator</responseGenerator>

<storeRequestProcess>org.perfsonar.service.measurementArchive.sqlType.store.OwampStoreRequestProcess</storeRequestProcess>
</eventType>

+ <eventType>
+ <name>http://ggf.org/ns/nmwg/tools/bwctl/2.0</name>
+
<metadataQueryGenerator>org.perfsonar.service.measurementArchive.metadataConfig.queryGenerator.BwctlQueryGenerator</metadataQueryGenerator>
+
<responseGenerator>org.perfsonar.service.measurementArchive.sqlType.fetch.BwctlResponseGenerator</responseGenerator>
+
<storeRequestProcess>org.perfsonar.service.measurementArchive.sqlType.store.BwctlStoreRequestProcess</storeRequestProcess>
+ </eventType>
+
+ <eventType>
+ <name>http://ggf.org/ns/nmwg/tools/ping/2.0</name>
+
<metadataQueryGenerator>org.perfsonar.service.measurementArchive.metadataConfig.queryGenerator.PingQueryGenerator</metadataQueryGenerator>
+
<responseGenerator>org.perfsonar.service.measurementArchive.sqlType.fetch.PingResponseGenerator</responseGenerator>
+
<storeRequestProcess>org.perfsonar.service.measurementArchive.sqlType.store.PingStoreRequestProcess</storeRequestProcess>
+ </eventType>
+
</eventType-config>

Copied:
branches/GEANT2_JAVA-SQL-MA-STABLE/conf/ibatis-SqlMapConfig-clmp-bwctl.template.xml
(from rev 3382,
trunk/geant2_java-sql-ma/conf/ibatis-SqlMapConfig-clmp-bwctl.template.xml)

Copied:
branches/GEANT2_JAVA-SQL-MA-STABLE/conf/ibatis-SqlMapConfig-clmp-owamp.template.xml
(from rev 3382,
trunk/geant2_java-sql-ma/conf/ibatis-SqlMapConfig-clmp-owamp.template.xml)

Deleted:
branches/GEANT2_JAVA-SQL-MA-STABLE/conf/ibatis-SqlMapConfig-clmp-owamp.xml

Copied:
branches/GEANT2_JAVA-SQL-MA-STABLE/conf/ibatis-SqlMapConfig-clmp-ping.template.xml
(from rev 3382,
trunk/geant2_java-sql-ma/conf/ibatis-SqlMapConfig-clmp-ping.template.xml)

Copied: branches/GEANT2_JAVA-SQL-MA-STABLE/conf/ibatis-clmp-bwctl.xml (from
rev 3382, trunk/geant2_java-sql-ma/conf/ibatis-clmp-bwctl.xml)

Copied: branches/GEANT2_JAVA-SQL-MA-STABLE/conf/ibatis-clmp-ping.xml (from
rev 3382, trunk/geant2_java-sql-ma/conf/ibatis-clmp-ping.xml)

Modified: branches/GEANT2_JAVA-SQL-MA-STABLE/conf/mysql-sqlma-dbremove.sql
===================================================================
--- branches/GEANT2_JAVA-SQL-MA-STABLE/conf/mysql-sqlma-dbremove.sql
2008-02-21 13:20:31 UTC (rev 3382)
+++ branches/GEANT2_JAVA-SQL-MA-STABLE/conf/mysql-sqlma-dbremove.sql
2008-02-21 13:44:32 UTC (rev 3383)
@@ -37,10 +37,18 @@
interdomain_link;


-DROP DATABASE
- perfsonar_ma;
+#DROP TABLE
+# clmp_owamp;


+#DROP TABLE
+# clmp_bwctl;
+
+
+#DROP TABLE
+# clmp_ping;
+
+
DROP USER
perfsonar_ma;


Modified: branches/GEANT2_JAVA-SQL-MA-STABLE/conf/mysql-sqlma-dbsetup.sql
===================================================================
--- branches/GEANT2_JAVA-SQL-MA-STABLE/conf/mysql-sqlma-dbsetup.sql
2008-02-21 13:20:31 UTC (rev 3382)
+++ branches/GEANT2_JAVA-SQL-MA-STABLE/conf/mysql-sqlma-dbsetup.sql
2008-02-21 13:44:32 UTC (rev 3383)
@@ -82,7 +82,7 @@
#
#CREATE TABLE
# clmp_owamp
-# (metadataId VARCHAR(30) NOT NULL,
+# (metadataId VARCHAR(255) NOT NULL,
# receiveSynchronized INT(1) NULL DEFAULT 0,
# receiveTime VARCHAR(21) NOT NULL,
# receiveTimeError FLOAT NULL DEFAULT 0,
@@ -97,6 +97,50 @@
#
############################################################

+############### Create table for BWCTL data ################
+#CREATE TABLE `clmp_bwctl` (
+# `metadataId` varchar(255) NOT NULL,
+# `intervalEnd` varchar(30) default NULL,
+# `intervalStart` varchar(30) default NULL,
+# `intervalUnit` varchar(30) default NULL,
+# `numBytes` varchar(30) default NULL,
+# `numBytesUnits` varchar(30) default NULL,
+# `tcpAdapterType` varchar(30) default NULL,
+# `tcpMSSSize` varchar(30) default NULL,
+# `timeType` varchar(30) default NULL,
+# `timeValue` mediumtext NOT NULL,
+# `value` mediumtext NOT NULL,
+# `valueUnits` varchar(30) default NULL,
+# `tcpMSSUnit` varchar(30) default NULL,
+# `tcpMTUSize` varchar(30) default NULL,
+# `tcpMTUUnit` varchar(30) default NULL,
+# `tcpWindowSize` varchar(30) default NULL,
+# `tcpWindowUnit` varchar(30) default NULL,
+# `udpBufferSize` varchar(30) default NULL,
+# `udpBufferUnit` varchar(30) default NULL,
+# `udpJitter` varchar(30) default NULL,
+# `udpJitterUnit` varchar(30) default NULL,
+# `udpPacketLoss` varchar(30) default NULL,
+# `udpPacketLossPercentage` varchar(30) default NULL,
+# `udpPacketSent` varchar(30) default NULL,
+# `ts` timestamp NOT NULL default CURRENT_TIMESTAMP);
+###########################################################
+
+############### Create table for ping data ################
+#CREATE TABLE
+# clmp_ping
+# (metadataId VARCHAR(255) NOT NULL,
+# seqNum INT UNSIGNED NULL DEFAULT 0,
+# value FLOAT (16,4) NOT NULL,
+# valueUnits VARCHAR(4) NULL,
+# ttl TINYINT UNSIGNED NULL DEFAULT 0,
+# numBytes INT NULL DEFAULT 0,
+# numBytesUnits VARCHAR(10) NULL,
+# timeValue LONG NOT NULL,
+# timeType VARCHAR(4) NULL,
+# ts TIMESTAMP DEFAULT NOW());
+############################################################
+
# insert statements for testing perfsonar_utilization table

INSERT

Modified: branches/GEANT2_JAVA-SQL-MA-STABLE/conf/service.properties.template
===================================================================
--- branches/GEANT2_JAVA-SQL-MA-STABLE/conf/service.properties.template
2008-02-21 13:20:31 UTC (rev 3382)
+++ branches/GEANT2_JAVA-SQL-MA-STABLE/conf/service.properties.template
2008-02-21 13:44:32 UTC (rev 3383)
@@ -2,7 +2,7 @@
service.r.type=ma


service.ma.class_name=org.perfsonar.service.measurementArchive.sqlType.SQLTypeMAServiceEngine
-service.ma.message_types=MetadataKeyRequest,SetupDataRequest,MeasurementArchiveStoreRequest,EchoRequest,LookupInfoRequest
+service.ma.message_types=MetadataKeyRequest,SetupDataRequest,MeasurementArchiveStoreRequest,MeasurementArchiveStoreKeyRequest,EchoRequest,LookupInfoRequest


service.ma.base_chaining_mergers=org.perfsonar.service.measurementArchive.rrdType.NMWGInterfaceBaseChaining


Copied: branches/GEANT2_JAVA-SQL-MA-STABLE/conf/service.properties.template-2
(from rev 3382, trunk/geant2_java-sql-ma/conf/service.properties.template-2)

Copied: branches/GEANT2_JAVA-SQL-MA-STABLE/conf/servlet.properties (from rev
3382, trunk/geant2_java-sql-ma/conf/servlet.properties)

Copied: branches/GEANT2_JAVA-SQL-MA-STABLE/conf/wizard.properties (from rev
3382, trunk/geant2_java-sql-ma/conf/wizard.properties)

Copied: branches/GEANT2_JAVA-SQL-MA-STABLE/conf/wizardproperties.dtd (from
rev 3382, trunk/geant2_java-sql-ma/conf/wizardproperties.dtd)

Modified: branches/GEANT2_JAVA-SQL-MA-STABLE/doc/ChangeLog.txt
===================================================================
--- branches/GEANT2_JAVA-SQL-MA-STABLE/doc/ChangeLog.txt 2008-02-21
13:20:31 UTC (rev 3382)
+++ branches/GEANT2_JAVA-SQL-MA-STABLE/doc/ChangeLog.txt 2008-02-21
13:44:32 UTC (rev 3383)
@@ -1,12 +1,15 @@
Relational Database MA


-2007-12-21 Version 2.0
+2008-02-18 Version 2.0

- New namespace (netutil) of datum element in the response containing
utilization value is used
- supportedEventTypes parameter in metadata element (in metadata
cofiguration file) replaced with eventType element
(the parameter is still supported). Metadata elements with eventType
"Path.Status" still prefer the parameter.
+- Web administration (set of servlets) added.
+- RPM is used as the installation package.

+
2007-11-08 Version 1.3

- New: installation script asks for eXist context name instead of static
default

Copied:
branches/GEANT2_JAVA-SQL-MA-STABLE/doc/Functional_Testing_Specification.doc
(from rev 3382,
trunk/geant2_java-sql-ma/doc/Functional_Testing_Specification.doc)

Copied:
branches/GEANT2_JAVA-SQL-MA-STABLE/lib/misc/perfsonar-base-ant-1.0.20080204.jar
(from rev 3382,
trunk/geant2_java-sql-ma/lib/misc/perfsonar-base-ant-1.0.20080204.jar)

Modified:
branches/GEANT2_JAVA-SQL-MA-STABLE/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLTypeMAServiceEngine.java
===================================================================
---
branches/GEANT2_JAVA-SQL-MA-STABLE/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLTypeMAServiceEngine.java
2008-02-21 13:20:31 UTC (rev 3382)
+++
branches/GEANT2_JAVA-SQL-MA-STABLE/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLTypeMAServiceEngine.java
2008-02-21 13:44:32 UTC (rev 3383)
@@ -20,9 +20,11 @@

import org.perfsonar.base.exceptions.PerfSONARException;

+import org.perfsonar.service.base.util.ResultCodesUtil;
import
org.perfsonar.service.measurementArchive.metadataConfig.MetadataConfigurationStorageManager;
import
org.perfsonar.service.measurementArchive.rrdType.RRDTypeMAServiceEngine;

+
/**
* Class implementing the Measurement Archive Service Engine which deals
with
* SQL database
@@ -190,7 +192,23 @@

}

+ public Message storeKey(Message request)
+ throws PerfSONARException {

+// logger.debug("SQLTypeMAServiceEngine.storeKey: Request:
"+request.toString());
+
+ metadataConfig.store(request);
+
+ Message response = new Message();
+
+ PerfSONARException pex = new PerfSONARException("success.ma.write",
+ "Key has been stored");
+
+ response = ResultCodesUtil.createResultCodeMetadata(response, pex);
+
+ return response;
+ }
+
protected Key getStoreKey(Metadata metadata)
throws PerfSONARException {


Copied:
branches/GEANT2_JAVA-SQL-MA-STABLE/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/BwctlResponseGenerator.java
(from rev 3382,
trunk/geant2_java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/BwctlResponseGenerator.java)

Modified:
branches/GEANT2_JAVA-SQL-MA-STABLE/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/OwampResponseGenerator.java
===================================================================
---
branches/GEANT2_JAVA-SQL-MA-STABLE/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/OwampResponseGenerator.java
2008-02-21 13:20:31 UTC (rev 3382)
+++
branches/GEANT2_JAVA-SQL-MA-STABLE/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/OwampResponseGenerator.java
2008-02-21 13:44:32 UTC (rev 3383)
@@ -2,13 +2,12 @@


import java.util.Collection;
+import java.util.Date;
import java.util.List;
import java.util.Map;
-import java.util.Date;

import org.ggf.ns.nmwg.base.v2_0.Data;
import org.ggf.ns.nmwg.tools.owamp.v2_0.Datum;
-
import org.perfsonar.base.exceptions.PerfSONARException;

/**
@@ -82,6 +81,9 @@
else if (column.equals("timeType"))
datum.setTimeType(strValue);
else if (column.equals("timeValue"))
datum.setTimeValue(strValue);

+ //logger.debug("SQLStorageManager.fetch: "
+ // + "column: " + column + ", value: " + strValue );
+
}

}

Copied:
branches/GEANT2_JAVA-SQL-MA-STABLE/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/PingResponseGenerator.java
(from rev 3382,
trunk/geant2_java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/PingResponseGenerator.java)

Copied:
branches/GEANT2_JAVA-SQL-MA-STABLE/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/BwctlStoreRequestProcess.java
(from rev 3382,
trunk/geant2_java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/BwctlStoreRequestProcess.java)

Modified:
branches/GEANT2_JAVA-SQL-MA-STABLE/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/OwampStoreRequestProcess.java
===================================================================
---
branches/GEANT2_JAVA-SQL-MA-STABLE/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/OwampStoreRequestProcess.java
2008-02-21 13:20:31 UTC (rev 3382)
+++
branches/GEANT2_JAVA-SQL-MA-STABLE/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/OwampStoreRequestProcess.java
2008-02-21 13:44:32 UTC (rev 3383)
@@ -9,7 +9,6 @@

import org.ggf.ns.nmwg.base.v2_0.Element;
import org.ggf.ns.nmwg.tools.owamp.v2_0.Datum;
-
import org.perfsonar.base.exceptions.PerfSONARException;

/**

Copied:
branches/GEANT2_JAVA-SQL-MA-STABLE/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/PingStoreRequestProcess.java
(from rev 3382,
trunk/geant2_java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/PingStoreRequestProcess.java)


  • perfsonar: r3383 - in branches/GEANT2_JAVA-SQL-MA-STABLE: . ant conf conf/axis-1.4 conf/axis-1.4/WEB-INF doc lib/misc src/main/java/org/perfsonar/service/measurementArchive/sqlType src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch src/main/java/org/perfsonar/service/measurementArchive/sqlType/store, svnlog, 02/21/2008

Archive powered by MHonArc 2.6.16.

Top of Page