Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r3261 - in trunk/rnp_java-cl-mp: ant conf src/main/java/org/perfsonar/service/measurementPoint/commandLine/tools src/main/java/org/perfsonar/service/measurementPoint/commandLine/utils

Subject: perfsonar development work

List archive

perfsonar: r3261 - in trunk/rnp_java-cl-mp: ant conf src/main/java/org/perfsonar/service/measurementPoint/commandLine/tools src/main/java/org/perfsonar/service/measurementPoint/commandLine/utils


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r3261 - in trunk/rnp_java-cl-mp: ant conf src/main/java/org/perfsonar/service/measurementPoint/commandLine/tools src/main/java/org/perfsonar/service/measurementPoint/commandLine/utils
  • Date: Wed, 23 Jan 2008 13:58:19 -0500
Author: fernandes
Date: 2008-01-23 13:58:19 -0500 (Wed, 23 Jan 2008)
New Revision: 3261

Modified:
trunk/rnp_java-cl-mp/ant/axis-deploy-targets.xml
trunk/rnp_java-cl-mp/ant/configure-targets.xml
trunk/rnp_java-cl-mp/conf/objects.config

trunk/rnp_java-cl-mp/src/main/java/org/perfsonar/service/measurementPoint/commandLine/tools/Cron.java

trunk/rnp_java-cl-mp/src/main/java/org/perfsonar/service/measurementPoint/commandLine/utils/Entries.java
Log:


Modified: trunk/rnp_java-cl-mp/ant/axis-deploy-targets.xml
===================================================================
--- trunk/rnp_java-cl-mp/ant/axis-deploy-targets.xml 2008-01-23 14:10:04
UTC (rev 3260)
+++ trunk/rnp_java-cl-mp/ant/axis-deploy-targets.xml 2008-01-23 18:58:19
UTC (rev 3261)
@@ -21,9 +21,9 @@
xmlns:psbase="psbase:/base.perfsonar.org">

<psbase:create-deploy-root deploy-path="${service.home}/${deploy.root}"/>
- <mkdir dir="@{deploy-path}/WEB-INF/classes/perfsonar/cron"/>
- <mkdir dir="@{deploy-path}/WEB-INF/classes/perfsonar/cron/local"/>
- <touch file="@{deploy-path}/WEB-INF/classes/perfsonar/cron/clmpcron"/>
+ <mkdir
dir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/cron"/>
+ <mkdir
dir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/cron/local"/>
+ <touch
file="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/cron/clmpcron"/>

</target>


Modified: trunk/rnp_java-cl-mp/ant/configure-targets.xml
===================================================================
--- trunk/rnp_java-cl-mp/ant/configure-targets.xml 2008-01-23 14:10:04
UTC (rev 3260)
+++ trunk/rnp_java-cl-mp/ant/configure-targets.xml 2008-01-23 18:58:19
UTC (rev 3261)
@@ -69,7 +69,8 @@
</propertyfile>
</target>

- <target name="resource-protection-for-clmp">
+ <target name="resource-protection-for-clmp"
+ xmlns:psbase="psbase:/base.perfsonar.org">

<echo>CL-MP implements simple resource protection by limiting</echo>
<echo>the number of concurrent processes of a specific tool.</echo>
@@ -103,7 +104,8 @@

</target>

- <target name="measurement-scheduling-for-clmp">
+ <target name="measurement-scheduling-for-clmp"
+ xmlns:psbase="psbase:/base.perfsonar.org">

<echo>CL-MP permits the scheduling of measurements. When a</echo>
<echo>scheduled test is made, CL-MP can send the results to</echo>

Modified: trunk/rnp_java-cl-mp/conf/objects.config
===================================================================
--- trunk/rnp_java-cl-mp/conf/objects.config 2008-01-23 14:10:04 UTC (rev
3260)
+++ trunk/rnp_java-cl-mp/conf/objects.config 2008-01-23 18:58:19 UTC (rev
3261)
@@ -1,186 +1,197 @@
-http://ggf.org/ns/nmwg/base/2.0/subject/
org.ggf.ns.nmwg.base.v2_0.Subject
-http://ggf.org/ns/nmwg/base/2.0/parameters/
org.ggf.ns.nmwg.base.v2_0.Parameters
http://ggf.org/ns/nmwg/base/2.0/commonTime/
org.ggf.ns.nmwg.base.v2_0.CommonTime
http://ggf.org/ns/nmwg/base/2.0/data/ org.ggf.ns.nmwg.base.v2_0.Data
http://ggf.org/ns/nmwg/base/2.0/datum/ org.ggf.ns.nmwg.base.v2_0.Datum
-http://ggf.org/ns/nmwg/base/2.0/parameter/
org.ggf.ns.nmwg.base.v2_0.Parameter
-http://ggf.org/ns/nmwg/base/2.0/metadata/
org.ggf.ns.nmwg.base.v2_0.Metadata
+http://ggf.org/ns/nmwg/base/2.0/element/
org.ggf.ns.nmwg.base.v2_0.Element
+http://ggf.org/ns/nmwg/base/2.0/elementHandler/
org.ggf.ns.nmwg.base.v2_0.ElementHandler
http://ggf.org/ns/nmwg/base/2.0/eventType/
org.ggf.ns.nmwg.base.v2_0.EventType
+http://ggf.org/ns/nmwg/base/2.0/genericHandler/
org.ggf.ns.nmwg.base.v2_0.GenericHandler
+http://ggf.org/ns/nmwg/base/2.0/handler/
org.ggf.ns.nmwg.base.v2_0.Handler
+http://ggf.org/ns/nmwg/base/2.0/key/ org.ggf.ns.nmwg.base.v2_0.Key
http://ggf.org/ns/nmwg/base/2.0/message/
org.ggf.ns.nmwg.base.v2_0.Message
-http://ggf.org/ns/nmwg/base/2.0/key/ org.ggf.ns.nmwg.base.v2_0.Key
+http://ggf.org/ns/nmwg/base/2.0/messageHandler/
org.ggf.ns.nmwg.base.v2_0.MessageHandler
+http://ggf.org/ns/nmwg/base/2.0/metadata/
org.ggf.ns.nmwg.base.v2_0.Metadata
+http://ggf.org/ns/nmwg/base/2.0/parameter/
org.ggf.ns.nmwg.base.v2_0.Parameter
+http://ggf.org/ns/nmwg/base/2.0/parameters/
org.ggf.ns.nmwg.base.v2_0.Parameters
http://ggf.org/ns/nmwg/base/2.0/store/ org.ggf.ns.nmwg.base.v2_0.Store
+http://ggf.org/ns/nmwg/base/2.0/subject/
org.ggf.ns.nmwg.base.v2_0.Subject
+http://ggf.org/ns/nmwg/characteristic/discards/2.0/datum/
org.ggf.ns.nmwg.characteristic.discards.v2_0.Datum
+http://ggf.org/ns/nmwg/characteristic/discards/2.0/parameters/
org.ggf.ns.nmwg.characteristic.discards.v2_0.Parameters
+http://ggf.org/ns/nmwg/characteristic/discards/2.0/subject/
org.ggf.ns.nmwg.characteristic.discards.v2_0.Subject
+http://ggf.org/ns/nmwg/characteristic/errors/2.0/datum/
org.ggf.ns.nmwg.characteristic.errors.v2_0.Datum
+http://ggf.org/ns/nmwg/characteristic/errors/2.0/parameters/
org.ggf.ns.nmwg.characteristic.errors.v2_0.Parameters
+http://ggf.org/ns/nmwg/characteristic/errors/2.0/subject/
org.ggf.ns.nmwg.characteristic.errors.v2_0.Subject
+http://ggf.org/ns/nmwg/characteristic/utilization/2.0/datum/
org.ggf.ns.nmwg.characteristic.utilization.v2_0.Datum
+http://ggf.org/ns/nmwg/characteristic/utilization/2.0/parameters/
org.ggf.ns.nmwg.characteristic.utilization.v2_0.Parameters
http://ggf.org/ns/nmwg/characteristic/utilization/2.0/subject/
org.ggf.ns.nmwg.characteristic.utilization.v2_0.Subject
-http://ggf.org/ns/nmwg/characteristic/utilization/2.0/parameters/
org.ggf.ns.nmwg.characteristic.utilization.v2_0.Parameters
-http://ggf.org/ns/nmwg/characteristic/utilization/2.0/datum/
org.ggf.ns.nmwg.characteristic.utilization.v2_0.Datum
-http://ggf.org/ns/nmwg/characteristic/errors/2.0/subject/
org.ggf.ns.nmwg.characteristic.errors.v2_0.Subject
-http://ggf.org/ns/nmwg/characteristic/errors/2.0/parameters/
org.ggf.ns.nmwg.characteristic.errors.v2_0.Parameters
-http://ggf.org/ns/nmwg/characteristic/errors/2.0/datum/
org.ggf.ns.nmwg.characteristic.errors.v2_0.Datum
-http://ggf.org/ns/nmwg/characteristic/discards/2.0/subject/
org.ggf.ns.nmwg.characteristic.discards.v2_0.Subject
-http://ggf.org/ns/nmwg/characteristic/discards/2.0/parameters/
org.ggf.ns.nmwg.characteristic.discards.v2_0.Parameters
-http://ggf.org/ns/nmwg/characteristic/discards/2.0/datum/
org.ggf.ns.nmwg.characteristic.discards.v2_0.Datum
+http://ggf.org/ns/nmwg/event/status/base/2.0/datum/
org.ggf.ns.nmwg.event.status.base.v2_0.Datum
+http://ggf.org/ns/nmwg/event/status/base/2.0/stateAdmin/
org.ggf.ns.nmwg.event.status.base.v2_0.StateAdmin
http://ggf.org/ns/nmwg/event/status/base/2.0/stateOper/
org.ggf.ns.nmwg.event.status.base.v2_0.StateOper
-http://ggf.org/ns/nmwg/event/status/base/2.0/stateAdmin/
org.ggf.ns.nmwg.event.status.base.v2_0.StateAdmin
-http://ggf.org/ns/nmwg/event/status/base/2.0/datum/
org.ggf.ns.nmwg.event.status.base.v2_0.Datum
+http://ggf.org/ns/nmwg/ops/average/2.0/parameters/
org.ggf.ns.nmwg.ops.average.v2_0.Parameters
http://ggf.org/ns/nmwg/ops/average/2.0/subject/
org.ggf.ns.nmwg.ops.average.v2_0.Subject
-http://ggf.org/ns/nmwg/ops/average/2.0/parameters/
org.ggf.ns.nmwg.ops.average.v2_0.Parameters
+http://ggf.org/ns/nmwg/ops/cdf/2.0/parameters/
org.ggf.ns.nmwg.ops.cdf.v2_0.Parameters
http://ggf.org/ns/nmwg/ops/cdf/2.0/subject/
org.ggf.ns.nmwg.ops.cdf.v2_0.Subject
-http://ggf.org/ns/nmwg/ops/cdf/2.0/parameters/
org.ggf.ns.nmwg.ops.cdf.v2_0.Parameters
+http://ggf.org/ns/nmwg/ops/histogram/2.0/parameters/
org.ggf.ns.nmwg.ops.histogram.v2_0.Parameters
http://ggf.org/ns/nmwg/ops/histogram/2.0/subject/
org.ggf.ns.nmwg.ops.histogram.v2_0.Subject
-http://ggf.org/ns/nmwg/ops/histogram/2.0/parameters/
org.ggf.ns.nmwg.ops.histogram.v2_0.Parameters
+http://ggf.org/ns/nmwg/ops/max/2.0/parameters/
org.ggf.ns.nmwg.ops.max.v2_0.Parameters
http://ggf.org/ns/nmwg/ops/max/2.0/subject/
org.ggf.ns.nmwg.ops.max.v2_0.Subject
-http://ggf.org/ns/nmwg/ops/max/2.0/parameters/
org.ggf.ns.nmwg.ops.max.v2_0.Parameters
+http://ggf.org/ns/nmwg/ops/mean/2.0/parameters/
org.ggf.ns.nmwg.ops.mean.v2_0.Parameters
http://ggf.org/ns/nmwg/ops/mean/2.0/subject/
org.ggf.ns.nmwg.ops.mean.v2_0.Subject
-http://ggf.org/ns/nmwg/ops/mean/2.0/parameters/
org.ggf.ns.nmwg.ops.mean.v2_0.Parameters
+http://ggf.org/ns/nmwg/ops/median/2.0/parameters/
org.ggf.ns.nmwg.ops.median.v2_0.Parameters
http://ggf.org/ns/nmwg/ops/median/2.0/subject/
org.ggf.ns.nmwg.ops.median.v2_0.Subject
-http://ggf.org/ns/nmwg/ops/median/2.0/parameters/
org.ggf.ns.nmwg.ops.median.v2_0.Parameters
+http://ggf.org/ns/nmwg/ops/min/2.0/parameters/
org.ggf.ns.nmwg.ops.min.v2_0.Parameters
http://ggf.org/ns/nmwg/ops/min/2.0/subject/
org.ggf.ns.nmwg.ops.min.v2_0.Subject
-http://ggf.org/ns/nmwg/ops/min/2.0/parameters/
org.ggf.ns.nmwg.ops.min.v2_0.Parameters
+http://ggf.org/ns/nmwg/ops/select/2.0/parameters/
org.ggf.ns.nmwg.ops.select.v2_0.Parameters
http://ggf.org/ns/nmwg/ops/select/2.0/subject/
org.ggf.ns.nmwg.ops.select.v2_0.Subject
-http://ggf.org/ns/nmwg/ops/select/2.0/parameters/
org.ggf.ns.nmwg.ops.select.v2_0.Parameters
http://ggf.org/ns/nmwg/result/2.0/datum/
org.ggf.ns.nmwg.result.v2_0.Datum
http://ggf.org/ns/nmwg/time/2.0/end/ org.ggf.ns.nmwg.time.v2_0.End
-http://ggf.org/ns/nmwg/time/2.0/value/ org.ggf.ns.nmwg.time.v2_0.Value
http://ggf.org/ns/nmwg/time/2.0/start/ org.ggf.ns.nmwg.time.v2_0.Start
http://ggf.org/ns/nmwg/time/2.0/time/ org.ggf.ns.nmwg.time.v2_0.Time
+http://ggf.org/ns/nmwg/time/2.0/value/ org.ggf.ns.nmwg.time.v2_0.Value
+http://ggf.org/ns/nmwg/tools/bwctl/2.0/datum/
org.ggf.ns.nmwg.tools.bwctl.v2_0.Datum
+http://ggf.org/ns/nmwg/tools/bwctl/2.0/parameters/
org.ggf.ns.nmwg.tools.bwctl.v2_0.Parameters
http://ggf.org/ns/nmwg/tools/bwctl/2.0/subject/
org.ggf.ns.nmwg.tools.bwctl.v2_0.Subject
-http://ggf.org/ns/nmwg/tools/bwctl/2.0/parameters/
org.ggf.ns.nmwg.tools.bwctl.v2_0.Parameters
-http://ggf.org/ns/nmwg/tools/bwctl/2.0/datum/
org.ggf.ns.nmwg.tools.bwctl.v2_0.Datum
+http://ggf.org/ns/nmwg/tools/cron/2.0/datum/
org.ggf.ns.nmwg.tools.cron.v2_0.Datum
+http://ggf.org/ns/nmwg/tools/cron/2.0/parameters/
org.ggf.ns.nmwg.tools.cron.v2_0.Parameters
+http://ggf.org/ns/nmwg/tools/cron/2.0/subject/
org.ggf.ns.nmwg.tools.cron.v2_0.Subject
+http://ggf.org/ns/nmwg/tools/flow/2.0/datum/
org.ggf.ns.nmwg.tools.flow.v2_0.Datum
+http://ggf.org/ns/nmwg/tools/flow/2.0/parameters/
org.ggf.ns.nmwg.tools.flow.v2_0.Parameters
+http://ggf.org/ns/nmwg/tools/flow/2.0/subject/
org.ggf.ns.nmwg.tools.flow.v2_0.Subject
+http://ggf.org/ns/nmwg/tools/iperf/2.0/datum/
org.ggf.ns.nmwg.tools.iperf.v2_0.Datum
+http://ggf.org/ns/nmwg/tools/iperf/2.0/parameters/
org.ggf.ns.nmwg.tools.iperf.v2_0.Parameters
http://ggf.org/ns/nmwg/tools/iperf/2.0/subject/
org.ggf.ns.nmwg.tools.iperf.v2_0.Subject
-http://ggf.org/ns/nmwg/tools/iperf/2.0/parameters/
org.ggf.ns.nmwg.tools.iperf.v2_0.Parameters
-http://ggf.org/ns/nmwg/tools/iperf/2.0/datum/
org.ggf.ns.nmwg.tools.iperf.v2_0.Datum
-http://ggf.org/ns/nmwg/tools/netflow/2.0/subject/
org.ggf.ns.nmwg.tools.netflow.v2_0.Subject
+http://ggf.org/ns/nmwg/tools/netflow/2.0/description/
org.ggf.ns.nmwg.tools.netflow.v2_0.Description
http://ggf.org/ns/nmwg/tools/netflow/2.0/flowFormat/
org.ggf.ns.nmwg.tools.netflow.v2_0.FlowFormat
+http://ggf.org/ns/nmwg/tools/netflow/2.0/flowFormats/
org.ggf.ns.nmwg.tools.netflow.v2_0.FlowFormats
http://ggf.org/ns/nmwg/tools/netflow/2.0/name/
org.ggf.ns.nmwg.tools.netflow.v2_0.Name
+http://ggf.org/ns/nmwg/tools/netflow/2.0/parameters/
org.ggf.ns.nmwg.tools.netflow.v2_0.Parameters
http://ggf.org/ns/nmwg/tools/netflow/2.0/router/
org.ggf.ns.nmwg.tools.netflow.v2_0.Router
-http://ggf.org/ns/nmwg/tools/netflow/2.0/description/
org.ggf.ns.nmwg.tools.netflow.v2_0.Description
-http://ggf.org/ns/nmwg/tools/netflow/2.0/flowFormats/
org.ggf.ns.nmwg.tools.netflow.v2_0.FlowFormats
-http://ggf.org/ns/nmwg/tools/netflow/2.0/parameters/
org.ggf.ns.nmwg.tools.netflow.v2_0.Parameters
+http://ggf.org/ns/nmwg/tools/netflow/2.0/subject/
org.ggf.ns.nmwg.tools.netflow.v2_0.Subject
http://ggf.org/ns/nmwg/tools/netflow/2.0/transportFormat/
org.ggf.ns.nmwg.tools.netflow.v2_0.TransportFormat
http://ggf.org/ns/nmwg/tools/netflow/2.0/transportFormats/
org.ggf.ns.nmwg.tools.netflow.v2_0.TransportFormats
+http://ggf.org/ns/nmwg/tools/org/perfsonar/service/lookup/sql/1.0/datum/
org.ggf.ns.nmwg.tools.org.perfsonar.service.lookup.sql.v1_0.Datum
+http://ggf.org/ns/nmwg/tools/org/perfsonar/service/lookup/sql/1.0/parameters/
org.ggf.ns.nmwg.tools.org.perfsonar.service.lookup.sql.v1_0.Parameters
http://ggf.org/ns/nmwg/tools/org/perfsonar/service/lookup/sql/1.0/subject/
org.ggf.ns.nmwg.tools.org.perfsonar.service.lookup.sql.v1_0.Subject
-http://ggf.org/ns/nmwg/tools/org/perfsonar/service/lookup/sql/1.0/parameters/
org.ggf.ns.nmwg.tools.org.perfsonar.service.lookup.sql.v1_0.Parameters
-http://ggf.org/ns/nmwg/tools/org/perfsonar/service/lookup/sql/1.0/datum/
org.ggf.ns.nmwg.tools.org.perfsonar.service.lookup.sql.v1_0.Datum
+http://ggf.org/ns/nmwg/tools/org/perfsonar/service/lookup/xpath/1.0/datum/
org.ggf.ns.nmwg.tools.org.perfsonar.service.lookup.xpath.v1_0.Datum
+http://ggf.org/ns/nmwg/tools/org/perfsonar/service/lookup/xpath/1.0/parameters/

org.ggf.ns.nmwg.tools.org.perfsonar.service.lookup.xpath.v1_0.Parameters
http://ggf.org/ns/nmwg/tools/org/perfsonar/service/lookup/xpath/1.0/subject/
org.ggf.ns.nmwg.tools.org.perfsonar.service.lookup.xpath.v1_0.Subject
-http://ggf.org/ns/nmwg/tools/org/perfsonar/service/lookup/xpath/1.0/parameters/

org.ggf.ns.nmwg.tools.org.perfsonar.service.lookup.xpath.v1_0.Parameters
-http://ggf.org/ns/nmwg/tools/org/perfsonar/service/lookup/xpath/1.0/datum/
org.ggf.ns.nmwg.tools.org.perfsonar.service.lookup.xpath.v1_0.Datum
+http://ggf.org/ns/nmwg/tools/org/perfsonar/service/lookup/xquery/1.0/datum/
org.ggf.ns.nmwg.tools.org.perfsonar.service.lookup.xquery.v1_0.Datum
+http://ggf.org/ns/nmwg/tools/org/perfsonar/service/lookup/xquery/1.0/parameters/

org.ggf.ns.nmwg.tools.org.perfsonar.service.lookup.xquery.v1_0.Parameters

http://ggf.org/ns/nmwg/tools/org/perfsonar/service/lookup/xquery/1.0/subject/
org.ggf.ns.nmwg.tools.org.perfsonar.service.lookup.xquery.v1_0.Subject
-http://ggf.org/ns/nmwg/tools/org/perfsonar/service/lookup/xquery/1.0/parameters/

org.ggf.ns.nmwg.tools.org.perfsonar.service.lookup.xquery.v1_0.Parameters
-http://ggf.org/ns/nmwg/tools/org/perfsonar/service/lookup/xquery/1.0/datum/
org.ggf.ns.nmwg.tools.org.perfsonar.service.lookup.xquery.v1_0.Datum
-http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/subject/
org.ggf.ns.nmwg.tools.org.perfsonar.service.v1_0.Subject
+http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/accessPoint/
org.ggf.ns.nmwg.tools.org.perfsonar.service.v1_0.AccessPoint
+http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/contactEmail/
org.ggf.ns.nmwg.tools.org.perfsonar.service.v1_0.ContactEmail
+http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/datum/
org.ggf.ns.nmwg.tools.org.perfsonar.service.v1_0.Datum
+http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/organization/
org.ggf.ns.nmwg.tools.org.perfsonar.service.v1_0.Organization
+http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/parameters/
org.ggf.ns.nmwg.tools.org.perfsonar.service.v1_0.Parameters
http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/service/
org.ggf.ns.nmwg.tools.org.perfsonar.service.v1_0.Service
+http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/serviceDescription/
org.ggf.ns.nmwg.tools.org.perfsonar.service.v1_0.ServiceDescription
http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/serviceName/
org.ggf.ns.nmwg.tools.org.perfsonar.service.v1_0.ServiceName
http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/serviceType/
org.ggf.ns.nmwg.tools.org.perfsonar.service.v1_0.ServiceType
-http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/contactEmail/
org.ggf.ns.nmwg.tools.org.perfsonar.service.v1_0.ContactEmail
-http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/parameters/
org.ggf.ns.nmwg.tools.org.perfsonar.service.v1_0.Parameters
-http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/organization/
org.ggf.ns.nmwg.tools.org.perfsonar.service.v1_0.Organization
-http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/serviceDescription/
org.ggf.ns.nmwg.tools.org.perfsonar.service.v1_0.ServiceDescription
http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/serviceVersion/
org.ggf.ns.nmwg.tools.org.perfsonar.service.v1_0.ServiceVersion
-http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/datum/
org.ggf.ns.nmwg.tools.org.perfsonar.service.v1_0.Datum
-http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/accessPoint/
org.ggf.ns.nmwg.tools.org.perfsonar.service.v1_0.AccessPoint
+http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/subject/
org.ggf.ns.nmwg.tools.org.perfsonar.service.v1_0.Subject
+http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/parameters/
org.ggf.ns.nmwg.tools.org.perfsonar.v1_0.Parameters
http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/subject/
org.ggf.ns.nmwg.tools.org.perfsonar.v1_0.Subject
-http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/parameters/
org.ggf.ns.nmwg.tools.org.perfsonar.v1_0.Parameters
+http://ggf.org/ns/nmwg/tools/owamp/2.0/datum/
org.ggf.ns.nmwg.tools.owamp.v2_0.Datum
+http://ggf.org/ns/nmwg/tools/owamp/2.0/parameters/
org.ggf.ns.nmwg.tools.owamp.v2_0.Parameters
http://ggf.org/ns/nmwg/tools/owamp/2.0/subject/
org.ggf.ns.nmwg.tools.owamp.v2_0.Subject
-http://ggf.org/ns/nmwg/tools/owamp/2.0/parameters/
org.ggf.ns.nmwg.tools.owamp.v2_0.Parameters
-http://ggf.org/ns/nmwg/tools/owamp/2.0/datum/
org.ggf.ns.nmwg.tools.owamp.v2_0.Datum
+http://ggf.org/ns/nmwg/tools/passivetracefile/2.0/datum/
org.ggf.ns.nmwg.tools.passivetracefile.v2_0.Datum
+http://ggf.org/ns/nmwg/tools/passivetracefile/2.0/parameters/
org.ggf.ns.nmwg.tools.passivetracefile.v2_0.Parameters
http://ggf.org/ns/nmwg/tools/passivetracefile/2.0/subject/
org.ggf.ns.nmwg.tools.passivetracefile.v2_0.Subject
-http://ggf.org/ns/nmwg/tools/passivetracefile/2.0/parameters/
org.ggf.ns.nmwg.tools.passivetracefile.v2_0.Parameters
-http://ggf.org/ns/nmwg/tools/passivetracefile/2.0/datum/
org.ggf.ns.nmwg.tools.passivetracefile.v2_0.Datum
+http://ggf.org/ns/nmwg/tools/ping/2.0/datum/
org.ggf.ns.nmwg.tools.ping.v2_0.Datum
+http://ggf.org/ns/nmwg/tools/ping/2.0/parameters/
org.ggf.ns.nmwg.tools.ping.v2_0.Parameters
http://ggf.org/ns/nmwg/tools/ping/2.0/subject/
org.ggf.ns.nmwg.tools.ping.v2_0.Subject
-http://ggf.org/ns/nmwg/tools/ping/2.0/parameters/
org.ggf.ns.nmwg.tools.ping.v2_0.Parameters
-http://ggf.org/ns/nmwg/tools/ping/2.0/datum/
org.ggf.ns.nmwg.tools.ping.v2_0.Datum
+http://ggf.org/ns/nmwg/tools/schedule/2.0/datum/
org.ggf.ns.nmwg.tools.schedule.v2_0.Datum
+http://ggf.org/ns/nmwg/tools/schedule/2.0/parameters/
org.ggf.ns.nmwg.tools.schedule.v2_0.Parameters
http://ggf.org/ns/nmwg/tools/schedule/2.0/subject/
org.ggf.ns.nmwg.tools.schedule.v2_0.Subject
-http://ggf.org/ns/nmwg/tools/schedule/2.0/parameters/
org.ggf.ns.nmwg.tools.schedule.v2_0.Parameters
-http://ggf.org/ns/nmwg/tools/schedule/2.0/datum/
org.ggf.ns.nmwg.tools.schedule.v2_0.Datum
+http://ggf.org/ns/nmwg/tools/traceroute/2.0/datum/
org.ggf.ns.nmwg.tools.traceroute.v2_0.Datum
+http://ggf.org/ns/nmwg/tools/traceroute/2.0/parameters/
org.ggf.ns.nmwg.tools.traceroute.v2_0.Parameters
http://ggf.org/ns/nmwg/tools/traceroute/2.0/subject/
org.ggf.ns.nmwg.tools.traceroute.v2_0.Subject
-http://ggf.org/ns/nmwg/tools/traceroute/2.0/parameters/
org.ggf.ns.nmwg.tools.traceroute.v2_0.Parameters
-http://ggf.org/ns/nmwg/tools/traceroute/2.0/datum/
org.ggf.ns.nmwg.tools.traceroute.v2_0.Datum
+http://ggf.org/ns/nmwg/topology/base/3.0/address/
org.ggf.ns.nmwg.topology.base.v3_0.Address
http://ggf.org/ns/nmwg/topology/base/3.0/cage/
org.ggf.ns.nmwg.topology.base.v3_0.Cage
+http://ggf.org/ns/nmwg/topology/base/3.0/capacity/
org.ggf.ns.nmwg.topology.base.v3_0.Capacity
+http://ggf.org/ns/nmwg/topology/base/3.0/city/
org.ggf.ns.nmwg.topology.base.v3_0.City
+http://ggf.org/ns/nmwg/topology/base/3.0/country/
org.ggf.ns.nmwg.topology.base.v3_0.Country
+http://ggf.org/ns/nmwg/topology/base/3.0/cpu/
org.ggf.ns.nmwg.topology.base.v3_0.Cpu
+http://ggf.org/ns/nmwg/topology/base/3.0/description/
org.ggf.ns.nmwg.topology.base.v3_0.Description
+http://ggf.org/ns/nmwg/topology/base/3.0/floor/
org.ggf.ns.nmwg.topology.base.v3_0.Floor
+http://ggf.org/ns/nmwg/topology/base/3.0/globalName/
org.ggf.ns.nmwg.topology.base.v3_0.GlobalName
+http://ggf.org/ns/nmwg/topology/base/3.0/hostName/
org.ggf.ns.nmwg.topology.base.v3_0.HostName
+http://ggf.org/ns/nmwg/topology/base/3.0/ifDescription/
org.ggf.ns.nmwg.topology.base.v3_0.IfDescription
+http://ggf.org/ns/nmwg/topology/base/3.0/ifIndex/
org.ggf.ns.nmwg.topology.base.v3_0.IfIndex
http://ggf.org/ns/nmwg/topology/base/3.0/ifName/
org.ggf.ns.nmwg.topology.base.v3_0.IfName
+http://ggf.org/ns/nmwg/topology/base/3.0/index/
org.ggf.ns.nmwg.topology.base.v3_0.Index
+http://ggf.org/ns/nmwg/topology/base/3.0/institution/
org.ggf.ns.nmwg.topology.base.v3_0.Institution
http://ggf.org/ns/nmwg/topology/base/3.0/interface/
org.ggf.ns.nmwg.topology.base.v3_0.Interface
-http://ggf.org/ns/nmwg/topology/base/3.0/shelf/
org.ggf.ns.nmwg.topology.base.v3_0.Shelf
+http://ggf.org/ns/nmwg/topology/base/3.0/lat/
org.ggf.ns.nmwg.topology.base.v3_0.Lat
http://ggf.org/ns/nmwg/topology/base/3.0/latitude/
org.ggf.ns.nmwg.topology.base.v3_0.Latitude
-http://ggf.org/ns/nmwg/topology/base/3.0/hostName/
org.ggf.ns.nmwg.topology.base.v3_0.HostName
-http://ggf.org/ns/nmwg/topology/base/3.0/rack/
org.ggf.ns.nmwg.topology.base.v3_0.Rack
+http://ggf.org/ns/nmwg/topology/base/3.0/link/
org.ggf.ns.nmwg.topology.base.v3_0.Link
+http://ggf.org/ns/nmwg/topology/base/3.0/location/
org.ggf.ns.nmwg.topology.base.v3_0.Location
+http://ggf.org/ns/nmwg/topology/base/3.0/long/
org.ggf.ns.nmwg.topology.base.v3_0.Long
+http://ggf.org/ns/nmwg/topology/base/3.0/longitude/
org.ggf.ns.nmwg.topology.base.v3_0.Longitude
http://ggf.org/ns/nmwg/topology/base/3.0/name/
org.ggf.ns.nmwg.topology.base.v3_0.Name
-http://ggf.org/ns/nmwg/topology/base/3.0/description/
org.ggf.ns.nmwg.topology.base.v3_0.Description
+http://ggf.org/ns/nmwg/topology/base/3.0/network/
org.ggf.ns.nmwg.topology.base.v3_0.Network
http://ggf.org/ns/nmwg/topology/base/3.0/node/
org.ggf.ns.nmwg.topology.base.v3_0.Node
-http://ggf.org/ns/nmwg/topology/base/3.0/institution/
org.ggf.ns.nmwg.topology.base.v3_0.Institution
-http://ggf.org/ns/nmwg/topology/base/3.0/longitude/
org.ggf.ns.nmwg.topology.base.v3_0.Longitude
-http://ggf.org/ns/nmwg/topology/base/3.0/link/
org.ggf.ns.nmwg.topology.base.v3_0.Link
-http://ggf.org/ns/nmwg/topology/base/3.0/long/
org.ggf.ns.nmwg.topology.base.v3_0.Long
+http://ggf.org/ns/nmwg/topology/base/3.0/operSys/
org.ggf.ns.nmwg.topology.base.v3_0.OperSys
+http://ggf.org/ns/nmwg/topology/base/3.0/path/
org.ggf.ns.nmwg.topology.base.v3_0.Path
+http://ggf.org/ns/nmwg/topology/base/3.0/rack/
org.ggf.ns.nmwg.topology.base.v3_0.Rack
http://ggf.org/ns/nmwg/topology/base/3.0/role/
org.ggf.ns.nmwg.topology.base.v3_0.Role
-http://ggf.org/ns/nmwg/topology/base/3.0/globalName/
org.ggf.ns.nmwg.topology.base.v3_0.GlobalName
-http://ggf.org/ns/nmwg/topology/base/3.0/ifDescription/
org.ggf.ns.nmwg.topology.base.v3_0.IfDescription
-http://ggf.org/ns/nmwg/topology/base/3.0/country/
org.ggf.ns.nmwg.topology.base.v3_0.Country
-http://ggf.org/ns/nmwg/topology/base/3.0/operSys/
org.ggf.ns.nmwg.topology.base.v3_0.OperSys
-http://ggf.org/ns/nmwg/topology/base/3.0/index/
org.ggf.ns.nmwg.topology.base.v3_0.Index
-http://ggf.org/ns/nmwg/topology/base/3.0/location/
org.ggf.ns.nmwg.topology.base.v3_0.Location
-http://ggf.org/ns/nmwg/topology/base/3.0/city/
org.ggf.ns.nmwg.topology.base.v3_0.City
http://ggf.org/ns/nmwg/topology/base/3.0/room/
org.ggf.ns.nmwg.topology.base.v3_0.Room
+http://ggf.org/ns/nmwg/topology/base/3.0/shelf/
org.ggf.ns.nmwg.topology.base.v3_0.Shelf
+http://ggf.org/ns/nmwg/topology/base/3.0/state/
org.ggf.ns.nmwg.topology.base.v3_0.State
http://ggf.org/ns/nmwg/topology/base/3.0/streetAddress/
org.ggf.ns.nmwg.topology.base.v3_0.StreetAddress
-http://ggf.org/ns/nmwg/topology/base/3.0/state/
org.ggf.ns.nmwg.topology.base.v3_0.State
-http://ggf.org/ns/nmwg/topology/base/3.0/lat/
org.ggf.ns.nmwg.topology.base.v3_0.Lat
-http://ggf.org/ns/nmwg/topology/base/3.0/floor/
org.ggf.ns.nmwg.topology.base.v3_0.Floor
http://ggf.org/ns/nmwg/topology/base/3.0/type/
org.ggf.ns.nmwg.topology.base.v3_0.Type
-http://ggf.org/ns/nmwg/topology/base/3.0/address/
org.ggf.ns.nmwg.topology.base.v3_0.Address
-http://ggf.org/ns/nmwg/topology/base/3.0/ifIndex/
org.ggf.ns.nmwg.topology.base.v3_0.IfIndex
-http://ggf.org/ns/nmwg/topology/base/3.0/cpu/
org.ggf.ns.nmwg.topology.base.v3_0.Cpu
-http://ggf.org/ns/nmwg/topology/base/3.0/network/
org.ggf.ns.nmwg.topology.base.v3_0.Network
-http://ggf.org/ns/nmwg/topology/base/3.0/path/
org.ggf.ns.nmwg.topology.base.v3_0.Path
-http://ggf.org/ns/nmwg/topology/base/3.0/capacity/
org.ggf.ns.nmwg.topology.base.v3_0.Capacity
http://ggf.org/ns/nmwg/topology/base/3.0/zipCode/
org.ggf.ns.nmwg.topology.base.v3_0.ZipCode
-http://ggf.org/ns/nmwg/topology/l2/3.0/interface/
org.ggf.ns.nmwg.topology.l2.v3_0.Interface
-http://ggf.org/ns/nmwg/topology/l2/3.0/name/
org.ggf.ns.nmwg.topology.l2.v3_0.Name
-http://ggf.org/ns/nmwg/topology/l2/3.0/vlan/
org.ggf.ns.nmwg.topology.l2.v3_0.Vlan
+http://ggf.org/ns/nmwg/topology/l2/3.0/address/
org.ggf.ns.nmwg.topology.l2.v3_0.Address
+http://ggf.org/ns/nmwg/topology/l2/3.0/capacity/
org.ggf.ns.nmwg.topology.l2.v3_0.Capacity
+http://ggf.org/ns/nmwg/topology/l2/3.0/description/
org.ggf.ns.nmwg.topology.l2.v3_0.Description
http://ggf.org/ns/nmwg/topology/l2/3.0/globalName/
org.ggf.ns.nmwg.topology.l2.v3_0.GlobalName
-http://ggf.org/ns/nmwg/topology/l2/3.0/role/
org.ggf.ns.nmwg.topology.l2.v3_0.Role
-http://ggf.org/ns/nmwg/topology/l2/3.0/type/
org.ggf.ns.nmwg.topology.l2.v3_0.Type
-http://ggf.org/ns/nmwg/topology/l2/3.0/description/
org.ggf.ns.nmwg.topology.l2.v3_0.Description
-http://ggf.org/ns/nmwg/topology/l2/3.0/address/
org.ggf.ns.nmwg.topology.l2.v3_0.Address
+http://ggf.org/ns/nmwg/topology/l2/3.0/ifHostName/
org.ggf.ns.nmwg.topology.l2.v3_0.IfHostName
http://ggf.org/ns/nmwg/topology/l2/3.0/ifIndex/
org.ggf.ns.nmwg.topology.l2.v3_0.IfIndex
http://ggf.org/ns/nmwg/topology/l2/3.0/index/
org.ggf.ns.nmwg.topology.l2.v3_0.Index
+http://ggf.org/ns/nmwg/topology/l2/3.0/interface/
org.ggf.ns.nmwg.topology.l2.v3_0.Interface
+http://ggf.org/ns/nmwg/topology/l2/3.0/link/
org.ggf.ns.nmwg.topology.l2.v3_0.Link
+http://ggf.org/ns/nmwg/topology/l2/3.0/name/
org.ggf.ns.nmwg.topology.l2.v3_0.Name
http://ggf.org/ns/nmwg/topology/l2/3.0/network/
org.ggf.ns.nmwg.topology.l2.v3_0.Network
http://ggf.org/ns/nmwg/topology/l2/3.0/path/
org.ggf.ns.nmwg.topology.l2.v3_0.Path
-http://ggf.org/ns/nmwg/topology/l2/3.0/capacity/
org.ggf.ns.nmwg.topology.l2.v3_0.Capacity
-http://ggf.org/ns/nmwg/topology/l2/3.0/ifHostName/
org.ggf.ns.nmwg.topology.l2.v3_0.IfHostName
-http://ggf.org/ns/nmwg/topology/l2/3.0/link/
org.ggf.ns.nmwg.topology.l2.v3_0.Link
-http://ggf.org/ns/nmwg/topology/l3/3.0/ifName/
org.ggf.ns.nmwg.topology.l3.v3_0.IfName
-http://ggf.org/ns/nmwg/topology/l3/3.0/interface/
org.ggf.ns.nmwg.topology.l3.v3_0.Interface
-http://ggf.org/ns/nmwg/topology/l3/3.0/subnet/
org.ggf.ns.nmwg.topology.l3.v3_0.Subnet
+http://ggf.org/ns/nmwg/topology/l2/3.0/role/
org.ggf.ns.nmwg.topology.l2.v3_0.Role
+http://ggf.org/ns/nmwg/topology/l2/3.0/type/
org.ggf.ns.nmwg.topology.l2.v3_0.Type
+http://ggf.org/ns/nmwg/topology/l2/3.0/vlan/
org.ggf.ns.nmwg.topology.l2.v3_0.Vlan
+http://ggf.org/ns/nmwg/topology/l3/3.0/asn/
org.ggf.ns.nmwg.topology.l3.v3_0.Asn
+http://ggf.org/ns/nmwg/topology/l3/3.0/capacity/
org.ggf.ns.nmwg.topology.l3.v3_0.Capacity
http://ggf.org/ns/nmwg/topology/l3/3.0/globalName/
org.ggf.ns.nmwg.topology.l3.v3_0.GlobalName
-http://ggf.org/ns/nmwg/topology/l3/3.0/role/
org.ggf.ns.nmwg.topology.l3.v3_0.Role
-http://ggf.org/ns/nmwg/topology/l3/3.0/netmask/
org.ggf.ns.nmwg.topology.l3.v3_0.Netmask
+http://ggf.org/ns/nmwg/topology/l3/3.0/ifAddress/
org.ggf.ns.nmwg.topology.l3.v3_0.IfAddress
http://ggf.org/ns/nmwg/topology/l3/3.0/ifDescription/
org.ggf.ns.nmwg.topology.l3.v3_0.IfDescription
-http://ggf.org/ns/nmwg/topology/l3/3.0/ifAddress/
org.ggf.ns.nmwg.topology.l3.v3_0.IfAddress
+http://ggf.org/ns/nmwg/topology/l3/3.0/ifHostName/
org.ggf.ns.nmwg.topology.l3.v3_0.IfHostName
+http://ggf.org/ns/nmwg/topology/l3/3.0/ifIndex/
org.ggf.ns.nmwg.topology.l3.v3_0.IfIndex
+http://ggf.org/ns/nmwg/topology/l3/3.0/ifName/
org.ggf.ns.nmwg.topology.l3.v3_0.IfName
http://ggf.org/ns/nmwg/topology/l3/3.0/index/
org.ggf.ns.nmwg.topology.l3.v3_0.Index
+http://ggf.org/ns/nmwg/topology/l3/3.0/interface/
org.ggf.ns.nmwg.topology.l3.v3_0.Interface
http://ggf.org/ns/nmwg/topology/l3/3.0/ipAddress/
org.ggf.ns.nmwg.topology.l3.v3_0.IpAddress
+http://ggf.org/ns/nmwg/topology/l3/3.0/link/
org.ggf.ns.nmwg.topology.l3.v3_0.Link
http://ggf.org/ns/nmwg/topology/l3/3.0/name/
org.ggf.ns.nmwg.topology.l3.v3_0.Name
-http://ggf.org/ns/nmwg/topology/l3/3.0/asn/
org.ggf.ns.nmwg.topology.l3.v3_0.Asn
-http://ggf.org/ns/nmwg/topology/l3/3.0/type/
org.ggf.ns.nmwg.topology.l3.v3_0.Type
-http://ggf.org/ns/nmwg/topology/l3/3.0/ifIndex/
org.ggf.ns.nmwg.topology.l3.v3_0.IfIndex
+http://ggf.org/ns/nmwg/topology/l3/3.0/netmask/
org.ggf.ns.nmwg.topology.l3.v3_0.Netmask
http://ggf.org/ns/nmwg/topology/l3/3.0/network/
org.ggf.ns.nmwg.topology.l3.v3_0.Network
http://ggf.org/ns/nmwg/topology/l3/3.0/path/
org.ggf.ns.nmwg.topology.l3.v3_0.Path
-http://ggf.org/ns/nmwg/topology/l3/3.0/link/
org.ggf.ns.nmwg.topology.l3.v3_0.Link
-http://ggf.org/ns/nmwg/topology/l3/3.0/ifHostName/
org.ggf.ns.nmwg.topology.l3.v3_0.IfHostName
-http://ggf.org/ns/nmwg/topology/l3/3.0/capacity/
org.ggf.ns.nmwg.topology.l3.v3_0.Capacity
+http://ggf.org/ns/nmwg/topology/l3/3.0/role/
org.ggf.ns.nmwg.topology.l3.v3_0.Role
+http://ggf.org/ns/nmwg/topology/l3/3.0/subnet/
org.ggf.ns.nmwg.topology.l3.v3_0.Subnet
+http://ggf.org/ns/nmwg/topology/l3/3.0/type/
org.ggf.ns.nmwg.topology.l3.v3_0.Type
+http://ggf.org/ns/nmwg/topology/l4/3.0/address/
org.ggf.ns.nmwg.topology.l4.v3_0.Address
http://ggf.org/ns/nmwg/topology/l4/3.0/endPoint/
org.ggf.ns.nmwg.topology.l4.v3_0.EndPoint
-http://ggf.org/ns/nmwg/topology/l4/3.0/role/
org.ggf.ns.nmwg.topology.l4.v3_0.Role
-http://ggf.org/ns/nmwg/topology/l4/3.0/address/
org.ggf.ns.nmwg.topology.l4.v3_0.Address
http://ggf.org/ns/nmwg/topology/l4/3.0/endPointPair/
org.ggf.ns.nmwg.topology.l4.v3_0.EndPointPair
http://ggf.org/ns/nmwg/topology/l4/3.0/path/
org.ggf.ns.nmwg.topology.l4.v3_0.Path
+http://ggf.org/ns/nmwg/topology/l4/3.0/role/
org.ggf.ns.nmwg.topology.l4.v3_0.Role
+http://ggf.org/ns/nmwg/topology/2.0/authRealm/
org.ggf.ns.nmwg.topology.v2_0.AuthRealm
+http://ggf.org/ns/nmwg/topology/2.0/capacity/
org.ggf.ns.nmwg.topology.v2_0.Capacity
+http://ggf.org/ns/nmwg/topology/2.0/classOfService/
org.ggf.ns.nmwg.topology.v2_0.ClassOfService
+http://ggf.org/ns/nmwg/topology/2.0/direction/
org.ggf.ns.nmwg.topology.v2_0.Direction
+http://ggf.org/ns/nmwg/topology/2.0/dst/
org.ggf.ns.nmwg.topology.v2_0.Dst
+http://ggf.org/ns/nmwg/topology/2.0/endPoint/
org.ggf.ns.nmwg.topology.v2_0.EndPoint
+http://ggf.org/ns/nmwg/topology/2.0/endPointPair/
org.ggf.ns.nmwg.topology.v2_0.EndPointPair
+http://ggf.org/ns/nmwg/topology/2.0/hostName/
org.ggf.ns.nmwg.topology.v2_0.HostName
+http://ggf.org/ns/nmwg/topology/2.0/ifAddress/
org.ggf.ns.nmwg.topology.v2_0.IfAddress
+http://ggf.org/ns/nmwg/topology/2.0/ifDescription/
org.ggf.ns.nmwg.topology.v2_0.IfDescription
+http://ggf.org/ns/nmwg/topology/2.0/ifIndex/
org.ggf.ns.nmwg.topology.v2_0.IfIndex
http://ggf.org/ns/nmwg/topology/2.0/ifName/
org.ggf.ns.nmwg.topology.v2_0.IfName
http://ggf.org/ns/nmwg/topology/2.0/interface/
org.ggf.ns.nmwg.topology.v2_0.Interface
-http://ggf.org/ns/nmwg/topology/2.0/ifDescription/
org.ggf.ns.nmwg.topology.v2_0.IfDescription
-http://ggf.org/ns/nmwg/topology/2.0/ifAddress/
org.ggf.ns.nmwg.topology.v2_0.IfAddress
-http://ggf.org/ns/nmwg/topology/2.0/classOfService/
org.ggf.ns.nmwg.topology.v2_0.ClassOfService
http://ggf.org/ns/nmwg/topology/2.0/ipAddress/
org.ggf.ns.nmwg.topology.v2_0.IpAddress
-http://ggf.org/ns/nmwg/topology/2.0/hostName/
org.ggf.ns.nmwg.topology.v2_0.HostName
-http://ggf.org/ns/nmwg/topology/2.0/endPoint/
org.ggf.ns.nmwg.topology.v2_0.EndPoint
-http://ggf.org/ns/nmwg/topology/2.0/direction/
org.ggf.ns.nmwg.topology.v2_0.Direction
+http://ggf.org/ns/nmwg/topology/2.0/src/
org.ggf.ns.nmwg.topology.v2_0.Src
http://ggf.org/ns/nmwg/topology/2.0/type/
org.ggf.ns.nmwg.topology.v2_0.Type
-http://ggf.org/ns/nmwg/topology/2.0/authRealm/
org.ggf.ns.nmwg.topology.v2_0.AuthRealm
-http://ggf.org/ns/nmwg/topology/2.0/ifIndex/
org.ggf.ns.nmwg.topology.v2_0.IfIndex
-http://ggf.org/ns/nmwg/topology/2.0/src/
org.ggf.ns.nmwg.topology.v2_0.Src
-http://ggf.org/ns/nmwg/topology/2.0/dst/
org.ggf.ns.nmwg.topology.v2_0.Dst
-http://ggf.org/ns/nmwg/topology/2.0/endPointPair/
org.ggf.ns.nmwg.topology.v2_0.EndPointPair
-http://ggf.org/ns/nmwg/topology/2.0/capacity/
org.ggf.ns.nmwg.topology.v2_0.Capacity

Modified:
trunk/rnp_java-cl-mp/src/main/java/org/perfsonar/service/measurementPoint/commandLine/tools/Cron.java
===================================================================
---
trunk/rnp_java-cl-mp/src/main/java/org/perfsonar/service/measurementPoint/commandLine/tools/Cron.java
2008-01-23 14:10:04 UTC (rev 3260)
+++
trunk/rnp_java-cl-mp/src/main/java/org/perfsonar/service/measurementPoint/commandLine/tools/Cron.java
2008-01-23 18:58:19 UTC (rev 3261)
@@ -247,10 +247,11 @@
}
}
}
-
+
+ Parameters params = null;
if (action.equals("add") || action.equals("modify")) {

- Parameters params = metadata.getParameters();
+ params = metadata.getParameters();

if (params == null) {
logger
@@ -263,76 +264,76 @@
+
".validateMessageRequest: No parameters in metadata element "
+ "found in
request.");
}
+ }
+
+ StringBuilder entry = new StringBuilder();

- StringBuilder entry = new StringBuilder();
+ if (action.equals("add")) {
+ if (metadataCollection.size() < 2) {
+ logger
+ .fatal(CNAME
+ + ".validateMessageRequest:
At least two metadatas are "
+ + "required in message to add
a new schedule.");
+ throw new PerfSONARException(
+
"error.mp.clmp.validator.no_metadata_elements",
+ CNAME
+ + ".validateMessageRequest:
At least two metadatas are "
+ + "required in message to add
a new schedule.");
+ }

- if (action.equals("add")) {
- if (metadataCollection.size() < 2) {
- logger
- .fatal(CNAME
- +
".validateMessageRequest: At least two metadatas are "
- +
"required in message to add a new schedule.");
- throw new PerfSONARException(
-
"error.mp.clmp.validator.no_metadata_elements",
- CNAME
- +
".validateMessageRequest: At least two metadatas are "
- +
"required in message to add a new schedule.");
- }
+ if (metadata.getSubject() == null
+ ||
metadata.getSubject().getMetadataIdRef() == null) {
+ logger
+ .fatal(CNAME
+ + ".validateMessageRequest:
Cron metadata must reference a "
+ + "second metadata that
represents the tool measurement request.");
+ throw new PerfSONARException(
+
"error.mp.clmp.validator.no_metadata_elements",
+ CNAME
+ + ".validateMessageRequest:
Cron metadata must reference a "
+ + "second metadata that
represents the tool measurement request.");
+ }

- if (metadata.getSubject() == null
- ||
metadata.getSubject().getMetadataIdRef() == null) {
- logger
- .fatal(CNAME
- +
".validateMessageRequest: Cron metadata must reference a "
- +
"second metadata that represents the tool measurement request.");
- throw new PerfSONARException(
-
"error.mp.clmp.validator.no_metadata_elements",
- CNAME
- +
".validateMessageRequest: Cron metadata must reference a "
- +
"second metadata that represents the tool measurement request.");
+ Metadata lastMetadata = null;
+ Metadata secondMetadata = request.getMetadata(metadata
+ .getSubject().getMetadataIdRef());
+
+ while (secondMetadata.getEventType() == null) {
+ lastMetadata = secondMetadata;
+ if (secondMetadata.getSubject() != null
+ &&
secondMetadata.getSubject().getMetadataIdRef() != null){
+ secondMetadata =
request.getMetadata(secondMetadata.getSubject()
+ .getMetadataIdRef());
}
-
- Metadata lastMetadata = null;
- Metadata secondMetadata =
request.getMetadata(metadata
-
.getSubject().getMetadataIdRef());
-
- while (secondMetadata.getEventType() == null)
{
- lastMetadata = secondMetadata;
- if (secondMetadata.getSubject() !=
null
- &&
secondMetadata.getSubject().getMetadataIdRef() != null){
- secondMetadata =
request.getMetadata(secondMetadata.getSubject()
-
.getMetadataIdRef());
+ else {
+ if
(secondMetadata.getMetadataIdRef().length() > 0) {
+ secondMetadata =
request.getMetadata(secondMetadata.getMetadataIdRef());
+ } else {
+ logger
+ .fatal(CNAME
+ + ": Request
must have at least one EventType defined other than schedule.");
+ throw new PerfSONARException(
+
"error.mp.clmp.validator.no_metadata_eventType",
+ CNAME
+ + ": Request
must have at least one EventType defined other than schedule.");
}
- else {
- if
(secondMetadata.getMetadataIdRef().length() > 0) {
- secondMetadata =
request.getMetadata(secondMetadata.getMetadataIdRef());
- } else {
- logger
-
.fatal(CNAME
-
+ ": Request must have at least one EventType defined other than
schedule.");
- throw new
PerfSONARException(
-
"error.mp.clmp.validator.no_metadata_eventType",
- CNAME
-
+ ": Request must have at least one EventType defined other than
schedule.");
- }
- }
}
-
- secondMetadata.setId(secondMetadata.getId() +
"-"
- + System.currentTimeMillis());
-
- if (lastMetadata != null){
-
lastMetadata.setMetadataIdRef(secondMetadata.getId());
- data.setMetadataIdRef(metadata
-
.getSubject().getMetadataIdRef());
- }
- else
-
data.setMetadataIdRef(secondMetadata.getId());
-
- request.updateMetadata();
- metadataMap.remove(metadata.getId());
}

+ secondMetadata.setId(secondMetadata.getId() + "-"
+ + System.currentTimeMillis());
+
+ if (lastMetadata != null){
+
lastMetadata.setMetadataIdRef(secondMetadata.getId());
+ data.setMetadataIdRef(metadata
+
.getSubject().getMetadataIdRef());
+ }
+ else
+ data.setMetadataIdRef(secondMetadata.getId());
+
+ request.updateMetadata();
+ metadataMap.remove(metadata.getId());
+
if (params.getParameterByName("minutes") == null
|| params.getParameterByName("hours")
== null
|| params.getParameterByName("dom")
== null
@@ -340,150 +341,196 @@
|| params.getParameterByName("dow")
== null) {

logger
- .fatal(CNAME
- +
".validateMessageRequest: For action '"
- + action
- + "' the
following "
- + "parameters
need to be set: minutes, hours, dom, months and dow.");
+ .fatal(CNAME
+ + ".validateMessageRequest:
For action '"
+ + action
+ + "' the following "
+ + "parameters need to be set:
minutes, hours, dom, months and dow.");
throw new PerfSONARException(

"error.mp.clmp.validator.parameter_mising",
CNAME
- +
".validateMessageRequest: For action '"
- + action
- + "' the
following "
- + "parameters
need to be set: minutes, hours, dom, months and dow.");
+ + ".validateMessageRequest:
For action '"
+ + action
+ + "' the following "
+ + "parameters need to be set:
minutes, hours, dom, months and dow.");
}
-
- // Parsing and evaluating parameter minutes
-
- String errorString = CNAME
- + ".validateMessageRequest: Parameter
'minutes' syntax error. "
- + "Minutes should be separated by ','
and ranges defined by '-'. "
- + "Examples: '10,14,35' '20-30',
'*/5', '10,14,20-30,35'. min=0, max=59 ";
-
- String minutes = params.getParameterByName("minutes")
- .getParameterValue();
-
- if (validateField(minutes, 0, 59))
- entry.append(padding(minutes, 80));
- else {
- logger.fatal(errorString);
- throw new PerfSONARException(
-
"error.mp.clmp.validator.parameter_syntax_error",
- errorString);
- }
-
+
+ // Parsing and evaluating parameter minutes

+ parseMinutes(params, entry, false);
// Parsing and evaluating parameter hours
+ parseHours(params, entry, false);
+ // Parsing and evaluating parameter dom
+ parseDom(params, entry, false);
+ // Parsing and evaluating parameter months
+ parseMonths(params, entry, false);
+ // Parsing and evaluating parameter dow
+ parseDow(params, entry, false);
+ // Parsing and evaluating parameter ma
+ parseMa(params, entry);
+ }

- errorString = CNAME
- + ".validateMessageRequest: Parameter
'hours' syntax error. "
- + "Hours should be separated by ','
and ranges defined by '-'. "
- + "Examples: '0,3,20' '10-15', '*/5',
'1,3,10-14,22'. min=0, max=23";
+ if (action.equals("modify")) {
+ parseMinutes(params, entry,
params.getParameterByName("minutes") == null);
+ parseHours(params, entry,
params.getParameterByName("hours") == null);
+ parseDom(params, entry,
params.getParameterByName("dom") == null);
+ parseMonths(params, entry,
params.getParameterByName("months") == null);
+ parseDow(params, entry,
params.getParameterByName("dow") == null);
+ parseMa(params, entry);
+ }
+
+ req.setEntry(entry.toString());
+
+ return req;
+ }

- String hours = params.getParameterByName("hours")
- .getParameterValue();
+ private void parseMa(Parameters params, StringBuilder entry) throws
PerfSONARException {
+ if (params.getParameterByName("ma") != null) {

- if (validateField(hours, 0, 23))
- entry.append(padding(hours, 30));
- else {
- logger.fatal(errorString);
- throw new PerfSONARException(
-
"error.mp.clmp.validator.parameter_syntax_error",
- errorString);
- }
+ String ma =
params.getParameterByName("ma").getParameterValue();

- // Parsing and evaluating parameter dom
+ String maRegex =
"^http://[0-9]*\\.[0-9]*\\.[0-9]*\\.[0-9]*.*$";;
+ Pattern maPattern = Pattern.compile(maRegex);
+ Matcher matcher = null;
+ matcher = maPattern.matcher(ma);

- errorString = CNAME
- + ".validateMessageRequest: Parameter
'dom' syntax error. "
- + "dom (DayOfMonth) should be
separated by ',' and ranges defined by '-'. "
- + "Examples: '1,3,20' '10-15', '*/2',
'1,3,10-14,22'. min=1, max=31";
-
- String dom =
params.getParameterByName("dom").getParameterValue();
-
- if (validateField(dom, 1, 31))
- entry.append(padding(dom, 40));
- else {
- logger.fatal(errorString);
+ if (!ma.equals("local") && !matcher.matches()) {
+ logger
+ .fatal(CNAME
+ +
".validateMessageRequest: paramater 'ma' must be "
+ + "the full
URL of a MA. Example: http://10.10.10.10";
+ +
":8080/perfSONAR-SQL-MA-1.0/services/MeasurementAr"
+ +
"chiveService");
throw new PerfSONARException(

"error.mp.clmp.validator.parameter_syntax_error",
- errorString);
+ CNAME
+ +
".validateMessageRequest: paramater 'ma' must be "
+ + "the full
URL of a MA. Example: http://10.10.10.10";
+ +
":8080/perfSONAR-SQL-MA-1.0/services/MeasurementAr"
+ +
"chiveService");
}

- // Parsing and evaluating parameter months
+ entry.append(padding(ma, 150));
+ } else {
+ entry.append(padding("default", 150));
+ }
+ }

- errorString = CNAME
- + ".validateMessageRequest: Parameter
'months' syntax error. "
- + "months should be separated by ','
and ranges defined by '-'. "
- + "Examples: '1,3' '8-11', '*/2',
'1,3-6,12'. min=1, max=12";
+ private void parseDow(Parameters params, StringBuilder entry, boolean
setNull) throws PerfSONARException {
+ if(setNull){
+ entry.append(padding("null", 6));
+ return;
+ }
+
+ String errorString = CNAME
+ + ".validateMessageRequest: Parameter 'dow'
syntax error. "
+ + "dow (DayOfWeek) should be separated by ','
and ranges defined by '-'. "
+ + "Examples: '1,2' '3-6', '*/2', '1,3-5,6'.
min=0 (sunday), max=6 (saturday)";

- String months = params.getParameterByName("months")
- .getParameterValue();
+ String dow =
params.getParameterByName("dow").getParameterValue();

- if (validateField(months, 1, 12))
- entry.append(padding(months, 20));
- else {
- logger.fatal(errorString);
- throw new PerfSONARException(
-
"error.mp.clmp.validator.parameter_syntax_error",
- errorString);
- }
+ if (validateField(dow, 0, 6))
+ entry.append(padding(dow, 6));
+ else {
+ logger.fatal(errorString);
+ throw new PerfSONARException(
+
"error.mp.clmp.validator.parameter_syntax_error",
+ errorString);
+ }
+ }

- // Parsing and evaluating parameter dow
+ private void parseMonths(Parameters params, StringBuilder entry,
boolean setNull) throws PerfSONARException {
+ if(setNull){
+ entry.append(padding("null", 20));
+ return;
+ }
+
+ String errorString = CNAME
+ + ".validateMessageRequest: Parameter
'months' syntax error. "
+ + "months should be separated by ',' and
ranges defined by '-'. "
+ + "Examples: '1,3' '8-11', '*/2', '1,3-6,12'.
min=1, max=12";

- errorString = CNAME
- + ".validateMessageRequest: Parameter
'dow' syntax error. "
- + "dow (DayOfWeek) should be
separated by ',' and ranges defined by '-'. "
- + "Examples: '1,2' '3-6', '*/2',
'1,3-5,6'. min=0 (sunday), max=6 (saturday)";
+ String months = params.getParameterByName("months")
+ .getParameterValue();

- String dow =
params.getParameterByName("dow").getParameterValue();
+ if (validateField(months, 1, 12))
+ entry.append(padding(months, 20));
+ else {
+ logger.fatal(errorString);
+ throw new PerfSONARException(
+
"error.mp.clmp.validator.parameter_syntax_error",
+ errorString);
+ }
+ }

- if (validateField(dow, 0, 6))
- entry.append(padding(dow, 6));
- else {
- logger.fatal(errorString);
- throw new PerfSONARException(
-
"error.mp.clmp.validator.parameter_syntax_error",
- errorString);
- }
+ private void parseDom(Parameters params, StringBuilder entry, boolean
setNull) throws PerfSONARException {
+ if(setNull){
+ entry.append(padding("null", 40));
+ return;
+ }
+
+ String errorString = CNAME
+ + ".validateMessageRequest: Parameter 'dom'
syntax error. "
+ + "dom (DayOfMonth) should be separated by
',' and ranges defined by '-'. "
+ + "Examples: '1,3,20' '10-15', '*/2',
'1,3,10-14,22'. min=1, max=31";

- // Parsing and evaluating parameter ma
+ String dom =
params.getParameterByName("dom").getParameterValue();

- if (params.getParameterByName("ma") != null) {
+ if (validateField(dom, 1, 31))
+ entry.append(padding(dom, 40));
+ else {
+ logger.fatal(errorString);
+ throw new PerfSONARException(
+
"error.mp.clmp.validator.parameter_syntax_error",
+ errorString);
+ }
+ }

- String ma =
params.getParameterByName("ma").getParameterValue();
+ private void parseHours(Parameters params, StringBuilder entry,
boolean setNull) throws PerfSONARException {
+ if(setNull){
+ entry.append(padding("null", 30));
+ return;
+ }
+
+ String errorString = CNAME
+ + ".validateMessageRequest: Parameter 'hours'
syntax error. "
+ + "Hours should be separated by ',' and
ranges defined by '-'. "
+ + "Examples: '0,3,20' '10-15', '*/5',
'1,3,10-14,22'. min=0, max=23";

- String maRegex =
"^http://[0-9]*\\.[0-9]*\\.[0-9]*\\.[0-9]*.*$";;
- Pattern maPattern = Pattern.compile(maRegex);
- Matcher matcher = null;
- matcher = maPattern.matcher(ma);
+ String hours = params.getParameterByName("hours")
+ .getParameterValue();

- if (!ma.equals("local") &&
!matcher.matches()) {
- logger
- .fatal(CNAME
- +
".validateMessageRequest: paramater 'ma' must be "
- +
"the full URL of a MA. Example: http://10.10.10.10";
- +
":8080/perfSONAR-SQL-MA-1.0/services/MeasurementAr"
- +
"chiveService");
- throw new PerfSONARException(
-
"error.mp.clmp.validator.parameter_syntax_error",
- CNAME
- +
".validateMessageRequest: paramater 'ma' must be "
- +
"the full URL of a MA. Example: http://10.10.10.10";
- +
":8080/perfSONAR-SQL-MA-1.0/services/MeasurementAr"
- +
"chiveService");
- }
+ if (validateField(hours, 0, 23))
+ entry.append(padding(hours, 30));
+ else {
+ logger.fatal(errorString);
+ throw new PerfSONARException(
+
"error.mp.clmp.validator.parameter_syntax_error",
+ errorString);
+ }
+ }

- entry.append(padding(ma, 150));
- } else {
- entry.append(padding("default", 150));
- }
+ private void parseMinutes(Parameters params, StringBuilder entry,
boolean setNull) throws PerfSONARException {
+ if(setNull){
+ entry.append(padding("null", 80));
+ return;
+ }
+
+ String errorString = CNAME
+ + ".validateMessageRequest: Parameter
'minutes' syntax error. "
+ + "Minutes should be separated by ',' and
ranges defined by '-'. "
+ + "Examples: '10,14,35' '20-30', '*/5',
'10,14,20-30,35'. min=0, max=59 ";

- req.setEntry(entry.toString());
+ String minutes = params.getParameterByName("minutes")
+ .getParameterValue();

+ if (validateField(minutes, 0, 59))
+ entry.append(padding(minutes, 80));
+ else {
+ logger.fatal(errorString);
+ throw new PerfSONARException(
+
"error.mp.clmp.validator.parameter_syntax_error",
+ errorString);
}
-
- return req;
}

private boolean validateField(String field, int min, int max) {

Modified:
trunk/rnp_java-cl-mp/src/main/java/org/perfsonar/service/measurementPoint/commandLine/utils/Entries.java
===================================================================
---
trunk/rnp_java-cl-mp/src/main/java/org/perfsonar/service/measurementPoint/commandLine/utils/Entries.java
2008-01-23 14:10:04 UTC (rev 3260)
+++
trunk/rnp_java-cl-mp/src/main/java/org/perfsonar/service/measurementPoint/commandLine/utils/Entries.java
2008-01-23 18:58:19 UTC (rev 3261)
@@ -181,11 +181,17 @@

public int modifyEntry(String key, Entries newEntry, int pos) {
if (key.equals(this.key)) {
- minutes = newEntry.getMinutes();
- hours = newEntry.getHours();
- dom = newEntry.getDom();
- months = newEntry.getMonths();
- dow = newEntry.getDow();
+ if(newEntry.getMinutes() != -1)
+ minutes = newEntry.getMinutes();
+ if(newEntry.getHours() != -1)
+ hours = newEntry.getHours();
+ if(newEntry.getDom() != -1)
+ dom = newEntry.getDom();
+ if(newEntry.getMonths() != -1)
+ months = newEntry.getMonths();
+ if(newEntry.getDow() != -1)
+ dow = newEntry.getDow();
+
ma = newEntry.getMa();
return pos;
} else if (!nextEntry.isEmpty())


  • perfsonar: r3261 - in trunk/rnp_java-cl-mp: ant conf src/main/java/org/perfsonar/service/measurementPoint/commandLine/tools src/main/java/org/perfsonar/service/measurementPoint/commandLine/utils, svnlog, 01/23/2008

Archive powered by MHonArc 2.6.16.

Top of Page