Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r3603 - in trunk/rnp_java-cl-mp: ant conf conf/axis-1.4 doc/schema lib/misc samples/requests src/main/java/org/perfsonar/service/measurementPoint/commandLine/tools

Subject: perfsonar development work

List archive

perfsonar: r3603 - in trunk/rnp_java-cl-mp: ant conf conf/axis-1.4 doc/schema lib/misc samples/requests src/main/java/org/perfsonar/service/measurementPoint/commandLine/tools


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r3603 - in trunk/rnp_java-cl-mp: ant conf conf/axis-1.4 doc/schema lib/misc samples/requests src/main/java/org/perfsonar/service/measurementPoint/commandLine/tools
  • Date: Thu, 3 Apr 2008 10:29:49 -0400
Author: fernandes
Date: 2008-04-03 10:29:49 -0400 (Thu, 03 Apr 2008)
New Revision: 3603

Added:
trunk/rnp_java-cl-mp/conf/axis-1.4/Service_Admin.js
trunk/rnp_java-cl-mp/conf/axis-1.4/graphics/
trunk/rnp_java-cl-mp/conf/axis-1.4/perfsonar.png
trunk/rnp_java-cl-mp/conf/axis-1.4/sqlma_admin_script.js
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/lib/misc/perfsonar-base-ant-1.0.20080331.jar
Removed:
trunk/rnp_java-cl-mp/conf/axis-1.4/default.css
trunk/rnp_java-cl-mp/conf/axis-1.4/index.html
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_logo.gif
trunk/rnp_java-cl-mp/lib/misc/perfsonar-base-ant-1.0.20080303.jar
Modified:
trunk/rnp_java-cl-mp/ant/axis-deploy-targets.xml
trunk/rnp_java-cl-mp/ant/const.properties.template
trunk/rnp_java-cl-mp/ant/libs-download-targets.xml
trunk/rnp_java-cl-mp/conf/service.properties.template
trunk/rnp_java-cl-mp/conf/service.properties.template-2
trunk/rnp_java-cl-mp/conf/wizard.properties
trunk/rnp_java-cl-mp/doc/schema/cronRequestList.rnc
trunk/rnp_java-cl-mp/doc/schema/cronResponseList.rnc
trunk/rnp_java-cl-mp/samples/requests/CronList.xml
trunk/rnp_java-cl-mp/samples/requests/CronListSpecific.xml

trunk/rnp_java-cl-mp/src/main/java/org/perfsonar/service/measurementPoint/commandLine/tools/Traceroute.java
Log:
RC4 of CL-MP:

- Now using perfsonar-base-ant version 1.0.20080331
- Now using perfsonar-web-admin 0.8.1b
- Bug Fix: Fixed traceroute bug introduced with RC3 (hopMax and numBytes
wasn't being shown on RedHat dists).
- Bug Fix: Traceroute's parameter displayTtl is now being ignored due to
differences in implementations of some linux distributions.
- Bug Fix: Fixed error message of wrong values for Traceroute numQueries and
maxTtl parameters (bug id 387)
- Bug Fix: Example messages and RNCs fixed for CronList functionality (bug
ids 389 and 390)

Modified: trunk/rnp_java-cl-mp/ant/axis-deploy-targets.xml
===================================================================
--- trunk/rnp_java-cl-mp/ant/axis-deploy-targets.xml 2008-04-03 14:29:04
UTC (rev 3602)
+++ trunk/rnp_java-cl-mp/ant/axis-deploy-targets.xml 2008-04-03 14:29:49
UTC (rev 3603)
@@ -50,7 +50,7 @@

<copy
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20080124/nmwg-1.0.20080124.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080310/perfsonar-base-1.0.20080310.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.5b/perfsonar-web-admin-0.5b.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.8.1b/perfsonar-web-admin-0.8.1b.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"/>

@@ -222,7 +222,7 @@

<copy
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20080124/nmwg-1.0.20080124.jar"
todir="${tmpdir}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080310/perfsonar-base-1.0.20080310.jar"
todir="${tmpdir}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.5b/perfsonar-web-admin-0.5b.jar"
todir="${tmpdir}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.8.1b/perfsonar-web-admin-0.8.1b.jar"
todir="${tmpdir}/WEB-INF/lib"/>

<copy file="${basedir}/conf/eventType-map.xml"
todir="${tmpdir}/WEB-INF/classes/perfsonar/conf"/>


Modified: trunk/rnp_java-cl-mp/ant/const.properties.template
===================================================================
--- trunk/rnp_java-cl-mp/ant/const.properties.template 2008-04-03 14:29:04
UTC (rev 3602)
+++ trunk/rnp_java-cl-mp/ant/const.properties.template 2008-04-03 14:29:49
UTC (rev 3603)
@@ -18,7 +18,7 @@
wsdd.webservice.name=CommandLineService

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

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

Modified: trunk/rnp_java-cl-mp/ant/libs-download-targets.xml
===================================================================
--- trunk/rnp_java-cl-mp/ant/libs-download-targets.xml 2008-04-03 14:29:04
UTC (rev 3602)
+++ trunk/rnp_java-cl-mp/ant/libs-download-targets.xml 2008-04-03 14:29:49
UTC (rev 3603)
@@ -56,7 +56,7 @@

<dependency groupId="perfsonar" artifactId="perfsonar-base"
version="1.0.20080310"/>
<dependency groupId="nmwg" artifactId="nmwg"
version="1.0.20080124"/>
- <dependency groupId="perfsonar" artifactId="perfsonar-web-admin"
version="0.5b"/>
+ <dependency groupId="perfsonar" artifactId="perfsonar-web-admin"
version="0.8.1b"/>

<localRepository refid="local.repository"/>
<remoteRepository refid="remote.repository"/>

Added: 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/index.html

Deleted: trunk/rnp_java-cl-mp/conf/axis-1.4/main.css

Deleted: trunk/rnp_java-cl-mp/conf/axis-1.4/partners.gif

Added: trunk/rnp_java-cl-mp/conf/axis-1.4/perfsonar.png


Property changes on: trunk/rnp_java-cl-mp/conf/axis-1.4/perfsonar.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Deleted: trunk/rnp_java-cl-mp/conf/axis-1.4/perfsonar_logo.gif

Added: trunk/rnp_java-cl-mp/conf/axis-1.4/sqlma_admin_script.js

Added: trunk/rnp_java-cl-mp/conf/axis-1.4/top_slice.gif


Property changes on: trunk/rnp_java-cl-mp/conf/axis-1.4/top_slice.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added: trunk/rnp_java-cl-mp/conf/axis-1.4/welcome.htm

Added: trunk/rnp_java-cl-mp/conf/axis-1.4/wz_tooltip.js

Modified: trunk/rnp_java-cl-mp/conf/service.properties.template
===================================================================
--- trunk/rnp_java-cl-mp/conf/service.properties.template 2008-04-03
14:29:04 UTC (rev 3602)
+++ trunk/rnp_java-cl-mp/conf/service.properties.template 2008-04-03
14:29:49 UTC (rev 3603)
@@ -15,4 +15,6 @@
service.clmp.rp.maxthreads.traceroute=99999
service.clmp.rp.maxthreads.ping=99999

-service.as.point=http://homer.rediris.es:8080/perfSONAR-AS/services/AuthService

\ No newline at end of file
+service.ls.registration_file
+
+service.as.point=http://homer.rediris.es:8080/perfSONAR-AS/services/AuthService

Modified: trunk/rnp_java-cl-mp/conf/service.properties.template-2
===================================================================
--- trunk/rnp_java-cl-mp/conf/service.properties.template-2 2008-04-03
14:29:04 UTC (rev 3602)
+++ trunk/rnp_java-cl-mp/conf/service.properties.template-2 2008-04-03
14:29:49 UTC (rev 3603)
@@ -23,4 +23,6 @@
service.r.service_version=2.0

service.r.contact_email=default@email

-service.as.point=http://homer.rediris.es:8080/perfSONAR-AS/services/AuthService

\ No newline at end of file
+service.ls.registration_file=
+
+service.as.point=http://homer.rediris.es:8080/perfSONAR-AS/services/AuthService

Modified: trunk/rnp_java-cl-mp/conf/wizard.properties
===================================================================
--- trunk/rnp_java-cl-mp/conf/wizard.properties 2008-04-03 14:29:04 UTC (rev
3602)
+++ trunk/rnp_java-cl-mp/conf/wizard.properties 2008-04-03 14:29:49 UTC (rev
3603)
@@ -55,9 +55,9 @@
<Group order="1">Cron-Like Scheduler</Group>
</property>
<property>
- <entry key="service.clmp.cron.local_storage_dir"
required="true">_BASEPATH_/classes/perfsonar/cron/local</entry>
+ <entry key="service.clmp.cron.local_storage_dir"
required="true">/home/perfsonar/webapps/perfSONAR-CLMP/classes/perfsonar/cron/local</entry>
<Comment>Enter directory for local storage</Comment>
- <ProposedValue>_BASEPATH_/classes/perfsonar/cron/local</ProposedValue>
+
<ProposedValue>/home/perfsonar/webapps/perfSONAR-CLMP/classes/perfsonar/cron/local</ProposedValue>
<Group order="2">Cron-Like Scheduler</Group>
</property>

@@ -113,9 +113,9 @@
<Group order="6">LS</Group>
</property>
<property>
- <entry key="service.r.access_point"
required="true">http://mpaddress:8080/rnp_java-cl-mp/services/CommandLineService</entry>
+ <entry key="service.r.access_point"
required="true">http://mpaddress:8080/perfSONAR-CLMP/services/CommandLineService</entry>
<Comment>Give the service access point</Comment>
-
<ProposedValue>http://mpaddress:8080/rnp_java-cl-mp/services/CommandLineService</ProposedValue>
+
<ProposedValue>http://mpaddress:8080/perfSONAR-CLMP/services/CommandLineService</ProposedValue>
<Group order="7">LS</Group>
</property>
</properties>
\ No newline at end of file

Modified: trunk/rnp_java-cl-mp/doc/schema/cronRequestList.rnc
===================================================================
--- trunk/rnp_java-cl-mp/doc/schema/cronRequestList.rnc 2008-04-03 14:29:04
UTC (rev 3602)
+++ trunk/rnp_java-cl-mp/doc/schema/cronRequestList.rnc 2008-04-03 14:29:49
UTC (rev 3603)
@@ -39,6 +39,7 @@
Key =
element nmwg:key {
element nmwg:parameters {
+ Identifier &
KeyParameter+
}
}

Modified: trunk/rnp_java-cl-mp/doc/schema/cronResponseList.rnc
===================================================================
--- trunk/rnp_java-cl-mp/doc/schema/cronResponseList.rnc 2008-04-03
14:29:04 UTC (rev 3602)
+++ trunk/rnp_java-cl-mp/doc/schema/cronResponseList.rnc 2008-04-03
14:29:49 UTC (rev 3603)
@@ -12,11 +12,10 @@
Type &
CronData &
(
-ToolMetadata,
-CronMetadata
-)+
+ToolMetadata*,
+CronMetadata*
+)*

-
Identifier =
attribute id { xsd:string }

@@ -24,13 +23,13 @@
attribute messageIdRef { xsd:string }

Type =
- attribute type { "MeasurementRequest" }
+ attribute type { "MeasurementResponse" }

ToolMetadata =
element nmwg:metadata {
Identifier,
- ToolEventType,
- anyElement*
+ anyElement*,
+ ToolEventType
}

ToolEventType =
@@ -55,7 +54,9 @@

Key =
element nmwg:key {
+ Identifier &
element nmwg:parameters {
+ Identifier &
element nmwg:parameter {
attribute name { xsd:string } &
(
@@ -68,13 +69,13 @@

CronParameters =
element cron:parameters {
- Identifier,
- CronParameterMinutes,
- CronParameterHours,
+ Identifier,
+ CronParameterMa,
+ CronParameterMonths,
CronParameterDom,
- CronParameterMonths,
CronParameterDow,
- CronParameterMa
+ CronParameterHours,
+ CronParameterMinutes
}

CronParameterMinutes =

Deleted: trunk/rnp_java-cl-mp/lib/misc/perfsonar-base-ant-1.0.20080303.jar

Added: trunk/rnp_java-cl-mp/lib/misc/perfsonar-base-ant-1.0.20080331.jar


Property changes on:
trunk/rnp_java-cl-mp/lib/misc/perfsonar-base-ant-1.0.20080331.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Modified: trunk/rnp_java-cl-mp/samples/requests/CronList.xml
===================================================================
--- trunk/rnp_java-cl-mp/samples/requests/CronList.xml 2008-04-03 14:29:04
UTC (rev 3602)
+++ trunk/rnp_java-cl-mp/samples/requests/CronList.xml 2008-04-03 14:29:49
UTC (rev 3603)
@@ -6,7 +6,7 @@

<nmwg:metadata id="meta1" >
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/cron/2.0</nmwg:eventType>
- <nmwg:parameters><nmwg:parameter name="action" value="list"
/></nmwg:parameters>
+ <cron:parameters id="param"><nmwg:parameter name="action" value="list"
/></cron:parameters>
</nmwg:metadata>

<nmwg:data id="1" metadataIdRef="meta1" />

Modified: trunk/rnp_java-cl-mp/samples/requests/CronListSpecific.xml
===================================================================
--- trunk/rnp_java-cl-mp/samples/requests/CronListSpecific.xml 2008-04-03
14:29:04 UTC (rev 3602)
+++ trunk/rnp_java-cl-mp/samples/requests/CronListSpecific.xml 2008-04-03
14:29:49 UTC (rev 3603)
@@ -11,7 +11,7 @@
<nmwg:parameter
name="id">popsc-poprj-1200709006950</nmwg:parameter>
</nmwg:parameters>
</nmwg:key>
- <nmwg:parameters><nmwg:parameter name="action" value="list"
/></nmwg:parameters>
+ <cron:parameters id="param"><nmwg:parameter name="action" value="list"
/></cron:parameters>
</nmwg:metadata>

<nmwg:data id="1" metadataIdRef="meta1" />

Modified:
trunk/rnp_java-cl-mp/src/main/java/org/perfsonar/service/measurementPoint/commandLine/tools/Traceroute.java
===================================================================
---
trunk/rnp_java-cl-mp/src/main/java/org/perfsonar/service/measurementPoint/commandLine/tools/Traceroute.java
2008-04-03 14:29:04 UTC (rev 3602)
+++
trunk/rnp_java-cl-mp/src/main/java/org/perfsonar/service/measurementPoint/commandLine/tools/Traceroute.java
2008-04-03 14:29:49 UTC (rev 3603)
@@ -50,8 +50,8 @@
protected LoggerComponent logger = null;
protected CommandLineResourceProtector protector = null;

- private int numQueries;
-
+ private int numQueries = 3;
+
public String getToolBundleName(){
return "Traceroute";
}
@@ -162,15 +162,13 @@
cmd.add(p.getParameterValue());
}
p = params.getParameterByName("numQueries");
- if(p != null){
- this.numQueries =
Integer.parseInt(p.getParameterValue());
- } else {
- this.numQueries = 3;
- }
+ if(p != null)
+ numQueries =
Integer.parseInt(p.getParameterValue());
+
p = params.getParameterByName("maxTtl");
- if(p != null){
- maxTtl = Integer.parseInt(p.getParameterValue());
- }
+ if(p != null)
+ maxTtl =
Integer.parseInt(p.getParameterValue());
+
}

// Now execute
@@ -195,6 +193,14 @@
+ t.getMessage(),
t
);
+ }catch (NumberFormatException e){
+ logger.fatal(
+ CNAME + ": Parameters numQueries and maxTtl must be
integers."
+ );
+ throw new
PerfSONARException("error.mp.clmp.validator.malformed_request",
+ CNAME + ": Parameters numQueries and maxTtl must be
integers.",
+ e
+ );
}

/*
@@ -393,8 +399,13 @@
toolOptions.put("tos","-t:");
toolOptions.put("numQueries","-q:3");

- if (OS.indexOf("linux") > -1) {
- toolOptions.put("displayTtl","-l:novalue");
- }
+ /*
+ * XXX: -l option removed because of differences in traceroute
implementation
+ * from different linux distributions.
+ *
+ * if (OS.indexOf("linux") > -1) {
+ * toolOptions.put("displayTtl","-l:");
+ * }
+ */
}
}


  • perfsonar: r3603 - in trunk/rnp_java-cl-mp: ant conf conf/axis-1.4 doc/schema lib/misc samples/requests src/main/java/org/perfsonar/service/measurementPoint/commandLine/tools, svnlog, 04/03/2008

Archive powered by MHonArc 2.6.16.

Top of Page