perfsonar-dev - perfsonar: r4858 - in trunk/rnp_java-cl-mp: . ant conf conf/axis-1.4 conf/axis-1.4/graphics conf/scripts doc doc/schema packaging/deb packaging/rpm src/main/java/org/perfsonar/service/measurementPoint/commandLine src/main/java/org/perfsonar/service/measurementPoint/commandLine/tools
Subject: perfsonar development work
List archive
perfsonar: r4858 - in trunk/rnp_java-cl-mp: . ant conf conf/axis-1.4 conf/axis-1.4/graphics conf/scripts doc doc/schema packaging/deb packaging/rpm src/main/java/org/perfsonar/service/measurementPoint/commandLine src/main/java/org/perfsonar/service/measurementPoint/commandLine/tools
Chronological Thread
- From:
- To:
- Subject: perfsonar: r4858 - in trunk/rnp_java-cl-mp: . ant conf conf/axis-1.4 conf/axis-1.4/graphics conf/scripts doc doc/schema packaging/deb packaging/rpm src/main/java/org/perfsonar/service/measurementPoint/commandLine src/main/java/org/perfsonar/service/measurementPoint/commandLine/tools
- Date: Mon, 12 Jan 2009 08:36:34 -0500
Author: fernandes
Date: 2009-01-12 08:36:33 -0500 (Mon, 12 Jan 2009)
New Revision: 4858
Added:
trunk/rnp_java-cl-mp/conf/axis-1.4/index.jsp
trunk/rnp_java-cl-mp/doc/Collaboration.txt
trunk/rnp_java-cl-mp/doc/License.txt
trunk/rnp_java-cl-mp/doc/perfSONAR-MDM-3.1_Admin_Guide_1.0.pdf
Removed:
trunk/rnp_java-cl-mp/conf/axis-1.4/Service_Admin.js
trunk/rnp_java-cl-mp/conf/axis-1.4/default.css
trunk/rnp_java-cl-mp/conf/axis-1.4/fingerprint.jsp
trunk/rnp_java-cl-mp/conf/axis-1.4/graphics/Thumbs.db
trunk/rnp_java-cl-mp/conf/axis-1.4/graphics/admin_home_target.gif
trunk/rnp_java-cl-mp/conf/axis-1.4/graphics/apply_button.gif
trunk/rnp_java-cl-mp/conf/axis-1.4/graphics/apply_button_2.gif
trunk/rnp_java-cl-mp/conf/axis-1.4/graphics/arrow_icon.gif
trunk/rnp_java-cl-mp/conf/axis-1.4/graphics/arrow_icon2.gif
trunk/rnp_java-cl-mp/conf/axis-1.4/graphics/button_1_large.gif
trunk/rnp_java-cl-mp/conf/axis-1.4/graphics/button_1_small.gif
trunk/rnp_java-cl-mp/conf/axis-1.4/graphics/button_2_large.gif
trunk/rnp_java-cl-mp/conf/axis-1.4/graphics/button_2_small.gif
trunk/rnp_java-cl-mp/conf/axis-1.4/graphics/cancel_button.gif
trunk/rnp_java-cl-mp/conf/axis-1.4/graphics/create_resource_button.gif
trunk/rnp_java-cl-mp/conf/axis-1.4/graphics/delete_red_button.gif
trunk/rnp_java-cl-mp/conf/axis-1.4/graphics/edit_button.gif
trunk/rnp_java-cl-mp/conf/axis-1.4/graphics/edit_green_button.gif
trunk/rnp_java-cl-mp/conf/axis-1.4/graphics/login_panel.gif
trunk/rnp_java-cl-mp/conf/axis-1.4/graphics/logos.gif
trunk/rnp_java-cl-mp/conf/axis-1.4/graphics/logout_button.gif
trunk/rnp_java-cl-mp/conf/axis-1.4/graphics/manage_collections_off_tab.gif
trunk/rnp_java-cl-mp/conf/axis-1.4/graphics/manage_collections_on_tab.gif
trunk/rnp_java-cl-mp/conf/axis-1.4/graphics/manage_users_off_tab.gif
trunk/rnp_java-cl-mp/conf/axis-1.4/graphics/manage_users_on_tab.gif
trunk/rnp_java-cl-mp/conf/axis-1.4/graphics/step_1_bottom.gif
trunk/rnp_java-cl-mp/conf/axis-1.4/graphics/step_1_slice.gif
trunk/rnp_java-cl-mp/conf/axis-1.4/graphics/step_1_top.gif
trunk/rnp_java-cl-mp/conf/axis-1.4/graphics/step_2_bottom.gif
trunk/rnp_java-cl-mp/conf/axis-1.4/graphics/step_2_slice.gif
trunk/rnp_java-cl-mp/conf/axis-1.4/graphics/step_2_top.gif
trunk/rnp_java-cl-mp/conf/axis-1.4/graphics/testdepl_fail.gif
trunk/rnp_java-cl-mp/conf/axis-1.4/graphics/testdepl_main.gif
trunk/rnp_java-cl-mp/conf/axis-1.4/graphics/testdepl_return.gif
trunk/rnp_java-cl-mp/conf/axis-1.4/graphics/testdepl_startbn.gif
trunk/rnp_java-cl-mp/conf/axis-1.4/graphics/testdepl_succ.gif
trunk/rnp_java-cl-mp/conf/axis-1.4/happyaxis.jsp
trunk/rnp_java-cl-mp/conf/axis-1.4/i18nLib.jsp
trunk/rnp_java-cl-mp/conf/axis-1.4/main.css
trunk/rnp_java-cl-mp/conf/axis-1.4/partners.gif
trunk/rnp_java-cl-mp/conf/axis-1.4/perfsonar.png
trunk/rnp_java-cl-mp/conf/axis-1.4/perfsonar_logo.gif
trunk/rnp_java-cl-mp/conf/axis-1.4/top_slice.gif
trunk/rnp_java-cl-mp/conf/axis-1.4/welcome.htm
trunk/rnp_java-cl-mp/conf/axis-1.4/wz_tooltip.js
trunk/rnp_java-cl-mp/conf/log4j.properties.template
trunk/rnp_java-cl-mp/conf/objects.config
Modified:
trunk/rnp_java-cl-mp/ant/axis-deploy-targets.xml
trunk/rnp_java-cl-mp/ant/libs-download-targets.xml
trunk/rnp_java-cl-mp/conf/scripts/daemonbwctl.sh
trunk/rnp_java-cl-mp/conf/scripts/daemonntp.sh
trunk/rnp_java-cl-mp/conf/scripts/daemonowamp.sh
trunk/rnp_java-cl-mp/doc/CLMP Interface Specification.doc
trunk/rnp_java-cl-mp/doc/Changelog.txt
trunk/rnp_java-cl-mp/doc/schema/owampSummaryResponse.rnc
trunk/rnp_java-cl-mp/packaging/deb/changelog
trunk/rnp_java-cl-mp/packaging/deb/control
trunk/rnp_java-cl-mp/packaging/deb/copyright
trunk/rnp_java-cl-mp/packaging/deb/postinst
trunk/rnp_java-cl-mp/packaging/deb/postrm
trunk/rnp_java-cl-mp/packaging/rpm/perfsonar-clmp.specs
trunk/rnp_java-cl-mp/pom.xml
trunk/rnp_java-cl-mp/src/main/java/org/perfsonar/service/measurementPoint/commandLine/CommandLineCronComponent.java
trunk/rnp_java-cl-mp/src/main/java/org/perfsonar/service/measurementPoint/commandLine/CommandLineMAStorageManager.java
trunk/rnp_java-cl-mp/src/main/java/org/perfsonar/service/measurementPoint/commandLine/tools/OwampSummary.java
Log:
Merging for release 3.1
CL-MP v2.1 final
With this commit:
- Cron storage fallback - if the configured SQL-MA can't be reached, CL-MP
will store results locally until one of the tests is able to store remotely.
It will then store locally saved results and delete them.
- Added ReorderingBuckets to OWAMP summary eventType
- Changed to nmwg-1.0.20090108 and perfsonar-web-admin-0.9.6b
- Because of particularities of the new eventType, CL-MP communication with
SQL-MA has been changed. It will now only work with a modified version of the
SQL-MA 3.1 release; check
http://wiki.perfsonar.net/jra1-wiki/index.php/PerfSONAR_CLMP for more
information.
Modified: trunk/rnp_java-cl-mp/ant/axis-deploy-targets.xml
===================================================================
--- trunk/rnp_java-cl-mp/ant/axis-deploy-targets.xml 2009-01-12 13:22:43
UTC (rev 4857)
+++ trunk/rnp_java-cl-mp/ant/axis-deploy-targets.xml 2009-01-12 13:36:33
UTC (rev 4858)
@@ -45,9 +45,9 @@
<target name="copy-dep-service-jars"
depends="copy-dep-base-service-jars">
- <copy
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20080916/nmwg-1.0.20080916.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20090108/nmwg-1.0.20090108.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.6b/perfsonar-web-admin-0.9.6b.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
<copy file="${basedir}/conf/eventType-map.xml"
todir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf"/>
<copy file="${basedir}/conf/selfTest-map.xml"
todir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf"/>
@@ -226,9 +226,9 @@
<copy file="${basedir}/${build}/${jarfilename}-${version}.jar"
todir="${tmpdir}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20080916/nmwg-1.0.20080916.jar"
todir="${tmpdir}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20090108/nmwg-1.0.20090108.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.6b/perfsonar-web-admin-0.9.6b.jar"
todir="${tmpdir}/WEB-INF/lib"/>
<copy file="${basedir}/conf/eventType-map.xml"
todir="${tmpdir}/WEB-INF/classes/perfsonar/conf"/>
<copy file="${basedir}/conf/selfTest-map.xml"
todir="${tmpdir}/WEB-INF/classes/perfsonar/conf"/>
Modified: trunk/rnp_java-cl-mp/ant/libs-download-targets.xml
===================================================================
--- trunk/rnp_java-cl-mp/ant/libs-download-targets.xml 2009-01-12 13:22:43
UTC (rev 4857)
+++ trunk/rnp_java-cl-mp/ant/libs-download-targets.xml 2009-01-12 13:36:33
UTC (rev 4858)
@@ -55,8 +55,8 @@
<artifact:dependencies>
<dependency groupId="perfsonar" artifactId="perfsonar-base"
version="1.0.20080902"/>
- <dependency groupId="nmwg" artifactId="nmwg"
version="1.0.20080916"/>
- <dependency groupId="perfsonar" artifactId="perfsonar-web-admin"
version="0.9.2b"/>
+ <dependency groupId="nmwg" artifactId="nmwg"
version="1.0.20090108"/>
+ <dependency groupId="perfsonar" artifactId="perfsonar-web-admin"
version="0.9.6b"/>
<localRepository refid="local.repository"/>
<remoteRepository refid="remote.repository"/>
Deleted: trunk/rnp_java-cl-mp/conf/axis-1.4/Service_Admin.js
Deleted: trunk/rnp_java-cl-mp/conf/axis-1.4/default.css
Deleted: trunk/rnp_java-cl-mp/conf/axis-1.4/fingerprint.jsp
Deleted: trunk/rnp_java-cl-mp/conf/axis-1.4/graphics/Thumbs.db
Deleted: trunk/rnp_java-cl-mp/conf/axis-1.4/graphics/admin_home_target.gif
Deleted: trunk/rnp_java-cl-mp/conf/axis-1.4/graphics/apply_button.gif
Deleted: trunk/rnp_java-cl-mp/conf/axis-1.4/graphics/apply_button_2.gif
Deleted: trunk/rnp_java-cl-mp/conf/axis-1.4/graphics/arrow_icon.gif
Deleted: trunk/rnp_java-cl-mp/conf/axis-1.4/graphics/arrow_icon2.gif
Deleted: trunk/rnp_java-cl-mp/conf/axis-1.4/graphics/button_1_large.gif
Deleted: trunk/rnp_java-cl-mp/conf/axis-1.4/graphics/button_1_small.gif
Deleted: trunk/rnp_java-cl-mp/conf/axis-1.4/graphics/button_2_large.gif
Deleted: trunk/rnp_java-cl-mp/conf/axis-1.4/graphics/button_2_small.gif
Deleted: trunk/rnp_java-cl-mp/conf/axis-1.4/graphics/cancel_button.gif
Deleted:
trunk/rnp_java-cl-mp/conf/axis-1.4/graphics/create_resource_button.gif
Deleted: trunk/rnp_java-cl-mp/conf/axis-1.4/graphics/delete_red_button.gif
Deleted: trunk/rnp_java-cl-mp/conf/axis-1.4/graphics/edit_button.gif
Deleted: trunk/rnp_java-cl-mp/conf/axis-1.4/graphics/edit_green_button.gif
Deleted: trunk/rnp_java-cl-mp/conf/axis-1.4/graphics/login_panel.gif
Deleted: trunk/rnp_java-cl-mp/conf/axis-1.4/graphics/logos.gif
Deleted: trunk/rnp_java-cl-mp/conf/axis-1.4/graphics/logout_button.gif
Deleted:
trunk/rnp_java-cl-mp/conf/axis-1.4/graphics/manage_collections_off_tab.gif
Deleted:
trunk/rnp_java-cl-mp/conf/axis-1.4/graphics/manage_collections_on_tab.gif
Deleted: trunk/rnp_java-cl-mp/conf/axis-1.4/graphics/manage_users_off_tab.gif
Deleted: trunk/rnp_java-cl-mp/conf/axis-1.4/graphics/manage_users_on_tab.gif
Deleted: trunk/rnp_java-cl-mp/conf/axis-1.4/graphics/step_1_bottom.gif
Deleted: trunk/rnp_java-cl-mp/conf/axis-1.4/graphics/step_1_slice.gif
Deleted: trunk/rnp_java-cl-mp/conf/axis-1.4/graphics/step_1_top.gif
Deleted: trunk/rnp_java-cl-mp/conf/axis-1.4/graphics/step_2_bottom.gif
Deleted: trunk/rnp_java-cl-mp/conf/axis-1.4/graphics/step_2_slice.gif
Deleted: trunk/rnp_java-cl-mp/conf/axis-1.4/graphics/step_2_top.gif
Deleted: trunk/rnp_java-cl-mp/conf/axis-1.4/graphics/testdepl_fail.gif
Deleted: trunk/rnp_java-cl-mp/conf/axis-1.4/graphics/testdepl_main.gif
Deleted: trunk/rnp_java-cl-mp/conf/axis-1.4/graphics/testdepl_return.gif
Deleted: trunk/rnp_java-cl-mp/conf/axis-1.4/graphics/testdepl_startbn.gif
Deleted: trunk/rnp_java-cl-mp/conf/axis-1.4/graphics/testdepl_succ.gif
Deleted: trunk/rnp_java-cl-mp/conf/axis-1.4/happyaxis.jsp
Deleted: trunk/rnp_java-cl-mp/conf/axis-1.4/i18nLib.jsp
Added: trunk/rnp_java-cl-mp/conf/axis-1.4/index.jsp
Deleted: trunk/rnp_java-cl-mp/conf/axis-1.4/main.css
Deleted: trunk/rnp_java-cl-mp/conf/axis-1.4/partners.gif
Deleted: trunk/rnp_java-cl-mp/conf/axis-1.4/perfsonar.png
Deleted: trunk/rnp_java-cl-mp/conf/axis-1.4/perfsonar_logo.gif
Deleted: trunk/rnp_java-cl-mp/conf/axis-1.4/top_slice.gif
Deleted: trunk/rnp_java-cl-mp/conf/axis-1.4/welcome.htm
Deleted: trunk/rnp_java-cl-mp/conf/axis-1.4/wz_tooltip.js
Deleted: trunk/rnp_java-cl-mp/conf/log4j.properties.template
Deleted: trunk/rnp_java-cl-mp/conf/objects.config
Modified: trunk/rnp_java-cl-mp/conf/scripts/daemonbwctl.sh
===================================================================
--- trunk/rnp_java-cl-mp/conf/scripts/daemonbwctl.sh 2009-01-12 13:22:43
UTC (rev 4857)
+++ trunk/rnp_java-cl-mp/conf/scripts/daemonbwctl.sh 2009-01-12 13:36:33
UTC (rev 4858)
@@ -1,9 +1,9 @@
#!/bin/sh
-RESULT=`ps aux | grep -E "[b]wctld" | tr -s ' ' | cut -d " " -f 8 | cut -f 1`
+RESULT=`ps axw -o stat,command | grep -E "[b]wctld" | cut -d " " -f 1`
if [ -n "$RESULT" ]; then
- if [ $RESULT = "T" -o $RESULT = "Z" ]; then
+ if [ "$RESULT" = "T" -o "$RESULT" = "Z" ]; then
echo "error"
echo "'bwctld' process is in either stopped or zombie state."
else
Modified: trunk/rnp_java-cl-mp/conf/scripts/daemonntp.sh
===================================================================
--- trunk/rnp_java-cl-mp/conf/scripts/daemonntp.sh 2009-01-12 13:22:43
UTC (rev 4857)
+++ trunk/rnp_java-cl-mp/conf/scripts/daemonntp.sh 2009-01-12 13:36:33
UTC (rev 4858)
@@ -1,9 +1,9 @@
#!/bin/sh
-RESULT=`ps aux | grep -E "[n]tpd" | tr -s ' ' | cut -d " " -f 8 | cut -f 1`
+RESULT=`ps axw -o stat,command | grep -E "[n]tpd" | cut -d " " -f 1`
if [ -n "$RESULT" ]; then
- if [ $RESULT = "T" -o $RESULT = "Z" ]; then
+ if [ "$RESULT" = "T" -o "$RESULT" = "Z" ]; then
echo "error"
echo "'ntpd' process is in either stopped or zombie state."
else
Modified: trunk/rnp_java-cl-mp/conf/scripts/daemonowamp.sh
===================================================================
--- trunk/rnp_java-cl-mp/conf/scripts/daemonowamp.sh 2009-01-12 13:22:43
UTC (rev 4857)
+++ trunk/rnp_java-cl-mp/conf/scripts/daemonowamp.sh 2009-01-12 13:36:33
UTC (rev 4858)
@@ -1,9 +1,9 @@
#!/bin/sh
-RESULT=`ps aux | grep -E "[o]wampd" | tr -s ' ' | cut -d " " -f 8 | cut -f 1`
+RESULT=`ps axw -o stat,command | grep -E "[o]wampd" | cut -d " " -f 1`
if [ -n "$RESULT" ]; then
- if [ $RESULT = "T" -o $RESULT = "Z" ]; then
+ if [ "$RESULT" = "T" -o "$RESULT" = "Z" ]; then
echo "error"
echo "'owampd' process is in either stopped or zombie state."
else
Modified: trunk/rnp_java-cl-mp/doc/CLMP Interface Specification.doc
===================================================================
(Binary files differ)
Modified: trunk/rnp_java-cl-mp/doc/Changelog.txt
===================================================================
--- trunk/rnp_java-cl-mp/doc/Changelog.txt 2009-01-12 13:22:43 UTC (rev
4857)
+++ trunk/rnp_java-cl-mp/doc/Changelog.txt 2009-01-12 13:36:33 UTC (rev
4858)
@@ -1,10 +1,18 @@
v2.1:
-NEW: Added a new eventType for summarized owamp measurements (-M switch),
http://ggf.org/ns/nmwg/tools/owamp/summary/2.0
-NEW: SelfTest functionality added. Works modularly - calls external scripts
defined in conf/selfTest-map.xml and expects "success" or "error" on the
first line and the reasons next.
-NEW: Log4j properties file for logging to a Syslog server added
-Change: Some classes were changed for internal self-testing
(componentsInitialization).
-Change: Using nmwg-1.0.20080916, perfsonar-base-1.0.20080902 and
perfsonar-web-admin-0.9.2b
+- New: Cron storage fallback - if the configured SQL-MA can't be reached,
CL-MP will store results locally until one of the tests is able to store
remotely. It will then store locally saved results and delete them.
+- New: Added a new eventType for summarized owamp measurements (-M switch),
http://ggf.org/ns/nmwg/tools/owamp/summary/2.0
+- New: SelfTest functionality added. Works modularly - calls external
scripts defined in conf/selfTest-map.xml and expects "success" or "error" on
the first line and the reasons next.
+- New: Log4j properties file for logging to a Syslog server added
+- New: LS Registration now uses a registration file with extra information
to register. This file is populated by a script run during initialization
(scripts/init.sh).
+- New: Service now registers the eventTypes of enabled tools on LS
+- Change: new service path /usr/lib/perfsonar/services/perfsonar-clmp/
+- Change: Some classes were changed for internal self-testing
(componentsInitialization).
+- Change: Using nmwg-1.0.20090108, perfsonar-base-1.0.20080902 and
perfsonar-web-admin-0.9.6b
+- Change: Authentication eventType configuration can now depend on a parent
eventType (case of OwampSummary and Owamp)
+- Change: Because of particularities of the new eventType, CL-MP
communication with SQL-MA has been changed. It will now only work with a
modified version of the SQL-MA 3.1 release; check
http://wiki.perfsonar.net/jra1-wiki/index.php/PerfSONAR_CLMP for more
information.
+- Bug fix: Fixed cron database removal bug (wrong entry being deleted
sometimes).
+- Bug fix: Fixed cron's 'dow' parameter bug (Java considers Sunday 1 through
Saturday 7, instead of 0 to 6).
v2.0:
Added: trunk/rnp_java-cl-mp/doc/Collaboration.txt
Added: trunk/rnp_java-cl-mp/doc/License.txt
Added: trunk/rnp_java-cl-mp/doc/perfSONAR-MDM-3.1_Admin_Guide_1.0.pdf
Property changes on:
trunk/rnp_java-cl-mp/doc/perfSONAR-MDM-3.1_Admin_Guide_1.0.pdf
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/rnp_java-cl-mp/doc/schema/owampSummaryResponse.rnc
===================================================================
--- trunk/rnp_java-cl-mp/doc/schema/owampSummaryResponse.rnc 2009-01-12
13:22:43 UTC (rev 4857)
+++ trunk/rnp_java-cl-mp/doc/schema/owampSummaryResponse.rnc 2009-01-12
13:36:33 UTC (rev 4858)
@@ -92,14 +92,14 @@
attribute maxError { xsd:float } &
attribute duplicates { xsd:unsignedInt } &
attribute loss { xsd:unsignedInt } &
- attribute min_delay { xsd:float } &
- attribute max_delay { xsd:float } &
+ attribute min_delay { xsd:float }? &
+ attribute max_delay { xsd:float }? &
element owampsum:value_buckets {
element owampsum:value_bucket {
attribute value { xsd:int } &
attribute count { xsd:unsignedInt}
} +
- } &
+ }? &
element owampsum:TTL_buckets {
element owampsum:TTL_bucket {
attribute ttl { xsd:unsignedInt } &
Modified: trunk/rnp_java-cl-mp/packaging/deb/changelog
===================================================================
--- trunk/rnp_java-cl-mp/packaging/deb/changelog 2009-01-12 13:22:43
UTC (rev 4857)
+++ trunk/rnp_java-cl-mp/packaging/deb/changelog 2009-01-12 13:36:33
UTC (rev 4858)
@@ -1,17 +1,20 @@
perfsonar-clmp (2.1-1) stable; urgency=low
+ * New: Cron storage fallback - if the configured SQL-MA can't be reached,
CL-MP will store results locally until one of the tests is able to store
remotely. It will then store locally saved results and delete them.
* New: Added a new eventType for summarized owamp measurements (-M
switch), http://ggf.org/ns/nmwg/tools/owamp/summary/2.0
* New: SelfTest functionality added. Works modularly - calls external
scripts defined in conf/selfTest-map.xml and expects "success" or "error" on
the first line and the reasons next.
* New: Log4j properties file for logging to a Syslog server added
- * New: LS Registration now uses a registration file with extra information
to register. This file is populated by a script run during initialization.
Script can be customized.
+ * New: LS Registration now uses a registration file with extra information
to register. This file is populated by a script run during initialization
(scripts/init.sh).
+ * New: Service now registers the eventTypes of enabled tools on LS
* Change: new service path /usr/lib/perfsonar/services/perfsonar-clmp/
* Change: Some classes were changed for internal self-testing
(componentsInitialization).
- * Change: Using nmwg-1.0.20080916, perfsonar-base-1.0.20080902 and
perfsonar-web-admin-0.9.6b
+ * Change: Using nmwg-1.0.20090108, perfsonar-base-1.0.20080902 and
perfsonar-web-admin-0.9.6b
* Change: Authentication eventType configuration can now depend on a
parent eventType (case of OwampSummary and Owamp)
+ * Change: Because of particularities of the new eventType, CL-MP
communication with SQL-MA has been changed. It will now only work with a
modified version of the SQL-MA 3.1 release; check
http://wiki.perfsonar.net/jra1-wiki/index.php/PerfSONAR_CLMP for more
information.
* Bug fix: Fixed cron database removal bug (wrong entry being deleted
sometimes).
* Bug fix: Fixed cron's 'dow' parameter bug (Java considers Sunday 1
through Saturday 7, instead of 0 to 6).
- -- Guilherme Fernandes
<>
Tue, 16 Sep 2008 12:00:00 +0200
+ -- Guilherme Fernandes
<>
Mon, 12 Jan 2009 12:00:00 +0200
perfsonar-clmp (2.0-1) stable; urgency=low
Modified: trunk/rnp_java-cl-mp/packaging/deb/control
===================================================================
--- trunk/rnp_java-cl-mp/packaging/deb/control 2009-01-12 13:22:43 UTC (rev
4857)
+++ trunk/rnp_java-cl-mp/packaging/deb/control 2009-01-12 13:36:33 UTC (rev
4858)
@@ -2,7 +2,7 @@
Section: web
Priority: extra
Maintainer: Guilherme Fernandes
<>
-Build-Depends: debhelper (>= 5)
+Build-Depends: debhelper (>= 5), maven2
Standards-Version: 3.7.2
Package: perfsonar-clmp
Modified: trunk/rnp_java-cl-mp/packaging/deb/copyright
===================================================================
--- trunk/rnp_java-cl-mp/packaging/deb/copyright 2009-01-12 13:22:43
UTC (rev 4857)
+++ trunk/rnp_java-cl-mp/packaging/deb/copyright 2009-01-12 13:36:33
UTC (rev 4858)
@@ -9,22 +9,28 @@
License:
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this package; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ Copyright (c) 2008, DANTE on behalf of the GEANT2 NRENs
+ All rights reserved.
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ * Neither the name of the DANTE or GEANT2 nor the
+ names of its contributors may be used to endorse or promote products
+ derived from this software without specific prior written permission.
-The Debian packaging is (C) 2008, Guilherme Fernandes
<>
-and is licensed under the GPL, see above.
+ THIS SOFTWARE IS PROVIDED BY DANTE ``AS IS AND ANY
+ EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL DANTE or the GEANT2 NRENS BE LIABLE FOR ANY
+ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
Modified: trunk/rnp_java-cl-mp/packaging/deb/postinst
===================================================================
--- trunk/rnp_java-cl-mp/packaging/deb/postinst 2009-01-12 13:22:43 UTC (rev
4857)
+++ trunk/rnp_java-cl-mp/packaging/deb/postinst 2009-01-12 13:36:33 UTC (rev
4858)
@@ -18,34 +18,44 @@
# the debian-policy package
+SERVICENAME="perfsonar-clmp"
+SERVICEPATH="/usr/lib/perfsonar/services"
+
+
case "$1" in
configure)
- if [ -h /var/lib/tomcat5.5/webapps/perfsonar-clmp ]
+ if [ -h /var/lib/tomcat5.5/webapps/$SERVICENAME ]
then
- rm /var/lib/tomcat5.5/webapps/perfsonar-clmp
+ rm /var/lib/tomcat5.5/webapps/$SERVICENAME
fi
- ln -s /usr/lib/perfsonar/services/perfsonar-clmp
/var/lib/tomcat5.5/webapps/perfsonar-clmp || true
- if [ -h /etc/perfsonar-clmp ]
+ ln -sf $SERVICEPATH/$SERVICENAME /var/lib/tomcat5.5/webapps/$SERVICENAME
|| true
+
+ if [ -h /etc/$SERVICENAME ]
then
- rm /etc/perfsonar-clmp
+ rm /etc/$SERVICENAME
fi
- ln -s
/usr/lib/perfsonar/services/perfsonar-clmp/WEB-INF/classes/perfsonar/conf
/etc/perfsonar-clmp || true
+ ln -sf $SERVICEPATH/$SERVICENAME/WEB-INF/classes/perfsonar/conf
/etc/$SERVICENAME || true
- if [ -h /var/log/perfsonar-clmp ]
+ if [ -h /var/log/$SERVICENAME ]
then
- rm /var/log/perfsonar-clmp
+ rm /var/log/$SERVICENAME
fi
- ln -s /var/log/tomcat5.5 /var/log/perfsonar-clmp || true
+ mkdir -p $SERVICEPATH/$SERVICENAME/WEB-INF/log
+ ln -sf $SERVICEPATH/$SERVICENAME/WEB-INF/log /var/log/$SERVICENAME ||
true
- if [ -h /usr/share/doc/perfsonar-clmp/spec ]
+ if [ -h /usr/share/doc/$SERVICENAME/spec ]
then
- rm /usr/share/doc/perfsonar-clmp/spec
+ rm /usr/share/doc/$SERVICENAME/spec
fi
- ln -s /usr/lib/perfsonar/services/perfsonar-clmp/WEB-INF/doc
/usr/share/doc/perfsonar-clmp/spec || true
+ ln -sf $SERVICEPATH/$SERVICENAME/WEB-INF/doc
/usr/share/doc/$SERVICENAME/spec || true
- chown -R tomcat55
/usr/lib/perfsonar/services/perfsonar-clmp/WEB-INF/classes/perfsonar/conf
- chown -R tomcat55
/usr/lib/perfsonar/services/perfsonar-clmp/WEB-INF/classes/perfsonar/cron
- chmod a+x
/usr/lib/perfsonar/services/perfsonar-clmp/WEB-INF/classes/perfsonar/scripts/*
+
+ chown -R tomcat55
$SERVICEPATH/$SERVICENAME/WEB-INF/classes/perfsonar/conf
+ chown -R tomcat55
$SERVICEPATH/$SERVICENAME/WEB-INF/classes/perfsonar/cron
+ chown tomcat55 $SERVICEPATH/$SERVICENAME/WEB-INF/log
+
+ chmod a+x $SERVICEPATH/$SERVICENAME/WEB-INF/classes/perfsonar/scripts/*
+
/etc/init.d/tomcat5.5 restart
;;
Modified: trunk/rnp_java-cl-mp/packaging/deb/postrm
===================================================================
--- trunk/rnp_java-cl-mp/packaging/deb/postrm 2009-01-12 13:22:43 UTC (rev
4857)
+++ trunk/rnp_java-cl-mp/packaging/deb/postrm 2009-01-12 13:36:33 UTC (rev
4858)
@@ -19,23 +19,31 @@
# the debian-policy package
+SERVICENAME="perfsonar-clmp"
+SERVICEPATH="/usr/lib/perfsonar/services"
+
+
case "$1" in
purge)
- if [ -h /var/lib/tomcat5.5/webapps/perfsonar-clmp ]
+ if [ -h /var/lib/tomcat5.5/webapps/$SERVICENAME ]
then
- rm /var/lib/tomcat5.5/webapps/perfsonar-clmp
+ rm /var/lib/tomcat5.5/webapps/$SERVICENAME
fi
- if [ -h /etc/perfsonar-clmp ]
+
+ if [ -h /etc/$SERVICENAME ]
then
- rm /etc/perfsonar-clmp
+ rm /etc/$SERVICENAME
fi
- if [ -h /var/log/perfsonar-clmp ]
+
+ if [ -h /var/log/$SERVICENAME ]
then
- rm /var/log/perfsonar-clmp
+ rm /var/log/$SERVICENAME
fi
- if [ -h /usr/share/doc/perfsonar-clmp/spec ]
+ rm -fr $SERVICEPATH/$SERVICENAME/WEB-INF/log
+
+ if [ -h /usr/share/doc/$SERVICENAME/spec ]
then
- rm /usr/share/doc/perfsonar-clmp/spec
+ rm /usr/share/doc/$SERVICENAME/spec
fi
;;
Modified: trunk/rnp_java-cl-mp/packaging/rpm/perfsonar-clmp.specs
===================================================================
--- trunk/rnp_java-cl-mp/packaging/rpm/perfsonar-clmp.specs 2009-01-12
13:22:43 UTC (rev 4857)
+++ trunk/rnp_java-cl-mp/packaging/rpm/perfsonar-clmp.specs 2009-01-12
13:36:33 UTC (rev 4858)
@@ -45,6 +45,7 @@
%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{prefix}/WEB-INF/samples
%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{prefix}/WEB-INF/samples/requests
%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{prefix}/WEB-INF/samples/responses
+%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{prefix}/WEB-INF/log
# copy the service content to the tomcat webapps directory
pushd ${RPM_BUILD_DIR}/%{name}-%{version}/build
@@ -65,11 +66,11 @@
%post
## make symlink for easy access to conf
-%{__ln_s} %{prefix}/WEB-INF/classes/perfsonar/conf/*.properties
%{_sysconfdir}/%{name}
-%{__ln_s} %{prefix}/WEB-INF/classes/perfsonar/conf/objects.config
%{_sysconfdir}/%{name}
-%{__ln_s} %{prefix}/WEB-INF/classes/perfsonar/conf/*.xml
%{_sysconfdir}/%{name}
-%{__ln_s} %{_var}/log/tomcat5 %{_var}/log/%{name}
-%{__ln_s} %{prefix} %{_var}/lib/tomcat5/webapps/%{name}
+%{__ln_s} -f %{prefix}/WEB-INF/classes/perfsonar/conf/*.properties
%{_sysconfdir}/%{name}
+%{__ln_s} -f %{prefix}/WEB-INF/classes/perfsonar/conf/objects.config
%{_sysconfdir}/%{name}
+%{__ln_s} -f %{prefix}/WEB-INF/classes/perfsonar/conf/*.xml
%{_sysconfdir}/%{name}
+%{__ln_s} -f %{prefix}/WEB-INF/log %{_var}/log/%{name}
+%{__ln_s} -f %{prefix} %{_var}/lib/tomcat5/webapps/%{name}
## restart tomcat
/sbin/service tomcat5 restart
@@ -78,11 +79,13 @@
%preun
## remove symlink
-%{__rm} -rf %{_sysconfdir}/%{name}/*.properties
-%{__rm} -rf %{_sysconfdir}/%{name}/objects.config
-%{__rm} -rf %{_sysconfdir}/%{name}/*.xml
-%{__rm} -rf %{_var}/log/%{name}
-%{__rm} -rf %{_var}/lib/tomcat5/webapps/%{name}
+if [ ! -e %{prefix}/WEB-INF/classes/perfsonar/conf/service.properties ]; then
+ %{__rm} -rf %{_sysconfdir}/%{name}/*.properties || true
+ %{__rm} -rf %{_sysconfdir}/%{name}/objects.config || true
+ %{__rm} -rf %{_sysconfdir}/%{name}/*.xml || true
+ %{__rm} -rf %{_var}/log/%{name} || true
+ %{__rm} -rf %{_var}/lib/tomcat5/webapps/%{name} || true
+fi
@@ -100,9 +103,12 @@
%files
%defattr(0644,root,tomcat,0755)
+%attr(755,tomcat,tomcat) %{prefix}/WEB-INF/log
%attr(640,tomcat,tomcat) %config(noreplace)
%{prefix}/WEB-INF/classes/perfsonar/conf/*.properties
%attr(640,tomcat,tomcat) %config(noreplace)
%{prefix}/WEB-INF/classes/perfsonar/conf/objects.config
%attr(640,tomcat,tomcat) %config(noreplace)
%{prefix}/WEB-INF/classes/perfsonar/conf/*.xml
+%attr(755,tomcat,tomcat) %{prefix}/WEB-INF/classes/perfsonar/cron
+%attr(755,tomcat,tomcat) %{prefix}/WEB-INF/classes/perfsonar/cron/local
%attr(640,tomcat,tomcat) %config(noreplace)
%{prefix}/WEB-INF/classes/perfsonar/cron/clmpcron
%attr(755,tomcat,tomcat) %config(noreplace)
%{prefix}/WEB-INF/classes/perfsonar/scripts/*
%{prefix}
@@ -113,19 +119,22 @@
%changelog
-* Wed Sep 16 2008 Guilherme Fernandes
<>
2.1-1
+* Mon Jan 12 2009 Guilherme Fernandes
<>
2.1-1
+- New: Cron storage fallback - if the configured SQL-MA can't be reached,
CL-MP will store results locally until one of the tests is able to store
remotely. It will then store locally saved results and delete them.
- New: Added a new eventType for summarized owamp measurements (-M switch),
http://ggf.org/ns/nmwg/tools/owamp/summary/2.0
- New: SelfTest functionality added. Works modularly - calls external
scripts defined in conf/selfTest-map.xml and expects "success" or "error" on
the first line and the reasons next.
- New: Log4j properties file for logging to a Syslog server added
-- New: LS Registration now uses a registration file with extra information
to register. This file is populated by a script run during initialization.
Script can be customized.
+- New: LS Registration now uses a registration file with extra information
to register. This file is populated by a script run during initialization
(scripts/init.sh).
+- New: Service now registers the eventTypes of enabled tools on LS
- Change: new service path /usr/lib/perfsonar/services/perfsonar-clmp/
- Change: Some classes were changed for internal self-testing
(componentsInitialization).
-- Change: Using nmwg-1.0.20080916, perfsonar-base-1.0.20080902 and
perfsonar-web-admin-0.9.6b
+- Change: Using nmwg-1.0.20090108, perfsonar-base-1.0.20080902 and
perfsonar-web-admin-0.9.6b
- Change: Authentication eventType configuration can now depend on a parent
eventType (case of OwampSummary and Owamp)
+- Change: Because of particularities of the new eventType, CL-MP
communication with SQL-MA has been changed. It will now only work with a
modified version of the SQL-MA 3.1 release; check
http://wiki.perfsonar.net/jra1-wiki/index.php/PerfSONAR_CLMP for more
information.
- Bug fix: Fixed cron database removal bug (wrong entry being deleted
sometimes).
- Bug fix: Fixed cron's 'dow' parameter bug (Java considers Sunday 1 through
Saturday 7, instead of 0 to 6).
-* Wed Sep 16 2008 Guilherme Fernandes
<>
2.1-1
+* Wed Sep 16 2008 Guilherme Fernandes
<>
2.0-1
- New: Authentication Functionality added.
- New: Configuration via a Servlet (WebAdmin).
- New: Scheduling of measurements through a Cron-Like Scheduler Component
(new eventType: cron/2.0).
Modified: trunk/rnp_java-cl-mp/pom.xml
===================================================================
--- trunk/rnp_java-cl-mp/pom.xml 2009-01-12 13:22:43 UTC (rev 4857)
+++ trunk/rnp_java-cl-mp/pom.xml 2009-01-12 13:36:33 UTC (rev 4858)
@@ -64,13 +64,22 @@
<webResources>
<resource>
<directory>${basedir}/conf/axis-1.4/</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
</resource>
<resource>
<directory>${basedir}/conf/wsdd/</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
<targetPath>wsdd</targetPath>
</resource>
<resource>
<directory>${basedir}/conf/</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
<excludes>
<exclude>axis-1.4/**/*</exclude>
<exclude>wsdd/**/*</exclude>
@@ -116,7 +125,7 @@
<dependency>
<groupId>nmwg</groupId>
<artifactId>nmwg</artifactId>
- <version>1.0.20080916</version>
+ <version>1.0.20090108</version>
</dependency>
<dependency>
<groupId>perfsonar</groupId>
@@ -126,7 +135,7 @@
<dependency>
<groupId>perfsonar</groupId>
<artifactId>perfsonar-web-admin</artifactId>
- <version>0.9.2b</version>
+ <version>0.9.6b</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
Modified:
trunk/rnp_java-cl-mp/src/main/java/org/perfsonar/service/measurementPoint/commandLine/CommandLineCronComponent.java
===================================================================
---
trunk/rnp_java-cl-mp/src/main/java/org/perfsonar/service/measurementPoint/commandLine/CommandLineCronComponent.java
2009-01-12 13:22:43 UTC (rev 4857)
+++
trunk/rnp_java-cl-mp/src/main/java/org/perfsonar/service/measurementPoint/commandLine/CommandLineCronComponent.java
2009-01-12 13:36:33 UTC (rev 4858)
@@ -2,6 +2,7 @@
import java.io.File;
import java.io.FileInputStream;
+import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.RandomAccessFile;
@@ -14,6 +15,8 @@
import java.util.Iterator;
import java.util.List;
+import javax.xml.parsers.ParserConfigurationException;
+
import org.ggf.ns.nmwg.base.v2_0.Data;
import org.ggf.ns.nmwg.base.v2_0.Key;
import org.ggf.ns.nmwg.base.v2_0.Message;
@@ -34,6 +37,7 @@
import org.perfsonar.service.measurementPoint.commandLine.utils.Entries;
import
org.perfsonar.service.measurementPoint.commandLine.utils.ScheduleRequest;
import org.w3c.dom.Document;
+import org.xml.sax.SAXException;
/**
* Cron Component for CLMP Scheduling
@@ -1014,9 +1018,8 @@
iS.close();
} catch (Exception e) {
- logger
-
.debug("CommandLineCronComponent.Job: Error trying to read "
- + path + "/"
+ action + ".");
+ logger.error("CommandLineCronComponent.Job: "
+
+ "Error trying to read "+ path
+ "/" + action + ".");
return;
}
@@ -1028,7 +1031,7 @@
} catch (Exception e) {
- logger.debug("CommandLineCronComponent.Job: "
+ logger.error("CommandLineCronComponent.Job: "
+ "Parse/validation error for
action "+action
+ ". Cannot convert action to
Message. "
+ "Nested error messsage was
" + e.getMessage());
@@ -1047,29 +1050,83 @@
ma = defaultMa;
if (ma.equals("local")) {
- Document responseDocument = XMLUtils
-
.convertMessageToDOM(responseMessage);
- String filename = path + "/local/"
- +
action.split("\\.xml")[0] + "_" + ma + "_"
- +
System.currentTimeMillis();
- File file = new File(filename);
- FileOutputStream oS = new
FileOutputStream(file);
-
org.apache.axis.utils.XMLUtils.DocumentToStream(
- responseDocument, oS);
- oS.close();
+ storeLocal(action, responseMessage);
} else {
- CommandLineMAStorageManager
storeManager = new CommandLineMAStorageManager();
- storeManager.store(ma,
action.split("_")[0],
- responseMessage);
+ String actiondir =
path+"/local/"+action.split("\\.xml")[0];
+ CommandLineMAStorageManager
storeManager =
+ new
CommandLineMAStorageManager();
+ if(storeManager.store(
+ ma,
action.split("_")[0], responseMessage)){
+ checkStoredResults(actiondir,
storeManager);
+ }else{
+
logger.debug("CommandLineCronComponent.Job: " +
+ "storing data
for action "+action+" locally.");
+ storeLocal(actiondir,
responseMessage);
+ }
}
} catch (Exception e) {
-
- logger.debug("CommandLineCronComponent.Job: "
+ logger.error("CommandLineCronComponent.Job: "
+ "Error while trying to
execute/store action: "
+ e.getMessage());
+ }
+ }
+ private void checkStoredResults(String actiondir,
+ CommandLineMAStorageManager storeManager)
throws PerfSONARException {
+
+ if(new File(actiondir).exists()){
+
logger.debug("CommandLineCronComponent.Job.checkStoredResults: "
+ + "Storing past results of
action "+action);
+
+ File[] files = new
File(actiondir).listFiles();
+ if(files.length > 0){
+ for(File file : files){
+
if(file.getName().startsWith(action.split("\\.xml")[0])){
+ Message storedResult
= null;
+ try {
+
FileInputStream iS = new FileInputStream(file);
+ storedResult
= XMLUtils.convertToMessage(
+
org.apache.axis.utils.XMLUtils.newDocument(iS),
+
configuration.getProperty("service.sax_parser.config"));
+ iS.close();
+ } catch (Exception e)
{
+
logger.error("CommandLineCronComponent.Job.checkStoredResults: "
+
+ "Error trying to store past result " + file.getName()
+
+ ": " + e.getMessage());
+ continue;
+ }
+
if(storeManager.store(ma, action.split("_")[0], storedResult))
+
if(!file.delete()){
+
logger.error(
+
"CommandLineCronComponent.Job.checkStoredResults: "
+
+ "Couldn't delete file " + file.getAbsolutePath()
+
+ ". Stored results might get duplicated.");
+ }
+ }
+ }
+ }
}
}
+
+ private void storeLocal(String actiondir, Message
responseMessage)
+ throws PerfSONARException,
FileNotFoundException, IOException {
+ if(!(new File(actiondir)).exists())
+ if(!(new File(actiondir)).mkdir()){
+
logger.debug("CommandLineCronComponent.Job.storeLocal: "
+ + "Couldn't create
directory: "+ actiondir);
+ actiondir = path+"/local";
+ }
+
+ Document responseDocument = XMLUtils
+ .convertMessageToDOM(responseMessage);
+ String filename = actiondir + "/" +
action.split("\\.xml")[0] +
+ "_" + System.currentTimeMillis()
+ ".xml";
+ File file = new File(filename);
+ FileOutputStream oS = new FileOutputStream(file);
+ org.apache.axis.utils.XMLUtils.DocumentToStream(
+ responseDocument, oS);
+ oS.close();
+ }
}
}
Modified:
trunk/rnp_java-cl-mp/src/main/java/org/perfsonar/service/measurementPoint/commandLine/CommandLineMAStorageManager.java
===================================================================
---
trunk/rnp_java-cl-mp/src/main/java/org/perfsonar/service/measurementPoint/commandLine/CommandLineMAStorageManager.java
2009-01-12 13:22:43 UTC (rev 4857)
+++
trunk/rnp_java-cl-mp/src/main/java/org/perfsonar/service/measurementPoint/commandLine/CommandLineMAStorageManager.java
2009-01-12 13:36:33 UTC (rev 4858)
@@ -53,10 +53,10 @@
}
- public void store(String ma, String tool, Message request) {
+ public boolean store(String ma, String tool, Message request) {
if ("bwctl".equals(tool))
if(!prepareBwctl(request))
- return;
+ return false;
request.setType("MeasurementArchiveStoreRequest");
@@ -66,10 +66,17 @@
datum = send(ma, request);
}
- if (datum == null || !datum.getValue().contains("have been
stored"))
+ if (datum != null && !datum.getValue().contains("have been
stored")){
logger
-
.debug("CommandLineMAStorageManager.store: Not expected response received: "
+
.debug("CommandLineMAStorageManager.store: Unexpected response received: "
+ datum.toString());
+ return false;
+ }
+
+ if(datum == null)
+ return false;
+
+ return true;
}
public void storeKey(String ma, String tool, Message request) {
@@ -79,11 +86,6 @@
Data data = new Data();
data.setId("data-" + old.getMetadataIdRef());
data.setMetadataIdRef(old.getMetadataIdRef());
- Key key = new Key();
- key.addParameter("metadataId", data.getMetadataIdRef());
- key.addParameter("ibatisConfig", "ibatis-SqlMapConfig-clmp-"
+ tool
- + ".xml");
- data.addChild(key);
request.getDataMap().clear();
request.addChild(data);
Modified:
trunk/rnp_java-cl-mp/src/main/java/org/perfsonar/service/measurementPoint/commandLine/tools/OwampSummary.java
===================================================================
---
trunk/rnp_java-cl-mp/src/main/java/org/perfsonar/service/measurementPoint/commandLine/tools/OwampSummary.java
2009-01-12 13:22:43 UTC (rev 4857)
+++
trunk/rnp_java-cl-mp/src/main/java/org/perfsonar/service/measurementPoint/commandLine/tools/OwampSummary.java
2009-01-12 13:36:33 UTC (rev 4858)
@@ -35,6 +35,8 @@
import org.ggf.ns.nmwg.time.v2_0.Start;
import org.ggf.ns.nmwg.time.v2_0.Time;
import org.ggf.ns.nmwg.tools.owamp.summary.v2_0.Datum;
+import org.ggf.ns.nmwg.tools.owamp.summary.v2_0.ReorderingBucket;
+import org.ggf.ns.nmwg.tools.owamp.summary.v2_0.ReorderingBuckets;
import org.ggf.ns.nmwg.tools.owamp.summary.v2_0.TTLBucket;
import org.ggf.ns.nmwg.tools.owamp.summary.v2_0.TTLBuckets;
import org.ggf.ns.nmwg.tools.owamp.summary.v2_0.ValueBucket;
@@ -285,9 +287,9 @@
datum.addChild(time);
// SENT 100
- Integer i = new Integer(getFirstMatchedGroup(
+ Long l = new Long(getFirstMatchedGroup(
"SENT\\s*([0-9]+)", br.readLine()));
- datum.setSent(i);
+ datum.setSent(l);
// SYNC 1
if("1".equals(
@@ -302,14 +304,14 @@
datum.setMaxError(f);
// DUPS 0
- i = new Integer(getFirstMatchedGroup(
+ l = new Long(getFirstMatchedGroup(
"DUPS\\s*([0-9]+)", br.readLine()));
- datum.setDuplicates(i);
+ datum.setDuplicates(l);
// LOST 0
- i = new Integer(getFirstMatchedGroup(
+ l = new Long(getFirstMatchedGroup(
"LOST\\s*([0-9]+)", br.readLine()));
- datum.setLoss(i);
+ datum.setLoss(l);
line = br.readLine(); // MIN 0.00172043
if(line != null && line.startsWith("MIN")){
@@ -332,13 +334,15 @@
</BUCKETS>
*/
br.readLine();
+ Integer i = null;
while(!(line =
br.readLine()).equals("</BUCKETS>")){
ValueBucket vb = new ValueBucket();
- vb.setValue(getFirstMatchedGroup(
+ i = new Integer(getFirstMatchedGroup(
"\\s*([0-9\\-]+)\\s+[0-9]+", line));
- i = new Integer(getFirstMatchedGroup(
+ vb.setValue(i);
+ l = new Long(getFirstMatchedGroup(
"\\s*[0-9\\-]+\\s+([0-9]+)", line));
- vb.setCount(i);
+ vb.setCount(l);
valueBuckets.addChild(vb);
}
datum.addChild(valueBuckets);
@@ -359,13 +363,31 @@
i = new
Integer(getFirstMatchedGroup(
"\\s*([0-9]+)\\s+[0-9]+", line));
tb.setTtl(i);
- i = new
Integer(getFirstMatchedGroup(
+ l = new
Long(getFirstMatchedGroup(
"\\s*[0-9]+\\s+([0-9]+)", line));
- tb.setCount(i);
+ tb.setCount(l);
ttlBuckets.addChild(tb);
- }
+ }
datum.addChild(ttlBuckets);
}
+
+ line = br.readLine(); // <NREORDERING>
+ if(line != null &&
line.equals("<NREORDERING>")){
+ ReorderingBuckets reorderingBuckets =
new ReorderingBuckets();
+ while(!(line =
br.readLine()).equals("</NREORDERING>")){
+ ReorderingBucket rb = new
ReorderingBucket();
+ l = new
Long(getFirstMatchedGroup(
+
"\\s*([0-9]+)\\s+[0-9\\.\\-e]+", line));
+ rb.setOrder(l);
+ Double d = new
Double(getFirstMatchedGroup(
+
"\\s*[0-9]+\\s+([0-9\\.\\-e]+)", line));
+ d = d * (datum.getSent() +
datum.getDuplicates()
+ -
datum.getLoss() + l + 1);
+ rb.setCount(d.longValue());
+
reorderingBuckets.addChild(rb);
+ }
+ datum.addChild(reorderingBuckets);
+ }
}
datumList.add(datum);
- perfsonar: r4858 - in trunk/rnp_java-cl-mp: . ant conf conf/axis-1.4 conf/axis-1.4/graphics conf/scripts doc doc/schema packaging/deb packaging/rpm src/main/java/org/perfsonar/service/measurementPoint/commandLine src/main/java/org/perfsonar/service/measurementPoint/commandLine/tools, svnlog, 01/12/2009
Archive powered by MHonArc 2.6.16.