Chronological Thread 

< Chronological >      < Thread >

---

Author: rodriguez
Date: 2006-12-26 03:54:11 -0500 (Tue, 26 Dec 2006)
New Revision: 1872

Added:
branches/ulisseskan/ant/build-flowmp.xml
branches/ulisseskan/ant/clmp/clmp-axis-deploy-targets.xml
branches/ulisseskan/ant/clmp/clmp-client-run-targets.xml
branches/ulisseskan/ant/clmp/clmp-configure-targets.xml
branches/ulisseskan/ant/clmp/clmp-java-compile-targets.xml
branches/ulisseskan/ant/clmp/clmp-libs-download-targets.xml
branches/ulisseskan/ant/clmp/clmp-pre-install-targets.xml
branches/ulisseskan/ant/clmp/clmp-release-targets.xml
branches/ulisseskan/ant/clmp/clmp-test-run-targets.xml
branches/ulisseskan/ant/const.properties.clmp
branches/ulisseskan/ant/flowmp/
branches/ulisseskan/ant/flowmp/flowTypeMP-axis-deploy-targets.xml
branches/ulisseskan/ant/flowmp/flowTypeMP-configure-targets.xml
branches/ulisseskan/ant/flowmp/flowTypeMP-doc-targets.xml
branches/ulisseskan/ant/flowmp/flowTypeMP-java-compile-targets.xml
branches/ulisseskan/ant/flowmp/flowTypeMP-release-targets.xml
branches/ulisseskan/ant/flowmp/flowTypeMP-test-targets.xml
branches/ulisseskan/ant/perfsonar-install.xml
branches/ulisseskan/ant/pre-install-targets.xml
branches/ulisseskan/ant/rrdma/rrdma-pre-install-targets.xml
branches/ulisseskan/ant/tops/tops-configure-targets.xml
branches/ulisseskan/ant/tops/tops-pre-install-targets.xml
branches/ulisseskan/ant/tops/tops-release-targets.xml
branches/ulisseskan/conf/axis-1.4/
branches/ulisseskan/conf/axis-1.4/WEB-INF/
branches/ulisseskan/conf/axis-1.4/WEB-INF/classes/
branches/ulisseskan/conf/axis-1.4/WEB-INF/classes/i18n.properties
branches/ulisseskan/conf/axis-1.4/WEB-INF/users.lst
branches/ulisseskan/conf/axis-1.4/WEB-INF/web.xml
branches/ulisseskan/conf/axis-1.4/fingerprint.jsp
branches/ulisseskan/conf/axis-1.4/happyaxis.jsp
branches/ulisseskan/conf/axis-1.4/i18nLib.jsp
branches/ulisseskan/conf/axis-1.4/index.html
branches/ulisseskan/conf/axis-1.4/index.jsp
branches/ulisseskan/conf/components.properties.clmp
branches/ulisseskan/conf/components.properties.rrdma
branches/ulisseskan/conf/components.properties.sqlma
branches/ulisseskan/conf/service.properties.clmp
branches/ulisseskan/conf/wsdd/
branches/ulisseskan/conf/wsdd/clmp-service-deploy.wsdd
branches/ulisseskan/conf/wsdd/clmp-service-undeploy.wsdd
branches/ulisseskan/conf/wsdd/ls-service-deploy.wsdd
branches/ulisseskan/conf/wsdd/ls-service-undeploy.wsdd
branches/ulisseskan/conf/wsdd/ma-service-deploy.wsdd
branches/ulisseskan/conf/wsdd/ma-service-undeploy.wsdd
branches/ulisseskan/conf/wsdd/mp-service-deploy.wsdd
branches/ulisseskan/conf/wsdd/mp-service-undeploy.wsdd
branches/ulisseskan/conf/wsdd/tcmp-service-deploy.wsdd
branches/ulisseskan/conf/wsdd/tcmp-service-undeploy.wsdd
branches/ulisseskan/conf/wsdd/tops-service-deploy.wsdd
branches/ulisseskan/conf/wsdd/tops-service-undeploy.wsdd
branches/ulisseskan/doc/base/
branches/ulisseskan/doc/ls/
branches/ulisseskan/doc/ma/
branches/ulisseskan/doc/ma/rrdTypeMA/
branches/ulisseskan/doc/ma/sqlTypeMA/
branches/ulisseskan/doc/mp/cliTypeMP/
branches/ulisseskan/schema/example-instances/perfSONAR/

branches/ulisseskan/schema/example-instances/perfSONAR/CommandLineMP-Ping-Request.xml
branches/ulisseskan/schema/example-instances/perfSONAR/Echo-Req.xml
branches/ulisseskan/schema/example-instances/perfSONAR/Echo-Resp.xml
branches/ulisseskan/schema/example-instances/perfSONAR/LS/
branches/ulisseskan/schema/example-instances/perfSONAR/LS/test/

branches/ulisseskan/schema/example-instances/perfSONAR/LS/test/LSDeregisterRequest.xml

branches/ulisseskan/schema/example-instances/perfSONAR/LS/test/LSKeepaliveRequest.xml

branches/ulisseskan/schema/example-instances/perfSONAR/LS/test/LSQueryRequest.xml

branches/ulisseskan/schema/example-instances/perfSONAR/LS/test/LSRegisterRequest-Update.xml

branches/ulisseskan/schema/example-instances/perfSONAR/LS/test/LSRegisterRequest.xml

branches/ulisseskan/schema/example-instances/perfSONAR/LS/test/LSStore-control.xml
branches/ulisseskan/schema/example-instances/perfSONAR/LS/test/LSStore.xml
branches/ulisseskan/schema/example-instances/perfSONAR/MPDataRequest.xml
branches/ulisseskan/schema/example-instances/perfSONAR/MPDataRequestKey.xml
branches/ulisseskan/schema/example-instances/perfSONAR/MPDataResponse.xml

branches/ulisseskan/schema/example-instances/perfSONAR/MPDataResponseKey.xml
branches/ulisseskan/schema/example-instances/perfSONAR/MPKeyRequest.xml
branches/ulisseskan/schema/example-instances/perfSONAR/MPKeyResponse.xml

branches/ulisseskan/schema/example-instances/perfSONAR/MeasurementArchiveStore-L2status-Req-1.xml

branches/ulisseskan/schema/example-instances/perfSONAR/MeasurementArchiveStoreRequest-1.xml

branches/ulisseskan/schema/example-instances/perfSONAR/MeasurementArchiveStoreRequest-Key-1.xml

branches/ulisseskan/schema/example-instances/perfSONAR/MetadataKey-Filter-Req-1.xml

branches/ulisseskan/schema/example-instances/perfSONAR/MetadataKey-Filter-Req-2.xml

branches/ulisseskan/schema/example-instances/perfSONAR/MetadataKey-Filter-Resp.xml

branches/ulisseskan/schema/example-instances/perfSONAR/MetadataKey-L2status-Req-1.xml

branches/ulisseskan/schema/example-instances/perfSONAR/MetadataKey-L2status-Req-2.xml

branches/ulisseskan/schema/example-instances/perfSONAR/MetadataKey-L2status-Req-3.xml
branches/ulisseskan/schema/example-instances/perfSONAR/MetadataKey-Req.xml
branches/ulisseskan/schema/example-instances/perfSONAR/MetadataKey-Resp.xml

branches/ulisseskan/schema/example-instances/perfSONAR/SetupData-L2status-Req-1.xml

branches/ulisseskan/schema/example-instances/perfSONAR/SetupData-L2status-Req-2.xml

branches/ulisseskan/schema/example-instances/perfSONAR/SetupData-L2status-Req-3.xml

branches/ulisseskan/schema/example-instances/perfSONAR/SetupData-L2status-Req-4.xml

branches/ulisseskan/schema/example-instances/perfSONAR/SetupData-L2status-Req-5.xml

branches/ulisseskan/schema/example-instances/perfSONAR/SetupData-L2status-Req-6.xml
branches/ulisseskan/schema/example-instances/perfSONAR/SetupData-Req1.xml
branches/ulisseskan/schema/example-instances/perfSONAR/SetupData-Req2.xml
branches/ulisseskan/schema/example-instances/perfSONAR/SetupData-Resp1.xml
branches/ulisseskan/schema/example-instances/perfSONAR/SetupData-Resp2.xml

branches/ulisseskan/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-2.xml

branches/ulisseskan/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-3.xml

branches/ulisseskan/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-4.xml

branches/ulisseskan/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-5.xml

branches/ulisseskan/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-Chaining-1.xml

branches/ulisseskan/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-Chaining-2.xml

branches/ulisseskan/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect.xml

branches/ulisseskan/schema/example-instances/perfSONAR/SetupDataResponse-FilterRRDSelect-2.xml

branches/ulisseskan/schema/example-instances/perfSONAR/SetupDataResponse-FilterRRDSelect-3.xml

branches/ulisseskan/schema/example-instances/perfSONAR/SetupDataResponse-FilterRRDSelect.xml

branches/ulisseskan/schema/example-instances/perfSONAR/TCMPCaptureRequest-measurement.xml
branches/ulisseskan/schema/example-instances/perfSONAR/TOPS/
branches/ulisseskan/schema/example-instances/perfSONAR/TOPS/test/

branches/ulisseskan/schema/example-instances/perfSONAR/TOPS/test/TOPSDownloadRequest.xml
branches/ulisseskan/schema/example-instances/perfSONAR/TOPS/test/Void.xml

branches/ulisseskan/schema/example-instances/perfSONAR/link-status-store.xml
branches/ulisseskan/schema/example-instances/perfSONAR/netflow/

branches/ulisseskan/schema/example-instances/perfSONAR/netflow/ClientMPKeepaliveRequest.xml

branches/ulisseskan/schema/example-instances/perfSONAR/netflow/ClientMPKeepaliveResponse.xml

branches/ulisseskan/schema/example-instances/perfSONAR/netflow/ClientMPSubscribeRequest.xml

branches/ulisseskan/schema/example-instances/perfSONAR/netflow/ClientMPSubscribeResponse.xml

branches/ulisseskan/schema/example-instances/perfSONAR/netflow/ClientMPUnSubscribeRequest.xml

branches/ulisseskan/schema/example-instances/perfSONAR/netflow/ClientMPUnSubscribeResponse.xml

branches/ulisseskan/schema/example-instances/perfSONAR/netflow/MPLSRegistrationRequest.xml

branches/ulisseskan/schema/example-instances/perfSONAR/netflow/MPLSRegistrationResponse.xml
branches/ulisseskan/schema/example-instances/perfSONAR/nmsTypeMP/

branches/ulisseskan/schema/example-instances/perfSONAR/nmsTypeMP/DataRequest-exampleMetadata-noKey.xml

branches/ulisseskan/schema/example-instances/perfSONAR/nmsTypeMP/GEANT2-link-status-with-data-store

branches/ulisseskan/schema/example-instances/perfSONAR/nmsTypeMP/GEANT2-link-status-with-key-store

branches/ulisseskan/schema/example-instances/perfSONAR/nmsTypeMP/KeyRequest-emptyMetadata.xml

branches/ulisseskan/schema/example-instances/perfSONAR/nmsTypeMP/KeyRequest-exampleMetadata.xml

branches/ulisseskan/schema/example-instances/perfSONAR/nmsTypeMP/nmsTypeMP-store-beta1.xml
branches/ulisseskan/schema/example-instances/perfSONAR/rrdTypeMA/
branches/ulisseskan/schema/example-instances/perfSONAR/snmpTypeMP/

branches/ulisseskan/schema/example-instances/perfSONAR/snmpTypeMP/DataRequest-exampleMetadata-noKey.xml

branches/ulisseskan/schema/example-instances/perfSONAR/snmpTypeMP/DataRequest-withKey.xml

branches/ulisseskan/schema/example-instances/perfSONAR/snmpTypeMP/KeyRequest-exampleMetadata.xml

branches/ulisseskan/schema/example-instances/perfSONAR/snmpTypeMP/snmpTypeMP-store-beta1.xml
branches/ulisseskan/schema/example-instances/perfSONAR/store.xml
branches/ulisseskan/schema/nmwg/netflow.rnc

branches/ulisseskan/src/org/perfsonar/service/measurementPoint/commandLine/CommandLineResourceProtector.java
branches/ulisseskan/src/org/perfsonar/service/measurementPoint/flowType/

branches/ulisseskan/src/org/perfsonar/service/measurementPoint/flowType/FlowTypeMERequestTypes.java

branches/ulisseskan/src/org/perfsonar/service/measurementPoint/flowType/FlowTypeMPServiceEngine.java

branches/ulisseskan/src/org/perfsonar/service/measurementPoint/flowType/keepalive/

branches/ulisseskan/src/org/perfsonar/service/measurementPoint/flowType/keepalive/KeepAliveThread.java
Removed:
branches/ulisseskan/ant/clmp/commandLineMP-axis-deploy-targets.xml
branches/ulisseskan/ant/clmp/commandLineMP-client-run-targets.xml
branches/ulisseskan/ant/clmp/commandLineMP-configure-targets.xml
branches/ulisseskan/ant/clmp/commandLineMP-doc-targets.xml
branches/ulisseskan/ant/clmp/commandLineMP-java-compile-targets.xml
branches/ulisseskan/ant/clmp/commandLineMP-libs-download-targets.xml
branches/ulisseskan/ant/clmp/commandLineMP-release-targets.xml
branches/ulisseskan/ant/clmp/commandLineMP-test-targets.xml
branches/ulisseskan/ant/const.properties.cl
branches/ulisseskan/ant/flowmp/flowTypeMP-axis-deploy-targets.xml
branches/ulisseskan/ant/flowmp/flowTypeMP-configure-targets.xml
branches/ulisseskan/ant/flowmp/flowTypeMP-doc-targets.xml
branches/ulisseskan/ant/flowmp/flowTypeMP-java-compile-targets.xml
branches/ulisseskan/ant/flowmp/flowTypeMP-release-targets.xml
branches/ulisseskan/ant/flowmp/flowTypeMP-test-targets.xml
branches/ulisseskan/ant/webservice-env-targets.xml
branches/ulisseskan/conf/axis-1.4/WEB-INF/
branches/ulisseskan/conf/axis-1.4/WEB-INF/classes/
branches/ulisseskan/conf/axis-1.4/WEB-INF/classes/i18n.properties
branches/ulisseskan/conf/axis-1.4/WEB-INF/users.lst
branches/ulisseskan/conf/axis-1.4/WEB-INF/web.xml
branches/ulisseskan/conf/axis-1.4/fingerprint.jsp
branches/ulisseskan/conf/axis-1.4/happyaxis.jsp
branches/ulisseskan/conf/axis-1.4/i18nLib.jsp
branches/ulisseskan/conf/axis-1.4/index.html
branches/ulisseskan/conf/axis-1.4/index.jsp
branches/ulisseskan/conf/components.properties.cl
branches/ulisseskan/conf/components.properties.ma
branches/ulisseskan/conf/service.properties.cl
branches/ulisseskan/conf/wsdd/clmp-service-deploy.wsdd
branches/ulisseskan/conf/wsdd/clmp-service-undeploy.wsdd
branches/ulisseskan/conf/wsdd/ls-service-deploy.wsdd
branches/ulisseskan/conf/wsdd/ls-service-undeploy.wsdd
branches/ulisseskan/conf/wsdd/ma-service-deploy.wsdd
branches/ulisseskan/conf/wsdd/ma-service-undeploy.wsdd
branches/ulisseskan/conf/wsdd/mp-service-deploy.wsdd
branches/ulisseskan/conf/wsdd/mp-service-undeploy.wsdd
branches/ulisseskan/conf/wsdd/tcmp-service-deploy.wsdd
branches/ulisseskan/conf/wsdd/tcmp-service-undeploy.wsdd
branches/ulisseskan/conf/wsdd/tops-service-deploy.wsdd
branches/ulisseskan/conf/wsdd/tops-service-undeploy.wsdd
branches/ulisseskan/doc/ma/rrdTypeMA/
branches/ulisseskan/doc/ma/sqlTypeMA/

branches/ulisseskan/schema/example-instances/perfSONAR/CommandLineMP-Ping-Request.xml
branches/ulisseskan/schema/example-instances/perfSONAR/Echo-Req.xml
branches/ulisseskan/schema/example-instances/perfSONAR/Echo-Resp.xml
branches/ulisseskan/schema/example-instances/perfSONAR/LS/
branches/ulisseskan/schema/example-instances/perfSONAR/LS/test/

branches/ulisseskan/schema/example-instances/perfSONAR/LS/test/LSDeregisterRequest.xml

branches/ulisseskan/schema/example-instances/perfSONAR/LS/test/LSKeepaliveRequest.xml

branches/ulisseskan/schema/example-instances/perfSONAR/LS/test/LSQueryRequest.xml

branches/ulisseskan/schema/example-instances/perfSONAR/LS/test/LSRegisterRequest-Update.xml

branches/ulisseskan/schema/example-instances/perfSONAR/LS/test/LSRegisterRequest.xml

branches/ulisseskan/schema/example-instances/perfSONAR/LS/test/LSStore-control.xml
branches/ulisseskan/schema/example-instances/perfSONAR/LS/test/LSStore.xml
branches/ulisseskan/schema/example-instances/perfSONAR/MPDataRequest.xml
branches/ulisseskan/schema/example-instances/perfSONAR/MPDataRequestKey.xml
branches/ulisseskan/schema/example-instances/perfSONAR/MPDataResponse.xml

branches/ulisseskan/schema/example-instances/perfSONAR/MPDataResponseKey.xml
branches/ulisseskan/schema/example-instances/perfSONAR/MPKeyRequest.xml
branches/ulisseskan/schema/example-instances/perfSONAR/MPKeyResponse.xml

branches/ulisseskan/schema/example-instances/perfSONAR/MeasurementArchiveStore-L2status-Req-1.xml

branches/ulisseskan/schema/example-instances/perfSONAR/MeasurementArchiveStoreRequest-1.xml

branches/ulisseskan/schema/example-instances/perfSONAR/MeasurementArchiveStoreRequest-Key-1.xml

branches/ulisseskan/schema/example-instances/perfSONAR/MetadataKey-Filter-Req-1.xml

branches/ulisseskan/schema/example-instances/perfSONAR/MetadataKey-Filter-Req-2.xml

branches/ulisseskan/schema/example-instances/perfSONAR/MetadataKey-Filter-Resp.xml

branches/ulisseskan/schema/example-instances/perfSONAR/MetadataKey-L2status-Req-1.xml

branches/ulisseskan/schema/example-instances/perfSONAR/MetadataKey-L2status-Req-2.xml

branches/ulisseskan/schema/example-instances/perfSONAR/MetadataKey-L2status-Req-3.xml
branches/ulisseskan/schema/example-instances/perfSONAR/MetadataKey-Req.xml
branches/ulisseskan/schema/example-instances/perfSONAR/MetadataKey-Resp.xml

branches/ulisseskan/schema/example-instances/perfSONAR/SetupData-L2status-Req-1.xml

branches/ulisseskan/schema/example-instances/perfSONAR/SetupData-L2status-Req-2.xml

branches/ulisseskan/schema/example-instances/perfSONAR/SetupData-L2status-Req-3.xml

branches/ulisseskan/schema/example-instances/perfSONAR/SetupData-L2status-Req-4.xml

branches/ulisseskan/schema/example-instances/perfSONAR/SetupData-L2status-Req-5.xml

branches/ulisseskan/schema/example-instances/perfSONAR/SetupData-L2status-Req-6.xml
branches/ulisseskan/schema/example-instances/perfSONAR/SetupData-Req1.xml
branches/ulisseskan/schema/example-instances/perfSONAR/SetupData-Req2.xml
branches/ulisseskan/schema/example-instances/perfSONAR/SetupData-Resp1.xml
branches/ulisseskan/schema/example-instances/perfSONAR/SetupData-Resp2.xml

branches/ulisseskan/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-2.xml

branches/ulisseskan/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-3.xml

branches/ulisseskan/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-4.xml

branches/ulisseskan/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-5.xml

branches/ulisseskan/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-Chaining-1.xml

branches/ulisseskan/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-Chaining-2.xml

branches/ulisseskan/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect.xml

branches/ulisseskan/schema/example-instances/perfSONAR/SetupDataResponse-FilterRRDSelect-2.xml

branches/ulisseskan/schema/example-instances/perfSONAR/SetupDataResponse-FilterRRDSelect-3.xml

branches/ulisseskan/schema/example-instances/perfSONAR/SetupDataResponse-FilterRRDSelect.xml

branches/ulisseskan/schema/example-instances/perfSONAR/TCMPCaptureRequest-measurement.xml
branches/ulisseskan/schema/example-instances/perfSONAR/TOPS/
branches/ulisseskan/schema/example-instances/perfSONAR/TOPS/test/
branches/ulisseskan/schema/example-instances/perfSONAR/TOPS/test/Void.xml

branches/ulisseskan/schema/example-instances/perfSONAR/link-status-store.xml
branches/ulisseskan/schema/example-instances/perfSONAR/netflow/

branches/ulisseskan/schema/example-instances/perfSONAR/netflow/ClientMPKeepaliveRequest.xml

branches/ulisseskan/schema/example-instances/perfSONAR/netflow/ClientMPKeepaliveResponse.xml

branches/ulisseskan/schema/example-instances/perfSONAR/netflow/ClientMPSubscribeRequest.xml

branches/ulisseskan/schema/example-instances/perfSONAR/netflow/ClientMPSubscribeResponse.xml

branches/ulisseskan/schema/example-instances/perfSONAR/netflow/ClientMPUnSubscribeRequest.xml

branches/ulisseskan/schema/example-instances/perfSONAR/netflow/ClientMPUnSubscribeResponse.xml

branches/ulisseskan/schema/example-instances/perfSONAR/netflow/MPLSRegistrationRequest.xml

branches/ulisseskan/schema/example-instances/perfSONAR/netflow/MPLSRegistrationResponse.xml
branches/ulisseskan/schema/example-instances/perfSONAR/nmsTypeMP/

branches/ulisseskan/schema/example-instances/perfSONAR/nmsTypeMP/DataRequest-exampleMetadata-noKey.xml

branches/ulisseskan/schema/example-instances/perfSONAR/nmsTypeMP/GEANT2-link-status-with-data-store

branches/ulisseskan/schema/example-instances/perfSONAR/nmsTypeMP/GEANT2-link-status-with-key-store

branches/ulisseskan/schema/example-instances/perfSONAR/nmsTypeMP/KeyRequest-emptyMetadata.xml

branches/ulisseskan/schema/example-instances/perfSONAR/nmsTypeMP/KeyRequest-exampleMetadata.xml

branches/ulisseskan/schema/example-instances/perfSONAR/nmsTypeMP/nmsTypeMP-store-beta1.xml
branches/ulisseskan/schema/example-instances/perfSONAR/rrdTypeMA/
branches/ulisseskan/schema/example-instances/perfSONAR/snmpTypeMP/

branches/ulisseskan/schema/example-instances/perfSONAR/snmpTypeMP/DataRequest-exampleMetadata-noKey.xml

branches/ulisseskan/schema/example-instances/perfSONAR/snmpTypeMP/DataRequest-withKey.xml

branches/ulisseskan/schema/example-instances/perfSONAR/snmpTypeMP/KeyRequest-exampleMetadata.xml

branches/ulisseskan/schema/example-instances/perfSONAR/snmpTypeMP/snmpTypeMP-store-beta1.xml
branches/ulisseskan/schema/example-instances/perfSONAR/store.xml
branches/ulisseskan/schema/example-instances/sonar/

branches/ulisseskan/src/org/perfsonar/service/measurementPoint/flowType/FlowTypeMERequestTypes.java

branches/ulisseskan/src/org/perfsonar/service/measurementPoint/flowType/FlowTypeMPServiceEngine.java

branches/ulisseskan/src/org/perfsonar/service/measurementPoint/flowType/keepalive/

branches/ulisseskan/src/org/perfsonar/service/measurementPoint/flowType/keepalive/KeepAliveThread.java
Modified:
branches/ulisseskan/ant/axis-deploy-targets.xml
branches/ulisseskan/ant/build-clmp.xml
branches/ulisseskan/ant/build-rrdma.xml
branches/ulisseskan/ant/build-tops.xml
branches/ulisseskan/ant/configure-targets.xml
branches/ulisseskan/ant/java-compile-targets.xml
branches/ulisseskan/ant/javadoc-targets.xml
branches/ulisseskan/ant/libs-download-targets.xml
branches/ulisseskan/ant/rrdma/rrdjtool-compile-targets.xml
branches/ulisseskan/ant/rrdma/rrdma-axis-deploy-targets.xml
branches/ulisseskan/ant/rrdma/rrdma-client-run-targets.xml
branches/ulisseskan/ant/rrdma/rrdma-configure-targets.xml
branches/ulisseskan/ant/rrdma/rrdma-exist-xmldb-targets.xml
branches/ulisseskan/ant/rrdma/rrdma-java-compile-targets.xml
branches/ulisseskan/ant/rrdma/rrdma-junit-test-targets.xml
branches/ulisseskan/ant/rrdma/rrdma-libs-download-targets.xml
branches/ulisseskan/ant/rrdma/rrdma-release-targets.xml
branches/ulisseskan/ant/rrdma/rrdma-test-run-targets.xml
branches/ulisseskan/ant/tops/tops-axis-deploy-targets.xml
branches/ulisseskan/ant/tops/tops-client-run-targets.xml
branches/ulisseskan/ant/tops/tops-java-compile-targets.xml
branches/ulisseskan/ant/tops/tops-libs-download-targets.xml
branches/ulisseskan/ant/tops/tops-test-run-targets.xml
branches/ulisseskan/conf/components.properties.tops
branches/ulisseskan/conf/log4j.properties
branches/ulisseskan/conf/rrd-database_TEST.xml
branches/ulisseskan/conf/service.properties.tops
branches/ulisseskan/schema/nmwg/nmtopo-l2.rnc
branches/ulisseskan/schema/nmwg/nmtopo-l3.rnc
branches/ulisseskan/schema/nmwg/nmtopo_ver3.rnc
branches/ulisseskan/schema/nmwg/test.sh
branches/ulisseskan/src/objects.config

branches/ulisseskan/src/org/perfsonar/commons/auxiliary/AuxiliaryComponentManager.java

branches/ulisseskan/src/org/perfsonar/commons/auxiliary/components/configuration/properties/PropertiesConfigurationComponent.java

branches/ulisseskan/src/org/perfsonar/commons/auxiliary/components/simplescheduler/SchedulerTask.java
branches/ulisseskan/src/org/perfsonar/commons/messages/Request.java

branches/ulisseskan/src/org/perfsonar/service/commons/registration/GenericServiceLSRegistrator.java

branches/ulisseskan/src/org/perfsonar/service/commons/registration/LSRegistrationComponent.java

branches/ulisseskan/src/org/perfsonar/service/lookupService/xmlType/LSAction.java

branches/ulisseskan/src/org/perfsonar/service/lookupService/xmlType/LSDeregisterAction.java

branches/ulisseskan/src/org/perfsonar/service/lookupService/xmlType/LSGenericRegisterAction.java

branches/ulisseskan/src/org/perfsonar/service/lookupService/xmlType/LSKeepaliveAction.java

branches/ulisseskan/src/org/perfsonar/service/lookupService/xmlType/LSRegisterAction.java

branches/ulisseskan/src/org/perfsonar/service/measurementArchive/eventTypeConfig/EventTypeConfigurationComponent.java

branches/ulisseskan/src/org/perfsonar/service/measurementPoint/commandLine/CommandLineAction.java

branches/ulisseskan/src/org/perfsonar/service/measurementPoint/commandLine/CommandLineToolBundle.java

branches/ulisseskan/src/org/perfsonar/service/measurementPoint/commandLine/CommandLineToolBundleFactory.java

branches/ulisseskan/src/org/perfsonar/service/measurementPoint/commandLine/tools/Bwctl.java

branches/ulisseskan/src/org/perfsonar/service/measurementPoint/commandLine/tools/Owamp.java

branches/ulisseskan/src/org/perfsonar/service/measurementPoint/commandLine/tools/Ping.java

branches/ulisseskan/src/org/perfsonar/service/measurementPoint/commandLine/tools/Traceroute.java

branches/ulisseskan/src/org/perfsonar/service/measurementPoint/tracefileCaptureType/TCMPTypeMeasurementExecutor.java

branches/ulisseskan/src/org/perfsonar/service/topologyService/TopServiceEngine.java

branches/ulisseskan/src/org/perfsonar/service/topologyService/TopsLSRegistrationComponent.java
Log:
Update the topology service

Modified: branches/ulisseskan/ant/axis-deploy-targets.xml
===================================================================
--- branches/ulisseskan/ant/axis-deploy-targets.xml 2006-12-22 11:52:13
UTC (rev 1871)
+++ branches/ulisseskan/ant/axis-deploy-targets.xml 2006-12-26 08:54:11
UTC (rev 1872)
@@ -6,7 +6,7 @@
author: romradz

Notes:
- A set of targets for deployment of web service in the Axis.
+ A set of targets for deployment of Axis web service.

</description>
==================================================================== -->
@@ -14,50 +14,129 @@
<project name="axis-deploy-targets">


+
+ <property file="conf/service.properties" />
+ <property file="ant/const.properties" />
+
+
<taskdef resource="axis-tasks.properties" classpathref="classpath"
onerror="ignore"/>


- <property name="adminService"
value="http://${target.server}:${target.port}/axis/services/AdminService"; />
- <property name="deployFile"
value="../${build}/${wsdd.path}/${wsdd.file.deploy}" />
- <property name="undeployFile"
value="../${build}/${wsdd.path}/${wsdd.file.undeploy}" />
- <property name="axisWebXml" value="${axis.home}/WEB-INF/web.xml" />
+ <property name="adminService"
value="http://${target.server}:${target.port}/${deploy.root}/services/AdminService";
/>
+ <property name="deployFile"
value="${service.home}/${deploy.root}/wsdd/${wsdd.file.deploy}" />
+ <property name="undeployFile"
value="${service.home}/${deploy.root}/wsdd/${wsdd.file.undeploy}" />
+ <property name="axisWebXml"
value="${service.home}/${deploy.root}/WEB-INF/web.xml" />


+ <target name="create-deploy-root">

- <target name="copy-jars-for-service">
+ <mkdir dir="${service.home}/${deploy.root}"/>
+ <mkdir dir="${service.home}/${deploy.root}/wsdd"/>
+ <mkdir dir="${service.home}/${deploy.root}/WEB-INF"/>
+ <mkdir dir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <mkdir dir="${service.home}/${deploy.root}/WEB-INF/classes"/>
+ <mkdir
dir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar"/>
+ <mkdir
dir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf"/>

- <copy file="./lib/repository/jdom/jdom/1.0b8/jdom-1.0b8.jar"
todir="${axis.home}/WEB-INF/lib"/>
- <copy file="./lib/repository/xalan/xalan/2.7.0/xalan-2.7.0.jar"
todir="${axis.home}/WEB-INF/lib"/>
- <copy
file="./lib/repository/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar"
todir="${axis.home}/WEB-INF/lib"/>
- <copy
file="./lib/repository/xml-apis/xml-apis/1.3.02/xml-apis-1.3.02.jar"
todir="${axis.home}/WEB-INF/lib"/>
- <copy
file="./lib/repository/xerces/xmlParserAPIs/2.6.2/xmlParserAPIs-2.6.2.jar"
todir="${axis.home}/WEB-INF/lib"/>
- <copy
file="./lib/repository/commons-pool/commons-pool/1.1/commons-pool-1.1.jar"
todir="${axis.home}/WEB-INF/lib"/>
- <copy
file="./lib/repository/javax/activation/activation/1.0.2/activation-1.0.2.jar"
todir="${axis.home}/WEB-INF/lib"/>
- <copy file="./lib/repository/javax/mail/mail/1.3.2/mail-1.3.2.jar"
todir="${axis.home}/WEB-INF/lib"/>
- <copy file="./lib/repository/log4j/log4j/1.2.9/log4j-1.2.9.jar"
todir="${axis.home}/WEB-INF/lib"/>
+ </target>

+
+ <target name="delete-deploy-root">
+ <delete dir="${service.home}/${deploy.root}"/>
</target>


- <target name="delete-jars-for-service">
+ <target name="copy-axis-for-service" depends="create-deploy-root">

- <delete file="${axis.home}/WEB-INF/lib/jdom-1.0b8.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/xalan-2.7.0.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/xercesImpl-2.6.2.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/xml-apis-1.3.02.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/xmlParserAPIs-2.6.2.jar"/>
+ <copy file="./conf/axis-1.4/fingerprint.jsp"
todir="${service.home}/${deploy.root}"/>
+ <copy file="./conf/axis-1.4/happyaxis.jsp"
todir="${service.home}/${deploy.root}"/>
+ <copy file="./conf/axis-1.4/i18nLib.jsp"
todir="${service.home}/${deploy.root}"/>
+ <copy file="./conf/axis-1.4/index.html"
todir="${service.home}/${deploy.root}"/>
+ <copy file="./conf/axis-1.4/index.jsp"
todir="${service.home}/${deploy.root}"/>

- <delete file="${axis.home}/WEB-INF/lib/commons-pool-1.1.jar"/>
+ <copy file="./conf/axis-1.4/WEB-INF/users.lst"
todir="${service.home}/${deploy.root}/WEB-INF"/>
+ <copy file="./conf/axis-1.4/WEB-INF/web.xml"
todir="${service.home}/${deploy.root}/WEB-INF"/>

- <delete file="${axis.home}/WEB-INF/lib/activation-1.0.2.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/mail-1.3.2.jar"/>
+ <copy file="./conf/axis-1.4/WEB-INF/classes/i18n.properties"
todir="${service.home}/${deploy.root}/WEB-INF/classes"/>

- <delete file="${axis.home}/WEB-INF/lib/log4j-1.2.9.jar"/>
+ <copy file="./conf/service.properties"
todir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf"/>
+ <copy file="./conf/components.properties"
todir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf"/>

</target>


+ <target name="copy-jars-for-service" depends="copy-axis-for-service">

+ <copy file="./lib/repository/axis/axis/1.4/axis-1.4.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="./lib/repository/axis/axis-jaxrpc/1.4/axis-jaxrpc-1.4.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy file="./lib/repository/axis/axis-saaj/1.4/axis-saaj-1.4.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="./lib/repository/axis/axis-wsdl4j/1.5.1/axis-wsdl4j-1.5.1.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="./lib/repository/commons-discovery/commons-discovery/0.2/commons-discovery-0.2.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="./lib/repository/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+
+
+ <copy file="./lib/repository/jdom/jdom/1.0b8/jdom-1.0b8.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy file="./lib/repository/xalan/xalan/2.7.0/xalan-2.7.0.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="./lib/repository/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="./lib/repository/xml-apis/xml-apis/1.3.02/xml-apis-1.3.02.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="./lib/repository/xerces/xmlParserAPIs/2.6.2/xmlParserAPIs-2.6.2.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+
+ <copy
file="./lib/repository/commons-pool/commons-pool/1.1/commons-pool-1.1.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+
+ <copy
file="./lib/repository/javax/activation/activation/1.0.2/activation-1.0.2.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy file="./lib/repository/javax/mail/mail/1.3.2/mail-1.3.2.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+
+ <copy file="./lib/repository/log4j/log4j/1.2.9/log4j-1.2.9.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+
+ </target>
+
+
+ <target name="delete-jars-for-service"
depends="delete-axis-for-service">
+
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/axis-1.4.jar"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/axis-jaxrpc-1.4.jar"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/axis-saaj-1.4.jar"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/axis-wsdl4j-1.5.1.jar"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/commons-discovery-0.2.jar"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/commons-logging-1.0.4.jar"/>
+
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/jdom-1.0b8.jar"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/xalan-2.7.0.jar"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/xercesImpl-2.6.2.jar"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/lib/xml-apis-1.3.02.jar"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/xmlParserAPIs-2.6.2.jar"/>
+
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/commons-pool-1.1.jar"/>
+
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/activation-1.0.2.jar"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/mail-1.3.2.jar"/>
+
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/log4j-1.2.9.jar"/>
+
+ <antcall target="delete-deploy-root"/>
+
+ </target>
+
+
+ <target name="delete-axis-for-service">
+
+ <delete file="${service.home}/${deploy.root}/fingerprint.jsp"/>
+ <delete file="${service.home}/${deploy.root}happyaxis.jsp"/>
+ <delete file="${service.home}/${deploy.root}/i18nLib.jsp"/>
+ <delete file="${service.home}/${deploy.root}/index.html"/>
+ <delete file="${service.home}/${deploy.root}/index.jsp"/>
+
+ <delete file="${service.home}/${deploy.root}/WEB-INF/users.lst"/>
+ <delete file="${service.home}/${deploy.root}/WEB-INF/web.xml"/>
+
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/classes/i18n.properties"/>
+
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/service.properties"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/components.properties"/>
+
+ </target>
+
+
<!-- generic -->

<available file="${build}/perfSONAR-generic.jar"
property="jar.perfsonar.generic.present"/>
@@ -77,32 +156,145 @@
if="jar.perfsonar.generic.present"
description="Copy generic jar to Tomcat">

- <copy file="${build}/perfSONAR-generic.jar"
todir="${axis.home}/WEB-INF/lib"/>
+ <copy file="${build}/perfSONAR-generic.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>

</target>
-
+
+
+ <!-- adding/removing a new listener to/from the Axis file web.xml -->
+
<!-- Add service (un)initialization context listener class to AXIS
web.xml -->
<target name="add-context-listener">
-
+
<copy file="${axisWebXml}" tofile="${axisWebXml}.bak"
overwrite="yes" />
-
<style in="${axisWebXml}" out="${axisWebXml}.out"
style="ant/add-context-listener.xsl" />
-
<copy file="${axisWebXml}.out" tofile="${axisWebXml}"
overwrite="yes" />
-
-
+
</target>

+
<!-- Remove service (un)initialization context listener class from AXIS
web.xml -->
<target name="rem-context-listener">
-
+
<copy file="${axisWebXml}" tofile="${axisWebXml}.bak"
overwrite="yes" />
-
<style in="${axisWebXml}" out="${axisWebXml}.out"
style="ant/rem-context-listener.xsl" />
-
<copy file="${axisWebXml}.out" tofile="${axisWebXml}"
overwrite="yes" />
-
+
</target>
-

+
+ <!-- running and stopping the Tomcat -->
+
+ <property environment="env"/>
+
+
+ <target name="tomcat-start-question">
+
+ <input message="Do you want me to start the application server
Tomcat for you? "
+ addproperty="_tomcat.start.decision"
+ validargs="y,n"
+ defaultvalue="y" />
+
+ <condition property="tomcat.start.decision">
+ <equals arg1="y" arg2="${_tomcat.start.decision}"/>
+ </condition>
+
+ </target>
+
+
+ <target name="tomcat-start"
+ depends="tomcat-start-question"
+ if="tomcat.start.decision">
+
+ <echo>Please, insert now the following xml tag 'Context'</echo>
+ <echo>into Tomcat configuration file server.xml</echo>
+ <echo>(${tomcat.home}/conf/server.xml)</echo>
+ <echo>inside existing xml tag 'Host':</echo>
+ <echo></echo>
+ <echo message=" &lt;Context path='/${deploy.root}'"/>
+ <echo message="
docBase='${service.home}/${service.name}'&gt;"/>
+ <echo message=" &lt;/Context&gt;"/>
+ <echo></echo>
+ <echo>Please, do it now. I will wait for you.</echo>
+ <input message="Press Return key ..."/>
+
+ <exec dir="${tomcat.home}/bin"
+ executable="sh"
+ output="${basedir}/log/tomcat.log"
+ error="${basedir}/log/tomcat.log">
+ <arg line="startup.sh"/>
+ <env key="PATH" path="${env.PATH}:${tomcat.home}/bin:."/>
+ </exec>
+
+ </target>
+
+
+ <target name="tomcat-shutdown-question">
+
+ <input message="Do you want me to shutdown the application server
Tomcat for you? "
+ addproperty="_tomcat.shutdown.decision"
+ validargs="y,n"
+ defaultvalue="y" />
+
+ <condition property="tomcat.shutdown.decision">
+ <equals arg1="y" arg2="${_tomcat.shutdown.decision}"/>
+ </condition>
+
+ </target>
+
+
+ <target name="tomcat-shutdown"
+ depends="tomcat-shutdown-question"
+ if="tomcat.shutdown.decision">
+
+ <exec dir="${tomcat.home}/bin"
+ executable="sh"
+ output="${basedir}/log/tomcat.log"
+ error="${basedir}/log/tomcat.log">
+ <arg line="shutdown.sh"/>
+ <env key="PATH" path="${env.PATH}:${tomcat.home}/bin:."/>
+ </exec>
+
+ </target>
+
+
+ <!-- (un)deploying the service in Axis -->
+
+
+ <target name="_deploy-adminclient">
+
+ <echo></echo>
+ <echo>The directory with all required service files has been
created.</echo>
+ <echo>The next step in deploy action is installing the service in
Tomcat.</echo>
+ <echo>(If you are an expert in Axis and want to install the service
other way</echo>
+ <echo> than default one use ctrl+c to stop the script in this
moment)</echo>
+ <echo></echo>
+
+ <input message="Press Return key ..."/>
+
+ </target>
+
+
+ <target name="deploy-adminclient"
+ depends="_deploy-adminclient">
+
+ <java classname="org.apache.axis.client.AdminClient">
+ <arg line="-l ${adminService} ${deployFile}"/>
+ <classpath refid="classpath"/>
+ </java>
+
+ </target>
+
+
+ <target name="undeploy-adminclient">
+
+ <java classname="org.apache.axis.client.AdminClient">
+ <arg line="-l ${adminService} ${undeployFile}"/>
+ <classpath refid="classpath"/>
+ </java>
+
+ </target>
+
+
+
</project>
\ No newline at end of file

Modified: branches/ulisseskan/ant/build-clmp.xml
===================================================================
--- branches/ulisseskan/ant/build-clmp.xml 2006-12-22 11:52:13 UTC (rev
1871)
+++ branches/ulisseskan/ant/build-clmp.xml 2006-12-26 08:54:11 UTC (rev
1872)
@@ -6,10 +6,10 @@

$Id$
project: perfSONAR
- author: boote
+ author: fernandes

Notes:
- This is a build file for commandLine MP.
+ This is a build file for CommandLine MP.

</description>
==================================================================== -->
@@ -40,22 +40,23 @@

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


-
<!-- commandLine MP imports -->

- <import file="clmp/commandLineMP-java-compile-targets.xml"/>
- <import file="clmp/commandLineMP-axis-deploy-targets.xml"/>
- <import file="clmp/commandLineMP-configure-targets.xml"/>
- <import file="clmp/commandLineMP-libs-download-targets.xml"/>
- <import file="clmp/commandLineMP-test-targets.xml"/>
- <import file="clmp/commandLineMP-release-targets.xml"/>
- <import file="clmp/commandLineMP-doc-targets.xml"/>
+ <import file="clmp/clmp-axis-deploy-targets.xml"/>
+ <import file="clmp/clmp-configure-targets.xml"/>
+ <import file="clmp/clmp-pre-install-targets.xml"/>
+ <import file="clmp/clmp-libs-download-targets.xml"/>
+ <import file="clmp/clmp-test-run-targets.xml"/>
+ <import file="clmp/clmp-client-run-targets.xml"/>
+ <import file="clmp/clmp-java-compile-targets.xml"/>
+ <import file="clmp/clmp-release-targets.xml"/>




Copied: branches/ulisseskan/ant/build-flowmp.xml (from rev 1849,
trunk/perfsonar/ant/build-flowmp.xml)

Modified: branches/ulisseskan/ant/build-rrdma.xml
===================================================================
--- branches/ulisseskan/ant/build-rrdma.xml 2006-12-22 11:52:13 UTC (rev
1871)
+++ branches/ulisseskan/ant/build-rrdma.xml 2006-12-26 08:54:11 UTC (rev
1872)
@@ -4,14 +4,14 @@
<!-- ===================================================================
<description>
perfSONAR generic service
-
+
$Id$
project: perfSONAR
author: romradz
-
+
Notes:
This is a build file for RRD MA.
-
+
</description>
==================================================================== -->

@@ -20,9 +20,7 @@
<project basedir="../" default="compile-rrdma" name="perfsonar-rrdma">


- <property file="ant/const.properties" />

-
<path id="classpath">
<fileset dir="./lib/repository">
<include name="**/*.jar"/>
@@ -41,7 +39,7 @@

<import file="configure-targets.xml"/>
<import file="javadoc-targets.xml"/>
- <import file="webservice-env-targets.xml"/>
+ <import file="pre-install-targets.xml"/>
<import file="java-compile-targets.xml"/>
<import file="axis-deploy-targets.xml"/>
<import file="libs-download-targets.xml"/>
@@ -50,8 +48,8 @@

<!-- RRD MA imports -->

+ <import file="rrdma/rrdma-pre-install-targets.xml"/>
<import file="rrdma/rrdjtool-compile-targets.xml"/>
-
<import file="rrdma/rrdma-java-compile-targets.xml"/>
<import file="rrdma/rrdma-axis-deploy-targets.xml"/>
<import file="rrdma/rrdma-client-run-targets.xml"/>

Modified: branches/ulisseskan/ant/build-tops.xml
===================================================================
--- branches/ulisseskan/ant/build-tops.xml 2006-12-22 11:52:13 UTC (rev
1871)
+++ branches/ulisseskan/ant/build-tops.xml 2006-12-26 08:54:11 UTC (rev
1872)
@@ -1,28 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!-- ===================================================================
- <description>
- perfSONAR generic service
-
- $Id: build-sqlma.xml 1390 2006-07-06 10:33:52Z roman $
- project: perfSONAR
- author: romradz, modofied by ulisses for the topology service
-
- Notes:
- This is a build file for Topology Service.
-
- </description>
- ==================================================================== -->
-
-
-
<project basedir="../" default="compile-tops" name="perfsonar-tops">
-
-
<property file="ant/const.properties" />

-
<path id="classpath">
<fileset dir="./lib">
<include name="**/*.jar"/>
@@ -30,31 +9,25 @@
<pathelement location="build"/>
</path>

-
<target name="init">
<tstamp/>
</target>

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

- <!-- dependencies -->
-
-
<!-- TOPS imports -->
-
- <import file="tops/tops-java-compile-targets.xml"/>
<import file="tops/tops-axis-deploy-targets.xml"/>
- <import file="tops/tops-client-run-targets.xml"/>
- <import file="tops/tops-test-run-targets.xml"/>
+ <import file="tops/tops-configure-targets.xml"/>
+ <import file="tops/tops-pre-install-targets.xml"/>
<import file="tops/tops-libs-download-targets.xml"/>
-
+ <import file="tops/tops-test-run-targets.xml"/>
+ <import file="tops/tops-client-run-targets.xml"/>
+ <import file="tops/tops-java-compile-targets.xml"/>
+ <import file="tops/tops-release-targets.xml"/>
</project>
\ No newline at end of file

Copied: branches/ulisseskan/ant/clmp/clmp-axis-deploy-targets.xml (from rev
1849, trunk/perfsonar/ant/clmp/clmp-axis-deploy-targets.xml)

Copied: branches/ulisseskan/ant/clmp/clmp-client-run-targets.xml (from rev
1849, trunk/perfsonar/ant/clmp/clmp-client-run-targets.xml)

Copied: branches/ulisseskan/ant/clmp/clmp-configure-targets.xml (from rev
1849, trunk/perfsonar/ant/clmp/clmp-configure-targets.xml)

Copied: branches/ulisseskan/ant/clmp/clmp-java-compile-targets.xml (from rev
1849, trunk/perfsonar/ant/clmp/clmp-java-compile-targets.xml)

Copied: branches/ulisseskan/ant/clmp/clmp-libs-download-targets.xml (from rev
1849, trunk/perfsonar/ant/clmp/clmp-libs-download-targets.xml)

Copied: branches/ulisseskan/ant/clmp/clmp-pre-install-targets.xml (from rev
1849, trunk/perfsonar/ant/clmp/clmp-pre-install-targets.xml)

Copied: branches/ulisseskan/ant/clmp/clmp-release-targets.xml (from rev 1849,
trunk/perfsonar/ant/clmp/clmp-release-targets.xml)

Copied: branches/ulisseskan/ant/clmp/clmp-test-run-targets.xml (from rev
1849, trunk/perfsonar/ant/clmp/clmp-test-run-targets.xml)

Deleted: branches/ulisseskan/ant/clmp/commandLineMP-axis-deploy-targets.xml

Deleted: branches/ulisseskan/ant/clmp/commandLineMP-client-run-targets.xml

Deleted: branches/ulisseskan/ant/clmp/commandLineMP-configure-targets.xml

Deleted: branches/ulisseskan/ant/clmp/commandLineMP-doc-targets.xml

Deleted: branches/ulisseskan/ant/clmp/commandLineMP-java-compile-targets.xml

Deleted: branches/ulisseskan/ant/clmp/commandLineMP-libs-download-targets.xml

Deleted: branches/ulisseskan/ant/clmp/commandLineMP-release-targets.xml

Deleted: branches/ulisseskan/ant/clmp/commandLineMP-test-targets.xml

Modified: branches/ulisseskan/ant/configure-targets.xml
===================================================================
--- branches/ulisseskan/ant/configure-targets.xml 2006-12-22 11:52:13
UTC (rev 1871)
+++ branches/ulisseskan/ant/configure-targets.xml 2006-12-26 08:54:11
UTC (rev 1872)
@@ -15,93 +15,14 @@
<project name="configure-targets">


- <property name="tomcat.dir" value="apache-tomcat-5.5.17" />
+ <property file="ant/const.properties" />


-
- <target name="_get-java-path">
- <exec executable="which"
- os="Linux"
- errorproperty="java.path.error"
- outputproperty="full.java.path">
- <arg line="java"/>
- </exec>
- </target>
-
-
- <target name="get-java-path" depends="_get-java-path">
- <dirname property="__java.path" file="${full.java.path}"/>
- <dirname property="_java.path" file="${__java.path}"/>
- <input message="Enter the path of Java [${_java.path}]:"
- addproperty="java.path"
- defaultvalue="${_java.path}"
- />
- <echo message="Accepted Java path: ${java.path}"/>
- </target>
-
-
- <target name="get-current-path">
- <dirname property="_current.path" file="."/>
- <dirname property="current.path" file="${_current.path}"/>
- </target>
-
-
- <target name="get-axis-path">
- <input message="Enter the path of Axis location
[${basedir}/../${tomcat.dir}/webapps/axis]:"
- addproperty="axis.path"
- defaultvalue="${basedir}/../${tomcat.dir}/webapps/axis"
- />
- <echo message="Accepted Axis path: ${axis.path}"/>
- </target>
-
-
- <target name="get-server-address">
- <input message="Enter the address of host (perfSONAR service
location) [localhost]:"
- addproperty="server.address"
- defaultvalue="localhost"
- />
- <echo message="Accepted server address: ${server.address}"/>
- </target>
-
-
- <target name="get-server-port">
- <input message="Enter the port of server [8080]:"
- addproperty="server.port"
- defaultvalue="8080"
- />
- <echo message="Accepted server port: ${server.port}"/>
- </target>
-
-
- <target name="get-message-1">
- <echo message="Start creating ant/const.properties file"/>
- <echo
message="-----------------------------------------------------------"/>
- </target>
-
-
- <target name="get-message-2">
- <echo message="Start creating conf/service.properties file"/>
- <echo
message="-----------------------------------------------------------"/>
- </target>
-
-
- <target name="get-message-3">
- <echo message="Start creating conf/log4j.properties file"/>
- <echo
message="-----------------------------------------------------------"/>
- </target>
-
-
- <target name="get-message-4">
- <echo message="Start adding properties to Tomcat catalina.properties
file"/>
- <echo
message="-----------------------------------------------------------"/>
- </target>
-
-
<!-- creating log4j.properties file -->

- <target name="set-log4j-properties"
- depends="get-message-3">

+ <target name="set-log4j-properties">
+
<property name="logDir" value="${basedir}/log"/>

<propertyfile file="conf/log4j.properties"
@@ -111,93 +32,111 @@

<entry key="log4j.rootLogger" value="INFO, rootAppender"/>
<entry key="log4j.logger.perfsonar-debug" value="DEBUG,
debugAppender"/>
- <entry key="log4j.logger.perfsonar-info" value="INFO,
infoAppender"/>
- <entry key="log4j.logger.perfsonar-warn" value="WARN,
warnAppender"/>
+ <entry key="log4j.logger.perfsonar-info" value="INFO,
infoAppender"/>
+ <entry key="log4j.logger.perfsonar-warn" value="WARN,
warnAppender"/>
<entry key="log4j.logger.perfsonar-error" value="ERROR,
errorAppender"/>
<entry key="log4j.logger.perfsonar-fatal" value="FATAL,
fatalAppender"/>

- <entry key="log4j.appender.rootAppender"
value="org.apache.log4j.RollingFileAppender"/>
- <entry key="log4j.appender.rootAppender.File"
value="${logDir}/perfsonar.log"/>
- <entry key="log4j.appender.rootAppender.MaxFileSize"
value="500KB"/>
- <entry key="log4j.appender.rootAppender.MaxBackupIndex"
value="1000"/>
- <entry key="log4j.appender.rootAppender.layout"
value="org.apache.log4j.PatternLayout"/>
+ <entry key="log4j.appender.rootAppender"
value="org.apache.log4j.RollingFileAppender"/>
+ <entry key="log4j.appender.rootAppender.File"
value="${logDir}/perfsonar.log"/>
+ <entry key="log4j.appender.rootAppender.MaxFileSize"
value="500KB"/>
+ <entry key="log4j.appender.rootAppender.MaxBackupIndex"
value="1000"/>
+ <entry key="log4j.appender.rootAppender.layout"
value="org.apache.log4j.PatternLayout"/>
<entry
key="log4j.appender.rootAppender.layout.ConversionPattern" value="%d %5p -
%m%n"/>

- <entry key="log4j.appender.debugAppender"
value="org.apache.log4j.RollingFileAppender"/>
- <entry key="log4j.appender.debugAppender.File"
value="${logDir}/perfsonar_debug.log"/>
- <entry key="log4j.appender.debugAppender.MaxFileSize"
value="500KB"/>
- <entry key="log4j.appender.debugAppender.MaxBackupIndex"
value="1000"/>
- <entry key="log4j.appender.debugAppender.layout"
value="org.apache.log4j.PatternLayout"/>
+ <entry key="log4j.appender.debugAppender"
value="org.apache.log4j.RollingFileAppender"/>
+ <entry key="log4j.appender.debugAppender.File"
value="${logDir}/perfsonar_debug.log"/>
+ <entry key="log4j.appender.debugAppender.MaxFileSize"
value="500KB"/>
+ <entry key="log4j.appender.debugAppender.MaxBackupIndex"
value="1000"/>
+ <entry key="log4j.appender.debugAppender.layout"
value="org.apache.log4j.PatternLayout"/>
<entry
key="log4j.appender.debugAppender.layout.ConversionPattern" value="%d %5p -
%m%n"/>

- <entry key="log4j.appender.infoAppender"
value="org.apache.log4j.RollingFileAppender"/>
- <entry key="log4j.appender.infoAppender.File"
value="${logDir}/perfsonar_info.log"/>
- <entry key="log4j.appender.infoAppender.MaxFileSize"
value="500KB"/>
- <entry key="log4j.appender.infoAppender.MaxBackupIndex"
value="1000"/>
- <entry key="log4j.appender.infoAppender.layout"
value="org.apache.log4j.PatternLayout"/>
+ <entry key="log4j.appender.infoAppender"
value="org.apache.log4j.RollingFileAppender"/>
+ <entry key="log4j.appender.infoAppender.File"
value="${logDir}/perfsonar_info.log"/>
+ <entry key="log4j.appender.infoAppender.MaxFileSize"
value="500KB"/>
+ <entry key="log4j.appender.infoAppender.MaxBackupIndex"
value="1000"/>
+ <entry key="log4j.appender.infoAppender.layout"
value="org.apache.log4j.PatternLayout"/>
<entry
key="log4j.appender.infoAppender.layout.ConversionPattern" value="%d %5p -
%m%n"/>

- <entry key="log4j.appender.warnAppender"
value="org.apache.log4j.RollingFileAppender"/>
- <entry key="log4j.appender.warnAppender.File"
value="${logDir}/perfsonar_warn.log"/>
- <entry key="log4j.appender.warnAppender.MaxFileSize"
value="500KB"/>
- <entry key="log4j.appender.warnAppender.MaxBackupIndex"
value="1000"/>
- <entry key="log4j.appender.warnAppender.layout"
value="org.apache.log4j.PatternLayout"/>
+ <entry key="log4j.appender.warnAppender"
value="org.apache.log4j.RollingFileAppender"/>
+ <entry key="log4j.appender.warnAppender.File"
value="${logDir}/perfsonar_warn.log"/>
+ <entry key="log4j.appender.warnAppender.MaxFileSize"
value="500KB"/>
+ <entry key="log4j.appender.warnAppender.MaxBackupIndex"
value="1000"/>
+ <entry key="log4j.appender.warnAppender.layout"
value="org.apache.log4j.PatternLayout"/>
<entry
key="log4j.appender.warnAppender.layout.ConversionPattern" value="%d %5p -
%m%n"/>

- <entry key="log4j.appender.errorAppender"
value="org.apache.log4j.RollingFileAppender"/>
- <entry key="log4j.appender.errorAppender.File"
value="${logDir}/perfsonar_error.log"/>
- <entry key="log4j.appender.errorAppender.MaxFileSize"
value="500KB"/>
- <entry key="log4j.appender.errorAppender.MaxBackupIndex"
value="1000"/>
- <entry key="log4j.appender.errorAppender.layout"
value="org.apache.log4j.PatternLayout"/>
+ <entry key="log4j.appender.errorAppender"
value="org.apache.log4j.RollingFileAppender"/>
+ <entry key="log4j.appender.errorAppender.File"
value="${logDir}/perfsonar_error.log"/>
+ <entry key="log4j.appender.errorAppender.MaxFileSize"
value="500KB"/>
+ <entry key="log4j.appender.errorAppender.MaxBackupIndex"
value="1000"/>
+ <entry key="log4j.appender.errorAppender.layout"
value="org.apache.log4j.PatternLayout"/>
<entry
key="log4j.appender.errorAppender.layout.ConversionPattern" value="%d %5p -
%m%n"/>

- <entry key="log4j.appender.fatalAppender"
value="org.apache.log4j.RollingFileAppender"/>
- <entry key="log4j.appender.fatalAppender.File"
value="${logDir}/perfsonar_fatal.log"/>
- <entry key="log4j.appender.fatalAppender.MaxFileSize"
value="500KB"/>
- <entry key="log4j.appender.fatalAppender.MaxBackupIndex"
value="1000"/>
- <entry key="log4j.appender.fatalAppender.layout"
value="org.apache.log4j.PatternLayout"/>
+ <entry key="log4j.appender.fatalAppender"
value="org.apache.log4j.RollingFileAppender"/>
+ <entry key="log4j.appender.fatalAppender.File"
value="${logDir}/perfsonar_fatal.log"/>
+ <entry key="log4j.appender.fatalAppender.MaxFileSize"
value="500KB"/>
+ <entry key="log4j.appender.fatalAppender.MaxBackupIndex"
value="1000"/>
+ <entry key="log4j.appender.fatalAppender.layout"
value="org.apache.log4j.PatternLayout"/>
<entry
key="log4j.appender.fatalAppender.layout.ConversionPattern" value="%d %5p -
%m%n"/>

</propertyfile>

- <echo message="log4j.properties file created"/>
- <input message="Press Return key ..."/>
-
</target>


+ <!-- removing prooperties files -->
+
+
<target name="remove-properties">
+
<delete file="ant/const.properties" failonerror="false"/>
<delete file="conf/service.properties" failonerror="false"/>
<delete file="conf/log4j.properties" failonerror="false"/>
+
</target>


- <target name="copy-properties">
- <copy file="ant/const.properties"
tofile="ant/const-old.properties" overwrite="true" failonerror="false"/>
- <copy file="conf/service.properties"
tofile="conf/service-old.properties" overwrite="true" failonerror="false"/>
- <copy file="conf/log4j.properties"
tofile="conf/log4j-old.properties" overwrite="true" failonerror="false"/>
+ <!-- configuring LS register functionality -->
+
+
+ <target name="register-fuctionality-question">
+
+ <input message="Do you want the service to register in LS? "
+ addproperty="_functionality.register.decision"
+ validargs="y,n" />
+
+ <condition property="functionality.register.decision">
+ <equals arg1="y" arg2="${_functionality.register.decision}"/>
+ </condition>
+
</target>


- <target name="set-tomcat-properties" depends="get-message-4">
- <input message="Enter the path of Tomcat location
[${basedir}/../${tomcat.dir}]:"
- addproperty="full.tomcat.path"
- defaultvalue="${basedir}/../${tomcat.dir}"
- />
- <input message="Enter the path of service.properties file
[${basedir}/conf/service.properties]:"
- addproperty="service.properties.path"
- defaultvalue="${basedir}/conf/service.properties"
- />
- <input message="Enter the path of components.properties file
[${basedir}/conf/components.properties]:"
- addproperty="components.properties.path"
- defaultvalue="${basedir}/conf/components.properties"
- />
- <propertyfile file="${full.tomcat.path}/conf/catalina.properties"
- comment="tranformed by perfSONAR">
- <entry key="service.properties"
value="${service.properties.path}"/>
- <entry key="components.properties"
value="${components.properties.path}"/>
+ <target name="register-fuctionality"
+ depends="register-fuctionality-question"
+ if="functionality.register.decision">
+
+ <input message="Enter the URL of LS []:"
+ addproperty="functionality.register.ls_address"/>
+
+ <input message="Enter the registration interval [30000]:"
+ addproperty="functionality.register.interval"
+ defaultvalue="30000"/>
+
+ <input message="Enter the descirption of service that will be send
to the LS [perfSONAR service]:"
+ addproperty="functionality.register.description"
+ defaultvalue="perfSONAR service"/>
+
+ <propertyfile file="conf/service.properties"
+ comment="This file was created by the Ant configuration script.">
+
+ <entry key="service.r.access_point"
value="http://${target.server}:${target.port}/${deploy.root}/services/${webservice.name}"/>
+ <entry key="service.r.service_description"
value="${functionality.register.description}"/>
+ <entry key="service.r.ls_url"
value="${functionality.register.ls_address}"/>
+ <entry key="component.registrator.interval"
value="${functionality.register.interval}"/>
+
</propertyfile>
+
</target>



Deleted: branches/ulisseskan/ant/const.properties.cl

Copied: branches/ulisseskan/ant/const.properties.clmp (from rev 1849,
trunk/perfsonar/ant/const.properties.clmp)

Copied: branches/ulisseskan/ant/flowmp (from rev 1849,
trunk/perfsonar/ant/flowmp)

Deleted: branches/ulisseskan/ant/flowmp/flowTypeMP-axis-deploy-targets.xml

Copied: branches/ulisseskan/ant/flowmp/flowTypeMP-axis-deploy-targets.xml
(from rev 1849, trunk/perfsonar/ant/flowmp/flowTypeMP-axis-deploy-targets.xml)

Deleted: branches/ulisseskan/ant/flowmp/flowTypeMP-configure-targets.xml

Copied: branches/ulisseskan/ant/flowmp/flowTypeMP-configure-targets.xml (from
rev 1849, trunk/perfsonar/ant/flowmp/flowTypeMP-configure-targets.xml)

Deleted: branches/ulisseskan/ant/flowmp/flowTypeMP-doc-targets.xml

Copied: branches/ulisseskan/ant/flowmp/flowTypeMP-doc-targets.xml (from rev
1849, trunk/perfsonar/ant/flowmp/flowTypeMP-doc-targets.xml)

Deleted: branches/ulisseskan/ant/flowmp/flowTypeMP-java-compile-targets.xml

Copied: branches/ulisseskan/ant/flowmp/flowTypeMP-java-compile-targets.xml
(from rev 1849,
trunk/perfsonar/ant/flowmp/flowTypeMP-java-compile-targets.xml)

Deleted: branches/ulisseskan/ant/flowmp/flowTypeMP-release-targets.xml

Copied: branches/ulisseskan/ant/flowmp/flowTypeMP-release-targets.xml (from
rev 1849, trunk/perfsonar/ant/flowmp/flowTypeMP-release-targets.xml)

Deleted: branches/ulisseskan/ant/flowmp/flowTypeMP-test-targets.xml

Copied: branches/ulisseskan/ant/flowmp/flowTypeMP-test-targets.xml (from rev
1849, trunk/perfsonar/ant/flowmp/flowTypeMP-test-targets.xml)

Modified: branches/ulisseskan/ant/java-compile-targets.xml
===================================================================
--- branches/ulisseskan/ant/java-compile-targets.xml 2006-12-22 11:52:13
UTC (rev 1871)
+++ branches/ulisseskan/ant/java-compile-targets.xml 2006-12-26 08:54:11
UTC (rev 1872)
@@ -18,81 +18,93 @@
<project name="java-compile-targets">


- <!-- all sources -->

-
<target name="clean-all"
description="Removes build directories.">
+
<delete dir="${build}/org"/>
<delete>
<fileset dir="${build}" includes="**/*.jar"/>
<fileset dir="${build}" includes="**/*.xml"/>
</delete>
+
</target>


<target name="clean-jar-all">
+
<delete file="${build}/perfSONAR-all.jar" failonerror="false"/>
+
</target>


<target name="compile-all"
depends="clean-all"
description="Compiles all Java files">
+
<javac srcdir="src" destdir="${build}" deprecation="yes">
<include name="**/*.java" />
<classpath refid="classpath"/>
</javac>
+
<copy failonerror="false"
todir="${build}/${package.root}/${wsdd.home}">
<fileset dir="src/${package.root}/${wsdd.home}">
<include name="*.wsdd" />
</fileset>
</copy>
+
</target>


<target name="jar-all" depends="clean-jar-all, compile-all"
description="Creates JAR file for all perfSONAR classes">
+
<jar destfile="${build}/perfSONAR-all.jar" basedir="${build}" />
+
</target>


-
<!-- generic -->

+
<target name="clean-jar-generic">
+
<delete file="${build}/perfSONAR-generic.jar" failonerror="false"/>
+
</target>


<target name="compile-generic"
description="Compiles generic Java files">
+
<javac srcdir="src" destdir="${build}" deprecation="yes">
<include name="org/perfsonar/commons/**" />
<include name="org/perfsonar/service/commons/**" />
<include name="org/perfsonar/client/commons/**" />
<include name="org/perfsonar/client/axis/**" />
- <include name="org/perfsonar/client/testHarness/SOAPClient.java"
/>
- <include
name="org/perfsonar/client/testHarness/SOAPClientMulti.java" />
+ <include name="org/perfsonar/client/testHarness/**" />
+ <exclude name="**/LSTestClient.java" />
<include name="org/ggf/**" />
<classpath refid="classpath"/>
</javac>
+
</target>


<target name="jar-generic" depends="clean-jar-generic, compile-generic"
description="Creates JAR file for generic">
+
<jar destfile="${build}/perfSONAR-generic.jar">
<fileset dir="${build}">
<include name="org/perfsonar/commons/**" />
<include name="org/perfsonar/service/commons/**" />
<include name="org/perfsonar/client/commons/**" />
<include name="org/perfsonar/client/axis/**" />
- <include
name="org/perfsonar/client/testHarness/SOAPClient.java" />
- <include
name="org/perfsonar/client/testHarness/SOAPClientMulti.java" />
+ <include name="org/perfsonar/client/testHarness/**" />
<include name="org/ggf/**" />
</fileset>
</jar>
+
</target>



Modified: branches/ulisseskan/ant/javadoc-targets.xml
===================================================================
--- branches/ulisseskan/ant/javadoc-targets.xml 2006-12-22 11:52:13 UTC (rev
1871)
+++ branches/ulisseskan/ant/javadoc-targets.xml 2006-12-26 08:54:11 UTC (rev
1872)
@@ -20,15 +20,19 @@


<target name="clean-javadoc"
- description="Removes Java doc API">
- <property file="ant/const.properties" />
+ description="Removes Java doc API">
+
+ <property file="ant/const.properties" />
<delete dir="${api.location}"/>
+
</target>


- <target name="javadoc" depends="init,clean-javadoc"
- description="Generates Javadoc API">
- <property file="ant/const.properties" />
+ <target name="javadoc"
+ depends="init,clean-javadoc"
+ description="Generates Javadoc API">
+
+ <property file="ant/const.properties" />
<javadoc
packagenames="org.*"
destdir="${api.location}"
@@ -42,6 +46,7 @@
doctitle="${api.title}"
windowtitle="${api.windowtitle}">
</javadoc>
+
</target>



Modified: branches/ulisseskan/ant/libs-download-targets.xml
===================================================================
--- branches/ulisseskan/ant/libs-download-targets.xml 2006-12-22 11:52:13
UTC (rev 1871)
+++ branches/ulisseskan/ant/libs-download-targets.xml 2006-12-26 08:54:11
UTC (rev 1872)
@@ -2,17 +2,17 @@

<!-- ===================================================================
<description>
-
+
$Id$
project: perfSONAR
author: romradz
-
+
Notes: Targets to download needed libraries
-
+
</description>
==================================================================== -->
-
-
+
+
<project basedir="../" name="libs-download-targets"
xmlns:artifact="urn:maven-artifact-ant">



Copied: branches/ulisseskan/ant/perfsonar-install.xml (from rev 1849,
trunk/perfsonar/ant/perfsonar-install.xml)

Copied: branches/ulisseskan/ant/pre-install-targets.xml (from rev 1849,
trunk/perfsonar/ant/pre-install-targets.xml)

Modified: branches/ulisseskan/ant/rrdma/rrdjtool-compile-targets.xml
===================================================================
--- branches/ulisseskan/ant/rrdma/rrdjtool-compile-targets.xml 2006-12-22
11:52:13 UTC (rev 1871)
+++ branches/ulisseskan/ant/rrdma/rrdjtool-compile-targets.xml 2006-12-26
08:54:11 UTC (rev 1872)
@@ -27,20 +27,14 @@


<property name="lib_name" value="libjrrd.so" />
- <property name="rrd_h_path" value="${rrdtool_path}/include" />
- <property name="rrd_lib_path" value="${rrdtool_path}/lib" />


-
-
<!-- targets -->


<target name="init-rrdjtool" depends="init">

- <echo
message="-----------------------------------------------------------" />
- <echo message="Remember to download sources of rrdjtool library from
CVS (sonar/rrdjtool) !!!!"/>
- <echo
message="-----------------------------------------------------------" />
+ <property file="ant/const.properties" />

</target>

@@ -72,7 +66,7 @@



- <!-- this target is for LINUX platform -->
+ <!-- this target is for LINUX platform -->

<target name="build-rrdjtool" depends="jar-rrdjtool">

@@ -87,17 +81,28 @@
-lc -lrrd"/>
</exec>

- <echo message="" />
- <echo message="" />
- <echo
message="-----------------------------------------------------------" />
- <echo message="Now you need to setup LD_LIBRARY_PATH env variable
which should contain" />
- <echo message="${rrd_lib_path}:${rrdjdir}/build" />
- <echo
message="-----------------------------------------------------------" />
-
</target>


+ <!-- this target is for LINUX 64-bit platform -->

+ <target name="build-rrdjtool-64bit" depends="jar-rrdjtool">
+
+ <exec dir="${rrdjdir}/native" executable="/usr/bin/gcc">
+ <arg line="-o ${rrdjdir}/build/${lib_name}
+ -shared -Wl,-soname,${rrdjdir}/build/${lib_name}
+ -I ${rrd_h_path}
+ -L${rrd_lib_path}
+ -I ${jdk_path}/include
+ -I ${jdk_path}/include/linux/
+ ${rrdjdir}/native/Rrd.c
+ -lc -lrrd
+ -fPIC"/>
+ </exec>
+
+ </target>
+
+
<!-- this target is for FREEBSD platform -->

<target name="build-rrdjtool-freebsd" depends="jar-rrdjtool">
@@ -113,13 +118,6 @@
-lc -lrrd"/>
</exec>

- <echo message="" />
- <echo message="" />
- <echo
message="-----------------------------------------------------------" />
- <echo message="Now you need to setup LD_LIBRARY_PATH env variable
which should contain" />
- <echo message="${rrd_lib_path}:${rrdjdir}/build" />
- <echo
message="-----------------------------------------------------------" />
-
</target>


@@ -139,13 +137,6 @@
-lc -lrrd"/>
</exec>

- <echo message="" />
- <echo message="" />
- <echo
message="-----------------------------------------------------------" />
- <echo message="Now you need to setup LD_LIBRARY_PATH env variable
which should contain" />
- <echo message="${rrd_lib_path}:${rrdjdir}/build" />
- <echo
message="-----------------------------------------------------------" />
-
</target>



Modified: branches/ulisseskan/ant/rrdma/rrdma-axis-deploy-targets.xml
===================================================================
--- branches/ulisseskan/ant/rrdma/rrdma-axis-deploy-targets.xml 2006-12-22
11:52:13 UTC (rev 1871)
+++ branches/ulisseskan/ant/rrdma/rrdma-axis-deploy-targets.xml 2006-12-26
08:54:11 UTC (rev 1872)
@@ -21,47 +21,53 @@

<target name="copy-jars-for-rrdma" depends="copy-jars-for-service">

- <copy file="./lib/repository/rrdjtool/rrdjtool/1.0/rrdjtool-1.0.jar"
todir="${axis.home}/WEB-INF/lib"/>
- <copy
file="./lib/repository/commons-digester/commons-digester/1.7/commons-digester-1.7.jar"
todir="${axis.home}/WEB-INF/lib"/>
- <copy
file="./lib/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar"
todir="${axis.home}/WEB-INF/lib"/>
- <copy
file="./lib/repository/commons-collections/commons-collections/3.2/commons-collections-3.2.jar"
todir="${axis.home}/WEB-INF/lib"/>
- <copy
file="./lib/repository/com/ibatis/ibatis-common/2.1.7.597/ibatis-common-2.1.7.597.jar"
todir="${axis.home}/WEB-INF/lib"/>
+ <copy file="./lib/repository/rrdjtool/rrdjtool/1.0/rrdjtool-1.0.jar"

todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="./lib/repository/commons-digester/commons-digester/1.7/commons-digester-1.7.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="./lib/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="./lib/repository/commons-collections/commons-collections/3.2/commons-collections-3.2.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="./lib/repository/com/ibatis/ibatis-common/2.1.7.597/ibatis-common-2.1.7.597.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>

- <copy
file="./lib/repository/exist/exist-xmldb/1.0rc/exist-xmldb-1.0rc.jar"
todir="${axis.home}/WEB-INF/lib"/>
- <copy
file="./lib/repository/exist/exist-xmlrpc/1.0rc/exist-xmlrpc-1.0rc.jar"
todir="${axis.home}/WEB-INF/lib"/>
- <copy
file="./lib/repository/exist/exist-db/1.0rc/exist-db-1.0rc.jar"
todir="${axis.home}/WEB-INF/lib"/>
- <copy
file="./lib/repository/exist/exist-optional/1.0rc/exist-optional-1.0rc.jar"
todir="${axis.home}/WEB-INF/lib"/>
+ <copy
file="./lib/repository/exist/exist-xmldb/1.0rc/exist-xmldb-1.0rc.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="./lib/repository/exist/exist-xmlrpc/1.0rc/exist-xmlrpc-1.0rc.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="./lib/repository/exist/exist-db/1.0rc/exist-db-1.0rc.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="./lib/repository/exist/exist-optional/1.0rc/exist-optional-1.0rc.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>

- <copy file="./lib/repository/net/sf/saxon/saxon/8.7/saxon-8.7.jar"
todir="${axis.home}/WEB-INF/lib"/>
- <copy
file="./lib/repository/net/sf/saxon/saxon-jdom/8.7/saxon-jdom-8.7.jar"
todir="${axis.home}/WEB-INF/lib"/>
- <copy
file="./lib/repository/net/sf/saxon/saxon-dom/8.7/saxon-dom-8.7.jar"
todir="${axis.home}/WEB-INF/lib"/>
+ <copy file="./lib/repository/net/sf/saxon/saxon/8.7/saxon-8.7.jar"

todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="./lib/repository/net/sf/saxon/saxon-jdom/8.7/saxon-jdom-8.7.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="./lib/repository/net/sf/saxon/saxon-dom/8.7/saxon-dom-8.7.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>

- <copy file="./conf/eventType-map.xml"
todir="${axis.home}/WEB-INF/classes"/>
- <copy file="./conf/eventType-rules.xml"
todir="${axis.home}/WEB-INF/classes"/>
+ <copy file="./conf/eventType-map.xml"

todir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf"/>
+ <copy file="./conf/eventType-rules.xml"

todir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf"/>

+ <copy file="./conf/wsdd/${wsdd.file.deploy}"

todir="${service.home}/${deploy.root}/wsdd"/>
+ <copy file="./conf/wsdd/${wsdd.file.undeploy}"

todir="${service.home}/${deploy.root}/wsdd"/>
+
</target>


<target name="delete-jars-for-rrdma" depends="delete-jars-for-service">

- <delete file="${axis.home}/WEB-INF/lib/rrdjtool-1.0.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/commons-digester-1.7.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/commons-beanutils-1.7.0.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/commons-collections-3.2.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/ibatis-common-2.1.7.597.jar"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/rrdjtool-1.0.jar"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/commons-digester-1.7.jar"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/commons-beanutils-1.7.0.jar"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/commons-collections-3.2.jar"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/ibatis-common-2.1.7.597.jar"/>

- <delete file="${axis.home}/WEB-INF/lib/exist-xmldb-1.0rc.jar" />
- <delete file="${axis.home}/WEB-INF/lib/exist-xmlrpc-1.0rc.jar" />
- <delete file="${axis.home}/WEB-INF/lib/exist-db-1.0rc.jar" />
- <delete file="${axis.home}/WEB-INF/lib/exist-optional-1.0rc.jar" />
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/exist-xmldb-1.0rc.jar" />
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/exist-xmlrpc-1.0rc.jar" />
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/exist-db-1.0rc.jar" />
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/exist-optional-1.0rc.jar" />

- <delete file="${axis.home}/WEB-INF/lib/saxon-8.7.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/saxon-jdom-8.7.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/saxon-dom-8.7.jar"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/saxon-8.7.jar"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/saxon-jdom-8.7.jar"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/saxon-dom-8.7.jar"/>

- <delete file="${axis.home}/WEB-INF/classes/eventType-map.xml" />
- <delete file="${axis.home}/WEB-INF/classes/eventType-rules.xml" />
+ <delete
file="${service.home}${deploy.root}/WEB-INF/classes/perfsonar/conf/eventType-map.xml"
/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/eventType-rules.xml"
/>

+ <delete
file="${service.home}/${deploy.root}/wsdd/${wsdd.file.deploy}" />
+ <delete
file="${service.home}/${deploy.root}/wsdd/${wsdd.file.undeploy}" />
+
</target>


@@ -84,45 +90,113 @@
if="jar.perfsonar.rrdma.present"
description="Copy rrdma jar to Tomcat">

- <copy file="${build}/perfSONAR-rrdma.jar"
todir="${axis.home}/WEB-INF/lib"/>
+ <copy file="${build}/perfSONAR-rrdma.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>

- <echo/>
- <echo>------------------------------ WARNING
---------------------------</echo>
- <echo/>
- <echo>Restart your application server (container of perfSONAR
service)!!!</echo>
- <echo/>
-
<echo>------------------------------------------------------------------</echo>
+ </target>

+
+ <target name="tomcat-start-for-rrdma-true"
+ depends="tomcat-start-question"
+ if="tomcat.start.decision">
+
+ <echo>Please, insert now the following xml tag 'Context'</echo>
+ <echo>into Tomcat configuration file server.xml</echo>
+ <echo>(${tomcat.home}/conf/server.xml)</echo>
+ <echo>inside existing xml tag 'Host':</echo>
+ <echo></echo>
+ <echo message=" &lt;Context path='/${deploy.root}'"/>
+ <echo message="
docBase='${service.home}/${service.name}'&gt;"/>
+ <echo message=" &lt;/Context&gt;"/>
+ <echo></echo>
+ <echo>Please, do it now. I will wait for you.</echo>
+ <input message="Press Return key ..."/>
+
+ <exec dir="${tomcat.home}/bin"
+ executable="sh"
+ output="${basedir}/log/tomcat.log"
+ error="${basedir}/log/tomcat.log">
+ <arg line="startup.sh"/>
+ <env key="PATH" path="${env.PATH}:${tomcat.home}/bin:."/>
+ <env key="LD_LIBRARY_PATH"
path="${env.LD_LIBRARY_PATH}:${rrd_lib_path}:${rrdjdir}/build"/>
+ </exec>
+
+ <echo>Please, make sure that the Tomcat is running. Use the address
http://${target.server}:${target.port} .</echo>
+ <input message="Press Return key ..."/>
+
</target>


- <target name="deploy-rrdma" depends="copy-rrdma-jar,
add-context-listener"
- description="Deploys RRD MA service">
- <java classname="org.apache.axis.client.AdminClient">
- <arg line="-l ${adminService} ${deployFile}"/>
- <classpath refid="classpath"/>
- </java>
+ <target name="tomcat-start-for-rrdma-false"
+ unless="tomcat.start.decision">
+
+ <echo>Please, insert now the following xml tag 'Context'</echo>
+ <echo>into Tomcat configuration file server.xml</echo>
+ <echo>(${tomcat.home}/conf/server.xml)</echo>
+ <echo>inside existing xml tag 'Host':</echo>
+ <echo></echo>
+ <echo message=" &lt;Context path='/${deploy.root}'"/>
+ <echo message="
docBase='${service.home}/${service.name}'&gt;"/>
+ <echo message=" &lt;/Context&gt;"/>
+ <echo></echo>
+ <echo>Please, do it now. I will wait for you.</echo>
+ <input message="Press Return key ..."/>
+
+
+ <echo>${line.separator}You have to manually set up the env variable
LD_LIBRARY_PATH</echo>
+ <echo>which should be seen by the Tomcat instance.</echo>
+ <echo></echo>
+ <echo>After setting up the variable (re)start the Tomcat.</echo>
+
+ <echo>${line.separator}Example:</echo>
+ <echo> export
LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${rrdtool_path}/lib:${rrdjdir}/build</echo>
+ <echo>${line.separator} Please, do it now. I will wait for
you.</echo>
+
+ <input message="Press Return key ..."/>
+
</target>


- <target name="undeploy-rrdma"
+ <target name="tomcat-start-for-rrdma"
+ depends="tomcat-start-for-rrdma-true,tomcat-start-for-rrdma-false">
+
+ </target>
+
+
+ <!-- the main targets -->
+
+
+ <target name="deploy" depends="copy-rrdma-jar, add-context-listener"
+ description="Deploys RRD MA service">
+
+ <echo>Deploying the service...</echo>
+
+ <antcall target="tomcat-start-for-rrdma" />
+
+ <antcall target="xmldb-adduser-rrdma" />
+
+ <antcall target="deploy-adminclient" />
+
+ </target>
+
+
+ <target name="undeploy"
description="Undeploys RRD MA service">

- <java classname="org.apache.axis.client.AdminClient">
- <arg line="-l ${adminService} ${undeployFile}"/>
- <classpath refid="classpath"/>
- </java>
+ <echo>Undeploying the service...</echo>

+ <antcall target="undeploy-adminclient" />
+
<antcall target="rem-context-listener" />
<antcall target="delete-jars-for-rrdma"/>

- <delete file="${axis.home}/WEB-INF/lib/perfSONAR-generic.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/perfSONAR-rrdma.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/perfSONAR.jar"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/perfSONAR-generic.jar"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/perfSONAR-rrdma.jar"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/perfSONAR.jar"/>

+ <antcall target="tomcat-shutdown" />
+
</target>



-
</project>

Modified: branches/ulisseskan/ant/rrdma/rrdma-client-run-targets.xml
===================================================================
--- branches/ulisseskan/ant/rrdma/rrdma-client-run-targets.xml 2006-12-22
11:52:13 UTC (rev 1871)
+++ branches/ulisseskan/ant/rrdma/rrdma-client-run-targets.xml 2006-12-26
08:54:11 UTC (rev 1872)
@@ -1,5 +1,4 @@

-
<!-- ===================================================================
<description>

@@ -16,30 +15,144 @@
<project name="rrdma-client-run-targets">


- <property name="ma.esnet"
value="http://mea1.es.net:8080/axis/services/MeasurementArchiveService"/>
- <property name="ma.geant"
value="http://mu.dante.org.uk:8090/axis/services/MeasurementArchiveService"/>
- <property name="ma.udel"
value="http://stout.pc.cis.udel.edu:8080/axis/services/MeasurementArchiveService"/>
- <property name="ma.abilene"
value="http://thunderbird.internet2.edu:8080/axis/services/MeasurementArchiveService"/>

- <property name="ma.local"
value="http://${target.server}:${target.port}/axis/services/MeasurementArchiveService"/>
+ <property name="ma.local"
value="http://${target.server}:${target.port}/${deploy.root}/services/MeasurementArchiveService"/>


+
<!-- fetching -->

- <target name="run-rrdma-client" description="Runs Java client2">
+
+ <target name="run-rrdma-client-1" description="Runs Java client">
+
<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"/>
+
+ <classpath>
+ <pathelement location="build/perfSONAR-generic.jar"/>
+ </classpath>
+
+ </java>
+
+ </target>
+
+
+ <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}"/>
+
+ <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"/>
+
+ <classpath>
+ <pathelement location="build/perfSONAR-generic.jar"/>
+ </classpath>
+
+ </java>
+
+ </target>
+
+
+ <target name="run-rrdma-client-3" description="Runs Java client">
+
+ <replace
file="${basedir}/schema/example-instances/sonar/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"/>
+
+ <classpath>
+ <pathelement location="build/perfSONAR-generic.jar"/>
+ </classpath>
+
+ </java>
+
+ </target>
+
+
+ <target name="run-rrdma-client-4" description="Runs Java client">
+
+ <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.xml"/>
+ <arg
value="${basedir}/schema/example-instances/sonar/response-4.xml"/>
+
+ <classpath>
+ <pathelement location="build/perfSONAR-generic.jar"/>
+ </classpath>
+
</java>
+
</target>


+ <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}"/>
+
+ <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"/>
+
+ <classpath>
+ <pathelement location="build/perfSONAR-generic.jar"/>
+ </classpath>
+
+ </java>
+
+ </target>
+
+
+ <target name="run-rrdma-client-6" description="Runs Java client">
+
+ <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"/>
+
+ <classpath>
+ <pathelement location="build/perfSONAR-generic.jar"/>
+ </classpath>
+
+ </java>
+
+ </target>
+
+
+ <target name="run-rrdma-client-7" description="Runs Java client">
+
+ <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"/>
+
+ <classpath>
+ <pathelement location="build/perfSONAR-generic.jar"/>
+ </classpath>
+
+ </java>
+
+ </target>
+
+
<!--storing -->

+
<target name="run-rrdma-client-store" description="Runs Java client">
+
<java classname="org.perfsonar.client.testHarness.SOAPClient"
classpathref="classpath"
fork="true">
@@ -47,10 +160,12 @@
<arg
value="${basedir}/schema/example-instances/sonar/MeasurementArchiveStoreRequest-1.xml"/>
<arg
value="${basedir}/schema/example-instances/sonar/response.xml"/>
</java>
+
</target>


<target name="run-rrdma-client-store-with-key" description="Runs Java
client">
+
<java classname="org.perfsonar.client.testHarness.SOAPClient"
classpathref="classpath"
fork="true">
@@ -58,21 +173,22 @@
<arg
value="${basedir}/schema/example-instances/sonar/MeasurementArchiveStoreRequest-Key-1.xml"/>
<arg
value="${basedir}/schema/example-instances/sonar/response.xml"/>
</java>
+
</target>



<target name="run-echo">
+
<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"/>
</java>
+
</target>



</project>
-
-

Modified: branches/ulisseskan/ant/rrdma/rrdma-configure-targets.xml
===================================================================
--- branches/ulisseskan/ant/rrdma/rrdma-configure-targets.xml 2006-12-22
11:52:13 UTC (rev 1871)
+++ branches/ulisseskan/ant/rrdma/rrdma-configure-targets.xml 2006-12-26
08:54:11 UTC (rev 1872)
@@ -15,75 +15,63 @@
<project name="rrdma-configure-targets">


- <target name="_get-rrdtool-path">
- <exec executable="which"
- os="Linux"
- errorproperty="rrdtool.path.error"
- outputproperty="full.rrdtool.path">
- <arg line="rrdtool"/>
- </exec>
- </target>

+ <property file="ant/const.properties" />

- <target name="get-rrdtool-path" depends="_get-rrdtool-path"
if="full.rrdtool.path">
- <dirname property="__rrdtool.path" file="${full.rrdtool.path}"/>
- <dirname property="_rrdtool.path" file="${__rrdtool.path}"/>
- <input message="Enter the base path of RRDTool [${_rrdtool.path}]:"
- addproperty="rrdtool.path"
- defaultvalue="${_rrdtool.path}"
- />
- <echo message="Accepted RRDTool base path: ${rrdtool.path}"/>
- </target>
+ <property name="deploy.root" value="${service.name}" />


+ <!-- getting the rrd metadata configuration file -->
+
+
<target name="__get-rrd-config-file">
- <input message="Enter the path of rrd config file
[${basedir}/conf/rrd-database_TEST.xml]:"
+
+ <input message="RRD metadata configuration file is required. More
information about this is available in the installation guide. It is
suggested that you use the TEST metadata configuration file for now and you
can change it later on with your own file. Enter the path of rrd metadata
configuration file [${basedir}/conf/rrd-database_TEST.xml]:"
addproperty="rrd.config.file"
defaultvalue="${basedir}/conf/rrd-database_TEST.xml"
/>
<available file="${rrd.config.file}"
property="rrd.config.file.present"/>
+
</target>

- <target name="_get-rrd-config-file_1" depends="__get-rrd-config-file"
if="rrd.config.file.present">
- <echo message="Accepted rrd metadata config file:
${rrd.config.file}"/>
+
+ <target name="_get-rrd-config-file_1"
+ depends="__get-rrd-config-file"
+ if="rrd.config.file.present">
</target>

- <target name="_get-rrd-config-file_2" depends="__get-rrd-config-file"
unless="rrd.config.file.present">
+
+ <target name="_get-rrd-config-file_2"
+ depends="__get-rrd-config-file"
+ unless="rrd.config.file.present">
+
<echo message="!!!!!! ERROR: Provided rrd metadata config file does
not exist !!!!!!"/>
<property name="rrd.config.file" value="xxxxxxxx"/>
+
</target>

- <target name="get-rrd-config-file"
depends="_get-rrd-config-file_1,_get-rrd-config-file_2">
+
+ <target name="get-rrd-config-file"
+ depends="_get-rrd-config-file_1,_get-rrd-config-file_2">
</target>


<!-- creating const.properties file -->

- <target name="set-const-properties-for-rrdma"
- depends="get-message-1,
- get-java-path,
- get-rrdtool-path,
- get-axis-path,
- get-server-address,
- get-server-port">

+ <target name="set-const-properties-for-rrdma">
+
<propertyfile file="ant/const.properties"
- comment="This file was created by the Ant
configuration script.">
+ comment="This file was created by the Ant
configuration script.">

- <entry key="axis.home" value="${axis.path}"/>
- <entry key="rrdjdir" value="${basedir}/contrib/rrdjtool"/>
- <entry key="rrdtool_path" value="${rrdtool.path}"/>
- <entry key="jdk_path" value="${java.path}"/>
- <entry key="target.server" value="${server.address}"/>
- <entry key="target.port" value="${server.port}"/>
+ <entry key="service.name" value="${service.name}"/>
+ <entry key="deploy.root" value="${deploy.root}"/>
<entry key="webservice.name" value="MeasurementArchiveService"/>
<entry key="build" value="build"/>
<entry key="package.root" value="org/perfsonar"/>
<entry key="package.nmwg.root" value="org/ggf"/>
- <entry key="wsdd.home" value="service/web/wsdd"/>
<entry key="wsdd.file.deploy" value="ma-service-deploy.wsdd"/>
<entry key="wsdd.file.undeploy"
value="ma-service-undeploy.wsdd"/>
- <entry key="wsdd.path" value="org/perfsonar/service/web/wsdd"/>
<entry key="api.location" value="doc/api"/>
<entry key="api.title" value="perfSONAR"/>
<entry key="api.windowtitle" value="perfSONAR"/>
@@ -91,87 +79,189 @@

</propertyfile>

- <echo message="const.properties file created"/>
- <input message="Press Return key ..."/>
-
</target>


-
<!-- creating service.properties file -->

+
<target name="set-service-properties-for-rrdma"
- depends="get-message-2,
- get-server-address,
- get-rrd-config-file">
+ depends="get-rrd-config-file">

+ <property file="ant/const.properties" />
+
<propertyfile file="conf/service.properties"
- comment="This file was created by the Ant
configuration script.">
+ comment="This file was created by the Ant
configuration script.">

- <entry key="service.r.type" value="ma"/>
- <entry key="service.r.access_point"
value="http://${server.address}:8080/axis/services/MeasurementArchiveService"/>
- <entry key="service.r.service_name" value="Java RRD MA"/>
- <entry key="service.r.service_type" value="RRD MA"/>
+ <entry key="service.r.type" value="ma"/>
+ <entry key="service.r.access_point"
value="http://${target.server}:${target.port}/${deploy.root}/services/${webservice.name}"/>
+ <entry key="service.r.service_name" value="Java RRD MA"/>
+ <entry key="service.r.service_type" value="RRD MA"/>
<entry key="service.r.service_description" value="Java RRD MA,
perfSONAR project"/>

- <entry key="service.log.log4j.config"
value="${basedir}/conf/log4j.properties"/>
+ <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.r.ma.characteristic" value="utitlization"/>
- <entry key="service.r.ma.measurement_tool"
value="cricket,mrtg"/>
- <entry key="service.r.ma.format" value="rrd"/>
+ <entry key="service.r.ma.characteristic"
value="utitlization"/>
+ <entry key="service.r.ma.measurement_tool"
value="cricket,mrtg,cacti"/>
+ <entry key="service.r.ma.format" value="rrd"/>

- <entry key="service.ma.conf_file" value="${rrd.config.file}"/>
+ <entry key="service.ma.conf_file"
value="${rrd.config.file}"/>
<entry key="service.ma.message_types"
value="MetadataKeyRequest,SetupDataRequest,MeasurementArchiveStoreRequest,EchoRequest"/>
- <entry key="service.ma.class_name"
value="org.perfsonar.service.measurementArchive.rrdType.RRDTypeMAServiceEngine"/>
+ <entry key="service.ma.class_name"
value="org.perfsonar.service.measurementArchive.rrdType.RRDTypeMAServiceEngine"/>

- <entry key="component.ma.xmldb.db_status" value="off"/>
- <entry key="component.ma.xmldb.db_access" value="http"/>
- <entry key="component.ma.xmldb.db_uri" value=""/>
- <entry key="component.ma.xmldb.db_uri.xmlrpc" value=""/>
- <entry key="component.ma.xmldb.db_username"
value="rrdmaservice"/>
- <entry key="component.ma.xmldb.db_password"
value="rrdmaservice"/>
-
<entry key="service.ma.xmldb.db_store" value="off"/>

<entry key="service.ma.rrd.xmldb.db_store.data_dir"
value="${basedir}/"/>

<entry
key="service.ma.rrd.rrd_storage_manager_rrd_DS_type_default"
value="COUNTER:1800:0:10000000000000"/>
- <entry
key="service.ma.rrd.rrd_storage_manager_rrd_step_default" value="300"/>
- <entry key="service.ma.rrd.rrd_storage_manager_rrd_RRA_default"
value="MAX:0.5:1:600,MAX:0.5:6:600,MAX:0.5:24:600,AVERAGE:0.5:288:600,AVERAGE:0.5:1:600,AVERAGE:0.5:24:600,MAX:0.5:288:600,AVERAGE:0.5:6:600"/>
+ <entry
key="service.ma.rrd.rrd_storage_manager_rrd_step_default" value="300"/>
+ <entry key="service.ma.rrd.rrd_storage_manager_rrd_RRA_default"

value="MAX:0.5:1:600,MAX:0.5:6:600,MAX:0.5:24:600,AVERAGE:0.5:288:600,AVERAGE:0.5:1:600,AVERAGE:0.5:24:600,MAX:0.5:288:600,AVERAGE:0.5:6:600"/>

- <entry key="service.r.ls_url" value=""/>
- <entry key="component.registrator.interval" value="30000"/>
+ <entry key="service.r.ls_url"
value=""/>
+ <entry key="component.registrator.interval"
value="30000"/>
<entry key="component.registrator.scheduler_component"
value="ma_scheduler"/>

</propertyfile>

- <echo message="service.properties file created"/>
- <input message="Press Return key ..."/>
-
</target>


+ <!-- preparing test rrd metadata configuration file -->
+
+
<target name="create-testrrdconfig-for-rrdma">
- <copy file="conf/rrd-database_TEST.xml"
tofile="conf/rrd-database_TEST-old.xml" overwrite="true" failonerror="false"/>
- <replace file="conf/rrd-database_TEST.xml" token="__BASEPATH__"
value="${basedir}"/>
+
+ <copy file="conf/rrd-database_TEST.xml"
tofile="conf/rrd-database_TEST-old.xml" overwrite="true" failonerror="false"/>
+ <replace file="conf/rrd-database_TEST.xml" token="__BASEPATH__"
value="${basedir}"/>
+
</target>


- <target name="copy-initconfig-for-rrdma">
- <copy file="ant/const.properties.ma" tofile="ant/const.properties"
overwrite="true" failonerror="false"/>
- <copy file="conf/components.properties.ma"
tofile="conf/components.properties" overwrite="true" failonerror="false"/>
+ <!-- creating components.properties file -->
+
+
+ <target name="copy-components-properties">
+
+ <copy file="conf/components.properties.rrdma"
tofile="conf/components.properties" overwrite="true" failonerror="false"/>
+
</target>


- <target name="configure-rrdma">
- <antcall target="copy-initconfig-for-rrdma"/>
- <antcall target="copy-properties"/>
+ <!-- configuring store functionality -->
+
+
+ <target name="store-fuctionality-question-for-rrdma">
+
+ <input message="Do you want the service to accept messages with
measurement data and store them? "
+ addproperty="_functionality.store.decision"
+ validargs="y,n" />
+
+ <condition property="functionality.store.decision">
+ <equals arg1="y" arg2="${_functionality.store.decision}"/>
+ </condition>
+
+ </target>
+
+
+ <target name="store-fuctionality-for-rrdma"
+ depends="store-fuctionality-question-for-rrdma"
+ if="functionality.store.decision">
+
+ <input message="Enter the path where new rrd files with measearement
data sent to the service will be located [${service.home}]?"
+ addproperty="functionality.store.path"
+ defaultvalue="${service.home}"/>
+
+ <propertyfile file="conf/service.properties"
+ comment="This file was created by the Ant configuration script.">
+
+ <entry key="service.ma.xmldb.db_store" value="on"/>
+ <entry key="service.ma.rrd.xmldb.db_store.data_dir"
value="${functionality.store.path}/"/>
+
+ </propertyfile>
+
+ </target>
+
+
+ <!-- configuring LS register functionality -->
+
+
+ <target name="register-fuctionality-for-rrdma"
+ depends="register-fuctionality"
+ if="functionality.register.decision">
+
+ <propertyfile file="conf/service.properties"
+ comment="This file was created by the Ant configuration script.">
+
+ <entry key="service.r.service_name" value="${service.name}"/>
+ <entry key="service.r.service_type" value="MA"/>
+ <entry key="component.registrator.scheduler_component"
value="ma_scheduler"/>
+
+ </propertyfile>
+
+ <propertyfile file="conf/components.properties"
+ comment="This file was created by the Ant configuration script.">
+
+ <entry key="ma_scheduler"
value="org.perfsonar.commons.auxiliary.components.simplescheduler.Scheduler"/>
+ <entry key="registrator"
value="org.perfsonar.service.measurementArchive.register.LSRegistrationComponent"/>
+
+ </propertyfile>
+
+ </target>
+
+
+ <!-- initializing xml database eXist -->
+
+
+ <target name="__exist-init">
+
+ <property file="conf/service.properties" />
+
+ <condition property="component.ma.xmldb.db_status.present"
value="true">
+ <isset property="component.ma.xmldb.db_status"/>
+ </condition>
+
+ </target>
+
+
+ <target name="_exist-init"
+ depends="__exist-init"
+ if="component.ma.xmldb.db_status.present">
+
+ <condition property="component.ma.xmldb.db_status.type_standalone">
+ <equals arg1="stand-alone" arg2="${component.ma.xmldb.type}"/>
+ </condition>
+
+ </target>
+
+
+ <target name="exist-init"
+ depends="_exist-init"
+ if="component.ma.xmldb.db_status.type_standalone">
+
+ <echo>Initializing the xml database eXist...</echo>
+
+ <antcall target="xmldb-init-rrdma"/>
+
+ </target>
+
+
+ <!-- the main target -->
+
+
+ <target name="configure">
+
+ <echo>Configuring...</echo>
+
+ <antcall target="copy-components-properties"/>
<antcall target="set-const-properties-for-rrdma"/>
<antcall target="set-service-properties-for-rrdma"/>
<antcall target="set-log4j-properties"/>
- <antcall target="set-tomcat-properties"/>
<antcall target="create-testrrdconfig-for-rrdma"/>
+ <antcall target="exist-init"/>
+ <antcall target="store-fuctionality-for-rrdma"/>
+ <antcall target="register-fuctionality-for-rrdma"/>
+
</target>



Modified: branches/ulisseskan/ant/rrdma/rrdma-exist-xmldb-targets.xml
===================================================================
--- branches/ulisseskan/ant/rrdma/rrdma-exist-xmldb-targets.xml 2006-12-22
11:52:13 UTC (rev 1871)
+++ branches/ulisseskan/ant/rrdma/rrdma-exist-xmldb-targets.xml 2006-12-26
08:54:11 UTC (rev 1872)
@@ -14,6 +14,7 @@
<project name="rrdma-exist-xmldb-targets">


+
<property file="conf/service.properties" />


@@ -23,6 +24,7 @@
<taskdef name="extract" classname="org.exist.ant.XMLDBExtractTask"
classpathref="classpath" onerror="ignore"/>
<taskdef name="create" classname="org.exist.ant.XMLDBCreateTask"
classpathref="classpath" onerror="ignore"/>
<taskdef name="list" classname="org.exist.ant.XMLDBListTask"
classpathref="classpath" onerror="ignore"/>
+ <taskdef name="xquery" classname="org.exist.ant.XMLDBXQueryTask"
classpathref="classpath" onerror="ignore"/>


<property name="dump" value="dump"/>
@@ -30,46 +32,67 @@


<target name="getresource-rrdma">
+
<basename property="xmlresource" file="${service.ma.conf_file}"/>
+
</target>


<target name="get-xmldb-collection">
- <basename property="ma-collection"
file="${component.ma.xmldb.db_uri.xmlrpc}" />
+
+ <basename property="ma-collection"
file="${component.ma.xmldb.db_uri.xmlrpc}" />
+
</target>


+ <target name="_xmldb-list-rrdma">

- <target name="_xmldb-list-rrdma">
- <list uri="${component.ma.xmldb.db_uri.xmlrpc}"
+ <list uri="${component.ma.xmldb.db_uri.xmlrpc}"
resources="true"
outputproperty="resource.list"
separator=", "/>
+
</target>


- <target name="xmldb-list-rrdma_1" depends="_xmldb-list-rrdma"
if="resource.list">
- <echo>Available resources: ${resource.list}</echo>
+ <target name="xmldb-list-rrdma_1"
+ depends="_xmldb-list-rrdma"
+ if="resource.list">
+
+ <echo>Available resources: ${resource.list}</echo>
+
</target>

- <target name="xmldb-list-rrdma_2" depends="_xmldb-list-rrdma"
unless="resource.list">
- <echo>No available resources</echo>
+
+ <target name="xmldb-list-rrdma_2"
+ depends="_xmldb-list-rrdma"
+ unless="resource.list">
+
+ <echo>No available resources</echo>
+
</target>


- <target name="xmldb-list-rrdma" depends="xmldb-list-rrdma_1,
xmldb-list-rrdma_2" unless="resource.list">
+ <target name="xmldb-list-rrdma"
+ depends="xmldb-list-rrdma_1, xmldb-list-rrdma_2"
+ unless="resource.list">
</target>


- <target name="xmldb-exist-rrdma" depends="getresource-rrdma">
+ <target name="xmldb-exist-rrdma"
+ depends="getresource-rrdma">
+
<condition property="isExists-rrdma">
<exist uri="${component.ma.xmldb.db_uri.xmlrpc}"
resource="${xmlresource}"/>
</condition>
+
</target>


- <target name="xmldb-remove-rrdma" depends="getresource-rrdma,
get-xmldb-collection">
+ <target name="xmldb-remove-rrdma"
+ depends="getresource-rrdma, get-xmldb-collection">
+
<remove uri="${component.ma.xmldb.db_uri.xmlrpc}"
resource="${xmlresource}"
user="${component.ma.xmldb.db_username}"
@@ -78,10 +101,12 @@
collection="${ma-collection}"
user="${component.ma.xmldb.db_username}"
password="${component.ma.xmldb.db_password}"/>
+
</target>


<target name="xmldb-resource-remove-rrdma">
+
<input message="Set the name a resource to remove []:"
addproperty="resource.unwanted"
defaultvalue=""
@@ -90,23 +115,30 @@
resource="${resource.unwanted}"
user="${component.ma.xmldb.db_username}"
password="${component.ma.xmldb.db_password}"/>
+
</target>

+
<target name="xmldb-store-rrdma">
+
<store uri="${component.ma.xmldb.db_uri.xmlrpc}"
type="xml"
srcfile="${service.ma.conf_file}"
user="${component.ma.xmldb.db_username}"
password="${component.ma.xmldb.db_password}"/>
+
</target>


- <target name="xmldb-extract-rrdma" depends="getresource-rrdma">
+ <target name="xmldb-extract-rrdma"
+ depends="getresource-rrdma">
+
<extract uri="${component.ma.xmldb.db_uri.xmlrpc}"
resource="${xmlresource}"
destfile="${basedir}/conf/dump_${xmlresource}"
user="${component.ma.xmldb.db_username}"
password="${component.ma.xmldb.db_password}"/>
+
</target>


@@ -129,25 +161,102 @@
</target>


- <target name="xmldb-collection-rrdma" depends="getdbroot-rrdma,
get-xmldb-collection">
+ <target name="xmldb-collection-rrdma"
+ depends="getdbroot-rrdma, get-xmldb-collection">
+
<create uri="${dbroot}"
collection="${ma-collection}"
user="${component.ma.xmldb.db_username}"
password="${component.ma.xmldb.db_password}"/>
+
</target>


- <target name="__xmldb-init-rrdma" depends="xmldb-exist-rrdma"
if="isExists-rrdma">
+ <target name="__xmldb-init-rrdma"
+ depends="xmldb-exist-rrdma"
+ if="isExists-rrdma">
+
<antcall target="xmldb-extract-rrdma"/>
<antcall target="xmldb-remove-rrdma"/>
+
</target>


- <target name="xmldb-init-rrdma" depends="__xmldb-init-rrdma">
+ <target name="xmldb-init-rrdma"
+ depends="__xmldb-init-rrdma">
+
<antcall target="xmldb-collection-rrdma"/>
<antcall target="xmldb-store-rrdma"/>
+
</target>


+ <target name="xmldb-check-status">
+
+ <condition property="exist.check.status">
+ <and>
+ <equals arg1="on" arg2="${component.ma.xmldb.db_status}"/>
+ <equals arg1="webapp" arg2="${component.ma.xmldb.type}"/>
+ </and>
+ </condition>
+
+ </target>
+
+
+ <target name="xmldb-adduser-init-question-rrdma"
+ depends="xmldb-check-status"
+ if="exist.check.status">
+
+ <input message="Do you want me to add new user
${component.ma.xmldb.db_username} (provided in the pre-install step) and
initiate the xml database eXist (If your eXist is already configured and
initialized for RRD MA answer 'n'. But probably it's your first run of this
installation script so you have not added this user and initialized the
database yet.) ? "
+ addproperty="_exist.adduser.init"
+ validargs="y,n"
+ defaultvalue="y" />
+
+ <condition property="exist.adduser.init">
+ <equals arg1="y" arg2="${_exist.adduser.init}"/>
+ </condition>
+
+ </target>
+
+
+ <target name="xmldb-adduser-rrdma"
+ depends="xmldb-adduser-init-question-rrdma"
+ if="exist.adduser.init">
+
+ <xquery
+
uri="xmldb:exist://${target.server}:${target.port}/exist/xmlrpc/db"
+ user="admin"
+ password="${component.ma.xmldb.db_adminpassword}"
+ query="xmldb:create-user('${component.ma.xmldb.db_username}',
'${component.ma.xmldb.db_password}', 'dba', '/db')" />
+
+ <antcall target="xmldb-init-rrdma"/>
+
+ </target>
+
+
+ <target name="xmldb-password-rrdma">
+
+ <input message="Enter eXist admin password []?"
+ addproperty="adminpass"
+ defaultvalue=""/>
+
+ <input message="Enter eXist username []?"
+ addproperty="username"/>
+
+ <input message="Enter new password for ${username} []?"
+ addproperty="password"/>
+
+ <input message="Enter the URL of eXist
[xmldb:exist://${target.server}:${target.port}/exist/xmlrpc/db]?"
+ addproperty="url"/>
+
+ <xquery
+ uri="${url}"
+ user="admin"
+ password="${adminpass}"
+ query="xmldb:change-user('${username}', '${password}', 'dba',
'/')" />
+
+ </target>
+
+
+
</project>
-

Modified: branches/ulisseskan/ant/rrdma/rrdma-java-compile-targets.xml
===================================================================
--- branches/ulisseskan/ant/rrdma/rrdma-java-compile-targets.xml
2006-12-22 11:52:13 UTC (rev 1871)
+++ branches/ulisseskan/ant/rrdma/rrdma-java-compile-targets.xml
2006-12-26 08:54:11 UTC (rev 1872)
@@ -19,17 +19,19 @@



-
<!-- RRD MA -->


<target name="clean-jar-rrdma">
+
<delete file="${build}/perfSONAR-rrdma.jar" failonerror="false"/>
+
</target>


<target name="compile-rrdma"
description="Compiles Java files of RRD MA">
+
<javac srcdir="src" destdir="${build}" deprecation="yes">
<include name="org/perfsonar/service/measurementArchive/**" />
<include name="org/perfsonar/service/web/**" />
@@ -38,16 +40,19 @@
<include
name="org/perfsonar/service/testHarness/RRDStorageManagerTester.java" />
<classpath refid="classpath"/>
</javac>
+
<copy failonerror="false"
todir="${build}/${package.root}/${wsdd.home}">
<fileset dir="src/${package.root}/${wsdd.home}">
<include name="ma-*.wsdd" />
</fileset>
</copy>
+
</target>


<target name="jar-rrdma" depends="clean-jar-rrdma, compile-rrdma"
description="Creates JAR file for RRD MA">
+
<jar destfile="${build}/perfSONAR-rrdma.jar">
<fileset dir="${build}">
<include name="org/perfsonar/service/measurementArchive/**"
/>
@@ -57,19 +62,24 @@
<include
name="org/perfsonar/service/testHarness/RRDStorageManagerTester.class" />
</fileset>
</jar>
+
</target>


- <target name="build-rrdma"
+ <!-- the main target -->
+
+
+ <target name="build"
description="Builds RRD MA.">
+
<antcall target="clean-all"/>
<antcall target="jar-generic"/>
<antcall target="jar-rrdma"/>
+
</target>



-
</project>



Modified: branches/ulisseskan/ant/rrdma/rrdma-junit-test-targets.xml
===================================================================
--- branches/ulisseskan/ant/rrdma/rrdma-junit-test-targets.xml 2006-12-22
11:52:13 UTC (rev 1871)
+++ branches/ulisseskan/ant/rrdma/rrdma-junit-test-targets.xml 2006-12-26
08:54:11 UTC (rev 1872)
@@ -16,17 +16,22 @@
<project name="rrdma-junit-test-targets">


+
<target name="set-path-of-rrdtestfile">
+
<replace
file="test/org/perfsonar/service/measurementArchive/rrdType/RRDStorageManagerTest.java"
token="__BASEPATH__"
value="${basedir}"/>
+
</target>


<target name="set-path-of-rrdconfigfile">
+
<replace
file="test/org/perfsonar/service/measurementArchive/metadataConfig/SimpleMetadataConfigurationStorageManagerTest.java"
token="__BASEPATH__"
value="${basedir}"/>
+
</target>


@@ -109,5 +114,4 @@



-
</project>
\ No newline at end of file

Modified: branches/ulisseskan/ant/rrdma/rrdma-libs-download-targets.xml
===================================================================
--- branches/ulisseskan/ant/rrdma/rrdma-libs-download-targets.xml
2006-12-22 11:52:13 UTC (rev 1871)
+++ branches/ulisseskan/ant/rrdma/rrdma-libs-download-targets.xml
2006-12-26 08:54:11 UTC (rev 1872)
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>

-
-
<!-- ===================================================================
<description>

@@ -16,8 +14,6 @@



-
-
<project basedir="../" name="rrdma-libs-download-targets"
xmlns:artifact="urn:maven-artifact-ant">


@@ -42,6 +38,8 @@
<dependency groupId="net.sf.saxon" artifactId="saxon-jdom"
version="8.7"/>
<dependency groupId="net.sf.saxon" artifactId="saxon-dom"
version="8.7"/>

+ <dependency groupId="antlr" artifactId="antlr"
version="2.7.6"/>
+
<localRepository refid="local.repository"/>
<remoteRepository refid="remote.repository"/>

@@ -51,7 +49,7 @@



- <target name="libs-rrdma">
+ <target name="lib">

<antcall target="libs-generic"/>
<antcall target="libs-for-rrdma"/>
@@ -59,6 +57,7 @@
</target>


+
</project>



Copied: branches/ulisseskan/ant/rrdma/rrdma-pre-install-targets.xml (from rev
1849, trunk/perfsonar/ant/rrdma/rrdma-pre-install-targets.xml)

Modified: branches/ulisseskan/ant/rrdma/rrdma-release-targets.xml
===================================================================
--- branches/ulisseskan/ant/rrdma/rrdma-release-targets.xml 2006-12-22
11:52:13 UTC (rev 1871)
+++ branches/ulisseskan/ant/rrdma/rrdma-release-targets.xml 2006-12-26
08:54:11 UTC (rev 1872)
@@ -9,7 +9,7 @@

Notes:
This files contains the target which is used to create
- a release file of the perfSONAR sources.
+ a release file of RRD MA.

</description>
==================================================================== -->
@@ -18,105 +18,106 @@
<project name="rrdma-release-targets">


+ <target name="init-release">

- <!-- source release of RRD MA -->
+ <propertyfile file="ant/const.properties"
+ comment="This file was created by the Ant configuration script.">
+ <entry key="service.name" value="${service.name}"/>
+ <entry key="build" value="build"/>
+ </propertyfile>

- <target name="rrdma-release-src"
- depends="copy-initconfig-for-rrdma"
- description="Build src release.">
+ </target>

- <property file="ant/const.properties" />

- <delete dir="tmp"/>
- <mkdir
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar"/>
- <copy
todir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar">
- <fileset dir="../perfsonar"/>
- </copy>
- <delete
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/tmp"/>
+ <target name="release"
+ depends="init-release, build"
+ description="Build the release.">

+ <property file="ant/const.properties" />

- <delete
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/src/org/perfsonar/service/lookupService"/>
- <delete
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/src/org/perfsonar/service/measurementPoint"/>
- <delete
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/src/org/perfsonar/service/topologyService"/>
- <delete
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/build/org"/>
- <delete>
- <fileset
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/build"
includes="**/*.jar"/>
- <fileset
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/log"
includes="**/*.log"/>
- <fileset
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/src"
includes="**/ls-*.wsdd"/>
- <fileset
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/src"
includes="**/mp-*.wsdd"/>
- <fileset
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/src"
includes="**/tcmp-*.wsdd"/>
- <fileset
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/conf"
includes="**/*.ls"/>
- <fileset
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/conf"
includes="**/*.cl"/>
- <fileset
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/conf"
includes="**/*.sqlma"/>
- <fileset
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/conf"
includes="**/*.tcmp"/>
- <fileset
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/conf"
includes="**/*.mp"/>
- </delete>
+ <delete dir="tmp"/>
+ <mkdir dir="tmp/${service.name}/perfsonar"/>
+ <copy todir="tmp/${service.name}/perfsonar">
+ <fileset dir="${basedir}"/>
+ </copy>
+ <delete dir="tmp/${service.name}/perfsonar/tmp"/>

- <tar
destfile="${release.basename}-${release.servicename}-src-${release.version}.tar"
- basedir="tmp/"
- longfile="gnu"
- excludes=".svn/**"
- />
+ <delete dir="tmp/${service.name}/perfsonar/src/org"/>
+ <delete dir="tmp/${service.name}/perfsonar/doc"/>
+ <delete dir="tmp/${service.name}/perfsonar/test"/>
+ <delete dir="tmp/${service.name}/perfsonar/releng"/>
+ <delete dir="tmp/${service.name}/perfsonar/build/org"/>

- <delete dir="tmp"/>
+ <delete
file="tmp/${service.name}/perfsonar/conf/components.properties"/>
+ <delete file="tmp/${service.name}/perfsonar/conf/service.properties"/>
+ <delete file="tmp/${service.name}/perfsonar/ant/const.properties"/>

- <gzip
zipfile="${release.basename}-${release.servicename}-src-${release.version}.tar.gz"
-
src="${release.basename}-${release.servicename}-src-${release.version}.tar"
- />
+ <delete file="tmp/${service.name}/perfsonar/ant/changes-rrdma"/>

- <delete
file="${release.basename}-${release.servicename}-src-${release.version}.tar"/>
+ <delete dir="tmp/${service.name}/perfsonar/ant/clmp"/>
+ <delete dir="tmp/${service.name}/perfsonar/ant/nmsmp"/>
+ <delete dir="tmp/${service.name}/perfsonar/ant/snmpmp"/>
+ <delete dir="tmp/${service.name}/perfsonar/ant/sqlma"/>
+ <delete dir="tmp/${service.name}/perfsonar/ant/tcmp"/>
+ <delete dir="tmp/${service.name}/perfsonar/ant/tops"/>
+ <delete dir="tmp/${service.name}/perfsonar/ant/xmlls"/>

- </target>
+ <delete dir="tmp/${service.name}/perfsonar/conf/template"/>

+ <delete dir="tmp/${service.name}/perfsonar/lib/rrd"/>

+ <move file="tmp/${service.name}/perfsonar/ant/build-rrdma.xml"
tofile="tmp/${service.name}/perfsonar/ant/build.xml"/>

- <!-- binary release of RRD MA -->
+ <delete>

- <target name="rrdma-release-bin"
- depends="copy-initconfig-for-rrdma, build-rrdma"
- description="Build bin release.">
+ <fileset dir="tmp/${service.name}/perfsonar/log"
includes="**/*.log"/>

- <property file="ant/const.properties" />
+ <fileset dir="tmp/${service.name}/perfsonar/ant"
includes="**/*.cl"/>
+ <fileset dir="tmp/${service.name}/perfsonar/ant"
includes="**/*.mp"/>
+ <fileset dir="tmp/${service.name}/perfsonar/ant"
includes="**/*.sqlma"/>
+ <fileset dir="tmp/${service.name}/perfsonar/ant"
includes="**/*.tops"/>
+ <fileset dir="tmp/${service.name}/perfsonar/ant"
includes="**/*.tcmp"/>

- <delete dir="tmp"/>
- <mkdir
dir="tmp/${release.basename}-${release.servicename}-bin-${release.version}/perfsonar"/>
- <copy
todir="tmp/${release.basename}-${release.servicename}-bin-${release.version}/perfsonar">
- <fileset dir="../perfsonar"/>
- </copy>
- <delete
dir="tmp/${release.basename}-${release.servicename}-bin-${release.version}/perfsonar/tmp"/>
+ <fileset dir="tmp/${service.name}/perfsonar/conf"
includes="**/*.cl"/>
+ <fileset dir="tmp/${service.name}/perfsonar/conf"
includes="**/*.mp"/>
+ <fileset dir="tmp/${service.name}/perfsonar/conf"
includes="**/*.sqlma"/>
+ <fileset dir="tmp/${service.name}/perfsonar/conf"
includes="**/*.tops"/>
+ <fileset dir="tmp/${service.name}/perfsonar/conf"
includes="**/*.tcmp"/>

+ <fileset dir="tmp/${service.name}/perfsonar/ant"
includes="**/build-*.xml"/>

- <delete
dir="tmp/${release.basename}-${release.servicename}-bin-${release.version}/perfsonar/src/org"/>
- <delete
dir="tmp/${release.basename}-${release.servicename}-bin-${release.version}/perfsonar/doc"/>
- <delete
dir="tmp/${release.basename}-${release.servicename}-bin-${release.version}/perfsonar/test"/>
- <delete>
- <fileset
dir="tmp/${release.basename}-${release.servicename}-bin-${release.version}/perfsonar/log"
includes="**/*.log"/>
- <fileset
dir="tmp/${release.basename}-${release.servicename}-bin-${release.version}/perfsonar/conf"
includes="**/*.ls"/>
- <fileset
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/conf"
includes="**/*.cl"/>
- <fileset
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/conf"
includes="**/*.sqlma"/>
- <fileset
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/conf"
includes="**/*.tcmp"/>
- <fileset
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/conf"
includes="**/*.mp"/>
- </delete>
+ <fileset dir="tmp/${service.name}/perfsonar/ant"
includes="**/*-old.*"/>
+ <fileset dir="tmp/${service.name}/perfsonar/conf"
includes="**/*-old.*"/>

- <tar
destfile="${release.basename}-${release.servicename}-bin-${release.version}.tar"
- basedir="tmp/"
- longfile="gnu"
- excludes=".svn/**"
- />
+ <fileset dir="tmp/${service.name}/perfsonar/conf/wsdd"
includes="**/clmp-*.wsdd"/>
+ <fileset dir="tmp/${service.name}/perfsonar/conf/wsdd"
includes="**/ls-*.wsdd"/>
+ <fileset dir="tmp/${service.name}/perfsonar/conf/wsdd"
includes="**/mp-*.wsdd"/>
+ <fileset dir="tmp/${service.name}/perfsonar/conf/wsdd"
includes="**/tops-*.wsdd"/>

- <delete dir="tmp"/>
+ <fileset dir="tmp/${service.name}/perfsonar/conf"
includes="**/ibatis-*.*"/>
+ <fileset dir="tmp/${service.name}/perfsonar/conf"
includes="**/mysql-*.*"/>
+ <fileset dir="tmp/${service.name}/perfsonar/conf"
includes="**/psql-*.*"/>
+ <fileset dir="tmp/${service.name}/perfsonar/conf"
includes="**/sql-*.*"/>
+ <fileset dir="tmp/${service.name}/perfsonar/conf"
includes="**/tcmp-*.*"/>

- <gzip
zipfile="${release.basename}-${release.servicename}-bin-${release.version}.tar.gz"
-
src="${release.basename}-${release.servicename}-bin-${release.version}.tar"
- />
+ </delete>

- <delete
file="${release.basename}-${release.servicename}-bin-${release.version}.tar"/>
+ <tar destfile="${service.name}.tar"
+ basedir="tmp/"
+ longfile="gnu"
+ excludes=".svn/**"
+ />

+ <delete dir="tmp"/>

+ <gzip zipfile="${service.name}.tar.gz"
+ src="${service.name}.tar"
+ />
+
+ <delete file="${service.name}.tar"/>
+
</target>



</project>
-
-

Modified: branches/ulisseskan/ant/rrdma/rrdma-test-run-targets.xml
===================================================================
--- branches/ulisseskan/ant/rrdma/rrdma-test-run-targets.xml 2006-12-22
11:52:13 UTC (rev 1871)
+++ branches/ulisseskan/ant/rrdma/rrdma-test-run-targets.xml 2006-12-26
08:54:11 UTC (rev 1872)
@@ -16,7 +16,24 @@
<project name="rrdma-test-run-targets">


+
+ <target name="test">
+
+ <antcall target="run-echo"/>
+
+ <antcall target="run-rrdma-client-1"/>
+ <antcall target="run-rrdma-client-2"/>
+ <antcall target="run-rrdma-client-3"/>
+ <antcall target="run-rrdma-client-4"/>
+ <antcall target="run-rrdma-client-5"/>
+ <antcall target="run-rrdma-client-6"/>
+ <antcall target="run-rrdma-client-7"/>
+
+ </target>
+
+
<target name="run-rrdma-test1" description="Runs test3">
+
<java
classname="org.perfsonar.service.testHarness.RequestHandlerTester"
classpathref="classpath"
fork="true">
@@ -25,10 +42,12 @@
<jvmarg
value="-Dservice.properties=${basedir}/conf/service.properties"/>
<jvmarg
value="-Dcomponents.properties=${basedir}/conf/components.properties"/>
</java>
+
</target>


<target name="run-rrdma-test2" description="Test of RRDStorageManager
component">
+
<java
classname="org.perfsonar.service.testHarness.RRDStorageManagerTester"
classpathref="classpath"
fork="true">
@@ -44,10 +63,12 @@
<jvmarg
value="-Dservice.properties=${basedir}/conf/service.properties"/>
<jvmarg
value="-Dcomponents.properties=${basedir}/conf/components.properties"/>
</java>
+
</target>


<target name="run-rrdma-test3" description="Test of
RRDConfigurationStorageManager component">
+
<java
classname="org.perfsonar.service.testHarness.RRDConfigurationStorageManagerTester"
classpathref="classpath"
fork="true">
@@ -66,10 +87,12 @@
<jvmarg
value="-Dcomponents.properties=${basedir}/conf/components.properties"/>

</java>
+
</target>


<target name="run-rrdma-test4" description="Test of
SimpleRRDConfigurationStorageManager component">
+
<java
classname="org.perfsonar.service.testHarness.SimpleRRDConfigurationStorageManagerTester"
classpathref="classpath"
fork="true">
@@ -87,10 +110,12 @@
<jvmarg
value="-Dcomponents.properties=${basedir}/conf/components.properties"/>

</java>
+
</target>


<target name="run-rrdma-test5" description="Test of RRDStorageManager
write functionality">
+
<java
classname="org.perfsonar.service.testHarness.RRDStorageManagerTester"
classpathref="classpath"
fork="true">
@@ -108,9 +133,9 @@
<jvmarg
value="-Dcomponents.properties=${basedir}/conf/components.properties"/>

</java>
+
</target>



</project>
-

Modified: branches/ulisseskan/ant/tops/tops-axis-deploy-targets.xml
===================================================================
--- branches/ulisseskan/ant/tops/tops-axis-deploy-targets.xml 2006-12-22
11:52:13 UTC (rev 1871)
+++ branches/ulisseskan/ant/tops/tops-axis-deploy-targets.xml 2006-12-26
08:54:11 UTC (rev 1872)
@@ -1,9 +1,7 @@
-
-
<!-- ===================================================================
<description>

- $Id: tops-axis-deploy-targets.xml,v 1.2 2006/11/22 10:19:12 kan Exp $
+ $Id: tops-axis-deploy-targets.xml,v 1.2 2006/12/20 10:19:12 kan Exp $
project: perfSONAR
author: kan

@@ -17,53 +15,34 @@

<project name="tops-axis-deploy-targets">

+ <target name="copy-jars-for-tops" depends="copy-jars-for-service">

- <taskdef resource="axis-tasks.properties" classpathref="classpath" />
+ <copy
file="./lib/repository/postgresql/postgresql/8.1-407.jdbc3/postgresql-8.1-407.jdbc3.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="./lib/repository/exist/exist-xmldb/1.0rc/exist-xmldb-1.0rc.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>

+ <copy file="./conf/TOPSRegisterRequest.xml"

todir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf"/>
+ <copy file="./conf/interfaces-description.xml"

todir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf"/>

- <!-- general -->
+ <copy file="./conf/wsdd/${wsdd.file.deploy}"

todir="${service.home}/${deploy.root}/wsdd"/>
+ <copy file="./conf/wsdd/${wsdd.file.undeploy}"

todir="${service.home}/${deploy.root}/wsdd"/>

- <property name="adminService"
value="http://${target.server}:${target.port}/axis/services/AdminService"; />
-
- <target name="copy-jars-for-tops" depends="jar-tops">
- <!-- this should be generic-libs' jar files -->
- <copy file="./lib/repository/jdom/jdom/1.0b8/jdom-1.0b8.jar"
todir="${axis.home}/WEB-INF/lib"/>
-<!-- <copy file="./lib/extra/xml-commons/resolver.jar"
todir="${axis.home}/WEB-INF/lib"/> -->
- <copy file="./lib/repository/xalan/xalan/2.7.0/xalan-2.7.0.jar"
todir="${axis.home}/WEB-INF/lib"/>
- <copy
file="./lib/repository/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar"
todir="${axis.home}/WEB-INF/lib"/>
- <copy
file="./lib/repository/xml-apis/xml-apis/1.3.02/xml-apis-1.3.02.jar"
todir="${axis.home}/WEB-INF/lib"/>
- <copy
file="./lib/repository/xerces/xmlParserAPIs/2.6.2/xmlParserAPIs-2.6.2.jar"
todir="${axis.home}/WEB-INF/lib"/>
- <copy
file="./lib/repository/commons-pool/commons-pool/1.1/commons-pool-1.1.jar"
todir="${axis.home}/WEB-INF/lib"/>
- <copy
file="./lib/repository/javax/activation/activation/1.0.2/activation-1.0.2.jar"
todir="${axis.home}/WEB-INF/lib"/>
- <copy file="./lib/repository/javax/mail/mail/1.3.2/mail-1.3.2.jar"
todir="${axis.home}/WEB-INF/lib"/>
-<!-- <copy file="./lib/extra/xml-security/xmlsec-1.3.0.jar"
todir="${axis.home}/WEB-INF/lib"/> -->
-<!-- <copy
file="./lib/extra/servlet-api/5.0.28/servlet-api-5.0.28.jar"
todir="${axis.home}/WEB-INF/lib"/> -->
- <!-- files needed to download from jars-for-tops target -->
- <copy
file="./lib/repository/postgresql/postgresql/8.1-407.jdbc3/postgresql-8.1-407.jdbc3.jar"
todir="${axis.home}/WEB-INF/lib"/>
</target>

+ <target name="delete-jars-for-tops" depends="delete-jars-for-service">
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/postgresql-8.1-407.jdbc3.jar"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/exist-xmldb-1.0rc.jar" />

- <target name="delete-jars-for-tops">
- <delete file="${axis.home}/WEB-INF/lib/jdom-1.0b8.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/resolver.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/xalan-2.7.0.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/xercesImpl-2.6.2.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/xml-apis-1.3.02.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/xmlParserAPIs-2.6.2.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/commons-pool-1.1.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/activation-1.0.2.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/xmlrpc-1.2-patched.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/activation.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/mail-1.3.2.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/xmlsec-1.3.0.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/servlet-api-5.0.28.jar"/>
- <!-- files needed to download from jars-for-tops target -->
- <delete
file="${axis.home}/WEB-INF/lib/postgresql-8.1-407.jdbc3.jar"/>
+ <delete
file="${service.home}${deploy.root}/WEB-INF/classes/perfsonar/conf/TOPSRegisterRequest.xml"
/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/interfaces-description.xml"
/>
+
+ <delete
file="${service.home}/${deploy.root}/wsdd/${wsdd.file.deploy}" />
+ <delete
file="${service.home}/${deploy.root}/wsdd/${wsdd.file.undeploy}" />
</target>

<!-- Topology Service -->

<available file="${build}/perfSONAR-tops.jar"
property="jar.perfsonar.tops.present"/>
+
<target name="does-jar-tops-exist" unless="jar.perfsonar.tops.present">
<echo>------------------------------ WARNING
---------------------------</echo>
<echo/>
@@ -72,45 +51,94 @@

<echo>------------------------------------------------------------------</echo>
</target>

-
- <target name="copy-tops-jar"
- depends="copy-generic-jar, copy-jars-for-tops,
does-jar-tops-exist"
+ <target name="copy-tops-jar" depends="copy-generic-jar,
copy-jars-for-tops, does-jar-tops-exist"
if="jar.perfsonar.tops.present"
- description="Copy tops jar of Tomcat">
+ description="Copy tops jar to Tomcat">

- <copy file="${build}/perfSONAR-tops.jar"
todir="${axis.home}/WEB-INF/lib"/>
+ <copy file="${build}/perfSONAR-tops.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>

- <echo/>
- <echo>------------------------------ WARNING
---------------------------</echo>
- <echo/>
- <echo>Restart your application server (container of perfSONAR
service)!!!</echo>
- <echo/>
-
<echo>------------------------------------------------------------------</echo>
+ </target>

+ <target name="tomcat-start-for-tops-true"
+ depends="tomcat-start-question"
+ if="tomcat.start.decision">
+
+ <echo>Please, insert now the following xml tag Context</echo>
+ <echo>into Tomcat configuration file server.xml</echo>
+ <echo>(${tomcat.home}/conf/server.xml)</echo>
+ <echo>inside existing xml tag Host:</echo>
+ <echo></echo>
+ <echo message=" &lt;Context path='/${deploy.root}'"/>
+ <echo message="
docBase='${service.home}/${service.name}'&gt;"/>
+ <echo message=" &lt;/Context&gt;"/>
+ <echo></echo>
+ <echo>Please, do it now. I will wait for you.</echo>
+ <input message="Press Return key ..."/>
+
+ <exec dir="${tomcat.home}/bin"
+ executable="sh"
+ output="${basedir}/log/tomcat.log"
+ error="${basedir}/log/tomcat.log">
+ <arg line="startup.sh"/>
+ <env key="PATH" path="${env.PATH}:${tomcat.home}/bin:."/>
+ </exec>
+
+ <echo>Please, make sure that the Tomcat is running. Use the address
http://${target.server}:${target.port} .</echo>
+ <input message="Press Return key ..."/>
+
</target>

+ <target name="tomcat-start-for-tops-false"
+ unless="tomcat.start.decision">

- <target name="deploy-tops"
- description="Deploys Topology Service">
- <java classname="org.apache.axis.client.AdminClient">
- <arg line="-l ${adminService} ${deployFile}"/>
- <classpath refid="classpath"/>
- </java>
+ <echo>Please, insert now the following xml tag Context</echo>
+ <echo>into Tomcat configuration file server.xml</echo>
+ <echo>(${tomcat.home}/conf/server.xml)</echo>
+ <echo>inside existing xml tag Host:</echo>
+ <echo></echo>
+ <echo message=" &lt;Context path='/${deploy.root}'"/>
+ <echo message="
docBase='${service.home}/${service.name}'&gt;"/>
+ <echo message=" &lt;/Context&gt;"/>
+ <echo></echo>
+ <echo>Please, do it now. I will wait for you.</echo>
+ <input message="Press Return key ..."/>
+
</target>

+ <target name="tomcat-start-for-tops"
+ depends="tomcat-start-for-tops-true,tomcat-start-for-tops-false">

- <target name="undeploy-tops"
- description="Undeploys Topology Service">
+ </target>

- <java classname="org.apache.axis.client.AdminClient">
- <arg line="-l ${adminService} ${undeployFile}"/>
- <classpath refid="classpath"/>
- </java>
+ <target name="deploy" depends="copy-tops-jar, add-context-listener"
+ description="Deploys ToS service">

+ <echo>Deploying the service...</echo>
+
+ <antcall target="tomcat-start-for-tops" />
+
+ <antcall target="deploy-adminclient" />
+
+ </target>
+
+
+ <target name="undeploy"
+ description="Undeploys ToS service">
+
+ <echo>Undeploying the service...</echo>
+
+ <antcall target="undeploy-adminclient" />
+
+ <antcall target="rem-context-listener" />
<antcall target="delete-jars-for-tops"/>
- <delete file="${axis.home}/WEB-INF/lib/perfSONAR-tops.jar"/>

+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/perfSONAR-generic.jar"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/perfSONAR-tops.jar"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/perfSONAR.jar"/>
+
+ <antcall target="tomcat-shutdown" />
+
</target>


-</project>
+</project>
\ No newline at end of file

Modified: branches/ulisseskan/ant/tops/tops-client-run-targets.xml
===================================================================
--- branches/ulisseskan/ant/tops/tops-client-run-targets.xml 2006-12-22
11:52:13 UTC (rev 1871)
+++ branches/ulisseskan/ant/tops/tops-client-run-targets.xml 2006-12-26
08:54:11 UTC (rev 1872)
@@ -3,9 +3,8 @@
<!-- ===================================================================
<description>

- $Id: xmlls-client-run-targets.xml,v 1.2 2006/05/08 14:19:44 mac Exp $
project: perfSONAR
- author: romradz, modified by Ulisses for the Topology Service
+ author: romradz, modified by Ulisses and rodriguez for the Topology
Service

Notes: Tests the Topology Service through SOAP/Tomcat

@@ -15,37 +14,26 @@

<project name="tops-client-run-targets">

- <!-- === Targets that run SOAPClient
====================================================== -->
+ <property name="tops.local"
value="http://${target.server}:${target.port}/${deploy.root}/services/TopologyService"/>

+ <target name="run-tops-client" description="Runs Java client2">

- <!-- Sends request to Tops deployed in Tomcat, Initialize -->
- <target name="tops-initialize"
- description="Sends void message to Tomcat">
<java classname="org.perfsonar.client.testHarness.SOAPClient"
- classpathref="classpath" fork="true">
+ classpathref="classpath" fork="true">
+ <arg value="${tops.local}"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/TOPS/test/TOPSDownloadRequest.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/TOPS/test/TOPSDownloadResponse.xml"/>

- <!-- arguments are: end point defined in const.properties, input
file, output file (must be specified
- even if it is not needed) -->
+ <classpath>
+ <pathelement location="build/perfSONAR-generic.jar"/>
+ </classpath>

- <arg value="${tops.test.server}"/>
- <arg
value="${basedir}/schema/example-instances/sonar/TOPS/test/Void.xml"/>
- <arg
value="${basedir}/schema/example-instances/sonar/TOPS/test/Void.xml"/>
</java>
- </target>
+
+ <echo>Test ended successfully.</echo>
+ <echo>Message used for request:
${basedir}/schema/example-instances/perfSONAR/TOPS/test/TOPSDownloadRequest.xml</echo>
+ <echo>You can check the response at:
${basedir}/schema/example-instances/perfSONAR/TOPS/test/TOPSDownloadResponse.xml</echo>

-
- <target name="tops-download-db"
- description="Sends request to Tomcat: full database download">
- <java classname="org.perfsonar.client.testHarness.SOAPClient"
- classpathref="classpath" fork="true">
-
- <!-- arguments are: end point defined in const.properties, input
file, output file (must be specified
- even if it is not needed) -->
-
- <arg value="${tops.test.server}"/>
- <arg
value="${basedir}/schema/example-instances/sonar/TOPS/test/TOPSDownloadRequest.xml"/>
- <arg
value="${basedir}/schema/example-instances/sonar/TOPS/test/TOPSDownloadResponse.xml"/>
- </java>
</target>

</project>

Added: branches/ulisseskan/ant/tops/tops-configure-targets.xml

Modified: branches/ulisseskan/ant/tops/tops-java-compile-targets.xml
===================================================================
--- branches/ulisseskan/ant/tops/tops-java-compile-targets.xml 2006-12-22
11:52:13 UTC (rev 1871)
+++ branches/ulisseskan/ant/tops/tops-java-compile-targets.xml 2006-12-26
08:54:11 UTC (rev 1872)
@@ -3,9 +3,8 @@
<!-- ===================================================================
<description>

- $Id: xmlls-java-compile-targets.xml,v 1.3 2006/05/08 14:21:27 mac Exp $
project: perfSONAR
- author: mac
+ author: rodriguez

Notes:
A set of targets for building the application.
@@ -23,72 +22,51 @@
<delete file="${build}/perfSONAR-tops.jar" failonerror="false"/>
</target>

- <target name="clean-tops-messages">
- <delete
file="${build}/org/perfsonar/commons/messages/TOPSDownloadDBRequest.class" />
- <delete
file="${build}/org/perfsonar/commons/messages/TOPSRequest.class" />
- </target>
+ <target name="compile-tops"
+ description="Compiles Java files of Topology Service">

- <target name="clean-tops" description="Removes build directories." >
- <delete dir="${build}/org/perfsonar/service/topologyService/"/>
- </target>
-
- <target name="compile-tops"
- description="Compiles Java files of Topology Service">
-
- <javac srcdir="src" destdir="${build}" deprecation="yes"
verbose="yes">
-
+ <javac srcdir="src" destdir="${build}" deprecation="yes">
<!-- tops service -->
-
<include name="org/perfsonar/service/topologyService/**" />
<include name="org/perfsonar/service/web/**" />
-
- <!-- tops client -->
-
- <!-- TODO: include
name="org/perfsonar/client/testHarness/TopsTestClient.java" / -->
-
<classpath refid="classpath"/>
-
- <compilerarg value="-Xlint:unchecked"/>
+ <compilerarg value="-Xlint:unchecked"/>
</javac>

- <copy failonerror="false"
todir="${build}/${package.root}/${wsdd.home}">
+ <copy failonerror="true"
todir="${build}/${package.root}/${wsdd.home}">
<fileset dir="src/${package.root}/${wsdd.home}">
<include name="tops-*.wsdd" />
</fileset>
</copy>
+
</target>

+ <target name="jar-tops" depends="clean-jar-tops, compile-tops"
+ description="Creates JAR file for ToS">

- <target name="jar-tops" description="Creates JAR file for Topology
Service">
<jar destfile="${build}/perfSONAR-tops.jar">
<fileset dir="${build}">
-
- <!-- tops service -->
-
<include name="org/perfsonar/service/topologyService/**" />
<include name="org/perfsonar/service/web/**" />
-
- <!-- tops client -->
-
- <!-- TODO: include
name="org/perfsonar/client/testHarness/TopsTestClient.class" / -->
-
</fileset>
</jar>
+
</target>

+ <target name="build"
+ description="Builds ToS.">

- <target name="build-tops"
- description="Builds Topology Service">
- <antcall target="clean-jar-tops"/>
- <antcall target="clean-tops"/>
- <antcall target="compile-tops"/>
+ <antcall target="clean-all"/>
+ <antcall target="jar-generic"/>
<antcall target="jar-tops"/>
- <antcall target="copy-tops-jar"/>
+
</target>




+
+
</project>



Modified: branches/ulisseskan/ant/tops/tops-libs-download-targets.xml
===================================================================
--- branches/ulisseskan/ant/tops/tops-libs-download-targets.xml 2006-12-22
11:52:13 UTC (rev 1871)
+++ branches/ulisseskan/ant/tops/tops-libs-download-targets.xml 2006-12-26
08:54:11 UTC (rev 1872)
@@ -1,30 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
<!-- ===================================================================
<description>

- $Id: sqlma-libs-download-targets.xml 1519 2006-08-08 14:51:08Z roman $
project: perfSONAR
- author: romradz, modified by ulisses to met tops needs
+ author: romradz, modified by ulisses and rodriguez to met tops needs

Notes: Targets to download required libraries

</description>
==================================================================== -->

-
-
-
-
<project basedir="../" name="tops-libs-download-targets"
xmlns:artifact="urn:maven-artifact-ant">

+ <target name="libs-for-tops" depends="init-libs">

- <target name="libs-for-tops" depends="init-libs">
+ <artifact:dependencies>
+ <dependency groupId="exist" artifactId="exist-xmldb"
version="1.0rc"/>

- <artifact:dependencies>
- <dependency groupId="postgresql" artifactId="postgresql"
version="8.1-407.jdbc3"/>
+ <dependency groupId="postgresql"
artifactId="postgresql" version="8.1-407.jdbc3"/>

<localRepository refid="local.repository"/>
<remoteRepository refid="remote.repository"/>
@@ -33,8 +26,6 @@

</target>

-
-
<target name="libs-tops">

<antcall target="libs-generic"/>
@@ -42,8 +33,4 @@

</target>

-
-</project>
-
-
-
+</project>
\ No newline at end of file

Added: branches/ulisseskan/ant/tops/tops-pre-install-targets.xml

Added: branches/ulisseskan/ant/tops/tops-release-targets.xml

Modified: branches/ulisseskan/ant/tops/tops-test-run-targets.xml
===================================================================
--- branches/ulisseskan/ant/tops/tops-test-run-targets.xml 2006-12-22
11:52:13 UTC (rev 1871)
+++ branches/ulisseskan/ant/tops/tops-test-run-targets.xml 2006-12-26
08:54:11 UTC (rev 1872)
@@ -2,29 +2,18 @@
<!-- ===================================================================
<description>

- $Id: xmlls-test-run-targets.xml 1294 2006-06-09 14:01:50Z mac $
project: perfSONAR
- author: romradz
+ author: rodriguez

- Notes: Targets to test some parts of the application
- (for exampleparsers).
-
</description>
==================================================================== -->

<project name="tops-test-run-targets">
- <!-- === Targets that test TOPS functionality without Tomcat
============================= -->
- <!-- TESTS -->

- <target name="tops-test-query"
- description="Run TOPS pseudo Test">
- <java classname="org.perfsonar.client.testHarness.LSTestClient"
classpathref="classpath" 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/sonar/TOPS/test/TOPSDownloadRequest.xml"/>
- </java>
+ <target name="test">
+
+ <antcall target="run-tops-client"/>
+
</target>

</project>

Deleted: branches/ulisseskan/ant/webservice-env-targets.xml

Copied: branches/ulisseskan/conf/axis-1.4 (from rev 1849,
trunk/perfsonar/conf/axis-1.4)

Copied: branches/ulisseskan/conf/axis-1.4/WEB-INF (from rev 1849,
trunk/perfsonar/conf/axis-1.4/WEB-INF)

Copied: branches/ulisseskan/conf/axis-1.4/WEB-INF/classes (from rev 1849,
trunk/perfsonar/conf/axis-1.4/WEB-INF/classes)

Deleted: branches/ulisseskan/conf/axis-1.4/WEB-INF/classes/i18n.properties

Copied: branches/ulisseskan/conf/axis-1.4/WEB-INF/classes/i18n.properties
(from rev 1849, trunk/perfsonar/conf/axis-1.4/WEB-INF/classes/i18n.properties)

Deleted: branches/ulisseskan/conf/axis-1.4/WEB-INF/users.lst

Copied: branches/ulisseskan/conf/axis-1.4/WEB-INF/users.lst (from rev 1849,
trunk/perfsonar/conf/axis-1.4/WEB-INF/users.lst)

Deleted: branches/ulisseskan/conf/axis-1.4/WEB-INF/web.xml

Copied: branches/ulisseskan/conf/axis-1.4/WEB-INF/web.xml (from rev 1849,
trunk/perfsonar/conf/axis-1.4/WEB-INF/web.xml)

Deleted: branches/ulisseskan/conf/axis-1.4/fingerprint.jsp

Copied: branches/ulisseskan/conf/axis-1.4/fingerprint.jsp (from rev 1849,
trunk/perfsonar/conf/axis-1.4/fingerprint.jsp)

Deleted: branches/ulisseskan/conf/axis-1.4/happyaxis.jsp

Copied: branches/ulisseskan/conf/axis-1.4/happyaxis.jsp (from rev 1849,
trunk/perfsonar/conf/axis-1.4/happyaxis.jsp)

Deleted: branches/ulisseskan/conf/axis-1.4/i18nLib.jsp

Copied: branches/ulisseskan/conf/axis-1.4/i18nLib.jsp (from rev 1849,
trunk/perfsonar/conf/axis-1.4/i18nLib.jsp)

Deleted: branches/ulisseskan/conf/axis-1.4/index.html

Copied: branches/ulisseskan/conf/axis-1.4/index.html (from rev 1849,
trunk/perfsonar/conf/axis-1.4/index.html)

Deleted: branches/ulisseskan/conf/axis-1.4/index.jsp

Copied: branches/ulisseskan/conf/axis-1.4/index.jsp (from rev 1849,
trunk/perfsonar/conf/axis-1.4/index.jsp)

Deleted: branches/ulisseskan/conf/components.properties.cl

Copied: branches/ulisseskan/conf/components.properties.clmp (from rev 1849,
trunk/perfsonar/conf/components.properties.clmp)

Deleted: branches/ulisseskan/conf/components.properties.ma

Copied: branches/ulisseskan/conf/components.properties.rrdma (from rev 1849,
trunk/perfsonar/conf/components.properties.rrdma)

Copied: branches/ulisseskan/conf/components.properties.sqlma (from rev 1849,
trunk/perfsonar/conf/components.properties.sqlma)

Modified: branches/ulisseskan/conf/components.properties.tops
===================================================================
--- branches/ulisseskan/conf/components.properties.tops 2006-12-22 11:52:13
UTC (rev 1871)
+++ branches/ulisseskan/conf/components.properties.tops 2006-12-26 08:54:11
UTC (rev 1872)
@@ -3,15 +3,18 @@

# --------------- Common components -----------------------------

-#Configuration component - must be the first one!
+# Configuration component - must be the first one!

config=org.perfsonar.commons.auxiliary.components.configuration.properties.PropertiesConfigurationComponent

-#Logger component - must be the second one!
+# Logger component - must be the second one!

logger=org.perfsonar.commons.auxiliary.components.logger.log4j.Log4jLoggerComponent

+scheduler=org.perfsonar.commons.auxiliary.components.simplescheduler.Scheduler
+#registrator=org.perfsonar.service.commons.registration.LSRegistrationComponent
+registrator=org.perfsonar.service.topologyService.TopsLSRegistrationComponent
# ---------------- Service specific components -------------------

-tops_scheduler=org.perfsonar.commons.auxiliary.components.simplescheduler.Scheduler
-tops-registrator=org.perfsonar.service.topologyService.TopsLSRegistrationComponent
+#tops_scheduler=org.perfsonar.commons.auxiliary.components.simplescheduler.Scheduler
+#tops-registrator=org.perfsonar.service.topologyService.TopsLSRegistrationComponent
tops-jdbc=org.perfsonar.service.topologyService.TopsJDBCComponent


Modified: branches/ulisseskan/conf/log4j.properties
===================================================================
--- branches/ulisseskan/conf/log4j.properties 2006-12-22 11:52:13 UTC (rev
1871)
+++ branches/ulisseskan/conf/log4j.properties 2006-12-26 08:54:11 UTC (rev
1872)
@@ -1,70 +1,50 @@
-
-## $Id$
-## project: perfSONAR
-## author: romradz
-
-
-
-
-# point the property to the directory where log files should be created.
Suggested directory is
-# $PERFSONAR/log
-
-# example path for log files
-logDir=/opt/perfsonar/log
-
-
-## --------------- The properties below do not need any changes -----------
-
-log4j.rootLogger=INFO, rootAppender
-log4j.logger.sonar-debug=DEBUG, debugAppender
-log4j.logger.sonar-info=INFO, infoAppender
-log4j.logger.sonar-warn=WARN, warnAppender
-log4j.logger.sonar-error=ERROR, errorAppender
-log4j.logger.sonar-fatal=FATAL, fatalAppender
-
-
-log4j.appender.rootAppender=org.apache.log4j.RollingFileAppender
-log4j.appender.rootAppender.File=${logDir}/sonar.log
-log4j.appender.rootAppender.MaxFileSize=500KB
+#This file was created by the ant script.
+#Mon Dec 25 17:57:16 CET 2006
+log4j.appender.debugAppender.layout=org.apache.log4j.PatternLayout
+log4j.appender.errorAppender.layout.ConversionPattern=%d %5p - %m%n
+log4j.appender.debugAppender.MaxBackupIndex=1000
+log4j.appender.infoAppender.MaxBackupIndex=1000
+log4j.appender.warnAppender.File=/Users/kan/Proyectos/workspace/RedIRIS -
perfSONAR private branch/log/perfsonar_warn.log
+log4j.appender.warnAppender.MaxBackupIndex=1000
+log4j.appender.debugAppender.File=/Users/kan/Proyectos/workspace/RedIRIS -
perfSONAR private branch/log/perfsonar_debug.log
log4j.appender.rootAppender.MaxBackupIndex=1000
+log4j.appender.rootAppender.File=/Users/kan/Proyectos/workspace/RedIRIS -
perfSONAR private branch/log/perfsonar.log
log4j.appender.rootAppender.layout=org.apache.log4j.PatternLayout
-log4j.appender.rootAppender.layout.ConversionPattern=%d %5p - %m%n
-
-log4j.appender.debugAppender=org.apache.log4j.RollingFileAppender
-log4j.appender.debugAppender.File=${logDir}/sonar_debug.log
log4j.appender.debugAppender.MaxFileSize=500KB
-log4j.appender.debugAppender.MaxBackupIndex=100
-log4j.appender.debugAppender.layout=org.apache.log4j.PatternLayout
-log4j.appender.debugAppender.layout.ConversionPattern=%d %5p - %m%n
-
-log4j.appender.infoAppender=org.apache.log4j.RollingFileAppender
-log4j.appender.infoAppender.File=${logDir}/sonar_info.log
-log4j.appender.infoAppender.MaxFileSize=500KB
-log4j.appender.infoAppender.MaxBackupIndex=100
-log4j.appender.infoAppender.layout=org.apache.log4j.PatternLayout
-log4j.appender.infoAppender.layout.ConversionPattern=%d %5p - %m%n
-
-log4j.appender.warnAppender=org.apache.log4j.RollingFileAppender
-log4j.appender.warnAppender.File=${logDir}/sonar_warn.log
-log4j.appender.warnAppender.MaxFileSize=500KB
-log4j.appender.warnAppender.MaxBackupIndex=100
-log4j.appender.warnAppender.layout=org.apache.log4j.PatternLayout
-log4j.appender.warnAppender.layout.ConversionPattern=%d %5p - %m%n
-
-log4j.appender.errorAppender=org.apache.log4j.RollingFileAppender
-log4j.appender.errorAppender.File=${logDir}/sonar_error.log
-log4j.appender.errorAppender.MaxFileSize=500KB
-log4j.appender.errorAppender.MaxBackupIndex=100
+log4j.appender.debugAppender=org.apache.log4j.RollingFileAppender
+log4j.logger.sonar-warn=WARN, warnAppender
log4j.appender.errorAppender.layout=org.apache.log4j.PatternLayout
-log4j.appender.errorAppender.layout.ConversionPattern=%d %5p - %m%n
-
+logDir=/Users/kan/Proyectos/workspace/RedIRIS - perfSONAR private branch/log
log4j.appender.fatalAppender=org.apache.log4j.RollingFileAppender
-log4j.appender.fatalAppender.File=${logDir}/sonar_fatal.log
-log4j.appender.fatalAppender.MaxFileSize=500KB
-log4j.appender.fatalAppender.MaxBackupIndex=100
+log4j.appender.errorAppender.MaxBackupIndex=1000
+log4j.appender.errorAppender=org.apache.log4j.RollingFileAppender
+log4j.appender.rootAppender.layout.ConversionPattern=%d %5p - %m%n
+log4j.appender.warnAppender.MaxFileSize=500KB
+log4j.rootLogger=INFO, rootAppender
+log4j.appender.rootAppender.MaxFileSize=500KB
log4j.appender.fatalAppender.layout=org.apache.log4j.PatternLayout
+log4j.appender.warnAppender=org.apache.log4j.RollingFileAppender
+log4j.appender.fatalAppender.MaxBackupIndex=1000
+log4j.appender.warnAppender.layout=org.apache.log4j.PatternLayout
+log4j.appender.infoAppender=org.apache.log4j.RollingFileAppender
+log4j.appender.errorAppender.File=/Users/kan/Proyectos/workspace/RedIRIS -
perfSONAR private branch/log/perfsonar_error.log
+log4j.appender.errorAppender.MaxFileSize=500KB
log4j.appender.fatalAppender.layout.ConversionPattern=%d %5p - %m%n
-
-
-
-
+log4j.logger.perfsonar-info=INFO, infoAppender
+log4j.appender.fatalAppender.File=/Users/kan/Proyectos/workspace/RedIRIS -
perfSONAR private branch/log/perfsonar_fatal.log
+log4j.appender.infoAppender.layout.ConversionPattern=%d %5p - %m%n
+log4j.appender.infoAppender.layout=org.apache.log4j.PatternLayout
+log4j.appender.fatalAppender.MaxFileSize=500KB
+log4j.appender.warnAppender.layout.ConversionPattern=%d %5p - %m%n
+log4j.logger.perfsonar-debug=DEBUG, debugAppender
+log4j.logger.sonar-debug=DEBUG, debugAppender
+log4j.appender.rootAppender=org.apache.log4j.RollingFileAppender
+log4j.logger.perfsonar-error=ERROR, errorAppender
+log4j.logger.sonar-error=ERROR, errorAppender
+log4j.appender.debugAppender.layout.ConversionPattern=%d %5p - %m%n
+log4j.logger.perfsonar-warn=WARN, warnAppender
+log4j.appender.infoAppender.MaxFileSize=500KB
+log4j.logger.sonar-info=INFO, infoAppender
+log4j.appender.infoAppender.File=/Users/kan/Proyectos/workspace/RedIRIS -
perfSONAR private branch/log/perfsonar_info.log
+log4j.logger.perfsonar-fatal=FATAL, fatalAppender
+log4j.logger.sonar-fatal=FATAL, fatalAppender

Modified: branches/ulisseskan/conf/rrd-database_TEST.xml
===================================================================
--- branches/ulisseskan/conf/rrd-database_TEST.xml 2006-12-22 11:52:13
UTC (rev 1871)
+++ branches/ulisseskan/conf/rrd-database_TEST.xml 2006-12-26 08:54:11
UTC (rev 1872)
@@ -26,7 +26,7 @@
<nmwg:key>
<nmwg:parameters>
<!-- __basepath__ string is replaced with the path of
perfsonar package -->
- <!-- when Ant configuration script is run (ant
configure-rrdma) -->
+ <!-- when Ant configuration script is run (ant configure)
-->
<nmwg:parameter
name="file">__BASEPATH__/data/rrd/test/test.rrd</nmwg:parameter>
<nmwg:parameter name="dataSource">bytes</nmwg:parameter>
<nmwg:parameter name="valueUnits">Bps</nmwg:parameter>
@@ -56,7 +56,7 @@
<nmwg:key>
<nmwg:parameters>
<!-- __basepath__ string is replaced with the path of
perfsonar package -->
- <!-- when Ant configuration script is run (ant
configure-rrdma) -->
+ <!-- when Ant configuration script is run (ant configure)
-->
<nmwg:parameter
name="file">__BASEPATH__/data/rrd/test/test.rrd</nmwg:parameter>
<nmwg:parameter name="dataSource">pkts</nmwg:parameter>
<nmwg:parameter name="valueUnits">Bps</nmwg:parameter>

Deleted: branches/ulisseskan/conf/service.properties.cl

Copied: branches/ulisseskan/conf/service.properties.clmp (from rev 1849,
trunk/perfsonar/conf/service.properties.clmp)

Modified: branches/ulisseskan/conf/service.properties.tops
===================================================================
--- branches/ulisseskan/conf/service.properties.tops 2006-12-22 11:52:13
UTC (rev 1871)
+++ branches/ulisseskan/conf/service.properties.tops 2006-12-26 08:54:11
UTC (rev 1872)
@@ -2,7 +2,7 @@
##
## Service configuration file
##
-## $Id: service.properties.ls-template,v 1.1 2006/04/24 13:09:29 mac Exp $ $
+## $Id: service.properties.tops 2006/18/12 13:09:29 rodriguez $
## Project: perfSONAR
##

###############################################################################
@@ -11,69 +11,52 @@
## this parameter belongs to the lookup service information set


-## --- general service properties
--------------------------------------------------------
+## general service properties

-service.name=Lookup Service
+service.name=Topology Service

# --- directories
-------------------------------------------------------------------------
-
service.basepath=/home/ulisses/rediris/jra1/perfsonar/

service.log.log4j.config=/home/ulisses/rediris/jra1/perfsonar/conf/log4j.properties

service.sax_parser.config=/home/ulisses/rediris/jra1/perfsonar/src/objects.config

# --- registration
------------------------------------------------------------------------
-
service.r.type=tops
-service.r.access_point=http://loco4.man.poznan.pl:8090/axis/services/TopologyService
-service.r.service_name=Topology Service
-service.r.service_type=TOPS
-service.r.service_description=Topology Service, perfSONAR
-# Reference LS service
-service.r.ls_url=http://loco4.man.poznan.pl:8090/axis/services/LookupService
+service.r.location=loco4.man.poznan.pl
+service.r.description=This is Command Line MP service
+service.r.parameters=
+service.r.access_point.address=loco4.man.poznan.pl:8090/axis/services/TopologyService
+service.r.access_point.type=http
+service.r.access_point.description=test deployment
+service.r.technology=webservice
+service.r.discovery.location=
+service.r.auth_realm=RNP
+service.r.version=1.0

-# --- Lookup Service properties
--------------------------------------------------------
+### registration in LS
+#registration lookup service URL
+service.registration.accessPoint=http://loco4.man.poznan.pl:8090/axis/services/TopologyService
+service.registration.serviceName=Topology Service
+service.registration.serviceType=TOPS
+service.registration.serviceDescription=Topology Service, perfSONAR

-# Database username and password for ls_storage
-component.ls_storage.db_uri=xmldb:exist://localhost:8680/exist/xmlrpc/db/ls
-component.ls_storage.db_username=lookupservice
-component.ls_storage.db_password=sonar
-
-#LS Cleanup loader
-component.ls_cleanup_loader.interval=180000
-component.ls_cleanup_loader.scheduler_component=ls_scheduler
-component.ls_cleanup_loader.storage_component=ls_storage
-
-#Registrator loader
+#registrator component loader
+#time in milliseconds (60000 means 60 sec)
component.registrator.interval=600000
component.registrator.scheduler_component=ls_scheduler
+#component.tops-registrator.scheduler_component=tops_scheduler
+#component.tops-registrator.register_file=/home/ulisses/rediris/jra1/perfsonar/conf/rrd-database_TEST.xml
+component.registrator.scheduler_component=tops_scheduler
+component.registrator.register_file=/home/ulisses/rediris/jra1/perfsonar/conf/rrd-database_TEST.xml

-#updates
-service.ls.allow_replace=yes
+# --- ToS service properties
---------------------------------------------------------------

-# Lookup Service
+service.tops.class_name=org.perfsonar.service.topologyService.TopServiceEngine
+service.tops.message_types=SetupDataDBRequest
+service.tops.interfaces=/home/ulisses/rediris/jra1/perfsonar/conf/interfaces-description.xml

-component.ls_cleanup_loader.interval=180000
-component.ls_cleanup_loader.scheduler_component=ls_scheduler
-component.ls_cleanup_loader.storage_component=ls_storage
-
-#
-component.tops-registrator.scheduler_component=tops_scheduler
-# TODO
-component.tops-registrator.register_file=/home/ulisses/rediris/jra1/perfsonar/conf/rrd-database_TEST.xml
-
component.tops-jdbc.jdbc_uri=jdbc:postgresql:ulisses
component.tops-jdbc.jdbc_user=ulisses
component.tops-jdbc.jdbc_pass=ulisses

-
-# --- Service properties
---------------------------------------------------------------
-
-service.ls.class_name=org.perfsonar.service.lookupService.xmlType.XmlTypeLSServiceEngine
-service.ls.message_types=LSQueryRequest,LSRegisterRequest,LSDeregisterRequest
-
-service.tops.class_name=org.perfsonar.service.topologyService.TopServiceEngine
-service.tops.message_types=SetupDataDBRequest
-service.tops.interfaces=/home/ulisses/rediris/jra1/perfsonar/conf/interfaces-description.xml
-
-# ------- END
--------------------------------------------------------------------------
-
+# ------- END
--------------------------------------------------------------------------
\ No newline at end of file

Copied: branches/ulisseskan/conf/wsdd (from rev 1849,
trunk/perfsonar/conf/wsdd)

Deleted: branches/ulisseskan/conf/wsdd/clmp-service-deploy.wsdd

Copied: branches/ulisseskan/conf/wsdd/clmp-service-deploy.wsdd (from rev
1849, trunk/perfsonar/conf/wsdd/clmp-service-deploy.wsdd)

Deleted: branches/ulisseskan/conf/wsdd/clmp-service-undeploy.wsdd

Copied: branches/ulisseskan/conf/wsdd/clmp-service-undeploy.wsdd (from rev
1849, trunk/perfsonar/conf/wsdd/clmp-service-undeploy.wsdd)

Deleted: branches/ulisseskan/conf/wsdd/ls-service-deploy.wsdd

Copied: branches/ulisseskan/conf/wsdd/ls-service-deploy.wsdd (from rev 1849,
trunk/perfsonar/conf/wsdd/ls-service-deploy.wsdd)

Deleted: branches/ulisseskan/conf/wsdd/ls-service-undeploy.wsdd

Copied: branches/ulisseskan/conf/wsdd/ls-service-undeploy.wsdd (from rev
1849, trunk/perfsonar/conf/wsdd/ls-service-undeploy.wsdd)

Deleted: branches/ulisseskan/conf/wsdd/ma-service-deploy.wsdd

Copied: branches/ulisseskan/conf/wsdd/ma-service-deploy.wsdd (from rev 1849,
trunk/perfsonar/conf/wsdd/ma-service-deploy.wsdd)

Deleted: branches/ulisseskan/conf/wsdd/ma-service-undeploy.wsdd

Copied: branches/ulisseskan/conf/wsdd/ma-service-undeploy.wsdd (from rev
1849, trunk/perfsonar/conf/wsdd/ma-service-undeploy.wsdd)

Deleted: branches/ulisseskan/conf/wsdd/mp-service-deploy.wsdd

Copied: branches/ulisseskan/conf/wsdd/mp-service-deploy.wsdd (from rev 1849,
trunk/perfsonar/conf/wsdd/mp-service-deploy.wsdd)

Deleted: branches/ulisseskan/conf/wsdd/mp-service-undeploy.wsdd

Copied: branches/ulisseskan/conf/wsdd/mp-service-undeploy.wsdd (from rev
1849, trunk/perfsonar/conf/wsdd/mp-service-undeploy.wsdd)

Deleted: branches/ulisseskan/conf/wsdd/tcmp-service-deploy.wsdd

Copied: branches/ulisseskan/conf/wsdd/tcmp-service-deploy.wsdd (from rev
1849, trunk/perfsonar/conf/wsdd/tcmp-service-deploy.wsdd)

Deleted: branches/ulisseskan/conf/wsdd/tcmp-service-undeploy.wsdd

Copied: branches/ulisseskan/conf/wsdd/tcmp-service-undeploy.wsdd (from rev
1849, trunk/perfsonar/conf/wsdd/tcmp-service-undeploy.wsdd)

Deleted: branches/ulisseskan/conf/wsdd/tops-service-deploy.wsdd

Copied: branches/ulisseskan/conf/wsdd/tops-service-deploy.wsdd (from rev
1849, trunk/perfsonar/conf/wsdd/tops-service-deploy.wsdd)

Deleted: branches/ulisseskan/conf/wsdd/tops-service-undeploy.wsdd

Copied: branches/ulisseskan/conf/wsdd/tops-service-undeploy.wsdd (from rev
1849, trunk/perfsonar/conf/wsdd/tops-service-undeploy.wsdd)

Copied: branches/ulisseskan/doc/base (from rev 1849, trunk/perfsonar/doc/base)

Copied: branches/ulisseskan/doc/ls (from rev 1849, trunk/perfsonar/doc/ls)

Copied: branches/ulisseskan/doc/ma (from rev 1849, trunk/perfsonar/doc/ma)

Copied: branches/ulisseskan/doc/ma/rrdTypeMA (from rev 1849,
trunk/perfsonar/doc/ma/rrdTypeMA)

Copied: branches/ulisseskan/doc/ma/sqlTypeMA (from rev 1849,
trunk/perfsonar/doc/ma/sqlTypeMA)

Copied: branches/ulisseskan/doc/mp/cliTypeMP (from rev 1849,
trunk/perfsonar/doc/mp/cliTypeMP)

Copied: branches/ulisseskan/schema/example-instances/perfSONAR (from rev
1849, trunk/perfsonar/schema/example-instances/perfSONAR)

Deleted:
branches/ulisseskan/schema/example-instances/perfSONAR/CommandLineMP-Ping-Request.xml

Copied:
branches/ulisseskan/schema/example-instances/perfSONAR/CommandLineMP-Ping-Request.xml
(from rev 1849,
trunk/perfsonar/schema/example-instances/perfSONAR/CommandLineMP-Ping-Request.xml)

Deleted: branches/ulisseskan/schema/example-instances/perfSONAR/Echo-Req.xml

Copied: branches/ulisseskan/schema/example-instances/perfSONAR/Echo-Req.xml
(from rev 1849,
trunk/perfsonar/schema/example-instances/perfSONAR/Echo-Req.xml)

Deleted: branches/ulisseskan/schema/example-instances/perfSONAR/Echo-Resp.xml

Copied: branches/ulisseskan/schema/example-instances/perfSONAR/Echo-Resp.xml
(from rev 1849,
trunk/perfsonar/schema/example-instances/perfSONAR/Echo-Resp.xml)

Copied: branches/ulisseskan/schema/example-instances/perfSONAR/LS (from rev
1849, trunk/perfsonar/schema/example-instances/perfSONAR/LS)

Copied: branches/ulisseskan/schema/example-instances/perfSONAR/LS/test (from
rev 1849, trunk/perfsonar/schema/example-instances/perfSONAR/LS/test)

Deleted:
branches/ulisseskan/schema/example-instances/perfSONAR/LS/test/LSDeregisterRequest.xml

Copied:
branches/ulisseskan/schema/example-instances/perfSONAR/LS/test/LSDeregisterRequest.xml
(from rev 1849,
trunk/perfsonar/schema/example-instances/perfSONAR/LS/test/LSDeregisterRequest.xml)

Deleted:
branches/ulisseskan/schema/example-instances/perfSONAR/LS/test/LSKeepaliveRequest.xml

Copied:
branches/ulisseskan/schema/example-instances/perfSONAR/LS/test/LSKeepaliveRequest.xml
(from rev 1849,
trunk/perfsonar/schema/example-instances/perfSONAR/LS/test/LSKeepaliveRequest.xml)

Deleted:
branches/ulisseskan/schema/example-instances/perfSONAR/LS/test/LSQueryRequest.xml

Copied:
branches/ulisseskan/schema/example-instances/perfSONAR/LS/test/LSQueryRequest.xml
(from rev 1849,
trunk/perfsonar/schema/example-instances/perfSONAR/LS/test/LSQueryRequest.xml)

Deleted:
branches/ulisseskan/schema/example-instances/perfSONAR/LS/test/LSRegisterRequest-Update.xml

Copied:
branches/ulisseskan/schema/example-instances/perfSONAR/LS/test/LSRegisterRequest-Update.xml
(from rev 1849,
trunk/perfsonar/schema/example-instances/perfSONAR/LS/test/LSRegisterRequest-Update.xml)

Deleted:
branches/ulisseskan/schema/example-instances/perfSONAR/LS/test/LSRegisterRequest.xml

Copied:
branches/ulisseskan/schema/example-instances/perfSONAR/LS/test/LSRegisterRequest.xml
(from rev 1849,
trunk/perfsonar/schema/example-instances/perfSONAR/LS/test/LSRegisterRequest.xml)

Deleted:
branches/ulisseskan/schema/example-instances/perfSONAR/LS/test/LSStore-control.xml

Copied:
branches/ulisseskan/schema/example-instances/perfSONAR/LS/test/LSStore-control.xml
(from rev 1849,
trunk/perfsonar/schema/example-instances/perfSONAR/LS/test/LSStore-control.xml)

Deleted:
branches/ulisseskan/schema/example-instances/perfSONAR/LS/test/LSStore.xml

Copied:
branches/ulisseskan/schema/example-instances/perfSONAR/LS/test/LSStore.xml
(from rev 1849,
trunk/perfsonar/schema/example-instances/perfSONAR/LS/test/LSStore.xml)

Deleted:
branches/ulisseskan/schema/example-instances/perfSONAR/MPDataRequest.xml

Copied:
branches/ulisseskan/schema/example-instances/perfSONAR/MPDataRequest.xml
(from rev 1849,
trunk/perfsonar/schema/example-instances/perfSONAR/MPDataRequest.xml)

Deleted:
branches/ulisseskan/schema/example-instances/perfSONAR/MPDataRequestKey.xml

Copied:
branches/ulisseskan/schema/example-instances/perfSONAR/MPDataRequestKey.xml
(from rev 1849,
trunk/perfsonar/schema/example-instances/perfSONAR/MPDataRequestKey.xml)

Deleted:
branches/ulisseskan/schema/example-instances/perfSONAR/MPDataResponse.xml

Copied:
branches/ulisseskan/schema/example-instances/perfSONAR/MPDataResponse.xml
(from rev 1849,
trunk/perfsonar/schema/example-instances/perfSONAR/MPDataResponse.xml)

Deleted:
branches/ulisseskan/schema/example-instances/perfSONAR/MPDataResponseKey.xml

Copied:
branches/ulisseskan/schema/example-instances/perfSONAR/MPDataResponseKey.xml
(from rev 1849,
trunk/perfsonar/schema/example-instances/perfSONAR/MPDataResponseKey.xml)

Deleted:
branches/ulisseskan/schema/example-instances/perfSONAR/MPKeyRequest.xml

Copied:
branches/ulisseskan/schema/example-instances/perfSONAR/MPKeyRequest.xml (from
rev 1849, trunk/perfsonar/schema/example-instances/perfSONAR/MPKeyRequest.xml)

Deleted:
branches/ulisseskan/schema/example-instances/perfSONAR/MPKeyResponse.xml

Copied:
branches/ulisseskan/schema/example-instances/perfSONAR/MPKeyResponse.xml
(from rev 1849,
trunk/perfsonar/schema/example-instances/perfSONAR/MPKeyResponse.xml)

Deleted:
branches/ulisseskan/schema/example-instances/perfSONAR/MeasurementArchiveStore-L2status-Req-1.xml

Copied:
branches/ulisseskan/schema/example-instances/perfSONAR/MeasurementArchiveStore-L2status-Req-1.xml
(from rev 1849,
trunk/perfsonar/schema/example-instances/perfSONAR/MeasurementArchiveStore-L2status-Req-1.xml)

Deleted:
branches/ulisseskan/schema/example-instances/perfSONAR/MeasurementArchiveStoreRequest-1.xml

Copied:
branches/ulisseskan/schema/example-instances/perfSONAR/MeasurementArchiveStoreRequest-1.xml
(from rev 1849,
trunk/perfsonar/schema/example-instances/perfSONAR/MeasurementArchiveStoreRequest-1.xml)

Deleted:
branches/ulisseskan/schema/example-instances/perfSONAR/MeasurementArchiveStoreRequest-Key-1.xml

Copied:
branches/ulisseskan/schema/example-instances/perfSONAR/MeasurementArchiveStoreRequest-Key-1.xml
(from rev 1849,
trunk/perfsonar/schema/example-instances/perfSONAR/MeasurementArchiveStoreRequest-Key-1.xml)

Deleted:
branches/ulisseskan/schema/example-instances/perfSONAR/MetadataKey-Filter-Req-1.xml

Copied:
branches/ulisseskan/schema/example-instances/perfSONAR/MetadataKey-Filter-Req-1.xml
(from rev 1849,
trunk/perfsonar/schema/example-instances/perfSONAR/MetadataKey-Filter-Req-1.xml)

Deleted:
branches/ulisseskan/schema/example-instances/perfSONAR/MetadataKey-Filter-Req-2.xml

Copied:
branches/ulisseskan/schema/example-instances/perfSONAR/MetadataKey-Filter-Req-2.xml
(from rev 1849,
trunk/perfsonar/schema/example-instances/perfSONAR/MetadataKey-Filter-Req-2.xml)

Deleted:
branches/ulisseskan/schema/example-instances/perfSONAR/MetadataKey-Filter-Resp.xml

Copied:
branches/ulisseskan/schema/example-instances/perfSONAR/MetadataKey-Filter-Resp.xml
(from rev 1849,
trunk/perfsonar/schema/example-instances/perfSONAR/MetadataKey-Filter-Resp.xml)

Deleted:
branches/ulisseskan/schema/example-instances/perfSONAR/MetadataKey-L2status-Req-1.xml

Copied:
branches/ulisseskan/schema/example-instances/perfSONAR/MetadataKey-L2status-Req-1.xml
(from rev 1849,
trunk/perfsonar/schema/example-instances/perfSONAR/MetadataKey-L2status-Req-1.xml)

Deleted:
branches/ulisseskan/schema/example-instances/perfSONAR/MetadataKey-L2status-Req-2.xml

Copied:
branches/ulisseskan/schema/example-instances/perfSONAR/MetadataKey-L2status-Req-2.xml
(from rev 1849,
trunk/perfsonar/schema/example-instances/perfSONAR/MetadataKey-L2status-Req-2.xml)

Deleted:
branches/ulisseskan/schema/example-instances/perfSONAR/MetadataKey-L2status-Req-3.xml

Copied:
branches/ulisseskan/schema/example-instances/perfSONAR/MetadataKey-L2status-Req-3.xml
(from rev 1849,
trunk/perfsonar/schema/example-instances/perfSONAR/MetadataKey-L2status-Req-3.xml)

Deleted:
branches/ulisseskan/schema/example-instances/perfSONAR/MetadataKey-Req.xml

Copied:
branches/ulisseskan/schema/example-instances/perfSONAR/MetadataKey-Req.xml
(from rev 1849,
trunk/perfsonar/schema/example-instances/perfSONAR/MetadataKey-Req.xml)

Deleted:
branches/ulisseskan/schema/example-instances/perfSONAR/MetadataKey-Resp.xml

Copied:
branches/ulisseskan/schema/example-instances/perfSONAR/MetadataKey-Resp.xml
(from rev 1849,
trunk/perfsonar/schema/example-instances/perfSONAR/MetadataKey-Resp.xml)

Deleted:
branches/ulisseskan/schema/example-instances/perfSONAR/SetupData-L2status-Req-1.xml

Copied:
branches/ulisseskan/schema/example-instances/perfSONAR/SetupData-L2status-Req-1.xml
(from rev 1849,
trunk/perfsonar/schema/example-instances/perfSONAR/SetupData-L2status-Req-1.xml)

Deleted:
branches/ulisseskan/schema/example-instances/perfSONAR/SetupData-L2status-Req-2.xml

Copied:
branches/ulisseskan/schema/example-instances/perfSONAR/SetupData-L2status-Req-2.xml
(from rev 1849,
trunk/perfsonar/schema/example-instances/perfSONAR/SetupData-L2status-Req-2.xml)

Deleted:
branches/ulisseskan/schema/example-instances/perfSONAR/SetupData-L2status-Req-3.xml

Copied:
branches/ulisseskan/schema/example-instances/perfSONAR/SetupData-L2status-Req-3.xml
(from rev 1849,
trunk/perfsonar/schema/example-instances/perfSONAR/SetupData-L2status-Req-3.xml)

Deleted:
branches/ulisseskan/schema/example-instances/perfSONAR/SetupData-L2status-Req-4.xml

Copied:
branches/ulisseskan/schema/example-instances/perfSONAR/SetupData-L2status-Req-4.xml
(from rev 1849,
trunk/perfsonar/schema/example-instances/perfSONAR/SetupData-L2status-Req-4.xml)

Deleted:
branches/ulisseskan/schema/example-instances/perfSONAR/SetupData-L2status-Req-5.xml

Copied:
branches/ulisseskan/schema/example-instances/perfSONAR/SetupData-L2status-Req-5.xml
(from rev 1849,
trunk/perfsonar/schema/example-instances/perfSONAR/SetupData-L2status-Req-5.xml)

Deleted:
branches/ulisseskan/schema/example-instances/perfSONAR/SetupData-L2status-Req-6.xml

Copied:
branches/ulisseskan/schema/example-instances/perfSONAR/SetupData-L2status-Req-6.xml
(from rev 1849,
trunk/perfsonar/schema/example-instances/perfSONAR/SetupData-L2status-Req-6.xml)

Deleted:
branches/ulisseskan/schema/example-instances/perfSONAR/SetupData-Req1.xml

Copied:
branches/ulisseskan/schema/example-instances/perfSONAR/SetupData-Req1.xml
(from rev 1849,
trunk/perfsonar/schema/example-instances/perfSONAR/SetupData-Req1.xml)

Deleted:
branches/ulisseskan/schema/example-instances/perfSONAR/SetupData-Req2.xml

Copied:
branches/ulisseskan/schema/example-instances/perfSONAR/SetupData-Req2.xml
(from rev 1849,
trunk/perfsonar/schema/example-instances/perfSONAR/SetupData-Req2.xml)

Deleted:
branches/ulisseskan/schema/example-instances/perfSONAR/SetupData-Resp1.xml

Copied:
branches/ulisseskan/schema/example-instances/perfSONAR/SetupData-Resp1.xml
(from rev 1849,
trunk/perfsonar/schema/example-instances/perfSONAR/SetupData-Resp1.xml)

Deleted:
branches/ulisseskan/schema/example-instances/perfSONAR/SetupData-Resp2.xml

Copied:
branches/ulisseskan/schema/example-instances/perfSONAR/SetupData-Resp2.xml
(from rev 1849,
trunk/perfsonar/schema/example-instances/perfSONAR/SetupData-Resp2.xml)

Deleted:
branches/ulisseskan/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-2.xml

Copied:
branches/ulisseskan/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-2.xml
(from rev 1849,
trunk/perfsonar/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-2.xml)

Deleted:
branches/ulisseskan/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-3.xml

Copied:
branches/ulisseskan/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-3.xml
(from rev 1849,
trunk/perfsonar/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-3.xml)

Deleted:
branches/ulisseskan/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-4.xml

Copied:
branches/ulisseskan/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-4.xml
(from rev 1849,
trunk/perfsonar/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-4.xml)

Deleted:
branches/ulisseskan/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-5.xml

Copied:
branches/ulisseskan/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-5.xml
(from rev 1849,
trunk/perfsonar/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-5.xml)

Deleted:
branches/ulisseskan/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-Chaining-1.xml

Copied:
branches/ulisseskan/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-Chaining-1.xml
(from rev 1849,
trunk/perfsonar/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-Chaining-1.xml)

Deleted:
branches/ulisseskan/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-Chaining-2.xml

Copied:
branches/ulisseskan/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-Chaining-2.xml
(from rev 1849,
trunk/perfsonar/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-Chaining-2.xml)

Deleted:
branches/ulisseskan/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect.xml

Copied:
branches/ulisseskan/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect.xml
(from rev 1849,
trunk/perfsonar/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect.xml)

Deleted:
branches/ulisseskan/schema/example-instances/perfSONAR/SetupDataResponse-FilterRRDSelect-2.xml

Copied:
branches/ulisseskan/schema/example-instances/perfSONAR/SetupDataResponse-FilterRRDSelect-2.xml
(from rev 1849,
trunk/perfsonar/schema/example-instances/perfSONAR/SetupDataResponse-FilterRRDSelect-2.xml)

Deleted:
branches/ulisseskan/schema/example-instances/perfSONAR/SetupDataResponse-FilterRRDSelect-3.xml

Copied:
branches/ulisseskan/schema/example-instances/perfSONAR/SetupDataResponse-FilterRRDSelect-3.xml
(from rev 1849,
trunk/perfsonar/schema/example-instances/perfSONAR/SetupDataResponse-FilterRRDSelect-3.xml)

Deleted:
branches/ulisseskan/schema/example-instances/perfSONAR/SetupDataResponse-FilterRRDSelect.xml

Copied:
branches/ulisseskan/schema/example-instances/perfSONAR/SetupDataResponse-FilterRRDSelect.xml
(from rev 1849,
trunk/perfsonar/schema/example-instances/perfSONAR/SetupDataResponse-FilterRRDSelect.xml)

Deleted:
branches/ulisseskan/schema/example-instances/perfSONAR/TCMPCaptureRequest-measurement.xml

Copied:
branches/ulisseskan/schema/example-instances/perfSONAR/TCMPCaptureRequest-measurement.xml
(from rev 1849,
trunk/perfsonar/schema/example-instances/perfSONAR/TCMPCaptureRequest-measurement.xml)

Copied: branches/ulisseskan/schema/example-instances/perfSONAR/TOPS (from rev
1849, trunk/perfsonar/schema/example-instances/perfSONAR/TOPS)

Copied: branches/ulisseskan/schema/example-instances/perfSONAR/TOPS/test
(from rev 1849, trunk/perfsonar/schema/example-instances/perfSONAR/TOPS/test)

Added:
branches/ulisseskan/schema/example-instances/perfSONAR/TOPS/test/TOPSDownloadRequest.xml

Deleted:
branches/ulisseskan/schema/example-instances/perfSONAR/TOPS/test/Void.xml

Copied:
branches/ulisseskan/schema/example-instances/perfSONAR/TOPS/test/Void.xml
(from rev 1849,
trunk/perfsonar/schema/example-instances/perfSONAR/TOPS/test/Void.xml)

Deleted:
branches/ulisseskan/schema/example-instances/perfSONAR/link-status-store.xml

Copied:
branches/ulisseskan/schema/example-instances/perfSONAR/link-status-store.xml
(from rev 1849,
trunk/perfsonar/schema/example-instances/perfSONAR/link-status-store.xml)

Copied: branches/ulisseskan/schema/example-instances/perfSONAR/netflow (from
rev 1849, trunk/perfsonar/schema/example-instances/perfSONAR/netflow)

Deleted:
branches/ulisseskan/schema/example-instances/perfSONAR/netflow/ClientMPKeepaliveRequest.xml

Copied:
branches/ulisseskan/schema/example-instances/perfSONAR/netflow/ClientMPKeepaliveRequest.xml
(from rev 1849,
trunk/perfsonar/schema/example-instances/perfSONAR/netflow/ClientMPKeepaliveRequest.xml)

Deleted:
branches/ulisseskan/schema/example-instances/perfSONAR/netflow/ClientMPKeepaliveResponse.xml

Copied:
branches/ulisseskan/schema/example-instances/perfSONAR/netflow/ClientMPKeepaliveResponse.xml
(from rev 1849,
trunk/perfsonar/schema/example-instances/perfSONAR/netflow/ClientMPKeepaliveResponse.xml)

Deleted:
branches/ulisseskan/schema/example-instances/perfSONAR/netflow/ClientMPSubscribeRequest.xml

Copied:
branches/ulisseskan/schema/example-instances/perfSONAR/netflow/ClientMPSubscribeRequest.xml
(from rev 1849,
trunk/perfsonar/schema/example-instances/perfSONAR/netflow/ClientMPSubscribeRequest.xml)

Deleted:
branches/ulisseskan/schema/example-instances/perfSONAR/netflow/ClientMPSubscribeResponse.xml

Copied:
branches/ulisseskan/schema/example-instances/perfSONAR/netflow/ClientMPSubscribeResponse.xml
(from rev 1849,
trunk/perfsonar/schema/example-instances/perfSONAR/netflow/ClientMPSubscribeResponse.xml)

Deleted:
branches/ulisseskan/schema/example-instances/perfSONAR/netflow/ClientMPUnSubscribeRequest.xml

Copied:
branches/ulisseskan/schema/example-instances/perfSONAR/netflow/ClientMPUnSubscribeRequest.xml
(from rev 1849,
trunk/perfsonar/schema/example-instances/perfSONAR/netflow/ClientMPUnSubscribeRequest.xml)

Deleted:
branches/ulisseskan/schema/example-instances/perfSONAR/netflow/ClientMPUnSubscribeResponse.xml

Copied:
branches/ulisseskan/schema/example-instances/perfSONAR/netflow/ClientMPUnSubscribeResponse.xml
(from rev 1849,
trunk/perfsonar/schema/example-instances/perfSONAR/netflow/ClientMPUnSubscribeResponse.xml)

Deleted:
branches/ulisseskan/schema/example-instances/perfSONAR/netflow/MPLSRegistrationRequest.xml

Copied:
branches/ulisseskan/schema/example-instances/perfSONAR/netflow/MPLSRegistrationRequest.xml
(from rev 1849,
trunk/perfsonar/schema/example-instances/perfSONAR/netflow/MPLSRegistrationRequest.xml)

Deleted:
branches/ulisseskan/schema/example-instances/perfSONAR/netflow/MPLSRegistrationResponse.xml

Copied:
branches/ulisseskan/schema/example-instances/perfSONAR/netflow/MPLSRegistrationResponse.xml
(from rev 1849,
trunk/perfsonar/schema/example-instances/perfSONAR/netflow/MPLSRegistrationResponse.xml)

Copied: branches/ulisseskan/schema/example-instances/perfSONAR/nmsTypeMP
(from rev 1849, trunk/perfsonar/schema/example-instances/perfSONAR/nmsTypeMP)

Deleted:
branches/ulisseskan/schema/example-instances/perfSONAR/nmsTypeMP/DataRequest-exampleMetadata-noKey.xml

Copied:
branches/ulisseskan/schema/example-instances/perfSONAR/nmsTypeMP/DataRequest-exampleMetadata-noKey.xml
(from rev 1849,
trunk/perfsonar/schema/example-instances/perfSONAR/nmsTypeMP/DataRequest-exampleMetadata-noKey.xml)

Deleted:
branches/ulisseskan/schema/example-instances/perfSONAR/nmsTypeMP/GEANT2-link-status-with-data-store

Copied:
branches/ulisseskan/schema/example-instances/perfSONAR/nmsTypeMP/GEANT2-link-status-with-data-store
(from rev 1849,
trunk/perfsonar/schema/example-instances/perfSONAR/nmsTypeMP/GEANT2-link-status-with-data-store)

Deleted:
branches/ulisseskan/schema/example-instances/perfSONAR/nmsTypeMP/GEANT2-link-status-with-key-store

Copied:
branches/ulisseskan/schema/example-instances/perfSONAR/nmsTypeMP/GEANT2-link-status-with-key-store
(from rev 1849,
trunk/perfsonar/schema/example-instances/perfSONAR/nmsTypeMP/GEANT2-link-status-with-key-store)

Deleted:
branches/ulisseskan/schema/example-instances/perfSONAR/nmsTypeMP/KeyRequest-emptyMetadata.xml

Copied:
branches/ulisseskan/schema/example-instances/perfSONAR/nmsTypeMP/KeyRequest-emptyMetadata.xml
(from rev 1849,
trunk/perfsonar/schema/example-instances/perfSONAR/nmsTypeMP/KeyRequest-emptyMetadata.xml)

Deleted:
branches/ulisseskan/schema/example-instances/perfSONAR/nmsTypeMP/KeyRequest-exampleMetadata.xml

Copied:
branches/ulisseskan/schema/example-instances/perfSONAR/nmsTypeMP/KeyRequest-exampleMetadata.xml
(from rev 1849,
trunk/perfsonar/schema/example-instances/perfSONAR/nmsTypeMP/KeyRequest-exampleMetadata.xml)

Deleted:
branches/ulisseskan/schema/example-instances/perfSONAR/nmsTypeMP/nmsTypeMP-store-beta1.xml

Copied:
branches/ulisseskan/schema/example-instances/perfSONAR/nmsTypeMP/nmsTypeMP-store-beta1.xml
(from rev 1849,
trunk/perfsonar/schema/example-instances/perfSONAR/nmsTypeMP/nmsTypeMP-store-beta1.xml)

Copied: branches/ulisseskan/schema/example-instances/perfSONAR/rrdTypeMA
(from rev 1849, trunk/perfsonar/schema/example-instances/perfSONAR/rrdTypeMA)

Copied: branches/ulisseskan/schema/example-instances/perfSONAR/snmpTypeMP
(from rev 1849, trunk/perfsonar/schema/example-instances/perfSONAR/snmpTypeMP)

Deleted:
branches/ulisseskan/schema/example-instances/perfSONAR/snmpTypeMP/DataRequest-exampleMetadata-noKey.xml

Copied:
branches/ulisseskan/schema/example-instances/perfSONAR/snmpTypeMP/DataRequest-exampleMetadata-noKey.xml
(from rev 1849,
trunk/perfsonar/schema/example-instances/perfSONAR/snmpTypeMP/DataRequest-exampleMetadata-noKey.xml)

Deleted:
branches/ulisseskan/schema/example-instances/perfSONAR/snmpTypeMP/DataRequest-withKey.xml

Copied:
branches/ulisseskan/schema/example-instances/perfSONAR/snmpTypeMP/DataRequest-withKey.xml
(from rev 1849,
trunk/perfsonar/schema/example-instances/perfSONAR/snmpTypeMP/DataRequest-withKey.xml)

Deleted:
branches/ulisseskan/schema/example-instances/perfSONAR/snmpTypeMP/KeyRequest-exampleMetadata.xml

Copied:
branches/ulisseskan/schema/example-instances/perfSONAR/snmpTypeMP/KeyRequest-exampleMetadata.xml
(from rev 1849,
trunk/perfsonar/schema/example-instances/perfSONAR/snmpTypeMP/KeyRequest-exampleMetadata.xml)

Deleted:
branches/ulisseskan/schema/example-instances/perfSONAR/snmpTypeMP/snmpTypeMP-store-beta1.xml

Copied:
branches/ulisseskan/schema/example-instances/perfSONAR/snmpTypeMP/snmpTypeMP-store-beta1.xml
(from rev 1849,
trunk/perfsonar/schema/example-instances/perfSONAR/snmpTypeMP/snmpTypeMP-store-beta1.xml)

Deleted: branches/ulisseskan/schema/example-instances/perfSONAR/store.xml

Copied: branches/ulisseskan/schema/example-instances/perfSONAR/store.xml
(from rev 1849, trunk/perfsonar/schema/example-instances/perfSONAR/store.xml)

Copied: branches/ulisseskan/schema/nmwg/netflow.rnc (from rev 1849,
trunk/perfsonar/schema/nmwg/netflow.rnc)

Modified: branches/ulisseskan/schema/nmwg/nmtopo-l2.rnc
===================================================================
--- branches/ulisseskan/schema/nmwg/nmtopo-l2.rnc 2006-12-22 11:52:13
UTC (rev 1871)
+++ branches/ulisseskan/schema/nmwg/nmtopo-l2.rnc 2006-12-26 08:54:11
UTC (rev 1872)
@@ -32,7 +32,10 @@
L2Role? &
element nmtl2:type { xsd:string }? &
element nmtl2:address { L2Address }? &
- element nmtl2:name { xsd:string }? &
+ element nmtl2:name {
+ attribute type { xsd:string }? &
+ xsd:string
+ }? &
element nmtl2:description { xsd:string }? &
element nmtl2:ifHostName { xsd:string }? &
element nmtl2:ifIndex { xsd:string }? &
@@ -66,10 +69,7 @@
element nmtl2:globalName {
attribute type { xsd:string }? &
xsd:string
- }? &
- element nmtl2:authRealm {
- xsd:string
- }? &
+ }? &
L2Interface* &
L2Link* &
Node*
@@ -85,7 +85,10 @@
L2NetworkContent =
Identifier? &
L2NetworkIdRef? &
- element nmtl2:name { xsd:string }? &
+ element nmtl2:name {
+ attribute type { xsd:string }? &
+ xsd:string
+ }? &
element nmtl2:type { xsd:string }? &
element nmtl2:vlan { xsd:string }? &
L2Interface* &

Modified: branches/ulisseskan/schema/nmwg/nmtopo-l3.rnc
===================================================================
--- branches/ulisseskan/schema/nmwg/nmtopo-l3.rnc 2006-12-22 11:52:13
UTC (rev 1871)
+++ branches/ulisseskan/schema/nmwg/nmtopo-l3.rnc 2006-12-26 08:54:11
UTC (rev 1872)
@@ -74,10 +74,7 @@
element nmtl3:globalName {
attribute type { xsd:string }? &
xsd:string
- }? &
- element nmtl3:authRealm {
- xsd:string
- }? &
+ }? &
(
L3Interface |
L2Interface
@@ -99,7 +96,10 @@
L3NetworkContent =
Identifier? &
L3NetworkIdRef? &
- element nmtl3:name { xsd:string }? &
+ element nmtl3:name {
+ attribute type { xsd:string }? &
+ xsd:string
+ }? &
element nmtl3:type { xsd:string }? &
element nmtl3:subnet { xsd:string }? &
element nmtl3:netmask { xsd:string }? &

Modified: branches/ulisseskan/schema/nmwg/nmtopo_ver3.rnc
===================================================================
--- branches/ulisseskan/schema/nmwg/nmtopo_ver3.rnc 2006-12-22 11:52:13
UTC (rev 1871)
+++ branches/ulisseskan/schema/nmwg/nmtopo_ver3.rnc 2006-12-26 08:54:11
UTC (rev 1872)
@@ -38,9 +38,11 @@
element nmwgtopo3:ifDescription { xsd:string }? &
element nmwgtopo3:ifIndex { xsd:string }? &
element nmwgtopo3:capacity { xsd:string }? &
- element nmwgtopo3:name { xsd:string}?
+ element nmwgtopo3:name {
+ attribute type { xsd:string }? &
+ xsd:string
+ }?

-
## ########################
## generic link
## ########################
@@ -84,7 +86,10 @@
BaseNetworkContent =
Identifier? &
BaseNetworkIdRef? &
- element nmwgtopo3:name { xsd:string }? &
+ element nmwgtopo3:name {
+ attribute type { xsd:string }? &
+ xsd:string
+ }? &
element nmwgtopo3:type { xsd:string }? &
(
BaseInterface |
@@ -119,19 +124,34 @@
element nmwgtopo3:description { xsd:string }? &
element nmwgtopo3:cpu { xsd:string }? &
element nmwgtopo3:operSys { xsd:string }? &
- element nmwgtopo3:location { xsd:string }? &
+ element nmwgtopo3:location { LocationContent }? &
+ element nmwgtopo3:institution { xsd:string }? &
element nmwgtopo3:country { xsd:string }? &
- element nmwgtopo3:city { xsd:string }? &
- element nmwgtopo3:latitude { xsd:string }? &
- element nmwgtopo3:longitude { xsd:string }? &
- element nmwgtopo3:institution { xsd:string }? &
+ element nmwgtopo3:city { xsd:string }? &
+ element nmwgtopo3:latitude { xsd:float }? &
+ element nmwgtopo3:longitude { xsd:float }? &
(
BaseInterface |
L2Interface |
L3Interface
)*

+LocationContent =
+ element nmwgtopo3:institution { xsd:string }? &
+ element nmwgtopo3:country { xsd:string }? &
+ element nmwgtopo3:zipcode { xsd:integer }? &
+ element nmwgtopo3:state { xsd:string }? &
+ element nmwgtopo3:city { xsd:string }? &
+ element nmwgtopo3:streetAddress { xsd:string }? &
+ element nmwgtopo3:floor { xsd:string }? &
+ element nmwgtopo3:room { xsd:string }? &
+ element nmwgtopo3:cage { xsd:string }? &
+ element nmwgtopo3:rack { xsd:string }? &
+ element nmwgtopo3:shelf { xsd:string }? &
+ element nmwgtopo3:latitude { xsd:float }? &
+ element nmwgtopo3:longitude { xsd:float }?

+
## ########################
## generic path
## ########################
@@ -153,6 +173,13 @@
## misc
## ########################

+BaseAddress =
+ (
+ attribute value { xsd:string } |
+ text
+ ) &
+ attribute type { xsd:string }
+
BaseRole =
(
attribute role { xsd:string } |

Modified: branches/ulisseskan/schema/nmwg/test.sh
===================================================================
--- branches/ulisseskan/schema/nmwg/test.sh 2006-12-22 11:52:13 UTC (rev
1871)
+++ branches/ulisseskan/schema/nmwg/test.sh 2006-12-26 08:54:11 UTC (rev
1872)
@@ -2,12 +2,49 @@

rm -f *.rng *.xsd

-JAVA=/usr/java/jdk1.5.0_06/jre/bin/java
+JAVA=/usr/java/jdk1.5.0_07/jre/bin/java
TRANG=/usr/local/trang/trang.jar
JING=/usr/local/jing/bin/jing.jar
MSV=/usr/local/msv/msv.jar

+$JAVA -jar $TRANG -I rnc -O rng netflow.rnc netflow.rng
+$JAVA -jar $TRANG -I rng -O xsd netflow.rng netflow.xsd

+$JAVA -jar $MSV -warning netflow.rng
../example-instances/sonar/netflow/ClientMPKeepaliveRequest.xml
+$JAVA -jar $JING netflow.rng
../example-instances/sonar/netflow/ClientMPKeepaliveRequest.xml
+#$JAVA -jar $JING netflow.xsd
../example-instances/sonar/netflow/ClientMPKeepaliveRequest.xml
+
+$JAVA -jar $MSV -warning netflow.rng
../example-instances/sonar/netflow/ClientMPKeepaliveResponse.xml
+$JAVA -jar $JING netflow.rng
../example-instances/sonar/netflow/ClientMPKeepaliveResponse.xml
+#$JAVA -jar $JING netflow.xsd
../example-instances/sonar/netflow/ClientMPKeepaliveResponse.xml
+
+$JAVA -jar $MSV -warning netflow.rng
../example-instances/sonar/netflow/ClientMPUnSubscribeRequest.xml
+$JAVA -jar $JING netflow.rng
../example-instances/sonar/netflow/ClientMPUnSubscribeRequest.xml
+#$JAVA -jar $JING netflow.xsd
../example-instances/sonar/netflow/ClientMPUnSubscribeRequest.xml
+
+$JAVA -jar $MSV -warning netflow.rng
../example-instances/sonar/netflow/ClientMPUnSubscribeResponse.xml
+$JAVA -jar $JING netflow.rng
../example-instances/sonar/netflow/ClientMPUnSubscribeResponse.xml
+#$JAVA -jar $JING netflow.xsd
../example-instances/sonar/netflow/ClientMPUnSubscribeResponse.xml
+
+$JAVA -jar $MSV -warning netflow.rng
../example-instances/sonar/netflow/ClientMPSubscribeRequest.xml
+$JAVA -jar $JING netflow.rng
../example-instances/sonar/netflow/ClientMPSubscribeRequest.xml
+#$JAVA -jar $JING netflow.xsd
../example-instances/sonar/netflow/ClientMPSubscribeRequest.xml
+
+$JAVA -jar $MSV -warning netflow.rng
../example-instances/sonar/netflow/ClientMPSubscribeResponse.xml
+$JAVA -jar $JING netflow.rng
../example-instances/sonar/netflow/ClientMPSubscribeResponse.xml
+#$JAVA -jar $JING netflow.xsd
../example-instances/sonar/netflow/ClientMPSubscribeResponse.xml
+
+$JAVA -jar $MSV -warning netflow.rng
../example-instances/sonar/netflow/MPLSRegistrationRequest.xml
+$JAVA -jar $JING netflow.rng
../example-instances/sonar/netflow/MPLSRegistrationRequest.xml
+#$JAVA -jar $JING netflow.xsd
../example-instances/sonar/netflow/MPLSRegistrationRequest.xml
+
+$JAVA -jar $MSV -warning netflow.rng
../example-instances/sonar/netflow/MPLSRegistrationResponse.xml
+$JAVA -jar $JING netflow.rng
../example-instances/sonar/netflow/MPLSRegistrationResponse.xml
+#$JAVA -jar $JING netflow.xsd
../example-instances/sonar/netflow/MPLSRegistrationResponse.xml
+
+
+
+
$JAVA -jar $TRANG -I rnc -O rng topo-test.rnc topo-test.rng
$JAVA -jar $TRANG -I rng -O xsd topo-test.rng topo-test.xsd


Modified: branches/ulisseskan/src/objects.config
===================================================================
--- branches/ulisseskan/src/objects.config 2006-12-22 11:52:13 UTC (rev
1871)
+++ branches/ulisseskan/src/objects.config 2006-12-26 08:54:11 UTC (rev
1872)
@@ -1,21 +1,21 @@
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/subject/
org.ggf.ns.nmwg.base.v2_0.Subject
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/message/
org.ggf.ns.nmwg.base.v2_0.Message
+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/metadata/
org.ggf.ns.nmwg.base.v2_0.Metadata
-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/eventType/
org.ggf.ns.nmwg.base.v2_0.EventType
+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/subject/
org.ggf.ns.nmwg.base.v2_0.Subject
+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/parameters/
org.ggf.ns.nmwg.base.v2_0.Parameters
-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/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/element/
org.ggf.ns.nmwg.base.v2_0.Element
-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/parameter/
org.ggf.ns.nmwg.base.v2_0.Parameter
+http://ggf.org/ns/nmwg/base/2.0/datum/ org.ggf.ns.nmwg.base.v2_0.Datum
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/utilization/2.0/parameters/
org.ggf.ns.nmwg.characteristic.utilization.v2_0.Parameters
-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/datum/
org.ggf.ns.nmwg.event.status.base.v2_0.Datum
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/subject/
org.ggf.ns.nmwg.ops.cdf.v2_0.Subject
@@ -33,125 +33,144 @@
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/start/ org.ggf.ns.nmwg.time.v2_0.Start
+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/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/time/2.0/end/ org.ggf.ns.nmwg.time.v2_0.End
+http://ggf.org/ns/nmwg/time/2.0/start/ org.ggf.ns.nmwg.time.v2_0.Start
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/bwctl/2.0/parameters/
org.ggf.ns.nmwg.tools.bwctl.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/iperf/2.0/parameters/
org.ggf.ns.nmwg.tools.iperf.v2_0.Parameters
+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/transportFormats/
org.ggf.ns.nmwg.tools.netflow.v2_0.TransportFormats
+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/transportFormat/
org.ggf.ns.nmwg.tools.netflow.v2_0.TransportFormat
+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/subject/
org.ggf.ns.nmwg.tools.netflow.v2_0.Subject
+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/flowFormats/
org.ggf.ns.nmwg.tools.netflow.v2_0.FlowFormats
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/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/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/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/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/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/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/accessPoint/
org.ggf.ns.nmwg.tools.org.perfsonar.service.v1_0.AccessPoint
+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/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/datum/
org.ggf.ns.nmwg.tools.org.perfsonar.service.v1_0.Datum
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/serviceType/
org.ggf.ns.nmwg.tools.org.perfsonar.service.v1_0.ServiceType
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/serviceDescription/
org.ggf.ns.nmwg.tools.org.perfsonar.service.v1_0.ServiceDescription
-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/datum/
org.ggf.ns.nmwg.tools.org.perfsonar.service.v1_0.Datum
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/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/owamp/2.0/parameters/
org.ggf.ns.nmwg.tools.owamp.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/passivetracefile/2.0/parameters/
org.ggf.ns.nmwg.tools.passivetracefile.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/ping/2.0/parameters/
org.ggf.ns.nmwg.tools.ping.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/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/tools/traceroute/2.0/parameters/
org.ggf.ns.nmwg.tools.traceroute.v2_0.Parameters
-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/name/
org.ggf.ns.nmwg.topology.base.v3_0.Name
+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/base/3.0/city/
org.ggf.ns.nmwg.topology.base.v3_0.City
-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/longitude/
org.ggf.ns.nmwg.topology.base.v3_0.Longitude
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/institution/
org.ggf.ns.nmwg.topology.base.v3_0.Institution
-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/name/
org.ggf.ns.nmwg.topology.base.v3_0.Name
+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/hostName/
org.ggf.ns.nmwg.topology.base.v3_0.HostName
-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/ifDescription/
org.ggf.ns.nmwg.topology.base.v3_0.IfDescription
-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/rack/
org.ggf.ns.nmwg.topology.base.v3_0.Rack
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/node/
org.ggf.ns.nmwg.topology.base.v3_0.Node
+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/path/
org.ggf.ns.nmwg.topology.base.v3_0.Path
+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/globalName/
org.ggf.ns.nmwg.topology.base.v3_0.GlobalName
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/globalName/
org.ggf.ns.nmwg.topology.base.v3_0.GlobalName
-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/room/
org.ggf.ns.nmwg.topology.base.v3_0.Room
+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/shelf/
org.ggf.ns.nmwg.topology.base.v3_0.Shelf
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/ifName/
org.ggf.ns.nmwg.topology.base.v3_0.IfName
-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/country/
org.ggf.ns.nmwg.topology.base.v3_0.Country
+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/address/
org.ggf.ns.nmwg.topology.base.v3_0.Address
+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/type/
org.ggf.ns.nmwg.topology.base.v3_0.Type
+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/cpu/
org.ggf.ns.nmwg.topology.base.v3_0.Cpu
+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/floor/
org.ggf.ns.nmwg.topology.base.v3_0.Floor
+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/latitude/
org.ggf.ns.nmwg.topology.base.v3_0.Latitude
-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/country/
org.ggf.ns.nmwg.topology.base.v3_0.Country
-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/l2/3.0/ifHostName/
org.ggf.ns.nmwg.topology.l2.v3_0.IfHostName
-http://ggf.org/ns/nmwg/topology/l2/3.0/authRealm/
org.ggf.ns.nmwg.topology.l2.v3_0.AuthRealm
-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/base/3.0/state/
org.ggf.ns.nmwg.topology.base.v3_0.State
+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/link/
org.ggf.ns.nmwg.topology.base.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/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/interface/
org.ggf.ns.nmwg.topology.l2.v3_0.Interface
+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/description/
org.ggf.ns.nmwg.topology.l2.v3_0.Description
+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/globalName/
org.ggf.ns.nmwg.topology.l2.v3_0.GlobalName
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/globalName/
org.ggf.ns.nmwg.topology.l2.v3_0.GlobalName
-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/vlan/
org.ggf.ns.nmwg.topology.l2.v3_0.Vlan
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/vlan/
org.ggf.ns.nmwg.topology.l2.v3_0.Vlan
+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/address/
org.ggf.ns.nmwg.topology.l2.v3_0.Address
-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/index/
org.ggf.ns.nmwg.topology.l2.v3_0.Index
-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/l3/3.0/ifHostName/
org.ggf.ns.nmwg.topology.l3.v3_0.IfHostName
+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/ifHostName/
org.ggf.ns.nmwg.topology.l2.v3_0.IfHostName
+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/l3/3.0/name/
org.ggf.ns.nmwg.topology.l3.v3_0.Name
+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/ifIndex/
org.ggf.ns.nmwg.topology.l3.v3_0.IfIndex
+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/netmask/
org.ggf.ns.nmwg.topology.l3.v3_0.Netmask
-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/authRealm/
org.ggf.ns.nmwg.topology.l3.v3_0.AuthRealm
-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/path/
org.ggf.ns.nmwg.topology.l3.v3_0.Path
+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/capacity/
org.ggf.ns.nmwg.topology.l3.v3_0.Capacity
+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/ipAddress/
org.ggf.ns.nmwg.topology.l3.v3_0.IpAddress
+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/index/
org.ggf.ns.nmwg.topology.l3.v3_0.Index
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/network/
org.ggf.ns.nmwg.topology.l3.v3_0.Network
-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/ifHostName/
org.ggf.ns.nmwg.topology.l3.v3_0.IfHostName
+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/asn/
org.ggf.ns.nmwg.topology.l3.v3_0.Asn
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/ifDescription/
org.ggf.ns.nmwg.topology.l3.v3_0.IfDescription
-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/ifIndex/
org.ggf.ns.nmwg.topology.l3.v3_0.IfIndex
-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/ifName/
org.ggf.ns.nmwg.topology.l3.v3_0.IfName
-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/index/
org.ggf.ns.nmwg.topology.l3.v3_0.Index
-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/l3/3.0/link/
org.ggf.ns.nmwg.topology.l3.v3_0.Link
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/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/l4/3.0/address/
org.ggf.ns.nmwg.topology.l4.v3_0.Address
-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/2.0/authRealm/
org.ggf.ns.nmwg.topology.v2_0.AuthRealm
+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/2.0/endPoint/
org.ggf.ns.nmwg.topology.v2_0.EndPoint
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/src/
org.ggf.ns.nmwg.topology.v2_0.Src
+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/hostName/
org.ggf.ns.nmwg.topology.v2_0.HostName
+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/direction/
org.ggf.ns.nmwg.topology.v2_0.Direction
+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/ifName/
org.ggf.ns.nmwg.topology.v2_0.IfName
+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/ipAddress/
org.ggf.ns.nmwg.topology.v2_0.IpAddress
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/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/endPointPair/
org.ggf.ns.nmwg.topology.v2_0.EndPointPair
-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/direction/
org.ggf.ns.nmwg.topology.v2_0.Direction
-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/hostName/
org.ggf.ns.nmwg.topology.v2_0.HostName
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/endPoint/
org.ggf.ns.nmwg.topology.v2_0.EndPoint
-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/capacity/
org.ggf.ns.nmwg.topology.v2_0.Capacity
-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/dst/
org.ggf.ns.nmwg.topology.v2_0.Dst

Modified:
branches/ulisseskan/src/org/perfsonar/commons/auxiliary/AuxiliaryComponentManager.java
===================================================================
---
branches/ulisseskan/src/org/perfsonar/commons/auxiliary/AuxiliaryComponentManager.java
2006-12-22 11:52:13 UTC (rev 1871)
+++
branches/ulisseskan/src/org/perfsonar/commons/auxiliary/AuxiliaryComponentManager.java
2006-12-26 08:54:11 UTC (rev 1872)
@@ -5,6 +5,7 @@
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
+import java.net.URL;
import java.util.Iterator;

import org.perfsonar.service.commons.exceptions.SystemException;
@@ -64,10 +65,18 @@
*/
public void initManager() throws SystemException {

- //read components from Configuration file and init them
+//read components from Configuration file and init them

//String configFileName =
"/projects/sonar/perfsonar/conf/components.properties";
- String configFileName = System.getProperty("components.properties");
+ URL urlString =
this.getClass().getClassLoader().getResource("perfsonar/conf/components.properties");
+
+ if(urlString==null || urlString.toString()==null) {
+
+ throw new
SystemException("AuxiliaryComponentManager.initManager: " +
+ "Missing or unable to locate components.properties file.
Cannot continue");
+ }
+ String configFileName = urlString.getFile();
+
System.out.println("AuxiliaryComponentManager.initManager: " +
"Read config file name as: "+configFileName);


Modified:
branches/ulisseskan/src/org/perfsonar/commons/auxiliary/components/configuration/properties/PropertiesConfigurationComponent.java
===================================================================
---
branches/ulisseskan/src/org/perfsonar/commons/auxiliary/components/configuration/properties/PropertiesConfigurationComponent.java
2006-12-22 11:52:13 UTC (rev 1871)
+++
branches/ulisseskan/src/org/perfsonar/commons/auxiliary/components/configuration/properties/PropertiesConfigurationComponent.java
2006-12-26 08:54:11 UTC (rev 1872)
@@ -2,6 +2,7 @@

import java.io.File;
import java.io.FileInputStream;
+import java.net.URL;
import java.util.Properties;

import org.perfsonar.commons.auxiliary.AuxiliaryComponent;
@@ -45,8 +46,22 @@
public void initComponent() throws SystemException {

// bootstrapped absolute file location in catalina.properties file
- String fileName = System.getProperty("service.properties");
-
+ URL fileNameURL =
this.getClass().getClassLoader().getResource("perfsonar/conf/service.properties");
+
+ if(fileNameURL==null) {
+
+
System.out.println("PropertiesConfigurationComponent.initComponent:" +
+ " Missing or unable to locate service.properties file. Cannot
complete request.");
+
+ throw new
SystemException("PropertiesConfigurationComponent.initComponent:" +
+ " Missing or unable to locate service.properties file. Cannot
complete request.");
+ }
+
+ String fileName = fileNameURL.getFile();
+
+ System.out.println("PropertiesConfigurationComponent.initComponent:"
+
+ "Read the file name as: "+fileName);
+
// create a new file object with the read file name
try {

@@ -66,7 +81,6 @@
}


-
// ------------------------------------------------ public methods



Modified:
branches/ulisseskan/src/org/perfsonar/commons/auxiliary/components/simplescheduler/SchedulerTask.java
===================================================================
---
branches/ulisseskan/src/org/perfsonar/commons/auxiliary/components/simplescheduler/SchedulerTask.java
2006-12-22 11:52:13 UTC (rev 1871)
+++
branches/ulisseskan/src/org/perfsonar/commons/auxiliary/components/simplescheduler/SchedulerTask.java
2006-12-26 08:54:11 UTC (rev 1872)
@@ -27,6 +27,23 @@

}

+
+ /**
+ * This constructor is used, when some action should be run in the future
+ *
+ * @param interval interval for running action
+ * @param action action to run
+ * @param startTimestamp when should we start running action
+ */
+ public SchedulerTask(
+ long interval, SchedulerAction action, long startTimestamp) {
+
+ this(interval, action);
+
+ timestamp = startTimestamp - interval;
+
+ }
+

// ------------------------------------------------ public methods


Modified: branches/ulisseskan/src/org/perfsonar/commons/messages/Request.java
===================================================================
--- branches/ulisseskan/src/org/perfsonar/commons/messages/Request.java
2006-12-22 11:52:13 UTC (rev 1871)
+++ branches/ulisseskan/src/org/perfsonar/commons/messages/Request.java
2006-12-26 08:54:11 UTC (rev 1872)
@@ -105,7 +105,7 @@
*/
public Message execute(Message reqMessage) {

- logger.debug("Request: MessageHangler.execute()");
+ logger.debug("Request: MessageHandler.execute()");

ArrayList<Message> output = new ArrayList<Message>();

@@ -113,6 +113,8 @@

try {

+ logger.debug("Request.execute: run Service Engine for
extracted request");
+
//run service engine and add result to output list
output.add(
serviceEngine.takeAction(getType(),

Modified:
branches/ulisseskan/src/org/perfsonar/service/commons/registration/GenericServiceLSRegistrator.java
===================================================================
---
branches/ulisseskan/src/org/perfsonar/service/commons/registration/GenericServiceLSRegistrator.java
2006-12-22 11:52:13 UTC (rev 1871)
+++
branches/ulisseskan/src/org/perfsonar/service/commons/registration/GenericServiceLSRegistrator.java
2006-12-26 08:54:11 UTC (rev 1872)
@@ -60,7 +60,6 @@

}

-
// ------------------------------------------------ Public methods


@@ -91,10 +90,8 @@

Message message = getLSRegisterRequestMessage();

-
String result = XMLUtils.serializeXML(message);
//TODO: to remove
- logger.debug("GenericServiceLSRegistrator: request message:
"+result);

logger.debug("GenericServiceLSRegistrator: sending via Axis");

@@ -107,8 +104,8 @@

Document requestDocument = builder.newDocument();

requestDocument = message.getDOM(requestDocument);
- String domres = XMLUtils.serializeDOM(requestDocument);
- logger.debug("GenericServiceLSRegistrator: DOM: "+domres);
+// String domres = XMLUtils.serializeDOM(requestDocument);
+// logger.debug("GenericServiceLSRegistrator: DOM: "+domres);

logger.debug("GenericServiceLSRegistrator: Creating Axis
Client");

@@ -176,18 +173,24 @@

SystemException("error.common.lsregistrator.no_service_description",
"No service description");

- if (serviceContent==null) throw new
- SystemException("error.common.lsregistrator.no_service_content",
- "No service content");
-
Map commonParameters = serviceDescription.getServiceDescription();
- String[] metadata = serviceContent.getServiceContent();

LSRegisterRequestGenerator lsRegisterGenerator =
new LSRegisterRequestGenerator();
lsRegisterGenerator.setCommonParameters(commonParameters);
- lsRegisterGenerator.setMetadataElements(metadata);
-
+
+ if (serviceContent!=null) {
+
+ String[] metadata = serviceContent.getServiceContent();
+ lsRegisterGenerator.setMetadataElements(metadata);
+
+ }
+ else{
+ //String[] metadata = new String[1];
+ //metadata[0] = "<nmwg:metadata id=\"empty\" />";
+ lsRegisterGenerator.setMetadataElements(new String[0]);
+ }
+
Message message = lsRegisterGenerator.generateRequestMessage();

return message;

Modified:
branches/ulisseskan/src/org/perfsonar/service/commons/registration/LSRegistrationComponent.java
===================================================================
---
branches/ulisseskan/src/org/perfsonar/service/commons/registration/LSRegistrationComponent.java
2006-12-22 11:52:13 UTC (rev 1871)
+++
branches/ulisseskan/src/org/perfsonar/service/commons/registration/LSRegistrationComponent.java
2006-12-26 08:54:11 UTC (rev 1872)
@@ -127,12 +127,18 @@
logger.debug("LSRegistrationComponent.runAction: "
+ "register to LS [" + lsURL + "] with file "
+ "[" + registrationFile + "]");
+
+ ServiceLSRegistrator registrator;
+
+ if (registrationFile != null && registrationFile.length() > 0){
+ registrator = new GenericServiceLSRegistrator(
+ new PropertiesServiceDescription(),
+ new
InformationXMLFileServiceContent(registrationFile));
+ }else {
+ registrator = new GenericServiceLSRegistrator(
+ new PropertiesServiceDescription(), null);
+ }

- ServiceLSRegistrator registrator =
- new GenericServiceLSRegistrator(
- new PropertiesServiceDescription(),
- new InformationXMLFileServiceContent(registrationFile));
-
registrator.initRegistrator();

responseMessage = registrator.register(lsURL);
@@ -168,7 +174,7 @@

//get interval - parameter "component.CName.interval"
int interval = LSRegistrationComponent.DEFAULT_RUN_INTERVAL;
-
+
try {

String intervalVal = configuration.getProperty(
@@ -232,7 +238,7 @@


public void setComponentName(String name) {
-
+
componentName = name;

}

Modified:
branches/ulisseskan/src/org/perfsonar/service/lookupService/xmlType/LSAction.java
===================================================================
---
branches/ulisseskan/src/org/perfsonar/service/lookupService/xmlType/LSAction.java
2006-12-22 11:52:13 UTC (rev 1871)
+++
branches/ulisseskan/src/org/perfsonar/service/lookupService/xmlType/LSAction.java
2006-12-26 08:54:11 UTC (rev 1872)
@@ -136,7 +136,7 @@
*/
protected String getKeyFromMetadata(
Metadata requestMetadata, String keyId) {
-
+
//get Key

Key key = requestMetadata.getKey();
@@ -184,7 +184,11 @@
logger.warn("XmlTypeLSServiceEngine: error while getting " +
"parameters from Key");
}
-
+
+ //TODO: trim is temporary -- should be checked in NMWG classes!
+ if (keyValue!=null) keyValue=keyValue.trim();
+
+ //return null or trimmed value of the key
return keyValue;

}

Modified:
branches/ulisseskan/src/org/perfsonar/service/lookupService/xmlType/LSDeregisterAction.java
===================================================================
---
branches/ulisseskan/src/org/perfsonar/service/lookupService/xmlType/LSDeregisterAction.java
2006-12-22 11:52:13 UTC (rev 1871)
+++
branches/ulisseskan/src/org/perfsonar/service/lookupService/xmlType/LSDeregisterAction.java
2006-12-26 08:54:11 UTC (rev 1872)
@@ -143,13 +143,11 @@
logger.debug("XmlTypeLSServiceEngine: Removed
data="+countDataRemoved+
", metadata="+countMetadataRemoved);

- //Prepare result code (put it into the response)
- Message response = new Message();
+ //Prepare result code

- // XXX: Should there be a different type for response?
- response.setType("LSDeregisterResponse");
-
- throw new SystemException("result.success", "Removed ["+
+ if ((countDataRemoved==0) && (countMetadataRemoved==0))
+ throw new SystemException("error.ls.key_not_found", "There were
no metadata and data for key ["+keyValue+"]");
+ throw new SystemException("success.ls.deregister", "Removed ["+
countMetadataRemoved+"] metadata and ["+
countDataRemoved+"] data blocks for key ["+keyValue+"]");


Modified:
branches/ulisseskan/src/org/perfsonar/service/lookupService/xmlType/LSGenericRegisterAction.java
===================================================================
---
branches/ulisseskan/src/org/perfsonar/service/lookupService/xmlType/LSGenericRegisterAction.java
2006-12-22 11:52:13 UTC (rev 1871)
+++
branches/ulisseskan/src/org/perfsonar/service/lookupService/xmlType/LSGenericRegisterAction.java
2006-12-26 08:54:11 UTC (rev 1872)
@@ -273,8 +273,6 @@
String query =
"declare namespace
nmwg=\"http://ggf.org/ns/nmwg/base/2.0/\";; " +

"data(/nmwg:store[@type='"+LS_STORE_COLLECTION_TYPE+"']/nmwg:metadata[@id='"+key+"']/@id)";

-
-
XmlDbResult res = (XmlDbResult)xmlStorageManager.fetch(query);

int resnum = res.getCount();

Modified:
branches/ulisseskan/src/org/perfsonar/service/lookupService/xmlType/LSKeepaliveAction.java
===================================================================
---
branches/ulisseskan/src/org/perfsonar/service/lookupService/xmlType/LSKeepaliveAction.java
2006-12-22 11:52:13 UTC (rev 1871)
+++
branches/ulisseskan/src/org/perfsonar/service/lookupService/xmlType/LSKeepaliveAction.java
2006-12-26 08:54:11 UTC (rev 1872)
@@ -83,7 +83,7 @@
response.setType(request.getType());


- ResultCode rc = createResultCode("result.success", "Keepalive - Time
updated");
+ ResultCode rc = createResultCode("success.ls.keepalive", "Keepalive
- Time updated");

Metadata[] responseMetadata = { rc.getMetadata() };
Data[] responseData = null;

Modified:
branches/ulisseskan/src/org/perfsonar/service/lookupService/xmlType/LSRegisterAction.java
===================================================================
---
branches/ulisseskan/src/org/perfsonar/service/lookupService/xmlType/LSRegisterAction.java
2006-12-22 11:52:13 UTC (rev 1871)
+++
branches/ulisseskan/src/org/perfsonar/service/lookupService/xmlType/LSRegisterAction.java
2006-12-26 08:54:11 UTC (rev 1872)
@@ -85,13 +85,20 @@
accessPoint = ((org.ggf.ns.nmwg.tools.org.perfsonar.v1_0.Subject)
requestMetadata.getSubject()).getService().
getAccessPoint().getAccessPoint();
+
+ accessPoint = accessPoint.trim();
+
} catch (RuntimeException e) {
logger.debug("LSRegisterAction: no accessPoint");
}

//Try to get Key from Metadata

+
String keyValue = getKeyFromMetadata(requestMetadata, LS_KEY);
+
+ if (keyValue != null) keyValue = keyValue.trim(); //TODO: trim is
temporary
+
logger.debug("LSRegisterAction: LS key=["+keyValue+"]");


@@ -99,7 +106,6 @@
//========check metadata========


-
//check keyValue

if (keyValue == null) { //REGISTER
@@ -116,7 +122,7 @@
allowReplaceIfAlreadyRegistered = true;

//but check the key if it's already been in the DB
- if (checkIfKeyIsRegistered(keyValue, xmlStorageManager)) {
+ if (!checkIfKeyIsRegistered(keyValue, xmlStorageManager)) {

String m = "LSRegisterAction: key from request [" + keyValue
+
"] not found in the storage. " +
@@ -126,6 +132,10 @@

}

+ //remove key element from metadata
+ requestMetadata.setKey(null);
+
+
}

// check keyValue again, it may be accessPoint now
@@ -180,7 +190,15 @@
+keyValue+"']\" />\n" +
"<xu:remove
select=\"/nmwg:store[@type='"+LS_STORE_COLLECTION_TYPE+"']/nmwg:data[@metadataIdRef='"
+keyValue+"']\" />\n";
-
+
+ //if update key, keyvalue contains old key, accessPoint new
one
+ //but we must delete also old control information

+ if (!keyValue.equals(accessPoint)) {
+ logger.debug("LSRegisterAction: remove control
information for old key (DB key was changed)");
+ removeUpdate=removeUpdate+
+ "<xu:remove
select=\"/nmwg:store[@type='"+LS_STORE_CONTROL_COLLECTION_TYPE+"']/nmwg:metadata[@id='"
+ +keyValue+"']\" />\n";
+ }

} else {

@@ -269,13 +287,13 @@


//update control time - last modification
- updateTime(keyValue, xmlStorageManager); //TODO: change
xmlStorageManager to LSstorage-control
+ updateTime(accessPoint /*keyValue*/, xmlStorageManager); //TODO:
change xmlStorageManager to LSstorage-control

//return Key
// xpath:////nmwg:metadata/nmwg:key/
//
nmwg:parameters:/nmwg:parameter[@id="lsKey"]

- ResultCode rc = createResultCode("result.success",
+ ResultCode rc = createResultCode("success.ls.register",
"Data has been registered with key ["+keyValue+"]");

rc.getMetadata().setKey( createLSKey(keyValue) );

Modified:
branches/ulisseskan/src/org/perfsonar/service/measurementArchive/eventTypeConfig/EventTypeConfigurationComponent.java
===================================================================
---
branches/ulisseskan/src/org/perfsonar/service/measurementArchive/eventTypeConfig/EventTypeConfigurationComponent.java
2006-12-22 11:52:13 UTC (rev 1871)
+++
branches/ulisseskan/src/org/perfsonar/service/measurementArchive/eventTypeConfig/EventTypeConfigurationComponent.java
2006-12-26 08:54:11 UTC (rev 1872)
@@ -39,9 +39,9 @@



- private String digesterRules = "eventType-rules.xml";
+ private String digesterRules = "perfsonar/conf/eventType-rules.xml";

- private String digesterInput = "eventType-map.xml";
+ private String digesterInput = "perfsonar/conf/eventType-map.xml";

private String componentName = null;


Modified:
branches/ulisseskan/src/org/perfsonar/service/measurementPoint/commandLine/CommandLineAction.java
===================================================================
---
branches/ulisseskan/src/org/perfsonar/service/measurementPoint/commandLine/CommandLineAction.java
2006-12-22 11:52:13 UTC (rev 1871)
+++
branches/ulisseskan/src/org/perfsonar/service/measurementPoint/commandLine/CommandLineAction.java
2006-12-26 08:54:11 UTC (rev 1872)
@@ -82,7 +82,7 @@

public Message makeMeasurement(
Message reqMess
- ) throws SystemException, RequestException{
+ ) throws SystemException, RequestException {

if (!reqMess.getType().equals("MeasurementRequest")) {
logger.error(
@@ -90,7 +90,7 @@
": UNSUPPORTED: Can only handle MeasurementRequest
message"
);
throw new RequestException(
- "error.mp.clmp.validator.unsuported_message_type",
+ "error.mp.clmp.validator.malformed_request",
ME_TYPE +
": UNSUPPORTED: Can only handle MeasurementRequest
message"
);
@@ -112,7 +112,7 @@
": Request must have at least one
EventType defined in at least one MetaData."
);
throw new RequestException(
-
"error.mp.clmp.validator.no_metadata_eventType",
+
"error.mp.clmp.validator.malformed_request",
ME_TYPE +
": Request must have at least one
EventType defined in at least one MetaData."
);

Copied:
branches/ulisseskan/src/org/perfsonar/service/measurementPoint/commandLine/CommandLineResourceProtector.java
(from rev 1849,
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/commandLine/CommandLineResourceProtector.java)

Modified:
branches/ulisseskan/src/org/perfsonar/service/measurementPoint/commandLine/CommandLineToolBundle.java
===================================================================
---
branches/ulisseskan/src/org/perfsonar/service/measurementPoint/commandLine/CommandLineToolBundle.java
2006-12-22 11:52:13 UTC (rev 1871)
+++
branches/ulisseskan/src/org/perfsonar/service/measurementPoint/commandLine/CommandLineToolBundle.java
2006-12-26 08:54:11 UTC (rev 1872)
@@ -63,5 +63,5 @@
* and returns the result.
*/
public Message runTool(Message reqMessage)
- throws
SystemException,ResourceException,DataFormatException,RequestException;
+ throws SystemException,RequestException;
}

Modified:
branches/ulisseskan/src/org/perfsonar/service/measurementPoint/commandLine/CommandLineToolBundleFactory.java
===================================================================
---
branches/ulisseskan/src/org/perfsonar/service/measurementPoint/commandLine/CommandLineToolBundleFactory.java
2006-12-22 11:52:13 UTC (rev 1871)
+++
branches/ulisseskan/src/org/perfsonar/service/measurementPoint/commandLine/CommandLineToolBundleFactory.java
2006-12-26 08:54:11 UTC (rev 1872)
@@ -133,7 +133,7 @@
"because of IllegalAccessException: " +
e.getMessage());
throw new SystemException(
- "error.mp.clmp.toolFactory.illegal_access",
+ "error.mp.clmp.toolFactory.cant_instantiate",
"CommandLineToolBundleFactory: Unable to Instantiate " +
"ToolBundle for: " + eventString +
"because of IllegalAccessException: " +
@@ -146,7 +146,7 @@
"create ToolBundle for: " + eventString +
" because: " + e.getMessage());
throw new SystemException(
- "error.mp.clmp.toolFactory.no_class",
+ "error.mp.clmp.toolFactory.cant_instantiate",
"CommandLineToolBundleFactory: Unable to " +
"create ToolBundle for: " + eventString +
" because: " + e.getMessage());

Modified:
branches/ulisseskan/src/org/perfsonar/service/measurementPoint/commandLine/tools/Bwctl.java
===================================================================
---
branches/ulisseskan/src/org/perfsonar/service/measurementPoint/commandLine/tools/Bwctl.java
2006-12-22 11:52:13 UTC (rev 1871)
+++
branches/ulisseskan/src/org/perfsonar/service/measurementPoint/commandLine/tools/Bwctl.java
2006-12-26 08:54:11 UTC (rev 1872)
@@ -42,6 +42,7 @@
import
org.perfsonar.commons.auxiliary.components.configuration.ConfigurationComponent;
import org.perfsonar.commons.auxiliary.components.logger.LoggerComponent;
import org.perfsonar.service.measurementPoint.commandLine.CommandLineExec;
+import
org.perfsonar.service.measurementPoint.commandLine.CommandLineResourceProtector;
import
org.perfsonar.service.measurementPoint.commandLine.CommandLineToolBundle;

public class Bwctl implements CommandLineToolBundle{
@@ -51,7 +52,8 @@
private Hashtable toolOptions = null;

protected LoggerComponent logger = null;
-
+ protected CommandLineResourceProtector protector = null;
+
public String getToolBundleName(){
return "Bwctl";
}
@@ -103,11 +105,11 @@
else {
logger.fatal(
CNAME +
- ": UNSUPPORTED: Must to have at least one
Subject defined in at least one MetaData currently"
+ ": UNSUPPORTED: Must have at least one Subject
defined in at least one MetaData currently"
);
- throw new RequestException(
+ throw new
RequestException("error.mp.clmp.validator.malformed_request",
CNAME +
- ": UNSUPPORTED: Must to have at least one
Subject defined in at least one MetaData currently"
+ ": UNSUPPORTED: Must have at least one Subject
defined in at least one MetaData currently"
);
}
}
@@ -116,11 +118,11 @@
if(subject == null){
logger.fatal(
CNAME +
- ": UNSUPPORTED: Must to have at least one Subject
defined in at least one MetaData currently"
+ ": UNSUPPORTED: Must have at least one Subject defined
in at least one MetaData currently"
);
- throw new RequestException(
+ throw new
RequestException("error.mp.clmp.validator.malformed_request",
CNAME +
- ": UNSUPPORTED: Must to have at least one Subject
defined in at least one MetaData currently"
+ ": UNSUPPORTED: Must have at least one Subject defined
in at least one MetaData currently"
);
}

@@ -205,9 +207,18 @@
String[] parametersList = new String[cmd.size()];
cmd.toArray(parametersList);

+ // Estimate timeout
+ int duration = 10;
+
+ p = params.getParameterByName("duration");
+ if(p != null)
+ duration = Integer.parseInt(p.getParameterValue());
+
+ System.out.println(cmd.toString() + "\nEstimated timeout:
"+((duration*1000)+30000));
+
// TODO: make timeout an option somehow
// timeout - 30 seconds
- cl.run_synchronous(30000, parametersList);
+ protector.run(cl, (duration*1000)+30000, parametersList);

datums = parseResults(cl);

/*for (int i = 0; i < datums.length; i++) {
@@ -219,11 +230,19 @@
CNAME + "Unable to execute command: " + "bwctl" + ": "
+ t.getMessage()
);
- throw new SystemException(
+ throw new SystemException("error.mp.clmp.exec",
CNAME + "Unable to execute command: " + "bwctl" + ": "
+ t.getMessage(),
t
);
+ }catch (NumberFormatException e){
+ logger.fatal(
+ CNAME + ": Parameters count and interval must be
integers."
+ );
+ throw new
SystemException("error.mp.clmp.validator.malformed_request",
+ CNAME + ": Parameter duration must be an integer.",
+ e
+ );
}

/*
@@ -243,6 +262,10 @@
Parameter p = null;

for (int j = 0; j < metadata.length; j++) {
+
+ if (metadata[j].getSubject() != null)
+ respMess.addChild(metadata[j]);
+
params = metadata[j].getParameters();
p = null;
if (params != null) {
@@ -471,7 +494,8 @@
public Bwctl() throws SystemException{

logger =
(LoggerComponent)AuxiliaryComponentManager.getInstance().getComponent(ComponentNames.LOGGER);
-
+ protector =
(CommandLineResourceProtector)AuxiliaryComponentManager.getInstance().getComponent("clmprp");
+
toolOptions = new Hashtable();
/*
* toolOptions

Modified:
branches/ulisseskan/src/org/perfsonar/service/measurementPoint/commandLine/tools/Owamp.java
===================================================================
---
branches/ulisseskan/src/org/perfsonar/service/measurementPoint/commandLine/tools/Owamp.java
2006-12-22 11:52:13 UTC (rev 1871)
+++
branches/ulisseskan/src/org/perfsonar/service/measurementPoint/commandLine/tools/Owamp.java
2006-12-26 08:54:11 UTC (rev 1872)
@@ -41,6 +41,7 @@
import
org.perfsonar.commons.auxiliary.components.configuration.ConfigurationComponent;
import org.perfsonar.commons.auxiliary.components.logger.LoggerComponent;
import org.perfsonar.service.measurementPoint.commandLine.CommandLineExec;
+import
org.perfsonar.service.measurementPoint.commandLine.CommandLineResourceProtector;
import
org.perfsonar.service.measurementPoint.commandLine.CommandLineToolBundle;

public class Owamp implements CommandLineToolBundle{
@@ -50,7 +51,7 @@
private Hashtable toolOptions = null;

protected LoggerComponent logger = null;
-
+ protected CommandLineResourceProtector protector = null;

public String getToolBundleName(){
return "Owamp";
@@ -81,7 +82,7 @@
logger.fatal(
CNAME + "Unsupported: request can only have one Metadata"
);
- throw new SystemException(
+ throw new
SystemException("error.mp.clmp.validator.malformed_request",
CNAME + "Unsupported: request can only have one Metadata"
);
}
@@ -115,7 +116,22 @@
// TODO: Check config for cmd name
cmd.add("owping");
cmd.add("-R");
-
+
+ if (params != null) {
+ p = params.getParameterByName("direction");
+ if(p != null){
+ if
(p.getParameterValue().toLowerCase().equals("from"))
+ cmd.add("-f");
+ else if
(p.getParameterValue().toLowerCase().equals("to")) {
+ cmd.add("-t");
+ } else
+ //throw exception
+ ;
+ } else {
+ //default both directions test
+ }
+ }
+
cmd = cl.checkParameters(cmd, params, toolOptions);

// Check for dst addr
@@ -125,16 +141,23 @@
else{
cmd.add(dst.getValue());
}
-
+
// Now execute
String[] parametersList = new String[cmd.size()];
cmd.toArray(parametersList);

- System.out.println(cmd.toString());
+ // Estimate timeout
+ int count = 100;

+ p = params.getParameterByName("count");
+ if(p != null)
+ count = Integer.parseInt(p.getParameterValue());
+
+ System.out.println(cmd.toString() + "\nEstimated timeout:
"+((count*2000)+30000));
+
// TODO: make timeout an option somehow
// timeout - 30 seconds
- cl.run_synchronous(30000, parametersList);
+ protector.run(cl, (count*2000)+30000, parametersList);

datums = parseResults(cl);

/*for (int i = 0; i < datums.length; i++) {
@@ -146,11 +169,19 @@
CNAME + "Unable to execute command: " + "owamp" + ": "
+ t.getMessage()
);
- throw new SystemException(
+ throw new SystemException("error.mp.clmp.exec",
CNAME + "Unable to execute command: " + "owamp" + ": "
+ t.getMessage(),
t
);
+ }catch (NumberFormatException e){
+ logger.fatal(
+ CNAME + ": Parameters count and interval must be
integers."
+ );
+ throw new
SystemException("error.mp.clmp.validator.malformed_request",
+ CNAME + ": Parameter count must be an integer.",
+ e
+ );
}

/*
@@ -164,7 +195,7 @@
Message respMess = null;

respMess = new Message();
- respMess.setType("MeasurementArchiveStoreRequest");
+ respMess.setType("MeasurementResponse");

Data data = new Data();
data.setId("data1");
@@ -250,7 +281,8 @@
public Owamp() throws SystemException{

logger =
(LoggerComponent)AuxiliaryComponentManager.getInstance().getComponent(ComponentNames.LOGGER);
-
+ protector =
(CommandLineResourceProtector)AuxiliaryComponentManager.getInstance().getComponent("clmprp");
+
toolOptions = new Hashtable();
/*
* toolOptions
@@ -264,7 +296,6 @@
toolOptions.put("timeOut","-L:");
toolOptions.put("padding","-s:");
toolOptions.put("delayStart","-z:");
- toolOptions.put("fromTestHost","-f:novalue");
- toolOptions.put("toTestHost","-t:novalue");
+ toolOptions.put("portRange","-P:");
}
}

Modified:
branches/ulisseskan/src/org/perfsonar/service/measurementPoint/commandLine/tools/Ping.java
===================================================================
---
branches/ulisseskan/src/org/perfsonar/service/measurementPoint/commandLine/tools/Ping.java
2006-12-22 11:52:13 UTC (rev 1871)
+++
branches/ulisseskan/src/org/perfsonar/service/measurementPoint/commandLine/tools/Ping.java
2006-12-26 08:54:11 UTC (rev 1872)
@@ -41,6 +41,7 @@
import
org.perfsonar.commons.auxiliary.components.configuration.ConfigurationComponent;
import org.perfsonar.commons.auxiliary.components.logger.LoggerComponent;
import org.perfsonar.service.measurementPoint.commandLine.CommandLineExec;
+import
org.perfsonar.service.measurementPoint.commandLine.CommandLineResourceProtector;
import
org.perfsonar.service.measurementPoint.commandLine.CommandLineToolBundle;

public class Ping implements CommandLineToolBundle{
@@ -48,9 +49,11 @@
static private final String CNAME="PingCommandLineToolBundle";

private Hashtable toolOptions = null;
+ private String OS = null;

protected LoggerComponent logger = null;
-
+ protected CommandLineResourceProtector protector = null;
+

public String getToolBundleName(){
return "Ping";
@@ -81,7 +84,7 @@
logger.fatal(
CNAME + "Unsupported: request can only have one Metadata"
);
- throw new SystemException(
+ throw new
SystemException("error.mp.clmp.validator.malformed_request",
CNAME + "Unsupported: request can only have one Metadata"
);
}
@@ -125,8 +128,13 @@

// Check for src addr
if((src != null) && !src.getValue().equals("*")){
-
- cmd.add("-I " + src.getValue());
+ if (OS.indexOf("linux") > -1) {
+ cmd.add("-I");
+ cmd.add(src.getValue());
+ } else if (OS.indexOf("freebsd") > -1) {
+ cmd.add("-S ");
+ cmd.add(src.getValue());
+ }
}

cmd = cl.checkParameters(cmd, params, toolOptions);
@@ -138,32 +146,50 @@
else{
cmd.add(dst.getValue());
}
-
+
// Now execute
String[] parametersList = new String[cmd.size()];
cmd.toArray(parametersList);

- System.out.println(cmd.toString());
+ // Estimate timeout
+ int count = 10, interval = 1;

+ p = params.getParameterByName("count");
+ if(p != null)
+ count = Integer.parseInt(p.getParameterValue());
+
+ p = params.getParameterByName("interval");
+ if(p != null)
+ interval = Integer.parseInt(p.getParameterValue());
+
+ System.out.println(cmd.toString() + "\nEstimated timeout:
"+((count*interval*1000)+30000));
+
// TODO: make timeout an option somehow
// timeout - 30 seconds
- cl.run_synchronous(30000, parametersList);
+ protector.run(cl, (count*interval*1000)+30000,
parametersList);
datums = parseResults(cl);

/*for (int i = 0; i < datums.length; i++) {
System.out.println(datums[i].toString());
}*/
- }
- catch (java.io.IOException t){
+ }catch (java.io.IOException t){
logger.fatal(
CNAME + "Unable to execute command: " + "ping" + ": "
+ t.getMessage()
);
- throw new SystemException(
+ throw new SystemException("error.mp.clmp.exec",
CNAME + "Unable to execute command: " + "ping" + ": "
+ t.getMessage(),
t
);
+ }catch (NumberFormatException e){
+ logger.fatal(
+ CNAME + ": Parameters count and interval must be
integers."
+ );
+ throw new
SystemException("error.mp.clmp.validator.malformed_request",
+ CNAME + ": Parameters count and interval must be
integers.",
+ e
+ );
}

/*
@@ -177,7 +203,7 @@
Message respMess = null;

respMess = new Message();
- respMess.setType("MeasurementArchiveStoreRequest");
+ respMess.setType("MeasurementResponse");

Data data = new Data();
data.setId("data1");
@@ -216,8 +242,7 @@
Matcher matcher = null;
while( (line = br.readLine()) != null){
matcher = datumPattern.matcher(line);
- //System.out.println(line);
- if (matcher.matches()) {
+ if (matcher.matches()) {

numBytes = matcher.group(1);
numBytesUnits = matcher.group(2);
@@ -226,13 +251,6 @@
value = matcher.group(5);
valueUnits = matcher.group(6);

- /*System.out.println(numBytes + " " +
- numBytesUnits + "
" +
- seqNum + " " +
- ttl + " " +
- value + " " +
- valueUnits);*/
-
datum = new Datum();
datum.setNumBytes(numBytes);
datum.setNumBytesUnits(numBytesUnits);
@@ -263,17 +281,28 @@
public Ping() throws SystemException{

logger =
(LoggerComponent)AuxiliaryComponentManager.getInstance().getComponent(ComponentNames.LOGGER);
-
+ protector =
(CommandLineResourceProtector)AuxiliaryComponentManager.getInstance().getComponent("clmprp");
+
+ this.OS = System.getProperty("os.name").toLowerCase();
+
toolOptions = new Hashtable();
/*
* toolOptions
* KEY= parameter name
* VALUE= string containing [command line option]:[default value
(if any)]
*/
- toolOptions.put("count","-c:10");
- toolOptions.put("interval","-i:");
- toolOptions.put("deadline","-w:");
- toolOptions.put("packetSize","-s:");
- toolOptions.put("ttl","-t:");
+ if (OS.indexOf("linux") > -1) {
+ toolOptions.put("count","-c:10");
+ toolOptions.put("interval","-i:");
+ toolOptions.put("deadline","-w:");
+ toolOptions.put("packetSize","-s:");
+ toolOptions.put("ttl","-t:");
+ } else if (OS.indexOf("freebsd") > -1) {
+ toolOptions.put("count","-c:10");
+ toolOptions.put("interval","-i:");
+ toolOptions.put("deadline","-t:");
+ toolOptions.put("packetSize","-s:");
+ toolOptions.put("ttl","-m:");
+ }
}
}

Modified:
branches/ulisseskan/src/org/perfsonar/service/measurementPoint/commandLine/tools/Traceroute.java
===================================================================
---
branches/ulisseskan/src/org/perfsonar/service/measurementPoint/commandLine/tools/Traceroute.java
2006-12-22 11:52:13 UTC (rev 1871)
+++
branches/ulisseskan/src/org/perfsonar/service/measurementPoint/commandLine/tools/Traceroute.java
2006-12-26 08:54:11 UTC (rev 1872)
@@ -41,6 +41,7 @@
import
org.perfsonar.commons.auxiliary.components.configuration.ConfigurationComponent;
import org.perfsonar.commons.auxiliary.components.logger.LoggerComponent;
import org.perfsonar.service.measurementPoint.commandLine.CommandLineExec;
+import
org.perfsonar.service.measurementPoint.commandLine.CommandLineResourceProtector;
import
org.perfsonar.service.measurementPoint.commandLine.CommandLineToolBundle;

public class Traceroute implements CommandLineToolBundle{
@@ -48,8 +49,10 @@
static private final String CNAME="TracerouteCommandLineToolBundle";

private Hashtable toolOptions = null;
+ private String OS = null;

protected LoggerComponent logger = null;
+ protected CommandLineResourceProtector protector = null;

private int numQueries;

@@ -106,37 +109,23 @@

Parameters params = mdArr[0].getParameters();
Parameter p = null;
-
- numQueries = 3;
- if (params != null) {
- p = params.getParameterByName("numQueries");
- if(p != null){
- numQueries = Integer.parseInt(p.getParameterValue());
- }
- }
-
/*
* Build cmd array
*/
ArrayList cmd = new ArrayList();
Datum[] datums = null;
-
try{
- CommandLineExec cl = new CommandLineExec("traceroute");
+ CommandLineExec cl = new CommandLineExec("traceroute");
// cmd itself
// TODO: Check config for cmd name
cmd.add("traceroute");
cmd.add("-n");
- cmd.add("-l");
+ if (OS.indexOf("linux") > -1) {
+ cmd.add("-l");
+ }

// Check for src addr
- /*if((src != null) && !src.getValue().equals("*")){
-
- cmd.add("-s " + src.getValue());
- }*/
-
cmd = cl.checkParameters(cmd, params, toolOptions);
-
// Check for dst addr
if(dst == null){
//TODO: throw request exception
@@ -144,12 +133,17 @@
else{
cmd.add(dst.getValue());
}
-
if (params != null) {
p = params.getParameterByName("packetSize");
if(p != null){
cmd.add(p.getParameterValue());
}
+ p = params.getParameterByName("numQueries");
+ if(p != null){
+ this.numQueries =
Integer.parseInt(p.getParameterValue());
+ } else {
+ this.numQueries = 3;
+ }
}

// Now execute
@@ -160,7 +154,7 @@

// TODO: make timeout an option somehow
// timeout - 30 seconds
- cl.run_synchronous(30000, parametersList);
+ protector.run(cl, 60000, parametersList);
datums = parseResults(cl);

}
@@ -169,7 +163,7 @@
CNAME + "Unable to execute command: " + "traceroute" +
": "
+ t.getMessage()
);
- throw new SystemException(
+ throw new SystemException("error.mp.clmp.exec",
CNAME + "Unable to execute command: " + "traceroute" +
": "
+ t.getMessage(),
t
@@ -187,7 +181,7 @@
Message respMess = null;

respMess = new Message();
- respMess.setType("MeasurementArchiveStoreRequest");
+ respMess.setType("MeasurementResponse");

Data data = new Data();
data.setId("data1");
@@ -203,12 +197,14 @@
}

private Datum[] parseResults(CommandLineExec cle) {
+
String datumRegex =
"[^0-9]*([0-9]*)[^0-9]*(([0-9]{1,3}\\.){3}([0-9]{1,3}))";
- String datumQueryRegex =
"([^0-9]*([0-9\\.]*)[^a-zA-Z]*([a-zA-Z]*)[^\\(]*\\(([0-9]*)\\))?";
+ String datumQueryRegex =
"(([^0-9]*([0-9\\.]*)[^a-zA-Z]*([a-zA-Z]*)([^\\(]*\\(([0-9]*)\\))?)?|\\*)";
+
String hopMaxRegex = "[^\\,]*\\, ([0-9]*)[^\\,]*\\, ([0-9]*)
([a-zA-Z]*).*";
-
- for (int i = 0; i < numQueries; i++)
+ for (int i = 0; i < this.numQueries; i++)
datumRegex += datumQueryRegex;
+ datumRegex += ".*";

Pattern datumPattern = Pattern.compile(datumRegex);
Pattern hopMaxPattern = Pattern.compile(hopMaxRegex);
@@ -226,7 +222,6 @@
ArrayList datumList = new ArrayList();

try{
-
Datum datum = null;

String line = null;
@@ -236,8 +231,11 @@
InputStreamReader eisr = new InputStreamReader(efis);
BufferedReader ebr = new BufferedReader(eisr);

+
if ((line = ebr.readLine()) != null){
- System.out.println(line);
+ if (line.matches(".*multiple addresses.*"))
+ line = ebr.readLine();
+
matcher = hopMaxPattern.matcher(line);
if (matcher.matches()) {
hopMax = matcher.group(1);
@@ -249,34 +247,45 @@
FileInputStream fis = new FileInputStream(cle.getOsFile());
InputStreamReader isr = new InputStreamReader(fis);
BufferedReader br = new BufferedReader(isr);
-
+
while( (line = br.readLine()) != null){
matcher = datumPattern.matcher(line);
- System.out.println(line);
- if (matcher.matches()) {
-
+
+ if (matcher.matches()) {
seqNum = matcher.group(1);
hop =
matcher.group(2);

for (int i = 0; i < numQueries; i++) {
queryNum = String.valueOf(i +
1);
- value = matcher.group(6 +
(4*i));
- ttl =
matcher.group(7 + (4*i));
- valueUnits = matcher.group(6 +
(4*i));
-
- datum = new Datum();
- datum.setSeqNum(seqNum);
- datum.setHop(hop);
- datum.setHopMax(hopMax);
- datum.setTTL(ttl);
- datum.setQueryNum(queryNum);
- datum.setNumBytes(numBytes);
- datum.setNumBytesUnits(numBytesUnits);
- datum.setValue(value);
- datum.setValueUnits(valueUnits);
- datum.setTimeType("unix");
-
datum.setTimeValue(String.valueOf(System.currentTimeMillis()));
- datumList.add(datum);
+ value = matcher.group(7 +
(6*i));
+ valueUnits = matcher.group(8 +
(6*i));
+ ttl =
matcher.group(10 + (6*i));
+ if (value.length() > 0) {
+ datum = new Datum();
+ datum.setSeqNum(seqNum);
+ datum.setHop(hop);
+ datum.setHopMax(hopMax);
+ if (OS.indexOf("linux") > -1)
{
+ if (ttl != null) {
+ if
(ttl.length() > 0) {
+
datum.setTTL(ttl);
+ } else {
+
datum.setTTL("");
+ }
+ } else {
+
datum.setTTL("");
+ }
+ } else
+ datum.setTTL("");

+ datum.setQueryNum(queryNum);
+ datum.setNumBytes(numBytes);
+
datum.setNumBytesUnits(numBytesUnits);
+ datum.setValue(value);
+
datum.setValueUnits(valueUnits);
+ datum.setTimeType("unix");
+
datum.setTimeValue(String.valueOf(System.currentTimeMillis()));
+ datumList.add(datum);
+ }
}
}
}
@@ -298,7 +307,10 @@
public Traceroute() throws SystemException{

logger =
(LoggerComponent)AuxiliaryComponentManager.getInstance().getComponent(ComponentNames.LOGGER);
-
+ protector =
(CommandLineResourceProtector)AuxiliaryComponentManager.getInstance().getComponent("clmprp");
+
+ this.OS = System.getProperty("os.name").toLowerCase();
+
toolOptions = new Hashtable();
/*
* toolOptions
@@ -313,6 +325,6 @@
toolOptions.put("icmp","-I:novalue");
toolOptions.put("port","-p:");
toolOptions.put("tos","-t:");
- toolOptions.put("numQueries","-q:");
+ toolOptions.put("numQueries","-q:3");
}
}

Copied:
branches/ulisseskan/src/org/perfsonar/service/measurementPoint/flowType (from
rev 1849, trunk/perfsonar/src/org/perfsonar/service/measurementPoint/flowType)

Deleted:
branches/ulisseskan/src/org/perfsonar/service/measurementPoint/flowType/FlowTypeMERequestTypes.java

Copied:
branches/ulisseskan/src/org/perfsonar/service/measurementPoint/flowType/FlowTypeMERequestTypes.java
(from rev 1849,
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/flowType/FlowTypeMERequestTypes.java)

Deleted:
branches/ulisseskan/src/org/perfsonar/service/measurementPoint/flowType/FlowTypeMPServiceEngine.java

Copied:
branches/ulisseskan/src/org/perfsonar/service/measurementPoint/flowType/FlowTypeMPServiceEngine.java
(from rev 1849,
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/flowType/FlowTypeMPServiceEngine.java)

Copied:
branches/ulisseskan/src/org/perfsonar/service/measurementPoint/flowType/keepalive
(from rev 1849,
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/flowType/keepalive)

Deleted:
branches/ulisseskan/src/org/perfsonar/service/measurementPoint/flowType/keepalive/KeepAliveThread.java

Copied:
branches/ulisseskan/src/org/perfsonar/service/measurementPoint/flowType/keepalive/KeepAliveThread.java
(from rev 1849,
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/flowType/keepalive/KeepAliveThread.java)

Modified:
branches/ulisseskan/src/org/perfsonar/service/measurementPoint/tracefileCaptureType/TCMPTypeMeasurementExecutor.java
===================================================================
---
branches/ulisseskan/src/org/perfsonar/service/measurementPoint/tracefileCaptureType/TCMPTypeMeasurementExecutor.java
2006-12-22 11:52:13 UTC (rev 1871)
+++
branches/ulisseskan/src/org/perfsonar/service/measurementPoint/tracefileCaptureType/TCMPTypeMeasurementExecutor.java
2006-12-26 08:54:11 UTC (rev 1872)
@@ -27,6 +27,9 @@
import org.perfsonar.commons.auxiliary.ComponentNames;
import
org.perfsonar.commons.auxiliary.components.configuration.ConfigurationComponent;
import org.perfsonar.commons.auxiliary.components.logger.LoggerComponent;
+import org.perfsonar.commons.auxiliary.components.simplescheduler.Scheduler;
+import
org.perfsonar.commons.auxiliary.components.simplescheduler.SchedulerAction;
+import
org.perfsonar.commons.auxiliary.components.simplescheduler.SchedulerTask;

import org.perfsonar.service.commons.measurementExecutor.MeasurementExecutor;

@@ -64,7 +67,7 @@
* @author urosj
*/

-public class TCMPTypeMeasurementExecutor implements MeasurementExecutor,
Runnable {
+public class TCMPTypeMeasurementExecutor implements MeasurementExecutor,
SchedulerAction {


// ---------------------------------- class fields
@@ -88,8 +91,7 @@

private static HashSet<String> localHostsIPs = null;

- private TCMPTypeMeasurementExecutor parent = null;
- private int threadCount = 0;
+ private boolean runnedAlready = false;


// ---------------------------------- constructors
@@ -106,14 +108,12 @@
* Private constructor used by makeMeasurement to run this
* object in a new thread.
*
- * @param parent Parent TCMPTypeMeasurementExecutor object
* @param request Filled by makeMeasurement
* @param capIf Interface to capture from (@see CaptureInterface)
*/
- private TCMPTypeMeasurementExecutor(TCMPTypeMeasurementExecutor parent,
+ private TCMPTypeMeasurementExecutor(
TCMPTypeMeasurementRequest request, CaptureInterface capIf) {

- this.parent = parent;
this.request = request;
this.capIf = capIf;

@@ -179,32 +179,43 @@
// Throw either SystemException on RequestException if validation
fails
TCMPTypeMeasurementRequest req = validateTCMPRequest(request);

- // Create new Thread of myself for first interface or both
- // depending on second endPoint host
- this.threadCount = 0;
+ // Create one or more Measurement executors
+ // (first or both interfaces)
+ // and pass them to the scheduler.
+ Scheduler scheduler = (Scheduler)
+
AuxiliaryComponentManager.getInstance().getComponent("scheduler");
+
+ if (scheduler == null)
+
+ throw new SystemException(
+ "error.common.no_scheduler",
+ "No scheduler component in TCMPTypeMeasurementExecutor");
+
if (req.getSecondEndPointHost() == null) {
- new Thread(new TCMPTypeMeasurementExecutor(this, req,
- CaptureInterface.FIRST)).start();
- // Wait for thread to start
- while (this.threadCount < 1)
- try { Thread.sleep(50); } catch (Exception e) { }
- // Notify thread to start
- synchronized (this) {
- notifyAll();
- }
+
+ scheduler.addSchedulerTask(
+ new SchedulerTask(
+ 0,
+ new TCMPTypeMeasurementExecutor(req,
CaptureInterface.FIRST),
+ req.getStartTimeParam().getTime()));
+ logger.info(type + ".makeMeasurement: Scheduled start of 1
measurement at "
+ + req.getStartTimeParam());
+
} else {
- // Make synchronous start
- new Thread(new TCMPTypeMeasurementExecutor(this, req,
- CaptureInterface.FIRST)).start();
- new Thread(new TCMPTypeMeasurementExecutor(this, req,
- CaptureInterface.SECOND)).start();
- // Wait for threads to start
- while (this.threadCount < 2)
- try { Thread.sleep(50); } catch (Exception e) { }
- // Notify all threads to start
- synchronized (this) {
- notifyAll();
- }
+
+ scheduler.addSchedulerTask(
+ new SchedulerTask(
+ 0,
+ new TCMPTypeMeasurementExecutor(req,
CaptureInterface.FIRST),
+ req.getStartTimeParam().getTime()));
+ scheduler.addSchedulerTask(
+ new SchedulerTask(
+ 0,
+ new TCMPTypeMeasurementExecutor(req,
CaptureInterface.SECOND),
+ req.getStartTimeParam().getTime()));
+ logger.info(type + ".makeMeasurement: Scheduled start of 2
measurements at "
+ + req.getStartTimeParam());
+
}

// Construct a generic OK response, with URL to resulted data,
@@ -258,7 +269,9 @@
new org.ggf.ns.nmwg.base.v2_0.Datum();
firstData.setDatum(dDatum);
mdEventType.setEventType("success.mp.tcmp");
- dDatum.setDatum("Successfully initiated " + this.threadCount
+ dDatum.setDatum(
+ "Initiated "
+ + (req.getSecondEndPointHost() == null ? 1 : 2)
+ " capture(s).");

logger.info(type + ": Returning a response");
@@ -268,30 +281,38 @@
}

/**
- * Implementation of Runnable interface.
+ * Implementation of SchedulerAction interface.
* This methods starts executing in a new thread.
*/
- public void run() {
+ public void runAction() {

- // Wait for all threads to startup
- try {
- synchronized (parent) {
- parent.threadCount++;
- parent.wait();
- }
- } catch (Exception e) { parent.threadCount++; }
+ if (runnedAlready) return;

- // If request is null, then wrong constructor was called
- // from outside?
- // If so, return immediately!
- if (this.request == null) return;
+ runnedAlready = true;

+
try {

- this.logger =
(LoggerComponent)AuxiliaryComponentManager.getInstance().getComponent(ComponentNames.LOGGER);
+ this.logger = (LoggerComponent)
+
AuxiliaryComponentManager.getInstance().getComponent(ComponentNames.LOGGER);

- this.configuration =
(ConfigurationComponent)AuxiliaryComponentManager.getInstance().getComponent(ComponentNames.CONFIG);
+ this.configuration = (ConfigurationComponent)
+
AuxiliaryComponentManager.getInstance().getComponent(ComponentNames.CONFIG);

+ Scheduler scheduler = (Scheduler)
+
AuxiliaryComponentManager.getInstance().getComponent("scheduler");
+
+ if (scheduler == null)
+
+ throw new SystemException(
+ "error.common.no_scheduler",
+ "No scheduler component in TCMPTypeMeasurementExecutor");
+ scheduler.remSchedulerTask(this);
+
+ // If request is null, then wrong constructor was called
+ // from outside?
+ if (this.request == null) return;
+
if (this.configuration == null) {

throw new SystemException(
@@ -310,7 +331,7 @@

}

- this.logger.info(type + ".run: Created new thread (tid="
+ this.logger.info(type + ".runAction: Created new thread (tid="
+ Thread.currentThread().getId() + ")");

// Create needed info ((interface, host:interface) and datum)
@@ -390,14 +411,14 @@
// Create flow
monReq.mapiCreateFlow(hostIf);

- this.logger.info(type + ".run: Created flow to " + hostIf
+ this.logger.info(type + ".runAction: Created flow to " + hostIf
+ "(tid=" + Thread.currentThread().getId() + ")");

// Apply BPF_FILTER function to the flow if requested
if (this.request.getFlowHFilterParam() != null) {

monReq.mapiApplyFunction("BPF_FILTER",
this.request.getFlowHFilterParam());
- this.logger.info(type + ".run: Applied BPF_FILTER function
('"
+ this.logger.info(type + ".runAction: Applied BPF_FILTER
function ('"
+ this.request.getFlowHFilterParam() + "') to the flow
on " + hostIf
+ " (tid=" + Thread.currentThread().getId() + ")");

@@ -409,7 +430,7 @@

monReq.mapiApplyFunction("SAMPLE",
this.request.getFlowSThreParam(),
this.request.getFlowSTypeParam());
- this.logger.info(type + ".run: Applied SAMPLE function ("
+ this.logger.info(type + ".runAction: Applied SAMPLE function
("
+ this.request.getFlowSThreParam() + ", "
+ this.request.getFlowSTypeParam() + ") to the flow on "
+ hostIf
+ " (tid=" + Thread.currentThread().getId() + ")");
@@ -420,7 +441,7 @@
if (this.request.getFlowPFilterParam() != null) {

monReq.mapiApplyFunction("STR_SEARCH",
this.request.getFlowPFilterParam(), 0, 0);
- this.logger.info(type + ".run: Applied STR_SEARCH function
('"
+ this.logger.info(type + ".runAction: Applied STR_SEARCH
function ('"
+ this.request.getFlowPFilterParam() + "', 0, 0) to the
flow on " + hostIf
+ " (tid=" + Thread.currentThread().getId() + ")");

@@ -430,14 +451,14 @@
// TODO: another configuration option specifying maximum limit
of packets
// that can be captured to one pcap file (disk space
safeguard)
monReq.mapiApplyFunction("TO_FILE",
MonitorRequest.CAP_FORMAT_TYPE_MFF_PCAP, datumFile, 0L);
- this.logger.info(type + ".run: Applied TO_FILE function ("
+ this.logger.info(type + ".runAction: Applied TO_FILE function ("
+ MonitorRequest.CAP_FORMAT_TYPE_MFF_PCAP
+ ", '" + datumFile + "', 0) to the flow on " + hostIf
+ " (tid=" + Thread.currentThread().getId() + ")");

// Connect to the flow
monReq.mapiConnect();
- this.logger.info(type + ".run: Connected to the flow on "
+ this.logger.info(type + ".runAction: Connected to the flow on "
+ hostIf + ", waiting until " +
this.request.getEndTimeParam()
+ " (tid=" + Thread.currentThread().getId() + ")");

@@ -446,41 +467,41 @@
// Close flow
monReq.mapiCloseFlow();

- this.logger.info(type + ".run: Closed flow to " + hostIf
+ this.logger.info(type + ".runAction: Closed flow to " + hostIf
+ " (tid=" + Thread.currentThread().getId() + ")");


// If remote flow, copy remotely created PCAP file to local
// directory and remove it remotely
if (isRemoteFlow) {
- this.logger.info(type + ".run: Transporting remote PCAP file
'"
+ this.logger.info(type + ".runAction: Transporting remote
PCAP file '"
+ datumFile + "' from host " + host + " to localhost"
+ " (tid=" + Thread.currentThread().getId() + ")");

ft.copy(fileName, remoteLoc, localLoc);

- this.logger.info(type + ".run: Removing remote PCAP file '"
+ this.logger.info(type + ".runAction: Removing remote PCAP
file '"
+ datumFile + "' on host " + host
+ " (tid=" + Thread.currentThread().getId() + ")");

ft.delete(fileName, remoteLoc);
}

- this.logger.info(type + ".run: Thread exiting (tid="
+ this.logger.info(type + ".runAction: Thread exiting (tid="
+ Thread.currentThread().getId() + ")");
} catch (SystemException sysEx) {

- this.logger.fatal(type + ".run(): Received SystemException (tid="
+ this.logger.fatal(type + ".runAction: Received SystemException
(tid="
+ Thread.currentThread().getId() + "): " + sysEx);

} catch (MAPIException mapiEx) {

- this.logger.fatal(type + ".run(): Received MAPIException (tid="
+ this.logger.fatal(type + ".runAction: Received MAPIException
(tid="
+ Thread.currentThread().getId() + "): " + mapiEx);

} catch (Exception e) {

- this.logger.fatal(type + ".run(): Received Exception (tid="
+ this.logger.fatal(type + ".runAction: Received Exception (tid="
+ Thread.currentThread().getId() + "): " + e);

}

Modified:
branches/ulisseskan/src/org/perfsonar/service/topologyService/TopServiceEngine.java
===================================================================
---
branches/ulisseskan/src/org/perfsonar/service/topologyService/TopServiceEngine.java
2006-12-22 11:52:13 UTC (rev 1871)
+++
branches/ulisseskan/src/org/perfsonar/service/topologyService/TopServiceEngine.java
2006-12-26 08:54:11 UTC (rev 1872)
@@ -42,7 +42,7 @@

private static final String TOPS_JDBC_COMPONENT = "tops-jdbc";

- private static final String TOPS_REGISTRATOR_COMPONENT =
"tops-registrator";
+// private static final String TOPS_REGISTRATOR_COMPONENT =
"tops-registrator";

// ---------------------------------------------------------- class
fields

@@ -65,7 +65,7 @@

// control/debugging messages

- private TopsLSRegistrationComponent topsRegistration = null; // The
+// private TopsLSRegistrationComponent topsRegistration = null; // The

// object
// for
@@ -135,7 +135,7 @@
throw new SystemException("error.tops.dependency", m);
}

- String mm = "TopServiceEngine: trying to get registrator
component";
+/* String mm = "TopServiceEngine: trying to get registrator
component";
logger.debug(mm);

topsRegistration = (TopsLSRegistrationComponent)
AuxiliaryComponentManager
@@ -147,7 +147,7 @@
logger.error(m);
throw new SystemException("error.tops.dependency", m);
}
-
+*/
logger.debug("TopServiceEngine: started ");

} // constructor

Modified:
branches/ulisseskan/src/org/perfsonar/service/topologyService/TopsLSRegistrationComponent.java
===================================================================
---
branches/ulisseskan/src/org/perfsonar/service/topologyService/TopsLSRegistrationComponent.java
2006-12-22 11:52:13 UTC (rev 1871)
+++
branches/ulisseskan/src/org/perfsonar/service/topologyService/TopsLSRegistrationComponent.java
2006-12-26 08:54:11 UTC (rev 1872)
@@ -18,186 +18,171 @@
/**
* Action for simple Scheduler that registers with the LS
*
- * @author Maciej Glowiak, modified by Ulisses Alonso for incorporating it
- * in the Topology Service
+ * @author Maciej Glowiak, modified by Ulisses Alonso for incorporating it in
+ * the Topology Service
*/
-public class TopsLSRegistrationComponent
- implements SchedulerAction, AuxiliaryComponent {
-
- // ----------------------------------------------------- constants
-
-
- private static final int DEFAULT_RUN_INTERVAL = 10000;
+public class TopsLSRegistrationComponent implements SchedulerAction,
+ AuxiliaryComponent {

- private static final int MINIMAL_RUN_INTERVAL = 100;
-
- // -------------------------------------------- Instance variables
-
-
- private Message responseMessage;
-
- private String componentName = "tops-registrator";
-
- private LoggerComponent logger;
-
- private ConfigurationComponent config;
-
- private Scheduler scheduler;
+ // ----------------------------------------------------- constants

-
-
- // ------------------------------------------------------- Methods
-
-
- /**
- * Scheduler action
- */
- public void runAction() {
-
- try {
-
- config =
- (ConfigurationComponent)AuxiliaryComponentManager.
- getInstance().getComponent(ComponentNames.CONFIG);
-
- String topsRegisterFile = config.getProperty("component."
+componentName+ ".register_file");
+ private static final int DEFAULT_RUN_INTERVAL = 10000;

- String lsURL = config.getProperty(
- "service.r.ls_url");
-
- logger.debug("TopServiceLSRegistrationComponent: register to LS
["+
- lsURL+"] with file ["+topsRegisterFile+"]");
-
- ServiceLSRegistrator registrator = new
- GenericServiceLSRegistrator(
- new PropertiesServiceDescription(),
- new InformationXMLFileServiceContent(topsRegisterFile));
-
- registrator.initRegistrator();
-
- responseMessage = registrator.register(lsURL);
-
- // TODO: do something with message... ?
-
- } catch (PerfSONARException e) {
-
- logger.error("TopServiceLSRegistrationComponent: " +
- "Error while registration: "+e.getMessage());
- }
-
- }
+ private static final int MINIMAL_RUN_INTERVAL = 100;

-
- public Message getResponseMessage() {
-
- return responseMessage;
-
- }
+ // -------------------------------------------- Instance variables

+ private Message responseMessage;

- // ---------------------- component that loads action to scheduler
-
-
- public void initComponent() throws SystemException {
+ private String componentName = "tops-registrator";

- try {
-
- logger = (LoggerComponent)AuxiliaryComponentManager.
- getInstance().getComponent(ComponentNames.LOGGER);
-
- } catch (SystemException e) {
+ private LoggerComponent logger;

- throw new SystemException("error.tops.dependency",
"TopsLSRegistrationComponent: Can't obtain Logger component");
- }
-
- try {
- config = (ConfigurationComponent)
- AuxiliaryComponentManager.getInstance().
- getComponent(ComponentNames.CONFIG);
- } catch (SystemException e) {
+ private ConfigurationComponent config;

- String m= "TopsLSRegistrationComponent: Can't obtain Config
component";
- logger.error(m);
+ private Scheduler scheduler;

- throw new SystemException("error.tops.dependency", m);
- }
+ // ------------------------------------------------------- Methods

-
- //Get configuration
-
- //get interval - parameter "component.CName.interval"
- int interval = DEFAULT_RUN_INTERVAL;
- try {
- String intervalVal = config.getProperty(
- "component."+componentName+".interval");
- interval = Integer.parseInt(intervalVal);
- } catch (RuntimeException e) {
- //possibly not an integer - keep default interval
- } catch (SystemException e) {
- //no property - keep default interval
- }
-
- //if too small take default?
- if (interval<MINIMAL_RUN_INTERVAL) {
- interval = DEFAULT_RUN_INTERVAL;
- }
-
- logger.debug("TopsLSRegistrationComponent: parameter
RUN_INTERVAL="+interval);
-
- //get scheduler - parameter "component.CName.scheduler_component"
+ /**
+ * Scheduler action
+ */
+ public void runAction() {

- try {
- String schedulerVal = config.getProperty(
- "component."+componentName+".scheduler_component");
- logger.debug("TopsLSRegistrationComponent: parameter
SCHEDULER="+schedulerVal);
-
- scheduler = (Scheduler)
- AuxiliaryComponentManager.getInstance().
- getComponent(schedulerVal);
-
- if (scheduler==null) {
+ try {

- String m= "TopsLSRegistrationComponent: Can't obtain
scheduler component";
- logger.error(m);
- throw new SystemException("error.tops.dependency", m);
- }
-
- } catch (SystemException e) {
+ config = (ConfigurationComponent)
AuxiliaryComponentManager
+
.getInstance().getComponent(ComponentNames.CONFIG);

- String m= "TopsLSRegistrationComponent: no [component." +
- componentName+".scheduler_component] parameter. "
- + e.getMessage();
+ String topsRegisterFile =
config.getProperty("component."
+ + componentName + ".register_file");

- logger.error(m);
- throw new SystemException("error.tops.dependency", m);
- }
-
- // add cleanup action to scheduler
- scheduler.addSchedulerTask(interval, this);
- }
+ String lsURL = config.getProperty("service.r.ls_url");

+ logger.debug("TopServiceLSRegistrationComponent:
register to LS ["
+ + lsURL + "] with file [" +
topsRegisterFile + "]");

- public String getComponentName() {
+ ServiceLSRegistrator registrator = new
GenericServiceLSRegistrator(
+ new PropertiesServiceDescription(),
+ new
InformationXMLFileServiceContent(topsRegisterFile));

- return componentName;
-
- }
+ registrator.initRegistrator();

+ responseMessage = registrator.register(lsURL);

- public void setComponentName(String name) {
-
- componentName = name;
-
- }
+ // TODO: do something with message... ?

-
- // ---------------------------------------------------------- test
-
-
- public static void main(String[] args) throws Exception {
+ } catch (PerfSONARException e) {

- AuxiliaryComponentManager.getInstance();
- }
-
-
+ logger.error("TopServiceLSRegistrationComponent: "
+ + "Error while registration: " +
e.getMessage());
+ }
+
+ }
+
+ public Message getResponseMessage() {
+
+ return responseMessage;
+
+ }
+
+ // ---------------------- component that loads action to scheduler
+
+ public void initComponent() throws SystemException {
+
+ try {
+
+ logger = (LoggerComponent)
AuxiliaryComponentManager.getInstance()
+ .getComponent(ComponentNames.LOGGER);
+
+ } catch (SystemException e) {
+
+ throw new SystemException("error.tops.dependency",
+ "TopsLSRegistrationComponent: Can't
obtain Logger component");
+ }
+
+ try {
+ config = (ConfigurationComponent)
AuxiliaryComponentManager
+
.getInstance().getComponent(ComponentNames.CONFIG);
+ } catch (SystemException e) {
+
+ String m = "TopsLSRegistrationComponent: Can't obtain
Config component";
+ logger.error(m);
+
+ throw new SystemException("error.tops.dependency", m);
+ }
+
+ // Get configuration
+
+ // get interval - parameter "component.CName.interval"
+ int interval = DEFAULT_RUN_INTERVAL;
+ try {
+ String intervalVal = config.getProperty("component."
+ + componentName + ".interval");
+ interval = Integer.parseInt(intervalVal);
+ } catch (RuntimeException e) {
+ // possibly not an integer - keep default interval
+ } catch (SystemException e) {
+ // no property - keep default interval
+ }
+
+ // if too small take default?
+ if (interval < MINIMAL_RUN_INTERVAL) {
+ interval = DEFAULT_RUN_INTERVAL;
+ }
+
+ logger.debug("TopsLSRegistrationComponent: parameter
RUN_INTERVAL="
+ + interval);
+
+ // get scheduler - parameter
"component.CName.scheduler_component"
+
+ try {
+ String schedulerVal = config.getProperty("component."
+ + componentName +
".scheduler_component");
+ logger.debug("TopsLSRegistrationComponent: parameter
SCHEDULER="
+ + schedulerVal);
+
+ scheduler = (Scheduler)
AuxiliaryComponentManager.getInstance()
+ .getComponent(schedulerVal);
+
+ if (scheduler == null) {
+
+ String m = "TopsLSRegistrationComponent:
Can't obtain scheduler component";
+ logger.error(m);
+ throw new
SystemException("error.tops.dependency", m);
+ }
+
+ } catch (SystemException e) {
+
+ String m = "TopsLSRegistrationComponent: no
[component."
+ + componentName +
".scheduler_component] parameter. "
+ + e.getMessage();
+
+ logger.error(m);
+ throw new SystemException("error.tops.dependency", m);
+ }
+
+ // add cleanup action to scheduler
+ scheduler.addSchedulerTask(interval, this);
+ }
+
+ public String getComponentName() {
+
+ return componentName;
+
+ }
+
+ public void setComponentName(String name) {
+
+ componentName = name;
+
+ }
+
+ // ---------------------------------------------------------- test
+
+ public static void main(String[] args) throws Exception {
+
+ AuxiliaryComponentManager.getInstance();
+ }
+
} // TopServiceLSRegistrationComponent

---

• r1872 - in branches/ulisseskan: ant ant/clmp ant/flowmp ant/rrdma ant/tops conf conf/axis-1.4 conf/axis-1.4/WEB-INF conf/axis-1.4/WEB-INF/classes conf/wsdd doc doc/ma doc/mp schema/example-instances schema/example-instances/perfSONAR schema/example-instances/perfSONAR/LS schema/example-instances/perfSONAR/LS/test schema/example-instances/perfSONAR/TOPS schema/example-instances/perfSONAR/TOPS/test schema/example-instances/perfSONAR/netflow schema/example-instances/perfSONAR/nmsTypeMP schema/example-instances/perfSONAR/snmpTypeMP schema/nmwg src src/org/perfsonar/commons/auxiliary src/org/perfsonar/commons/auxiliary/components/configuration/properties src/org/perfsonar/commons/auxiliary/components/simplescheduler src/org/perfsonar/commons/messages src/org/perfsonar/service/commons/registration src/org/perfsonar/service/lookupService/xmlType src/org/perfsonar/service/measurementArchive/eventTypeConfig src/org/perfsonar/service/measurementPoint src/org/perfsonar/service/ measurementPoint/commandLine src/org/perfsonar/service/measurementPoint/commandLine/tools src/org/perfsonar/service/measurementPoint/flowType src/org/perfsonar/service/measurementPoint/flowType/keepalive src/org/perfsonar/service/measurementPoint/tracefileCaptureType src/org/perfsonar/service/topologyService, svnlog, 12/26/2006

---

Archive powered by MHonArc 2.6.16.