Skip to Content.
Sympa Menu

perfsonar-dev - r1894 - in branches/XML-LS-STABLE: ant ant/flowmp ant/rrdma ant/xmlls conf conf/template contrib contrib/FlowMP-client contrib/FlowMP-client/schemas contrib/FlowMP-manager doc doc/ls doc/ma/rrdTypeMA schema/example-instances/perfSONAR/LS/test src/org/perfsonar/client/commons/requests/lookupService src/org/perfsonar/service/lookupService/xmlType src/org/perfsonar/service/measurementPoint/flowType

Subject: perfsonar development work

List archive

r1894 - in branches/XML-LS-STABLE: ant ant/flowmp ant/rrdma ant/xmlls conf conf/template contrib contrib/FlowMP-client contrib/FlowMP-client/schemas contrib/FlowMP-manager doc doc/ls doc/ma/rrdTypeMA schema/example-instances/perfSONAR/LS/test src/org/perfsonar/client/commons/requests/lookupService src/org/perfsonar/service/lookupService/xmlType src/org/perfsonar/service/measurementPoint/flowType


Chronological Thread 
  • From:
  • To:
  • Subject: r1894 - in branches/XML-LS-STABLE: ant ant/flowmp ant/rrdma ant/xmlls conf conf/template contrib contrib/FlowMP-client contrib/FlowMP-client/schemas contrib/FlowMP-manager doc doc/ls doc/ma/rrdTypeMA schema/example-instances/perfSONAR/LS/test src/org/perfsonar/client/commons/requests/lookupService src/org/perfsonar/service/lookupService/xmlType src/org/perfsonar/service/measurementPoint/flowType
  • Date: Mon, 8 Jan 2007 10:22:00 -0500
Author: mac
Date: 2007-01-08 10:21:59 -0500 (Mon, 08 Jan 2007)
New Revision: 1894

Added:
branches/XML-LS-STABLE/conf/components.properties.flowmp
branches/XML-LS-STABLE/contrib/FlowMP-client/
branches/XML-LS-STABLE/contrib/FlowMP-client/README
branches/XML-LS-STABLE/contrib/FlowMP-client/client.py
branches/XML-LS-STABLE/contrib/FlowMP-client/common.py
branches/XML-LS-STABLE/contrib/FlowMP-client/config.py
branches/XML-LS-STABLE/contrib/FlowMP-client/flowmpclient.py
branches/XML-LS-STABLE/contrib/FlowMP-client/schemas/
branches/XML-LS-STABLE/contrib/FlowMP-client/schemas/keepalive.xml
branches/XML-LS-STABLE/contrib/FlowMP-client/schemas/subscribe.xml
branches/XML-LS-STABLE/contrib/FlowMP-client/schemas/unsubscribe.xml
branches/XML-LS-STABLE/contrib/FlowMP-client/soapclient.py
branches/XML-LS-STABLE/contrib/FlowMP-manager/
branches/XML-LS-STABLE/contrib/FlowMP-manager/README
branches/XML-LS-STABLE/contrib/FlowMP-manager/common.py
branches/XML-LS-STABLE/contrib/FlowMP-manager/config.py
branches/XML-LS-STABLE/contrib/FlowMP-manager/manager.py
branches/XML-LS-STABLE/contrib/FlowMP-manager/process.log
branches/XML-LS-STABLE/contrib/FlowMP-manager/process.py
branches/XML-LS-STABLE/doc/deployment.xml
branches/XML-LS-STABLE/doc/ls/LS_configuration_files.doc
branches/XML-LS-STABLE/doc/ls/LS_functionality_specificatio.doc
branches/XML-LS-STABLE/doc/ls/LS_instalaltion_actions.doc
branches/XML-LS-STABLE/doc/ls/LS_interface_specification.doc

branches/XML-LS-STABLE/doc/ma/rrdTypeMA/Configuration_Files_Specification.doc
branches/XML-LS-STABLE/doc/ma/rrdTypeMA/Functional_Specification.doc

branches/XML-LS-STABLE/doc/ma/rrdTypeMA/Installation_Actions_Specification.doc
branches/XML-LS-STABLE/doc/ma/rrdTypeMA/Interface_Specification.doc

branches/XML-LS-STABLE/doc/ma/rrdTypeMA/Metadata_Configuration_Specification.doc

branches/XML-LS-STABLE/schema/example-instances/perfSONAR/LS/test/EchoRequest.xml
Removed:
branches/XML-LS-STABLE/contrib/FlowMP-client/README
branches/XML-LS-STABLE/contrib/FlowMP-client/client.py
branches/XML-LS-STABLE/contrib/FlowMP-client/common.py
branches/XML-LS-STABLE/contrib/FlowMP-client/config.py
branches/XML-LS-STABLE/contrib/FlowMP-client/flowmpclient.py
branches/XML-LS-STABLE/contrib/FlowMP-client/schemas/
branches/XML-LS-STABLE/contrib/FlowMP-client/schemas/keepalive.xml
branches/XML-LS-STABLE/contrib/FlowMP-client/schemas/subscribe.xml
branches/XML-LS-STABLE/contrib/FlowMP-client/schemas/unsubscribe.xml
branches/XML-LS-STABLE/contrib/FlowMP-client/soapclient.py
branches/XML-LS-STABLE/contrib/FlowMP-manager/README
branches/XML-LS-STABLE/contrib/FlowMP-manager/common.py
branches/XML-LS-STABLE/contrib/FlowMP-manager/config.py
branches/XML-LS-STABLE/contrib/FlowMP-manager/manager.py
branches/XML-LS-STABLE/contrib/FlowMP-manager/process.log
branches/XML-LS-STABLE/contrib/FlowMP-manager/process.py
Modified:
branches/XML-LS-STABLE/ant/build-flowmp.xml
branches/XML-LS-STABLE/ant/flowmp/flowmp-axis-deploy-targets.xml
branches/XML-LS-STABLE/ant/flowmp/flowmp-configure-targets.xml
branches/XML-LS-STABLE/ant/flowmp/flowmp-java-compile-targets.xml
branches/XML-LS-STABLE/ant/pre-install-targets.xml
branches/XML-LS-STABLE/ant/rrdma/rrdma-client-run-targets.xml
branches/XML-LS-STABLE/ant/xmlls/test-targets.xml
branches/XML-LS-STABLE/conf/template/service.properties.ls-template

branches/XML-LS-STABLE/src/org/perfsonar/client/commons/requests/lookupService/LSRegisterRequestGenerator.java

branches/XML-LS-STABLE/src/org/perfsonar/service/lookupService/xmlType/XmlTypeLSServiceEngine.java

branches/XML-LS-STABLE/src/org/perfsonar/service/measurementPoint/flowType/ConfigFileWriter.java

branches/XML-LS-STABLE/src/org/perfsonar/service/measurementPoint/flowType/ZebedeeControl.java
Log:
Merge changes from trunk to LS Stable branch



Modified: branches/XML-LS-STABLE/ant/build-flowmp.xml
===================================================================
--- branches/XML-LS-STABLE/ant/build-flowmp.xml 2007-01-08 14:39:39 UTC (rev
1893)
+++ branches/XML-LS-STABLE/ant/build-flowmp.xml 2007-01-08 15:21:59 UTC (rev
1894)
@@ -3,7 +3,7 @@
<property file="ant/const.properties" />

<path id="classpath">
- <fileset dir="../../">
+ <fileset dir="../">
<include name="**/*.jar"/>
</fileset>
<pathelement location="build"/>
@@ -13,18 +13,20 @@
<tstamp/>
</target>

- <!-- general imports -->
+ <!-- general imports -->
+ <import file="pre-install-targets.xml"/>
<import file="configure-targets.xml"/>
<import file="javadoc-targets.xml"/>
- <import file="webservice-env-targets.xml"/>
+ <!-- <import file="webservice-env-targets.xml"/> -->
<import file="java-compile-targets.xml"/>
<import file="axis-deploy-targets.xml"/>

- <!-- flow MP imports -->
- <import file="flowmp/flowTypeMP-test-targets.xml"/>
- <import file="flowmp/flowTypeMP-java-compile-targets.xml"/>
- <import file="flowmp/flowTypeMP-axis-deploy-targets.xml"/>
- <import file="flowmp/flowTypeMP-configure-targets.xml"/>
- <import file="flowmp/flowTypeMP-doc-targets.xml"/>
- <import file="flowmp/flowTypeMP-release-targets.xml"/>
-</project>
\ No newline at end of file
+ <!-- flow MP imports -->
+ <import file="flowmp/flowmp-pre-install-targets.xml"/>
+ <import file="flowmp/flowmp-junit-test-targets.xml"/>
+ <import file="flowmp/flowmp-java-compile-targets.xml"/>
+ <import file="flowmp/flowmp-axis-deploy-targets.xml"/>
+ <import file="flowmp/flowmp-configure-targets.xml"/>
+ <!-- <import file="flowmp/flowmp-doc-targets.xml"/> -->
+ <import file="flowmp/flowmp-release-targets.xml"/>
+</project>

Modified: branches/XML-LS-STABLE/ant/flowmp/flowmp-axis-deploy-targets.xml
===================================================================
--- branches/XML-LS-STABLE/ant/flowmp/flowmp-axis-deploy-targets.xml
2007-01-08 14:39:39 UTC (rev 1893)
+++ branches/XML-LS-STABLE/ant/flowmp/flowmp-axis-deploy-targets.xml
2007-01-08 15:21:59 UTC (rev 1894)
@@ -55,8 +55,9 @@
if="jar.perfsonar.flowmp.present"
description="Copy flowmp jar to Tomcat">

- <copy file="${build}/perfSONAR-flowmp.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
-
+ <copy file="${build}/perfSONAR-flowmp.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <!-- create the clients directory -->
+ <mkdir
dir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/clients" />
</target>


@@ -150,6 +151,9 @@
<delete
file="${service.home}/${deploy.root}/WEB-INF/lib/perfSONAR-generic.jar"/>
<delete
file="${service.home}/${deploy.root}/WEB-INF/lib/perfSONAR-flowmp.jar"/>
<delete
file="${service.home}/${deploy.root}/WEB-INF/lib/perfSONAR.jar"/>
+
+ <!-- remove the clients directory -->
+ <rmdir
dir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/clients/conf/clients"
/>

<antcall target="tomcat-shutdown" />


Modified: branches/XML-LS-STABLE/ant/flowmp/flowmp-configure-targets.xml
===================================================================
--- branches/XML-LS-STABLE/ant/flowmp/flowmp-configure-targets.xml
2007-01-08 14:39:39 UTC (rev 1893)
+++ branches/XML-LS-STABLE/ant/flowmp/flowmp-configure-targets.xml
2007-01-08 15:21:59 UTC (rev 1894)
@@ -40,7 +40,8 @@
<entry key="service.log.log4j.config"
value="${basedir}/conf/log4j.properties"/>
<entry key="service.sax_parser.config"
value="${basedir}/src/objects.config"/>

- <entry key="service.mp.conf_file"
value="${flow.config.file}"/>
+ <entry key="service.mp.conf_file"
value="${flow.config.file}"/>
+ <entry key="service.mp.flow.client_dir"
value="${service.home}/${service.name}/WEB-INF/classes/perfsonar/conf/clients"/>
<entry key="service.mp.message_types"
value="SubscriptionRequest,UnSubscriptionRequest,SubscriptionKeepaliveRequest"/>
<entry key="service.mp.class_name"
value="org.perfsonar.service.measurementPoint.flowType.FlowTypeMPServiceEngine"/>


Modified: branches/XML-LS-STABLE/ant/flowmp/flowmp-java-compile-targets.xml
===================================================================
--- branches/XML-LS-STABLE/ant/flowmp/flowmp-java-compile-targets.xml
2007-01-08 14:39:39 UTC (rev 1893)
+++ branches/XML-LS-STABLE/ant/flowmp/flowmp-java-compile-targets.xml
2007-01-08 15:21:59 UTC (rev 1894)
@@ -15,7 +15,7 @@
==================================================================== -->


-<project name="rrdma-java-compile-targets">
+<project name="flowmp-java-compile-targets">
<!-- FLOW MP -->
<target name="clean-jar-flowmp">
<delete file="${build}/perfSONAR-flowmp.jar" failonerror="false"/>

Modified: branches/XML-LS-STABLE/ant/pre-install-targets.xml
===================================================================
--- branches/XML-LS-STABLE/ant/pre-install-targets.xml 2007-01-08 14:39:39
UTC (rev 1893)
+++ branches/XML-LS-STABLE/ant/pre-install-targets.xml 2007-01-08 15:21:59
UTC (rev 1894)
@@ -172,7 +172,9 @@
depends="webservice-container-question"
if="tomcat.install.decision">

- <dirname property="_tomcat.install.location" file="${basedir}"/>
+ <!-- <dirname property="_tomcat.install.location"
file="${basedir}"/> -->
+ <property file="ant/const.properties" />
+ <dirname property="_tomcat.install.location" file="${service.home}"/>

<input message="Enter the path for the Tomcat installation:
[${_tomcat.install.location}/${tomcat.dir}]:"
addproperty="tomcat.install.location"

Modified: branches/XML-LS-STABLE/ant/rrdma/rrdma-client-run-targets.xml
===================================================================
--- branches/XML-LS-STABLE/ant/rrdma/rrdma-client-run-targets.xml
2007-01-08 14:39:39 UTC (rev 1893)
+++ branches/XML-LS-STABLE/ant/rrdma/rrdma-client-run-targets.xml
2007-01-08 15:21:59 UTC (rev 1894)
@@ -28,8 +28,8 @@
<java classname="org.perfsonar.client.testHarness.SOAPClient"
classpathref="classpath" fork="true">
<arg value="${ma.local}"/>
- <arg
value="${basedir}/schema/example-instances/sonar/MetadataKey-Filter-Req-1.xml"/>
- <arg
value="${basedir}/schema/example-instances/sonar/response-1.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/MetadataKey-Filter-Req-1.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response-1.xml"/>

<classpath>
<pathelement location="build/perfSONAR-generic.jar"/>
@@ -42,13 +42,13 @@

<target name="run-rrdma-client-2" description="Runs Java client">

- <replace
file="${basedir}/schema/example-instances/sonar/MetadataKey-Filter-Req-2.xml"
token="__BASEPATH__" value="${basedir}"/>
+ <replace
file="${basedir}/schema/example-instances/perfSONAR/MetadataKey-Filter-Req-2.xml"
token="__BASEPATH__" value="${basedir}"/>

<java classname="org.perfsonar.client.testHarness.SOAPClient"
classpathref="classpath" fork="true">
<arg value="${ma.local}"/>
- <arg
value="${basedir}/schema/example-instances/sonar/MetadataKey-Filter-Req-2.xml"/>
- <arg
value="${basedir}/schema/example-instances/sonar/response-2.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/MetadataKey-Filter-Req-2.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response-2.xml"/>

<classpath>
<pathelement location="build/perfSONAR-generic.jar"/>
@@ -61,13 +61,13 @@

<target name="run-rrdma-client-3" description="Runs Java client">

- <replace
file="${basedir}/schema/example-instances/sonar/SetupDataRequest-FilterRRDSelect.xml"
token="__BASEPATH__" value="${basedir}"/>
+ <replace
file="${basedir}/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect.xml"
token="__BASEPATH__" value="${basedir}"/>

<java classname="org.perfsonar.client.testHarness.SOAPClient"
classpathref="classpath" fork="true">
<arg value="${ma.local}"/>
- <arg
value="${basedir}/schema/example-instances/sonar/SetupDataRequest-FilterRRDSelect.xml"/>
- <arg
value="${basedir}/schema/example-instances/sonar/response-3.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response-3.xml"/>

<classpath>
<pathelement location="build/perfSONAR-generic.jar"/>
@@ -83,8 +83,8 @@
<java classname="org.perfsonar.client.testHarness.SOAPClient"
classpathref="classpath" fork="true">
<arg value="${ma.local}"/>
- <arg
value="${basedir}/schema/example-instances/sonar/SetupDataRequest-FilterRRDSelect-2.xml"/>
- <arg
value="${basedir}/schema/example-instances/sonar/response-4.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-2.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response-4.xml"/>

<classpath>
<pathelement location="build/perfSONAR-generic.jar"/>
@@ -97,13 +97,13 @@

<target name="run-rrdma-client-5" description="Runs Java client">

- <replace
file="${basedir}/schema/example-instances/sonar/SetupDataRequest-FilterRRDSelect-3.xml"
token="__BASEPATH__" value="${basedir}"/>
+ <replace
file="${basedir}/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-3.xml"
token="__BASEPATH__" value="${basedir}"/>

<java classname="org.perfsonar.client.testHarness.SOAPClient"
classpathref="classpath" fork="true">
<arg value="${ma.local}"/>
- <arg
value="${basedir}/schema/example-instances/sonar/SetupDataRequest-FilterRRDSelect-3.xml"/>
- <arg
value="${basedir}/schema/example-instances/sonar/response-5.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-3.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response-5.xml"/>

<classpath>
<pathelement location="build/perfSONAR-generic.jar"/>
@@ -119,8 +119,8 @@
<java classname="org.perfsonar.client.testHarness.SOAPClient"
classpathref="classpath" fork="true">
<arg value="${ma.local}"/>
- <arg
value="${basedir}/schema/example-instances/sonar/SetupDataRequest-FilterRRDSelect-Chaining-1.xml"/>
- <arg
value="${basedir}/schema/example-instances/sonar/response-chaining-1.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-Chaining-1.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response-chaining-1.xml"/>

<classpath>
<pathelement location="build/perfSONAR-generic.jar"/>
@@ -136,8 +136,8 @@
<java classname="org.perfsonar.client.testHarness.SOAPClient"
classpathref="classpath" fork="true">
<arg value="${ma.local}"/>
- <arg
value="${basedir}/schema/example-instances/sonar/SetupDataRequest-FilterRRDSelect-Chaining-2.xml"/>
- <arg
value="${basedir}/schema/example-instances/sonar/response-chaining-2.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-Chaining-2.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response-chaining-2.xml"/>

<classpath>
<pathelement location="build/perfSONAR-generic.jar"/>
@@ -157,8 +157,8 @@
classpathref="classpath"
fork="true">
<arg value="${ma.local}"/>
- <arg
value="${basedir}/schema/example-instances/sonar/MeasurementArchiveStoreRequest-1.xml"/>
- <arg
value="${basedir}/schema/example-instances/sonar/response.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/MeasurementArchiveStoreRequest-1.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response.xml"/>
</java>

</target>
@@ -170,8 +170,8 @@
classpathref="classpath"
fork="true">
<arg value="${ma.local}"/>
- <arg
value="${basedir}/schema/example-instances/sonar/MeasurementArchiveStoreRequest-Key-1.xml"/>
- <arg
value="${basedir}/schema/example-instances/sonar/response.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/MeasurementArchiveStoreRequest-Key-1.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response.xml"/>
</java>

</target>
@@ -183,8 +183,8 @@
<java classname="org.perfsonar.client.testHarness.SOAPClient"
classpathref="classpath" fork="true">
<arg value="${ma.local}"/>
- <arg
value="${basedir}/schema/example-instances/sonar/Echo-Req.xml"/>
- <arg
value="${basedir}/schema/example-instances/sonar/response.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/Echo-Req.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response.xml"/>
</java>

</target>

Modified: branches/XML-LS-STABLE/ant/xmlls/test-targets.xml
===================================================================
--- branches/XML-LS-STABLE/ant/xmlls/test-targets.xml 2007-01-08 14:39:39
UTC (rev 1893)
+++ branches/XML-LS-STABLE/ant/xmlls/test-targets.xml 2007-01-08 15:21:59
UTC (rev 1894)
@@ -105,6 +105,16 @@
</java>
</target>

+ <!-- Sends request to LS deployed in Tomcat, Keep alive -->
+ <target name="client-echo"
+ description="Sends request to Tomcat: ECHO">
+ <java classname="org.perfsonar.client.testHarness.SOAPClient"
+ classpathref="classpath" fork="true">
+ <arg value="${ls.local}"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/LS/test/EchoRequest.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/LS/test/EchoResponse.xml"/>
+ </java>
+ </target>


<!--
@@ -140,8 +150,6 @@
<target name="test-query"
depends="copy-config-files-for-test"
description="Run LS Test: LOOKUP - QUERY">
-
- <echo>BASEDIR=${classpath}</echo>

<java classname="org.perfsonar.client.testHarness.LSTestClient"
classpathref="classpath_for_test" fork="true">
<jvmarg
value="-Dcomponents.properties=${basedir}/conf/components.properties"/>
@@ -207,8 +215,22 @@
</java>
</target>

+ <!-- Echo test -->

+ <target name="test-echo"
+ depends="copy-config-files-for-test"
+ description="Run LS Test: ECHO">
+
+ <java classname="org.perfsonar.client.testHarness.LSTestClient"
classpathref="classpath_for_test" fork="true">
+ <jvmarg
value="-Dcomponents.properties=${basedir}/conf/components.properties"/>
+ <jvmarg
value="-Dservice.properties=${basedir}/conf/service.properties"/>
+ <arg value="query"/>
+ <arg value="RequestHandler"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/LS/test/EchoRequest.xml"/>
+ </java>
+ </target>

+
<!--


******************************************************************

Copied: branches/XML-LS-STABLE/conf/components.properties.flowmp (from rev
1893, trunk/perfsonar/conf/components.properties.flowmp)

Modified: branches/XML-LS-STABLE/conf/template/service.properties.ls-template
===================================================================
--- branches/XML-LS-STABLE/conf/template/service.properties.ls-template
2007-01-08 14:39:39 UTC (rev 1893)
+++ branches/XML-LS-STABLE/conf/template/service.properties.ls-template
2007-01-08 15:21:59 UTC (rev 1894)
@@ -69,6 +69,6 @@
# --- Service properties
---------------------------------------------------------------


service.ls.class_name=org.perfsonar.service.lookupService.xmlType.XmlTypeLSServiceEngine
-service.ls.message_types=LSQueryRequest,LSRegisterRequest,LSDeregisterRequest,LSKeepaliveRequest
+service.ls.message_types=LSQueryRequest,LSRegisterRequest,LSDeregisterRequest,LSKeepaliveRequest,EchoRequest

# ------- END
--------------------------------------------------------------------------
\ No newline at end of file

Copied: branches/XML-LS-STABLE/contrib/FlowMP-client (from rev 1893,
trunk/perfsonar/contrib/FlowMP-client)

Deleted: branches/XML-LS-STABLE/contrib/FlowMP-client/README

Copied: branches/XML-LS-STABLE/contrib/FlowMP-client/README (from rev 1893,
trunk/perfsonar/contrib/FlowMP-client/README)

Deleted: branches/XML-LS-STABLE/contrib/FlowMP-client/client.py

Copied: branches/XML-LS-STABLE/contrib/FlowMP-client/client.py (from rev
1893, trunk/perfsonar/contrib/FlowMP-client/client.py)

Deleted: branches/XML-LS-STABLE/contrib/FlowMP-client/common.py

Copied: branches/XML-LS-STABLE/contrib/FlowMP-client/common.py (from rev
1893, trunk/perfsonar/contrib/FlowMP-client/common.py)

Deleted: branches/XML-LS-STABLE/contrib/FlowMP-client/config.py

Copied: branches/XML-LS-STABLE/contrib/FlowMP-client/config.py (from rev
1893, trunk/perfsonar/contrib/FlowMP-client/config.py)

Deleted: branches/XML-LS-STABLE/contrib/FlowMP-client/flowmpclient.py

Copied: branches/XML-LS-STABLE/contrib/FlowMP-client/flowmpclient.py (from
rev 1893, trunk/perfsonar/contrib/FlowMP-client/flowmpclient.py)

Copied: branches/XML-LS-STABLE/contrib/FlowMP-client/schemas (from rev 1893,
trunk/perfsonar/contrib/FlowMP-client/schemas)

Deleted: branches/XML-LS-STABLE/contrib/FlowMP-client/schemas/keepalive.xml

Copied: branches/XML-LS-STABLE/contrib/FlowMP-client/schemas/keepalive.xml
(from rev 1893, trunk/perfsonar/contrib/FlowMP-client/schemas/keepalive.xml)

Deleted: branches/XML-LS-STABLE/contrib/FlowMP-client/schemas/subscribe.xml

Copied: branches/XML-LS-STABLE/contrib/FlowMP-client/schemas/subscribe.xml
(from rev 1893, trunk/perfsonar/contrib/FlowMP-client/schemas/subscribe.xml)

Deleted: branches/XML-LS-STABLE/contrib/FlowMP-client/schemas/unsubscribe.xml

Copied: branches/XML-LS-STABLE/contrib/FlowMP-client/schemas/unsubscribe.xml
(from rev 1893, trunk/perfsonar/contrib/FlowMP-client/schemas/unsubscribe.xml)

Deleted: branches/XML-LS-STABLE/contrib/FlowMP-client/soapclient.py

Copied: branches/XML-LS-STABLE/contrib/FlowMP-client/soapclient.py (from rev
1893, trunk/perfsonar/contrib/FlowMP-client/soapclient.py)

Copied: branches/XML-LS-STABLE/contrib/FlowMP-manager (from rev 1893,
trunk/perfsonar/contrib/FlowMP-manager)

Deleted: branches/XML-LS-STABLE/contrib/FlowMP-manager/README

Copied: branches/XML-LS-STABLE/contrib/FlowMP-manager/README (from rev 1893,
trunk/perfsonar/contrib/FlowMP-manager/README)

Deleted: branches/XML-LS-STABLE/contrib/FlowMP-manager/common.py

Copied: branches/XML-LS-STABLE/contrib/FlowMP-manager/common.py (from rev
1893, trunk/perfsonar/contrib/FlowMP-manager/common.py)

Deleted: branches/XML-LS-STABLE/contrib/FlowMP-manager/config.py

Copied: branches/XML-LS-STABLE/contrib/FlowMP-manager/config.py (from rev
1893, trunk/perfsonar/contrib/FlowMP-manager/config.py)

Deleted: branches/XML-LS-STABLE/contrib/FlowMP-manager/manager.py

Copied: branches/XML-LS-STABLE/contrib/FlowMP-manager/manager.py (from rev
1893, trunk/perfsonar/contrib/FlowMP-manager/manager.py)

Deleted: branches/XML-LS-STABLE/contrib/FlowMP-manager/process.log

Copied: branches/XML-LS-STABLE/contrib/FlowMP-manager/process.log (from rev
1893, trunk/perfsonar/contrib/FlowMP-manager/process.log)

Deleted: branches/XML-LS-STABLE/contrib/FlowMP-manager/process.py

Copied: branches/XML-LS-STABLE/contrib/FlowMP-manager/process.py (from rev
1893, trunk/perfsonar/contrib/FlowMP-manager/process.py)

Copied: branches/XML-LS-STABLE/doc/deployment.xml (from rev 1893,
trunk/perfsonar/doc/deployment.xml)

Copied: branches/XML-LS-STABLE/doc/ls/LS_configuration_files.doc (from rev
1893, trunk/perfsonar/doc/ls/LS_configuration_files.doc)

Copied: branches/XML-LS-STABLE/doc/ls/LS_functionality_specificatio.doc (from
rev 1893, trunk/perfsonar/doc/ls/LS_functionality_specificatio.doc)

Copied: branches/XML-LS-STABLE/doc/ls/LS_instalaltion_actions.doc (from rev
1893, trunk/perfsonar/doc/ls/LS_instalaltion_actions.doc)

Copied: branches/XML-LS-STABLE/doc/ls/LS_interface_specification.doc (from
rev 1893, trunk/perfsonar/doc/ls/LS_interface_specification.doc)

Copied:
branches/XML-LS-STABLE/doc/ma/rrdTypeMA/Configuration_Files_Specification.doc
(from rev 1893,
trunk/perfsonar/doc/ma/rrdTypeMA/Configuration_Files_Specification.doc)

Copied: branches/XML-LS-STABLE/doc/ma/rrdTypeMA/Functional_Specification.doc
(from rev 1893, trunk/perfsonar/doc/ma/rrdTypeMA/Functional_Specification.doc)

Copied:
branches/XML-LS-STABLE/doc/ma/rrdTypeMA/Installation_Actions_Specification.doc
(from rev 1893,
trunk/perfsonar/doc/ma/rrdTypeMA/Installation_Actions_Specification.doc)

Copied: branches/XML-LS-STABLE/doc/ma/rrdTypeMA/Interface_Specification.doc
(from rev 1893, trunk/perfsonar/doc/ma/rrdTypeMA/Interface_Specification.doc)

Copied:
branches/XML-LS-STABLE/doc/ma/rrdTypeMA/Metadata_Configuration_Specification.doc
(from rev 1893,
trunk/perfsonar/doc/ma/rrdTypeMA/Metadata_Configuration_Specification.doc)

Copied:
branches/XML-LS-STABLE/schema/example-instances/perfSONAR/LS/test/EchoRequest.xml
(from rev 1893,
trunk/perfsonar/schema/example-instances/perfSONAR/LS/test/EchoRequest.xml)

Modified:
branches/XML-LS-STABLE/src/org/perfsonar/client/commons/requests/lookupService/LSRegisterRequestGenerator.java
===================================================================
---
branches/XML-LS-STABLE/src/org/perfsonar/client/commons/requests/lookupService/LSRegisterRequestGenerator.java
2007-01-08 14:39:39 UTC (rev 1893)
+++
branches/XML-LS-STABLE/src/org/perfsonar/client/commons/requests/lookupService/LSRegisterRequestGenerator.java
2007-01-08 15:21:59 UTC (rev 1894)
@@ -72,27 +72,52 @@

Service service = new Service();
service.setId("serviceParameters");
-
- //subject.setChild(service); //INCORRECT!
subject.addChild(service);

+ //access point -- mandatory
+ String
accessPointString=(String)commonParameters.get("access_point");
+ if (accessPointString==null) throw new SystemException(
+ "error.lsregistrator.no_accesspoint",
+ "AccessPoint parameter was not found. Registration failed");
+ if ("".equals(accessPointString)) throw new SystemException(
+ "error.lsregistrator.no_accesspoint",
+ "AccessPoint parameter was empty. Registration failed");
AccessPoint ap = new AccessPoint();
-
- ap.setAccessPoint((String)commonParameters.get("access_point"));
+ ap.setAccessPoint(accessPointString);
service.setAccessPoint(ap);

+ //service name -- mandatory
+ String
serviceNameString=(String)commonParameters.get("service_name");
+ if (serviceNameString==null) throw new SystemException(
+ "error.lsregistrator.no_servicename",
+ "ServiceName parameter was not found. Registration failed");
+ if ("".equals(serviceNameString)) throw new SystemException(
+ "error.lsregistrator.no_servicename",
+ "ServiceName parameter was empty. Registration failed");

ServiceName sn = new ServiceName();
- sn.setServiceName((String)commonParameters.get("service_name"));
+ sn.setServiceName(serviceNameString);
service.setServiceName(sn);

+ //service type -- mandatory
+ String
serviceTypeString=(String)commonParameters.get("service_type");
+ if (serviceTypeString==null) throw new SystemException(
+ "error.lsregistrator.no_servicetype",
+ "ServiceType parameter was not found. Registration failed");
+ if ("".equals(serviceTypeString)) throw new SystemException(
+ "error.lsregistrator.no_servicename",
+ "ServiceType parameter was empty. Registration failed");

ServiceType st = new ServiceType();
- st.setServiceType((String)commonParameters.get("service_type"));
+ st.setServiceType(serviceTypeString);
service.setServiceType(st);

- ServiceDescription sd = new ServiceDescription();
-
sd.setServiceDescription((String)commonParameters.get("service_description"));
- service.setServiceDescription(sd);
-
+ //service description -- optional
+ String
serviceDescString=(String)commonParameters.get("service_description");
+ if (serviceDescString==null) {
+ ServiceDescription sd = new ServiceDescription();
+ sd.setServiceDescription(serviceDescString);
+ service.setServiceDescription(sd);
+ }
+
//data fields

System.out.println("LSRegisterRequestGenerator: ");

Modified:
branches/XML-LS-STABLE/src/org/perfsonar/service/lookupService/xmlType/XmlTypeLSServiceEngine.java
===================================================================
---
branches/XML-LS-STABLE/src/org/perfsonar/service/lookupService/xmlType/XmlTypeLSServiceEngine.java
2007-01-08 14:39:39 UTC (rev 1893)
+++
branches/XML-LS-STABLE/src/org/perfsonar/service/lookupService/xmlType/XmlTypeLSServiceEngine.java
2007-01-08 15:21:59 UTC (rev 1894)
@@ -12,12 +12,14 @@
import org.perfsonar.service.commons.engine.ActionType;
import org.perfsonar.service.commons.engine.ServiceEngine;
import org.perfsonar.service.commons.exceptions.DataFormatException;
+import org.perfsonar.service.commons.exceptions.PerfSONARException;
import org.perfsonar.service.commons.exceptions.RequestException;
import org.perfsonar.service.commons.exceptions.SystemException;
import org.perfsonar.service.commons.storage.xmldb.XmlDbDataRepository;
import org.perfsonar.service.commons.storage.xmldb.XmlDbStorageManager;
import org.perfsonar.service.commons.storage.xmldb.exist.ExistDbFactory;
import org.perfsonar.service.commons.storage.xmldb.XmlDbConstants;
+import org.perfsonar.service.commons.util.ResultCodesUtil;

/**
* ServiceEngine class for LookupService. (The heart of the LookupService)
@@ -94,7 +96,8 @@
ActionType.LS_REGISTER,
ActionType.LS_LOOKUP,
ActionType.LS_DEREGISTER,
- ActionType.LS_KEEPALIVE
+ ActionType.LS_KEEPALIVE,
+ ActionType.ECHO
};

smType = config.getProperty("service.ls.db_type");
@@ -202,7 +205,11 @@
getStorageManager(smType);
LSAction action = new LSKeepaliveAction(xmlDbStorageManager);
response = action.performAction(request);
-
+
+ } else if (actionType.equals(ActionType.ECHO)) {
+
+ response = getEcho(request);
+
} else {

throw new SystemException("error.ls.action_not_suported",
@@ -247,5 +254,22 @@

}

+ protected Message getEcho(Message request)
+ throws SystemException, RequestException, DataFormatException {
+
+ Message response = new Message();

+ PerfSONARException pex =
+ new PerfSONARException(
+ "success.echo",
+ "This is the echo response from the Lookup Service");
+
+ ResultCodesUtil.createResultCodeMetadata(response, pex);
+
+ return response;
+
+ }
+
+
+
} //XmlTypeLSServiceEngine

Modified:
branches/XML-LS-STABLE/src/org/perfsonar/service/measurementPoint/flowType/ConfigFileWriter.java
===================================================================
---
branches/XML-LS-STABLE/src/org/perfsonar/service/measurementPoint/flowType/ConfigFileWriter.java
2007-01-08 14:39:39 UTC (rev 1893)
+++
branches/XML-LS-STABLE/src/org/perfsonar/service/measurementPoint/flowType/ConfigFileWriter.java
2007-01-08 15:21:59 UTC (rev 1894)
@@ -21,6 +21,7 @@
public class ConfigFileWriter {

/**
+ * Creates a config file for the nfdump proces
*
* @param key The unique key of this tunnel (will be the filename).
* @param params Parameters derived from the soap request.
@@ -38,7 +39,7 @@
AuxiliaryComponentManager.getInstance().
getComponent(ComponentNames.CONFIG);

- String configBasePath =
configuration.getProperty("service.mp.flow.client_dir");
+ String configBasePath =
configuration.getProperty("service.mp.flow.client_dir");

File configFile = new File(configBasePath + "/" + key + ".xml");

@@ -59,4 +60,27 @@

out.close();
}
+
+ /**
+ * Deletes the written config file for the nfdump proces
+ * @param key The unique key of this tunnel (will be the filename).
+ * @throws SystemException
+ */
+ public static void delete(Integer key) throws SystemException {
+ LoggerComponent logger = (LoggerComponent)
+ AuxiliaryComponentManager.getInstance().
+ getComponent(ComponentNames.LOGGER);
+
+ ConfigurationComponent configuration = (ConfigurationComponent)
+ AuxiliaryComponentManager.getInstance().
+ getComponent(ComponentNames.CONFIG);
+
+ String configBasePath =
configuration.getProperty("service.mp.flow.client_dir");
+
+ File configFile = new File(configBasePath + "/" + key + ".xml");
+
+ if(configFile.exists()) {
+ configFile.delete();
+ }
+ }
}

Modified:
branches/XML-LS-STABLE/src/org/perfsonar/service/measurementPoint/flowType/ZebedeeControl.java
===================================================================
---
branches/XML-LS-STABLE/src/org/perfsonar/service/measurementPoint/flowType/ZebedeeControl.java
2007-01-08 14:39:39 UTC (rev 1893)
+++
branches/XML-LS-STABLE/src/org/perfsonar/service/measurementPoint/flowType/ZebedeeControl.java
2007-01-08 15:21:59 UTC (rev 1894)
@@ -130,8 +130,9 @@
* @param clientIP The flow subscribers ip address.
* @param outPort The port on wich the client wants to receive the
flows. This port is supplied by the subscriber.
* @throws IOException When the program execution failed.
+ * @throws SystemException
*/
- public Integer startTunnel(String clientIP, Integer outPort) throws
IOException {
+ public Integer startTunnel(String clientIP, Integer outPort) throws
IOException, SystemException {
//Get a new unique key
Integer key = newKey();

@@ -158,26 +159,27 @@
* Stop a running tunnel (kills the zebedee process).
*
* @param key Unique key identifying the client (supplied by the
service).
+ * @throws SystemException
*/
- public void stopTunnel(Integer key) {
- logger.debug("ZebedeeControl: stopping tunnel with key " + key + ".");
- //Get the process that needs to be killed
- Process processToKill = processList.get(key);
- //Destroy (hard-kill) the process
- processToKill.destroy();
- //Remove the key from the processList and the keepAliveList
- processList.remove(key);
- keepAliveList.remove(key);
+ public void stopTunnel(Integer key) throws SystemException {
+ logger.debug("ZebedeeControl: stopping tunnel with key " +
key + ".");
+ //Get the process that needs to be killed
+ Process processToKill = processList.get(key);
+ //Destroy (hard-kill) the process
+ processToKill.destroy();
+ //Remove the key from the processList and the keepAliveList
+ processList.remove(key);
+ keepAliveList.remove(key);
+ ConfigFileWriter.delete(key);
}

/**
* Infinate loop wich checks the keepalive times of the active tunnels.
- *
* @see Runnable.run
*/
public void run() {
- // Infinate loop
- while (true) {
+ // Infinate loop
+ while (true) {
try {
Thread.sleep(SLEEPTIME);
} catch (InterruptedException e) {
@@ -185,8 +187,13 @@
logger.error("ZebedeeControl: InterruptedException! " +
e.getMessage());
}
//run the checkForTimeouts method to check for timeouts, and to
close timed-out tunnels
- checkForTimeouts();
- }
+ try {
+ checkForTimeouts();
+ } catch (SystemException e) {
+ e.printStackTrace();
+ logger.error("ZebedeeControl:
SystemException! " + e.getMessage());
+ }
+ }
}

/**
@@ -195,18 +202,19 @@
* @param key The unique key for the clients tunnel connection.
*/
public void keepAlive(Integer key) {
- logger.debug("ZebedeeControl: keeping alive tunnel with key " + key +
".");
- // current time
- Long now = (Long) System.currentTimeMillis();
-
- //add or update this key with the current time
- keepAliveList.put(key, now);
+ logger.debug("ZebedeeControl: keeping alive tunnel with key "
+ key + ".");
+ // current time
+ Long now = (Long) System.currentTimeMillis();
+
+ //add or update this key with the current time
+ keepAliveList.put(key, now);
}

/**
* Checks the keepAliveList list for timed-out tunnels and closes them.
+ * @throws SystemException
*/
- private void checkForTimeouts() {
+ private void checkForTimeouts() throws SystemException {
logger.debug("ZebedeeControl: checking for timeouts.");
// temporary list with timed out tunnel connections
ArrayList<Integer> tunnelsToClose = new ArrayList<Integer>();


  • r1894 - in branches/XML-LS-STABLE: ant ant/flowmp ant/rrdma ant/xmlls conf conf/template contrib contrib/FlowMP-client contrib/FlowMP-client/schemas contrib/FlowMP-manager doc doc/ls doc/ma/rrdTypeMA schema/example-instances/perfSONAR/LS/test src/org/perfsonar/client/commons/requests/lookupService src/org/perfsonar/service/lookupService/xmlType src/org/perfsonar/service/measurementPoint/flowType, svnlog, 01/08/2007

Archive powered by MHonArc 2.6.16.

Top of Page