Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r3345 - in trunk/rnp_java-cl-mp: ant conf conf/axis-1.4 conf/axis-1.4/WEB-INF doc doc/schema lib/misc samples samples/requests samples/responses src/main/java src/main/java/org/perfsonar/service/measurementPoint/commandLine/tools src/main/java/perfSONARWebAdmin src/main/java/perfSONARWebAdmin/admin src/main/java/perfSONARWebAdmin/admin/wizard src/main/java/perfSONARWebAdmin/admin/wizard/services

Subject: perfsonar development work

List archive

perfsonar: r3345 - in trunk/rnp_java-cl-mp: ant conf conf/axis-1.4 conf/axis-1.4/WEB-INF doc doc/schema lib/misc samples samples/requests samples/responses src/main/java src/main/java/org/perfsonar/service/measurementPoint/commandLine/tools src/main/java/perfSONARWebAdmin src/main/java/perfSONARWebAdmin/admin src/main/java/perfSONARWebAdmin/admin/wizard src/main/java/perfSONARWebAdmin/admin/wizard/services


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r3345 - in trunk/rnp_java-cl-mp: ant conf conf/axis-1.4 conf/axis-1.4/WEB-INF doc doc/schema lib/misc samples samples/requests samples/responses src/main/java src/main/java/org/perfsonar/service/measurementPoint/commandLine/tools src/main/java/perfSONARWebAdmin src/main/java/perfSONARWebAdmin/admin src/main/java/perfSONARWebAdmin/admin/wizard src/main/java/perfSONARWebAdmin/admin/wizard/services
  • Date: Tue, 12 Feb 2008 07:45:37 -0500
Author: fernandes
Date: 2008-02-12 07:45:37 -0500 (Tue, 12 Feb 2008)
New Revision: 3345

Added:
trunk/rnp_java-cl-mp/conf/axis-1.4/WEB-INF/server-config.wsdd
trunk/rnp_java-cl-mp/conf/axis-1.4/default.css
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/conf/service.properties.template-2
trunk/rnp_java-cl-mp/conf/servlet.properties
trunk/rnp_java-cl-mp/conf/wizard.properties
trunk/rnp_java-cl-mp/conf/wizardproperties.dtd
trunk/rnp_java-cl-mp/doc/CLMP Components Properties.doc
trunk/rnp_java-cl-mp/doc/CLMP Functional Specification.doc
trunk/rnp_java-cl-mp/doc/CLMP Installation Actions Specification.doc
trunk/rnp_java-cl-mp/doc/CLMP Interface Specification.doc
trunk/rnp_java-cl-mp/doc/CLMP Service Properties.doc
trunk/rnp_java-cl-mp/doc/schema/
trunk/rnp_java-cl-mp/doc/schema/anyElement.rnc
trunk/rnp_java-cl-mp/doc/schema/bwctlRequest.rnc
trunk/rnp_java-cl-mp/doc/schema/bwctlResponse.rnc
trunk/rnp_java-cl-mp/doc/schema/cronRequest.rnc
trunk/rnp_java-cl-mp/doc/schema/cronRequestAdd.rnc
trunk/rnp_java-cl-mp/doc/schema/cronRequestList.rnc
trunk/rnp_java-cl-mp/doc/schema/cronRequestModify.rnc
trunk/rnp_java-cl-mp/doc/schema/cronRequestRemove.rnc
trunk/rnp_java-cl-mp/doc/schema/cronResponseList.rnc
trunk/rnp_java-cl-mp/doc/schema/owampRequest.rnc
trunk/rnp_java-cl-mp/doc/schema/owampResponse.rnc
trunk/rnp_java-cl-mp/doc/schema/pingRequest.rnc
trunk/rnp_java-cl-mp/doc/schema/pingResponse.rnc
trunk/rnp_java-cl-mp/doc/schema/tracerouteRequest.rnc
trunk/rnp_java-cl-mp/doc/schema/tracerouteResponse.rnc
trunk/rnp_java-cl-mp/lib/misc/perfsonar-base-ant-1.0.20080204.jar
trunk/rnp_java-cl-mp/samples/requests/CronAdd.xml
trunk/rnp_java-cl-mp/samples/requests/CronAddOwamp.xml
trunk/rnp_java-cl-mp/samples/requests/CronAddPing.xml
trunk/rnp_java-cl-mp/samples/requests/CronList.xml
trunk/rnp_java-cl-mp/samples/requests/CronListSpecific.xml
trunk/rnp_java-cl-mp/samples/requests/CronModify.xml
trunk/rnp_java-cl-mp/samples/requests/CronRemove.xml
trunk/rnp_java-cl-mp/samples/responses/
trunk/rnp_java-cl-mp/samples/responses/CronAddPingResponse.xml
trunk/rnp_java-cl-mp/samples/responses/CronListResponse.xml
trunk/rnp_java-cl-mp/samples/responses/CronListSpecificResponse.xml
trunk/rnp_java-cl-mp/samples/responses/CronModifyResponse.xml
trunk/rnp_java-cl-mp/samples/responses/CronRemoveResponse.xml
trunk/rnp_java-cl-mp/src/main/java/perfSONARWebAdmin/
trunk/rnp_java-cl-mp/src/main/java/perfSONARWebAdmin/admin/
trunk/rnp_java-cl-mp/src/main/java/perfSONARWebAdmin/admin/wizard/
trunk/rnp_java-cl-mp/src/main/java/perfSONARWebAdmin/admin/wizard/services/

trunk/rnp_java-cl-mp/src/main/java/perfSONARWebAdmin/admin/wizard/services/CLMPHandler.java
Removed:
trunk/rnp_java-cl-mp/doc/~$stallation_Actions_Specification.doc
trunk/rnp_java-cl-mp/doc/~$terface_Specification.doc
trunk/rnp_java-cl-mp/lib/misc/perfsonar-base-ant-1.0.20070927.jar
trunk/rnp_java-cl-mp/samples/rncs/
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/axis-1.4/WEB-INF/web.xml
trunk/rnp_java-cl-mp/conf/axis-1.4/index.html
trunk/rnp_java-cl-mp/conf/objects.config
trunk/rnp_java-cl-mp/conf/service.properties.template

trunk/rnp_java-cl-mp/src/main/java/org/perfsonar/service/measurementPoint/commandLine/tools/Cron.java
Log:
Modifications for CL-MP 2.0 RC2:
Web admin servlets support added.
RNCs and Documentation updated.

Modified: trunk/rnp_java-cl-mp/ant/axis-deploy-targets.xml
===================================================================
--- trunk/rnp_java-cl-mp/ant/axis-deploy-targets.xml 2008-02-12 12:15:13
UTC (rev 3344)
+++ trunk/rnp_java-cl-mp/ant/axis-deploy-targets.xml 2008-02-12 12:45:37
UTC (rev 3345)
@@ -50,6 +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.20080124/perfsonar-base-1.0.20080124.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}/conf/eventType-map.xml"
todir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf"/>

@@ -197,7 +198,99 @@
<antcall target="undeploy-adminclient" />
</target>

+ <!--
===================================================================================
-->
+ <!-- targets for web admin installation stuff -->

+ <!-- it is assumed that the installation location is
/home/perfsonar directory (user) -->
+
+
+ <property name="tmpdir" value="tmp" />
+
+ <target name="webapp-directory-prepare"
+ xmlns:psbase="psbase:/base.perfsonar.org">
+
+ <delete dir="${tmpdir}"/>
+ <delete dir="${tmpdir}-webapps"/>
+ <mkdir dir="${tmpdir}"/>
+
+
+ <copy file="${basedir}/conf/service.properties.template-2"
tofile="${basedir}/conf/service.properties"/>
+ <copy file="${basedir}/conf/components.properties.template"
tofile="${basedir}/conf/components.properties"/>
+ <copy file="${basedir}/conf/log4j.properties.template"
tofile="${basedir}/conf/log4j.properties"/>
+
+ <copy file="${basedir}/${build}/${jarfilename}-${version}.jar"
todir="${tmpdir}/WEB-INF/lib"/>
+
+ <copy
file="${basedir}/lib/repository/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.20080124/perfsonar-base-1.0.20080124.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}/conf/eventType-map.xml"
todir="${tmpdir}/WEB-INF/classes/perfsonar/conf"/>
+
+ <copy file="${basedir}/conf/wsdd/${wsdd.file.deploy}"
todir="${tmpdir}/wsdd"/>
+ <copy file="${basedir}/conf/wsdd/${wsdd.file.undeploy}"
todir="${tmpdir}/wsdd"/>
+
+ <psbase:copy-dep-base-service-jars dest-jars-path="${tmpdir}"/>
+ <psbase:copy-axis-config dest-conf-path="${tmpdir}"/>
+
+ <copy file="${basedir}/conf/axis-1.4/WEB-INF/server-config.wsdd"
todir="${tmpdir}/WEB-INF"/>
+
+ <replace
file="${tmpdir}/WEB-INF/classes/perfsonar/conf/wizard.properties"
+ token="__BASEPATH__"
+
value="/home/perfsonar/webapps/${service.name}-${version}/WEB-INF" />
+
+ <replace
file="${tmpdir}/WEB-INF/classes/perfsonar/conf/log4j.properties"
+ token="_LOGPATH_"
+
value="/home/perfsonar/webapps/${service.name}-${version}/WEB-INF/logs"/>
+
+ <echo
file="${tmpdir}/WEB-INF/classes/perfsonar/conf/service.properties"
+
message="service.sax_parser.config=/home/perfsonar/webapps/${service.name}-${version}/WEB-INF/classes/perfsonar/conf/objects.config${line.separator}"
+ append="true" />
+
+ <echo
file="${tmpdir}/WEB-INF/classes/perfsonar/conf/service.properties"
+
message="service.log.log4j.config=/home/perfsonar/webapps/${service.name}-${version}/WEB-INF/classes/perfsonar/conf/log4j.properties${line.separator}"
+ append="true" />
+
+ <echo
file="${tmpdir}/WEB-INF/classes/perfsonar/conf/service.properties"
+
message="service.clmp.cron_dir=/home/perfsonar/webapps/${service.name}-${version}/WEB-INF/classes/perfsonar/cron${line.separator}"
+ append="true" />
+
+ <echo
file="${tmpdir}/WEB-INF/classes/perfsonar/conf/service.properties"
+
message="service.clmp.tools_map=/home/perfsonar/webapps/${service.name}-${version}/WEB-INF/classes/perfsonar/conf/eventType-map.xml${line.separator}"
+ append="true" />
+
+ <mkdir dir="${tmpdir}/WEB-INF/logs"/>
+
+ <mkdir dir="${tmpdir}/WEB-INF/classes/perfsonar/cron"/>
+ <mkdir dir="${tmpdir}/WEB-INF/classes/perfsonar/cron/local"/>
+ <touch
file="${tmpdir}/WEB-INF/classes/perfsonar/cron/clmpcron"/>
+
+ </target>
+
+
+
+ <target name="war-create"
+ depends="webapp-directory-prepare">
+
+ <zip destfile="${service.name}-${version}.war"
+ basedir="${tmpdir}/"
+ excludes=".svn/**" />
+
+ <delete dir="${tmpdir}"/>
+
+ </target>
+
+
+ <target name="webapp-create"
+ xmlns:psbase="psbase:/base.perfsonar.org"
+ depends="webapp-directory-prepare">
+
+ <move
todir="${tmpdir}-webapps/webapps/${service.name}-${version}">
+ <fileset dir="${tmpdir}"/>
+ </move>
+
+ </target>
+
+
<!--
===================================================================================
-->
<!-- main targets -->


Modified: trunk/rnp_java-cl-mp/ant/const.properties.template
===================================================================
--- trunk/rnp_java-cl-mp/ant/const.properties.template 2008-02-12 12:15:13
UTC (rev 3344)
+++ trunk/rnp_java-cl-mp/ant/const.properties.template 2008-02-12 12:45:37
UTC (rev 3345)
@@ -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.20070927.jar
+antpsbase.jar=${basedir}/lib/misc/perfsonar-base-ant-1.0.20080204.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-02-12 12:15:13
UTC (rev 3344)
+++ trunk/rnp_java-cl-mp/ant/libs-download-targets.xml 2008-02-12 12:45:37
UTC (rev 3345)
@@ -56,7 +56,8 @@

<dependency groupId="perfsonar" artifactId="perfsonar-base"
version="1.0.20080124"/>
<dependency groupId="nmwg" artifactId="nmwg"
version="1.0.20080124"/>
-
+ <dependency groupId="perfsonar" artifactId="perfsonar-web-admin"
version="0.5b"/>
+
<localRepository refid="local.repository"/>
<remoteRepository refid="remote.repository"/>


Added: trunk/rnp_java-cl-mp/conf/axis-1.4/WEB-INF/server-config.wsdd

Modified: trunk/rnp_java-cl-mp/conf/axis-1.4/WEB-INF/web.xml
===================================================================
--- trunk/rnp_java-cl-mp/conf/axis-1.4/WEB-INF/web.xml 2008-02-12 12:15:13
UTC (rev 3344)
+++ trunk/rnp_java-cl-mp/conf/axis-1.4/WEB-INF/web.xml 2008-02-12 12:45:37
UTC (rev 3345)
@@ -84,16 +84,60 @@
<extension>wsdl</extension>
<mime-type>text/xml</mime-type>
</mime-mapping>
-

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

+
+
+ <!-- pS Config Servlet Admin -->
+
+ <servlet>
+ <servlet-name>
+ ServiceAdmin
+ </servlet-name>
+ <servlet-class>
+ perfSONARWebAdmin.admin.service.Admin
+ </servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>
+ ServiceAdmin
+ </servlet-name>
+ <url-pattern>
+ /ServiceAdmin
+ </url-pattern>
+ </servlet-mapping>
+
+ <!-- pS Config Wizard Admin -->
+
+ <servlet>
+ <servlet-name>
+ Wizard
+ </servlet-name>
+ <servlet-class>
+ perfSONARWebAdmin.admin.wizard.Wizard
+ </servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>
+ Wizard
+ </servlet-name>
+ <url-pattern>
+ /Wizard
+ </url-pattern>
+ </servlet-mapping>
+
+
+
<welcome-file-list id="WelcomeFileList">
+ <welcome-file>index.html</welcome-file>
<welcome-file>index.jsp</welcome-file>
- <welcome-file>index.html</welcome-file>
<welcome-file>index.jws</welcome-file>
</welcome-file-list>


Added: trunk/rnp_java-cl-mp/conf/axis-1.4/default.css

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

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

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


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

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


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

Modified: trunk/rnp_java-cl-mp/conf/objects.config
===================================================================
--- trunk/rnp_java-cl-mp/conf/objects.config 2008-02-12 12:15:13 UTC (rev
3344)
+++ trunk/rnp_java-cl-mp/conf/objects.config 2008-02-12 12:45:37 UTC (rev
3345)
@@ -2,7 +2,6 @@
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/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

Modified: trunk/rnp_java-cl-mp/conf/service.properties.template
===================================================================
--- trunk/rnp_java-cl-mp/conf/service.properties.template 2008-02-12
12:15:13 UTC (rev 3344)
+++ trunk/rnp_java-cl-mp/conf/service.properties.template 2008-02-12
12:45:37 UTC (rev 3345)
@@ -10,7 +10,8 @@

service.clmp.default_ma=local

-service.mp.clmp.rp.maxthreads.owping=99999
-service.mp.clmp.rp.maxthreads.bwctl=99999
-service.mp.clmp.rp.maxthreads.traceroute=99999
-service.mp.clmp.rp.maxthreads.ping=99999
+service.clmp.rp.maxthreads.owping=99999
+service.clmp.rp.maxthreads.bwctl=99999
+service.clmp.rp.maxthreads.traceroute=99999
+service.clmp.rp.maxthreads.ping=99999
+

Added: trunk/rnp_java-cl-mp/conf/service.properties.template-2

Added: trunk/rnp_java-cl-mp/conf/servlet.properties

Added: trunk/rnp_java-cl-mp/conf/wizard.properties

Added: trunk/rnp_java-cl-mp/conf/wizardproperties.dtd

Added: trunk/rnp_java-cl-mp/doc/CLMP Components Properties.doc


Property changes on: trunk/rnp_java-cl-mp/doc/CLMP Components Properties.doc
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added: trunk/rnp_java-cl-mp/doc/CLMP Functional Specification.doc


Property changes on: trunk/rnp_java-cl-mp/doc/CLMP Functional
Specification.doc
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added: trunk/rnp_java-cl-mp/doc/CLMP Installation Actions Specification.doc


Property changes on: trunk/rnp_java-cl-mp/doc/CLMP Installation Actions
Specification.doc
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added: trunk/rnp_java-cl-mp/doc/CLMP Interface Specification.doc


Property changes on: trunk/rnp_java-cl-mp/doc/CLMP Interface Specification.doc
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added: trunk/rnp_java-cl-mp/doc/CLMP Service Properties.doc


Property changes on: trunk/rnp_java-cl-mp/doc/CLMP Service Properties.doc
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added: trunk/rnp_java-cl-mp/doc/schema/anyElement.rnc

Added: trunk/rnp_java-cl-mp/doc/schema/bwctlRequest.rnc

Added: trunk/rnp_java-cl-mp/doc/schema/bwctlResponse.rnc

Added: trunk/rnp_java-cl-mp/doc/schema/cronRequest.rnc

Added: trunk/rnp_java-cl-mp/doc/schema/cronRequestAdd.rnc

Added: trunk/rnp_java-cl-mp/doc/schema/cronRequestList.rnc

Added: trunk/rnp_java-cl-mp/doc/schema/cronRequestModify.rnc

Added: trunk/rnp_java-cl-mp/doc/schema/cronRequestRemove.rnc

Added: trunk/rnp_java-cl-mp/doc/schema/cronResponseList.rnc

Added: trunk/rnp_java-cl-mp/doc/schema/owampRequest.rnc

Added: trunk/rnp_java-cl-mp/doc/schema/owampResponse.rnc

Added: trunk/rnp_java-cl-mp/doc/schema/pingRequest.rnc

Added: trunk/rnp_java-cl-mp/doc/schema/pingResponse.rnc

Added: trunk/rnp_java-cl-mp/doc/schema/tracerouteRequest.rnc

Added: trunk/rnp_java-cl-mp/doc/schema/tracerouteResponse.rnc

Deleted: trunk/rnp_java-cl-mp/doc/~$stallation_Actions_Specification.doc

Deleted: trunk/rnp_java-cl-mp/doc/~$terface_Specification.doc

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

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


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

Added: trunk/rnp_java-cl-mp/samples/requests/CronAdd.xml

Added: trunk/rnp_java-cl-mp/samples/requests/CronAddOwamp.xml

Added: trunk/rnp_java-cl-mp/samples/requests/CronAddPing.xml

Added: trunk/rnp_java-cl-mp/samples/requests/CronList.xml

Added: trunk/rnp_java-cl-mp/samples/requests/CronListSpecific.xml

Added: trunk/rnp_java-cl-mp/samples/requests/CronModify.xml

Added: trunk/rnp_java-cl-mp/samples/requests/CronRemove.xml

Added: trunk/rnp_java-cl-mp/samples/responses/CronAddPingResponse.xml

Added: trunk/rnp_java-cl-mp/samples/responses/CronListResponse.xml

Added: trunk/rnp_java-cl-mp/samples/responses/CronListSpecificResponse.xml

Added: trunk/rnp_java-cl-mp/samples/responses/CronModifyResponse.xml

Added: trunk/rnp_java-cl-mp/samples/responses/CronRemoveResponse.xml

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-02-12 12:15:13 UTC (rev 3344)
+++
trunk/rnp_java-cl-mp/src/main/java/org/perfsonar/service/measurementPoint/commandLine/tools/Cron.java
2008-02-12 12:45:37 UTC (rev 3345)
@@ -56,11 +56,7 @@
}

public String getToolVersion() {
- /*
- * TODO: Use system properties to reference as part of OS -
or fetch
- * from "config" if this is a custom ping program.
- */
- return "OS (Specific not implemented)";
+ return "1.0";
}

public Message runTool(Message requestMessage) throws
PerfSONARException {
@@ -89,6 +85,9 @@

}

+ /*
+ * TODO: For action 'add', validate the actual measurement.
+ */
private ScheduleRequest validateMessageRequest(Message request)
throws PerfSONARException {

@@ -248,23 +247,7 @@
}
}

- Parameters params = null;
- if (action.equals("add") || action.equals("modify")) {
-
- params = metadata.getParameters();
-
- if (params == null) {
- logger
- .fatal(CNAME
- +
".validateMessageRequest: No parameters in metadata element "
- + "found in
request.");
- throw new PerfSONARException(
-
"error.mp.clmp.validator.no_metadata_parameters",
- CNAME
- +
".validateMessageRequest: No parameters in metadata element "
- + "found in
request.");
- }
- }
+ Parameters params = metadata.getParameters();

StringBuilder entry = new StringBuilder();


Added:
trunk/rnp_java-cl-mp/src/main/java/perfSONARWebAdmin/admin/wizard/services/CLMPHandler.java


  • perfsonar: r3345 - in trunk/rnp_java-cl-mp: ant conf conf/axis-1.4 conf/axis-1.4/WEB-INF doc doc/schema lib/misc samples samples/requests samples/responses src/main/java src/main/java/org/perfsonar/service/measurementPoint/commandLine/tools src/main/java/perfSONARWebAdmin src/main/java/perfSONARWebAdmin/admin src/main/java/perfSONARWebAdmin/admin/wizard src/main/java/perfSONARWebAdmin/admin/wizard/services, svnlog, 02/12/2008

Archive powered by MHonArc 2.6.16.

Top of Page