Chronological Thread 

< Chronological >      < Thread >

---

Author: nordunet.behrmann
Date: 2012-12-03 13:50:47 +0000 (Mon, 03 Dec 2012)
New Revision: 6047

Added:
trunk/perfsonar-java-sql-ma/src/main/resources/i18n.properties
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/

trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/components.properties

trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/eventType-map.xml

trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/eventType-rules.xml

trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/log4j.properties

trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/log4j.syslog.properties

trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/mysql-sqlma-dbremove.sql

trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/mysql-sqlma-dbsetup.sql

trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/mysql-sqlma-dbupdate-owamp.sql

trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/mysql-sqlma-dbupdate-owamp_v2.sql

trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/mysql-sqlma-dbupdate.sql

trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/objects.config

trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/psql-sqlma-dbremove.sql

trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/psql-sqlma-dbsetup.sql

trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/service.properties

trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/servlet.properties

trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/sql-database-L2status_TEST.xml

trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/sql-database_TEST.xml

trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/sql-database_clmp-owamp.xml

trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/sql-database_clmp-ping.xml

trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/sql-database_discards_TEST.xml

trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/sql-database_errors_TEST.xml

trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/sql-database_iperf_TEST.xml

trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/sql-database_utilization_TEST.xml

trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/wizard.properties

trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/wizardproperties.dtd
trunk/perfsonar-java-sql-ma/src/main/webapp/
trunk/perfsonar-java-sql-ma/src/main/webapp/Service_Admin.js
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/

trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/CompleteMetadataStoreRequest.xml

trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/EchoRequest-random-fetch-test.xml

trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/EchoRequest-self-test.xml

trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/EchoRequest-xmldb-access-test.xml

trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/EchoRequest-xmldb-content-test.xml

trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/EchoRequest.xml

trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/LookupInfoRequest.xml

trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MeasurementArchiveStoreRequest-Discards-1.xml

trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MeasurementArchiveStoreRequest-Errors-1.xml

trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MeasurementArchiveStoreRequest-L2Status-1.xml

trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MeasurementArchiveStoreRequest-L2Status-2.xml

trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MeasurementArchiveStoreRequest-L2Status-3.xml

trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MeasurementArchiveStoreRequest-L2Status-4.xml

trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MeasurementArchiveStoreRequest-Ping-1.xml

trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MeasurementArchiveStoreRequest-Ping-2.xml

trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MeasurementArchiveStoreRequest-Utilization-1.xml

trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MeasurementArchiveStoreRequest-bwctl-iperf-1.xml

trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MeasurementArchiveStoreRequest-bwctl-iperf-2.xml

trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MeasurementArchiveStoreRequest-owamp-1.xml

trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MetadataKeyRequest-Discards-1.xml

trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MetadataKeyRequest-Errors-1.xml

trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MetadataKeyRequest-L2Status-1.xml

trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MetadataKeyRequest-L2Status-2.xml

trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MetadataKeyRequest-L2Status-3.xml

trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MetadataKeyRequest-Ping-1.xml

trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MetadataKeyRequest-Ping-2.xml

trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MetadataKeyRequest-Utilization-1.xml

trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MetadataKeyRequest-Utilization-2.xml

trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MetadataKeyRequest-iperf-1.xml

trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MetadataKeyRequest-iperf-2.xml

trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MetadataKeyRequest-iperf-3.xml

trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MetadataKeyRequest-iperf-4.xml

trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MetadataKeyRequest-iperf-5.xml

trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MetadataKeyRequest-owamp-1.xml

trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MetadataKeyRequest-owamp-2.xml

trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-Discards-1.xml

trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-Errors-1.xml

trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-L2Status-1.xml

trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-L2Status-2.xml

trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-L2Status-3.xml

trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-L2Status-4.xml

trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-L2Status-5.xml

trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-L2Status-6.xml

trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-Ping-1.xml

trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-Ping-2.xml

trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-Utilization-1.xml

trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-Utilization-2.xml

trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-Utilization-3.xml

trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-iperf-1.xml

trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-iperf-2.xml

trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-iperf-3.xml

trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-iperf-4.xml

trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-iperf-5.xml

trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-owamp-1.xml

trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-owamp-2.xml
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/responses/

trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/responses/EchoResponse.xml

trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/responses/MeasurementArchiveStoreResponse-owamp-1.xml

trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/responses/MetadataKeyResponse-owamp-1.xml

trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/responses/MetadataKeyResponse-owamp-2.xml

trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/responses/SetupDataResponse-owamp-1.xml

trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/responses/SetupDataResponse-owamp-2.xml
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/services/

trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/services/MeasurementArchiveService/

trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/services/MeasurementArchiveService/META-INF/

trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/services/MeasurementArchiveService/META-INF/services.xml
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/web.xml
trunk/perfsonar-java-sql-ma/src/main/webapp/default.css
trunk/perfsonar-java-sql-ma/src/main/webapp/fingerprint.jsp
trunk/perfsonar-java-sql-ma/src/main/webapp/graphics/
trunk/perfsonar-java-sql-ma/src/main/webapp/graphics/Thumbs.db
trunk/perfsonar-java-sql-ma/src/main/webapp/graphics/admin_home_target.gif
trunk/perfsonar-java-sql-ma/src/main/webapp/graphics/apply_button.gif
trunk/perfsonar-java-sql-ma/src/main/webapp/graphics/apply_button_2.gif
trunk/perfsonar-java-sql-ma/src/main/webapp/graphics/arrow_icon.gif
trunk/perfsonar-java-sql-ma/src/main/webapp/graphics/arrow_icon2.gif
trunk/perfsonar-java-sql-ma/src/main/webapp/graphics/button_1_large.gif
trunk/perfsonar-java-sql-ma/src/main/webapp/graphics/button_1_small.gif
trunk/perfsonar-java-sql-ma/src/main/webapp/graphics/button_2_large.gif
trunk/perfsonar-java-sql-ma/src/main/webapp/graphics/button_2_small.gif
trunk/perfsonar-java-sql-ma/src/main/webapp/graphics/cancel_button.gif

trunk/perfsonar-java-sql-ma/src/main/webapp/graphics/create_resource_button.gif
trunk/perfsonar-java-sql-ma/src/main/webapp/graphics/delete_red_button.gif
trunk/perfsonar-java-sql-ma/src/main/webapp/graphics/edit_button.gif
trunk/perfsonar-java-sql-ma/src/main/webapp/graphics/edit_green_button.gif
trunk/perfsonar-java-sql-ma/src/main/webapp/graphics/login_panel.gif
trunk/perfsonar-java-sql-ma/src/main/webapp/graphics/logos.gif
trunk/perfsonar-java-sql-ma/src/main/webapp/graphics/logout_button.gif

trunk/perfsonar-java-sql-ma/src/main/webapp/graphics/manage_collections_off_tab.gif

trunk/perfsonar-java-sql-ma/src/main/webapp/graphics/manage_collections_on_tab.gif

trunk/perfsonar-java-sql-ma/src/main/webapp/graphics/manage_users_off_tab.gif

trunk/perfsonar-java-sql-ma/src/main/webapp/graphics/manage_users_on_tab.gif
trunk/perfsonar-java-sql-ma/src/main/webapp/graphics/step_1_bottom.gif
trunk/perfsonar-java-sql-ma/src/main/webapp/graphics/step_1_slice.gif
trunk/perfsonar-java-sql-ma/src/main/webapp/graphics/step_1_top.gif
trunk/perfsonar-java-sql-ma/src/main/webapp/graphics/step_2_bottom.gif
trunk/perfsonar-java-sql-ma/src/main/webapp/graphics/step_2_slice.gif
trunk/perfsonar-java-sql-ma/src/main/webapp/graphics/step_2_top.gif
trunk/perfsonar-java-sql-ma/src/main/webapp/graphics/testdepl_fail.gif
trunk/perfsonar-java-sql-ma/src/main/webapp/graphics/testdepl_main.gif
trunk/perfsonar-java-sql-ma/src/main/webapp/graphics/testdepl_return.gif
trunk/perfsonar-java-sql-ma/src/main/webapp/graphics/testdepl_startbn.gif
trunk/perfsonar-java-sql-ma/src/main/webapp/graphics/testdepl_succ.gif
trunk/perfsonar-java-sql-ma/src/main/webapp/happyaxis.jsp
trunk/perfsonar-java-sql-ma/src/main/webapp/i18nLib.jsp
trunk/perfsonar-java-sql-ma/src/main/webapp/index.jsp
trunk/perfsonar-java-sql-ma/src/main/webapp/liveclock.js
trunk/perfsonar-java-sql-ma/src/main/webapp/main.css
trunk/perfsonar-java-sql-ma/src/main/webapp/partners.gif
trunk/perfsonar-java-sql-ma/src/main/webapp/perfsonar.png
trunk/perfsonar-java-sql-ma/src/main/webapp/perfsonar_logo.gif
trunk/perfsonar-java-sql-ma/src/main/webapp/sqlma_admin_script.js
trunk/perfsonar-java-sql-ma/src/main/webapp/testdepl.jsp
trunk/perfsonar-java-sql-ma/src/main/webapp/tick.gif
trunk/perfsonar-java-sql-ma/src/main/webapp/top_slice.gif
trunk/perfsonar-java-sql-ma/src/main/webapp/welcome.htm
trunk/perfsonar-java-sql-ma/src/main/webapp/wsdd/
trunk/perfsonar-java-sql-ma/src/main/webapp/wsdd/service-deploy.wsdd
trunk/perfsonar-java-sql-ma/src/main/webapp/wsdd/service-undeploy.wsdd
trunk/perfsonar-java-sql-ma/src/main/webapp/wz_tooltip.js

trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/web/RequestHandlerAxis2.java
Removed:
trunk/perfsonar-java-sql-ma/conf/axis-1.4/Service_Admin.js
trunk/perfsonar-java-sql-ma/conf/axis-1.4/WEB-INF/classes/i18n.properties
trunk/perfsonar-java-sql-ma/conf/axis-1.4/WEB-INF/server-config.wsdd
trunk/perfsonar-java-sql-ma/conf/axis-1.4/WEB-INF/users.lst
trunk/perfsonar-java-sql-ma/conf/axis-1.4/WEB-INF/web.xml
trunk/perfsonar-java-sql-ma/conf/axis-1.4/default.css
trunk/perfsonar-java-sql-ma/conf/axis-1.4/fingerprint.jsp
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/Thumbs.db
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/admin_home_target.gif
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/apply_button.gif
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/apply_button_2.gif
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/arrow_icon.gif
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/arrow_icon2.gif
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/button_1_large.gif
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/button_1_small.gif
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/button_2_large.gif
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/button_2_small.gif
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/cancel_button.gif

trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/create_resource_button.gif
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/delete_red_button.gif
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/edit_button.gif
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/edit_green_button.gif
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/login_panel.gif
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/logos.gif
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/logout_button.gif

trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/manage_collections_off_tab.gif

trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/manage_collections_on_tab.gif
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/manage_users_off_tab.gif
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/manage_users_on_tab.gif
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/step_1_bottom.gif
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/step_1_slice.gif
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/step_1_top.gif
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/step_2_bottom.gif
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/step_2_slice.gif
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/step_2_top.gif
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/testdepl_fail.gif
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/testdepl_main.gif
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/testdepl_return.gif
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/testdepl_startbn.gif
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/testdepl_succ.gif
trunk/perfsonar-java-sql-ma/conf/axis-1.4/happyaxis.jsp
trunk/perfsonar-java-sql-ma/conf/axis-1.4/i18nLib.jsp
trunk/perfsonar-java-sql-ma/conf/axis-1.4/index.jsp
trunk/perfsonar-java-sql-ma/conf/axis-1.4/liveclock.js
trunk/perfsonar-java-sql-ma/conf/axis-1.4/main.css
trunk/perfsonar-java-sql-ma/conf/axis-1.4/partners.gif
trunk/perfsonar-java-sql-ma/conf/axis-1.4/perfsonar.png
trunk/perfsonar-java-sql-ma/conf/axis-1.4/perfsonar_logo.gif
trunk/perfsonar-java-sql-ma/conf/axis-1.4/sqlma_admin_script.js
trunk/perfsonar-java-sql-ma/conf/axis-1.4/testdepl.jsp
trunk/perfsonar-java-sql-ma/conf/axis-1.4/tick.gif
trunk/perfsonar-java-sql-ma/conf/axis-1.4/top_slice.gif
trunk/perfsonar-java-sql-ma/conf/axis-1.4/welcome.htm
trunk/perfsonar-java-sql-ma/conf/axis-1.4/wz_tooltip.js
trunk/perfsonar-java-sql-ma/conf/components.properties
trunk/perfsonar-java-sql-ma/conf/components.properties.template
trunk/perfsonar-java-sql-ma/conf/eventType-map.xml
trunk/perfsonar-java-sql-ma/conf/eventType-rules.xml
trunk/perfsonar-java-sql-ma/conf/log4j.properties
trunk/perfsonar-java-sql-ma/conf/log4j.properties.template
trunk/perfsonar-java-sql-ma/conf/log4j.syslog.properties
trunk/perfsonar-java-sql-ma/conf/mysql-sqlma-dbremove.sql
trunk/perfsonar-java-sql-ma/conf/mysql-sqlma-dbsetup.sql
trunk/perfsonar-java-sql-ma/conf/mysql-sqlma-dbupdate-owamp.sql
trunk/perfsonar-java-sql-ma/conf/mysql-sqlma-dbupdate-owamp_v2.sql
trunk/perfsonar-java-sql-ma/conf/mysql-sqlma-dbupdate.sql
trunk/perfsonar-java-sql-ma/conf/objects.config
trunk/perfsonar-java-sql-ma/conf/psql-sqlma-dbremove.sql
trunk/perfsonar-java-sql-ma/conf/psql-sqlma-dbsetup.sql
trunk/perfsonar-java-sql-ma/conf/service.properties
trunk/perfsonar-java-sql-ma/conf/service.properties.template
trunk/perfsonar-java-sql-ma/conf/service.properties.template-2
trunk/perfsonar-java-sql-ma/conf/servlet.properties
trunk/perfsonar-java-sql-ma/conf/sql-database-L2status_TEST.xml
trunk/perfsonar-java-sql-ma/conf/sql-database_TEST.xml
trunk/perfsonar-java-sql-ma/conf/sql-database_clmp-owamp.xml
trunk/perfsonar-java-sql-ma/conf/sql-database_clmp-ping.xml
trunk/perfsonar-java-sql-ma/conf/sql-database_discards_TEST.xml
trunk/perfsonar-java-sql-ma/conf/sql-database_errors_TEST.xml
trunk/perfsonar-java-sql-ma/conf/sql-database_iperf_TEST.xml
trunk/perfsonar-java-sql-ma/conf/sql-database_utilization_TEST.xml
trunk/perfsonar-java-sql-ma/conf/wizard.properties
trunk/perfsonar-java-sql-ma/conf/wizardproperties.dtd
trunk/perfsonar-java-sql-ma/conf/wsdd/service-deploy.wsdd
trunk/perfsonar-java-sql-ma/conf/wsdd/service-undeploy.wsdd

trunk/perfsonar-java-sql-ma/samples/requests/CompleteMetadataStoreRequest.xml

trunk/perfsonar-java-sql-ma/samples/requests/EchoRequest-random-fetch-test.xml
trunk/perfsonar-java-sql-ma/samples/requests/EchoRequest-self-test.xml

trunk/perfsonar-java-sql-ma/samples/requests/EchoRequest-xmldb-access-test.xml

trunk/perfsonar-java-sql-ma/samples/requests/EchoRequest-xmldb-content-test.xml
trunk/perfsonar-java-sql-ma/samples/requests/EchoRequest.xml
trunk/perfsonar-java-sql-ma/samples/requests/LookupInfoRequest.xml

trunk/perfsonar-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-Discards-1.xml

trunk/perfsonar-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-Errors-1.xml

trunk/perfsonar-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-L2Status-1.xml

trunk/perfsonar-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-L2Status-2.xml

trunk/perfsonar-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-L2Status-3.xml

trunk/perfsonar-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-L2Status-4.xml

trunk/perfsonar-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-Ping-1.xml

trunk/perfsonar-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-Ping-2.xml

trunk/perfsonar-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-Utilization-1.xml

trunk/perfsonar-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-bwctl-iperf-1.xml

trunk/perfsonar-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-bwctl-iperf-2.xml

trunk/perfsonar-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-owamp-1.xml

trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-Discards-1.xml

trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-Errors-1.xml

trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-L2Status-1.xml

trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-L2Status-2.xml

trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-L2Status-3.xml
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-Ping-1.xml
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-Ping-2.xml

trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-Utilization-1.xml

trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-Utilization-2.xml
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-iperf-1.xml
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-iperf-2.xml
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-iperf-3.xml
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-iperf-4.xml
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-iperf-5.xml
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-owamp-1.xml
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-owamp-2.xml

trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-Discards-1.xml
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-Errors-1.xml

trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-L2Status-1.xml

trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-L2Status-2.xml

trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-L2Status-3.xml

trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-L2Status-4.xml

trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-L2Status-5.xml

trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-L2Status-6.xml
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-Ping-1.xml
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-Ping-2.xml

trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-Utilization-1.xml

trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-Utilization-2.xml

trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-Utilization-3.xml
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-iperf-1.xml
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-iperf-2.xml
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-iperf-3.xml
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-iperf-4.xml
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-iperf-5.xml
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-owamp-1.xml
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-owamp-2.xml
trunk/perfsonar-java-sql-ma/samples/responses/EchoResponse.xml

trunk/perfsonar-java-sql-ma/samples/responses/MeasurementArchiveStoreResponse-owamp-1.xml

trunk/perfsonar-java-sql-ma/samples/responses/MetadataKeyResponse-owamp-1.xml

trunk/perfsonar-java-sql-ma/samples/responses/MetadataKeyResponse-owamp-2.xml
trunk/perfsonar-java-sql-ma/samples/responses/SetupDataResponse-owamp-1.xml
trunk/perfsonar-java-sql-ma/samples/responses/SetupDataResponse-owamp-2.xml
Modified:
trunk/perfsonar-java-sql-ma/pom.xml
trunk/perfsonar_base/pom.xml
trunk/perfsonar_base/src/main/java/org/perfsonar/base/util/XMLUtils.java
Log:
perfsonar_base, perfsonar-java-sql-ma: Add Axis2 support

This patch adds Axis 2 support to perfsonar_base and ports SQL MA to
make use of Axis 2. The code is loosely based on bits and pieces in
base 2.

Axis 1 code is still present in perfsonar_base as many of the client
tools make explicit use of Axis 1.

The packaging of SQL MA has been further cleaned up. Although loosely
based on base 2, SQL MA avoids the need of creating an Axis 2 Service
Archive (an .aar file).

The old wssd files are kept as it appears that webadmin relies on those.

Deleted: trunk/perfsonar-java-sql-ma/conf/axis-1.4/Service_Admin.js
===================================================================
--- trunk/perfsonar-java-sql-ma/conf/axis-1.4/Service_Admin.js 2012-11-30
11:48:50 UTC (rev 6046)
+++ trunk/perfsonar-java-sql-ma/conf/axis-1.4/Service_Admin.js 2012-12-03
13:50:47 UTC (rev 6047)
@@ -1,128 +0,0 @@
-/**
- * @author Michalis Michael,Cynet
- */
-function setTip(el, description, color){
- var text = '<span style=\"font-size: 12px; width:20px;\">' + description
+ '</span>';
- var width;
- if (el) {
- el.style.cursor = 'pointer';
- width = 250;
- }
- else {
- width = 0;
- }
-
- Tip(text, BGCOLOR, color, WIDTH, width, TEXTALIGN, 'justify', ABOVE,
true);
-}
-
-function FloatPosition(){
- var ns = (navigator.appName.indexOf("Netscape") != -1);
- var x = screen.width;
- var y = screen.height;
- var button = document.getElementById("Button");
- var reset_button = document.getElementById("ResetButton");
- if (reset_button) {
- var width = reset_button.parentNode.offsetWidth;
- var offset = reset_button.parentNode.offsetLeft;
- var leftoffset = parent
- if (reset_button != null) {
- if (y == 768) {
- reset_button.style.top = 95 + '%';
- reset_button.style.left = 83 + '%';
- }
- else {
- //alert("Not 768 "+x);
- reset_button.style.top = 95 + '%';
- reset_button.style.left = 67 + '%';
- }
- }
- if (button != null) {
- if (y == 768) {
- button.style.top = 95 + '%';
- button.style.left = 91.5 + '%';
- }
- else {
- button.style.top = 95 + '%';
- button.style.left = 74 + '%';
- }
- }
- }
-
-}
-
-onload = FloatPosition;
-onscroll = FloatPosition;
-onresize = FloatPosition;
-
-function checkStarFields(){
-
- var divs = document.getElementsByTagName("div");
- var filled = true;
-
- for (var i = 0; i < divs.length; i++) {
-
- var div = divs[i];
- if (div.style.display == "block") {
- var input_array = div.getElementsByTagName("input");
-
- var text = document.createElement("td");
- var ex = document.getElementById("extra");
- if (ex != null) {
- var p = ex.parentNode;
- p.removeChild(ex);
- }
- text.id = "extra";
- text.innerHTML = '<p style=\"color:red;\">Please fill in the
field!</p>';
-
- for (var j = 0; j < input_array.length; j++) {
-
- var input = input_array[j];
-
- if (input.id == "required") {
-
- var parent = input.parentNode.parentNode;
- if (input.value == null || input.value == "" ||
input.value == " ") {
- if
(parent.parentNode.parentNode.parentNode.style.display == "block") {
- filled = false;
- parent.appendChild(text);
- return filled;
- }
-
- }
-
- }
-
- }
- }
-
- }
-
- return filled;
-
-}
-
-function getDate(){
-
- var date = document.getElementById("date");
-
- var stampdays = new Array("Sunday", "Monday", "Tuesday", "Wednesday",
"Thursday", "Friday", "Saturday");
-
- var stampmonths = new Array("January", "February", "March", "April",
"May", "June", "July", "August", "September", "October", "November",
"December");
-
- var thedate = new Date();
-
- date.innerHTML = stampdays[thedate.getDay()] + ", " +
stampmonths[thedate.getMonth()] + " " + thedate.getDate() + ", " +
thedate.getFullYear();
-
-}
-
-function highlight(el){
- alert("Highlighted");
- var links = document.getElementsByTagName("a");
- for (var i = 0; i < links.length; i++) {
-
- var link = links[i];
-
- link.className
- }
-}
-

Deleted:
trunk/perfsonar-java-sql-ma/conf/axis-1.4/WEB-INF/classes/i18n.properties
===================================================================
--- trunk/perfsonar-java-sql-ma/conf/axis-1.4/WEB-INF/classes/i18n.properties
2012-11-30 11:48:50 UTC (rev 6046)
+++ trunk/perfsonar-java-sql-ma/conf/axis-1.4/WEB-INF/classes/i18n.properties
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,132 +0,0 @@
-############################################################
-# i18n settings for the Axis Web-Application
-#
-
-#################### [i18n global setting] #################
-#
-locales=en ja
-
-#################### [index.jsp] ###########################
-#
-
-### Header ###
-#
-language=Language
-welcomeMessage=Hello! Welcome to Apache-Axis.
-
-### Operation list ###
-#
-operationType=What do you want to do today?
-
-# Validation
-validation=Validation
-validationURL=happyaxis.jsp
-validationFootnote00=Validate the local installation's configuration
-validationFootnote01=see below if this does not work.
-
-# List
-serviceList=List
-serviceListURL=servlet/AxisServlet
-serviceListFootnote=View the list of deployed Web services
-
-# Call
-callAnEndpoint=Call
-callAnEndpointURL=EchoHeaders.jws?method=list
-callAnEndpointFootnote00=Call a local endpoint that list's the caller's http
headers
-callAnEndpointFootnote01=(or see its <a
href="EchoHeaders.jws?wsdl">WSDL</a>).
-
-# Visit
-visit=Visit
-visitURL=http://ws.apache.org/axis/
-visitFootnote=Visit the Apache-Axis Home Page
-
-# Admin
-admin=Administer Axis
-adminURL=servlet/AdminServlet
-adminFootnote=[disabled by default for security reasons]
-
-# SOAPMonitor
-soapMonitor=SOAPMonitor
-soapMonitorURL=SOAPMonitor
-soapMonitorFootnote=[disabled by default for security reasons]
-
-# Sidenote
-sideNote=To enable the disabled features, uncomment the appropriate
declarations in WEB-INF/web.xml in the webapplication and restart it.
-
-### Validating Axis ###
-#
-
-# Title
-validatingAxis=Validating Axis
-
-# Note 0
-validationNote00=If the "happyaxis" validation page displays an exception
instead of a status page, the likely cause is that you have multiple XML
parsers in your classpath. Clean up your classpath by eliminating extraneous
parsers.
-
-# Note 1
-validationNote01=If you have problems getting Axis to work, consult the Axis
<a href="http://wiki.apache.org/ws/FrontPage/Axis";>Wiki</a> and then try the
Axis user mailing list.
-
-#
-#################### [index.jsp] ###########################
-
-#################### [happyaxis.jsp] #######################
-#
-
-pageTitle=Axis Happiness Page
-pageRole=Examining webapp configuration
-
-### Needed Components ###
-#
-neededComponents=Needed Components
-error=Error
-warning=Warning
-criticalErrorMessage=Axis will not work.
-uncertainErrorMessage=Axis may not work.
-# parameters = url, name
-seeHomepage=<br> See <a href="{0}">{0}</a>
-# parameters = category, classname, jarFile, errorText, url
-couldNotFound=<p> {0}: could not find class {1} from file <b>{2}</b><br> {3}
{4}<p>
-# parameters = description, classname
-foundClass00=Found {0} ( {1} )
-# parameters = description, classname
-foundClass01=Found {0} ( {1} ) at {2}
-# parameters = category, classname, errorText, url
-couldNotFoundDep=<p> {0}: could not find a dependency of class {1} from file
<b>{2}</b><br> {3} {4}
-# parameters = ncdfe.getMessage(), classname
-theRootCause=<br>The root cause was: {0}<br>This can happen e.g. if {1} is
in the 'common' classpath, but a dependency like activation.jar is only in
the webapp classpath.<p>
-# parameters = location
-invalidSAAJ=<b>Error:</b> Invalid version of SAAJ API found in {0}. Make
sure that Axis' saaj.jar precedes {0} in CLASSPATH.<br>
-axisInstallation=Axis installation instructions
-
-### Optional Components ###
-#
-
-optionalComponents=Optional Components
-attachmentsError=Attachments will not work.
-xmlSecurityError=XML Security is not supported.
-httpsError=https is not supported.
-
-happyResult00=<i>The core axis libraries are present.</i>
-happyResult01=<i>The optional components are present.</i>
-# parameters = needed(num of missing libraries)
-unhappyResult00=<i>{0} core axis library(ies) are missing</i>
-# parameters = wanted(num of missing libraries)
-unhappyResult01=<i>{0} wanted optional axis librar(ies) are missing</i>
-
-hintString=<B><I>Note:</I></B> On Tomcat 4.x and Java1.4, you may need to
put libraries that contain java.* or javax.* packages into
CATALINA_HOME/common/lib <br>jaxrpc.jar and saaj.jar are two such
libraries.<p/>
-noteString=<B><I>Note:</I></B> Even if everything this page probes for is
present, there is no guarantee your web service will work, because there are
many configuration options that we do not check for. These tests are
<i>necessary</i> but not <i>sufficient</i><hr>
-
-### Examining Application Server ###
-#
-apsExamining=Examining Application Server
-recommendedParser=<b>We recommend <a
href="http://xml.apache.org/xerces2-j/";>Xerces 2</a> over Crimson as the XML
parser for Axis</b>
-couldNotCreateParser=Could not create an XML Parser
-
-### Examining System Properties ###
-#
-sysExamining=Examining System Properties
-sysPropError=System properties are not accessible.<p>
-classFoundError=an unknown location
-apsPlatform=Platform
-
-#
-#################### [happyaxis.jsp] #######################
\ No newline at end of file

Deleted: trunk/perfsonar-java-sql-ma/conf/axis-1.4/WEB-INF/server-config.wsdd
===================================================================
--- trunk/perfsonar-java-sql-ma/conf/axis-1.4/WEB-INF/server-config.wsdd
2012-11-30 11:48:50 UTC (rev 6046)
+++ trunk/perfsonar-java-sql-ma/conf/axis-1.4/WEB-INF/server-config.wsdd
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<deployment xmlns="http://xml.apache.org/axis/wsdd/";
xmlns:java="http://xml.apache.org/axis/wsdd/providers/java";>
- <globalConfiguration>
- <parameter name="adminPassword" value="admin"/>
- <parameter name="enableNamespacePrefixOptimization" value="false"/>
- <parameter name="dotNetSoapEncFix" value="true"/>
- <parameter name="disablePrettyXML" value="true"/>
- <parameter name="attachments.implementation"
value="org.apache.axis.attachments.AttachmentsImpl"/>
- <parameter name="sendXsiTypes" value="true"/>
- <parameter name="sendMultiRefs" value="true"/>
- <parameter name="sendXMLDeclaration" value="true"/>
- <requestFlow>
- <handler type="java:org.apache.axis.handlers.JWSHandler">
- <parameter name="scope" value="session"/>
- </handler>
- <handler type="java:org.apache.axis.handlers.JWSHandler">
- <parameter name="scope" value="request"/>
- <parameter name="extension" value=".jwr"/>
- </handler>
- </requestFlow>
- </globalConfiguration>
- <handler name="URLMapper"
type="java:org.apache.axis.handlers.http.URLMapper"/>
- <handler name="LocalResponder"
type="java:org.apache.axis.transport.local.LocalResponder"/>
- <handler name="Authenticate"
type="java:org.apache.axis.handlers.SimpleAuthenticationHandler"/>
- <service name="MeasurementArchiveService" provider="java:MSG"
style="message" use="literal">
- <parameter name="allowedMethods" value="acceptCall"/>
- <parameter name="className"
value="org.perfsonar.service.base.web.RequestHandler"/>
- <namespace>http://perfsonar.org/services/measurementArchive</namespace>
- </service>
- <service name="AdminService" provider="java:MSG">
- <parameter name="allowedMethods" value="AdminService"/>
- <parameter name="enableRemoteAdmin" value="false"/>
- <parameter name="className" value="org.apache.axis.utils.Admin"/>
- <namespace>http://xml.apache.org/axis/wsdd/</namespace>
- </service>
- <service name="Version" provider="java:RPC">
- <parameter name="allowedMethods" value="getVersion"/>
- <parameter name="className" value="org.apache.axis.Version"/>
- </service>
- <transport name="http">
- <requestFlow>
- <handler type="URLMapper"/>
- <handler type="java:org.apache.axis.handlers.http.HTTPAuthHandler"/>
- </requestFlow>
- <parameter name="qs:list"
value="org.apache.axis.transport.http.QSListHandler"/>
- <parameter name="qs:wsdl"
value="org.apache.axis.transport.http.QSWSDLHandler"/>
- <parameter name="qs.list"
value="org.apache.axis.transport.http.QSListHandler"/>
- <parameter name="qs.method"
value="org.apache.axis.transport.http.QSMethodHandler"/>
- <parameter name="qs:method"
value="org.apache.axis.transport.http.QSMethodHandler"/>
- <parameter name="qs.wsdl"
value="org.apache.axis.transport.http.QSWSDLHandler"/>
- </transport>
- <transport name="local">
- <responseFlow>
- <handler type="LocalResponder"/>
- </responseFlow>
- </transport>
-</deployment>

Deleted: trunk/perfsonar-java-sql-ma/conf/axis-1.4/WEB-INF/users.lst
===================================================================
--- trunk/perfsonar-java-sql-ma/conf/axis-1.4/WEB-INF/users.lst 2012-11-30
11:48:50 UTC (rev 6046)
+++ trunk/perfsonar-java-sql-ma/conf/axis-1.4/WEB-INF/users.lst 2012-12-03
13:50:47 UTC (rev 6047)
@@ -1,3 +0,0 @@
-user1 pass1
-user2
-user3 pass3

Deleted: trunk/perfsonar-java-sql-ma/conf/axis-1.4/WEB-INF/web.xml
===================================================================
--- trunk/perfsonar-java-sql-ma/conf/axis-1.4/WEB-INF/web.xml 2012-11-30
11:48:50 UTC (rev 6046)
+++ trunk/perfsonar-java-sql-ma/conf/axis-1.4/WEB-INF/web.xml 2012-12-03
13:50:47 UTC (rev 6047)
@@ -1,185 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web
-Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd";>
-
-<web-app>
- <display-name>Apache-Axis</display-name>
-
- <listener>
-
<listener-class>org.apache.axis.transport.http.AxisHTTPSessionListener</listener-class>
- </listener>
-
- <listener>
-
<listener-class>org.perfsonar.service.base.container.listeners.StartupInitializer</listener-class>
- </listener>
-
- <servlet>
- <servlet-name>AxisServlet</servlet-name>
- <display-name>Apache-Axis Servlet</display-name>
- <servlet-class>
- org.apache.axis.transport.http.AxisServlet
- </servlet-class>
- </servlet>
-
- <servlet>
- <servlet-name>AdminServlet</servlet-name>
- <display-name>Axis Admin Servlet</display-name>
- <servlet-class>
- org.apache.axis.transport.http.AdminServlet
- </servlet-class>
- <load-on-startup>100</load-on-startup>
- </servlet>
-
- <servlet>
- <servlet-name>SOAPMonitorService</servlet-name>
- <display-name>SOAPMonitorService</display-name>
- <servlet-class>
- org.apache.axis.monitor.SOAPMonitorService
- </servlet-class>
- <init-param>
- <param-name>SOAPMonitorPort</param-name>
- <param-value>5001</param-value>
- </init-param>
- <load-on-startup>100</load-on-startup>
- </servlet>
-
-
-
- <!-- pS extension -->
- <!-- begin -->
-
- <servlet>
- <servlet-name>
- ServiceAdmin
- </servlet-name>
- <servlet-class>
- perfSONARWebAdmin.admin.service.Admin
- </servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>
- ServiceAdmin
- </servlet-name>
- <url-pattern>
- /ServiceAdmin
- </url-pattern>
- </servlet-mapping>
-
-
- <servlet>
- <servlet-name>
- eXistAdmin
- </servlet-name>
- <servlet-class>
- perfSONARWebAdmin.admin.exist.eXistAdmin
- </servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>
- eXistAdmin
- </servlet-name>
- <url-pattern>
- /eXistAdmin
- </url-pattern>
- </servlet-mapping>
-
-
- <servlet>
- <servlet-name>
- Wizard
- </servlet-name>
- <servlet-class>
- perfSONARWebAdmin.admin.wizard.Wizard
- </servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>
- Wizard
- </servlet-name>
- <url-pattern>
- /Wizard
- </url-pattern>
- </servlet-mapping>
-
-
- <servlet>
- <servlet-name>
- SQLMAdmin
- </servlet-name>
- <servlet-class>
- perfSONARWebAdmin.admin.sqlma.SQLMAdmin
- </servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>
- SQLMAdmin
- </servlet-name>
- <url-pattern>
- /SQLMAdmin
- </url-pattern>
- </servlet-mapping>
-
-
- <!-- end -->
- <!-- pS extension -->
-
-
- <servlet-mapping>
- <servlet-name>AxisServlet</servlet-name>
- <url-pattern>/servlet/AxisServlet</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>AxisServlet</servlet-name>
- <url-pattern>*.jws</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>AxisServlet</servlet-name>
- <url-pattern>/services/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>SOAPMonitorService</servlet-name>
- <url-pattern>/SOAPMonitor</url-pattern>
- </servlet-mapping>
-
- <!-- uncomment this if you want the admin servlet -->
- <!--
- <servlet-mapping>
- <servlet-name>AdminServlet</servlet-name>
- <url-pattern>/servlet/AdminServlet</url-pattern>
- </servlet-mapping>
- -->
-
- <session-config>
- <!-- Default to 5 minute session timeouts -->
- <session-timeout>5</session-timeout>
- </session-config>
-
- <!-- currently the W3C havent settled on a media type for WSDL;
- http://www.w3.org/TR/2003/WD-wsdl12-20030303/#ietf-draft
- for now we go with the basic 'it's XML' response -->
- <mime-mapping>
- <extension>wsdl</extension>
- <mime-type>text/xml</mime-type>
- </mime-mapping>
-
-
- <mime-mapping>
- <extension>xsd</extension>
- <mime-type>text/xml</mime-type>
- </mime-mapping>
-
- <welcome-file-list id="WelcomeFileList">
- <welcome-file>index.jsp</welcome-file>
- <welcome-file>index.html</welcome-file>
- <welcome-file>index.jws</welcome-file>
- </welcome-file-list>
-
-</web-app>

Deleted: trunk/perfsonar-java-sql-ma/conf/axis-1.4/default.css
===================================================================
--- trunk/perfsonar-java-sql-ma/conf/axis-1.4/default.css 2012-11-30
11:48:50 UTC (rev 6046)
+++ trunk/perfsonar-java-sql-ma/conf/axis-1.4/default.css 2012-12-03
13:50:47 UTC (rev 6047)
@@ -1,801 +0,0 @@
-
-/* standard elements */
-html {
- min-height: 100%;
-}
-
-* {
- margin: 0;
- padding: 0;
-}
-
-body {
- background-color: #ffffff;
- font-family: arial;
-}
-
-a img{
- border: none;
-}
-/* Wizard CSS */
-.top {
- display: block;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 13px;
- color: #468C46;
- margin: 0% 1% 0 1%;
- border-bottom: 1px dotted #468C46;
- padding: 7px;
- background: #ffffff;
-}
-
-.greenasterisk {
- font-size: 130%;
- color: #468C46;
-}
-
-.properties {
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 13px;
- padding: 10px;
- margin: 0% 1% 0 1%;
-}
-
-.properties p {
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 13px;
-}
-
-.properties table {
- border-bottom: 1px dotted #468C46;
- margin-bottom: 20px;
-}
-
-.inner_properties {
- padding:0px;
- margin:0px;
-}
-.inner_properties table{
- border: none;
- margin:0px;
- padding:0px;
-}
-
-.properties td {
- padding: 15px;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 13px;
-}
-
-.properties em {
- display: block;
- color: red;
- font-size: 95%;
-}
-
-.info_wizard {
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 13px;
- color: #468C46;
-}
-
-.info_wizard p {
-}
-/* General Purpose CSS*/
-.welcometextlavender {
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 13px;
- font-weight: bold;
- color: #4169E1;
- border-bottom-width: 1px;
- border-bottom-style: dotted;
- border-bottom-color: #4169E1;
- clip: rect( auto, auto, auto, auto );
- margin-left: 0%;
-}
-
-.formated_text {
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 13px;
-}
-
-.blueheader {
- text-align: left;
- color: #4169E1;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 13px;
-}
-
-.info {
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 13px;
- color: #4169E1;
- float: none;
- margin: 0% 0% 0% 1%;
-}
-
-.info p {
- float: none;
- text-align: justify;
-}
-
-.lightgrey {
- background-color: #f1f3f1;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 10px;
-}
-
-.lightgrey td {
- padding: 5px;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 10px;
-}
-
-.darkgrey {
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 10px;
- background-color: #e1e5e1;
-}
-
-.darkgrey td {
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 10px;
- padding: 5px;
-}
-
-.hilighted {
- color: #4169E1;
- border-bottom: 1px solid #4169E1;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 13px;
-}
-
-.underlined {
- border-bottom: 1px solid #4169E1;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 13px;
-}
-
-.tablessContent {
- margin: 2% 0 0 0.3%;
- background: #ffffff;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 13px;
-}
-
-.input_style_blue {
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 10px;
-}
-
-.headerlavender {
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 13px;
- background-color: #A0A0D8;
- margin-right: 0px;
- margin-left: 0px;
- padding: 5px;
-}
-/*eXist Admin CSS*/
-.content {
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 13px;
- margin: 2% 0% 0 0%;
- background: #ffffff;
-}
-
-.content ul {
- margin-top: 5px;
- display: block;
- list-style: none outside;
- padding: 5px;
-}
-
-.content li {
- margin: 0 0 0 0;
- padding: 0px;
- display: block;
- float: left;
- position: relative;
- top: -1.32em;
-}
-
-.manage_exist {
- background: #ffffff;
- margin: 0% 0% 0% 0%;
- padding: 0px;
-}
-
-.showResource {
- float: none;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 13px;
- text-indent: 0%;
- margin-top: 5px;
- margin-left: 0.3%;
- padding: 0px;
- text-align: inherit;
-}
-
-.showResource table {
- left: -100px;
- position: static;
- margin-top: 0px;
- border-spacing: 1px 0px;
-}
-
-.showResource th {
- padding: 10px;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 12px;
- background-color: #C7C7F2;
-}
-
-.showResource td {
- padding: 10px;
-}
-
-.showResource p {
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 13px;
- border: none;
- padding: 5px;
- margin: 0% 0% 0% 0%;
-}
-
-.exist_welcome_text {
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 13px;
- font-weight: bold;
- padding: 5px;
- color: #4169E1;
- font-weight: bold;
- border-bottom-width: 1px;
- border-bottom-style: dotted;
- border-bottom-color: #4169E1;
- clip: rect( auto, auto, auto, auto );
- margin-left: 0%;
-}
-
-.input {
- padding: 1em;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 13px;
-}
-
-.input_style {
- border-color: #468C46;
- border-style: solid;
- border-width: 1px;
-}
-
-.login_table {
- background-color: #E6E6FA;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 13px;
-}
-
-.login_table td {
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 13px;
-}
-
-.logout {
- margin-top: 10px;
- margin-left: 48%;
-}
-
-.logout a {
- padding: 5px;
- text-decoration: none;
- color: green;
- background: transparent url(graphics/logout_button.gif) no-repeat center
top;
- width: 64px;
- height: 28px;
- display: block;
-}
-
-.logout a:hover {
- background: transparent url(graphics/logout_button.gif) no-repeat center
top;
- color: #049;
-}
-
-.input_table {
- border: 1px solid #4169E1;
- border-spacing: 0px 1px;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 13px;
-}
-
-.input_table td {
- padding: 5px;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 13px;
-}
-
-.input_table th {
- padding: 5px;
- text-align: left;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 13px;
-}
-/*Exist Buttons CSS*/
-.collections_option_on a {
- padding: 7px 80px 7px 80px;
- width: 210px;
- height: 28px;
- text-decoration: none;
- background: transparent url(graphics/manage_collections_on_tab.gif)
no-repeat center top;
-}
-
-
-.collections_option_off a {
- padding: 7px 80px 7px 80px;
- width: 210px;
- height: 28px;
- text-decoration: none;
- background: transparent url(graphics/manage_collections_off_tab.gif)
no-repeat center top;
-}
-
-
-.users_option_off a{
- padding: 7px 65px 7px 65px;
- width: 210px;
- height: 28px;
- text-decoration: none;
- background: transparent url(graphics/manage_users_off_tab.gif) no-repeat
center top;
-}
-
-.users_option_on a {
- padding: 7px 65px 7px 65px;
- width: 210px;
- height: 28px;
- text-decoration: none;
- background: transparent url(graphics/manage_users_on_tab.gif) no-repeat
center top;
-}
-
-
-.login_button {
- width: 54px;
- height: 28px;
- margin: 0;
- padding: 0;
- border: 0px;
- font-family: Helvetica, Calibri, Arial, sans-serif;
- font-size: 90%;
- font-weight: bold;
- text-align: center;
- clip: rect( auto, auto, auto, auto );
- cursor: pointer;
- background: transparent url(graphics/button_1_small.gif) no-repeat
center top;
- float: left;
-}
-
-.edit_button_res {
- display: block;
- margin-top: 5px;
- margin-left: 0px;
- width: 120px;
- height: 28px;
- float: left;
- outline: none;
- border: none;
- text-align: center;
- font-family: Helvetica, Calibri, Arial, sans-serif;
- font-size: 90%;
- font-weight: bold;
- text-decoration: none;
- background: url(graphics/button_1_large.gif) no-repeat center;
- cursor: pointer;
-}
-
-.create_button_res {
- display: block;
- margin-top: 5px;
- width: 120px;
- height: 28px;
- float: left;
- border: none;
- font-family: Helvetica, Calibri, Arial, sans-serif;
- font-size: 90%;
- font-weight: 600;
- text-decoration: none;
- cursor: pointer;
- background: transparent url(graphics/button_1_large.gif) no-repeat
center;
-}
-
-.delete_button_res {
- display: block;
- margin-top: 5px;
- width: 120px;
- height: 28px;
- float: none;
- border: none;
- font-family: Helvetica, Calibri, Arial, sans-serif;
- font-size: 90%;
- font-weight: 600;
- text-decoration: none;
- cursor: pointer;
- background: transparent url(graphics/button_1_large.gif) no-repeat
center top;
-}
-
-.input_Edit_button {
- width: 54px;
- height: 28px;
- margin: 0;
- border: 0;
- padding: 0;
- font-family: Helvetica, Calibri, Arial, sans-serif;
- font-size: 90%;
- font-weight: 600;
- cursor: pointer;
- background: transparent url(graphics/button_1_small.gif) no-repeat
center top;
- float: left;
-}
-
-.input_Create_button {
- width: 54px;
- height: 28px;
- margin: 0;
- border: 0;
- padding: 0;
- font-family: Helvetica, Calibri, Arial, sans-serif;
- font-size: 90%;
- font-weight: 600;
- cursor: pointer;
- background: transparent url(graphics/button_1_small.gif) no-repeat
center top;
- float: left;
-}
-
-.execute_button_users {
- width: 54px;
- height: 28px;
- margin: 0;
- border: 0;
- padding: 0;
- font-family: Helvetica, Calibri, Arial, sans-serif;
- font-size: 90%;
- font-weight: 600;
- cursor: pointer;
- background: transparent url(graphics/button_1_small.gif) no-repeat
center top;
- float: right;
-}
-/*Properties CSS */
-.groupheading {
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 10px;
- color: #468C46;
-}
-
-.manage {
- background: #ffffff;
- margin: 0 0.3% 0 0.3%;
- padding: 0px;
-}
-
-.manage table {
- padding: 3px;
- border-spacing: 1px 0px;
-}
-
-.manage th {
- padding-top: 8px;
- padding-bottom: 8px;
- padding-left: 5px;
- text-align: left;
-}
-
-.manage td {
- padding-top: 8px;
- padding-bottom: 8px;
- padding-left: 5px;
-}
-/*Properties Buttons CSS*/
-.floatResetButton {
- position: fixed;
- width: 64px;
- height: 28px;
- margin: 0;
- padding: 0;
- border: 0;
- text-indent: -1000em;
- cursor: pointer;
- background: transparent url(graphics/cancel_button.gif) no-repeat center
top;
- float: right;
-}
-
-.floatSubmitButton {
- position: fixed;;
- width: 53px;
- height: 28px;
- margin: 0;
- border: 0;
- padding: 0;
- text-indent: -1000em;
- cursor: pointer;
- background: transparent url(graphics/apply_button_2.gif) no-repeat
center top;
- float: right;
-}
-
-.submit_button {
- width: 53px;
- height: 28px;
- margin: 0;
- border: 0;
- padding: 0;
- text-indent: -1000em;
- cursor: pointer;
- background: transparent url(graphics/apply_button.gif) no-repeat center
top;
- float: none;
-}
-/* SQLMA Admin CSS*/
-.manage_slqma {
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 13px;
- margin: 0% 1% 0% 1%;
-}
-
-.Options {
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 13px;
- margin: 0% 1% 0% 1%;
-}
-
-#options {
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 13px;
- margin: 0% 1% 0% 1%;
-}
-
-#EditFile {
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 13px;
- margin: 0% 1% 0% 1%;
- float: none;
-}
-
-#CreateNewFile {
- margin: 0% 1% 0% 1%;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 13px;
- float: none;
-}
-
-.execute_button_sqlma {
- display: block;
- margin-top: 5px;
- width: 120px;
- height: 28px;
- float: left;
- border: none;
- font-family: Helvetica, Calibri, Arial, sans-serif;
- font-size: 90%;
- font-weight: 600;
- text-decoration: none;
- cursor: pointer;
- background: transparent url(graphics/button_1_large.gif) no-repeat
center;
-}
-
-.execute_button_sqlma_small {
- display: block;
- margin-top: 5px;
- width: 54px;
- height: 28px;
- float: left;
- border: none;
- font-family: Helvetica, Calibri, Arial, sans-serif;
- font-size: 90%;
- font-weight: 600;
- text-decoration: none;
- cursor: pointer;
- background: transparent url(graphics/button_1_small.gif) no-repeat
center;
-}
-
-.execute_button_sqlma_large {
- display: block;
- margin-top: 5px;
- width: 120px;
- height: 28px;
- float: left;
- border: none;
- font-family: Helvetica, Calibri, Arial, sans-serif;
- font-size: 90%;
- font-weight: 600;
- text-decoration: none;
- cursor: pointer;
- background: transparent url(graphics/button_1_large.gif) no-repeat
center;
-}
-
-.sqlmaheader {
- margin-left: 1%;
- color: #4169E1;
- font-family: Helvetica, Calibri, Arial, sans-serif;
- font-size: 13px;
-}
-
-init_table {
- margin-left: 1%;
- float: left;
- font-family: Helvetica, Calibri, Arial, sans-serif;
- font-size: 13px;
-}
-
-.init_table td {
- padding: 8px;
- text-align: left;
- font-family: Helvetica, Calibri, Arial, sans-serif;
- font-size: 13px;
-}
-
-.init_table th {
- padding: 8px;
- text-align: left;
- color: #4169E1;
- font-family: Helvetica, Calibri, Arial, sans-serif;
- font-size: 13px;
-}
-
-.test_table {
- background-color: #99ff99;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 13px;
-}
-
-.test_table td {
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 13px;
-}
-
-/* Stitching Servlet*/
-
-#main_iface_panel{
- margin-top: 2%;
- margin-left:2%;
- background-color: #ffffff;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 13px;
- height:100%
-
-}
-#main_iface_panel a{
-
-}
-
-#main_iface_panel a:visited a:active{
-
-}
-#iface_panel_body table{
-
-}
-#iface_panel_body td{
- vertical-align:top;
- height:100%;
- padding:0px;
-}
-#file_management{
- border: 1px solid blue;
- padding:10px;
- font-weight:bold;
-}
-
-#file_management table{
- width:100%;
-}
-#file_info{
- background-color:#BBBBE6;
- padding:0px;
-}
-
-#file_info table{
- width:100%;
-}
-#file_info th{
-
- background-color:#8282C9;
- color:#000000;
- padding: 5px;
- text-align:left;
-}
-#file_info_header{
- color:white;
- background-color:#8282C9;
- font-weight:bold;
-}
-#file_info td{
-
- padding: 5px;
- text-align:left;
-}
-
-#iface_panel_header{
-
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 13px;
- padding: 5px;
- background-color: #E6E6FA;
- margin:1px;
-
-}
-#panel_body_sidebar{
-
- background-color: #CBCBED;
-}
-#panel_body_sidebar_devices{
- height:100%;
- background-color: #CBCBED;
- float:left;
- padding: 5px;
- margin:1px;
-
-}
-
-#panel_body_sidebar table{
- width:100%;
- height:100%;
-}
-#panel_body_sidebar tr{
- height:100%;
-}
-#panel_body_sidebar td{
- padding: 8px;
-}
-
-#panel_body_sidebar a a:visited a:link{
- padding: 0px;
- margin:0px
-}
-
-#panel_body_ifaces{
- background-color: #DEDEF9;
- float:left;
- padding-left: 10px;
- padding-right: 10px;
- padding-bottom:20px;
- padding-top:8px;
- margin:0px;
-}
-#host_name{
- font-size:15px;
- font-weight:bold;
-}
-
-#ifaces_table{
- margin-top: 15px;
- background-color:#ECECFC;
- width:100%;
- border-spacing: 1px 0px;
-
-}
-
-#ifaces_table td{
- padding: 5px;
- border-top:none;
-}
-
-
-.ifaces_header1{
- text-align:left;
- font-weight:bold;
- background-color:#8282C9;
-}
-.ifaces_header2{
- background-color:#8282C9;
- font-weight:bold;
- text-align:center;
-}
-
-.execute_button_stitching {
- display: block;
- margin: 0px;
- width: 120px;
- height: 28px;
- float: left;
- border: none;
- font-family: Helvetica, Calibri, Arial, sans-serif;
- font-size: 90%;
- font-weight: 600;
- text-decoration: none;
- cursor: pointer;
- background: transparent url(graphics/button_1_large.gif) no-repeat
center;
-}
-

Deleted: trunk/perfsonar-java-sql-ma/conf/axis-1.4/fingerprint.jsp
===================================================================
--- trunk/perfsonar-java-sql-ma/conf/axis-1.4/fingerprint.jsp 2012-11-30
11:48:50 UTC (rev 6046)
+++ trunk/perfsonar-java-sql-ma/conf/axis-1.4/fingerprint.jsp 2012-12-03
13:50:47 UTC (rev 6047)
@@ -1,272 +0,0 @@
-<%@ page import="java.io.File,
- java.io.IOException,
- java.util.Date"
- session="false" %>
-<html>
-<head>
-<title>System Fingerprint</title>
-</head>
-<body bgcolor=#ffffff>
-<%!
-
- /*
- * Fingerprint the users system. This is mainly for use in
- * diagnosing classpath problems. It is intended to dump out
- * a copy of the environment this webapp is running in,
- * and additionally attempt to identify versions of each jar
- * in the classpath.
- *
- * @author Brian Ewins
- */
-
- private java.util.Properties versionProps=new java.util.Properties();
-
- /**
- * Identify the version of a jar file. This uses a properties file
- * containing known names and sizes in the format
- * 'name(size)=version'. Version strings should be like 'xerces-1.4'
- * ie they should include the name of the library.
- */
- public String getFileVersion(File file) throws IOException {
- String key="<td>"+file.getName()+"</td>";
- key+= "<td>"+file.length()+"</td>";
- Date timestamp=new Date(file.lastModified());
- key+= "<td>"+timestamp.toString()+"</td>";
- return key;
-
- /* TODO: implement
- String value=versionProps.getProperty(key);
- if (value==null) {
- // make it possible to have jars without version nos
- value=versionProps.getProperty(file.getName());
- }
- if (value==null) {
- // fall back on something obvious
- value=key;
- Date timestamp=new Date(file.lastModified());
- value+=" / "+timestamp.toString();
- }
- return value;
- */
- }
-
- /**
- * Split up a classpath-like variable. Returns a list of files.
- * TODO: this can't cope with relative paths. I think theres code in
BCEL that
- * can be used for this?
- */
- File[] splitClasspath(String path) throws IOException {
- java.util.StringTokenizer st=
- new java.util.StringTokenizer(path,
- System.getProperty("path.separator"));
- int toks=st.countTokens();
- File[] files=new File[toks];
- for(int i=0;i<toks;i++) {
- files[i]=new File(st.nextToken());
- }
- return files;
- }
-
- /** given a list of files, return a list of jars which actually exist */
- File[] scanFiles(File[] files) throws IOException {
- File[] jars=new File[files.length];
- int found=0;
- for (int i=0; i<files.length; i++) {
- if (files[i].getName().toLowerCase().endsWith(".jar")
- && files[i].exists()) {
- jars[found]=files[i];
- found++;
- }
- }
- if (found<files.length) {
- File[] temp=new File[found];
- System.arraycopy(jars,0,temp,0,found);
- jars=temp;
- }
- return jars;
- }
-
- private static final File[] NO_FILES=new File[0];
-
- /** scan a directory for jars */
- public File[] scanDir(String dir) throws IOException
- {
- if(dir==null) {
- return NO_FILES;
- }
- return scanDir(new File(dir));
- }
-
- public File[] scanDir(File dir) throws IOException {
- if (!dir.exists() || !dir.isDirectory()) {
- return NO_FILES;
- }
- return scanFiles(dir.listFiles());
- }
-
- /** scan a classpath for jars */
- public File[] scanClasspath(String path) throws IOException {
- if (path==null) {
- return NO_FILES;
- }
- return scanFiles(splitClasspath(path));
- }
-
- /**
- * scan a 'dirpath' (like the java.ext.dirs system property) for jars
- */
- public File[] scanDirpath(String path) throws IOException {
- if (path==null) {
- return NO_FILES;
- }
- File[] current=new File[0];
- File[] dirs=splitClasspath(path);
- for(int i=0; i<dirs.length; i++) {
- File[] jars=scanDir(dirs[i]);
- File[] temp=new File[current.length+jars.length];
- System.arraycopy(current,0,temp,0,current.length);
- System.arraycopy(jars,0,temp,current.length,jars.length);
- current=temp;
- }
- return scanFiles(current);
- }
-
- /** print out the jar versions for a directory */
- public void listDirectory(String title, JspWriter out,String dir, String
comment) throws IOException {
- listVersions(title, out,scanDir(dir), comment);
- }
-
- /** print out the jar versions for a directory-like system property */
- public void listDirProperty(String title, JspWriter out,String key,
String comment) throws IOException {
- listVersions(title, out,scanDir(System.getProperty(key)), comment);
- }
-
- /** print out the jar versions for a classpath-like system property */
- public void listClasspathProperty(String title, JspWriter out,String
key, String comment) throws IOException {
- listVersions(title, out,scanClasspath(System.getProperty(key)),
comment);
- }
-
- /** print out the jar versions for a 'java.ext.dirs'-like system
property */
- public void listDirpathProperty(String title, JspWriter out,String key,
String comment) throws IOException {
- listVersions(title, out,scanDirpath(System.getProperty(key)),
comment);
- }
-
- /** print out the jar versions for a context-relative directory */
- public void listContextPath(String title, JspWriter out, String path,
String comment) throws IOException {
- listVersions(title,
out,scanDir(getServletConfig().getServletContext().getRealPath(path)),
comment);
- }
-
- /** print out the jar versions for a given list of files */
- public void listVersions(String title, JspWriter out,File[] jars, String
comment) throws IOException {
- out.print("<h2>");
- out.print(title);
- out.println("</h2>");
- out.println("<table>");
- for (int i=0; i<jars.length; i++) {
- out.println("<tr>"+getFileVersion(jars[i])+"</tr>");
- }
- out.println("</table>");
- if(comment!=null && comment.length()>0) {
- out.println("<p>");
- out.println(comment);
- out.println("<p>");
- }
- }
-
-%>
-<h1>System Fingerprint</h1>
-<h2>JVM and Server Version</h2>
-<table>
-<tr>
- <td>Servlet Engine</td>
- <td><%= getServletConfig().getServletContext().getServerInfo() %></td>
- <td><%= getServletConfig().getServletContext().getMajorVersion() %></td>
- <td><%= getServletConfig().getServletContext().getMinorVersion() %></td>
-</tr>
-<tr>
- <td>Java VM</td>
- <td><%= System.getProperty("java.vm.vendor") %></td>
- <td><%= System.getProperty("java.vm.name") %></td>
- <td><%= System.getProperty("java.vm.version") %></td>
-</tr>
-<tr>
- <td>Java RE</td>
- <td><%= System.getProperty("java.vendor") %></td>
- <td><%= System.getProperty("java.version") %></td>
- <td> </td>
-</tr>
-<tr>
- <td>Platform</td>
- <td><%= System.getProperty("os.name") %></td>
- <td><%= System.getProperty("os.arch") %></td>
- <td><%= System.getProperty("os.version") %></td>
-</tr>
-</table>
-
-<%
-listClasspathProperty("Boot jars", out,"sun.boot.class.path", "Only valid on
a sun jvm");
-listClasspathProperty("System jars", out,"java.class.path", null);
-listDirpathProperty("Extra system jars", out,"java.ext.dirs", null);
-listContextPath("Webapp jars", out, "/WEB-INF/lib", null);
-// identify the container...
-String container=getServletConfig().getServletContext().getServerInfo();
-if (container.startsWith("Tomcat Web Server/3.2")) {
- String home=System.getProperty("tomcat.home");
- if(home!=null) {
- listDirectory("Tomcat 3.2 Common Jars", out,
- home+File.separator
- +"lib",
- null);
- }
-} else if (container.startsWith("Tomcat Web Server/3.3")) {
- String home=System.getProperty("tomcat.home");
- if(home!=null) {
- listDirectory("Tomcat 3.3 Container Jars", out,
- home+File.separator
- +"lib"+File.separator
- +"container",
- null);
- listDirectory("Tomcat 3.3 Common Jars", out,
- home+File.separator
- +"lib"+File.separator
- +"common",
- null);
- }
-} else if (container.startsWith("Apache Tomcat/4.0")) {
- //handle catalina common dir
- String home=System.getProperty("catalina.home");
- if(home!=null) {
- listDirectory("Tomcat 4.0 Common Jars", out,
- home+File.separator
- +"common"+File.separator
- +"lib",
- null);
- }
-} else if (container.startsWith("Apache Tomcat/4.1")) {
- //handle catalina common dir
- String home=System.getProperty("catalina.home");
- if(home!=null) {
- listDirectory("Tomcat 4.1 Common Jars", out,
- home+File.separator
- +"shared"+File.separator
- +"lib",
- null);
- }
-} else if (System.getProperty("resin.home")!=null) {
- String home=System.getProperty("resin.home");
- if(home!=null) {
- listDirectory("Resin Common Jars", out,
- home+File.separator
- +"lib",
- null);
- }
-} else if (System.getProperty("weblogic.httpd.servlet.classpath")!=null) {
- listClasspathProperty("Weblogic Servlet Jars", out,
- "weblogic.httpd.servlet.classpath",
- null);
-} else {
- //TODO: identify more servlet engine classpaths.
-}
-%>
-</body>
-</html>
\ No newline at end of file

Deleted: trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/Thumbs.db
===================================================================
(Binary files differ)

Deleted:
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/admin_home_target.gif
===================================================================
(Binary files differ)

Deleted: trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/apply_button.gif
===================================================================
(Binary files differ)

Deleted: trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/apply_button_2.gif
===================================================================
(Binary files differ)

Deleted: trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/arrow_icon.gif
===================================================================
(Binary files differ)

Deleted: trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/arrow_icon2.gif
===================================================================
(Binary files differ)

Deleted: trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/button_1_large.gif
===================================================================
(Binary files differ)

Deleted: trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/button_1_small.gif
===================================================================
(Binary files differ)

Deleted: trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/button_2_large.gif
===================================================================
(Binary files differ)

Deleted: trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/button_2_small.gif
===================================================================
(Binary files differ)

Deleted: trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/cancel_button.gif
===================================================================
(Binary files differ)

Deleted:
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/create_resource_button.gif
===================================================================
(Binary files differ)

Deleted:
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/delete_red_button.gif
===================================================================
(Binary files differ)

Deleted: trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/edit_button.gif
===================================================================
(Binary files differ)

Deleted:
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/edit_green_button.gif
===================================================================
(Binary files differ)

Deleted: trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/login_panel.gif
===================================================================
(Binary files differ)

Deleted: trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/logos.gif
===================================================================
(Binary files differ)

Deleted: trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/logout_button.gif
===================================================================
(Binary files differ)

Deleted:
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/manage_collections_off_tab.gif
===================================================================
(Binary files differ)

Deleted:
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/manage_collections_on_tab.gif
===================================================================
(Binary files differ)

Deleted:
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/manage_users_off_tab.gif
===================================================================
(Binary files differ)

Deleted:
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/manage_users_on_tab.gif
===================================================================
(Binary files differ)

Deleted: trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/step_1_bottom.gif
===================================================================
(Binary files differ)

Deleted: trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/step_1_slice.gif
===================================================================
(Binary files differ)

Deleted: trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/step_1_top.gif
===================================================================
(Binary files differ)

Deleted: trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/step_2_bottom.gif
===================================================================
(Binary files differ)

Deleted: trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/step_2_slice.gif
===================================================================
(Binary files differ)

Deleted: trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/step_2_top.gif
===================================================================
(Binary files differ)

Deleted: trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/testdepl_fail.gif
===================================================================
(Binary files differ)

Deleted: trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/testdepl_main.gif
===================================================================
(Binary files differ)

Deleted:
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/testdepl_return.gif
===================================================================
(Binary files differ)

Deleted:
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/testdepl_startbn.gif
===================================================================
(Binary files differ)

Deleted: trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/testdepl_succ.gif
===================================================================
(Binary files differ)

Deleted: trunk/perfsonar-java-sql-ma/conf/axis-1.4/happyaxis.jsp
===================================================================
--- trunk/perfsonar-java-sql-ma/conf/axis-1.4/happyaxis.jsp 2012-11-30
11:48:50 UTC (rev 6046)
+++ trunk/perfsonar-java-sql-ma/conf/axis-1.4/happyaxis.jsp 2012-12-03
13:50:47 UTC (rev 6047)
@@ -1,491 +0,0 @@
-<html>
-<%@ page contentType="text/html; charset=utf-8"
- import="java.io.InputStream,
- java.io.IOException,
- javax.xml.parsers.SAXParser,
- java.lang.reflect.*,
- javax.xml.parsers.SAXParserFactory"
- session="false" %>
-<%
-/*
- * Copyright 2002,2004,2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-%>
-
-<%!
- /*
- * Happiness tests for axis. These look at the classpath and warn if
things
- * are missing. Normally addng this much code in a JSP page is mad
- * but here we want to validate JSP compilation too, and have a drop-in
- * page for easy re-use
- * @author Steve 'configuration problems' Loughran
- * @author dims
- * @author Brian Ewins
- */
-
- /**
- * test for a class existing
- * @param classname
- * @return class iff present
- */
- Class classExists(String classname) {
- try {
- return Class.forName(classname);
- } catch (ClassNotFoundException e) {
- return null;
- }
- }
-
- /**
- * test for resource on the classpath
- * @param resource
- * @return true iff present
- */
- boolean resourceExists(String resource) {
- boolean found;
- InputStream instream=this.getClass().getResourceAsStream(resource);
- found=instream!=null;
- if(instream!=null) {
- try {
- instream.close();
- } catch (IOException e) {
- }
- }
- return found;
- }
-
- /**
- * probe for a class, print an error message is missing
- * @param out stream to print stuff
- * @param category text like "warning" or "error"
- * @param classname class to look for
- * @param jarFile where this class comes from
- * @param errorText extra error text
- * @param homePage where to d/l the library
- * @return the number of missing classes
- * @throws IOException
- */
- int probeClass(JspWriter out,
- String category,
- String classname,
- String jarFile,
- String description,
- String errorText,
- String homePage) throws IOException {
- try {
- Class clazz = classExists(classname);
- if(clazz == null) {
- String url="";
- if(homePage!=null) {
- url=getMessage("seeHomepage",homePage,homePage);
- }
-
out.write(getMessage("couldNotFound",category,classname,jarFile,errorText,url));
- return 1;
- } else {
- String location = getLocation(out, clazz);
-
- if(location == null) {
-
out.write("<li>"+getMessage("foundClass00",description,classname)+"</li><br>");
- }
- else {
-
out.write("<li>"+getMessage("foundClass01",description,classname,location)+"</li><br>");
- }
- return 0;
- }
- } catch(NoClassDefFoundError ncdfe) {
- String url="";
- if(homePage!=null) {
- url=getMessage("seeHomepage",homePage,homePage);
- }
- out.write(getMessage("couldNotFoundDep",category, classname,
errorText, url));
- out.write(getMessage("theRootCause",ncdfe.getMessage(),
classname));
- return 1;
- }
- }
-
- /**
- * get the location of a class
- * @param out
- * @param clazz
- * @return the jar file or path where a class was found
- */
-
- String getLocation(JspWriter out,
- Class clazz) {
- try {
- java.net.URL url =
clazz.getProtectionDomain().getCodeSource().getLocation();
- String location = url.toString();
- if(location.startsWith("jar")) {
- url =
((java.net.JarURLConnection)url.openConnection()).getJarFileURL();
- location = url.toString();
- }
-
- if(location.startsWith("file")) {
- java.io.File file = new java.io.File(url.getFile());
- return file.getAbsolutePath();
- } else {
- return url.toString();
- }
- } catch (Throwable t){
- }
- return getMessage("classFoundError");
- }
-
- /**
- * a class we need if a class is missing
- * @param out stream to print stuff
- * @param classname class to look for
- * @param jarFile where this class comes from
- * @param errorText extra error text
- * @param homePage where to d/l the library
- * @throws IOException when needed
- * @return the number of missing libraries (0 or 1)
- */
- int needClass(JspWriter out,
- String classname,
- String jarFile,
- String description,
- String errorText,
- String homePage) throws IOException {
- return probeClass(out,
- "<b>"+getMessage("error")+"</b>",
- classname,
- jarFile,
- description,
- errorText,
- homePage);
- }
-
- /**
- * print warning message if a class is missing
- * @param out stream to print stuff
- * @param classname class to look for
- * @param jarFile where this class comes from
- * @param errorText extra error text
- * @param homePage where to d/l the library
- * @throws IOException when needed
- * @return the number of missing libraries (0 or 1)
- */
- int wantClass(JspWriter out,
- String classname,
- String jarFile,
- String description,
- String errorText,
- String homePage) throws IOException {
- return probeClass(out,
- "<b>"+getMessage("warning")+"</b>",
- classname,
- jarFile,
- description,
- errorText,
- homePage);
- }
-
- /**
- * get servlet version string
- *
- */
-
- public String getServletVersion() {
- ServletContext context=getServletConfig().getServletContext();
- int major = context.getMajorVersion();
- int minor = context.getMinorVersion();
- return Integer.toString(major) + '.' + Integer.toString(minor);
- }
-
- /**
- * what parser are we using.
- * @return the classname of the parser
- */
- private String getParserName() {
- SAXParser saxParser = getSAXParser();
- if (saxParser == null) {
- return getMessage("couldNotCreateParser");
- }
-
- // check to what is in the classname
- String saxParserName = saxParser.getClass().getName();
- return saxParserName;
- }
-
- /**
- * Create a JAXP SAXParser
- * @return parser or null for trouble
- */
- private SAXParser getSAXParser() {
- SAXParserFactory saxParserFactory = SAXParserFactory.newInstance();
- if (saxParserFactory == null) {
- return null;
- }
- SAXParser saxParser = null;
- try {
- saxParser = saxParserFactory.newSAXParser();
- } catch (Exception e) {
- }
- return saxParser;
- }
-
- /**
- * get the location of the parser
- * @return path or null for trouble in tracking it down
- */
-
- private String getParserLocation(JspWriter out) {
- SAXParser saxParser = getSAXParser();
- if (saxParser == null) {
- return null;
- }
- String location = getLocation(out,saxParser.getClass());
- return location;
- }
-
- /**
- * Check if class implements specified interface.
- * @param Class clazz
- * @param String interface name
- * @return boolean
- */
- private boolean implementsInterface(Class clazz, String interfaceName) {
- if (clazz == null) {
- return false;
- }
- Class[] interfaces = clazz.getInterfaces();
- if (interfaces.length != 0) {
- for (int i = 0; i < interfaces.length; i++) {
- if (interfaces[i].getName().equals(interfaceName)) {
- return true;
- }
- }
- }
- return false;
- }
- %>
-
-<%@ include file="i18nLib.jsp" %>
-
-<%
- // initialize a private HttpServletRequest
- setRequest(request);
-
- // set a resouce base
- setResouceBase("i18n");
-%>
-
-<head>
-<title><%= getMessage("pageTitle") %></title>
-</head>
-<body bgcolor='#ffffff'>
-
-<%
- out.print("<h1>"+ getMessage("pageTitle") +"</h1>");
- out.print("<h2>"+ getMessage("pageRole") +"</h2><p/>");
-%>
-
-<%= getLocaleChoice() %>
-
-<%
- out.print("<h3>"+ getMessage("neededComponents") +"</h3>");
-%>
-
-<UL>
-<%
- int needed=0,wanted=0;
-
- /**
- * the essentials, without these Axis is not going to work
- */
-
- // need to check if the available version of SAAJ API meets requirements
- String className = "javax.xml.soap.SOAPPart";
- String interfaceName = "org.w3c.dom.Document";
- Class clazz = classExists(className);
- if (clazz == null || implementsInterface(clazz, interfaceName)) {
- needed = needClass(out, "javax.xml.soap.SOAPMessage",
- "saaj.jar",
- "SAAJ API",
- getMessage("criticalErrorMessage"),
- "http://ws.apache.org/axis/";);
- } else {
- String location = getLocation(out, clazz);
-
- out.print(getMessage("invalidSAAJ",location));
- out.print(getMessage("criticalErrorMessage"));
-
out.print(getMessage("seeHomepage","http://ws.apache.org/axis/java/install.html",getMessage("axisInstallation")));
- out.print("<br>");
- }
-
- needed+=needClass(out, "javax.xml.rpc.Service",
- "jaxrpc.jar",
- "JAX-RPC API",
- getMessage("criticalErrorMessage"),
- "http://ws.apache.org/axis/";);
-
- needed+=needClass(out, "org.apache.axis.transport.http.AxisServlet",
- "axis.jar",
- "Apache-Axis",
- getMessage("criticalErrorMessage"),
- "http://ws.apache.org/axis/";);
-
- needed+=needClass(out, "org.apache.commons.discovery.Resource",
- "commons-discovery.jar",
- "Jakarta-Commons Discovery",
- getMessage("criticalErrorMessage"),
- "http://jakarta.apache.org/commons/discovery/";);
-
- needed+=needClass(out, "org.apache.commons.logging.Log",
- "commons-logging.jar",
- "Jakarta-Commons Logging",
- getMessage("criticalErrorMessage"),
- "http://jakarta.apache.org/commons/logging/";);
-
- needed+=needClass(out, "org.apache.log4j.Layout",
- "log4j-1.2.8.jar",
- "Log4j",
- getMessage("uncertainErrorMessage"),
- "http://jakarta.apache.org/log4j";);
-
- //should we search for a javax.wsdl file here, to hint that it needs
- //to go into an approved directory? because we dont seem to need to do
that.
- needed+=needClass(out, "com.ibm.wsdl.factory.WSDLFactoryImpl",
- "wsdl4j.jar",
- "IBM's WSDL4Java",
- getMessage("criticalErrorMessage"),
- null);
-
- needed+=needClass(out, "javax.xml.parsers.SAXParserFactory",
- "xerces.jar",
- "JAXP implementation",
- getMessage("criticalErrorMessage"),
- "http://xml.apache.org/xerces-j/";);
-
- needed+=needClass(out,"javax.activation.DataHandler",
- "activation.jar",
- "Activation API",
- getMessage("criticalErrorMessage"),
- "http://java.sun.com/products/javabeans/glasgow/jaf.html";);
-%>
-</UL>
-<%
- out.print("<h3>"+ getMessage("optionalComponents") +"</h3>");
-%>
-<UL>
-<%
- /*
- * now the stuff we can live without
- */
- wanted+=wantClass(out,"javax.mail.internet.MimeMessage",
- "mail.jar",
- "Mail API",
- getMessage("attachmentsError"),
- "http://java.sun.com/products/javamail/";);
-
- wanted+=wantClass(out,"org.apache.xml.security.Init",
- "xmlsec.jar",
- "XML Security API",
- getMessage("xmlSecurityError"),
- "http://xml.apache.org/security/";);
-
- wanted += wantClass(out, "javax.net.ssl.SSLSocketFactory",
- "jsse.jar or java1.4+ runtime",
- "Java Secure Socket Extension",
- getMessage("httpsError"),
- "http://java.sun.com/products/jsse/";);
- /*
- * resources on the classpath path
- */
- /* add more libraries here */
-
-%>
-</UL>
-<%
- out.write("<h3>");
- //is everythng we need here
- if(needed==0) {
- //yes, be happy
- out.write(getMessage("happyResult00"));
- } else {
- //no, be very unhappy
- response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
- out.write(getMessage("unhappyResult00",Integer.toString(needed)));
- }
- //now look at wanted stuff
- if(wanted>0) {
- out.write(getMessage("unhappyResult01",Integer.toString(wanted)));
- } else {
- out.write(getMessage("happyResult01"));
- }
- out.write("</h3>");
-%>
-<UL>
-<%
-
- //hint if anything is missing
- if(needed>0 || wanted>0 ) {
- out.write(getMessage("hintString"));
- }
-
- out.write(getMessage("noteString"));
-%>
-</UL>
-
- <h2><%= getMessage("apsExamining") %></h2>
-
-<UL>
- <%
- String servletVersion=getServletVersion();
- String xmlParser=getParserName();
- String xmlParserLocation = getParserLocation(out);
- %>
- <table border="1" cellpadding="10">
- <tr><td>Servlet version</td><td><%= servletVersion %></td></tr>
- <tr><td>XML Parser</td><td><%= xmlParser %></td></tr>
- <tr><td>XML ParserLocation</td><td><%= xmlParserLocation %></td></tr>
- </table>
-</UL>
-
-<% if(xmlParser.indexOf("crimson")>=0) { %>
- <p>
- <%= getMessage("recommendedParser") %>
- </p>
-<% } %>
-
- <h2><%= getMessage("sysExamining") %></h2>
-<UL>
-<%
- /**
- * Dump the system properties
- */
- java.util.Enumeration e=null;
- try {
- e= System.getProperties().propertyNames();
- } catch (SecurityException se) {
- }
- if(e!=null) {
- out.write("<pre>");
- for (;e.hasMoreElements();) {
- String key = (String) e.nextElement();
- out.write(key + "=" + System.getProperty(key)+"\n");
- }
- out.write("</pre><p>");
- } else {
- out.write(getMessage("sysPropError"));
- }
-%>
-</UL>
- <hr>
- <%= getMessage("apsPlatform") %>:
- <%= getServletConfig().getServletContext().getServerInfo() %>
-</body>
-</html>

Deleted: trunk/perfsonar-java-sql-ma/conf/axis-1.4/i18nLib.jsp
===================================================================
--- trunk/perfsonar-java-sql-ma/conf/axis-1.4/i18nLib.jsp 2012-11-30
11:48:50 UTC (rev 6046)
+++ trunk/perfsonar-java-sql-ma/conf/axis-1.4/i18nLib.jsp 2012-12-03
13:50:47 UTC (rev 6047)
@@ -1,221 +0,0 @@
-<%@ page import="java.util.*" %>
-<%
-/*
- * Copyright 2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-%>
-
-<%!
- /*
- * A library file to produce i18n web applications. This can be easily
- * reused from your jsp(s) - just include and call any methods.
- * @author toshi
- */
-
- // private variable
- HttpServletRequest _req = null;
-
- // private variable
- String _strResourceName = null;
-
- /**
- * Set a HttpServletRequest to a private variable.
- * @param request HttpServletRequest
- */
- void setRequest(HttpServletRequest request) {
- _req = request;
- }
-
- /**
- * Get the private variable of the HttpServletRequest.
- * @return HttpServletRequest
- */
- HttpServletRequest getRequest() {
- return _req;
- }
-
- /**
- * Set a resouce base name to a private variable.
- * @param resouce The resouce base name
- */
- void setResouceBase(String resource) {
- _strResourceName = resource;
- }
-
- /**
- * Get the private variable of the resouce base name.
- * @return resouce The resouce base name
- */
- String getResouceBase() {
- return _strResourceName;
- }
-
- /**
- * Get a ResourceBundle object.
- * @return a ResourceBundle object
- */
- ResourceBundle getRB() {
- String strLocale = getRequest().getParameter("locale");
- ResourceBundle objRb = null;
- Locale objLcl = null;
-
- if (strLocale!=null) {
- objLcl=new Locale(strLocale,"");
- } else {
- objLcl=getRequest().getLocale();
- }
-
- Locale.setDefault(objLcl);
- objRb = ResourceBundle.getBundle(getResouceBase(),objLcl);
-
- return objRb;
- }
-
- /**
- * Get a list of locale choice
- * @return a list of supported locales
- */
- String getLocaleChoice() {
- String choice = getMessage("locales");
- StringBuffer buf = new StringBuffer();
-
- buf.append("<div align=\"right\">\n");
- buf.append(getMessage("language"));
- buf.append(": ");
-
- StringTokenizer st = new StringTokenizer(choice);
- String locale = null;
- while (st.hasMoreTokens()) {
- locale = st.nextToken();
- buf.append("[<a href=\"?locale="+ locale +"\">"+ locale +"</a>]
");
- }
- buf.append("\n</div>\n");
-
- return buf.toString();
- }
-
- /**
- * Get a message from i18n.properties with several arguments.
- * @param key The resource key
- * @return The formatted message
- */
- String getMessage(String key) {
- return getMessage(key, null, null, null, null, null);
- }
-
- /**
- * Get a message from i18n.properties with several arguments.
- * @param key The resource key
- * @param arg0 The argument to place in variable {0}
- * @return The formatted message
- */
- String getMessage(String key, String arg0) {
- return getMessage(key, arg0, null, null, null, null);
- }
-
- /**
- * Get a message from i18n.properties with several arguments.
- * @param key The resource key
- * @param arg0 The argument to place in variable {0}
- * @param arg1 The argument to place in variable {1}
- * @return The formatted message
- */
- String getMessage(String key, String arg0, String arg1) {
- return getMessage(key, arg0, arg1, null, null, null);
- }
-
- /**
- * Get a message from i18n.properties with several arguments.
- * @param key The resource key
- * @param arg0 The argument to place in variable {0}
- * @param arg1 The argument to place in variable {1}
- * @param arg2 The argument to place in variable {2}
- * @return The formatted message
- */
- String getMessage(String key, String arg0, String arg1, String arg2) {
- return getMessage(key, arg0, arg1, arg2, null, null);
- }
-
- /**
- * Get a message from i18n.properties with several arguments.
- * @param key The resource key
- * @param arg0 The argument to place in variable {0}
- * @param arg1 The argument to place in variable {1}
- * @param arg2 The argument to place in variable {2}
- * @param arg3 The argument to place in variable {3}
- * @return The formatted message
- */
- String getMessage(String key, String arg0, String arg1,
- String arg2, String arg3) {
- return getMessage(key, arg0, arg1, arg2, arg3, null);
- }
-
- /**
- * Get a message from i18n.properties with several arguments.
- * @param key The resource key
- * @param arg0 The argument to place in variable {0}
- * @param arg1 The argument to place in variable {1}
- * @param arg2 The argument to place in variable {2}
- * @param arg3 The argument to place in variable {3}
- * @param arg4 The argument to place in variable {4}
- * @return The formatted message
- */
- String getMessage(String key, String arg0, String arg1,
- String arg2, String arg3, String arg4) {
- String strPattern = getRB().getString(key);
-
- String [] params = { arg0, arg1, arg2, arg3, arg4 };
- for (int i=0; i<5; i++) {
- if (params[i]!=null) params[i]=replaceAll(params[i],"%20"," ");
- }
-
- if (arg0!=null) strPattern = replaceAll(strPattern,"{0}",params[0]);
- if (arg1!=null) strPattern = replaceAll(strPattern,"{1}",params[1]);
- if (arg2!=null) strPattern = replaceAll(strPattern,"{2}",params[2]);
- if (arg3!=null) strPattern = replaceAll(strPattern,"{3}",params[3]);
- if (arg4!=null) strPattern = replaceAll(strPattern,"{4}",params[4]);
-
- return strPattern;
- }
-
- /**
- * Get a replaced string by the specified message.
- * @param source The original message
- * @param pattern The key message for replacing
- * @param replace The message to place in the key variable - 'pattern'
- * @return The replaced message
- */
- String replaceAll(String source, String pattern, String replace)
- {
- int i=0;
- boolean ret = false;
- StringBuffer buf = new StringBuffer();
-
- int lenSource = source.length();
- int lenPattern = pattern.length();
-
- for (i=0; i<lenSource; i++) {
- ret = source.regionMatches(i, pattern, 0, lenPattern);
- if (ret) {
- buf.append(source.substring(0,i));
- buf.append(replace);
- buf.append(source.substring(i+lenPattern));
- source = replaceAll(buf.toString(), pattern, replace);
- break;
- }
- }
- return source;
- }
-%>
\ No newline at end of file

Deleted: trunk/perfsonar-java-sql-ma/conf/axis-1.4/index.jsp
===================================================================
--- trunk/perfsonar-java-sql-ma/conf/axis-1.4/index.jsp 2012-11-30 11:48:50
UTC (rev 6046)
+++ trunk/perfsonar-java-sql-ma/conf/axis-1.4/index.jsp 2012-12-03 13:50:47
UTC (rev 6047)
@@ -1,156 +0,0 @@
-<%@ page
import="perfSONARWebAdmin.auxiliary.PerfsonarProperties,perfSONARWebAdmin.auxiliary.PerfsonarPropertiesImpl,perfSONARWebAdmin.auxiliary.PerfsonarProperty,java.io.File,java.io.FileInputStream,java.io.FileOutputStream,java.io.IOException"
%>
-
-<html>
- <head>
- <title>perfSONAR Service Web Administration page</title>
- <link rel="stylesheet" type="text/css" href="main.css"/>
- <meta http-equiv="Content-Type" content="text/html;
charset=iso-8859-1">
- <script src="Service_Admin.js"></script>
- <script src="liveclock.js"></script>
-
- <style type="text/css">
- <!--
-
- a {
- }
-
- .style3 {
- color: #8585c1;
- font-size: 13px;
- }
-
- .style3 a:link {
- color: #8585C1;
- cursor: pointer;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 12px;
- }
-
- .style3 a:active {
- color: #117721;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 12px;
- }
-
- .style3 a:visited {
- color: #8585C1;
- cursor: auto;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 12px;
- /*font-weight: bold;*/
- }
-
-
- .style3 a:hover {
- color: #8585C1;
- cursor: pointer;
- text-decoration: underline;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 12px;
- }
- -->
- </style>
- </head>
- <body>
- <%
- String confPath = "WEB-INF/classes/perfsonar/conf/";
- String ServicePropertiesPath = confPath+ "service.properties";
- ServletContext sc = getServletContext();
- String ServicePath = sc.getRealPath("/");
- PerfsonarProperty property = new PerfsonarProperty();
- PerfsonarProperties serviceProperties = new PerfsonarPropertiesImpl();
- serviceProperties.loadProperties(new FileInputStream(ServicePath
- + ServicePropertiesPath));
-
- String serviceName=
serviceProperties.getProperty("service.r.service_name").getValue().trim();
- String serviceVersion=
serviceProperties.getProperty("service.r.service_version").getValue().trim();
-
-
- %>
- <div class="adminPanel">
- <div class="banner">
- <table border="0" align="left" cellpadding="0" cellspacing="0">
- <tr>
- <td>
- <a href="welcome.htm" target="main"><img
src="perfsonar_logo.gif" alt="perfSONAR" width="192" height="94" border="0"
align="right"></a>
- </td>
- <td>
- <table>
- <tr>
- <td id="date">
- <script type="text/javascript">
- <!--
- show_clock();
- //-->
- </script>
- </td>
- </tr>
- <tr>
- <td id="serviceName"><%=serviceName %>
&nbsp;<%=serviceVersion%></td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
- </div>
- <div class="mainWindow">
- <div class="sidebar">
- <table border="0" cellpadding="0" cellspacing="0">
- <tr>
- <th>
- <a href="welcome.htm" class="button"
target="main">Admin home &nbsp; &nbsp; &nbsp;</a>
- </th>
- </tr>
- <tr>
- <td>
- <p>
- <span class="navtexheading">Basic
- <br>
- Configuration
- </span>
- </p>
- <p>
- <span class="navtex"><a href="Wizard"
target="main">Service</a></span>
- <br>
- <a href="testdepl.jsp"
target="main">Test</a>
- </p>
- </td>
- </tr>
-
- <tr>
- <td>
- <p>
- <span class="navtexheading
style3">Advanced
- <br>
- Configuration
- </span>
- </p>
- <p>
- <span class="navtex style3"><a
href="ServiceAdmin?serviceProperties" target="main">Service</a>
- <br>
- <a
href="ServiceAdmin?loggingProperties" target="main">Logging</a>
- <br>
- <a href="eXistAdmin"
target="main">eXist Database</a>
- <br>
- <a href="SQLMAdmin"
target="main">SQL MA Admin</a>
- <br>
- </span>
- </p>
- </td>
- </tr>
- <tr>
- </tr>
- </table>
- <img src="graphics/logos.gif" alt="perfSONAR project
partners" width="117" height="263" border="0" align="top"/>
- </div>
- <div class="centerWindow">
- <object data="welcome.htm" type="text/html" name="main"
width="99%" height="100%">
- </object>
- </div>
- </div>
- <div class="footer">
- PERFormance Service-Oriented Network monitoring ARchitecture
&nbsp;
- </div>
- </div>
- </body>
-</html>

Deleted: trunk/perfsonar-java-sql-ma/conf/axis-1.4/liveclock.js
===================================================================
--- trunk/perfsonar-java-sql-ma/conf/axis-1.4/liveclock.js 2012-11-30
11:48:50 UTC (rev 6046)
+++ trunk/perfsonar-java-sql-ma/conf/axis-1.4/liveclock.js 2012-12-03
13:50:47 UTC (rev 6047)
@@ -1,173 +0,0 @@
-///////////////////////////////////////////////////////////
-// "Live Clock Advanced" script - Version 1.0
-// By Mark Plachetta
()
-//
-// Get the latest version at:
-// http://www.zip.com.au/~astroboy/liveclock/
-//
-// Based on the original script: "Upper Corner Live Clock"
-// available at:
-// - Dynamic Drive (http://www.dynamicdrive.com)
-// - Website Abstraction (http://www.wsabstract.com)
-// ========================================================
-// CHANGES TO ORIGINAL SCRIPT:
-// - Gave more flexibility in positioning of clock
-// - Added date construct (Advanced version only)
-// - User configurable
-// ========================================================
-// Both "Advanced" and "Lite" versions are available free
-// of charge, see the website for more information on the
-// two scripts.
-///////////////////////////////////////////////////////////
-
-///////////////////////////////////////////////////////////
-/////////////// CONFIGURATION /////////////////////////////
-
- // Set the clock's font face:
- var myfont_face = "Verdana";
-
- // Set the clock's font size (in point):
- var myfont_size = "10";
-
- // Set the clock's font color:
- var myfont_color = "#000000";
-
- // Set the clock's background color:
- var myback_color = "#FFFFFF";
-
- // Set the text to display before the clock:
- var mypre_text = "";
-
- // Set the width of the clock (in pixels):
- var mywidth = 300;
-
- // Display the time in 24 or 12 hour time?
- // 0 = 24, 1 = 12
- var my12_hour = 0;
-
- // How often do you want the clock updated?
- // 0 = Never, 1 = Every Second, 2 = Every Minute
- // If you pick 0 or 2, the seconds will not be displayed
- var myupdate = 1;
-
- // Display the date?
- // 0 = No, 1 = Yes
- var DisplayDate = 1;
-
-/////////////// END CONFIGURATION /////////////////////////
-///////////////////////////////////////////////////////////
-
-// Browser detect code
- var ie4=document.all
- var ns4=document.layers
- var ns6=document.getElementById&&!document.all
-
-// Global varibale definitions:
-
- var dn = "";
- var mn = "th";
- var old = "";
-
-// The following arrays contain data which is used in the clock's
-// date function. Feel free to change values for Days and Months
-// if needed (if you wanted abbreviated names for example).
- var DaysOfWeek = new Array(7);
- DaysOfWeek[0] = "Sun";
- DaysOfWeek[1] = "Mon";
- DaysOfWeek[2] = "Tue";
- DaysOfWeek[3] = "Wed";
- DaysOfWeek[4] = "Thu";
- DaysOfWeek[5] = "Fri";
- DaysOfWeek[6] = "Sat";
-
- var MonthsOfYear = new Array(12);
- MonthsOfYear[0] = "Jan";
- MonthsOfYear[1] = "Feb";
- MonthsOfYear[2] = "Mar";
- MonthsOfYear[3] = "Apr";
- MonthsOfYear[4] = "May";
- MonthsOfYear[5] = "Jun";
- MonthsOfYear[6] = "Jul";
- MonthsOfYear[7] = "Aug";
- MonthsOfYear[8] = "Sep";
- MonthsOfYear[9] = "Oct";
- MonthsOfYear[10] = "Nov";
- MonthsOfYear[11] = "Dec";
-
-// This array controls how often the clock is updated,
-// based on your selection in the configuration.
- var ClockUpdate = new Array(3);
- ClockUpdate[0] = 0;
- ClockUpdate[1] = 1000;
- ClockUpdate[2] = 60000;
-
-
-// The main part of the script:
- function show_clock() {
- if (old == "die") { return; }
-
- //show clock in NS 4
- if (ns4)
- document.ClockPosNS.visibility="show"
- // Get all our date variables:
- var Digital = new Date();
- var day = Digital.getDay();
- var mday = Digital.getDate();
- var month = Digital.getMonth();
- var hours = Digital.getHours();
-
- var minutes = Digital.getMinutes();
- var seconds = Digital.getSeconds();
-
- // Fix the "mn" variable if needed:
- if (mday == 1) { mn = "st"; }
- else if (mday == 2) { mn = "nd"; }
- else if (mday == 3) { mn = "rd"; }
- else if (mday == 21) { mn = "st"; }
- else if (mday == 22) { mn = "nd"; }
- else if (mday == 23) { mn = "rd"; }
- else if (mday == 31) { mn = "st"; }
- mn = "";
-
- // Set up the hours for either 24 or 12 hour display:
- if (my12_hour) {
- dn = "AM";
- if (hours > 12) { dn = "PM"; hours = hours - 12; }
- if (hours == 0) { hours = 12; }
- } else {
- dn = "";
- }
- if (minutes <= 9) { minutes = "0"+minutes; }
- if (seconds <= 9) { seconds = "0"+seconds; }
-
- // This is the actual HTML of the clock. If you're going to play
around
- // with this, be careful to keep all your quotations in tact.
- myclock = '';
- myclock += '<font style="color:'+myfont_color+';
font-family:'+myfont_face+'; font-size:'+myfont_size+'pt;">';
- myclock += Digital.toGMTString();
- myclock += '</font>';
-
- document.getElementById("date").innerHTML = myclock
- //document.write(myclock);
- if (old == "true") {
- old = "die";
- return;
- }
-
- // Write the clock to the layer:
- /*
- if (ns4) {
- clockpos = document.ClockPosNS;
- liveclock = clockpos.document.LiveClockNS;
- liveclock.document.write(myclock);
- liveclock.document.close();
- } else if (ie4) {
- LiveClockIE.innerHTML = myclock;
- } else if (ns6){
- document.getElementById("LiveClockIE").innerHTML =
myclock;
- }
- */
-
-
- if (myupdate != 0) {
setTimeout("show_clock()",ClockUpdate[myupdate]); }
-}

Deleted: trunk/perfsonar-java-sql-ma/conf/axis-1.4/main.css
===================================================================
--- trunk/perfsonar-java-sql-ma/conf/axis-1.4/main.css 2012-11-30 11:48:50
UTC (rev 6046)
+++ trunk/perfsonar-java-sql-ma/conf/axis-1.4/main.css 2012-12-03 13:50:47
UTC (rev 6047)
@@ -1,487 +0,0 @@
-/* standard elements */
-
-html {min-height: 100%;}
-
-
-
-* {
- margin: 0;
- padding: 0;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- text-decoration: none;
- border-top-style: none;
- border-right-style: none;
- border-bottom-style: none;
- border-left-style: none;
-}
-
-
-body{
- background-color: #C0C0C0;
- width: 100%;
- height: 100%;
- }
-a:link {
- color: #468C46;
- cursor: pointer;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 13px;
-}
-a:active {
- color: #117721;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 13px;
- font-weight: bold;
-}
-a:visited {
- color: #468C46;
- cursor: auto;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 13px;
-}
-a:hover {
- color: #468C46;
- cursor: pointer;
- text-decoration: underline;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 13px;
-}
-
-.adminPanel{
- width: 94%;
- height: 50%;
- float:left;
- margin-left: 3%;
- margin-right: 5%;
- background-color: #ffffff;
- margin-bottom: 2%;
-}
-.navtex {
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 13px;
- color: #468C46;
- text-align: right;
- font-style: normal;
- font-weight: normal;
- line-height: 28px;
- background-image: none;
-}
-
-.navtexheading {
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 13px;
- color: #468C46;
- text-align: right;
- font-style: normal;
- font-weight: bold;
- line-height: normal;
-
-}
-.welcometext {
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 13px;
- color: #468C46;
- border-bottom-width: 1px;
- border-bottom-style: dotted;
- border-bottom-color: #468C46;
- padding-top: 10px;
- padding-bottom: 8px;
- padding-right: 0px;
- clip: rect(auto,auto,auto,auto);
- margin-right: 0px;
- margin-left: 2%;
-}
-.heading1 {
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 14px;
- color: #468C46;
- padding-top: 23px;
- padding-bottom: 23px;
- font-weight: bold;
- margin-left: 2%;
-}
-
-.bodytext1 {
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 11px;
- color: #333333;
- width: 100%;
- margin-left: 18%;
- font-weight: normal;
- line-height: 22px;
-}
-
-.bodytextgreenline {
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 11px;
- color: #333333;
- margin-left: 18%;
- font-weight: normal;
- line-height: 18px;
- border-bottom-width: 1px;
- border-bottom-style: dotted;
- border-bottom-color: #468C46;
- padding-bottom: 11pt;
-}
-
-.contenttable {
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 12px;
- color: #468C46;
- padding-top: 0px;
- margin-left: 20px;
- font-weight: bold;
- background-color: #FFFFFF;
-}
-.configheadinglavender {
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 12px;
- color: #8585C1;
- font-weight: bold;
- background-image: url(graphics/arrow_icon2.gif);
- background-repeat: no-repeat;
- background-position: 17px top;
- padding-left: 38px;
-}
-
-.configheadinglavender a:link {
- color: #8585C1;
- cursor: pointer;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 13px;
-}
-.configheadinglavender a:active {
- color: #117721;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 13px;
- font-weight: bold;
-}
-.configheadinglavender a:visited {
- color: #8585C1;
- cursor: auto;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 13px;
-}
-.configheadinglavender a:hover {
- color: #8585C1;
- cursor: pointer;
- text-decoration: underline;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 13px;
-}
-
-
-.configheading {
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 12px;
- color: #27752C;
- font-weight: bold;
- background-image: url(graphics/arrow_icon.gif);
- background-repeat: no-repeat;
- background-position: 17px top;
- padding-left: 38px;
-}
-
-.configheading a:link {
- color: #27752C;
- cursor: pointer;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 13px;
-}
-.configheading a:active {
- color: #117721;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 13px;
- font-weight: bold;
-}
-.configheading a:visited {
- color: #27752C;
- cursor: auto;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 13px;
-}
-.configheading a:hover {
- color: #27752C;
- cursor: pointer;
- text-decoration: underline;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 13px;
-}
-
-.banner{
- margin: 5px;
- width: 99%;
- height: 94px;
- background-image: url(top_slice.gif);
- background-color: #FFFFFF;
- padding: 0px;
- clip: rect(auto,auto,auto,auto);
- float:left;
-}
-#date{
- padding-top:5px;
- float:right;
- text-align:right;
- margin-left: 79.5%;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 13px;
-}
-
-#serviceName{
- padding-top:5px;
- float:right;
- text-align:right;
- margin-left: 79.5%;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 13px;
- font-weight:bold;
-}
-
-.mainWindow{
- border: none;
- padding: 0px;
- width: 100%;
- height: 750px;
- background-color: #ffffff;
-}
-.centerWindow{
- background-color: #FFFFFF;
- width: 82%;
- height:80%;
- margin-right: 5px;
- margin-bottom: 5px;
- margin-left: 0;
- float: left;
-}
-.centerWindow object{
- width: 101%;
- height: 105%;
- background-color: #FFFFFF;
-}
-
-.welcomepage{
- background-color: #FFFFFF;
- width: 100%;
- height: 100%;
-}
-
-/* Sidebar*/
-
-.sidebar{
- width: 15%;
- height: 71.1%;
- padding-bottom: 12.1%;
- padding-right: 0px;
- float: left;
- border-right-width: 1px;
- border-right-style: solid;
- border-right-color: #61AF61;
- margin-top: 0px;
- margin-right: 5px;
- margin-bottom: 5px;
- margin-left: 5px;
-}
-.sidebar th{
- color: #ffffff;
- text-align: right;
- background-color: #61AF61;
- width: 15%;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 12px;
- font-weight: normal;
- text-decoration:none;
- background-repeat: no-repeat;
-
- padding-top: 10px;
- padding-right: 8%;
- padding-bottom: 10px;
- padding-left: 10px;
-}
-.sidebar td{
- text-align: right;
- background-color: #ffffff;
- padding: 10px;
- border-bottom-width: 1px;
- border-bottom-style: dotted;
- border-bottom-color: #92C992;
-}
-.sidebar a.button {
- color: #ffffff;
- text-align:left;
- background-color: #61AF61;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 12px;
- font-weight: normal;
- text-decoration:none;
- background-position: 100% 50%;
- background-image: url(graphics/admin_home_target.gif);
- background-repeat: no-repeat;
-
-}
-
-
-
-.sidebar a{
- font-weight: normal;
- padding-top: 0px;
- padding-right: 0px;
- padding-bottom: 0px;
- padding-left: 0px;
- margin-bottom: 0px;
-}
-
-.sidebar img{
- float: right;
- border: none;
- padding-top: 0px;
- padding-right: 0px;
- padding-bottom: 0px;
-}
-
-
-.footer{
- height: 20px;
- text-align: right;
- color: #61AF61;
- background-color: #ffffff;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 10px;
- border-top-width: 1px;
- border-top-style: dotted;
- border-top-color: #61AF61;
- padding-top: 12px;
- width: 100%;
- border-right-style: none;
- border-right-color: #FFFFFF;
- border-left-color: #FFFFFF;
- float: none;
-}
-.footermain {
- height: 20px;
- text-align: right;
- color: #61AF61;
- background-color: #ffffff;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 10px;
- border-top-width: 1px;
- border-top-style: dotted;
- border-top-color: #61AF61;
- padding-top: 5px;
- width: 100%;
- border-right-style: none;
- border-right-color: #FFFFFF;
- border-left-color: #FFFFFF;
- }
-
-.execute_button_testdepl {
- display: block;
- margin-top: 5px;
- width: 120px;
- height: 30px;
- float: right;
- border: none;
- font-family: Helvetica, Calibri, Arial, sans-serif;
- font-size: 60%;
- font-weight: 400;
- text-decoration: none;
- cursor: pointer;
- background: transparent url(graphics/button_2_medium.gif) no-repeat
center;
-}
-
-.testdeplmain {
- text-align: left;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 12px;
-/* font-weight:bold;;*/
-/* margin-left: -20%;*/
- margin-left: 2%;
- border-width: 1px;
- border-color: #61AF61;
- padding: 5px;
- width: 556px;
- height:108px;
- background: transparent url(graphics/testdepl_main.gif) no-repeat
center;
-}
-
-.testdeplsucc {
- text-align: left;
- float: left;
- /*font-weight:bold;;*/
- text-decoration: none;
-/* margin-left: -20%;*/
- margin-left: 2%;
- padding: 5px;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 12px;
- border:solid;
- border-width: 1px;
- border-color: #61AF61;
- width: 544px;
- height: 220px;
- background: transparent url(graphics/testdepl_succ.gif) no-repeat center;
-}
-
-.testdeplfail {
- text-align: left;
- float: left;
-/* font-weight:bold;;*/
- text-decoration: none;
- padding: 5px;
- margin-left: 2%;
- /*margin-left: -20%;*/
- height: 105px;
- width:555px;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 12px;
- border:solid;
- border-width: 1px;
- border-color: #61AF61;
- background: transparent url(graphics/testdepl_fail.gif) no-repeat
center;
-}
-
-.testdeplstartbn {
- display: block;
- margin-top: 5px;
- width: 120px;
- height: 30px;
- float: right;
- border: none;
- font-family: Helvetica, Calibri, Arial, sans-serif;
- font-size: 60%;
- font-weight: 400;
- text-decoration: none;
- cursor: pointer;
- background: transparent url(graphics/testdepl_startbn.gif) no-repeat
center;
-}
-
-.testdeplretbn {
- display: block;
- margin-top: 5px;
- width: 150px;
- height: 30px;
- float: none;;
- border: none;
- font-family: Helvetica, Calibri, Arial, sans-serif;
- font-size: 60%;
- font-weight: 400;
- text-decoration: none;
- cursor: pointer;
- background: transparent url(graphics/testdepl_return.gif) no-repeat
center;
-}
-
-.testdeplretbn2 {
- display: block;
- margin-top: 5px;
- width: 150px;
- height: 30px;
- float: right;
- border: none;
- font-family: Helvetica, Calibri, Arial, sans-serif;
- font-size: 60%;
- font-weight: 400;
- text-decoration: none;
- cursor: pointer;
- background: transparent url(graphics/testdepl_return.gif) no-repeat
center;
-}
-
-

Deleted: trunk/perfsonar-java-sql-ma/conf/axis-1.4/partners.gif
===================================================================
(Binary files differ)

Deleted: trunk/perfsonar-java-sql-ma/conf/axis-1.4/perfsonar.png
===================================================================
(Binary files differ)

Deleted: trunk/perfsonar-java-sql-ma/conf/axis-1.4/perfsonar_logo.gif
===================================================================
(Binary files differ)

Deleted: trunk/perfsonar-java-sql-ma/conf/axis-1.4/sqlma_admin_script.js
===================================================================
--- trunk/perfsonar-java-sql-ma/conf/axis-1.4/sqlma_admin_script.js
2012-11-30 11:48:50 UTC (rev 6046)
+++ trunk/perfsonar-java-sql-ma/conf/axis-1.4/sqlma_admin_script.js
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,137 +0,0 @@
-/**
- * @author Michalis Michael
- *
- */
-function confirmForm(userform){
-
- var password = userform.userPassword.value;
- var confirmpassword = userform.confirmPassword.value;
-
- //alert("Hi "+password+ " "+confirmpassword );
- if (password == confirmpassword) {
- if (userform.metricType.value != null) {
- //alert("file name");
- if (userform.fileName.value == "") {
- alert("Please enter the name of the file.")
- return false;
- }
- else {
- //alert("database url");
- if ((userform.dataBaseURL.value == "") ||
(!isUrl(userform.dataBaseURL.value))) {
- alert("Please enter the database
URL[jdbc:mysql://127.0.0.1]")
- return false;
- }
- else {
- //alert("database name");
- if (userform.databaseName.value == "") {
- alert("Please enter the name of the database.")
- return false;
- }
- else {
- //alert("user name");
- if (userform.userName.value == "") {
- alert("Please enter the name of the database
user.")
- return false;
- }
- else {
- //alert("table name");
- if (userform.tableName.value == "") {
- alert("Please enter the name of the table.")
- return false;
- }
- else {
-
- //document.userform.submit();
- return true;
-
-
- }
-
- }
-
- }
- }
-
-
- }
-
-
- }
-
- else {
- // document.userform.submit();
- return true;
- }
- }
- else {
- alert("Passwords don't match, re-enter matching passwords!");
- return false;
- }
-
-
-}
-
-function confirmDelete(form){
-
- var res = confirm("This action will delete the selected ibatis files
pair. Are you sure you want to continue?");
- if (res) {
- return true;
- //var res2 = confirm("Do you want to delete the contents of
the table containing the data?");
- /*if (res2) {
-
- var el = document.createElement("input");
- el.type = "hidden";
- el.name = "deleteData";
- el.value = "Yes";
- form.appendChild(el);
- // document.form.submit();
- return true;
- }
- else {
- //document.form.submit();
- return true;
- }*/
-
- }
- else {
- return false;
- }
-
-
-
-}
-
-function isUrl(s){
- //alert("checking url");
- var regexp = /(jdbc):(mysql|psql)(:\/\/[A-Za-z0-9-]+\.[A-Za-z0-9]+)/
- return regexp.test(s);
-}
-
-function createFile(){
- if (document.getElementById('EditFile') != null) {
- document.getElementById('EditFile').style.display = "none";
- }
- document.getElementById('CreateNewFile').style.display = "block";
-}
-
-function showOptions(){
-
- document.getElementById('options').style.display = "block";
-}
-
-function sendRequest(file){
- document.body.style.cursor = 'wait';
- var input = document.createElement("input");
- input.type = "hidden";
- input.name = "ibatisFile";
- input.value = file;
- var form = document.createElement("form");
- form.name = "ShowForm"
- form.method = 'post';
- form.action = 'SQLMAdmin';
- form.appendChild(input);
- document.getElementById('EditFile').appendChild(form);
- document.ShowForm.submit();
-
-}
-

Deleted: trunk/perfsonar-java-sql-ma/conf/axis-1.4/testdepl.jsp
===================================================================
--- trunk/perfsonar-java-sql-ma/conf/axis-1.4/testdepl.jsp 2012-11-30
11:48:50 UTC (rev 6046)
+++ trunk/perfsonar-java-sql-ma/conf/axis-1.4/testdepl.jsp 2012-12-03
13:50:47 UTC (rev 6047)
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
-<%@ page session="false" %>
-<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
- <head>
-
- <meta http-equiv="Content-Type" content="text/html;
charset=iso-8859-1"/>
- <title>Untitled Document</title>
- <link rel="stylesheet" type="text/css" href="main.css"/>
- </head>
- <body style="background-color: #FFFFFF" >
-
- <div class="centerWindow" >
- <p class="welcometext">Welcome to the perfSONAR service web
administration interface</p>
- <p class="heading1">
- Deployment test
- </p>
-
-
- <%
- ServletContext sc = getServletContext();
- // Getting the service path
- String parm,
- rootPath = sc.getRealPath("/");;
- if( (parm=request.getParameter("testit")) != null &&
parm.equals("true") )
- {
- String requestURL =
request.getRequestURL().toString();
- String requestURI = request.getRequestURI();
- String baseURL = requestURL.substring(0,
requestURL.indexOf(requestURI)) + "/";
-
- String
- endpoint = baseURL +
perfSONARWebAdmin.admin.service.soapclient.SoapClient.
-
guessWebServiceUrl(rootPath) , /* this path */
- filein = rootPath +
"/WEB-INF/samples/requests/EchoRequest.xml",
- fileout= rootPath +
"/WEB-INF/samples/responses/EchoResponse.xml";
- int ret = 0;
-
- if( endpoint.equals(baseURL) == false )
-
- {
- // out.println("<br/><br/>Root path:" +
(new java.io.File(rootPath)).getCanonicalPath() );
- //out.println("<br/><br/>Contacted
endpoint:");
- //out.println("<br/><br/>" + endpoint);
- ret =
perfSONARWebAdmin.admin.service.soapclient.SoapClient.
-
testDeployment(endpoint,perfSONARWebAdmin.admin.service.soapclient.SoapClient.Level.DEBUG,null,filein,fileout)?
- 0:1;
- //if( result )
out.println("<br/><br/>Deployment test successful");
- //else
out.println("<br/><br/>Deployment test failed.");
- }
- else ret = -1;
- // out.println("<br/> Internal failure. Please
contact the web admin.");
- String result = "";
- String parms1 = "", cssName2 = "";
-
- switch(ret)
- {
- case 0:
- result = "<br/>Contacted endpoint
:<br/><br/>" + endpoint + "<br/><br/> Deployment test successful.";
- parms1 = " class=\"testdeplsucc\"";
- cssName2 = "\"testdeplretbn\"";
- break;
- default:
- result = "";
- parms1 = " style=\"width:550px;height:150px\"
class=\"testdeplfail\"";
- cssName2 = "\"testdeplretbn2\"";
- break;
-
- }
- %>
-
- <table align="center" <%=parms1 %> >
- <tr> <td ></td> </tr>
- <tr> <td > &nbsp;
- <%= result %>
- </td> </tr>
- </table>
-
-
- <% } else { %>
-
- <table align="left" class="testdeplmain" >
- <tr> <td> </td>
</tr>
- <tr> <td >
- Click on the <b>start test</b> button to check if
you have deployed the <%=new java.io.File(rootPath).getName()%> web service
correctly.
- </td> </tr>
-
- <tr>
- <td>
- <center> <br/>
- <a href="?testit=true" target="_self"
- class="testdeplstartbn"></a>
- </center>
- </td>
-
- </tr>
- </table>
-
- <% } %>
-
-
- </div>
- </body>
-</html>
-

Deleted: trunk/perfsonar-java-sql-ma/conf/axis-1.4/tick.gif
===================================================================
(Binary files differ)

Deleted: trunk/perfsonar-java-sql-ma/conf/axis-1.4/top_slice.gif
===================================================================
(Binary files differ)

Deleted: trunk/perfsonar-java-sql-ma/conf/axis-1.4/welcome.htm
===================================================================
--- trunk/perfsonar-java-sql-ma/conf/axis-1.4/welcome.htm 2012-11-30
11:48:50 UTC (rev 6046)
+++ trunk/perfsonar-java-sql-ma/conf/axis-1.4/welcome.htm 2012-12-03
13:50:47 UTC (rev 6047)
@@ -1,141 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
"http://www.w3.org/TR/html4/strict.dtd";>
-<html>
- <head>
- <meta http-equiv="Content-Type" content="text/html;
charset=iso-8859-1"/>
- <title>Untitled Document</title>
- <link rel="stylesheet" type="text/css" href="main.css"/>
- </head>
- <body style="background-color: #FFFFFF" >
- <div class="centerWindow" >
- <p class="welcometext">Welcome to the perfSONAR service web
admin administration interface</p>
- <p class="heading1">
- Configuration Settings
- </p>
- <table width="0" border="0" cellpadding="0" cellspacing="0">
- <tr>
- <td>
- <table width="0" border="0" cellpadding="0"
cellspacing="0" background="graphics/step_1_slice.gif" class="contenttable">
- <tr>
- <td>
- <img src="graphics/step_1_top.gif"
width="350" height="122">
- </td>
- </tr>
- <tr>
- <td class="configheading">
- <p>
- <a href="Wizard"
target="main">Service Settings</a>
- </p>
- <p>
- &nbsp;
- </p>
- <p>
- &nbsp;
- </p>
- </td>
- </tr>
- <tr>
- <td >
- <p>
- &nbsp;
- </p>
- <p>
- &nbsp;
- </p>
- <p>
- &nbsp;
- </p>
- </td>
- </tr>
- <tr>
- <td >
- <p>
- &nbsp;
- </p>
- <p>
- &nbsp;
- </p>
- <p>
- &nbsp;
- </p>
- </td>
- </tr>
- <tr><td> </td></tr>
- <tr>
- <td>
- <img src="graphics/step_1_bottom.gif"
width="350" height="18">
- </td>
- </tr>
- </table>
- </td>
- <td>
- <table width="0" border="0" cellpadding="0"
cellspacing="0" background="graphics/step_2_slice.gif" class="contenttable">
- <tr>
- <td>
- <img src="graphics/step_2_top.gif"
width="350" height="118">
- </td>
- </tr>
- <tr>
- <td class="configheadinglavender">
- <p>
- <a
href="ServiceAdmin?serviceProperties" target="main">Service Settings</a>
- </p>
- <p>
- &nbsp;
- </p>
- <p>
- &nbsp;
- </p>
- </td>
- </tr>
- <tr>
- <td class="configheadinglavender">
- <p>
- <a
href="ServiceAdmin?loggingProperties" target="main">Logging Settings</a>
- </p>
- <p>
- &nbsp;
- </p>
- <p>
- &nbsp;
- </p>
- </td>
- </tr>
- <tr>
- <td class="configheadinglavender">
- <p>
- <a href="SQLMAdmin"
target="main">SQL MA Administration </a>
- </p>
- <p>
- &nbsp;
- </p>
- <p>
- &nbsp;
- </p>
- </td>
- </tr>
- <tr>
- <td class="configheadinglavender">
- <p>
- <a href="eXistAdmin"
target="main">eXist Database Settings</a>
- </p>
- <p>
- &nbsp;
- </p>
- <p>
- &nbsp;
- </p>
- </td>
- </tr>
-
- <tr>
- <td>
- <img src="graphics/step_2_bottom.gif"
width="350" height="18">
- </td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
- </div>
- </body>
-</html>
\ No newline at end of file

Deleted: trunk/perfsonar-java-sql-ma/conf/axis-1.4/wz_tooltip.js
===================================================================
--- trunk/perfsonar-java-sql-ma/conf/axis-1.4/wz_tooltip.js 2012-11-30
11:48:50 UTC (rev 6046)
+++ trunk/perfsonar-java-sql-ma/conf/axis-1.4/wz_tooltip.js 2012-12-03
13:50:47 UTC (rev 6047)
@@ -1,1149 +0,0 @@
-/* This notice must be untouched at all times.
-
-wz_tooltip.js v. 4.12
-
-The latest version is available at
-http://www.walterzorn.com
-or http://www.devira.com
-or http://www.walterzorn.de
-
-Copyright (c) 2002-2007 Walter Zorn. All rights reserved.
-Created 1.12.2002 by Walter Zorn (Web: http://www.walterzorn.com )
-Last modified: 13.7.2007
-
-Easy-to-use cross-browser tooltips.
-Just include the script at the beginning of the <body> section, and invoke
-Tip('Tooltip text') from within the desired HTML onmouseover eventhandlers.
-No container DIV, no onmouseouts required.
-By default, width of tooltips is automatically adapted to content.
-Is even capable of dynamically converting arbitrary HTML elements to tooltips
-by calling TagToTip('ID_of_HTML_element_to_be_converted') instead of Tip(),
-which means you can put important, search-engine-relevant stuff into
tooltips.
-Appearance of tooltips can be individually configured
-via commands passed to Tip() or TagToTip().
-
-Tab Width: 4
-LICENSE: LGPL
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License (LGPL) as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-For more details on the GNU Lesser General Public License,
-see http://www.gnu.org/copyleft/lesser.html
-*/
-
-var config = new Object();
-
-
-//=================== GLOBAL TOOPTIP CONFIGURATION
=========================//
-var tt_Debug = true // false or true - recommended: false once
you release your page to the public
-var tt_Enabled = true // Allows to (temporarily) suppress
tooltips, e.g. by providing the user with a button that sets this global
variable to false
-var TagsToTip = true // false or true - if true, the script is
capable of converting HTML elements to tooltips
-
-// For each of the following config variables there exists a command, which
is
-// just the variablename in uppercase, to be passed to Tip() or TagToTip() to
-// configure tooltips individually. Individual commands override global
-// configuration. Order of commands is arbitrary.
-// Example: onmouseover="Tip('Tooltip text', LEFT, true, BGCOLOR, '#FF9900',
FADEIN, 400)"
-
-config. Above = false // false or true - tooltip
above mousepointer?
-config. BgColor = '#E4E7FF' // Background color
-config. BgImg = '' // Path to background image,
none if empty string ''
-config. BorderColor = '#002299'
-config. BorderStyle = 'solid' // Any permitted CSS value, but I
recommend 'solid', 'dotted' or 'dashed'
-config. BorderWidth = 1
-config. CenterMouse = false // false or true - center the tip
horizontally below (or above) the mousepointer
-config. ClickClose = false // false or true - close
tooltip if the user clicks somewhere
-config. CloseBtn = false // false or true -
closebutton in titlebar
-config. CloseBtnColors = ['#990000', '#FFFFFF', '#DD3333', '#FFFFFF'] //
[Background, text, hovered background, hovered text] - use empty strings ''
to inherit title colors
-config. CloseBtnText = '&nbsp;X&nbsp;' // Close button text (may
also be an image tag)
-config. CopyContent = true // When converting a HTML
element to a tooltip, copy only the element's content, rather than converting
the element by its own
-config. Delay = 400 // Time span in ms until
tooltip shows up
-config. Duration = 0 // Time span in ms after
which the tooltip disappears; 0 for infinite duration
-config. FadeIn = 0 // Fade-in duration in ms,
e.g. 400; 0 for no animation
-config. FadeOut = 0
-config. FadeInterval = 30 // Duration of each fade step in ms
(recommended: 30) - shorter is smoother but causes more CPU-load
-config. Fix = null // Fixated position - x- an
y-oordinates in brackets, e.g. [210, 480], or null for no fixation
-config. FollowMouse = true // false or true - tooltip
follows the mouse
-config. FontColor = '#000044'
-config. FontFace = 'Verdana,Geneva,sans-serif'
-config. FontSize = '12px' // E.g. '9pt' or '12px' -
unit is mandatory
-config. FontWeight = 'normal' // 'normal' or 'bold';
-config. Left = false // false or true - tooltip on
the left of the mouse
-config. OffsetX = 14 // Horizontal offset of
left-top corner from mousepointer
-config. OffsetY = 8 // Vertical offset
-config. Opacity = 100 // Integer between 0 and 100
- opacity of tooltip in percent
-config. Padding = 3 // Spacing between border and
content
-config. Shadow = false // false or true
-config. ShadowColor = '#C0C0C0'
-config. ShadowWidth = 5
-config. Sticky = false // Do NOT hide tooltip on
mouseout? false or true
-config. TextAlign = 'left' // 'left', 'right' or
'justify'
-config. Title = '' // Default title text applied
to all tips (no default title: empty string '')
-config. TitleAlign = 'left' // 'left' or 'right' - text
alignment inside the title bar
-config. TitleBgColor = '' // If empty string '', BorderColor
will be used
-config. TitleFontColor = '#ffffff' // Color of title text - if '',
BgColor (of tooltip body) will be used
-config. TitleFontFace = '' // If '' use FontFace (boldified)
-config. TitleFontSize = '' // If '' use FontSize
-config. Width = 0 // Tooltip width; 0 for
automatic adaption to tooltip content
-//======= END OF TOOLTIP CONFIG, DO NOT CHANGE ANYTHING BELOW
==============//
-
-
-
-
-//====================== PUBLIC
============================================//
-function Tip()
-{
- tt_Tip(arguments, null);
-}
-function TagToTip()
-{
- if(TagsToTip)
- {
- var t2t = tt_GetElt(arguments[0]);
- if(t2t)
- tt_Tip(arguments, t2t);
- }
-}
-
-//================== PUBLIC EXTENSION API
==================================//
-// Extension eventhandlers currently supported:
-// OnLoadConfig, OnCreateContentString, OnSubDivsCreated, OnShow,
OnMoveBefore,
-// OnMoveAfter, OnHideInit, OnHide, OnKill
-
-var tt_aElt = new Array(10), // Container DIV, outer title & body DIVs,
inner title & body TDs, closebutton SPAN, shadow DIVs, and IFRAME to cover
windowed elements in IE
-tt_aV = new Array(), // Caches and enumerates config data for currently
active tooltip
-tt_sContent, // Inner tooltip text or HTML
-tt_scrlX = 0, tt_scrlY = 0,
-tt_musX, tt_musY,
-tt_over,
-tt_x, tt_y, tt_w, tt_h; // Position, width and height of currently displayed
tooltip
-
-function tt_Extension()
-{
- tt_ExtCmdEnum();
- tt_aExt[tt_aExt.length] = this;
- return this;
-}
-function tt_SetTipPos(x, y)
-{
- var css = tt_aElt[0].style;
-
- tt_x = x;
- tt_y = y;
- css.left = x + "px";
- css.top = y + "px";
- if(tt_ie56)
- {
- var ifrm = tt_aElt[tt_aElt.length - 1];
- if(ifrm)
- {
- ifrm.style.left = css.left;
- ifrm.style.top = css.top;
- }
- }
-}
-function tt_Hide()
-{
- if(tt_db && tt_iState)
- {
- if(tt_iState & 0x2)
- {
- tt_aElt[0].style.visibility = "hidden";
- tt_ExtCallFncs(0, "Hide");
- }
- tt_tShow.EndTimer();
- tt_tHide.EndTimer();
- tt_tDurt.EndTimer();
- tt_tFade.EndTimer();
- if(!tt_op && !tt_ie)
- {
- tt_tWaitMov.EndTimer();
- tt_bWait = false;
- }
- if(tt_aV[CLICKCLOSE])
- tt_RemEvtFnc(document, "mouseup", tt_HideInit);
- tt_AddRemOutFnc(false);
- tt_ExtCallFncs(0, "Kill");
- // In case of a TagToTip tooltip, hide converted DOM node and
- // re-insert it into document
- if(tt_t2t && !tt_aV[COPYCONTENT])
- {
- tt_t2t.style.display = "none";
- tt_MovDomNode(tt_t2t, tt_aElt[6], tt_t2tDad);
- }
- tt_iState = 0;
- tt_over = null;
- tt_ResetMainDiv();
- if(tt_aElt[tt_aElt.length - 1])
- tt_aElt[tt_aElt.length - 1].style.display = "none";
- }
-}
-function tt_GetElt(id)
-{
- return(document.getElementById ? document.getElementById(id)
- : document.all ? document.all[id]
- : null);
-}
-function tt_GetDivW(el)
-{
- return(el ? (el.offsetWidth || el.style.pixelWidth || 0) : 0);
-}
-function tt_GetDivH(el)
-{
- return(el ? (el.offsetHeight || el.style.pixelHeight || 0) : 0);
-}
-function tt_GetScrollX()
-{
- return(window.pageXOffset || (tt_db ? (tt_db.scrollLeft || 0) : 0));
-}
-function tt_GetScrollY()
-{
- return(window.pageYOffset || (tt_db ? (tt_db.scrollTop || 0) : 0));
-}
-function tt_GetClientW()
-{
- return(document.body && (typeof(document.body.clientWidth) != tt_u) ?
document.body.clientWidth
- : (typeof(window.innerWidth) != tt_u) ?
window.innerWidth
- : tt_db ? (tt_db.clientWidth || 0)
- : 0);
-}
-function tt_GetClientH()
-{
- // Exactly this order seems to yield correct values in all major
browsers
- return(document.body && (typeof(document.body.clientHeight) != tt_u)
? document.body.clientHeight
- : (typeof(window.innerHeight) != tt_u) ?
window.innerHeight
- : tt_db ? (tt_db.clientHeight || 0)
- : 0);
-}
-function tt_GetEvtX(e)
-{
- return (e ? ((typeof(e.pageX) != tt_u) ? e.pageX : (e.clientX +
tt_scrlX)) : 0);
-}
-function tt_GetEvtY(e)
-{
- return (e ? ((typeof(e.pageY) != tt_u) ? e.pageY : (e.clientY +
tt_scrlY)) : 0);
-}
-function tt_AddEvtFnc(el, sEvt, PFnc)
-{
- if(el)
- {
- if(el.addEventListener)
- el.addEventListener(sEvt, PFnc, false);
- else
- el.attachEvent("on" + sEvt, PFnc);
- }
-}
-function tt_RemEvtFnc(el, sEvt, PFnc)
-{
- if(el)
- {
- if(el.removeEventListener)
- el.removeEventListener(sEvt, PFnc, false);
- else
- el.detachEvent("on" + sEvt, PFnc);
- }
-}
-
-//====================== PRIVATE
===========================================//
-var tt_aExt = new Array(), // Array of extension objects
-
-tt_db, tt_op, tt_ie, tt_ie56, tt_bBoxOld, // Browser flags
-tt_body,
-tt_flagOpa, // Opacity support: 1=IE, 2=Khtml, 3=KHTML,
4=Moz, 5=W3C
-tt_maxPosX, tt_maxPosY,
-tt_iState = 0, // Tooltip active |= 1, shown |= 2, move with
mouse |= 4
-tt_opa, // Currently applied opacity
-tt_bJmpVert, // Tip above mouse (or ABOVE tip below mouse)
-tt_t2t, tt_t2tDad, // Tag converted to tip, and its parent
element in the document
-tt_elDeHref, // The tag from which Opera has removed the
href attribute
-// Timer
-tt_tShow = new Number(0), tt_tHide = new Number(0), tt_tDurt = new Number(0),
-tt_tFade = new Number(0), tt_tWaitMov = new Number(0),
-tt_bWait = false,
-tt_u = "undefined";
-
-
-function tt_Init()
-{
- tt_MkCmdEnum();
- // Send old browsers instantly to hell
- if(!tt_Browser() || !tt_MkMainDiv())
- return;
- tt_IsW3cBox();
- tt_OpaSupport();
- tt_AddEvtFnc(document, "mousemove", tt_Move);
- // In Debug mode we search for TagToTip() calls in order to notify
- // the user if they've forgotten to set the TagsToTip config flag
- if(TagsToTip || tt_Debug)
- tt_SetOnloadFnc();
- tt_AddEvtFnc(window, "scroll",
- function()
- {
- tt_scrlX = tt_GetScrollX();
- tt_scrlY = tt_GetScrollY();
- if(tt_iState && !(tt_aV[STICKY] && (tt_iState & 2)))
- tt_HideInit();
- } );
- // Ensure the tip be hidden when the page unloads
- tt_AddEvtFnc(window, "unload", tt_Hide);
- tt_Hide();
-}
-// Creates command names by translating config variable names to upper case
-function tt_MkCmdEnum()
-{
- var n = 0;
- for(var i in config)
- eval("window." + i.toString().toUpperCase() + " = " + n++);
- tt_aV.length = n;
-}
-function tt_Browser()
-{
- var n, nv, n6, w3c;
-
- n = navigator.userAgent.toLowerCase(),
- nv = navigator.appVersion;
- tt_op = (document.defaultView && typeof(eval("w" + "indow" + "." +
"o" + "p" + "er" + "a")) != tt_u);
- tt_ie = n.indexOf("msie") != -1 && document.all && !tt_op;
- if(tt_ie)
- {
- var ieOld = (!document.compatMode || document.compatMode ==
"BackCompat");
- tt_db = !ieOld ? document.documentElement : (document.body ||
null);
- if(tt_db)
- tt_ie56 = parseFloat(nv.substring(nv.indexOf("MSIE")
+ 5)) >= 5.5
- && typeof
document.body.style.maxHeight == tt_u;
- }
- else
- {
- tt_db = document.documentElement || document.body ||
- (document.getElementsByTagName ?
document.getElementsByTagName("body")[0]
- : null);
- if(!tt_op)
- {
- n6 = document.defaultView && typeof
document.defaultView.getComputedStyle != tt_u;
- w3c = !n6 && document.getElementById;
- }
- }
- tt_body = (document.getElementsByTagName ?
document.getElementsByTagName("body")[0]
- : (document.body || null));
- if(tt_ie || n6 || tt_op || w3c)
- {
- if(tt_body && tt_db)
- {
- if(document.attachEvent || document.addEventListener)
- return true;
- }
- else
- tt_Err("wz_tooltip.js must be included INSIDE the
body section,"
- + " immediately after the opening
<body> tag.");
- }
- tt_db = null;
- return false;
-}
-function tt_MkMainDiv()
-{
- // Create the tooltip DIV
- if(tt_body.insertAdjacentHTML)
- tt_body.insertAdjacentHTML("afterBegin", tt_MkMainDivHtm());
- else if(typeof tt_body.innerHTML != tt_u && document.createElement &&
tt_body.appendChild)
- tt_body.appendChild(tt_MkMainDivDom());
- // FireFox Alzheimer bug
- if(window.tt_GetMainDivRefs && tt_GetMainDivRefs())
- return true;
- tt_db = null;
- return false;
-}
-function tt_MkMainDivHtm()
-{
- return('<div id="WzTtDiV"></div>' +
- (tt_ie56 ? ('<iframe id="WzTtIfRm"
src="javascript:false" scrolling="no" frameborder="0"
style="filter:Alpha(opacity=0);position:absolute;top:0px;left:0px;display:none;"></iframe>')
- : ''));
-}
-function tt_MkMainDivDom()
-{
- var el = document.createElement("div");
- if(el)
- el.id = "WzTtDiV";
- return el;
-}
-function tt_GetMainDivRefs()
-{
- tt_aElt[0] = tt_GetElt("WzTtDiV");
- if(tt_ie56 && tt_aElt[0])
- {
- tt_aElt[tt_aElt.length - 1] = tt_GetElt("WzTtIfRm");
- if(!tt_aElt[tt_aElt.length - 1])
- tt_aElt[0] = null;
- }
- if(tt_aElt[0])
- {
- var css = tt_aElt[0].style;
-
- css.visibility = "hidden";
- css.position = "absolute";
- css.overflow = "hidden";
- return true;
- }
- return false;
-}
-function tt_ResetMainDiv()
-{
- var w = (window.screen && screen.width) ? screen.width : 10000;
-
- tt_SetTipPos(-w, 0);
- tt_aElt[0].innerHTML = "";
- tt_aElt[0].style.width = (w - 1) + "px";
-}
-function tt_IsW3cBox()
-{
- var css = tt_aElt[0].style;
-
- css.padding = "10px";
- css.width = "40px";
- tt_bBoxOld = (tt_GetDivW(tt_aElt[0]) == 40);
- css.padding = "0px";
- tt_ResetMainDiv();
-}
-function tt_OpaSupport()
-{
- var css = tt_body.style;
-
- tt_flagOpa = (typeof(css.filter) != tt_u) ? 1
- : (typeof(css.KhtmlOpacity) != tt_u) ? 2
- : (typeof(css.KHTMLOpacity) != tt_u) ? 3
- : (typeof(css.MozOpacity) != tt_u) ? 4
- : (typeof(css.opacity) != tt_u) ? 5
- : 0;
-}
-// Ported from http://dean.edwards.name/weblog/2006/06/again/
-// (Dean Edwards et al.)
-function tt_SetOnloadFnc()
-{
- tt_AddEvtFnc(document, "DOMContentLoaded", tt_HideSrcTags);
- tt_AddEvtFnc(window, "load", tt_HideSrcTags);
- if(tt_body.attachEvent)
- tt_body.attachEvent("onreadystatechange",
- function() {
- if(tt_body.readyState == "complete")
- tt_HideSrcTags();
- } );
- if(/WebKit|KHTML/i.test(navigator.userAgent))
- {
- var t = setInterval(function() {
-
if(/loaded|complete/.test(document.readyState))
- {
- clearInterval(t);
- tt_HideSrcTags();
- }
- }, 10);
- }
-}
-function tt_HideSrcTags()
-{
- if(!window.tt_HideSrcTags || window.tt_HideSrcTags.done)
- return;
- window.tt_HideSrcTags.done = true;
- if(!tt_HideSrcTagsRecurs(tt_body))
- tt_Err("To enable the capability to convert HTML elements to
tooltips,"
- + " you must set TagsToTip in the global
tooltip configuration"
- + " to true.");
-}
-function tt_HideSrcTagsRecurs(dad)
-{
- var a, ovr, asT2t;
-
- // Walk the DOM tree for tags that have an onmouseover attribute
- // containing a TagToTip('...') call.
- // (.childNodes first since .children is bugous in Safari)
- a = dad.childNodes || dad.children || null;
- for(var i = a ? a.length : 0; i;)
- {--i;
- if(!tt_HideSrcTagsRecurs(a[i]))
- return false;
- ovr = a[i].getAttribute ? a[i].getAttribute("onmouseover")
- : (typeof a[i].onmouseover == "function") ?
a[i].onmouseover
- : null;
- if(ovr)
- {
- asT2t =
ovr.toString().match(/TagToTip\s*\(\s*'[^'.]+'\s*[\),]/);
- if(asT2t && asT2t.length)
- {
- if(!tt_HideSrcTag(asT2t[0]))
- return false;
- }
- }
- }
- return true;
-}
-function tt_HideSrcTag(sT2t)
-{
- var id, el;
-
- // The ID passed to the found TagToTip() call identifies an HTML
element
- // to be converted to a tooltip, so hide that element
- id = sT2t.replace(/.+'([^'.]+)'.+/, "$1");
- el = tt_GetElt(id);
- if(el)
- {
- if(tt_Debug && !TagsToTip)
- return false;
- else
- el.style.display = "none";
- }
- else
- tt_Err("Invalid ID\n'" + id + "'\npassed to TagToTip()."
- + " There exists no HTML element with that
ID.");
- return true;
-}
-function tt_Tip(arg, t2t)
-{
- if(!tt_db)
- return;
- if(tt_iState)
- tt_Hide();
- if(!tt_Enabled)
- return;
- tt_t2t = t2t;
- if(!tt_ReadCmds(arg))
- return;
- tt_iState = 0x1 | 0x4;
- tt_AdaptConfig1();
- tt_MkTipContent(arg);
- tt_MkTipSubDivs();
- tt_FormatTip();
- tt_bJmpVert = false;
- tt_maxPosX = tt_GetClientW() + tt_scrlX - tt_w - 1;
- tt_maxPosY = tt_GetClientH() + tt_scrlY - tt_h - 1;
- tt_AdaptConfig2();
- // We must fake the first mousemove in order to ensure the tip
- // be immediately shown and positioned
- tt_Move();
- tt_ShowInit();
-}
-function tt_ReadCmds(a)
-{
- var i;
-
- // First load the global config values, to initialize also values
- // for which no command has been passed
- i = 0;
- for(var j in config)
- tt_aV[i++] = config[j];
- // Then replace each cached config value for which a command has been
- // passed (ensure the # of command args plus value args be even)
- if(a.length & 1)
- {
- for(i = a.length - 1; i > 0; i -= 2)
- tt_aV[a[i - 1]] = a[i];
- return true;
- }
- tt_Err("Incorrect call of Tip() or TagToTip().\n"
- + "Each command must be followed by a value.");
- return false;
-}
-function tt_AdaptConfig1()
-{
- tt_ExtCallFncs(0, "LoadConfig");
- // Inherit unspecified title formattings from body
- if(!tt_aV[TITLEBGCOLOR].length)
- tt_aV[TITLEBGCOLOR] = tt_aV[BORDERCOLOR];
- if(!tt_aV[TITLEFONTCOLOR].length)
- tt_aV[TITLEFONTCOLOR] = tt_aV[BGCOLOR];
- if(!tt_aV[TITLEFONTFACE].length)
- tt_aV[TITLEFONTFACE] = tt_aV[FONTFACE];
- if(!tt_aV[TITLEFONTSIZE].length)
- tt_aV[TITLEFONTSIZE] = tt_aV[FONTSIZE];
- if(tt_aV[CLOSEBTN])
- {
- // Use title colors for non-specified closebutton colors
- if(!tt_aV[CLOSEBTNCOLORS])
- tt_aV[CLOSEBTNCOLORS] = new Array("", "", "", "");
- for(var i = 4; i;)
- {--i;
- if(!tt_aV[CLOSEBTNCOLORS][i].length)
- tt_aV[CLOSEBTNCOLORS][i] = (i & 1) ?
tt_aV[TITLEFONTCOLOR] : tt_aV[TITLEBGCOLOR];
- }
- // Enforce titlebar be shown
- if(!tt_aV[TITLE].length)
- tt_aV[TITLE] = " ";
- }
- // Circumvents broken display of images and fade-in flicker in Geckos
< 1.8
- if(tt_aV[OPACITY] == 100 && typeof tt_aElt[0].style.MozOpacity !=
tt_u && !Array.every)
- tt_aV[OPACITY] = 99;
- // Smartly shorten the delay for fade-in tooltips
- if(tt_aV[FADEIN] && tt_flagOpa && tt_aV[DELAY] > 100)
- tt_aV[DELAY] = Math.max(tt_aV[DELAY] - tt_aV[FADEIN], 100);
-}
-function tt_AdaptConfig2()
-{
- if(tt_aV[CENTERMOUSE])
- tt_aV[OFFSETX] -= ((tt_w - (tt_aV[SHADOW] ?
tt_aV[SHADOWWIDTH] : 0)) >> 1);
-}
-// Expose content globally so extensions can modify it
-function tt_MkTipContent(a)
-{
- if(tt_t2t)
- {
- if(tt_aV[COPYCONTENT])
- tt_sContent = tt_t2t.innerHTML;
- else
- tt_sContent = "";
- }
- else
- tt_sContent = a[0];
- tt_ExtCallFncs(0, "CreateContentString");
-}
-function tt_MkTipSubDivs()
-{
- var sCss =
'position:relative;margin:0px;padding:0px;border-width:0px;left:0px;top:0px;line-height:normal;width:auto;',
- sTbTrTd = ' cellspacing=0 cellpadding=0 border=0 style="' + sCss +
'"><tbody style="' + sCss + '"><tr><td ';
-
- tt_aElt[0].innerHTML =
- (''
- + (tt_aV[TITLE].length ?
- ('<div id="WzTiTl"
style="position:relative;z-index:1;">'
- + '<table id="WzTiTlTb"' + sTbTrTd + 'id="WzTiTlI"
style="' + sCss + '">'
- + tt_aV[TITLE]
- + '</td>'
- + (tt_aV[CLOSEBTN] ?
- ('<td align="right" style="' + sCss
- + 'text-align:right;">'
- + '<span id="WzClOsE"
style="padding-left:2px;padding-right:2px;'
- + 'cursor:' + (tt_ie ? 'hand' : 'pointer')
- + ';" onmouseover="tt_OnCloseBtnOver(1)"
onmouseout="tt_OnCloseBtnOver(0)" onclick="tt_HideInit()">'
- + tt_aV[CLOSEBTNTEXT]
- + '</span></td>')
- : '')
- + '</tr></tbody></table></div>')
- : '')
- + '<div id="WzBoDy" style="position:relative;z-index:0;">'
- + '<table' + sTbTrTd + 'id="WzBoDyI" style="' + sCss + '">'
- + tt_sContent
- + '</td></tr></tbody></table></div>'
- + (tt_aV[SHADOW]
- ? ('<div id="WzTtShDwR"
style="position:absolute;overflow:hidden;"></div>'
- + '<div id="WzTtShDwB"
style="position:relative;overflow:hidden;"></div>')
- : '')
- );
- tt_GetSubDivRefs();
- // Convert DOM node to tip
- if(tt_t2t && !tt_aV[COPYCONTENT])
- {
- // Store the tag's parent element so we can restore that DOM
branch
- // once the tooltip is hidden
- tt_t2tDad = tt_t2t.parentNode || tt_t2t.parentElement ||
tt_t2t.offsetParent || null;
- if(tt_t2tDad)
- {
- tt_MovDomNode(tt_t2t, tt_t2tDad, tt_aElt[6]);
- tt_t2t.style.display = "block";
- }
- }
- tt_ExtCallFncs(0, "SubDivsCreated");
-}
-function tt_GetSubDivRefs()
-{
- var aId = new Array("WzTiTl", "WzTiTlTb", "WzTiTlI", "WzClOsE",
"WzBoDy", "WzBoDyI", "WzTtShDwB", "WzTtShDwR");
-
- for(var i = aId.length; i; --i)
- tt_aElt[i] = tt_GetElt(aId[i - 1]);
-}
-function tt_FormatTip()
-{
- var css, w, iOffY, iOffSh;
-
- //--------- Title DIV ----------
- if(tt_aV[TITLE].length)
- {
- css = tt_aElt[1].style;
- css.background = tt_aV[TITLEBGCOLOR];
- css.paddingTop = (tt_aV[CLOSEBTN] ? 2 : 0) + "px";
- css.paddingBottom = "1px";
- css.paddingLeft = css.paddingRight = tt_aV[PADDING] + "px";
- css = tt_aElt[3].style;
- css.color = tt_aV[TITLEFONTCOLOR];
- css.fontFamily = tt_aV[TITLEFONTFACE];
- css.fontSize = tt_aV[TITLEFONTSIZE];
- css.fontWeight = "bold";
- css.textAlign = tt_aV[TITLEALIGN];
- // Close button DIV
- if(tt_aElt[4])
- {
- css.paddingRight = (tt_aV[PADDING] << 1) + "px";
- css = tt_aElt[4].style;
- css.background = tt_aV[CLOSEBTNCOLORS][0];
- css.color = tt_aV[CLOSEBTNCOLORS][1];
- css.fontFamily = tt_aV[TITLEFONTFACE];
- css.fontSize = tt_aV[TITLEFONTSIZE];
- css.fontWeight = "bold";
- }
- if(tt_aV[WIDTH] > 0)
- tt_w = tt_aV[WIDTH] + ((tt_aV[PADDING] +
tt_aV[BORDERWIDTH]) << 1);
- else
- {
- tt_w = tt_GetDivW(tt_aElt[3]) +
tt_GetDivW(tt_aElt[4]);
- // Some spacing between title DIV and closebutton
- if(tt_aElt[4])
- tt_w += tt_aV[PADDING];
- }
- // Ensure the top border of the body DIV be covered by the
title DIV
- iOffY = -tt_aV[BORDERWIDTH];
- }
- else
- {
- tt_w = 0;
- iOffY = 0;
- }
-
- //-------- Body DIV ------------
- css = tt_aElt[5].style;
- css.top = iOffY + "px";
- if(tt_aV[BORDERWIDTH])
- {
- css.borderColor = tt_aV[BORDERCOLOR];
- css.borderStyle = tt_aV[BORDERSTYLE];
- css.borderWidth = tt_aV[BORDERWIDTH] + "px";
- }
- if(tt_aV[BGCOLOR].length)
- css.background = tt_aV[BGCOLOR];
- if(tt_aV[BGIMG].length)
- css.backgroundImage = "url(" + tt_aV[BGIMG] + ")";
- css.padding = tt_aV[PADDING] + "px";
- css.textAlign = tt_aV[TEXTALIGN];
- // TD inside body DIV
- css = tt_aElt[6].style;
- css.color = tt_aV[FONTCOLOR];
- css.fontFamily = tt_aV[FONTFACE];
- css.fontSize = tt_aV[FONTSIZE];
- css.fontWeight = tt_aV[FONTWEIGHT];
- css.background = "";
- css.textAlign = tt_aV[TEXTALIGN];
- if(tt_aV[WIDTH] > 0)
- w = tt_aV[WIDTH] + ((tt_aV[PADDING] + tt_aV[BORDERWIDTH]) <<
1);
- else
- // We measure the width of the body's inner TD, because some
browsers
- // expand the width of the container and outer body DIV to
100%
- w = tt_GetDivW(tt_aElt[6]) + ((tt_aV[PADDING] +
tt_aV[BORDERWIDTH]) << 1);
- if(w > tt_w)
- tt_w = w;
-
- //--------- Shadow DIVs ------------
- if(tt_aV[SHADOW])
- {
- tt_w += tt_aV[SHADOWWIDTH];
- iOffSh = Math.floor((tt_aV[SHADOWWIDTH] * 4) / 3);
- // Bottom shadow
- css = tt_aElt[7].style;
- css.top = iOffY + "px";
- css.left = iOffSh + "px";
- css.width = (tt_w - iOffSh - tt_aV[SHADOWWIDTH]) + "px";
- css.height = tt_aV[SHADOWWIDTH] + "px";
- css.background = tt_aV[SHADOWCOLOR];
- // Right shadow
- css = tt_aElt[8].style;
- css.top = iOffSh + "px";
- css.left = (tt_w - tt_aV[SHADOWWIDTH]) + "px";
- css.width = tt_aV[SHADOWWIDTH] + "px";
- css.background = tt_aV[SHADOWCOLOR];
- }
- else
- iOffSh = 0;
-
- //-------- Container DIV -------
- tt_SetTipOpa(tt_aV[FADEIN] ? 0 : tt_aV[OPACITY]);
- tt_FixSize(iOffY, iOffSh);
-}
-// Fixate the size so it can't dynamically change while the tooltip is
moving.
-function tt_FixSize(iOffY, iOffSh)
-{
- var wIn, wOut, i;
-
- tt_aElt[0].style.width = tt_w + "px";
- tt_aElt[0].style.pixelWidth = tt_w;
- wOut = tt_w - ((tt_aV[SHADOW]) ? tt_aV[SHADOWWIDTH] : 0);
- // Body
- wIn = wOut;
- if(!tt_bBoxOld)
- wIn -= ((tt_aV[PADDING] + tt_aV[BORDERWIDTH]) << 1);
- tt_aElt[5].style.width = wIn + "px";
- // Title
- if(tt_aElt[1])
- {
- wIn = wOut - (tt_aV[PADDING] << 1);
- if(!tt_bBoxOld)
- wOut = wIn;
- tt_aElt[1].style.width = wOut + "px";
- tt_aElt[2].style.width = wIn + "px";
- }
- tt_h = tt_GetDivH(tt_aElt[0]) + iOffY;
- // Right shadow
- if(tt_aElt[8])
- tt_aElt[8].style.height = (tt_h - iOffSh) + "px";
- i = tt_aElt.length - 1;
- if(tt_aElt[i])
- {
- tt_aElt[i].style.width = tt_w + "px";
- tt_aElt[i].style.height = tt_h + "px";
- }
-}
-function tt_DeAlt(el)
-{
- var aKid;
-
- if(el.alt)
- el.alt = "";
- if(el.title)
- el.title = "";
- aKid = el.childNodes || el.children || null;
- if(aKid)
- {
- for(var i = aKid.length; i;)
- tt_DeAlt(aKid[--i]);
- }
-}
-// This hack removes the annoying native tooltips over links in Opera
-function tt_OpDeHref(el)
-{
- if(!tt_op)
- return;
- if(tt_elDeHref)
- tt_OpReHref();
- while(el)
- {
- if(el.hasAttribute("href"))
- {
- el.t_href = el.getAttribute("href");
- el.t_stats = window.status;
- el.removeAttribute("href");
- el.style.cursor = "hand";
- tt_AddEvtFnc(el, "mousedown", tt_OpReHref);
- window.status = el.t_href;
- tt_elDeHref = el;
- break;
- }
- el = el.parentElement;
- }
-}
-function tt_ShowInit()
-{
- tt_tShow.Timer("tt_Show()", tt_aV[DELAY], true);
- if(tt_aV[CLICKCLOSE])
- tt_AddEvtFnc(document, "mouseup", tt_HideInit);
-}
-function tt_OverInit(e)
-{
- tt_over = e.target || e.srcElement;
- tt_DeAlt(tt_over);
- tt_OpDeHref(tt_over);
- tt_AddRemOutFnc(true);
-}
-function tt_Show()
-{
- var css = tt_aElt[0].style;
-
- // Override the z-index of the topmost wz_dragdrop.js D&D item
- css.zIndex = Math.max((window.dd && dd.z) ? (dd.z + 2) : 0, 1010);
- if(tt_aV[STICKY] || !tt_aV[FOLLOWMOUSE])
- tt_iState &= ~0x4;
- if(tt_aV[DURATION] > 0)
- tt_tDurt.Timer("tt_HideInit()", tt_aV[DURATION], true);
- tt_ExtCallFncs(0, "Show")
- css.visibility = "visible";
- tt_iState |= 0x2;
- if(tt_aV[FADEIN])
- tt_Fade(0, 0, tt_aV[OPACITY], Math.round(tt_aV[FADEIN] /
tt_aV[FADEINTERVAL]));
- tt_ShowIfrm();
-}
-function tt_ShowIfrm()
-{
- if(tt_ie56)
- {
- var ifrm = tt_aElt[tt_aElt.length - 1];
- if(ifrm)
- {
- var css = ifrm.style;
- css.zIndex = tt_aElt[0].style.zIndex - 1;
- css.display = "block";
- }
- }
-}
-function tt_Move(e)
-{
- e = window.event || e;
- if(e)
- {
- tt_musX = tt_GetEvtX(e);
- tt_musY = tt_GetEvtY(e);
- }
- if(tt_iState)
- {
- if(!tt_over && e)
- tt_OverInit(e);
- if(tt_iState & 0x4)
- {
- // Protect some browsers against jam of mousemove
events
- if(!tt_op && !tt_ie)
- {
- if(tt_bWait)
- return;
- tt_bWait = true;
- tt_tWaitMov.Timer("tt_bWait = false;", 1,
true);
- }
- if(tt_aV[FIX])
- {
- tt_iState &= ~0x4;
- tt_SetTipPos(tt_aV[FIX][0], tt_aV[FIX][1]);
- }
- else if(!tt_ExtCallFncs(e, "MoveBefore"))
- tt_SetTipPos(tt_PosX(), tt_PosY());
- tt_ExtCallFncs([tt_musX, tt_musY], "MoveAfter")
- }
- }
-}
-function tt_PosX()
-{
- var x;
-
- x = tt_musX;
- if(tt_aV[LEFT])
- x -= tt_w + tt_aV[OFFSETX] - (tt_aV[SHADOW] ?
tt_aV[SHADOWWIDTH] : 0);
- else
- x += tt_aV[OFFSETX];
- // Prevent tip from extending past right/left clientarea boundary
- if(x > tt_maxPosX)
- x = tt_maxPosX;
- return((x < tt_scrlX) ? tt_scrlX : x);
-}
-function tt_PosY()
-{
- var y;
-
- // Apply some hysteresis after the tip has snapped to the other side
of the
- // mouse. In case of insufficient space above and below the mouse, we
place
- // the tip below.
- if(tt_aV[ABOVE] && (!tt_bJmpVert || tt_CalcPosYAbove() >= tt_scrlY +
16))
- y = tt_DoPosYAbove();
- else if(!tt_aV[ABOVE] && tt_bJmpVert && tt_CalcPosYBelow() >
tt_maxPosY - 16)
- y = tt_DoPosYAbove();
- else
- y = tt_DoPosYBelow();
- // Snap to other side of mouse if tip would extend past window
boundary
- if(y > tt_maxPosY)
- y = tt_DoPosYAbove();
- if(y < tt_scrlY)
- y = tt_DoPosYBelow();
- return y;
-}
-function tt_DoPosYBelow()
-{
- tt_bJmpVert = tt_aV[ABOVE];
- return tt_CalcPosYBelow();
-}
-function tt_DoPosYAbove()
-{
- tt_bJmpVert = !tt_aV[ABOVE];
- return tt_CalcPosYAbove();
-}
-function tt_CalcPosYBelow()
-{
- return(tt_musY + tt_aV[OFFSETY]);
-}
-function tt_CalcPosYAbove()
-{
- var dy = tt_aV[OFFSETY] - (tt_aV[SHADOW] ? tt_aV[SHADOWWIDTH] : 0);
- if(tt_aV[OFFSETY] > 0 && dy <= 0)
- dy = 1;
- return(tt_musY - tt_h - dy);
-}
-function tt_OnOut()
-{
- tt_AddRemOutFnc(false);
- if(!(tt_aV[STICKY] && (tt_iState & 0x2)))
- tt_HideInit();
-}
-function tt_HideInit()
-{
- tt_ExtCallFncs(0, "HideInit");
- tt_iState &= ~0x4;
- if(tt_flagOpa && tt_aV[FADEOUT])
- {
- tt_tFade.EndTimer();
- if(tt_opa)
- {
- var n = Math.round(tt_aV[FADEOUT] /
(tt_aV[FADEINTERVAL] * (tt_aV[OPACITY] / tt_opa)));
- tt_Fade(tt_opa, tt_opa, 0, n);
- return;
- }
- }
- tt_tHide.Timer("tt_Hide();", 1, false);
-}
-function tt_OpReHref()
-{
- if(tt_elDeHref)
- {
- tt_elDeHref.setAttribute("href", tt_elDeHref.t_href);
- tt_RemEvtFnc(tt_elDeHref, "mousedown", tt_OpReHref);
- window.status = tt_elDeHref.t_stats;
- tt_elDeHref = null;
- }
-}
-function tt_Fade(a, now, z, n)
-{
- if(n)
- {
- now += Math.round((z - now) / n);
- if((z > a) ? (now >= z) : (now <= z))
- now = z;
- else
- tt_tFade.Timer("tt_Fade("
- + a + "," + now + ","
+ z + "," + (n - 1)
- + ")",
- tt_aV[FADEINTERVAL],
- true);
- }
- now ? tt_SetTipOpa(now) : tt_Hide();
-}
-// To circumvent the opacity nesting flaws of IE, we set the opacity
-// for each sub-DIV separately, rather than for the container DIV.
-function tt_SetTipOpa(opa)
-{
- tt_SetOpa(tt_aElt[5].style, opa);
- if(tt_aElt[1])
- tt_SetOpa(tt_aElt[1].style, opa);
- if(tt_aV[SHADOW])
- {
- opa = Math.round(opa * 0.8);
- tt_SetOpa(tt_aElt[7].style, opa);
- tt_SetOpa(tt_aElt[8].style, opa);
- }
-}
-function tt_OnCloseBtnOver(iOver)
-{
- var css = tt_aElt[4].style;
-
- iOver <<= 1;
- css.background = tt_aV[CLOSEBTNCOLORS][iOver];
- css.color = tt_aV[CLOSEBTNCOLORS][iOver + 1];
-}
-function tt_Int(x)
-{
- var y;
-
- return(isNaN(y = parseInt(x)) ? 0 : y);
-}
-// Adds or removes the document.mousemove or HoveredElem.mouseout handler
-// conveniently. Keeps track of those handlers to prevent them from being
-// set or removed redundantly.
-function tt_AddRemOutFnc(bAdd)
-{
- var PSet = bAdd ? tt_AddEvtFnc : tt_RemEvtFnc;
-
- if(bAdd != tt_AddRemOutFnc.bOn)
- {
- PSet(tt_over, "mouseout", tt_OnOut);
- tt_AddRemOutFnc.bOn = bAdd;
- if(!bAdd)
- tt_OpReHref();
- }
-}
-tt_AddRemOutFnc.bOn = false;
-Number.prototype.Timer = function(s, iT, bUrge)
-{
- if(!this.value || bUrge)
- this.value = window.setTimeout(s, iT);
-}
-Number.prototype.EndTimer = function()
-{
- if(this.value)
- {
- window.clearTimeout(this.value);
- this.value = 0;
- }
-}
-function tt_SetOpa(css, opa)
-{
- tt_opa = opa;
- if(tt_flagOpa == 1)
- {
- // Hack for bugs of IE:
- // A DIV cannot be made visible in a single step if an
opacity < 100
- // has been applied while the DIV was hidden.
- // Moreover, in IE6, applying an opacity < 100 has no effect
if the
- // concerned element has no layout (position, size, zoom,
...).
- if(opa < 100)
- {
- var bVis = css.visibility != "hidden";
- css.zoom = "100%";
- if(!bVis)
- css.visibility = "visible";
- css.filter = "alpha(opacity=" + opa + ")";
- if(!bVis)
- css.visibility = "hidden";
- }
- else
- css.filter = "";
- }
- else
- {
- opa /= 100.0;
- switch(tt_flagOpa)
- {
- case 2:
- css.KhtmlOpacity = opa; break;
- case 3:
- css.KHTMLOpacity = opa; break;
- case 4:
- css.MozOpacity = opa; break;
- case 5:
- css.opacity = opa; break;
- }
- }
-}
-function tt_MovDomNode(el, dadFrom, dadTo)
-{
- if(dadFrom)
- dadFrom.removeChild(el);
- if(dadTo)
- dadTo.appendChild(el);
-}
-function tt_Err(sErr)
-{
- if(tt_Debug)
- alert("Tooltip Script Error Message:\n\n" + sErr);
-}
-
-//=========== DEALING WITH EXTENSIONS ==============//
-function tt_ExtCmdEnum()
-{
- var s;
-
- // Add new command(s) to the commands enum
- for(var i in config)
- {
- s = "window." + i.toString().toUpperCase();
- if(eval("typeof(" + s + ") == tt_u"))
- {
- eval(s + " = " + tt_aV.length);
- tt_aV[tt_aV.length] = null;
- }
- }
-}
-function tt_ExtCallFncs(arg, sFnc)
-{
- var b = false;
- for(var i = tt_aExt.length; i;)
- {--i;
- var fnc = tt_aExt[i]["On" + sFnc];
- // Call the method the extension has defined for this event
- if(fnc && fnc(arg))
- b = true;
- }
- return b;
-}
-
-tt_Init();

Deleted: trunk/perfsonar-java-sql-ma/conf/components.properties
===================================================================
--- trunk/perfsonar-java-sql-ma/conf/components.properties 2012-11-30
11:48:50 UTC (rev 6046)
+++ trunk/perfsonar-java-sql-ma/conf/components.properties 2012-12-03
13:50:47 UTC (rev 6047)
@@ -1,30 +0,0 @@
-
-# $Id$
-
-
-# File contains components to load
-# Config and logger MUST be loaded first!
-
-
-# Configuration component - must be the first one!
-config=org.perfsonar.base.auxiliary.components.configuration.properties.PropertiesConfigurationComponent
-
-
-# Logger component - must be the second one!
-logger=org.perfsonar.base.auxiliary.components.logger.log4j.Log4jLoggerComponent
-
-
-# Simple scheduler
-#ma_scheduler=org.perfsonar.base.auxiliary.components.simplescheduler.Scheduler
-
-
-# Registration in LS
-#registrator=org.perfsonar.service.measurementArchive.register.LSRegistrationComponent
-
-
-eventType_config=org.perfsonar.service.measurementArchive.eventTypeConfig.EventTypeConfigurationComponent
-
-
-# Group=AuthN
-# Description=Authentication component
-authn=org.perfsonar.base.auxiliary.components.authn.wssec.WSSecAuthNComponent
\ No newline at end of file

Deleted: trunk/perfsonar-java-sql-ma/conf/components.properties.template
===================================================================
--- trunk/perfsonar-java-sql-ma/conf/components.properties.template
2012-11-30 11:48:50 UTC (rev 6046)
+++ trunk/perfsonar-java-sql-ma/conf/components.properties.template
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,30 +0,0 @@
-
-# $Id$
-
-
-# File contains components to load
-# Config and logger MUST be loaded first!
-
-
-# Configuration component - must be the first one!
-config=org.perfsonar.base.auxiliary.components.configuration.properties.PropertiesConfigurationComponent
-
-
-# Logger component - must be the second one!
-logger=org.perfsonar.base.auxiliary.components.logger.log4j.Log4jLoggerComponent
-
-
-# Simple scheduler
-#ma_scheduler=org.perfsonar.base.auxiliary.components.simplescheduler.Scheduler
-
-
-# Registration in LS
-#registrator=org.perfsonar.service.measurementArchive.register.LSRegistrationComponent
-
-
-eventType_config=org.perfsonar.service.measurementArchive.eventTypeConfig.EventTypeConfigurationComponent
-
-
-# Group=AuthN
-# Description=Authentication component
-authn=org.perfsonar.base.auxiliary.components.authn.wssec.WSSecAuthNComponent
\ No newline at end of file

Deleted: trunk/perfsonar-java-sql-ma/conf/eventType-map.xml
===================================================================
--- trunk/perfsonar-java-sql-ma/conf/eventType-map.xml 2012-11-30 11:48:50
UTC (rev 6046)
+++ trunk/perfsonar-java-sql-ma/conf/eventType-map.xml 2012-12-03 13:50:47
UTC (rev 6047)
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!-- $Id$ -->
-<!-- romradz -->
-
-
-<eventType-config>
-
- <eventType>
- <name>http://ggf.org/ns/nmwg/characteristic/utilization/2.0</name>
-
<metadataQueryGenerator>org.perfsonar.service.measurementArchive.metadataConfig.queryGenerator.UtilizationQueryGenerator</metadataQueryGenerator>
-
<responseGenerator>org.perfsonar.service.measurementArchive.sqlType.fetch.UtilizationResponseGenerator</responseGenerator>
-
<storeRequestProcess>org.perfsonar.service.measurementArchive.sqlType.store.UtilizationStoreRequestProcess</storeRequestProcess>
- <ibatisConfig>ibatis-SqlMapConfig-utilization.xml</ibatisConfig>
- </eventType>
-
- <eventType>
- <name>http://ggf.org/ns/nmwg/characteristic/errors/2.0</name>
-
<metadataQueryGenerator>org.perfsonar.service.measurementArchive.metadataConfig.queryGenerator.ErrorsQueryGenerator</metadataQueryGenerator>
-
<responseGenerator>org.perfsonar.service.measurementArchive.sqlType.fetch.ErrorsResponseGenerator</responseGenerator>
-
<storeRequestProcess>org.perfsonar.service.measurementArchive.sqlType.store.ErrorsStoreRequestProcess</storeRequestProcess>
- <ibatisConfig>ibatis-SqlMapConfig-errors.xml</ibatisConfig>
- </eventType>
-
- <eventType>
- <name>http://ggf.org/ns/nmwg/characteristic/discards/2.0</name>
-
<metadataQueryGenerator>org.perfsonar.service.measurementArchive.metadataConfig.queryGenerator.DiscardsQueryGenerator</metadataQueryGenerator>
-
<responseGenerator>org.perfsonar.service.measurementArchive.sqlType.fetch.DiscardsResponseGenerator</responseGenerator>
-
<storeRequestProcess>org.perfsonar.service.measurementArchive.sqlType.store.DiscardsStoreRequestProcess</storeRequestProcess>
- <ibatisConfig>ibatis-SqlMapConfig-discards.xml</ibatisConfig>
- </eventType>
-
- <eventType>
- <name>http://ggf.org/ns/nmwg/topology/l2/3.0/link/status</name>
-
<metadataQueryGenerator>org.perfsonar.service.measurementArchive.metadataConfig.queryGenerator.L2PathStatusQueryGenerator</metadataQueryGenerator>
-
<metadataKeyGenerator>org.perfsonar.service.measurementArchive.metadataConfig.keyGenerator.L2PathStatusKeyGenerator</metadataKeyGenerator>
-
<responseGenerator>org.perfsonar.service.measurementArchive.sqlType.fetch.L2PathStatusResponseGenerator</responseGenerator>
-
<storeRequestProcess>org.perfsonar.service.measurementArchive.sqlType.store.L2PathStatusStoreRequestProcess</storeRequestProcess>
- <ibatisConfig>ibatis-SqlMapConfig-L2-status.xml</ibatisConfig>
- </eventType>
-
- <eventType>
- <name>Path.Status</name>
-
<metadataQueryGenerator>org.perfsonar.service.measurementArchive.metadataConfig.queryGenerator.L2PathStatusQueryGeneratorTMP</metadataQueryGenerator>
-
<metadataKeyGenerator>org.perfsonar.service.measurementArchive.metadataConfig.keyGenerator.L2PathStatusKeyGenerator</metadataKeyGenerator>
-
<responseGenerator>org.perfsonar.service.measurementArchive.sqlType.fetch.L2PathStatusResponseGenerator</responseGenerator>
-
<storeRequestProcess>org.perfsonar.service.measurementArchive.sqlType.store.L2PathStatusStoreRequestProcess</storeRequestProcess>
- <ibatisConfig>ibatis-SqlMapConfig-L2-status.xml</ibatisConfig>
- </eventType>
-
- <eventType>
-
<name>http://schemas.perfsonar.net/tools/admin/selftest/1.0/xmldb-access-test</name>
-
<metadataQueryGenerator>org.perfsonar.service.measurementArchive.metadataConfig.queryGenerator.XmlDbAccessTestQueryGenerator</metadataQueryGenerator>
- </eventType>
-
- <eventType>
-
<name>http://schemas.perfsonar.net/tools/admin/selftest/1.0/xmldb-content-test</name>
-
<metadataQueryGenerator>org.perfsonar.service.measurementArchive.metadataConfig.queryGenerator.XmlDbContentTestQueryGenerator</metadataQueryGenerator>
- </eventType>
-
- <eventType>
-
<name>http://schemas.perfsonar.net/tools/admin/selftest/1.0/random-fetch-test</name>
-
<metadataQueryGenerator>org.perfsonar.service.measurementArchive.metadataConfig.queryGenerator.RandomFetchTestQueryGenerator</metadataQueryGenerator>
- </eventType>
-
- <eventType>
- <name>http://ggf.org/ns/nmwg/tools/owamp/2.0</name>
-
<metadataQueryGenerator>org.perfsonar.service.measurementArchive.metadataConfig.queryGenerator.OwampQueryGenerator</metadataQueryGenerator>
-
<responseGenerator>org.perfsonar.service.measurementArchive.sqlType.fetch.OwampResponseGenerator</responseGenerator>
-
<storeRequestProcess>org.perfsonar.service.measurementArchive.sqlType.store.OwampStoreRequestProcess</storeRequestProcess>
- </eventType>
-
- <eventType>
- <name>http://ggf.org/ns/nmwg/tools/bwctl/2.0</name>
-
<metadataQueryGenerator>org.perfsonar.service.measurementArchive.metadataConfig.queryGenerator.BwctlQueryGenerator</metadataQueryGenerator>
-
<responseGenerator>org.perfsonar.service.measurementArchive.sqlType.fetch.BwctlResponseGenerator</responseGenerator>
-
<storeRequestProcess>org.perfsonar.service.measurementArchive.sqlType.store.BwctlStoreRequestProcess</storeRequestProcess>
- </eventType>
-
- <eventType>
- <name>http://ggf.org/ns/nmwg/tools/bwctl/2.0/</name>
-
<metadataQueryGenerator>org.perfsonar.service.measurementArchive.metadataConfig.queryGenerator.BwctlQueryGenerator</metadataQueryGenerator>
-
<responseGenerator>org.perfsonar.service.measurementArchive.sqlType.fetch.BwctlResponseGenerator</responseGenerator>
-
<storeRequestProcess>org.perfsonar.service.measurementArchive.sqlType.store.BwctlStoreRequestProcess</storeRequestProcess>
- </eventType>
-
- <eventType>
- <name>http://ggf.org/ns/nmwg/tools/iperf/2.0</name>
-
<metadataQueryGenerator>org.perfsonar.service.measurementArchive.metadataConfig.queryGenerator.IperfQueryGenerator</metadataQueryGenerator>
-
<responseGenerator>org.perfsonar.service.measurementArchive.sqlType.fetch.IperfResponseGenerator</responseGenerator>
-
<storeRequestProcess>org.perfsonar.service.measurementArchive.sqlType.store.IperfStoreRequestProcess</storeRequestProcess>
- <ibatisConfig>ibatis-SqlMapConfig-iperf.xml</ibatisConfig>
- </eventType>
-
- <eventType>
- <name>http://ggf.org/ns/nmwg/tools/iperf/2.0/</name>
-
<metadataQueryGenerator>org.perfsonar.service.measurementArchive.metadataConfig.queryGenerator.IperfQueryGenerator</metadataQueryGenerator>
-
<responseGenerator>org.perfsonar.service.measurementArchive.sqlType.fetch.IperfResponseGenerator</responseGenerator>
-
<storeRequestProcess>org.perfsonar.service.measurementArchive.sqlType.store.IperfStoreRequestProcess</storeRequestProcess>
- <ibatisConfig>ibatis-SqlMapConfig-iperf.xml</ibatisConfig>
- </eventType>
-
- <eventType>
- <name>http://ggf.org/ns/nmwg/tools/ping/2.0</name>
-
<metadataQueryGenerator>org.perfsonar.service.measurementArchive.metadataConfig.queryGenerator.PingQueryGenerator</metadataQueryGenerator>
-
<responseGenerator>org.perfsonar.service.measurementArchive.sqlType.fetch.PingResponseGenerator</responseGenerator>
-
<storeRequestProcess>org.perfsonar.service.measurementArchive.sqlType.store.PingStoreRequestProcess</storeRequestProcess>
- <ibatisConfig>ibatis-SqlMapConfig-clmp-ping.xml</ibatisConfig>
- </eventType>
-
-</eventType-config>

Deleted: trunk/perfsonar-java-sql-ma/conf/eventType-rules.xml
===================================================================
--- trunk/perfsonar-java-sql-ma/conf/eventType-rules.xml 2012-11-30
11:48:50 UTC (rev 6046)
+++ trunk/perfsonar-java-sql-ma/conf/eventType-rules.xml 2012-12-03
13:50:47 UTC (rev 6047)
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!-- $Id$ -->
-<!-- romradz -->
-
-
-<digester-rules>
-
- <object-create-rule
- pattern="eventType-config"
-
classname="org.perfsonar.service.measurementArchive.eventTypeConfig.EventTypeConfiguration"
/>
-
- <pattern value="eventType-config/eventType">
- <object-create-rule
-
classname="org.perfsonar.service.measurementArchive.eventTypeConfig.EventType"
/>
- <call-method-rule pattern="name" methodname="setName"
- paramcount="0" />
- <call-method-rule pattern="metadataQueryGenerator"
methodname="setMetadataQueryGenerator"
- paramcount="0" />
- <call-method-rule pattern="metadataKeyGenerator"
methodname="setMetadataKeyGenerator"
- paramcount="0" />
- <call-method-rule pattern="responseGenerator"
methodname="setResponseGenerator"
- paramcount="0" />
- <call-method-rule pattern="storeRequestProcess"
methodname="setStoreRequestProcess"
- paramcount="0" />
- <call-method-rule pattern="baseChainingMerger"
methodname="setBaseChainingMerger"
- paramcount="0" />
- <call-method-rule pattern="ibatisConfig"
methodname="setIbatisConfig"
- paramcount="0" />
- <set-next-rule methodname="setEventType" />
- </pattern>
-
-</digester-rules>
\ No newline at end of file

Deleted: trunk/perfsonar-java-sql-ma/conf/log4j.properties
===================================================================
--- trunk/perfsonar-java-sql-ma/conf/log4j.properties 2012-11-30 11:48:50
UTC (rev 6046)
+++ trunk/perfsonar-java-sql-ma/conf/log4j.properties 2012-12-03 13:50:47
UTC (rev 6047)
@@ -1,13 +0,0 @@
-## $Id$
-## project : perfSONAR
-## author: romradz
-
-
-log4j.rootLogger=DEBUG, psRootAppender
-
-log4j.appender.psRootAppender=org.apache.log4j.RollingFileAppender
-log4j.appender.psRootAppender.MaxBackupIndex=11
-log4j.appender.psRootAppender.File=/var/log/geant2-java-sql-ma/perfsonar_debug_sqlma.log
-log4j.appender.psRootAppender.layout=org.apache.log4j.PatternLayout
-log4j.appender.psRootAppender.layout.ConversionPattern=%d %5p - %m%n
-log4j.appender.psRootAppender.MaxFileSize=2000KB

Deleted: trunk/perfsonar-java-sql-ma/conf/log4j.properties.template
===================================================================
--- trunk/perfsonar-java-sql-ma/conf/log4j.properties.template 2012-11-30
11:48:50 UTC (rev 6046)
+++ trunk/perfsonar-java-sql-ma/conf/log4j.properties.template 2012-12-03
13:50:47 UTC (rev 6047)
@@ -1,235 +0,0 @@
-
-## $Id$
-## project : perfSONAR
-## author: romradz
-
-
-
-
-# Group=Logging
-# Description=The location of the log directory.
-logDir=_LOGPATH_
-
-
-##
-## All log levels in one log file.
-## By default debug level is switched off (commented).
-##
-
-# Group=Log levels
-# Description=Assigns debug log messages to the specified log appender.
-#log4j.logger.sonar-debug=DEBUG, psRootAppender
-
-# Group=Log levels
-# Description=Assigns info log messages to the specified log appender.
-log4j.logger.sonar-info=INFO, psRootAppender
-
-# Group=Log levels
-# Description=Assigns warn log messages to the specified log appender.
-log4j.logger.sonar-warn=WARN, psRootAppender
-
-# Group=Log levels
-# Description=Assigns error log messages to the specified log appender.
-log4j.logger.sonar-error=ERROR, psRootAppender
-
-# Group=Log levels
-# Description=Assigns fatal log messages to the specified log appender.
-log4j.logger.sonar-fatal=FATAL, psRootAppender
-
-
-
-##
-## Uncomment this block (and comment the one above)
-## if you want to have log levels in separate log files
-##
-## this section is only for developer tests
-##
-#log4j.logger.sonar-debug=DEBUG, debugAppender, psRootAppender
-#log4j.logger.sonar-info=INFO, infoAppender, psRootAppender
-#log4j.logger.sonar-warn=WARN, warnAppender, psRootAppender
-#log4j.logger.sonar-error=ERROR, errorAppender, psRootAppender
-#log4j.logger.sonar-fatal=FATAL, fatalAppender, psRootAppender
-
-
-
-
-######################################### DEBUG
#######################################
-
-# Group=Debug message logging
-# Description=The maximum number of backup log files to create.
-log4j.appender.debugAppender.MaxBackupIndex=11
-
-# Group=Debug message logging
-# Description=The path to the log file, including the log file's name.
-log4j.appender.debugAppender.File=_LOGPATH_/perfsonar_debug.log
-
-# Group=Debug message logging
-# Description=The class responsible for the logging layout.
-log4j.appender.debugAppender.layout=org.apache.log4j.PatternLayout
-
-# Group=Debug message logging
-# Description=The log message format.
-log4j.appender.debugAppender.layout.ConversionPattern=%d
%%GEANT2-JAVA-RRD-MA.%p%% %m%n
-
-# Group=Debug message logging
-# Description=The maximum size the log file can reach before it replaces the
oldest backup file and a new log file is started.
-log4j.appender.debugAppender.MaxFileSize=500KB
-
-# Group=Debug message logging
-# Description=The class responsible for appending log messages to the log
file.
-log4j.appender.debugAppender=org.apache.log4j.RollingFileAppender
-
-
-
-######################################### INFO
########################################
-
-# Group=Info message logging
-# Description=The maximum number of backup log files to create.
-log4j.appender.infoAppender.MaxBackupIndex=11
-
-# Group=Info message logging
-# Description=The path to the log file, including the log file's name.
-log4j.appender.infoAppender.File=_LOGPATH_/perfsonar_info.log
-
-# Group=Info message logging
-# Description=The class responsible for the logging layout.
-log4j.appender.infoAppender.layout=org.apache.log4j.PatternLayout
-
-# Group=Info message logging
-# Description=The log message format.
-log4j.appender.infoAppender.layout.ConversionPattern=%d
%%GEANT2-JAVA-RRD-MA.%p%% %m%n
-
-# Group=Info message logging
-# Description=The maximum size the log file can reach before it replaces the
oldest backup file and a new log file is started.
-log4j.appender.infoAppender.MaxFileSize=500KB
-
-# Group=Info message logging
-# Description=The class responsible for appending log messages to the log
file.
-log4j.appender.infoAppender=org.apache.log4j.RollingFileAppender
-
-
-
-######################################### WARN
########################################
-
-# Group=Warn message logging
-# Description=The maximum number of backup log files to create.
-log4j.appender.warnAppender.MaxBackupIndex=11
-
-# Group=Warn message logging
-# Description=The path to the log file, including the log file's name.
-log4j.appender.warnAppender.File=_LOGPATH_/perfsonar_warn.log
-
-# Group=Warn message logging
-# Description=The class responsible for the logging layout.
-log4j.appender.warnAppender.layout=org.apache.log4j.PatternLayout
-
-# Group=Warn message logging
-# Description=The log message format.
-log4j.appender.warnAppender.layout.ConversionPattern=%d
%%GEANT2-JAVA-RRD-MA.%p%% %m%n
-
-# Group=Warn message logging
-# Description=The maximum size the log file can reach before it replaces the
oldest backup file and a new log file is started.
-log4j.appender.warnAppender.MaxFileSize=500KB
-
-# Group=Warn message logging
-# Description=The class responsible for appending log messages the log file.
-log4j.appender.warnAppender=org.apache.log4j.RollingFileAppender
-
-
-
-######################################### ERROR
#######################################
-
-# Group=Error message logging
-# Description=The maximum number of backup log files to create.
-log4j.appender.errorAppender.MaxBackupIndex=11
-
-# Group=Error message logging
-# Description=The path to the log file, including the log file's name.
-log4j.appender.errorAppender.File=_LOGPATH_/perfsonar_error.log
-
-# Group=Error message logging
-# Description=The class responsible for the logging layout.
-log4j.appender.errorAppender.layout=org.apache.log4j.PatternLayout
-
-# Group=Error message logging
-# Description=The log message format.
-log4j.appender.errorAppender.layout.ConversionPattern=%d
%%GEANT2-JAVA-RRD-MA.%p%% %m%n
-
-# Group=Error message logging
-# Description=The maximum size the log file can reach before it replaces the
oldest backup file and a new log file is started.
-log4j.appender.errorAppender.MaxFileSize=500KB
-
-# Group=Error message logging
-# Description=The class responsible for appending log messages the log file.
-log4j.appender.errorAppender=org.apache.log4j.RollingFileAppender
-
-
-
-######################################### FATAL
#######################################
-
-# Group=Fatal message logging
-# Description=The maximum number of backup log files to create.
-log4j.appender.fatalAppender.MaxBackupIndex=11
-
-# Group=Fatal message logging
-# Description=The path to the log file, including the log file's name.
-log4j.appender.fatalAppender.File=_LOGPATH_/perfsonar_fatal.log
-
-# Group=Fatal message logging
-# Description=The class responsible for the logging layout.
-log4j.appender.fatalAppender.layout=org.apache.log4j.PatternLayout
-
-# Group=Fatal message logging
-# Description=The log message format.
-log4j.appender.fatalAppender.layout.ConversionPattern=%d
%%GEANT2-JAVA-RRD-MA.%p%% %m%n
-
-# Group=Fatal message logging
-# Description=The maximum size the log file can reach before it replaces the
oldest backup file and a new log file is started.
-log4j.appender.fatalAppender.MaxFileSize=500KB
-
-# Group=Fatal message logging
-# Description=The class responsible for appending log messages the log file.
-log4j.appender.fatalAppender=org.apache.log4j.RollingFileAppender
-
-
-
-######################################### ALL
#########################################
-
-# Group=All message logging
-# Description=The maximum number of backup log files to create.
-log4j.appender.psRootAppender.MaxBackupIndex=11
-
-# Group=All message logging
-# Description=The path to the log file, including the log file's name.
-log4j.appender.psRootAppender.File=_LOGPATH_/perfsonar.log
-
-# Group=All message logging
-# Description=The class responsible for the logging layout.
-log4j.appender.psRootAppender.layout=org.apache.log4j.PatternLayout
-
-# Group=All message logging
-# Description=The log message format.
-log4j.appender.psRootAppender.layout.ConversionPattern=%d
%%GEANT2-JAVA-RRD-MA.%p%% %m%n
-
-# Group=All message logging
-# Description=The maximum size the log file can reach before it replaces the
oldest backup file and a new log file is started.
-log4j.appender.psRootAppender.MaxFileSize=500KB
-
-# Group=All message logging
-# Description=The class responsible for appending log messages the log file.
-log4j.appender.psRootAppender=org.apache.log4j.RollingFileAppender
-
-
-
-######################################### ROOT
#########################################
-
-# this section is only for developer's tests
-
-# ROOT
-#log4j.appender.rootAppender.MaxBackupIndex=11
-#log4j.appender.rootAppender.File=_LOGPATH_/perfsonar_root.log
-#log4j.appender.rootAppender.layout=org.apache.log4j.PatternLayout
-#log4j.appender.rootAppender.layout.ConversionPattern=%d
%%GEANT2-JAVA-RRD-MA.%p%% %m%n
-#log4j.rootLogger=DEBUG, rootAppender
-#log4j.appender.rootAppender.MaxFileSize=500KB
-#log4j.appender.rootAppender=org.apache.log4j.RollingFileAppender

Deleted: trunk/perfsonar-java-sql-ma/conf/log4j.syslog.properties
===================================================================
--- trunk/perfsonar-java-sql-ma/conf/log4j.syslog.properties 2012-11-30
11:48:50 UTC (rev 6046)
+++ trunk/perfsonar-java-sql-ma/conf/log4j.syslog.properties 2012-12-03
13:50:47 UTC (rev 6047)
@@ -1,248 +0,0 @@
-## $Id$
-## project : perfSONAR
-## author: romradz
-
-
-
-##
-## All log levels in one log file.
-## By default debug level is switched off (commented).
-##
-
-# Group=Log levels
-# Description=Assigns debug log messages to the specified log appender.
-#log4j.logger.sonar-debug=DEBUG, SYSLOG, psRootAppender
-
-# Group=Log levels
-# Description=Assigns info log messages to the specified log appender.
-log4j.logger.sonar-info=INFO, SYSLOG, psRootAppender
-
-# Group=Log levels
-# Description=Assigns warn log messages to the specified log appender.
-log4j.logger.sonar-warn=WARN, SYSLOG, psRootAppender
-
-# Group=Log levels
-# Description=Assigns error log messages to the specified log appender.
-log4j.logger.sonar-error=ERROR, SYSLOG, psRootAppender
-
-# Group=Log levels
-# Description=Assigns fatal log messages to the specified log appender.
-log4j.logger.sonar-fatal=FATAL, SYSLOG, psRootAppender
-
-
-
-##
-## Uncomment this block (and comment the one above)
-## if you want to have log levels in separate log files
-##
-## this section is only for developer tests
-##
-#log4j.logger.sonar-debug=DEBUG, SYSLOG, debugAppender, psRootAppender
-#log4j.logger.sonar-info=INFO, SYSLOG, infoAppender, psRootAppender
-#log4j.logger.sonar-warn=WARN, SYSLOG, warnAppender, psRootAppender
-#log4j.logger.sonar-error=ERROR, SYSLOG, errorAppender, psRootAppender
-#log4j.logger.sonar-fatal=FATAL, SYSLOG, fatalAppender, psRootAppender
-
-
-
-
-######################################### DEBUG
#######################################
-
-# Group=Debug message logging
-# Description=The maximum number of backup log files to create.
-log4j.appender.debugAppender.MaxBackupIndex=11
-
-# Group=Debug message logging
-# Description=The path to the log file, including the log file's name.
-log4j.appender.debugAppender.File=/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/log/perfsonar_debug.log
-
-# Group=Debug message logging
-# Description=The class responsible for the logging layout.
-log4j.appender.debugAppender.layout=org.apache.log4j.PatternLayout
-
-# Group=Debug message logging
-# Description=The log message format.
-log4j.appender.debugAppender.layout.ConversionPattern=%d
%%GEANT2-JAVA-SQL-MA.%p%% %m%n
-
-# Group=Debug message logging
-# Description=The maximum size the log file can reach before it replaces the
oldest backup file and a new log file is started.
-log4j.appender.debugAppender.MaxFileSize=500KB
-
-# Group=Debug message logging
-# Description=The class responsible for appending log messages to the log
file.
-log4j.appender.debugAppender=org.apache.log4j.RollingFileAppender
-
-
-
-######################################### INFO
########################################
-
-# Group=Info message logging
-# Description=The maximum number of backup log files to create.
-log4j.appender.infoAppender.MaxBackupIndex=11
-
-# Group=Info message logging
-# Description=The path to the log file, including the log file's name.
-log4j.appender.infoAppender.File=/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/log/perfsonar_info.log
-
-# Group=Info message logging
-# Description=The class responsible for the logging layout.
-log4j.appender.infoAppender.layout=org.apache.log4j.PatternLayout
-
-# Group=Info message logging
-# Description=The log message format.
-log4j.appender.infoAppender.layout.ConversionPattern=%d
%%GEANT2-JAVA-SQL-MA.%p%% %m%n
-
-# Group=Info message logging
-# Description=The maximum size the log file can reach before it replaces the
oldest backup file and a new log file is started.
-log4j.appender.infoAppender.MaxFileSize=500KB
-
-# Group=Info message logging
-# Description=The class responsible for appending log messages to the log
file.
-log4j.appender.infoAppender=org.apache.log4j.RollingFileAppender
-
-
-
-######################################### WARN
########################################
-
-# Group=Warn message logging
-# Description=The maximum number of backup log files to create.
-log4j.appender.warnAppender.MaxBackupIndex=11
-
-# Group=Warn message logging
-# Description=The path to the log file, including the log file's name.
-log4j.appender.warnAppender.File=/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/log/perfsonar_warn.log
-
-# Group=Warn message logging
-# Description=The class responsible for the logging layout.
-log4j.appender.warnAppender.layout=org.apache.log4j.PatternLayout
-
-# Group=Warn message logging
-# Description=The log message format.
-log4j.appender.warnAppender.layout.ConversionPattern=%d
%%GEANT2-JAVA-SQL-MA.%p%% %m%n
-
-# Group=Warn message logging
-# Description=The maximum size the log file can reach before it replaces the
oldest backup file and a new log file is started.
-log4j.appender.warnAppender.MaxFileSize=500KB
-
-# Group=Warn message logging
-# Description=The class responsible for appending log messages to the log
file.
-log4j.appender.warnAppender=org.apache.log4j.RollingFileAppender
-
-
-
-######################################### ERROR
#######################################
-
-# Group=Error message logging
-# Description=The maximum number of backup log files to create.
-log4j.appender.errorAppender.MaxBackupIndex=11
-
-# Group=Error message logging
-# Description=The path to the log file, including the log file's name.
-log4j.appender.errorAppender.File=/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/log/perfsonar_error.log
-
-# Group=Error message logging
-# Description=The class responsible for the logging layout.
-log4j.appender.errorAppender.layout=org.apache.log4j.PatternLayout
-
-# Group=Error message logging
-# Description=The log message format.
-log4j.appender.errorAppender.layout.ConversionPattern=%d
%%GEANT2-JAVA-SQL-MA.%p%% %m%n
-
-# Group=Error message logging
-# Description=The maximum size the log file can reach before it replaces the
oldest backup file and a new log file is started.
-log4j.appender.errorAppender.MaxFileSize=500KB
-
-# Group=Error message logging
-# Description=The class responsible for appending log messages to the log
file.
-log4j.appender.errorAppender=org.apache.log4j.RollingFileAppender
-
-
-
-######################################### FATAL
#######################################
-
-# Group=Fatal message logging
-# Description=The maximum number of backup log files to create.
-log4j.appender.fatalAppender.MaxBackupIndex=11
-
-# Group=Fatal message logging
-# Description=The path to the log file, including the log file's name.
-log4j.appender.fatalAppender.File=/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/log/perfsonar_fatal.log
-
-# Group=Fatal message logging
-# Description=The class responsible for the logging layout.
-log4j.appender.fatalAppender.layout=org.apache.log4j.PatternLayout
-
-# Group=Fatal message logging
-# Description=The log message format.
-log4j.appender.fatalAppender.layout.ConversionPattern=%d
%%GEANT2-JAVA-SQL-MA.%p%% %m%n
-
-# Group=Fatal message logging
-# Description=The maximum size the log file can reach before it replaces the
oldest backup file and a new log file is started.
-log4j.appender.fatalAppender.MaxFileSize=500KB
-
-# Group=Fatal message logging
-# Description=The class responsible for appending log messages to the log
file.
-log4j.appender.fatalAppender=org.apache.log4j.RollingFileAppender
-
-
-
-######################################### ALL
#########################################
-
-# Group=All message logging
-# Description=The maximum number of backup log files to create.
-log4j.appender.psRootAppender.MaxBackupIndex=11
-
-# Group=All message logging
-# Description=The path to the log file, including the log file's name.
-log4j.appender.psRootAppender.File=/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/log/perfsonar.log
-
-# Group=All message logging
-# Description=The class responsible for the logging layout.
-log4j.appender.psRootAppender.layout=org.apache.log4j.PatternLayout
-
-# Group=All message logging
-# Description=The log message format.
-log4j.appender.psRootAppender.layout.ConversionPattern=%d
%%GEANT2-JAVA-SQL-MA.%p%% %m%n
-
-# Group=All message logging
-# Description=The maximum size the log file can reach before it replaces the
oldest backup file and a new log file is started.
-log4j.appender.psRootAppender.MaxFileSize=500KB
-
-# Group=All message logging
-# Description=The class responsible for appending log messages to the log
file.
-log4j.appender.psRootAppender=org.apache.log4j.RollingFileAppender
-
-
-
-######################################### SYSLOG
#########################################
-
-# Group=Syslog logging
-# Description=The class responsible for appending log messages to the syslog
file.
-log4j.appender.SYSLOG=org.apache.log4j.net.SyslogAppender
-
-# Group=Syslog logging
-# Description=The IP address of the host executing syslog-ng.
-log4j.appender.SYSLOG.syslogHost=127.0.0.1
-
-# Group=Syslog logging
-# Description=The class responsible for the logging layout.
-log4j.appender.SYSLOG.layout=org.apache.log4j.PatternLayout
-
-# Group=Syslog logging
-# Description=The log message format. This can include @Location after
PERFSONAR-AS.
-log4j.appender.SYSLOG.layout.ConversionPattern=\%GEANT2-JAVA-SQL-MA.%p\% %m%n
-
-
-
-######################################### ROOT
#########################################
-
-# this section is only for developer's tests
-
-# ROOT
-#log4j.appender.rootAppender.MaxBackupIndex=11
-#log4j.appender.rootAppender.File=/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/log/perfsonar_root.log
-#log4j.appender.rootAppender.layout=org.apache.log4j.PatternLayout
-#log4j.appender.rootAppender.layout.ConversionPattern=%d
%%GEANT2-JAVA-SQL-MA.%p%% %m%n
-#log4j.rootLogger=DEBUG, rootAppender
-#log4j.appender.rootAppender.MaxFileSize=500KB
-#log4j.appender.rootAppender=org.apache.log4j.RollingFileAppender
\ No newline at end of file

Deleted: trunk/perfsonar-java-sql-ma/conf/mysql-sqlma-dbremove.sql
===================================================================
--- trunk/perfsonar-java-sql-ma/conf/mysql-sqlma-dbremove.sql 2012-11-30
11:48:50 UTC (rev 6046)
+++ trunk/perfsonar-java-sql-ma/conf/mysql-sqlma-dbremove.sql 2012-12-03
13:50:47 UTC (rev 6047)
@@ -1,64 +0,0 @@
-
-# $Id: mysql-sqlma-dbremove.sql 1540 2006-08-11 10:19:44Z roman $
-# project: perfSONAR
-# author: romradz
-
-
-# SQL Measurement Archive (MA)
-# sql script for mysql db
-
-
-# running:
-# mysql -u root -p < /opt/sonar/perfsonar/conf/mysql-sqlma-dbremove.sql
-
-
-
-
-USE perfsonar_ma
-
-
-DROP TABLE
- perfsonar_utilization;
-
-
-DROP TABLE
- perfsonar_errors;
-
-
-DROP TABLE
- perfsonar_discards;
-
-
-DROP TABLE
- domain_link;
-
-
-DROP TABLE
- interdomain_link;
-
-
-DROP TABLE
- perfsonar_links;
-
-
-DROP TABLE
- perfsonar_iperf;
-
-
-#DROP TABLE
-# clmp_owamp;
-
-
-#DROP TABLE
-# clmp_bwctl;
-
-
-DROP TABLE
- clmp_ping;
-
-
-DROP USER
- perfsonar_ma;
-
-
-

Deleted: trunk/perfsonar-java-sql-ma/conf/mysql-sqlma-dbsetup.sql
===================================================================
--- trunk/perfsonar-java-sql-ma/conf/mysql-sqlma-dbsetup.sql 2012-11-30
11:48:50 UTC (rev 6046)
+++ trunk/perfsonar-java-sql-ma/conf/mysql-sqlma-dbsetup.sql 2012-12-03
13:50:47 UTC (rev 6047)
@@ -1,298 +0,0 @@
-
-# $Id: mysql-sqlma-dbsetup.sql 1592 2006-09-01 18:37:40Z fernandes $
-# project: perfSONAR
-# author: romradz
-
-
-# SQL Measurement Archive (MA)
-# sql script for mysql db
-
-
-# running:
-# mysql -u root -p < /opt/sonar/perfsonar/conf/mysql-sqlma-dbsetup.sql
-
-
-
-
-CREATE DATABASE
- perfsonar_ma;
-
-
-USE perfsonar_ma
-
-
-CREATE USER
- perfsonar_ma;
-
-
-GRANT
- SELECT, INSERT, UPDATE, DELETE ON
- perfsonar_ma.* TO 'perfsonar_ma'@'localhost'
- IDENTIFIED BY 'testpass';
-
-
-CREATE TABLE
- perfsonar_utilization
- (metadataId VARCHAR(30) NOT NULL, # id of metadata which
is stored in xml database
- value FLOAT (16,4) NOT NULL, # measurement value
- valueUnits VARCHAR(30) NULL, # unit of value
- timeValue INT NOT NULL, # seconds since
`00:00:00 1970-01-01 UTC'
- ts TIMESTAMP DEFAULT NOW()); # time of inserting
-
-
-CREATE TABLE
- perfsonar_errors
- (metadataId VARCHAR(30) NOT NULL,
- value FLOAT (16,4) NOT NULL,
- valueUnits VARCHAR(30) NULL,
- timeValue INT NOT NULL,
- ts TIMESTAMP DEFAULT NOW());
-
-
-CREATE TABLE
- perfsonar_discards
- (metadataId VARCHAR(30) NOT NULL,
- value FLOAT (16,4) NOT NULL,
- valueUnits VARCHAR(30) NULL,
- timeValue INT NOT NULL,
- ts TIMESTAMP DEFAULT NOW());
-
-
-CREATE TABLE
- domain_link
- (id VARCHAR(255) NOT NULL,
- time TIMESTAMP DEFAULT NOW(),
- status_oper VARCHAR(255) DEFAULT 'UNKNOWN',
- status_admin VARCHAR(255) DEFAULT 'UNKNOWN',
- alarm_id_set VARCHAR(255),
- comments VARCHAR(255));
-
-
-CREATE TABLE
- interdomain_link
- (id VARCHAR(255) NOT NULL,
- time TIMESTAMP DEFAULT NOW(),
- status_oper VARCHAR(255) DEFAULT 'UNKNOWN',
- status_admin VARCHAR(255) DEFAULT 'UNKNOWN',
- alarm_id_set VARCHAR(255),
- comments VARCHAR(255));
-
-
-CREATE TABLE
- perfsonar_links
- (id VARCHAR(255) NOT NULL,
- time TIMESTAMP DEFAULT NOW(),
- status_oper VARCHAR(255) DEFAULT 'UNKNOWN',
- status_admin VARCHAR(255) DEFAULT 'UNKNOWN',
- alarm_id_set VARCHAR(255),
- comments VARCHAR(255));
-
-CREATE TABLE
- perfsonar_iperf
- (metadataId VARCHAR(30) NOT NULL,
- value FLOAT (16,4) NULL,
- valueUnits VARCHAR(30) NULL,
- throughput FLOAT (16,4) NULL,
- jitter FLOAT (16,4) NULL,
- loss VARCHAR(15) NULL,
- numBytes NUMERIC(40) NULL,
- numBytesUnits VARCHAR(15) NULL,
- interv VARCHAR(30) NULL,
- time INT NOT NULL,
- format VARCHAR(30) NULL,
- protocol VARCHAR(10) NULL,
- bufferLength INT NULL,
- windowSize INT NULL,
- windowSizeRequest VARCHAR(30) NULL,
- timeDuration VARCHAR(30) NULL,
- arguments VARCHAR(50) NULL,
- test_session_id VARCHAR(30) NULL,
- ts TIMESTAMP DEFAULT NOW());
-
-
-
-
-#INSERT
-# INTO owamp_agg
-# VALUES ('owamp-meta2', 'host1', 'host2', 1, 1, '10.0', 2, '1.0',
'2.0', '1.5', 'ms', '1.0', 'ms', '0.1', 'ms', 12, default);
-
-
-
-############### Create table for BWCTL data ################
-#CREATE TABLE `clmp_bwctl` (
-# `metadataId` varchar(255) NOT NULL,
-# `intervalEnd` varchar(30) default NULL,
-# `intervalStart` varchar(30) default NULL,
-# `intervalUnit` varchar(30) default NULL,
-# `numBytes` varchar(30) default NULL,
-# `numBytesUnits` varchar(30) default NULL,
-# `tcpAdapterType` varchar(30) default NULL,
-# `tcpMSSSize` varchar(30) default NULL,
-# `timeType` varchar(30) default NULL,
-# `timeValue` mediumtext NOT NULL,
-# `value` mediumtext NOT NULL,
-# `valueUnits` varchar(30) default NULL,
-# `tcpMSSUnit` varchar(30) default NULL,
-# `tcpMTUSize` varchar(30) default NULL,
-# `tcpMTUUnit` varchar(30) default NULL,
-# `tcpWindowSize` varchar(30) default NULL,
-# `tcpWindowUnit` varchar(30) default NULL,
-# `udpBufferSize` varchar(30) default NULL,
-# `udpBufferUnit` varchar(30) default NULL,
-# `udpJitter` varchar(30) default NULL,
-# `udpJitterUnit` varchar(30) default NULL,
-# `udpPacketLoss` varchar(30) default NULL,
-# `udpPacketLossPercentage` varchar(30) default NULL,
-# `udpPacketSent` varchar(30) default NULL,
-# `ts` timestamp NOT NULL default CURRENT_TIMESTAMP);
-###########################################################
-
-############### Create table for ping data ################
-CREATE TABLE
- clmp_ping
- (metadataId VARCHAR(255) NOT NULL,
- seqNum INT UNSIGNED NULL DEFAULT 0,
- value FLOAT (16,4) NOT NULL,
- valueUnits VARCHAR(4) NULL,
- ttl TINYINT UNSIGNED NULL DEFAULT 0,
- numBytes INT NULL DEFAULT 0,
- numBytesUnits VARCHAR(10) NULL,
- timeValue LONG NOT NULL,
- timeType VARCHAR(4) NULL,
- ts TIMESTAMP DEFAULT NOW());
-############################################################
-
-# insert statements for testing perfsonar_utilization table
-
-INSERT
- INTO perfsonar_utilization
- VALUES ('meta1-test', 2, 'Bps', 1143034705, default);
-
-INSERT
- INTO
- perfsonar_utilization
- VALUES ('meta2-test', 3, 'Bps', 1143034706, default);
-
-INSERT
- INTO
- perfsonar_utilization
- VALUES ('meta3-test', 4, 'Bps', 1143034707, default);
-
-INSERT
- INTO
- perfsonar_utilization
- VALUES ('meta4-test', 5, 'Bps', 1143034709, default);
-
-
-
-# insert statements for testing perfsonar_errors table
-
-INSERT
- INTO perfsonar_errors
- VALUES ('meta1-errors-test', 1, 'Eps', 1187948870, default);
-
-INSERT
- INTO
- perfsonar_errors
- VALUES ('meta1-errors-test', 0, 'Eps', 1187948875, default);
-
-INSERT
- INTO
- perfsonar_errors
- VALUES ('meta1-errors-test', 4, 'Eps', 1187948882, default);
-
-INSERT
- INTO
- perfsonar_errors
- VALUES ('meta1-errors-test', 2, 'Eps', 1187948888, default);
-
-
-
-# insert statements for testing perfsonar_discards table
-
-INSERT
- INTO perfsonar_discards
- VALUES ('meta1-discards-test', 1, 'Dps', 1187948870, default);
-
-INSERT
- INTO
- perfsonar_discards
- VALUES ('meta1-discards-test', 0, 'Dps', 1187948875, default);
-
-INSERT
- INTO
- perfsonar_discards
- VALUES ('meta1-discards-test', 4, 'Dps', 1187948882, default);
-
-INSERT
- INTO
- perfsonar_discards
- VALUES ('meta1-discards-test', 2, 'Dps', 1187948888, default);
-
-
-# insert statements for testing domain_link table
-
-INSERT
- INTO domain_link (id, status_oper, time)
- VALUES ('DFN-link-1234', 'down', '2006-04-06 12:15:23');
-
-INSERT
- INTO domain_link (id, status_oper, time)
- VALUES ('DFN-Surfnet-Link-5678', 'up', '2006-04-06 12:15:24');
-
-INSERT
- INTO domain_link (id, status_oper, time)
- VALUES ('PSNC-DFN-MUE-Link-1001', 'down', '2006-04-06 12:15:25');
-
-
-
-# insert statements for testing domain_link table
-
-INSERT
- INTO interdomain_link (id, status_oper, time)
- VALUES ('PSNC-2-DFN-MUE-Link-1002', 'up', '2006-04-06 12:17:33');
-
-
-
-# insert statements for testing perfsonar_links table
-
-INSERT
- INTO perfsonar_links (id, status_oper, time)
- VALUES ('PSNC-2-DFN-MUE-Link-1002', 'up', '2006-04-06 12:17:33');
-
-
-
-# insert statements for testing perfsonar_iperf table
-INSERT
-INTO perfsonar_iperf
-VALUES ('meta1-iperf-test', 165214869, 'bits/sec', 1.00, 1.830, '0/837',
123911152, 'Bytes', '0.0- 6.0', 1332320400, NULL, 'TCP', NULL, NULL, NULL,
NULL, NULL, NULL, default);
-
-INSERT
-INTO perfsonar_iperf
-VALUES ('meta1-iperf-test', 49782240, 'bits/sec', 1.50, 1.830, '0/837',
37336680, 'Bytes', '6.0-12.0', 1332320400, NULL, 'TCP', NULL, NULL, NULL,
NULL, NULL, NULL, default);
-
-INSERT
-INTO perfsonar_iperf
-VALUES ('meta1-iperf-test', 28124021, 'bits/sec', 2.00, 1.830, '0/837',
21093016, 'Bytes', '12.0-18.0', 1332320400, NULL, 'TCP', NULL, NULL, NULL,
NULL, NULL, NULL, default);
-
-INSERT
-INTO perfsonar_iperf
-VALUES ('meta1-iperf-test', 34060821, 'bits/sec', 2.50, 1.830, '0/837',
25545616, 'Bytes', '18.0-24.0', 1332320400, NULL, 'TCP', NULL, NULL, NULL,
NULL, NULL, NULL, default);
-
-INSERT
-INTO perfsonar_iperf
-VALUES ('meta1-iperf-test', 34946997, 'bits/sec', 3.00, 1.830, '0/837',
26210248, 'Bytes', '24.0-30.0', 1332320400, NULL, 'TCP', NULL, NULL, NULL,
NULL, NULL, NULL, default);
-
-INSERT
-INTO perfsonar_iperf
-VALUES ('meta1-iperf-test', 61428990, 'bits/sec', 3.50, 1.830, '0/837',
239779840, 'Bytes', '0.0-30.3', 1332320400, NULL, 'TCP', NULL, NULL, NULL,
NULL, NULL, NULL, default);
-
-# insert statements for testing clmp_ping table
-
-INSERT
- INTO clmp_ping
- VALUES ('ping-meta1', 1, 5.3, 'ms', 253, 8, 'Bytes', 1233655716, 'unix',
default);
-
-INSERT
- INTO clmp_ping
- VALUES ('ping-meta1', 2, 2.5, 'ms', 253, 8, 'Bytes', 1233655718, 'unix',
default);

Deleted: trunk/perfsonar-java-sql-ma/conf/mysql-sqlma-dbupdate-owamp.sql
===================================================================
--- trunk/perfsonar-java-sql-ma/conf/mysql-sqlma-dbupdate-owamp.sql
2012-11-30 11:48:50 UTC (rev 6046)
+++ trunk/perfsonar-java-sql-ma/conf/mysql-sqlma-dbupdate-owamp.sql
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,56 +0,0 @@
-#$Id : mysql-sqlma-dbupdate-owamp.sql
-#project: perfsonar
-#author: Piotr Pikusa
-
-# SQL Measurement Archive (MA)
-# sql script for upgrading mysql db. It updates db schema from the last
stable version (not rc) to the db schema for current version
-
-# running:
-# mysql -u root -p < /etc/mysql-sqlma-dbupdate-owamp.sql
-
-USE perfsonar_ma
-
-# Create table for OWAMP data
-CREATE TABLE
- owamp
- (metadataId VARCHAR(255) NOT NULL ,
- receiveSynchronized INT(1) NULL DEFAULT -1,
- receiveTime VARCHAR(21) NOT NULL DEFAULT '-1',
- receiveTimeError FLOAT NULL DEFAULT -1.0,
- sendSynchronized INT(1) NULL DEFAULT -1,
- sendTime VARCHAR(21) NOT NULL DEFAULT '-1',
- sendTimeError FLOAT NULL DEFAULT -1.0,
- seqNum INTEGER NULL DEFAULT -1,
- ttl SMALLINT NULL DEFAULT -1,
- ts TIMESTAMP DEFAULT NOW());
-
-INSERT
- INTO owamp
- VALUES ('owamp-meta1', 1, '15080301494633990766', 1.00583e-06, 1,
15080301494378967368, 4.91142e-05, 0, 243 ,default);
-INSERT
- INTO owamp
- VALUES ('owamp-meta1', 1, '15080301494633990766', 1.00483e-06, 1,
15080301494378967368, 4.81142e-05, 1, 243 ,default);
-
- CREATE TABLE
- owamp_agg
- (metadataId VARCHAR(255) NOT NULL,
- sender VARCHAR(255) NOT NULL DEFAULT '-1',
- receiver VARCHAR(255) NOT NULL DEFAULT '-1',
- sent INT NULL DEFAULT -1,
- loss INT NULL DEFAULT -1,
- lostPercent FLOAT NULL DEFAULT -1.0,
- duplicates INT NULL DEFAULT -1,
- minDelay FLOAT NULL DEFAULT -1.0,
- medDelay FLOAT NULL DEFAULT -1.0,
- maxDelay FLOAT NULL DEFAULT -1.0,
- delayUnits VARCHAR(10) NULL DEFAULT '-1',
- error FLOAT NULL DEFAULT -1.0,
- errorUnits VARCHAR (10) NULL DEFAULT '-1',
- jitter FLOAT NULL DEFAULT -1.0,
- jitterUnits VARCHAR(10) NULL DEFAULT '-1',
- hops INT NULL DEFAULT -1,
- ts TIMESTAMP DEFAULT NOW());
-
-INSERT
- INTO owamp_agg
- VALUES ('owamp-meta2', 'host1', 'host2', 1, 1, '10.0', 2, '1.0',
'2.0', '1.5', 'ms', '1.0', 'ms', '0.1', 'ms', 12, default);

Deleted: trunk/perfsonar-java-sql-ma/conf/mysql-sqlma-dbupdate-owamp_v2.sql
===================================================================
--- trunk/perfsonar-java-sql-ma/conf/mysql-sqlma-dbupdate-owamp_v2.sql
2012-11-30 11:48:50 UTC (rev 6046)
+++ trunk/perfsonar-java-sql-ma/conf/mysql-sqlma-dbupdate-owamp_v2.sql
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,56 +0,0 @@
-#$Id : mysql-sqlma-dbupdate-owamp.sql
-#project: perfsonar
-#author: Piotr Pikusa
-
-# SQL Measurement Archive (MA)
-# sql script for upgrading mysql db. It updates db schema from the last
stable version (not rc) to the db schema for current version
-
-# running:
-# mysql -u root -p < /etc/mysql-sqlma-dbupdate-owamp.sql
-
-USE perfsonar_ma
-
-#Create table for OWAMP data
-CREATE TABLE
- owamp
- (metadataId VARCHAR(255) NOT NULL ,
- receiveSynchronized INT(1) NOT NULL,
- receiveTime VARCHAR(21) NOT NULL,
- receiveTimeError FLOAT NOT NULL,
- sendSynchronized INT(1) NOT NULL,
- sendTime VARCHAR(21) NOT NULL,
- sendTimeError FLOAT NOT NULL,
- seqNum INTEGER NOT NULL,
- ttl SMALLINT NOT NULL,
- ts TIMESTAMP DEFAULT NOW());
-
-INSERT
- INTO owamp
- VALUES ('owamp-meta1', 1, '15080301494633990766', 1.00583e-06, 1,
15080301494378967368, 4.91142e-05, 0, 243 ,default);
-INSERT
- INTO owamp
- VALUES ('owamp-meta1', 1, '15080301494633990766', 1.00483e-06, 1,
15080301494378967368, 4.81142e-05, 1, 243 ,default);
-
- CREATE TABLE
- owamp_agg
- (metadataId VARCHAR(255) NOT NULL,
- sender VARCHAR(255) NOT NULL,
- receiver VARCHAR(255) NOT NULL,
- sent INT NOT NULL,
- loss INT NOT NULL,
- lostPercent FLOAT NOT NULL,
- duplicates INT NOT NULL,
- minDelay FLOAT NOT NULL,
- medDelay FLOAT NOT NULL,
- maxDelay FLOAT NOT NULL,
- delayUnits VARCHAR(10) NOT NULL,
- error FLOAT NOT NULL,
- errorUnits VARCHAR (10) NOT NULL,
- jitter FLOAT NULL NOT NULL,
- jitterUnits VARCHAR(10) NOT NULL,
- hops INT NOT NULL,
- ts TIMESTAMP DEFAULT NOW());
-
-INSERT
- INTO owamp_agg
- VALUES ('owamp-meta2', 'host1', 'host2', 1, 1, '10.0', 2, '1.0',
'2.0', '1.5', 'ms', '1.0', 'ms', '0.1', 'ms', 12, default);

Deleted: trunk/perfsonar-java-sql-ma/conf/mysql-sqlma-dbupdate.sql
===================================================================
--- trunk/perfsonar-java-sql-ma/conf/mysql-sqlma-dbupdate.sql 2012-11-30
11:48:50 UTC (rev 6046)
+++ trunk/perfsonar-java-sql-ma/conf/mysql-sqlma-dbupdate.sql 2012-12-03
13:50:47 UTC (rev 6047)
@@ -1,71 +0,0 @@
-#$Id : mysql-sqlma-dbupdate.sql
-#project: perfsonar
-#author: Piotr Pikusa
-
-# SQL Measurement Archive (MA)
-# sql script for upgrading mysql db. It updates db schema from the last
stable version (not rc) to the db schema for current version
-
-# running:
-# mysql -u root -p < /etc/mysql-sqlma-dbupdate.sql
-
-
-USE perfsonar_ma
-
-CREATE TABLE
- perfsonar_iperf
- (metadataId VARCHAR(30) NOT NULL,
- value FLOAT (16,4) NULL,
- valueUnits VARCHAR(30) NULL,
- throughput FLOAT (16,4) NULL,
- jitter FLOAT (16,4) NULL,
- loss VARCHAR(15) NULL,
- numBytes NUMERIC(40) NULL,
- numBytesUnits VARCHAR(15) NULL,
- interv VARCHAR(30) NULL,
- time INT NOT NULL,
- format VARCHAR(30) NULL,
- protocol VARCHAR(10) NULL,
- bufferLength INT NULL,
- windowSize INT NULL,
- windowSizeRequest VARCHAR(30) NULL,
- timeDuration VARCHAR(30) NULL,
- arguments VARCHAR(50) NULL,
- test_session_id VARCHAR(30) NULL,
- ts TIMESTAMP DEFAULT NOW());
-
-
-CREATE TABLE
- clmp_ping
- (metadataId VARCHAR(255) NOT NULL,
- seqNum INT UNSIGNED NULL DEFAULT 0,
- value FLOAT (16,4) NOT NULL,
- valueUnits VARCHAR(4) NULL,
- ttl TINYINT UNSIGNED NULL DEFAULT 0,
- numBytes INT NULL DEFAULT 0,
- numBytesUnits VARCHAR(10) NULL,
- timeValue LONG NOT NULL,
- timeType VARCHAR(4) NULL,
- ts TIMESTAMP DEFAULT NOW());
-
-
-# insert statements for testing perfsonar_iperf table
-
-INSERT
- INTO perfsonar_iperf
- VALUES ('meta1-iperf-test', NULL, 'bits/sec', 2.88, 1.830, '0/837',
23484640, 'Bytes', NULL, 1197642642, NULL, 'TCP', NULL, NULL, NULL, NULL,
NULL, NULL, default);
-
-INSERT
- INTO perfsonar_iperf
- VALUES ('meta2-iperf-test', NULL, 'bits/sec', 1.45, 1.806, '5/851',
23484640, 'Bytes', NULL, 1197642662, NULL, 'UDP', NULL, NULL, NULL, NULL,
NULL, NULL, default);
-
-
-
-# insert statements for testing clmp_ping table
-
-INSERT
- INTO clmp_ping
- VALUES ('ping-meta1', 1, 5.3, 'ms', 253, 8, 'Bytes', 1233655716, 'unix',
default);
-
-INSERT
- INTO clmp_ping
- VALUES ('ping-meta1', 2, 2.5, 'ms', 253, 8, 'Bytes', 1233655718, 'unix',
default);

Deleted: trunk/perfsonar-java-sql-ma/conf/objects.config
===================================================================
--- trunk/perfsonar-java-sql-ma/conf/objects.config 2012-11-30 11:48:50
UTC (rev 6046)
+++ trunk/perfsonar-java-sql-ma/conf/objects.config 2012-12-03 13:50:47
UTC (rev 6047)
@@ -1,186 +0,0 @@
-http://ggf.org/ns/nmwg/base/2.0/subject/
org.ggf.ns.nmwg.base.v2_0.Subject
-http://ggf.org/ns/nmwg/base/2.0/parameters/
org.ggf.ns.nmwg.base.v2_0.Parameters
-http://ggf.org/ns/nmwg/base/2.0/commonTime/
org.ggf.ns.nmwg.base.v2_0.CommonTime
-http://ggf.org/ns/nmwg/base/2.0/data/ org.ggf.ns.nmwg.base.v2_0.Data
-http://ggf.org/ns/nmwg/base/2.0/datum/ org.ggf.ns.nmwg.base.v2_0.Datum
-http://ggf.org/ns/nmwg/base/2.0/parameter/
org.ggf.ns.nmwg.base.v2_0.Parameter
-http://ggf.org/ns/nmwg/base/2.0/metadata/
org.ggf.ns.nmwg.base.v2_0.Metadata
-http://ggf.org/ns/nmwg/base/2.0/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/store/ org.ggf.ns.nmwg.base.v2_0.Store
-http://ggf.org/ns/nmwg/characteristic/utilization/2.0/subject/
org.ggf.ns.nmwg.characteristic.utilization.v2_0.Subject
-http://ggf.org/ns/nmwg/characteristic/utilization/2.0/parameters/
org.ggf.ns.nmwg.characteristic.utilization.v2_0.Parameters
-http://ggf.org/ns/nmwg/characteristic/utilization/2.0/datum/
org.ggf.ns.nmwg.characteristic.utilization.v2_0.Datum
-http://ggf.org/ns/nmwg/characteristic/errors/2.0/subject/
org.ggf.ns.nmwg.characteristic.errors.v2_0.Subject
-http://ggf.org/ns/nmwg/characteristic/errors/2.0/parameters/
org.ggf.ns.nmwg.characteristic.errors.v2_0.Parameters
-http://ggf.org/ns/nmwg/characteristic/errors/2.0/datum/
org.ggf.ns.nmwg.characteristic.errors.v2_0.Datum
-http://ggf.org/ns/nmwg/characteristic/discards/2.0/subject/
org.ggf.ns.nmwg.characteristic.discards.v2_0.Subject
-http://ggf.org/ns/nmwg/characteristic/discards/2.0/parameters/
org.ggf.ns.nmwg.characteristic.discards.v2_0.Parameters
-http://ggf.org/ns/nmwg/characteristic/discards/2.0/datum/
org.ggf.ns.nmwg.characteristic.discards.v2_0.Datum
-http://ggf.org/ns/nmwg/event/status/base/2.0/stateOper/
org.ggf.ns.nmwg.event.status.base.v2_0.StateOper
-http://ggf.org/ns/nmwg/event/status/base/2.0/stateAdmin/
org.ggf.ns.nmwg.event.status.base.v2_0.StateAdmin
-http://ggf.org/ns/nmwg/event/status/base/2.0/datum/
org.ggf.ns.nmwg.event.status.base.v2_0.Datum
-http://ggf.org/ns/nmwg/ops/average/2.0/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
-http://ggf.org/ns/nmwg/ops/cdf/2.0/parameters/
org.ggf.ns.nmwg.ops.cdf.v2_0.Parameters
-http://ggf.org/ns/nmwg/ops/histogram/2.0/subject/
org.ggf.ns.nmwg.ops.histogram.v2_0.Subject
-http://ggf.org/ns/nmwg/ops/histogram/2.0/parameters/
org.ggf.ns.nmwg.ops.histogram.v2_0.Parameters
-http://ggf.org/ns/nmwg/ops/max/2.0/subject/
org.ggf.ns.nmwg.ops.max.v2_0.Subject
-http://ggf.org/ns/nmwg/ops/max/2.0/parameters/
org.ggf.ns.nmwg.ops.max.v2_0.Parameters
-http://ggf.org/ns/nmwg/ops/mean/2.0/subject/
org.ggf.ns.nmwg.ops.mean.v2_0.Subject
-http://ggf.org/ns/nmwg/ops/mean/2.0/parameters/
org.ggf.ns.nmwg.ops.mean.v2_0.Parameters
-http://ggf.org/ns/nmwg/ops/median/2.0/subject/
org.ggf.ns.nmwg.ops.median.v2_0.Subject
-http://ggf.org/ns/nmwg/ops/median/2.0/parameters/
org.ggf.ns.nmwg.ops.median.v2_0.Parameters
-http://ggf.org/ns/nmwg/ops/min/2.0/subject/
org.ggf.ns.nmwg.ops.min.v2_0.Subject
-http://ggf.org/ns/nmwg/ops/min/2.0/parameters/
org.ggf.ns.nmwg.ops.min.v2_0.Parameters
-http://ggf.org/ns/nmwg/ops/select/2.0/subject/
org.ggf.ns.nmwg.ops.select.v2_0.Subject
-http://ggf.org/ns/nmwg/ops/select/2.0/parameters/
org.ggf.ns.nmwg.ops.select.v2_0.Parameters
-http://ggf.org/ns/nmwg/result/2.0/datum/
org.ggf.ns.nmwg.result.v2_0.Datum
-http://ggf.org/ns/nmwg/time/2.0/end/ org.ggf.ns.nmwg.time.v2_0.End
-http://ggf.org/ns/nmwg/time/2.0/value/ org.ggf.ns.nmwg.time.v2_0.Value
-http://ggf.org/ns/nmwg/time/2.0/start/ org.ggf.ns.nmwg.time.v2_0.Start
-http://ggf.org/ns/nmwg/time/2.0/time/ org.ggf.ns.nmwg.time.v2_0.Time
-http://ggf.org/ns/nmwg/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/iperf/2.0/subject/
org.ggf.ns.nmwg.tools.iperf.v2_0.Subject
-http://ggf.org/ns/nmwg/tools/iperf/2.0/parameters/
org.ggf.ns.nmwg.tools.iperf.v2_0.Parameters
-http://ggf.org/ns/nmwg/tools/iperf/2.0/datum/
org.ggf.ns.nmwg.tools.iperf.v2_0.Datum
-http://ggf.org/ns/nmwg/tools/netflow/2.0/subject/
org.ggf.ns.nmwg.tools.netflow.v2_0.Subject
-http://ggf.org/ns/nmwg/tools/netflow/2.0/flowFormat/
org.ggf.ns.nmwg.tools.netflow.v2_0.FlowFormat
-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/router/
org.ggf.ns.nmwg.tools.netflow.v2_0.Router
-http://ggf.org/ns/nmwg/tools/netflow/2.0/description/
org.ggf.ns.nmwg.tools.netflow.v2_0.Description
-http://ggf.org/ns/nmwg/tools/netflow/2.0/flowFormats/
org.ggf.ns.nmwg.tools.netflow.v2_0.FlowFormats
-http://ggf.org/ns/nmwg/tools/netflow/2.0/parameters/
org.ggf.ns.nmwg.tools.netflow.v2_0.Parameters
-http://ggf.org/ns/nmwg/tools/netflow/2.0/transportFormat/
org.ggf.ns.nmwg.tools.netflow.v2_0.TransportFormat
-http://ggf.org/ns/nmwg/tools/netflow/2.0/transportFormats/
org.ggf.ns.nmwg.tools.netflow.v2_0.TransportFormats
-http://ggf.org/ns/nmwg/tools/org/perfsonar/service/lookup/sql/1.0/subject/
org.ggf.ns.nmwg.tools.org.perfsonar.service.lookup.sql.v1_0.Subject
-http://ggf.org/ns/nmwg/tools/org/perfsonar/service/lookup/sql/1.0/parameters/
org.ggf.ns.nmwg.tools.org.perfsonar.service.lookup.sql.v1_0.Parameters
-http://ggf.org/ns/nmwg/tools/org/perfsonar/service/lookup/sql/1.0/datum/
org.ggf.ns.nmwg.tools.org.perfsonar.service.lookup.sql.v1_0.Datum
-http://ggf.org/ns/nmwg/tools/org/perfsonar/service/lookup/xpath/1.0/subject/
org.ggf.ns.nmwg.tools.org.perfsonar.service.lookup.xpath.v1_0.Subject
-http://ggf.org/ns/nmwg/tools/org/perfsonar/service/lookup/xpath/1.0/parameters/

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

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

Deleted: trunk/perfsonar-java-sql-ma/conf/psql-sqlma-dbremove.sql
===================================================================
--- trunk/perfsonar-java-sql-ma/conf/psql-sqlma-dbremove.sql 2012-11-30
11:48:50 UTC (rev 6046)
+++ trunk/perfsonar-java-sql-ma/conf/psql-sqlma-dbremove.sql 2012-12-03
13:50:47 UTC (rev 6047)
@@ -1,53 +0,0 @@
-
--- $Id: psql-sqlma-dbremove.sql 1540 2006-08-11 10:19:44Z roman $
--- project: perfSONAR
--- author: romradz
-
--- SQL Measurement Archive (MA)
--- sql script for postgresql db
-
-
--- running:
--- psql -f psql-sqlma-dbremove.conf
-
-
--- perfsonar_ma user
-
-\c perfsonar_ma perfsonar_ma
-
-drop trigger trigger1 on perfsonar_utilization;
-
-drop table perfsonar_utilization;
-
-drop table perfsonar_errors;
-
-drop table perfsonar_discards;
-
-drop table domain_link;
-
-drop table interdomain_link;
-
-drop table perfsonar_links;
-
-drop table perfsonar_iperf;
-
-drop table clmp_ping;
-
-
--- root (postgres) user
-
-\c perfsonar_ma postgres
-
-drop function fun1();
-
-drop language plpgsql;
-
-\c postgres postgres
-
-drop database perfsonar_ma;
-
-drop role perfsonar_ma;
-
-
-
-

Deleted: trunk/perfsonar-java-sql-ma/conf/psql-sqlma-dbsetup.sql
===================================================================
--- trunk/perfsonar-java-sql-ma/conf/psql-sqlma-dbsetup.sql 2012-11-30
11:48:50 UTC (rev 6046)
+++ trunk/perfsonar-java-sql-ma/conf/psql-sqlma-dbsetup.sql 2012-12-03
13:50:47 UTC (rev 6047)
@@ -1,251 +0,0 @@
-
--- $Id: psql-sqlma-dbsetup.sql 1545 2006-08-11 12:12:24Z roman $
--- project: perfSONAR
--- author: romradz
-
--- SQL Measurement Archive (MA)
--- sql script for postgresql db
-
-
--- running:
--- psql -f psql-sqlma-dbsetup.conf
-
-
--- root (postgres) user
-
-
-create user perfsonar_ma login password 'testpass';
-
-create database perfsonar_ma owner perfsonar_ma;
-
-\c perfsonar_ma
-
-create language plpgsql;
-
-create function fun1() returns trigger AS '
- declare
- nr integer;
- mintm integer;
- begin
- select into nr count(metadataId) from perfsonar_utilization;
- select into mintm min(timeValue) from perfsonar_utilization;
- delete from perfsonar_utilization
- where
- metadataId =
- (select metadataId from perfsonar_utilization
- where timeValue = mintm limit 1)
- and nr > 10000;
- return OLD;
- end;
- ' language plpgsql;
-
-
-
--- perfsonar_ma user
-
-\c perfsonar_ma perfsonar_ma
-
-create table
- perfsonar_utilization
- (metadataId varchar(30) not null, -- id of metadata which is
stored in xml database
- value double precision not null, -- measurement value
- valueUnits varchar(30) null, -- unit of value
- timeValue integer not null, -- seconds since `00:00:00
1970-01-01 UTC'
- ts timestamp default now() -- time of inserting
- );
-
-create table
- perfsonar_errors
- (metadataId varchar(30) not null,
- value double precision not null,
- valueUnits varchar(30) null,
- timeValue integer not null,
- ts timestamp default now()
- );
-
-create table
- perfsonar_discards
- (metadataId varchar(30) not null,
- value double precision not null,
- valueUnits varchar(30) null,
- timeValue integer not null,
- ts timestamp default now()
- );
-
-create table
- domain_link
- (id varchar(255) not null,
- time timestamp default now(),
- status_oper varchar(255) default 'unknown',
- status_admin varchar(255) default 'unknown',
- alarm_id_set varchar(255),
- comments varchar(255)
- );
-
-create table
- interdomain_link
- (id varchar(255) not null,
- time timestamp default now(),
- status_oper varchar(255) default 'unknown',
- status_admin varchar(255) default 'unknown',
- alarm_id_set varchar(255),
- comments varchar(255)
- );
-
-create table
- perfsonar_links
- (id varchar(255) not null,
- time timestamp default now(),
- status_oper varchar(255) default 'unknown',
- status_admin varchar(255) default 'unknown',
- alarm_id_set varchar(255),
- comments varchar(255)
- );
-
-create table
- perfsonar_iperf
- (metadataId varchar(30) not null,
- value double precision null,
- valueUnits varchar(30) null,
- throughput double precision null,
- jitter double precision null,
- loss varchar(15) null,
- numBytes NUMERIC(40) null,
- numBytesUnits varchar(15) null,
- interv varchar(30) null,
- time integer not null,
- format varchar(30) null,
- protocol varchar(10) null,
- bufferLength integer null,
- windowSize integer null,
- windowSizeRequest varchar(30) null,
- timeDuration varchar(30) null,
- arguments varchar(50) null,
- test_session_id varchar(30) null,
- ts timestamp default now()
- );
-
-create table
- clmp_ping
- (metadataId varchar(255) not null,
- seqNum integer null default 0,
- value double precision not null,
- valueUnits varchar(4) null,
- ttl smallint null default 0,
- numBytes integer null default 0,
- numBytesUnits varchar(10) null,
- timeValue integer not null,
- timeType varchar(4) null,
- ts timestamp default now()
- );
-
-
--- insert statements for testing perfsonar_utilization table
-
-insert
- into perfsonar_utilization
- values ('meta1-test', 2, 'Bps', 1143034705);
-
-insert
- into perfsonar_utilization
- values ('meta2-test', 3, 'Bps', 1143034706);
-
-insert
- into perfsonar_utilization
- values ('meta3-test', 4, 'Bps', 1143034707);
-
-insert
- into perfsonar_utilization
- values ('meta4-test', 5, 'Bps', 1143034709);
-
-
--- insert statements for testing perfsonar_errors table
-
-insert
- into perfsonar_errors
- values ('meta1-errors-test', 1, 'Eps', 1187948870);
-
-insert
- into perfsonar_errors
- values ('meta1-errors-test', 0, 'Eps', 1187948875);
-
-insert
- into perfsonar_errors
- values ('meta1-errors-test', 4, 'Eps', 1187948882);
-
-insert
- into perfsonar_errors
- values ('meta1-errors-test', 2, 'Eps', 1187948888);
-
-
--- insert statements for testing perfsonar_discards table
-
-insert
- into perfsonar_discards
- values ('meta1-discards-test', 1, 'Dps', 1187948870);
-
-insert
- into perfsonar_discards
- values ('meta1-discards-test', 0, 'Dps', 1187948875);
-
-insert
- into perfsonar_discards
- values ('meta1-discards-test', 4, 'Dps', 1187948882);
-
-insert
- into perfsonar_discards
- values ('meta1-discards-test', 2, 'Dps', 1187948888);
-
-
--- insert statements for testing domain_link table
-
-insert
- into domain_link (id, status_oper, time)
- values ('DFN-link-1234', 'down', '2006-04-06 12:15:23');
-
-insert
- into domain_link (id, status_oper, time)
- values ('DFN-Surfnet-Link-5678', 'up', '2006-04-06 12:15:24');
-
-insert
- into domain_link (id, status_oper, time)
- values ('PSNC-DFN-MUE-Link-1001', 'down', '2006-04-06 12:15:25');
-
-
--- insert statements for testing interdomain_link table
-
-insert
- into interdomain_link (id, status_oper, time)
- values ('PSNC-2-DFN-MUE-Link-1002', 'up', '2006-04-06 12:17:33');
-
-
--- insert statements for testing perfsonar_iperf table
-
-insert
- into perfsonar_iperf
- values ('meta1-iperf-test', null, 'bits/sec', 2.88, 1.830, '0/837',
23484640, 'Bytes', null, 1197642642, null, 'TCP', null, null, null, null,
null, null, default);
-
-insert
- into perfsonar_iperf
- values ('meta2-iperf-test', null, 'bits/sec', 1.45, 1.806, '5/851',
23484640, 'Bytes', null, 1197642662, null, 'UDP', null, null, null, null,
null, null, default);
-
-
--- insert statements for testing clmp_ping table
-
-insert
- into clmp_ping
- values ('ping-meta1', 1, 5.3, 'ms', 253, 8, 'Bytes', 1233655716, 'unix',
default);
-
-insert
- into clmp_ping
- values ('ping-meta1', 2, 2.5, 'ms', 253, 8, 'Bytes', 1233655718, 'unix',
default);
-
-
-
--- trigger
-
-create trigger trigger1
- after insert on perfsonar_utilization
- for each row
- execute procedure fun1();
-

Deleted: trunk/perfsonar-java-sql-ma/conf/service.properties
===================================================================
--- trunk/perfsonar-java-sql-ma/conf/service.properties 2012-11-30 11:48:50
UTC (rev 6046)
+++ trunk/perfsonar-java-sql-ma/conf/service.properties 2012-12-03 13:50:47
UTC (rev 6047)
@@ -1,175 +0,0 @@
-
-
-# this template file is prepared for the releases with web admin stuff and
packaged in rpm form
-# $Id$
-# romradz
-
-
-
-#
-----------------------------------------------------------------------------------------------
-# Configuration of the internal implementation structures
-
-
-# Group=Internal
-# Description=The type of service used to select the correct message handler
implementation.
-service.r.type=ma
-
-# Group=Internal
-# Description=The service name.
-service.name=geant2-java-sql-ma-2.3-1
-
-# Group=Internal
-# Description=The java class file which implements the ServiceEngine
interface.
-service.ma.class_name=org.perfsonar.service.measurementArchive.sqlType.SQLTypeMAServiceEngine
-
-# Group=Internal
-# Description=A CSV of request message types supported by the service.
-service.ma.message_types=MeasurementArchiveStoreKeyRequest,MeasurementArchiveStoreRequest,MetadataKeyRequest,SetupDataRequest,EchoRequest,LookupInfoRequest
-
-# Group=Internal
-# Description=The java class file which implements the base chaining of
requests.
-service.ma.base_chaining_mergers=org.perfsonar.service.measurementArchive.sqlType.NMWGInterfaceBaseChaining
-
-# Group=Internal
-# Description=The path to the file objects.config, including the NMWG
parser's configuration settings. The parser reads the request or metadata
configuration files, and creates internally used objects that represent these
files.
-service.sax_parser.config=/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/perfsonar/conf/objects.config
-
-# Group=Internal
-# Description=The path to the log4j.properties configuration file. If you
want to enable syslog message logging, enter the path to the
log4j.syslog.properties file instead.
-service.log.log4j.config=/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/perfsonar/conf/log4j.properties
-
-# Group=Internal
-# Description=The path to the metadata configuration file, including the
file's name.
-service.ma.conf_file=/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/perfsonar/conf/sql-database_TEST.xml
-
-
-
-#
-----------------------------------------------------------------------------------------------
-# Configuration of storing metadata configuration file in xml db eXist
-
-
-# Group=eXist
-# Description=Determines whether the xmld db (eXist) is used as a storage
for the metadata configuration file (on) or not (off). Currently only the
value 'on' is needed to run the service correctly.
-component.ma.xmldb.db_status=on
-
-# Group=eXist
-# Description=The type of connection to the eXist DB (xmlrpc or http). The
http type is not recommended when transfers of many data are expected.
-component.ma.xmldb.db_access=xmlrpc
-
-# Group=eXist
-# Description=URI address of the collection in the eXist DB that contains
the metadata configuration file.
-component.ma.xmldb.db_uri=xmldb:exist://localhost:8080/exist/xmlrpc/db/sqlmaconfig
-
-# Group=eXist
-# Description=The username for the eXist DB.
-component.ma.xmldb.db_username=sqlmaservice
-
-# Group=eXist
-# Description=The user password for the eXist DB.
-component.ma.xmldb.db_password=sqlmaservice
-
-# Group=eXist
-# Description=The administrator password for the eXist DB.
-component.ma.xmldb.db_adminpassword=
-
-# Group=eXist
-# Description=Determines how the eXist DB is installed (webapp or
stand-alone).
-component.ma.xmldb.type=webapp
-
-
-
-#
-----------------------------------------------------------------------------------------------
-# Configuration of LS functionality
-
-
-# Group=LS
-# Description=The service type.
-service.r.service_type=ma
-
-# Group=LS
-# Description=The URL address of the LS service (more LS addresses can be
separated by commas).
-service.r.ls_url=http://somewhere
-
-# Group=LS
-# Description=The URL address of the service configured by this
configuration file.
-service.r.access_point=http://somewhere:8080/geant2-java-sql-ma/services/MeasurementArchiveService
-
-# Group=LS
-# Description=The name of the organisation who is deploying the service.
-service.r.organization_name=X
-
-# Group=LS
-# Description=The name of the service (can contain multiple words).
-service.r.service_name=pS java sql ma
-
-# Group=LS
-# Description=The version number of the service.
-service.r.service_version=2.3-1
-
-# Group=LS
-# Description=The email address of the person who manages the service.
-service.r.contact_email=user@domain
-
-# Group=LS
-# Description=The description of the service.
-service.r.service_description=perfSONAR service
-
-# Group=LS
-# Description=The time (seconds) between register requests to the LS service
(default value is 43200 secs; 12 hours).
-component.registrator.interval=43200
-
-# Group=LS
-# Description=The name of the scheduler component (the implementation of
this component must also be declared in the components.properties file).
-component.registrator.scheduler_component=ma_scheduler
-
-# Group=LS
-# Description=Enter 'xmldb' to take metadata elements for register requests
from the XML database, or 'file' to take them from the XML metadata
configuration file.
-service.ma.conf_file.store_type=xmldb
-
-
-
-#
-----------------------------------------------------------------------------------------------
-# Configuration of AuthN functionality
-
-
-# Group=Authentication
-# Description=The URL address of the Authentication Service.
-service.as.point=http\://homer.rediris.es\:8080/perfSONAR-AS/services/AuthService
-
-# Group=Authentication
-# Description=The types of messages for which authentication is to be
enabled (if required).
-service.as.authn_for_msg_types=MeasurementArchiveStoreKeyRequest,MeasurementArchiveStoreRequest,SetupDataRequest,MetadataKeyRequest
-
-# Group=Authentication
-# Description=Determines if authentication is enabled (on) or not (off).
-service.as.authn_active=off
-
-
-
-#
-----------------------------------------------------------------------------------------------
-# Configuration of store functionality
-
-
-# Group=Store
-# Description=Determines whether new data sent to the service is stored (on)
or not (off).
-service.ma.xmldb.db_store=on
-
-
-#
-----------------------------------------------------------------------------------------------
-# Configuration of database settings
-
-# Group=JDBC
-# Description=The JDBC driver name
-service.ma.jdbc.driver=com.mysql.jdbc.Driver
-
-# Group=JDBC
-# Description=The JDBC connection URL
-service.ma.jdbc.url=jdbc:mysql://127.0.0.1/perfsonar_ma
-
-# Group=JDBC
-# Description=Database user name
-service.ma.jdbc.username=perfsonar_ma
-
-# Group=JDBC
-# Description=Database password
-service.ma.jdbc.password=testpass
\ No newline at end of file

Deleted: trunk/perfsonar-java-sql-ma/conf/service.properties.template
===================================================================
--- trunk/perfsonar-java-sql-ma/conf/service.properties.template
2012-11-30 11:48:50 UTC (rev 6046)
+++ trunk/perfsonar-java-sql-ma/conf/service.properties.template
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,28 +0,0 @@
-
-service.r.type=ma
-service.name=geant2-java-sql-ma-2.1
-
-service.ma.class_name=org.perfsonar.service.measurementArchive.sqlType.SQLTypeMAServiceEngine
-service.ma.message_types=MetadataKeyRequest,SetupDataRequest,EchoRequest,LookupInfoRequest
-#service.ma.message_types=MetadataKeyRequest,SetupDataRequest,MeasurementArchiveStoreRequest,MeasurementArchiveStoreKeyRequest,EchoRequest,LookupInfoRequest,CompleteMetadataStoreRequest
-
-service.ma.base_chaining_mergers=org.perfsonar.service.measurementArchive.sqlType.NMWGInterfaceBaseChaining
-
-component.ma.xmldb.db_status=off
-component.ma.xmldb.db_access=xmlrpc
-#component.ma.xmldb.db_access=http
-component.ma.xmldb.db_uri=
-component.ma.xmldb.db_uri.xmlrpc=
-component.ma.xmldb.db_username=sqlmaservice
-component.ma.xmldb.db_password=sqlmaservice
-
-service.ma.xmldb.db_store=off
-
-component.registrator.interval=43200000
-component.registrator.scheduler_component=ma_scheduler
-
-service.ma.conf_file.store_type=xmldb
-
-service.as.authn_active=off
-service.as.authn_for_msg_types=SetupDataRequest,MetadataKeyRequest
-service.as.point=http\://homer.rediris.es\:8080/perfSONAR-AS/services/AuthService

Deleted: trunk/perfsonar-java-sql-ma/conf/service.properties.template-2
===================================================================
--- trunk/perfsonar-java-sql-ma/conf/service.properties.template-2
2012-11-30 11:48:50 UTC (rev 6046)
+++ trunk/perfsonar-java-sql-ma/conf/service.properties.template-2
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,146 +0,0 @@
-
-
-# this template file is prepared for the releases with web admin stuff and
packaged in rpm form
-# $Id$
-# romradz
-
-
-
-#
-----------------------------------------------------------------------------------------------
-# Configuration of the internal implementation structures
-
-
-# Group=Internal
-# Description=The type of service used to select the correct message handler
implementation.
-service.r.type=ma
-
-# Group=Internal
-# Description=The service name.
-service.name=geant2-java-sql-ma-2.1
-
-# Group=Internal
-# Description=The java class file which implements the ServiceEngine
interface.
-service.ma.class_name=org.perfsonar.service.measurementArchive.sqlType.SQLTypeMAServiceEngine
-
-# Group=Internal
-# Description=A CSV of request message types supported by the service.
-##
service.ma.message_types=MetadataKeyRequest,SetupDataRequest,MeasurementArchiveStoreRequest,EchoRequest,LookupInfoRequest,CompleteMetadataStoreRequest
-service.ma.message_types=MetadataKeyRequest,SetupDataRequest,EchoRequest,LookupInfoRequest
-
-# Group=Internal
-# Description=The java class file which implements the base chaining of
requests.
-service.ma.base_chaining_mergers=org.perfsonar.service.measurementArchive.sqlType.NMWGInterfaceBaseChaining
-
-
-
-#
-----------------------------------------------------------------------------------------------
-# Configuration of storing metadata configuration file in xml db eXist
-
-
-# Group=eXist
-# Description=Determines whether the xmld db (eXist) is used as a storage
for the metadata configuration file (on) or not (off). Currently only the
value 'on' is needed to run the service correctly.
-component.ma.xmldb.db_status=on
-
-# Group=eXist
-# Description=The type of connection to the eXist DB (xmlrpc or http). The
http type is not recommended when transfers of many data are expected.
-component.ma.xmldb.db_access=xmlrpc
-
-# Group=eXist
-# Description=URI address of the collection in the eXist DB that contains
the metadata configuration file.
-component.ma.xmldb.db_uri=xmldb:exist://localhost:8080/exist/xmlrpc/db/sqlmaconfig
-
-# Group=eXist
-# Description=The username for the eXist DB.
-component.ma.xmldb.db_username=sqlmaservice
-
-# Group=eXist
-# Description=The user password for the eXist DB.
-component.ma.xmldb.db_password=
-
-# Group=eXist
-# Description=The administrator password for the eXist DB.
-component.ma.xmldb.db_adminpassword=
-
-# Group=eXist
-# Description=Determines how the eXist DB is installed (webapp or
stand-alone).
-component.ma.xmldb.type=webapp
-
-
-
-#
-----------------------------------------------------------------------------------------------
-# Configuration of LS functionality
-
-
-# Group=LS
-# Description=The service type.
-service.r.service_type=ma
-
-# Group=LS
-# Description=The URL address of the LS service.
-service.r.ls_url=http://somewhere
-
-# Group=LS
-# Description=The URL address of the service configured by this
configuration file.
-service.r.access_point=http://somewhere
-
-# Group=LS
-# Description=The name of the organisation who is deploying the service.
-service.r.organization_name=X
-
-# Group=LS
-# Description=The name of the service (can contain multiple words).
-service.r.service_name=pS java sql ma
-
-# Group=LS
-# Description=The version number of the service.
-service.r.service_version=2.0
-
-# Group=LS
-# Description=The email address of the person who manages the service.
-service.r.contact_email=user@domain
-
-# Group=LS
-# Description=The description of the service.
-service.r.service_description=perfSONAR service
-
-# Group=LS
-# Description=The time (miliseconds) between register requests to the LS
service (default value is 43200000 ms; 12 hours).
-component.registrator.interval=43200000
-
-# Group=LS
-# Description=The name of the scheduler component (the implementation of
this component must also be declared in the components.properties file).
-component.registrator.scheduler_component=ma_scheduler
-
-# Group=LS
-# Description=Enter 'xmldb' to take metadata elements for register requests
from the XML database, or 'file' to take them from the XML metadata
configuration file.
-service.ma.conf_file.store_type=xmldb
-
-
-
-#
-----------------------------------------------------------------------------------------------
-# Configuration of AuthN functionality
-
-
-# Group=Authentication
-# Description=The URL address of the Authentication Service.
-service.as.point=http\://homer.rediris.es\:8080/perfSONAR-AS/services/AuthService
-
-# Group=Authentication
-# Description=The types of messages for which authentication is to be
enabled (if required).
-service.as.authn_for_msg_types=SetupDataRequest,MetadataKeyRequest
-
-# Group=Authentication
-# Description=Determines if authentication is enabled (on) or not (off).
-service.as.authn_active=off
-
-
-
-#
-----------------------------------------------------------------------------------------------
-# Configuration of store functionality
-
-
-# Group=Store
-# Description=Determines whether new data sent to the service is stored (on)
or not (off).
-service.ma.xmldb.db_store=off
-
-

Deleted: trunk/perfsonar-java-sql-ma/conf/servlet.properties
===================================================================
--- trunk/perfsonar-java-sql-ma/conf/servlet.properties 2012-11-30 11:48:50
UTC (rev 6046)
+++ trunk/perfsonar-java-sql-ma/conf/servlet.properties 2012-12-03 13:50:47
UTC (rev 6047)
@@ -1,22 +0,0 @@
-#The type of the service
-servlet.service_type=sqlma
-
-#The ConfigurationHandler interface implementation used by the Wizard Servlet
-servlet.wizard.external_handler=perfSONARWebAdmin.admin.wizard.services.RRDMAHandler

-
-#The username used for authentication reasons when accessing properties
configuration and Wizard servlets
-servlet.username=perfsonaruser
-
-#The password used for authentication reasons when accessing properties
configuration and Wizard servlets
-servlet.password=perfsonarpass
-
-
-#The property inside the service.properties file that holds the admin
password for the eXist db
-servlet.exist_adminpass.property=component.ma.xmldb.db_adminpassword
-
-#The property inside the service.properties file that holds the location of
the eXist db
-servlet.exist_location.property=component.ma.xmldb.db_uri
-
-
-#Controls the use of advanced features in the properties management servlet.
Default value is “off”
-servlet.extra_functionalities=off
\ No newline at end of file

Deleted: trunk/perfsonar-java-sql-ma/conf/sql-database-L2status_TEST.xml
===================================================================
--- trunk/perfsonar-java-sql-ma/conf/sql-database-L2status_TEST.xml
2012-11-30 11:48:50 UTC (rev 6046)
+++ trunk/perfsonar-java-sql-ma/conf/sql-database-L2status_TEST.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,229 +0,0 @@
-<nmwg:store xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
- xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";
- xmlns:nmwgtopo3="http://ggf.org/ns/nmwg/topology/base/3.0/";
- xmlns:nmtl2="http://ggf.org/ns/nmwg/topology/l2/3.0/";
- xmlns:nmtl3="http://ggf.org/ns/nmwg/topology/l3/3.0/";>
-
-
-
- <nmwg:metadata id="md1">
- <nmwg:subject id="sub-DFN-LRZ">
- <nmwgtopo3:node id="DFN-LRZ">
- <nmwgtopo3:type>TopologyPoint</nmwgtopo3:type>
- <nmwgtopo3:name type="logical">DFN-LRZ</nmwgtopo3:name>
- <nmwgtopo3:country>Germany</nmwgtopo3:country>
- <nmwgtopo3:city>Munich</nmwgtopo3:city>
- <nmwgtopo3:institution>Leibniz
Rechenzentrum</nmwgtopo3:institution>
- <nmwgtopo3:latitude>0</nmwgtopo3:latitude>
- <nmwgtopo3:longitude>0</nmwgtopo3:longitude>
- </nmwgtopo3:node>
- </nmwg:subject>
- </nmwg:metadata>
-
-
- <nmwg:metadata id="md2">
- <nmwg:subject id="sub-DFN-MUE">
- <nmwgtopo3:node id="DFN-MUE">
- <nmwgtopo3:type>TopologyPoint</nmwgtopo3:type>
- <nmwgtopo3:name type="logical">DFN-MUE</nmwgtopo3:name>
- <nmwgtopo3:country>Germany</nmwgtopo3:country>
- <nmwgtopo3:city>Muenster</nmwgtopo3:city>
- <nmwgtopo3:institution>DFN-Verein</nmwgtopo3:institution>
- <nmwgtopo3:latitude>0</nmwgtopo3:latitude>
- <nmwgtopo3:longitude>0</nmwgtopo3:longitude>
- </nmwgtopo3:node>
- </nmwg:subject>
- </nmwg:metadata>
-
-
- <nmwg:metadata id="md3">
- <nmwg:subject id="sub-SURFnet-MUE">
- <nmwgtopo3:node id="SURFnet-MUE">
- <nmwgtopo3:type>TopologyPoint</nmwgtopo3:type>
- <nmwgtopo3:name type="logical">SURFnet-MUE</nmwgtopo3:name>
- <nmwgtopo3:country>Netherlands</nmwgtopo3:country>
- <nmwgtopo3:city>Amsterdam</nmwgtopo3:city>
- <nmwgtopo3:institution>Surfnet</nmwgtopo3:institution>
- <nmwgtopo3:latitude>0</nmwgtopo3:latitude>
- <nmwgtopo3:longitude>0</nmwgtopo3:longitude>
- </nmwgtopo3:node>
- </nmwg:subject>
- </nmwg:metadata>
-
-
- <nmwg:metadata id="md4">
- <nmwg:subject id="sub-PSNC-PL">
- <nmwgtopo3:node id="PSNC-PL">
- <nmwgtopo3:type>TopologyPoint</nmwgtopo3:type>
- <nmwgtopo3:name type="logical">PSNC-PL</nmwgtopo3:name>
- <nmwgtopo3:country>Poland</nmwgtopo3:country>
- <nmwgtopo3:city>Poznan</nmwgtopo3:city>
- <nmwgtopo3:institution>PSNC</nmwgtopo3:institution>
- <nmwgtopo3:latitude>0</nmwgtopo3:latitude>
- <nmwgtopo3:longitude>0</nmwgtopo3:longitude>
- </nmwgtopo3:node>
- </nmwg:subject>
- </nmwg:metadata>
-
-
- <nmwg:metadata id="md5">
- <nmwg:subject id="sub-PSNC-PL-2">
- <nmwgtopo3:node id="PSNC-PL-2">
- <nmwgtopo3:type>TopologyPoint</nmwgtopo3:type>
- <nmwgtopo3:name type="logical">PSNC-PL-2</nmwgtopo3:name>
- <nmwgtopo3:country>Poland</nmwgtopo3:country>
- <nmwgtopo3:city>Poznan</nmwgtopo3:city>
- <nmwgtopo3:institution>PSNC</nmwgtopo3:institution>
- <nmwgtopo3:latitude>0</nmwgtopo3:latitude>
- <nmwgtopo3:longitude>0</nmwgtopo3:longitude>
- </nmwgtopo3:node>
- </nmwg:subject>
- </nmwg:metadata>
-
-
- <nmwg:metadata id="md-link-LRZ-SARA-DEISA-001">
- <nmwg:subject id="sub1">
- <nmtl2:link>
-
- <nmtl2:name type="logical">DFN-link-1234</nmtl2:name>
- <nmtl2:globalName
type="logical">LRZ-SARA-DEISA-001</nmtl2:globalName>
- <nmtl2:type>NREN_Link</nmtl2:type>
-
- <nmwgtopo3:node nodeIdRef="DFN-LRZ">
- <nmwgtopo3:role>EndPoint</nmwgtopo3:role>
- </nmwgtopo3:node>
-
- <nmwgtopo3:node nodeIdRef="DFN-MUE">
- <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
- </nmwgtopo3:node>
-
- </nmtl2:link>
- </nmwg:subject>
- <nmwg:parameters>
- <nmwg:parameter
name="supportedEventType">Path.Status</nmwg:parameter>
- <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
- </nmwg:parameters>
- <!-- <nmwg:eventType>Path.Status</nmwg:eventType> -->
- </nmwg:metadata>
-
-
- <nmwg:metadata id="md-link-LRZ-SARA-DEISA-002">
- <nmwg:subject id="sub1">
- <nmtl2:link>
-
- <nmtl2:name type="logical">DFN-Surfnet-Link-5678</nmtl2:name>
- <nmtl2:globalName
type="logical">LRZ-SARA-DEISA-002</nmtl2:globalName>
- <nmtl2:type>ID_Link</nmtl2:type>
-
- <nmwgtopo3:node nodeIdRef="DFN-MUE">
- <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
- </nmwgtopo3:node>
-
- <nmwgtopo3:node nodeIdRef="SURFnet-MUE">
- <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
- </nmwgtopo3:node>
-
- </nmtl2:link>
- </nmwg:subject>
- <nmwg:parameters>
- <nmwg:parameter
name="supportedEventType">Path.Status</nmwg:parameter>
- <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
- </nmwg:parameters>
- <!-- <nmwg:eventType>Path.Status</nmwg:eventType> -->
- </nmwg:metadata>
-
-
- <nmwg:metadata id="md-link-PSNC-DFN-MUE-003">
- <nmwg:subject id="sub1">
- <nmtl2:link>
-
- <nmtl2:name
type="logical">PSNC-DFN-MUE-Link-1001</nmtl2:name>
- <nmtl2:globalName
type="logical">PSNC-DFN-MUE-003</nmtl2:globalName>
- <nmtl2:type>ID_Link</nmtl2:type>
-
- <nmwgtopo3:node nodeIdRef="PSNC-PL">
- <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
- </nmwgtopo3:node>
-
- <nmwgtopo3:node nodeIdRef="DFN-MUE">
- <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
- </nmwgtopo3:node>
-
- </nmtl2:link>
- </nmwg:subject>
- <nmwg:parameters>
- <nmwg:parameter
name="supportedEventType">Path.Status</nmwg:parameter>
- <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
- </nmwg:parameters>
- <!-- <nmwg:eventType>Path.Status</nmwg:eventType> -->
- </nmwg:metadata>
-
-
- <nmwg:metadata id="md-link-PSNC-2-DFN-MUE-004">
- <nmwg:subject id="sub1">
- <nmtl2:link>
-
- <nmtl2:name
type="logical">PSNC-2-DFN-MUE-Link-1002</nmtl2:name>
- <nmtl2:globalName
type="logical">PSNC-2-DFN-MUE-004</nmtl2:globalName>
- <nmtl2:type>ID_Link</nmtl2:type>
-
- <nmwgtopo3:node nodeIdRef="PSNC-PL-2">
- <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
- </nmwgtopo3:node>
-
- <nmwgtopo3:node nodeIdRef="DFN-MUE">
- <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
- </nmwgtopo3:node>
-
- </nmtl2:link>
- </nmwg:subject>
- <nmwg:parameters>
- <nmwg:parameter
name="supportedEventType">Path.Status</nmwg:parameter>
- <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
- </nmwg:parameters>
- <!-- <nmwg:eventType>Path.Status</nmwg:eventType> -->
- </nmwg:metadata>
-
-
- <nmwg:data id="d1" metadataIdRef="md-link-LRZ-SARA-DEISA-001">
- <nmwg:key>
- <nmwg:parameters>
- <nmwg:parameter name="pathId">DFN-link-1234</nmwg:parameter>
- <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-L2-status-domain.xml</nmwg:parameter>
- </nmwg:parameters>
- </nmwg:key>
- </nmwg:data>
-
-
- <nmwg:data id="d2" metadataIdRef="md-link-LRZ-SARA-DEISA-002">
- <nmwg:key>
- <nmwg:parameters>
- <nmwg:parameter
name="pathId">DFN-Surfnet-Link-5678</nmwg:parameter>
- <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-L2-status-domain.xml</nmwg:parameter>
- </nmwg:parameters>
- </nmwg:key>
- </nmwg:data>
-
-
- <nmwg:data id="d3" metadataIdRef="md-link-PSNC-DFN-MUE-003">
- <nmwg:key>
- <nmwg:parameters>
- <nmwg:parameter
name="pathId">PSNC-DFN-MUE-Link-1001</nmwg:parameter>
- <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-L2-status-domain.xml</nmwg:parameter>
- </nmwg:parameters>
- </nmwg:key>
- </nmwg:data>
-
-
- <nmwg:data id="d4" metadataIdRef="md-link-PSNC-2-DFN-MUE-004">
- <nmwg:key>
- <nmwg:parameters>
- <nmwg:parameter
name="pathId">PSNC-2-DFN-MUE-Link-1002</nmwg:parameter>
- <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-L2-status-interdomain.xml</nmwg:parameter>
- </nmwg:parameters>
- </nmwg:key>
- </nmwg:data>
-
-
-
-</nmwg:store>
\ No newline at end of file

Deleted: trunk/perfsonar-java-sql-ma/conf/sql-database_TEST.xml
===================================================================
--- trunk/perfsonar-java-sql-ma/conf/sql-database_TEST.xml 2012-11-30
11:48:50 UTC (rev 6046)
+++ trunk/perfsonar-java-sql-ma/conf/sql-database_TEST.xml 2012-12-03
13:50:47 UTC (rev 6047)
@@ -1,415 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<nmwg:store xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
- xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
- xmlns:netutil="http://ggf.org/ns/nmwg/characteristic/utilization/2.0/";
- xmlns:nmwgtopo="http://ggf.org/ns/nmwg/topology/2.0/";
- xmlns:nmwgtopo3="http://ggf.org/ns/nmwg/topology/base/3.0/";
- xmlns:nmtl2="http://ggf.org/ns/nmwg/topology/l2/3.0/";
- xmlns:errors="http://ggf.org/ns/nmwg/characteristic/errors/2.0/";
- xmlns:discards="http://ggf.org/ns/nmwg/characteristic/discards/2.0/";
- xmlns:iperf="http://ggf.org/ns/nmwg/tools/iperf/2.0/";
- xmlns:ping="http://ggf.org/ns/nmwg/tools/ping/2.0/";
- xmlns="http://ggf.org/ns/nmwg/base/2.0/";>
-
-
-
- <!-- utilization metadata section -->
-
-
- <nmwg:metadata id="meta1-test">
- <netutil:subject id="subj1">
- <nmwgt:interface>
- <nmwgt:hostName>test-hostName</nmwgt:hostName>
- <nmwgt:ifAddress type="ipv4">10.1.2.3</nmwgt:ifAddress>
- <nmwgt:ifName>test-0</nmwgt:ifName>
- <nmwgt:ifDescription>test description</nmwgt:ifDescription>
- <nmwgt:direction>in</nmwgt:direction>
- <nmwgt:capacity>1000BaseT</nmwgt:capacity>
- </nmwgt:interface>
- </netutil:subject>
-
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:eventType>
- <nmwg:parameters id="params1">
- <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
- </nmwg:parameters>
- </nmwg:metadata>
-
-
- <nmwg:data id="data1-test" metadataIdRef="meta1-test">
- <nmwg:key>
- <nmwg:parameters>
- <nmwg:parameter name="metadataId">meta1-test</nmwg:parameter>
- <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-utilization.xml</nmwg:parameter>
- <nmwg:parameter
name="eventType">http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:parameter>
- </nmwg:parameters>
- </nmwg:key>
- </nmwg:data>
-
-
- <!-- errors metadata section -->
-
-
- <nmwg:metadata id="meta1-errors-test">
- <errors:subject id="subj1">
- <nmwgt:interface>
- <nmwgt:hostName>test-hostName</nmwgt:hostName>
- <nmwgt:ifAddress type="ipv4">10.1.2.3</nmwgt:ifAddress>
- <nmwgt:ifName>test-0</nmwgt:ifName>
- <nmwgt:ifIndex>2</nmwgt:ifIndex>
- <nmwgt:direction>in</nmwgt:direction>
- <nmwgt:capacity>1000000000</nmwgt:capacity>
- </nmwgt:interface>
- </errors:subject>
-
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/errors/2.0</nmwg:eventType>
- <nmwg:parameters id="params1">
- <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
- </nmwg:parameters>
- </nmwg:metadata>
-
-
- <nmwg:data id="data1-errors-test" metadataIdRef="meta1-errors-test">
- <nmwg:key>
- <nmwg:parameters>
- <nmwg:parameter
name="metadataId">meta1-errors-test</nmwg:parameter>
- <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-errors.xml</nmwg:parameter>
- <nmwg:parameter
name="eventType">http://ggf.org/ns/nmwg/characteristic/errors/2.0</nmwg:parameter>
- </nmwg:parameters>
- </nmwg:key>
- </nmwg:data>
-
-
- <!-- discards metadata section -->
-
-
- <nmwg:metadata id="meta1-discards-test">
- <discards:subject id="subj1">
- <nmwgt:interface>
- <nmwgt:hostName>test-hostName</nmwgt:hostName>
- <nmwgt:ifAddress type="ipv4">10.1.2.3</nmwgt:ifAddress>
- <nmwgt:ifName>test-0</nmwgt:ifName>
- <nmwgt:ifIndex>2</nmwgt:ifIndex>
- <nmwgt:direction>in</nmwgt:direction>
- <nmwgt:capacity>1000000000</nmwgt:capacity>
- </nmwgt:interface>
- </discards:subject>
-
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/discards/2.0</nmwg:eventType>
- <nmwg:parameters id="params1">
- <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
- </nmwg:parameters>
- </nmwg:metadata>
-
-
- <nmwg:data id="data1-discards-test" metadataIdRef="meta1-discards-test">
- <nmwg:key>
- <nmwg:parameters>
- <nmwg:parameter
name="metadataId">meta1-discards-test</nmwg:parameter>
- <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-discards.xml</nmwg:parameter>
- <nmwg:parameter
name="eventType">http://ggf.org/ns/nmwg/characteristic/discards/2.0</nmwg:parameter>
- </nmwg:parameters>
- </nmwg:key>
- </nmwg:data>
-
-
- <!-- L2 status section -->
-
-
- <nmwg:metadata id="md1">
- <nmwg:subject id="sub-DFN-LRZ">
- <nmwgtopo3:node id="DFN-LRZ">
- <nmwgtopo3:type>TopologyPoint</nmwgtopo3:type>
- <nmwgtopo3:name type="logical">DFN-LRZ</nmwgtopo3:name>
- <nmwgtopo3:country>Germany</nmwgtopo3:country>
- <nmwgtopo3:city>Munich</nmwgtopo3:city>
- <nmwgtopo3:institution>Leibniz
Rechenzentrum</nmwgtopo3:institution>
- <nmwgtopo3:latitude>0</nmwgtopo3:latitude>
- <nmwgtopo3:longitude>0</nmwgtopo3:longitude>
- </nmwgtopo3:node>
- </nmwg:subject>
- </nmwg:metadata>
-
-
- <nmwg:metadata id="md2">
- <nmwg:subject id="sub-DFN-MUE">
- <nmwgtopo3:node id="DFN-MUE">
- <nmwgtopo3:type>TopologyPoint</nmwgtopo3:type>
- <nmwgtopo3:name type="logical">DFN-MUE</nmwgtopo3:name>
- <nmwgtopo3:country>Germany</nmwgtopo3:country>
- <nmwgtopo3:city>Muenster</nmwgtopo3:city>
- <nmwgtopo3:institution>DFN-Verein</nmwgtopo3:institution>
- <nmwgtopo3:latitude>0</nmwgtopo3:latitude>
- <nmwgtopo3:longitude>0</nmwgtopo3:longitude>
- </nmwgtopo3:node>
- </nmwg:subject>
- </nmwg:metadata>
-
-
- <nmwg:metadata id="md3">
- <nmwg:subject id="sub-SURFnet-MUE">
- <nmwgtopo3:node id="SURFnet-MUE">
- <nmwgtopo3:type>TopologyPoint</nmwgtopo3:type>
- <nmwgtopo3:name type="logical">SURFnet-MUE</nmwgtopo3:name>
- <nmwgtopo3:country>Netherlands</nmwgtopo3:country>
- <nmwgtopo3:city>Amsterdam</nmwgtopo3:city>
- <nmwgtopo3:institution>Surfnet</nmwgtopo3:institution>
- <nmwgtopo3:latitude>0</nmwgtopo3:latitude>
- <nmwgtopo3:longitude>0</nmwgtopo3:longitude>
- </nmwgtopo3:node>
- </nmwg:subject>
- </nmwg:metadata>
-
-
- <nmwg:metadata id="md4">
- <nmwg:subject id="sub-PSNC-PL">
- <nmwgtopo3:node id="PSNC-PL">
- <nmwgtopo3:type>TopologyPoint</nmwgtopo3:type>
- <nmwgtopo3:name type="logical">PSNC-PL</nmwgtopo3:name>
- <nmwgtopo3:country>Poland</nmwgtopo3:country>
- <nmwgtopo3:city>Poznan</nmwgtopo3:city>
- <nmwgtopo3:institution>PSNC</nmwgtopo3:institution>
- <nmwgtopo3:latitude>0</nmwgtopo3:latitude>
- <nmwgtopo3:longitude>0</nmwgtopo3:longitude>
- </nmwgtopo3:node>
- </nmwg:subject>
- </nmwg:metadata>
-
-
- <nmwg:metadata id="md5">
- <nmwg:subject id="sub-PSNC-PL-2">
- <nmwgtopo3:node id="PSNC-PL-2">
- <nmwgtopo3:type>TopologyPoint</nmwgtopo3:type>
- <nmwgtopo3:name type="logical">PSNC-PL-2</nmwgtopo3:name>
- <nmwgtopo3:country>Poland</nmwgtopo3:country>
- <nmwgtopo3:city>Poznan</nmwgtopo3:city>
- <nmwgtopo3:institution>PSNC</nmwgtopo3:institution>
- <nmwgtopo3:latitude>0</nmwgtopo3:latitude>
- <nmwgtopo3:longitude>0</nmwgtopo3:longitude>
- </nmwgtopo3:node>
- </nmwg:subject>
- </nmwg:metadata>
-
-
- <nmwg:metadata id="md-link-LRZ-SARA-DEISA-001">
- <nmwg:subject id="sub1">
- <nmtl2:link>
-
- <nmtl2:name type="logical">DFN-link-1234</nmtl2:name>
- <nmtl2:globalName
type="logical">LRZ-SARA-DEISA-001</nmtl2:globalName>
- <nmtl2:type>NREN_Link</nmtl2:type>
-
- <nmwgtopo3:node nodeIdRef="DFN-LRZ">
- <nmwgtopo3:role>EndPoint</nmwgtopo3:role>
- </nmwgtopo3:node>
-
- <nmwgtopo3:node nodeIdRef="DFN-MUE">
- <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
- </nmwgtopo3:node>
-
- </nmtl2:link>
- </nmwg:subject>
- <nmwg:parameters>
- <!-- supportedEventType parameter can replace the eventType
'Path.Status' -->
- <!-- <nmwg:parameter
name="supportedEventType">Path.Status</nmwg:parameter> -->
- <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
- </nmwg:parameters>
- <nmwg:eventType>Path.Status</nmwg:eventType>
- </nmwg:metadata>
-
-
- <nmwg:metadata id="md-link-LRZ-SARA-DEISA-002">
- <nmwg:subject id="sub1">
- <nmtl2:link>
-
- <nmtl2:name type="logical">DFN-Surfnet-Link-5678</nmtl2:name>
- <nmtl2:globalName
type="logical">LRZ-SARA-DEISA-002</nmtl2:globalName>
- <nmtl2:type>ID_Link</nmtl2:type>
-
- <nmwgtopo3:node nodeIdRef="DFN-MUE">
- <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
- </nmwgtopo3:node>
-
- <nmwgtopo3:node nodeIdRef="SURFnet-MUE">
- <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
- </nmwgtopo3:node>
-
- </nmtl2:link>
- </nmwg:subject>
- <nmwg:parameters>
- <!-- supportedEventType parameter can replace the eventType
'Path.Status' -->
- <!-- <nmwg:parameter
name="supportedEventType">Path.Status</nmwg:parameter> -->
- <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
- </nmwg:parameters>
- <nmwg:eventType>Path.Status</nmwg:eventType>
- </nmwg:metadata>
-
-
- <nmwg:metadata id="md-link-PSNC-DFN-MUE-003">
- <nmwg:subject id="sub1">
- <nmtl2:link>
-
- <nmtl2:name
type="logical">PSNC-DFN-MUE-Link-1001</nmtl2:name>
- <nmtl2:globalName
type="logical">PSNC-DFN-MUE-003</nmtl2:globalName>
- <nmtl2:type>ID_Link</nmtl2:type>
-
- <nmwgtopo3:node nodeIdRef="PSNC-PL">
- <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
- </nmwgtopo3:node>
-
- <nmwgtopo3:node nodeIdRef="DFN-MUE">
- <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
- </nmwgtopo3:node>
-
- </nmtl2:link>
- </nmwg:subject>
- <nmwg:parameters>
- <!-- supportedEventType parameter can replace the eventType
'Path.Status' -->
- <!-- <nmwg:parameter
name="supportedEventType">Path.Status</nmwg:parameter> -->
- <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
- </nmwg:parameters>
- <nmwg:eventType>Path.Status</nmwg:eventType>
- </nmwg:metadata>
-
-
- <nmwg:metadata id="md-link-PSNC-2-DFN-MUE-004">
- <nmwg:subject id="sub1">
- <nmtl2:link>
-
- <nmtl2:name
type="logical">PSNC-2-DFN-MUE-Link-1002</nmtl2:name>
- <nmtl2:globalName
type="logical">PSNC-2-DFN-MUE-004</nmtl2:globalName>
- <nmtl2:type>ID_Link</nmtl2:type>
-
- <nmwgtopo3:node nodeIdRef="PSNC-PL-2">
- <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
- </nmwgtopo3:node>
-
- <nmwgtopo3:node nodeIdRef="DFN-MUE">
- <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
- </nmwgtopo3:node>
-
- </nmtl2:link>
- </nmwg:subject>
- <nmwg:parameters>
- <!-- supportedEventType parameter can replace the eventType
'Path.Status' -->
- <!-- <nmwg:parameter
name="supportedEventType">Path.Status</nmwg:parameter> -->
- <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
- </nmwg:parameters>
- <nmwg:eventType>Path.Status</nmwg:eventType>
- </nmwg:metadata>
-
-
- <nmwg:data id="d1" metadataIdRef="md-link-LRZ-SARA-DEISA-001">
- <nmwg:key>
- <nmwg:parameters>
- <nmwg:parameter name="pathId">DFN-link-1234</nmwg:parameter>
- <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-L2-status.xml</nmwg:parameter>
- </nmwg:parameters>
- </nmwg:key>
- </nmwg:data>
-
-
- <nmwg:data id="d2" metadataIdRef="md-link-LRZ-SARA-DEISA-002">
- <nmwg:key>
- <nmwg:parameters>
- <nmwg:parameter
name="pathId">DFN-Surfnet-Link-5678</nmwg:parameter>
- <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-L2-status.xml</nmwg:parameter>
- </nmwg:parameters>
- </nmwg:key>
- </nmwg:data>
-
-
- <nmwg:data id="d3" metadataIdRef="md-link-PSNC-DFN-MUE-003">
- <nmwg:key>
- <nmwg:parameters>
- <nmwg:parameter
name="pathId">PSNC-DFN-MUE-Link-1001</nmwg:parameter>
- <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-L2-status.xml</nmwg:parameter>
- </nmwg:parameters>
- </nmwg:key>
- </nmwg:data>
-
-
- <nmwg:data id="d4" metadataIdRef="md-link-PSNC-2-DFN-MUE-004">
- <nmwg:key>
- <nmwg:parameters>
- <nmwg:parameter
name="pathId">PSNC-2-DFN-MUE-Link-1002</nmwg:parameter>
- <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-L2-status.xml</nmwg:parameter>
- </nmwg:parameters>
- </nmwg:key>
- </nmwg:data>
-
-
- <!-- iperf/bwctl metadata section -->
-
-
- <nmwg:metadata id="meta1-iperf-test">
- <iperf:subject id="subject-1">
- <nmwgt:endPointPair
xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
- <nmwgt:src type="ipv4" value="198.32.8.170" port="5433"/>
- <nmwgt:dst type="ipv4" value="198.32.8.174" port="5433"/>
- </nmwgt:endPointPair>
- </iperf:subject>
-
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/iperf/2.0</nmwg:eventType>
- <nmwg:parameters id="params1">
- <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
- </nmwg:parameters>
- </nmwg:metadata>
-
- <nmwg:data id="data1-iperf-test" metadataIdRef="meta1-iperf-test">
- <nmwg:key>
- <nmwg:parameters>
- <nmwg:parameter
name="metadataId">meta1-iperf-test</nmwg:parameter>
- <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-iperf.xml</nmwg:parameter>
- <nmwg:parameter
name="eventType">http://ggf.org/ns/nmwg/tools/iperf/2.0</nmwg:parameter>
- </nmwg:parameters>
- </nmwg:key>
- </nmwg:data>
-
-
- <nmwg:metadata id="meta2-iperf-test">
- <iperf:subject id="subject-1">
- <nmwgt:endPointPair
xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
- <nmwgt:src type="ipv4" value="150.254.0.1" port="5422"/>
- <nmwgt:dst type="ipv4" value="150.254.0.2" port="5422"/>
- </nmwgt:endPointPair>
- </iperf:subject>
-
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/iperf/2.0</nmwg:eventType>
- <nmwg:parameters id="params1">
- <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
- </nmwg:parameters>
- </nmwg:metadata>
-
- <nmwg:data id="data2-iperf-test" metadataIdRef="meta2-iperf-test">
- <nmwg:key>
- <nmwg:parameters>
- <nmwg:parameter
name="metadataId">meta2-iperf-test</nmwg:parameter>
- <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-iperf.xml</nmwg:parameter>
- <nmwg:parameter
name="eventType">http://ggf.org/ns/nmwg/tools/iperf/2.0</nmwg:parameter>
- </nmwg:parameters>
- </nmwg:key>
- </nmwg:data>
-
-
- <!-- ping metadata section -->
-
-
- <nmwg:metadata id="ping-meta1">
- <ping:subject id="sub1">
- <nmwgt:endPointPair>
- <nmwgt:src type="ipv4" value="222.22.22.22"/>
- <nmwgt:dst type="ipv4" value="111.11.11.11"/>
- </nmwgt:endPointPair>
- </ping:subject>
-
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/ping/2.0</nmwg:eventType>
- </nmwg:metadata>
-
- <nmwg:data id="ping-data1" metadataIdRef="ping-meta1">
- <nmwg:key>
- <nmwg:parameters>
- <nmwg:parameter name="metadataId">ping-meta1</nmwg:parameter>
- <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-clmp-ping.xml</nmwg:parameter>
- <nmwg:parameter
name="eventType">http://ggf.org/ns/nmwg/tools/ping/2.0</nmwg:parameter>
- </nmwg:parameters>
- </nmwg:key>
- </nmwg:data>
-
-
-</nmwg:store>
\ No newline at end of file

Deleted: trunk/perfsonar-java-sql-ma/conf/sql-database_clmp-owamp.xml
===================================================================
--- trunk/perfsonar-java-sql-ma/conf/sql-database_clmp-owamp.xml
2012-11-30 11:48:50 UTC (rev 6046)
+++ trunk/perfsonar-java-sql-ma/conf/sql-database_clmp-owamp.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,65 +0,0 @@
-<nmwg:store xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
xmlns:owamp="http://ggf.org/ns/nmwg/tools/owamp/2.0/";
- xmlns="http://ggf.org/ns/nmwg/base/2.0/";>
-
- <nmwg:metadata id="owamp-meta1">
- <owamp:subject id="sub1">
- <nmwgt:endPointPair>
- <nmwgt:src type="ipv4" value="222.22.22.22" />
- <nmwgt:dst type="ipv4" value="111.11.11.11" />
- </nmwgt:endPointPair>
- </owamp:subject>
-
- <owamp:parameters id="param1">
- <nmwg:parameter name="direction">to</nmwg:parameter>
- <nmwg:parameter name="count" value="10"/>
- <nmwg:parameter name="size" value="10"/>
- </owamp:parameters>
-
- <nmwg:eventType>http://ggf.org/ns/nmwg/tools/owamp/2.0
- </nmwg:eventType>
- </nmwg:metadata>
-
- <nmwg:data id="data1-owamp" metadataIdRef="owamp-meta1">
- <nmwg:key>
- <nmwg:parameters>
- <nmwg:parameter name="metadataId">owamp-meta1
- </nmwg:parameter>
- <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-clmp-owamp.xml</nmwg:parameter>
- </nmwg:parameters>
- </nmwg:key>
- </nmwg:data>
-
- <!-- This is metadata to store SUMMARY (aggregated) data -->
- <nmwg:metadata id="owamp-meta2">
- <owamp:subject id="sub1">
- <nmwgt:endPointPair>
- <nmwgt:src type="ipv4" value="222.22.22.21" />
- <nmwgt:dst type="ipv4" value="111.11.11.12" />
- </nmwgt:endPointPair>
- </owamp:subject>
-
- <owamp:parameters id="param1">
- <nmwg:parameter name="direction">to</nmwg:parameter>
- <nmwg:parameter name="count" value="10"/>
- <nmwg:parameter name="size" value="10"/>
- <nmwg:parameter name="output">summary</nmwg:parameter>
- </owamp:parameters>
-
- <nmwg:eventType>http://ggf.org/ns/nmwg/tools/owamp/2.0
- </nmwg:eventType>
- </nmwg:metadata>
-
- <nmwg:data id="data2-owamp" metadataIdRef="owamp-meta2">
- <nmwg:key>
- <nmwg:parameters>
- <nmwg:parameter
name="metadataId">owamp-meta2</nmwg:parameter>
- <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-owamp-aggregation.xml</nmwg:parameter>
- </nmwg:parameters>
- </nmwg:key>
- </nmwg:data>
-
-</nmwg:store>
-
-
-

Deleted: trunk/perfsonar-java-sql-ma/conf/sql-database_clmp-ping.xml
===================================================================
--- trunk/perfsonar-java-sql-ma/conf/sql-database_clmp-ping.xml 2012-11-30
11:48:50 UTC (rev 6046)
+++ trunk/perfsonar-java-sql-ma/conf/sql-database_clmp-ping.xml 2012-12-03
13:50:47 UTC (rev 6047)
@@ -1,28 +0,0 @@
-<nmwg:store xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
- xmlns:ping="http://ggf.org/ns/nmwg/tools/ping/2.0/";
- xmlns="http://ggf.org/ns/nmwg/base/2.0/";>
-
-
- <nmwg:metadata id="ping-meta1">
- <ping:subject id="sub1">
- <nmwgt:endPointPair>
- <nmwgt:src type="ipv4" value="222.22.22.22"/>
- <nmwgt:dst type="ipv4" value="111.11.11.11"/>
- </nmwgt:endPointPair>
- </ping:subject>
-
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/ping/2.0</nmwg:eventType>
- </nmwg:metadata>
-
- <nmwg:data id="ping-data1" metadataIdRef="ping-meta1">
- <nmwg:key>
- <nmwg:parameters>
- <nmwg:parameter name="metadataId">ping-meta1</nmwg:parameter>
- <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-clmp-ping.xml</nmwg:parameter>
- <nmwg:parameter
name="eventType">http://ggf.org/ns/nmwg/tools/ping/2.0</nmwg:parameter>
- </nmwg:parameters>
- </nmwg:key>
- </nmwg:data>
-
-
-</nmwg:store>
\ No newline at end of file

Deleted: trunk/perfsonar-java-sql-ma/conf/sql-database_discards_TEST.xml
===================================================================
--- trunk/perfsonar-java-sql-ma/conf/sql-database_discards_TEST.xml
2012-11-30 11:48:50 UTC (rev 6046)
+++ trunk/perfsonar-java-sql-ma/conf/sql-database_discards_TEST.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<nmwg:store xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
- xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
- xmlns:nmwgtopo="http://ggf.org/ns/nmwg/topology/2.0/";
- xmlns:nmwgtopo3="http://ggf.org/ns/nmwg/topology/base/3.0/";
- xmlns:nmtl2="http://ggf.org/ns/nmwg/topology/l2/3.0/";
- xmlns:discards="http://ggf.org/ns/nmwg/characteristic/discards/2.0/";
- xmlns="http://ggf.org/ns/nmwg/base/2.0/";>
-
-
- <nmwg:metadata id="meta1-discards-test">
- <discards:subject id="subj1">
- <nmwgt:interface>
- <nmwgt:hostName>test-hostName</nmwgt:hostName>
- <nmwgt:ifAddress type="ipv4">10.1.2.3</nmwgt:ifAddress>
- <nmwgt:ifName>test-0</nmwgt:ifName>
- <nmwgt:ifIndex>2</nmwgt:ifIndex>
- <nmwgt:direction>in</nmwgt:direction>
- <nmwgt:capacity>1000000000</nmwgt:capacity>
- </nmwgt:interface>
- </discards:subject>
-
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/discards/2.0</nmwg:eventType>
- <nmwg:parameters id="params1">
- <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
- </nmwg:parameters>
- </nmwg:metadata>
-
-
- <nmwg:data id="data1-discards-test" metadataIdRef="meta1-discards-test">
- <nmwg:key>
- <nmwg:parameters>
- <nmwg:parameter
name="metadataId">meta1-discards-test</nmwg:parameter>
- <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-discards.xml</nmwg:parameter>
- <nmwg:parameter
name="eventType">http://ggf.org/ns/nmwg/characteristic/discards/2.0</nmwg:parameter>
- </nmwg:parameters>
- </nmwg:key>
- </nmwg:data>
-
-
-</nmwg:store>
\ No newline at end of file

Deleted: trunk/perfsonar-java-sql-ma/conf/sql-database_errors_TEST.xml
===================================================================
--- trunk/perfsonar-java-sql-ma/conf/sql-database_errors_TEST.xml
2012-11-30 11:48:50 UTC (rev 6046)
+++ trunk/perfsonar-java-sql-ma/conf/sql-database_errors_TEST.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<nmwg:store xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
- xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
- xmlns:nmwgtopo="http://ggf.org/ns/nmwg/topology/2.0/";
- xmlns:nmwgtopo3="http://ggf.org/ns/nmwg/topology/base/3.0/";
- xmlns:nmtl2="http://ggf.org/ns/nmwg/topology/l2/3.0/";
- xmlns:errors="http://ggf.org/ns/nmwg/characteristic/errors/2.0/";
- xmlns="http://ggf.org/ns/nmwg/base/2.0/";>
-
-
- <nmwg:metadata id="meta1-errors-test">
- <errors:subject id="subj1">
- <nmwgt:interface>
- <nmwgt:hostName>test-hostName</nmwgt:hostName>
- <nmwgt:ifAddress type="ipv4">10.1.2.3</nmwgt:ifAddress>
- <nmwgt:ifName>test-0</nmwgt:ifName>
- <nmwgt:ifIndex>2</nmwgt:ifIndex>
- <nmwgt:direction>in</nmwgt:direction>
- <nmwgt:capacity>1000000000</nmwgt:capacity>
- </nmwgt:interface>
- </errors:subject>
-
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/errors/2.0</nmwg:eventType>
- <nmwg:parameters id="params1">
- <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
- </nmwg:parameters>
- </nmwg:metadata>
-
-
- <nmwg:data id="data1-errors-test" metadataIdRef="meta1-errors-test">
- <nmwg:key>
- <nmwg:parameters>
- <nmwg:parameter
name="metadataId">meta1-errors-test</nmwg:parameter>
- <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-errors.xml</nmwg:parameter>
- <nmwg:parameter
name="eventType">http://ggf.org/ns/nmwg/characteristic/errors/2.0</nmwg:parameter>
- </nmwg:parameters>
- </nmwg:key>
- </nmwg:data>
-
-
-</nmwg:store>
\ No newline at end of file

Deleted: trunk/perfsonar-java-sql-ma/conf/sql-database_iperf_TEST.xml
===================================================================
--- trunk/perfsonar-java-sql-ma/conf/sql-database_iperf_TEST.xml
2012-11-30 11:48:50 UTC (rev 6046)
+++ trunk/perfsonar-java-sql-ma/conf/sql-database_iperf_TEST.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<nmwg:store xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
- xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
- xmlns:iperf="http://ggf.org/ns/nmwg/tools/iperf/2.0/";
- xmlns="http://ggf.org/ns/nmwg/base/2.0/";>
-
-
- <nmwg:metadata id="meta1-iperf-test">
- <iperf:subject id="subject-1">
- <nmwgt:endPointPair
xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
- <nmwgt:src type="ipv4" value="198.32.8.170" port="5433"/>
- <nmwgt:dst type="ipv4" value="198.32.8.174" port="5433"/>
- </nmwgt:endPointPair>
- </iperf:subject>
-
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/iperf/2.0</nmwg:eventType>
- <nmwg:parameters id="params1">
- <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
- </nmwg:parameters>
- </nmwg:metadata>
-
- <nmwg:data id="data1-iperf-test" metadataIdRef="meta1-iperf-test">
- <nmwg:key>
- <nmwg:parameters>
- <nmwg:parameter
name="metadataId">meta1-iperf-test</nmwg:parameter>
- <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-iperf.xml</nmwg:parameter>
- <nmwg:parameter
name="eventType">http://ggf.org/ns/nmwg/tools/iperf/2.0</nmwg:parameter>
- </nmwg:parameters>
- </nmwg:key>
- </nmwg:data>
-
-</nmwg:store>
\ No newline at end of file

Deleted: trunk/perfsonar-java-sql-ma/conf/sql-database_utilization_TEST.xml
===================================================================
--- trunk/perfsonar-java-sql-ma/conf/sql-database_utilization_TEST.xml
2012-11-30 11:48:50 UTC (rev 6046)
+++ trunk/perfsonar-java-sql-ma/conf/sql-database_utilization_TEST.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<nmwg:store xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
- xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
-
xmlns:netutil="http://ggf.org/ns/nmwg/characteristic/utilization/2.0/";
- xmlns:nmwgtopo="http://ggf.org/ns/nmwg/topology/2.0/";
- xmlns:nmwgtopo3="http://ggf.org/ns/nmwg/topology/base/3.0/";
- xmlns:nmtl2="http://ggf.org/ns/nmwg/topology/l2/3.0/";
- xmlns="http://ggf.org/ns/nmwg/base/2.0/";>
-
-
-
- <nmwg:metadata id="meta1-test">
- <netutil:subject id="subj1">
- <nmwgt:interface>
- <nmwgt:hostName>test-hostName</nmwgt:hostName>
- <nmwgt:ifAddress type="ipv4">10.1.2.3</nmwgt:ifAddress>
- <nmwgt:ifName>test-0</nmwgt:ifName>
- <nmwgt:ifDescription>test description</nmwgt:ifDescription>
- <nmwgt:direction>in</nmwgt:direction>
- <nmwgt:capacity>1000BaseT</nmwgt:capacity>
- </nmwgt:interface>
- </netutil:subject>
-
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:eventType>
- <nmwg:parameters id="params1">
- <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
- </nmwg:parameters>
- </nmwg:metadata>
-
-
- <nmwg:data id="data1-test" metadataIdRef="meta1-test">
- <nmwg:key>
- <nmwg:parameters>
- <nmwg:parameter name="metadataId">meta1-test</nmwg:parameter>
- <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-utilization.xml</nmwg:parameter>
- <nmwg:parameter
name="eventType">http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:parameter>
- </nmwg:parameters>
- </nmwg:key>
- </nmwg:data>
-
-
-
-</nmwg:store>
\ No newline at end of file

Deleted: trunk/perfsonar-java-sql-ma/conf/wizard.properties
===================================================================
--- trunk/perfsonar-java-sql-ma/conf/wizard.properties 2012-11-30 11:48:50
UTC (rev 6046)
+++ trunk/perfsonar-java-sql-ma/conf/wizard.properties 2012-12-03 13:50:47
UTC (rev 6047)
@@ -1,206 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE properties [
- <!ELEMENT properties ( comment?, property* )>
-<!ATTLIST properties version CDATA #FIXED "0.1">
-<!ELEMENT comment (#PCDATA) >
-<!ELEMENT property (entry,Comment,ProposedValue,Group+,AcceptedValue*) >
-<!ELEMENT entry (#PCDATA) >
-<!ATTLIST entry
-key CDATA #REQUIRED
- password (true|false) #IMPLIED
- required (true|false) #IMPLIED >
-<!ELEMENT Comment (#PCDATA) >
-<!ELEMENT ProposedValue (#PCDATA) >
-<!ELEMENT Group (#PCDATA) >
-<!ATTLIST Group
- order CDATA #REQUIRED
- check (true|false) #IMPLIED
->
-<!ELEMENT AcceptedValue (#PCDATA) >
-]>
-
-
-<properties>
-
-
- <comment>$Id$</comment>
-
-
-
- <property>
- <entry key="component.ma.xmldb.db_uri"
required="true">xmldb:exist://localhost:8080/exist/xmlrpc</entry>
- <Comment>Enter the URI location of the eXist database:</Comment>
- <ProposedValue>xmldb:exist://localhost:8080/exist/xmlrpc</ProposedValue>
- <Group order="1">eXist</Group>
- </property>
-
- <property>
- <entry key="component.ma.xmldb.db_username"
required="true">sqlmaservice</entry>
- <Comment>Enter the service username for the eXist user:</Comment>
- <ProposedValue>sqlmaservice</ProposedValue>
- <Group order="2">eXist</Group>
- </property>
-
- <property>
- <entry key="component.ma.xmldb.db_password" required="true"
password="true">sqlmaservice</entry>
- <Comment>Enter the password for the eXist user:</Comment>
- <ProposedValue>sqlmaservice</ProposedValue>
- <Group order="3">eXist</Group>
- </property>
-
- <property>
- <entry key="create_user" required="true">no</entry>
- <Comment>Do you wish to create a user with this name?</Comment>
- <ProposedValue>yes</ProposedValue>
- <Group order="4" check="true">eXist</Group>
- <AcceptedValue>yes</AcceptedValue>
- <AcceptedValue>no</AcceptedValue>
- </property>
-
- <property>
- <entry key="old_adminpassword_1" required="true" password="true" />
- <Comment>Set an eXist administration password:</Comment>
- <ProposedValue />
- <Group order="5" dependsOn="4">eXist</Group>
- </property>
-
- <property>
- <entry key="service.ma.conf_file"
required="true">/etc/geant2-java-sql-ma/sql-database_TEST.xml</entry>
- <Comment>Enter the full path of the metadata configuration
file:</Comment>
-
<ProposedValue>/etc/geant2-java-sql-ma/sql-database_TEST.xml</ProposedValue>
- <Group order="6">eXist</Group>
- </property>
-
- <property>
- <entry key="change_admin_pass" required="true">no</entry>
- <Comment>Do you wish to change the exist Admin password?</Comment>
- <ProposedValue>yes</ProposedValue>
- <Group order="7" check="true">eXist</Group>
- <AcceptedValue>yes</AcceptedValue>
- <AcceptedValue>no</AcceptedValue>
- </property>
-
- <property>
- <entry key="component.ma.xmldb.db_adminpassword" required="true"
password="true" />
- <Comment>Set an eXist administration password:</Comment>
- <ProposedValue />
- <Group order="8" dependsOn="7">eXist</Group>
- </property>
-
- <property>
- <entry key="component.ma.xmldb.db_adminpassword_confirm" required="true"
password="true" />
- <Comment>Confirm new eXist administration password:</Comment>
- <ProposedValue />
- <Group order="9" dependsOn="7">eXist</Group>
- </property>
-
- <property>
- <entry key="old_adminpassword" required="true" password="true" />
- <Comment>Enter the old eXist administration password:</Comment>
- <ProposedValue />
- <Group order="99" dependsOn="7">eXist</Group>
- </property>
-
-
-
-
-
- <property>
- <entry key="service.r.service_name" required="true">perfSONAR Java SQL
MA</entry>
- <Comment>Enter the service name:</Comment>
- <ProposedValue>perfSONAR Java SQL MA</ProposedValue>
- <Group order="1">LS</Group>
- </property>
-
- <property>
- <entry key="service.r.service_description">perfSONAR Java SQL MA</entry>
- <Comment>Enter a description for the service:</Comment>
- <ProposedValue>perfSONAR Java SQL MA</ProposedValue>
- <Group order="2">LS</Group>
- </property>
-
- <property>
- <entry
key="service.r.contact_email">user@domain</entry>
- <Comment>Enter the service administrator's email address:</Comment>
-
<ProposedValue>user@domain</ProposedValue>
- <Group order="3">LS</Group>
- </property>
-
- <property>
- <entry key="service.r.organization_name">Institution</entry>
- <Comment>Enter the name of the organisation running this
service:</Comment>
- <ProposedValue>Institution</ProposedValue>
- <Group order="4">LS</Group>
- </property>
-
- <property>
- <entry key="service.r.ls_url" required="true">http://somewhere</entry>
- <Comment>Enter the LS URL (more LS addresses can be separated by
commas):</Comment>
- <ProposedValue>http://somewhere</ProposedValue>
- <Group order="5">LS</Group>
- </property>
-
- <property>
- <entry key="component.registrator.interval">43200</entry>
- <Comment>Set the registration interval (seconds):</Comment>
- <ProposedValue>43200</ProposedValue>
- <Group order="6">LS</Group>
- </property>
-
- <property>
- <entry key="service.r.access_point"
required="true">http://somewhere</entry>
- <Comment>Enter the service access point:</Comment>
- <ProposedValue>http://somewhere</ProposedValue>
- <Group order="7">LS</Group>
- </property>
-
-
-
-
-
- <property>
- <entry key="servlet.username" required="true">perfsonaruser</entry>
- <Comment>Enter the username for logging in to the admin pages:</Comment>
- <ProposedValue>perfsonaruser</ProposedValue>
- <Group order="1" check="false">Administration</Group>
- </property>
-
- <property>
- <entry key="servlet.password" required="true"
password="true">perfsonarpass</entry>
- <Comment>Enter the password for logging in to the admin pages:</Comment>
- <ProposedValue>perfsonarpass</ProposedValue>
- <Group order="2">Administration</Group>
- </property>
-
-
-
-
-
- <property>
- <entry key="service.as.authn_active" required="true">no</entry>
- <Comment>Do you wish to enable authentication?</Comment>
- <ProposedValue>yes</ProposedValue>
- <Group order="1" check="true">Authentication</Group>
- <AcceptedValue>yes</AcceptedValue>
- <AcceptedValue>no</AcceptedValue>
- </property>
-
- <property>
- <entry key="service.as.point"
required="true">http://homer.rediris.es:8080/perfSONAR-AS/services/AuthService</entry>
- <Comment>Enter the URL address of the Authentication Service:</Comment>
-
<ProposedValue>http://homer.rediris.es:8080/perfSONAR-AS/services/AuthService</ProposedValue>
- <Group order="2">Authentication</Group>
- </property>
-
- <property>
- <entry key="service.as.authn_for_msg_types"
required="true">SetupDataRequest,MetadataKeyRequest</entry>
- <Comment>Enter the message types which should be authenticated:</Comment>
-
<ProposedValue>MeasurementArchiveStoreKeyRequest,MeasurementArchiveStoreRequest,SetupDataRequest,MetadataKeyRequest</ProposedValue>
- <Group order="3">Authentication</Group>
- </property>
-
-
-
-
-
-</properties>

Deleted: trunk/perfsonar-java-sql-ma/conf/wizardproperties.dtd
===================================================================
--- trunk/perfsonar-java-sql-ma/conf/wizardproperties.dtd 2012-11-30
11:48:50 UTC (rev 6046)
+++ trunk/perfsonar-java-sql-ma/conf/wizardproperties.dtd 2012-12-03
13:50:47 UTC (rev 6047)
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
- <!-- DTD for wizard properties -->
- <!ELEMENT properties ( comment?, property* )>
- <!ATTLIST properties version CDATA #FIXED "0.1">
- <!ELEMENT comment (#PCDATA) >
- <!ELEMENT property
(entry,Comment,ProposedValue,Group+,AcceptedValue*) >
- <!ELEMENT entry (#PCDATA) >
- <!ATTLIST entry
- key CDATA #REQUIRED
- password (true|false) #IMPLIED
- required (true|false) #IMPLIED >
- <!ELEMENT Comment (#CDATA) >
- <!ELEMENT ProposedValue (#PCDATA) >
- <!ELEMENT Group (#PCDATA) >
- <!ATTLIST Group
- order CDATA #REQUIRED
- check (true|false) #IMPLIED
- >
- <!ELEMENT AcceptedValue (#PCDATA) >
-
-
\ No newline at end of file

Deleted: trunk/perfsonar-java-sql-ma/conf/wsdd/service-deploy.wsdd
===================================================================
--- trunk/perfsonar-java-sql-ma/conf/wsdd/service-deploy.wsdd 2012-11-30
11:48:50 UTC (rev 6046)
+++ trunk/perfsonar-java-sql-ma/conf/wsdd/service-deploy.wsdd 2012-12-03
13:50:47 UTC (rev 6047)
@@ -1,16 +0,0 @@
-<deployment xmlns="http://xml.apache.org/axis/wsdd/";
-xmlns:java="http://xml.apache.org/axis/wsdd/providers/java";>
-
-<service name="MeasurementArchiveService" style="message">
-<Documentation>Defines the name of the service and the type of service. The
style if message which for some reason makes communication cleaner and does
not affect anything. It implicitly uses Document style </Documentation>
-
-<parameter name="className"
value="org.perfsonar.service.base.web.RequestHandler"/>
-<Documentation> Define the name of the class to be used for the service.
This will remain the same regardless of the service </Documentation>
-
-<parameter name="allowedMethods" value="acceptCall"/>
-<Documentation> specified the methods that can be accessed. Only one method
for now and that is acceptCall</Documentation>
-
-<namespace>http://perfsonar.org/services/measurementArchive</namespace>
-<Documentation> namespace associated with the service </Documentation>
-</service>
-</deployment>

Deleted: trunk/perfsonar-java-sql-ma/conf/wsdd/service-undeploy.wsdd
===================================================================
--- trunk/perfsonar-java-sql-ma/conf/wsdd/service-undeploy.wsdd 2012-11-30
11:48:50 UTC (rev 6046)
+++ trunk/perfsonar-java-sql-ma/conf/wsdd/service-undeploy.wsdd 2012-12-03
13:50:47 UTC (rev 6047)
@@ -1,3 +0,0 @@
-<undeployment xmlns="http://xml.apache.org/axis/wsdd/";>
- <service name="MeasurementArchiveService"/>
-</undeployment>

Modified: trunk/perfsonar-java-sql-ma/pom.xml
===================================================================
--- trunk/perfsonar-java-sql-ma/pom.xml 2012-11-30 11:48:50 UTC (rev 6046)
+++ trunk/perfsonar-java-sql-ma/pom.xml 2012-12-03 13:50:47 UTC (rev 6047)
@@ -70,71 +70,17 @@
<version>6.1.9</version>
</plugin>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.7</version>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.3</version>
<executions>
<execution>
- <id>Update server-config.wsdd</id>
- <phase>process-classes</phase>
+ <phase>package</phase>
<goals>
- <goal>run</goal>
+ <goal>exploded</goal>
</goals>
- <configuration>
- <tasks>
- <java fork="true"
dir="${project.basedir}/conf/axis-1.4/WEB-INF/"
classname="org.apache.axis.utils.Admin"
classpathref="maven.compile.classpath">
- <arg value="server" />
- <arg
value="${project.basedir}/conf/wsdd/service-deploy.wsdd" />
- </java>
- </tasks>
- </configuration>
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.2</version>
- <configuration>
- <webResources>
- <resource>
-
<directory>${project.basedir}/conf/axis-1.4/</directory>
- <includes>
- <include>**/*</include>
- </includes>
- </resource>
- <resource>
-
<directory>${project.basedir}/conf/wsdd/</directory>
- <includes>
- <include>**/*</include>
- </includes>
- <targetPath>wsdd</targetPath>
- </resource>
- <resource>
- <directory>${project.basedir}/conf/</directory>
- <includes>
- <include>**/*</include>
- </includes>
- <excludes>
- <exclude>axis-1.4/**/*</exclude>
- <exclude>wsdd/**/*</exclude>
- <exclude>**/ibatis-*</exclude>
- <exclude>**/*.template*</exclude>
- </excludes>
-
<targetPath>WEB-INF/classes/perfsonar/conf</targetPath>
- </resource>
- <resource>
- <directory>${project.basedir}/conf/</directory>
- <includes>
- <include>**/ibatis-*</include>
- </includes>
- <excludes>
- <exclude>**/*.template*</exclude>
- </excludes>
- <targetPath>WEB-INF/classes</targetPath>
- </resource>
- </webResources>
-
<webXml>${project.basedir}/conf/axis-1.4/WEB-INF/web.xml</webXml>
- </configuration>
- </plugin>

<plugin>
<artifactId>jdeb</artifactId>
@@ -158,14 +104,6 @@
</mapper>
</data>
<data>
- <src>samples</src>
- <type>directory</type>
- <mapper>
- <type>perm</type>
-
<prefix>/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/samples</prefix>
- </mapper>
- </data>
- <data>

<src>packaging/deb/geant2-java-sql-ma.xml</src>
<type>file</type>
<mapper>
@@ -221,23 +159,23 @@
</repositories>

<dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.opensaml</groupId>
- <artifactId>xmltooling</artifactId>
- <version>1.1.0</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl104-over-slf4j</artifactId>
- <version>1.5.2</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>1.5.2</version>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>org.opensaml</groupId>
+ <artifactId>xmltooling</artifactId>
+ <version>1.1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl104-over-slf4j</artifactId>
+ <version>1.5.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.5.2</version>
+ </dependency>
+ </dependencies>
</dependencyManagement>

<dependencies>

Deleted:
trunk/perfsonar-java-sql-ma/samples/requests/CompleteMetadataStoreRequest.xml
===================================================================
---
trunk/perfsonar-java-sql-ma/samples/requests/CompleteMetadataStoreRequest.xml
2012-11-30 11:48:50 UTC (rev 6046)
+++
trunk/perfsonar-java-sql-ma/samples/requests/CompleteMetadataStoreRequest.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,138 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<!--
- This request replaces metadata configfuration file in the service
- with elements present here.
- This message contains also stattus data for new metadata elements.
--->
-
-<nmwg:message id="msg1"
- type="CompleteMetadataStoreRequest"
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
- xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";
- xmlns:nmwgtopo3="http://ggf.org/ns/nmwg/topology/base/3.0/";
- xmlns:nmtl2="http://ggf.org/ns/nmwg/topology/l2/3.0/";
- xmlns:nmtl3="http://ggf.org/ns/nmwg/topology/l3/3.0/";
- xmlns:ifevt="http://ggf.org/ns/nmwg/event/status/base/2.0/";>
-
-
- <nmwg:metadata id="node-md0">
- <nmwg:subject id="sub-PSNC-N1">
- <nmwgtopo3:node id="PSNC-N1">
- <nmwgtopo3:type>TopologyPoint</nmwgtopo3:type>
- <nmwgtopo3:name type="logical">PSNC-N1</nmwgtopo3:name>
- <nmwgtopo3:country>Poland</nmwgtopo3:country>
- <nmwgtopo3:city>Poznan</nmwgtopo3:city>
- <nmwgtopo3:institution>UAM</nmwgtopo3:institution>
- <nmwgtopo3:latitude>0</nmwgtopo3:latitude>
- <nmwgtopo3:longitude>0</nmwgtopo3:longitude>
- </nmwgtopo3:node>
- </nmwg:subject>
- </nmwg:metadata>
-
-
- <nmwg:metadata id="node-md1">
- <nmwg:subject id="sub-DFN-LRZ">
- <nmwgtopo3:node id="DFN-LRZ">
- <nmwgtopo3:type>TopologyPoint</nmwgtopo3:type>
- <nmwgtopo3:name type="logical">DFN-LRZ</nmwgtopo3:name>
- <nmwgtopo3:country>Germany</nmwgtopo3:country>
- <nmwgtopo3:city>Munich</nmwgtopo3:city>
- <nmwgtopo3:institution>Leibniz
Rechenzentrum</nmwgtopo3:institution>
- <nmwgtopo3:latitude>0</nmwgtopo3:latitude>
- <nmwgtopo3:longitude>0</nmwgtopo3:longitude>
- </nmwgtopo3:node>
- </nmwg:subject>
- </nmwg:metadata>
-
-
- <nmwg:metadata id="node-md2">
- <nmwg:subject id="sub-DFN-MUE">
- <nmwgtopo3:node id="DFN-MUE">
- <nmwgtopo3:type>TopologyPoint</nmwgtopo3:type>
- <nmwgtopo3:name type="logical">DFN-MUE</nmwgtopo3:name>
- <nmwgtopo3:country>Germany</nmwgtopo3:country>
- <nmwgtopo3:city>Muenster</nmwgtopo3:city>
- <nmwgtopo3:institution>DFN-Verein</nmwgtopo3:institution>
- <nmwgtopo3:latitude>0</nmwgtopo3:latitude>
- <nmwgtopo3:longitude>0</nmwgtopo3:longitude>
- </nmwgtopo3:node>
- </nmwg:subject>
- </nmwg:metadata>
-
-
- <nmwg:metadata id="link-md1">
- <nmwg:subject id="sub1">
- <nmtl2:link>
-
- <nmtl2:name
type="logical">DFN-MUE-LRZ-Link-100-TEST-0000</nmtl2:name>
- <nmtl2:globalName
type="logical">DFN-MUE-LRZ</nmtl2:globalName>
- <nmtl2:type>ID_Link</nmtl2:type>
-
- <nmwgtopo3:node nodeIdRef="DFN-LRZ">
- <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
- </nmwgtopo3:node>
-
- <nmwgtopo3:node nodeIdRef="DFN-MUE">
- <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
- </nmwgtopo3:node>
-
- </nmtl2:link>
- </nmwg:subject>
- <nmwg:eventType>Path.Status</nmwg:eventType>
- <nmwg:parameters>
- <!-- if the parameter 'ibatisConfig' is not provided in the
request then the default value of it is taken by the service -->
- <!-- <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-L2-status-domain.xml</nmwg:parameter>
-->
- <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
- </nmwg:parameters>
- </nmwg:metadata>
-
-
-
- <nmwg:metadata id="link-md2">
- <nmwg:subject id="sub1">
- <nmtl2:link>
-
- <nmtl2:name
type="logical">PSNC-DFN-LRZ-Link-200-TEST-1111</nmtl2:name>
- <nmtl2:globalName type="logical">PSNC-DFN-LRZ</nmtl2:globalName>
- <nmtl2:type>ID_Link</nmtl2:type>
-
- <nmwgtopo3:node nodeIdRef="DFN-LRZ">
- <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
- </nmwgtopo3:node>
-
- <nmwgtopo3:node nodeIdRef="PSNC-N1">
- <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
- </nmwgtopo3:node>
-
- </nmtl2:link>
- </nmwg:subject>
- <nmwg:eventType>Path.Status</nmwg:eventType>
- <nmwg:parameters>
- <!-- if the parameter 'ibatisConfig' is not provided in the request
then the default value of it is taken by the service -->
- <!-- <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-L2-status-interdomain.xml</nmwg:parameter>
-->
- <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
- </nmwg:parameters>
- </nmwg:metadata>
-
-
-
- <nmwg:data id="data1" metadataIdRef="link-md1">
- <ifevt:datum timeType="unix" timeValue="1214997801">
- <ifevt:stateAdmin>TEST-20080702-1</ifevt:stateAdmin>
- <ifevt:stateOper>down</ifevt:stateOper>
- </ifevt:datum>
- </nmwg:data>
-
-
- <nmwg:data id="data2" metadataIdRef="link-md2">
- <ifevt:datum timeType="unix" timeValue="1214997801">
- <ifevt:stateAdmin>TEST-20080702-1</ifevt:stateAdmin>
- <ifevt:stateOper>up</ifevt:stateOper>
- </ifevt:datum>
- </nmwg:data>
-
-
-
-
-</nmwg:message>

Deleted:
trunk/perfsonar-java-sql-ma/samples/requests/EchoRequest-random-fetch-test.xml
===================================================================
---
trunk/perfsonar-java-sql-ma/samples/requests/EchoRequest-random-fetch-test.xml
2012-11-30 11:48:50 UTC (rev 6046)
+++
trunk/perfsonar-java-sql-ma/samples/requests/EchoRequest-random-fetch-test.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,16 +0,0 @@
-<!-- $Id$ -->
-
-
-<nmwg:message type="EchoRequest"
- id="id1"
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
-
-
- <nmwg:metadata id="meta">
-
<nmwg:eventType>http://schemas.perfsonar.net/tools/admin/selftest/1.0/random-fetch-test</nmwg:eventType>
- </nmwg:metadata>
-
- <nmwg:data id="data" metadataIdRef="meta"/>
-
-
-</nmwg:message>
\ No newline at end of file

Deleted:
trunk/perfsonar-java-sql-ma/samples/requests/EchoRequest-self-test.xml
===================================================================
--- trunk/perfsonar-java-sql-ma/samples/requests/EchoRequest-self-test.xml
2012-11-30 11:48:50 UTC (rev 6046)
+++ trunk/perfsonar-java-sql-ma/samples/requests/EchoRequest-self-test.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,16 +0,0 @@
-<!-- $Id$ -->
-
-
-<nmwg:message type="EchoRequest"
- id="id1"
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
-
-
- <nmwg:metadata id="meta">
-
<nmwg:eventType>http://schemas.perfsonar.net/tools/admin/selftest/1.0</nmwg:eventType>
- </nmwg:metadata>
-
- <nmwg:data id="data" metadataIdRef="meta"/>
-
-
-</nmwg:message>
\ No newline at end of file

Deleted:
trunk/perfsonar-java-sql-ma/samples/requests/EchoRequest-xmldb-access-test.xml
===================================================================
---
trunk/perfsonar-java-sql-ma/samples/requests/EchoRequest-xmldb-access-test.xml
2012-11-30 11:48:50 UTC (rev 6046)
+++
trunk/perfsonar-java-sql-ma/samples/requests/EchoRequest-xmldb-access-test.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,16 +0,0 @@
-<!-- $Id$ -->
-
-
-<nmwg:message type="EchoRequest"
- id="id1"
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
-
-
- <nmwg:metadata id="meta">
-
<nmwg:eventType>http://schemas.perfsonar.net/tools/admin/selftest/1.0/xmldb-access-test</nmwg:eventType>
- </nmwg:metadata>
-
- <nmwg:data id="data" metadataIdRef="meta"/>
-
-
-</nmwg:message>
\ No newline at end of file

Deleted:
trunk/perfsonar-java-sql-ma/samples/requests/EchoRequest-xmldb-content-test.xml
===================================================================
---
trunk/perfsonar-java-sql-ma/samples/requests/EchoRequest-xmldb-content-test.xml
2012-11-30 11:48:50 UTC (rev 6046)
+++
trunk/perfsonar-java-sql-ma/samples/requests/EchoRequest-xmldb-content-test.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,16 +0,0 @@
-<!-- $Id$ -->
-
-
-<nmwg:message type="EchoRequest"
- id="id1"
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
-
-
- <nmwg:metadata id="meta">
-
<nmwg:eventType>http://schemas.perfsonar.net/tools/admin/selftest/1.0/xmldb-content-test</nmwg:eventType>
- </nmwg:metadata>
-
- <nmwg:data id="data" metadataIdRef="meta"/>
-
-
-</nmwg:message>
\ No newline at end of file

Deleted: trunk/perfsonar-java-sql-ma/samples/requests/EchoRequest.xml
===================================================================
--- trunk/perfsonar-java-sql-ma/samples/requests/EchoRequest.xml
2012-11-30 11:48:50 UTC (rev 6046)
+++ trunk/perfsonar-java-sql-ma/samples/requests/EchoRequest.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,16 +0,0 @@
-<!-- $Id$ -->
-
-
-<nmwg:message type="EchoRequest"
- id="id1"
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
-
-
- <nmwg:metadata id="meta">
-
<nmwg:eventType>http://schemas.perfsonar.net/tools/admin/echo/2.0</nmwg:eventType>
- </nmwg:metadata>
-
- <nmwg:data id="data" metadataIdRef="meta"/>
-
-
-</nmwg:message>
\ No newline at end of file

Deleted: trunk/perfsonar-java-sql-ma/samples/requests/LookupInfoRequest.xml
===================================================================
--- trunk/perfsonar-java-sql-ma/samples/requests/LookupInfoRequest.xml
2012-11-30 11:48:50 UTC (rev 6046)
+++ trunk/perfsonar-java-sql-ma/samples/requests/LookupInfoRequest.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,14 +0,0 @@
-<!-- $Id$ -->
-
-
-<nmwg:message type="LookupInfoRequest"
- id="id1"
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
-
- <nmwg:metadata id="meta">
-
<nmwg:eventType>http://schemas.perfsonar.net/tools/admin/lookupinfo/2.0</nmwg:eventType>
- </nmwg:metadata>
-
- <nmwg:data id="data" metadataIdRef="meta"/>
-
-</nmwg:message>
\ No newline at end of file

Deleted:
trunk/perfsonar-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-Discards-1.xml
===================================================================
---
trunk/perfsonar-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-Discards-1.xml
2012-11-30 11:48:50 UTC (rev 6046)
+++
trunk/perfsonar-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-Discards-1.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,33 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<!-- Purpose: Submitting a measurement (either metadata or data, there
- may be be multiple blocks) for storage into a
- MeasurementArchive -->
-<!-- Version: $Id$ -->
-
-<nmwg:message id="msg4"
- type="MeasurementArchiveStoreRequest"
-
xmlns:discards="http://ggf.org/ns/nmwg/characteristic/discards/2.0/";
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
- xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
-
-
- <nmwg:metadata id="meta1">
- <discards:subject id="subj1">
- <nmwgt:interface>
- <nmwgt:hostName>test-hostName</nmwgt:hostName>
- <nmwgt:ifAddress type="ipv4">10.1.2.3</nmwgt:ifAddress>
- <nmwgt:ifName>test-0</nmwgt:ifName>
- <nmwgt:ifIndex>2</nmwgt:ifIndex>
- <nmwgt:direction>in</nmwgt:direction>
- <nmwgt:capacity>1000000000</nmwgt:capacity>
- </nmwgt:interface>
- </discards:subject>
-
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/discards/2.0</nmwg:eventType>
- </nmwg:metadata>
-
- <nmwg:data id="data1" metadataIdRef="meta1">
- <nmwg:datum value="6" timeValue="1188986354" timeType="unix"
valueUnits="Dps" />
- </nmwg:data>
-
-</nmwg:message>

Deleted:
trunk/perfsonar-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-Errors-1.xml
===================================================================
---
trunk/perfsonar-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-Errors-1.xml
2012-11-30 11:48:50 UTC (rev 6046)
+++
trunk/perfsonar-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-Errors-1.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,33 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<!-- Purpose: Submitting a measurement (either metadata or data, there
- may be be multiple blocks) for storage into a
- MeasurementArchive -->
-<!-- Version: $Id$ -->
-
-<nmwg:message id="msg4"
- type="MeasurementArchiveStoreRequest"
-
xmlns:errors="http://ggf.org/ns/nmwg/characteristic/errors/2.0/";
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
- xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
-
-
- <nmwg:metadata id="meta1">
- <errors:subject id="subj1">
- <nmwgt:interface>
- <nmwgt:hostName>test-hostName</nmwgt:hostName>
- <nmwgt:ifAddress type="ipv4">10.1.2.3</nmwgt:ifAddress>
- <nmwgt:ifName>test-0</nmwgt:ifName>
- <nmwgt:ifIndex>2</nmwgt:ifIndex>
- <nmwgt:direction>in</nmwgt:direction>
- <nmwgt:capacity>1000000000</nmwgt:capacity>
- </nmwgt:interface>
- </errors:subject>
-
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/errors/2.0</nmwg:eventType>
- </nmwg:metadata>
-
- <nmwg:data id="data1" metadataIdRef="meta1">
- <nmwg:datum value="4" timeValue="1188986354" timeType="unix"
valueUnits="Eps" />
- </nmwg:data>
-
-</nmwg:message>

Deleted:
trunk/perfsonar-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-L2Status-1.xml
===================================================================
---
trunk/perfsonar-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-L2Status-1.xml
2012-11-30 11:48:50 UTC (rev 6046)
+++
trunk/perfsonar-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-L2Status-1.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,31 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<!-- Purpose: Submitting a measurement (either metadata or data, there
- may be be multiple blocks) for storage into a
- MeasurementArchive -->
-<!-- Version: $Id$ -->
-
-<nmwg:message id="msg4"
- type="MeasurementArchiveStoreRequest"
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
- xmlns:nmtl2="http://ggf.org/ns/nmwg/topology/l2/3.0/";
- xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
- xmlns:ifevt="http://ggf.org/ns/nmwg/event/status/base/2.0/";>
-
- <nmwg:metadata id="meta1">
- <nmwg:subject id="subject1">
- <nmtl2:link>
- <nmtl2:globalName type="logical">PSNC-DFN-MUE-003</nmtl2:globalName>
- </nmtl2:link>
- </nmwg:subject>
- <nmwg:eventType>Path.Status</nmwg:eventType>
- </nmwg:metadata>
-
- <nmwg:data id="data1" metadataIdRef="meta1">
- <ifevt:datum timeType="unix" timeValue="1157107685">
- <ifevt:stateAdmin>TEST2</ifevt:stateAdmin>
- <ifevt:stateOper>up</ifevt:stateOper>
- </ifevt:datum>
- </nmwg:data>
-
-</nmwg:message>

Deleted:
trunk/perfsonar-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-L2Status-2.xml
===================================================================
---
trunk/perfsonar-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-L2Status-2.xml
2012-11-30 11:48:50 UTC (rev 6046)
+++
trunk/perfsonar-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-L2Status-2.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,59 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<!-- Purpose: Submitting a measurement (either metadata or data, there
- may be be multiple blocks) for storage into a
- MeasurementArchive -->
-<!-- Version: $Id$ -->
-
-<nmwg:message id="msg"
- type="MeasurementArchiveStoreRequest"
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
- xmlns:nmtl2="http://ggf.org/ns/nmwg/topology/l2/3.0/";
- xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
- xmlns:nmwgtopo3="http://ggf.org/ns/nmwg/topology/base/3.0/";
- xmlns:ifevt="http://ggf.org/ns/nmwg/event/status/base/2.0/";>
-
-
-
-
- <nmwg:metadata id="meta1">
- <nmwg:subject id="sub1">
- <nmtl2:link>
-
- <nmtl2:name type="logical">PSNC-DFN-MUE-Link-1001</nmtl2:name>
- <nmtl2:globalName type="logical">PSNC-DFN-MUE-003</nmtl2:globalName>
- <nmtl2:type>ID_Link</nmtl2:type>
-
-
- <nmwgtopo3:node nodeIdRef="PSNC-PL">
- <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
- </nmwgtopo3:node>
-
- <nmwgtopo3:node nodeIdRef="DFN-MUE">
- <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
- </nmwgtopo3:node>
-
- </nmtl2:link>
- </nmwg:subject>
- <nmwg:eventType>Path.Status</nmwg:eventType>
- <nmwg:parameters>
- <nmwg:parameter name="pathId">PSNC-DFN-MUE-Link-1001</nmwg:parameter>
- <!--
- <nmwg:parameter name="ibatisConfig">
- ibatis-SqlMapConfig-L2-status-domain.xml
- </nmwg:parameter>
- -->
- </nmwg:parameters>
- </nmwg:metadata>
-
-
-
-
- <nmwg:data id="data1" metadataIdRef="meta1">
- <ifevt:datum timeType="unix" timeValue="1208948131">
- <ifevt:stateAdmin>TEST-20080423-3</ifevt:stateAdmin>
- <ifevt:stateOper>down</ifevt:stateOper>
- </ifevt:datum>
- </nmwg:data>
-
-</nmwg:message>

Deleted:
trunk/perfsonar-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-L2Status-3.xml
===================================================================
---
trunk/perfsonar-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-L2Status-3.xml
2012-11-30 11:48:50 UTC (rev 6046)
+++
trunk/perfsonar-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-L2Status-3.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,68 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<!-- Purpose: Submitting a measurement (either metadata or data, there
- may be be multiple blocks) for storage into a
- MeasurementArchive -->
-<!-- Version: $Id$ -->
-
-<nmwg:message id="msg"
- type="MeasurementArchiveStoreRequest"
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
- xmlns:nmtl2="http://ggf.org/ns/nmwg/topology/l2/3.0/";
- xmlns:nmwgtopo3="http://ggf.org/ns/nmwg/topology/base/3.0/";
- xmlns:ifevt="http://ggf.org/ns/nmwg/event/status/base/2.0/";>
-
-
-
- <nmwg:metadata id="meta1">
- <nmwg:subject id="sub1">
- <nmtl2:link>
-
- <nmtl2:name type="logical">PSNC-DFN-MUE-Link-1001</nmtl2:name>
- <nmtl2:globalName type="logical">PSNC-DFN-MUE-003</nmtl2:globalName>
- <nmtl2:type>ID_Link</nmtl2:type>
-
-
- <nmwgtopo3:node id="PSNC-PL">
- <nmwgtopo3:type>TopologyPoint</nmwgtopo3:type>
- <nmwgtopo3:name type="logical">PSNC-PL</nmwgtopo3:name>
- <nmwgtopo3:country>Poland</nmwgtopo3:country>
- <nmwgtopo3:city>Poznan</nmwgtopo3:city>
- <nmwgtopo3:institution>PSNC</nmwgtopo3:institution>
- <nmwgtopo3:latitude>0</nmwgtopo3:latitude>
- <nmwgtopo3:longitude>0</nmwgtopo3:longitude>
- </nmwgtopo3:node>
-
- <nmwgtopo3:node id="DFN-MUE">
- <nmwgtopo3:type>TopologyPoint</nmwgtopo3:type>
- <nmwgtopo3:name type="logical">DFN-MUE</nmwgtopo3:name>
- <nmwgtopo3:country>Germany</nmwgtopo3:country>
- <nmwgtopo3:city>Muenster</nmwgtopo3:city>
- <nmwgtopo3:institution>DFN-Verein</nmwgtopo3:institution>
- <nmwgtopo3:latitude>0</nmwgtopo3:latitude>
- <nmwgtopo3:longitude>0</nmwgtopo3:longitude>
- </nmwgtopo3:node>
-
- </nmtl2:link>
- </nmwg:subject>
- <nmwg:eventType>Path.Status</nmwg:eventType>
- <nmwg:parameters>
- <nmwg:parameter name="pathId">PSNC-DFN-MUE-Link-1001</nmwg:parameter>
- <!--
- <nmwg:parameter name="ibatisConfig">
- ibatis-SqlMapConfig-L2-status-domain.xml
- </nmwg:parameter>
- -->
- </nmwg:parameters>
- </nmwg:metadata>
-
-
-
- <nmwg:data id="data1" metadataIdRef="meta1">
- <ifevt:datum timeType="unix" timeValue="1208948131">
- <ifevt:stateAdmin>TEST-20080423-3</ifevt:stateAdmin>
- <ifevt:stateOper>down</ifevt:stateOper>
- </ifevt:datum>
- </nmwg:data>
-
-</nmwg:message>

Deleted:
trunk/perfsonar-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-L2Status-4.xml
===================================================================
---
trunk/perfsonar-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-L2Status-4.xml
2012-11-30 11:48:50 UTC (rev 6046)
+++
trunk/perfsonar-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-L2Status-4.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,62 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<!-- Purpose: Submitting a measurement (either metadata or data, there
- may be be multiple blocks) for storage into a
- MeasurementArchive -->
-<!-- Version: $Id$ -->
-
-<nmwg:message id="msg"
- type="MeasurementArchiveStoreRequest"
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
- xmlns:nmtl2="http://ggf.org/ns/nmwg/topology/l2/3.0/";
- xmlns:nmwgtopo3="http://ggf.org/ns/nmwg/topology/base/3.0/";
- xmlns:ifevt="http://ggf.org/ns/nmwg/event/status/base/2.0/";>
-
-
-
- <nmwg:metadata id="meta1">
- <nmwg:subject id="sub1">
- <nmtl2:link>
-
- <nmtl2:name type="logical">PSNC-DFN-MUE-Link-1001</nmtl2:name>
- <nmtl2:globalName type="logical">PSNC-DFN-MUE-003</nmtl2:globalName>
- <nmtl2:type>ID_Link</nmtl2:type>
-
-
- <nmwgtopo3:node id="PSNC-PL">
- <nmwgtopo3:type>TopologyPoint</nmwgtopo3:type>
- <nmwgtopo3:name type="logical">PSNC-PL</nmwgtopo3:name>
- <nmwgtopo3:country>Poland</nmwgtopo3:country>
- <nmwgtopo3:city>Poznan</nmwgtopo3:city>
- <nmwgtopo3:institution>PSNC</nmwgtopo3:institution>
- <nmwgtopo3:latitude>0</nmwgtopo3:latitude>
- <nmwgtopo3:longitude>0</nmwgtopo3:longitude>
- </nmwgtopo3:node>
-
- <nmwgtopo3:node nodeIdRef="DFN-MUE">
- <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
- </nmwgtopo3:node>
-
- </nmtl2:link>
- </nmwg:subject>
- <nmwg:eventType>Path.Status</nmwg:eventType>
- <nmwg:parameters>
- <nmwg:parameter name="pathId">PSNC-DFN-MUE-Link-1001</nmwg:parameter>
- <!--
- <nmwg:parameter name="ibatisConfig">
- ibatis-SqlMapConfig-L2-status-domain.xml
- </nmwg:parameter>
- -->
- </nmwg:parameters>
- </nmwg:metadata>
-
-
-
- <nmwg:data id="data1" metadataIdRef="meta1">
- <ifevt:datum timeType="unix" timeValue="1208948495">
- <ifevt:stateAdmin>TEST-20080423-4</ifevt:stateAdmin>
- <ifevt:stateOper>down</ifevt:stateOper>
- </ifevt:datum>
- </nmwg:data>
-
-</nmwg:message>

Deleted:
trunk/perfsonar-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-Ping-1.xml
===================================================================
---
trunk/perfsonar-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-Ping-1.xml
2012-11-30 11:48:50 UTC (rev 6046)
+++
trunk/perfsonar-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-Ping-1.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,33 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<!-- Version: $Id$ -->
-
-<nmwg:message id="msg1"
- type="MeasurementArchiveStoreRequest"
- xmlns:ping="http://ggf.org/ns/nmwg/tools/ping/2.0/";
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
- xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
-
-
- <nmwg:metadata id="meta1">
- <ping:subject id="sub1">
- <nmwgt:endPointPair>
- <nmwgt:src type="ipv4" value="222.22.22.22"/>
- <nmwgt:dst type="ipv4" value="111.11.11.11"/>
- </nmwgt:endPointPair>
- </ping:subject>
- <nmwg:eventType>http://ggf.org/ns/nmwg/tools/ping/2.0</nmwg:eventType>
- </nmwg:metadata>
-
-
- <nmwg:data id="data1" metadataIdRef="meta1">
- <ping:datum numBytes="56" numBytesUnits="bytes" seqNum="0"
- timeType="unix" timeValue="1233920540" ttl="252"
- value="23.00" valueUnits="ms"/>
- <ping:datum numBytes="56" numBytesUnits="bytes" seqNum="0"
- timeType="unix" timeValue="1233920541" ttl="252"
- value="4.25" valueUnits="ms"/>
- </nmwg:data>
-
-
-</nmwg:message>
\ No newline at end of file

Deleted:
trunk/perfsonar-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-Ping-2.xml
===================================================================
---
trunk/perfsonar-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-Ping-2.xml
2012-11-30 11:48:50 UTC (rev 6046)
+++
trunk/perfsonar-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-Ping-2.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,33 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<!-- Version: $Id$ -->
-
-<nmwg:message id="msg1"
- type="MeasurementArchiveStoreRequest"
- xmlns:ping="http://ggf.org/ns/nmwg/tools/ping/2.0/";
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
- xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
-
-
- <nmwg:metadata id="meta1">
- <nmwg:key>
- <nmwg:parameters>
- <nmwg:parameter
name="eventType">http://ggf.org/ns/nmwg/tools/ping/2.0</nmwg:parameter>
- <nmwg:parameter name="metadataId">ping-meta1</nmwg:parameter>
- <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-clmp-ping.xml</nmwg:parameter>
- </nmwg:parameters>
- </nmwg:key>
- </nmwg:metadata>
-
-
- <nmwg:data id="data1" metadataIdRef="meta1">
- <ping:datum numBytes="56" numBytesUnits="bytes" seqNum="0"
- timeType="unix" timeValue="1233920725" ttl="252"
- value="23.00" valueUnits="ms"/>
- <ping:datum numBytes="56" numBytesUnits="bytes" seqNum="0"
- timeType="unix" timeValue="1233920726" ttl="252"
- value="14.49" valueUnits="ms"/>
- </nmwg:data>
-
-
-</nmwg:message>
\ No newline at end of file

Deleted:
trunk/perfsonar-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-Utilization-1.xml
===================================================================
---
trunk/perfsonar-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-Utilization-1.xml
2012-11-30 11:48:50 UTC (rev 6046)
+++
trunk/perfsonar-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-Utilization-1.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,34 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<!-- Purpose: Submitting a measurement (either metadata or data, there
- may be be multiple blocks) for storage into a
- MeasurementArchive -->
-<!-- Version: $Id$ -->
-
-<nmwg:message id="msg4"
- type="MeasurementArchiveStoreRequest"
-
xmlns:netutil="http://ggf.org/ns/nmwg/characteristic/utilization/2.0/";
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
- xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
-
-
- <nmwg:metadata id="meta1">
- <netutil:subject id="subj1">
- <nmwgt:interface>
- <nmwgt:hostName>test-hostName</nmwgt:hostName>
- <nmwgt:ifAddress type="ipv4">10.1.2.3</nmwgt:ifAddress>
- <nmwgt:ifName>test-0</nmwgt:ifName>
- <nmwgt:ifDescription>test description</nmwgt:ifDescription>
- <nmwgt:direction>in</nmwgt:direction>
- <nmwgt:authRealm>TestRealm</nmwgt:authRealm>
- <nmwgt:capacity>1000BaseT</nmwgt:capacity>
- </nmwgt:interface>
- </netutil:subject>
-
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:eventType>
- </nmwg:metadata>
-
- <nmwg:data id="data1" metadataIdRef="meta1">
- <nmwg:datum value="12345" timeValue="1187688523" timeType="unix"
valueUnits="Bps" />
- </nmwg:data>
-
-</nmwg:message>

Deleted:
trunk/perfsonar-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-bwctl-iperf-1.xml
===================================================================
---
trunk/perfsonar-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-bwctl-iperf-1.xml
2012-11-30 11:48:50 UTC (rev 6046)
+++
trunk/perfsonar-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-bwctl-iperf-1.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,47 +0,0 @@
-<?xml version="1.0"?>
-<nmwg:message xmlns="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
- xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";
- xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
- xmlns:bwctl="http://ggf.org/ns/nmwg/tools/bwctl/2.0/";
- xmlns:iperf="http://ggf.org/ns/nmwg/tools/iperf/2.0/";
- xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
- type="MeasurementArchiveStoreRequest"
- id="bwctl-iperf-request">
-
-
- <nmwg:metadata id="bwctl-metadata">
- <bwctl:subject id="bwctl-subject">
- <nmwgt:endPoint type="ipv4" value="131.188.81.12"/>
- </bwctl:subject>
- <nmwg:eventType>http://ggf.org/ns/nmwg/tools/bwctl/2.0</nmwg:eventType>
- <bwctl:parameters id="bwctl-parameters">
- <nmwg:parameter name="duration" value="5"/>
- </bwctl:parameters>
- </nmwg:metadata>
-
- <nmwg:metadata id="iperf-metadata">
- <iperf:subject id="iperf-subject" metadataIdRef="bwctl-metadata">
- <nmwgt:endPointPair>
- <nmwgt:src type="ipv4" value="131.188.81.61"/>
- <nmwgt:dst type="ipv4" value="131.188.81.12"/>
- </nmwgt:endPointPair>
- </iperf:subject>
- <!--
- <iperf:parameters id="iperf-parameters">
- <nmwg:parameter name="interval" value="2"/>
- <nmwg:parameter name="protocol" value="tcp"/>
- </iperf:parameters>
- -->
- <nmwg:eventType>http://ggf.org/ns/nmwg/tools/iperf/2.0</nmwg:eventType>
- </nmwg:metadata>
-
-
- <nmwg:data id="1" metadataIdRef="iperf-metadata">
- <iperf:datum throughput="1.03" jitter="1.23" loss="0/837"
numBytes="23484640" numBytesUnits="Bytes" timeType="unix"
timeValue="1234273826" valueUnits="bits/sec"/>
- <iperf:datum throughput="4.46" jitter="1.11" loss="3/835"
numBytes="23484640" numBytesUnits="Bytes" timeType="unix"
timeValue="1234273836" valueUnits="bits/sec"/>
- <iperf:datum throughput="3.22" jitter="1.42" loss="5/855"
numBytes="23484640" numBytesUnits="Bytes" timeType="unix"
timeValue="1234273846" valueUnits="bits/sec"/>
- </nmwg:data>
-
-
-</nmwg:message>

Deleted:
trunk/perfsonar-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-bwctl-iperf-2.xml
===================================================================
---
trunk/perfsonar-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-bwctl-iperf-2.xml
2012-11-30 11:48:50 UTC (rev 6046)
+++
trunk/perfsonar-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-bwctl-iperf-2.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-<nmwg:message xmlns="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
- xmlns:iperf="http://ggf.org/ns/nmwg/tools/iperf/2.0/";
- type="MeasurementArchiveStoreRequest"
- id="bwctl-iperf-request">
-
-
- <nmwg:metadata id="m1">
- <nmwg:key id="k1">
- <nmwg:parameters id="p1">
- <nmwg:parameter
name="eventType">http://ggf.org/ns/nmwg/tools/iperf/2.0</nmwg:parameter>
- <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-iperf.xml</nmwg:parameter>
- <nmwg:parameter name="metadataId">meta1-iperf-test</nmwg:parameter>
- </nmwg:parameters>
- </nmwg:key>
- </nmwg:metadata>
-
- <nmwg:data id="d1" metadataIdRef="m1">
- <iperf:datum throughput="1.03" jitter="1.23" loss="0/837"
numBytes="23484640" numBytesUnits="Bytes" timeType="unix"
timeValue="1234273826" valueUnits="bits/sec"/>
- <iperf:datum throughput="4.46" jitter="1.11" loss="3/835"
numBytes="23484640" numBytesUnits="Bytes" timeType="unix"
timeValue="1234273836" valueUnits="bits/sec"/>
- <iperf:datum throughput="3.22" jitter="1.42" loss="5/855"
numBytes="23484640" numBytesUnits="Bytes" timeType="unix"
timeValue="1234273846" valueUnits="bits/sec"/>
- </nmwg:data>
-
-
-</nmwg:message>
\ No newline at end of file

Deleted:
trunk/perfsonar-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-owamp-1.xml
===================================================================
---
trunk/perfsonar-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-owamp-1.xml
2012-11-30 11:48:50 UTC (rev 6046)
+++
trunk/perfsonar-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-owamp-1.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,27 +0,0 @@
-<nmwg:message type="MeasurementArchiveStoreRequest" id="datarq2-1"
- xmlns="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";
- xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
- xmlns:owamp="http://ggf.org/ns/nmwg/tools/owamp/2.0/";
- xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";
- xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
- xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
-
- <nmwg:metadata id="meta1">
- <owamp:subject id="subj1">
- <nmwgt:endPointPair>
- <nmwgt:src type="ipv4" value="222.22.22.22"
/> <!-- The host where is OWAMP M -->
- <nmwgt:dst type="ipv4" value="111.11.11.11"
/> <!-- destination host -->
- </nmwgt:endPointPair>
- </owamp:subject>
- <nmwg:eventType>http://ggf.org/ns/nmwg/tools/owamp/2.0
- </nmwg:eventType>
- </nmwg:metadata>
-
- <nmwg:data id="data1" metadataIdRef="meta1">
- <owamp:datum receiveSynchronized="1"
receiveTime="15080301494633990768"
- receiveTimeError="1.00583E-6" sendSynchronized="1"
sendTime="15080301494378967370"
- sendTimeError="4.91142E-5" seqNum="0" ttl="243" />
- </nmwg:data>
-
-</nmwg:message>
\ No newline at end of file

Deleted:
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-Discards-1.xml
===================================================================
---
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-Discards-1.xml
2012-11-30 11:48:50 UTC (rev 6046)
+++
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-Discards-1.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<nmwg:message type="MetadataKeyRequest"
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
-
xmlns:discards="http://ggf.org/ns/nmwg/characteristic/discards/2.0/";
- xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
- xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";>
-
- <nmwg:metadata id="m1">
- <discards:subject id="s1">
- <nmwgt:interface>
- <nmwgt:ifAddress type="ipv4">10.1.2.3</nmwgt:ifAddress>
- <nmwgt:ifName>test-0</nmwgt:ifName>
- <nmwgt:direction>in</nmwgt:direction>
- </nmwgt:interface>
- </discards:subject>
-
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/discards/2.0</nmwg:eventType>
- </nmwg:metadata>
-
- <nmwg:metadata id="m2">
- <select:subject id="s2" metadataIdRef="m1"/>
- <nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>
- <select:parameters id="sp1">
- <nmwg:parameter name="startTime">1187948870</nmwg:parameter>
- <nmwg:parameter name="endTime">1187948888</nmwg:parameter>
- </select:parameters>
- </nmwg:metadata>
-
- <nmwg:data id="d1" metadataIdRef="m2"/>
-
-
-
-</nmwg:message>
\ No newline at end of file

Deleted:
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-Errors-1.xml
===================================================================
---
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-Errors-1.xml
2012-11-30 11:48:50 UTC (rev 6046)
+++
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-Errors-1.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<nmwg:message type="MetadataKeyRequest"
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
-
xmlns:errors="http://ggf.org/ns/nmwg/characteristic/errors/2.0/";
- xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
- xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";>
-
- <nmwg:metadata id="m1">
- <errors:subject id="s1">
- <nmwgt:interface>
- <nmwgt:ifAddress type="ipv4">10.1.2.3</nmwgt:ifAddress>
- <nmwgt:ifName>test-0</nmwgt:ifName>
- <nmwgt:direction>in</nmwgt:direction>
- </nmwgt:interface>
- </errors:subject>
-
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/errors/2.0</nmwg:eventType>
- </nmwg:metadata>
-
- <nmwg:metadata id="m2">
- <select:subject id="s2" metadataIdRef="m1"/>
- <nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>
- <select:parameters id="sp1">
- <nmwg:parameter name="startTime">1187948870</nmwg:parameter>
- <nmwg:parameter name="endTime">1187948888</nmwg:parameter>
- </select:parameters>
- </nmwg:metadata>
-
- <nmwg:data id="d1" metadataIdRef="m2"/>
-
-
-
-</nmwg:message>
\ No newline at end of file

Deleted:
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-L2Status-1.xml
===================================================================
---
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-L2Status-1.xml
2012-11-30 11:48:50 UTC (rev 6046)
+++
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-L2Status-1.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,31 +0,0 @@
-<nmwg:message type="MetadataKeyRequest"
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
- xmlns:nmtl2="http://ggf.org/ns/nmwg/topology/l2/3.0/";
- xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";>
-
-
-
- <nmwg:metadata id="meta1">
- <nmwg:subject id="subject1">
- <nmtl2:link>
- <nmtl2:globalName
type="logical">PSNC-DFN-MUE-003</nmtl2:globalName>
- </nmtl2:link>
- </nmwg:subject>
- <nmwg:eventType>Path.Status</nmwg:eventType>
- </nmwg:metadata>
-
-
- <nmwg:metadata id="meta2">
- <select:subject id="iusub2" metadataIdRef="meta1"/>
- <select:parameters id="param1">
- <nmwg:parameter name="time">now</nmwg:parameter>
- </select:parameters>
-
<nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>
- </nmwg:metadata>
-
-
-
- <nmwg:data id="data1" metadataIdRef="meta2"/>
-
-
- </nmwg:message>
\ No newline at end of file

Deleted:
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-L2Status-2.xml
===================================================================
---
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-L2Status-2.xml
2012-11-30 11:48:50 UTC (rev 6046)
+++
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-L2Status-2.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,54 +0,0 @@
-<nmwg:message type="MetadataKeyRequest"
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
- xmlns:nmtl2="http://ggf.org/ns/nmwg/topology/l2/3.0/";
- xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
- xmlns:nmwgtopo3="http://ggf.org/ns/nmwg/topology/base/3.0/";>
-
-
- <nmwg:metadata id="meta1">
- <nmwg:subject id="subject1">
- <nmtl2:link>
-
- <!--
- <nmwgtopo3:node>
- <nmwgtopo3:name type="logical">DFN-LRZ</nmwgtopo3:name>
- <nmwgtopo3:country>Germany</nmwgtopo3:country>
- <nmwgtopo3:city>Munich</nmwgtopo3:city>
- <nmwgtopo3:institution>Leibniz
Rechenzentrum</nmwgtopo3:institution>
- <nmwgtopo3:role>EndPoint</nmwgtopo3:role>
- </nmwgtopo3:node>
- -->
-
- <nmwgtopo3:node>
- <nmwgtopo3:name type="logical">PSNC-PL</nmwgtopo3:name>
- <nmwgtopo3:country>Poland</nmwgtopo3:country>
- <nmwgtopo3:city>Poznan</nmwgtopo3:city>
- <nmwgtopo3:institution>PSNC</nmwgtopo3:institution>
- </nmwgtopo3:node>
-
- <nmwgtopo3:node>
- <nmwgtopo3:name type="logical">DFN-MUE</nmwgtopo3:name>
- <nmwgtopo3:country>Germany</nmwgtopo3:country>
- <nmwgtopo3:city>Muenster</nmwgtopo3:city>
- <nmwgtopo3:institution>DFN-Verein</nmwgtopo3:institution>
- </nmwgtopo3:node>
-
- </nmtl2:link>
- </nmwg:subject>
- <nmwg:eventType>Path.Status</nmwg:eventType>
- </nmwg:metadata>
-
-
- <nmwg:metadata id="meta2">
- <select:subject id="iusub2" metadataIdRef="meta1"/>
- <select:parameters id="param1">
- <nmwg:parameter name="time">now</nmwg:parameter>
- </select:parameters>
-
<nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>
- </nmwg:metadata>
-
-
- <nmwg:data id="data1" metadataIdRef="meta2"/>
-
-
- </nmwg:message>
\ No newline at end of file

Deleted:
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-L2Status-3.xml
===================================================================
---
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-L2Status-3.xml
2012-11-30 11:48:50 UTC (rev 6046)
+++
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-L2Status-3.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,16 +0,0 @@
-<nmwg:message type="MetadataKeyRequest"
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
- xmlns:nmtl2="http://ggf.org/ns/nmwg/topology/l2/3.0/";
- xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
- xmlns:nmwgtopo3="http://ggf.org/ns/nmwg/topology/base/3.0/";>
-
-
- <nmwg:metadata id="meta1">
- <nmwg:eventType>Path.Status</nmwg:eventType>
- </nmwg:metadata>
-
-
- <nmwg:data id="data1" metadataIdRef="meta1"/>
-
-
- </nmwg:message>
\ No newline at end of file

Deleted:
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-Ping-1.xml
===================================================================
---
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-Ping-1.xml
2012-11-30 11:48:50 UTC (rev 6046)
+++
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-Ping-1.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<nmwg:message type="MetadataKeyRequest"
- id="metadataKeyRequest1"
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
- xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
- xmlns:ping="http://ggf.org/ns/nmwg/tools/ping/2.0/";
- xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";>
-
-
- <nmwg:metadata id="m1">
- <ping:subject id="sub1">
- <nmwgt:endPointPair>
- <nmwgt:src type="ipv4" value="222.22.22.22"/>
- <nmwgt:dst type="ipv4" value="111.11.11.11"/>
- </nmwgt:endPointPair>
- </ping:subject>
-
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/ping/2.0</nmwg:eventType>
- </nmwg:metadata>
-
-
- <nmwg:data id="d1" metadataIdRef="m1"/>
-
-
-</nmwg:message>
\ No newline at end of file

Deleted:
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-Ping-2.xml
===================================================================
---
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-Ping-2.xml
2012-11-30 11:48:50 UTC (rev 6046)
+++
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-Ping-2.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<nmwg:message type="MetadataKeyRequest"
- id="metadataKeyRequest1"
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
- xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
- xmlns:ping="http://ggf.org/ns/nmwg/tools/ping/2.0/";
- xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";>
-
-
- <!-- fetching all -->
-
- <nmwg:metadata id="m1">
- <ping:subject id="sub1">
- <nmwgt:endPointPair>
- </nmwgt:endPointPair>
- </ping:subject>
-
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/ping/2.0</nmwg:eventType>
- </nmwg:metadata>
-
-
- <nmwg:data id="d1" metadataIdRef="m1"/>
-
-
-</nmwg:message>
\ No newline at end of file

Deleted:
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-Utilization-1.xml
===================================================================
---
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-Utilization-1.xml
2012-11-30 11:48:50 UTC (rev 6046)
+++
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-Utilization-1.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,38 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<!-- Purpose: Requesting data from a partial metadata request. -->
-<!-- Version: $Id$ -->
-
-<nmwg:message type="MetadataKeyRequest"
- id="mdrq1"
-
xmlns:netutil="http://ggf.org/ns/nmwg/characteristic/utilization/2.0/";
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
- xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
-
-
-<!-- Metadata sent in - can be partially specified.
- The response should fill it in. The response will point
- at "key" versions of the metadata. Those versions will reference
- completely filled in metadata blocks. -->
-
- <nmwg:metadata id="meta1">
- <netutil:subject id="subj1">
- <nmwgt:interface>
- <nmwgt:ifAddress type="ipv4">10.1.2.3</nmwgt:ifAddress>
- <nmwgt:hostName>test-hostName</nmwgt:hostName>
- </nmwgt:interface>
- </netutil:subject>
-
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:eventType>
- <!-- The parameter 'keyword' can be also used as a filter -->
- <!-- but only if the interface (<nmwgt:interface></nmwgt:interface>)
filter is not empty. -->
- <!--
- <nmwg:parameters id="params1">
- <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
- </nmwg:parameters>
- -->
- </nmwg:metadata>
-
- <!-- This is the specific data we wish to see -->
- <nmwg:data id="1" metadataIdRef="meta1"/>
-
-</nmwg:message>

Deleted:
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-Utilization-2.xml
===================================================================
---
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-Utilization-2.xml
2012-11-30 11:48:50 UTC (rev 6046)
+++
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-Utilization-2.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,24 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-
-<!-- $Id$ -->
-
-<nmwg:message type="MetadataKeyRequest"
- id="mdrq1"
-
xmlns:netutil="http://ggf.org/ns/nmwg/characteristic/utilization/2.0/";
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
- xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
-
- <!-- getting all metadata for utilization -->
-
- <nmwg:metadata id="meta1">
- <netutil:subject id="subj1">
- <nmwgt:interface>
- </nmwgt:interface>
- </netutil:subject>
-
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:eventType>
- </nmwg:metadata>
-
- <nmwg:data id="1" metadataIdRef="meta1"/>
-
-</nmwg:message>

Deleted:
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-iperf-1.xml
===================================================================
---
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-iperf-1.xml
2012-11-30 11:48:50 UTC (rev 6046)
+++
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-iperf-1.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-<nmwg:message type="MetadataKeyRequest" id="metadataKeyRequest1"
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
- xmlns:iperf="http://ggf.org/ns/nmwg/tools/iperf/2.0/";
- xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
-
-
- <nmwg:metadata id="m1">
- <iperf:subject id="subject-1">
- <nmwgt:endPointPair>
- <nmwgt:src type="ipv4" value="198.32.8.170" port="5433"/>
- <nmwgt:dst type="ipv4" value="198.32.8.174" port="5433"/>
- </nmwgt:endPointPair>
- </iperf:subject>
- <nmwg:eventType>http://ggf.org/ns/nmwg/tools/iperf/2.0</nmwg:eventType>
- <!--
- <nmwg:parameters id="parameters-1">
- <nmwg:parameter name="protocol">TCP</nmwg:parameter>
- </nmwg:parameters>
- -->
- </nmwg:metadata>
-
- <nmwg:data id="d1" metadataIdRef="m1" />
-
-
-</nmwg:message>

Deleted:
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-iperf-2.xml
===================================================================
---
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-iperf-2.xml
2012-11-30 11:48:50 UTC (rev 6046)
+++
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-iperf-2.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,37 +0,0 @@
-<?xml version="1.0"?>
-<nmwg:message type="MetadataKeyRequest" id="metadataKeyRequest1"
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
- xmlns:iperf="http://ggf.org/ns/nmwg/tools/iperf/2.0/";
- xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
- xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
- xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";>
-
-
- <nmwg:metadata id="m1">
- <iperf:subject id="subject-1">
- <nmwgt:endPointPair>
- <nmwgt:src type="ipv4" value="198.32.8.170" port="5433"/>
- <nmwgt:dst type="ipv4" value="198.32.8.174" port="5433"/>
- </nmwgt:endPointPair>
- </iperf:subject>
- <nmwg:eventType>http://ggf.org/ns/nmwg/tools/iperf/2.0</nmwg:eventType>
- <!--
- <nmwg:parameters id="parameters-1">
- <nmwg:parameter name="protocol">TCP</nmwg:parameter>
- </nmwg:parameters>
- -->
- </nmwg:metadata>
-
- <nmwg:metadata id="m1c">
- <select:subject id="s1c" metadataIdRef="m1"/>
- <select:parameters id="p1c">
- <nmwg:parameter name="startTime"
type="unix">1105452600</nmwg:parameter>
- <nmwg:parameter name="endTime">1105453100</nmwg:parameter>
- </select:parameters>
- <nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>
- </nmwg:metadata>
-
- <nmwg:data id="d1" metadataIdRef="m1c"/>
-
-
-</nmwg:message>

Deleted:
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-iperf-3.xml
===================================================================
---
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-iperf-3.xml
2012-11-30 11:48:50 UTC (rev 6046)
+++
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-iperf-3.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<nmwg:message type="MetadataKeyRequest" id="metadataKeyRequest1"
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
-
-
- <nmwg:metadata id="m1">
- <nmwg:key id="k1">
- <nmwg:parameters id="p1">
- <nmwg:parameter
name="eventType">http://ggf.org/ns/nmwg/tools/iperf/2.0</nmwg:parameter>
- <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-iperf.xml</nmwg:parameter>
- <nmwg:parameter name="metadataId">meta1-iperf-test</nmwg:parameter>
- </nmwg:parameters>
- </nmwg:key>
- </nmwg:metadata>
-
- <nmwg:data id="d1" metadataIdRef="m1" />
-
-
-</nmwg:message>

Deleted:
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-iperf-4.xml
===================================================================
---
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-iperf-4.xml
2012-11-30 11:48:50 UTC (rev 6046)
+++
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-iperf-4.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<nmwg:message type="MetadataKeyRequest" id="metadataKeyRequest1"
- xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
-
- <nmwg:metadata id="m1">
- <nmwg:key id="k1">
- <nmwg:parameters id="p1">
- <nmwg:parameter
name="eventType">http://ggf.org/ns/nmwg/tools/iperf/2.0</nmwg:parameter>
- <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-iperf.xml</nmwg:parameter>
- <nmwg:parameter name="metadataId">meta1-iperf-test</nmwg:parameter>
- </nmwg:parameters>
- </nmwg:key>
- </nmwg:metadata>
-
- <nmwg:metadata id="m1c">
- <select:subject id="s1c" metadataIdRef="m1"/>
- <select:parameters id="p1c">
- <nmwg:parameter name="startTime">1105452600</nmwg:parameter>
- <nmwg:parameter name="endTime">1105453100</nmwg:parameter>
- </select:parameters>
- <nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>
- </nmwg:metadata>
-
- <nmwg:data id="d1" metadataIdRef="m1c"/>
-
-
-</nmwg:message>

Deleted:
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-iperf-5.xml
===================================================================
---
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-iperf-5.xml
2012-11-30 11:48:50 UTC (rev 6046)
+++
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-iperf-5.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<nmwg:message type="MetadataKeyRequest" id="metadataKeyRequest1"
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
- xmlns:iperf="http://ggf.org/ns/nmwg/tools/iperf/2.0/";
- xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
-
-
- <!-- fetching all -->
-
- <nmwg:metadata id="m1">
- <iperf:subject id="subject-1">
- <nmwgt:endPointPair>
- </nmwgt:endPointPair>
- </iperf:subject>
- <nmwg:eventType>http://ggf.org/ns/nmwg/tools/iperf/2.0</nmwg:eventType>
- </nmwg:metadata>
-
- <nmwg:data id="d1" metadataIdRef="m1" />
-
-
-</nmwg:message>

Deleted:
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-owamp-1.xml
===================================================================
---
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-owamp-1.xml
2012-11-30 11:48:50 UTC (rev 6046)
+++
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-owamp-1.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-<nmwg:message type="MetadataKeyRequest"
- id="metadataKeyRequest1"
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
- xmlns:owamp="http://ggf.org/ns/nmwg/tools/owamp/2.0/";
- xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
-
-
- <nmwg:metadata id="meta1">
- <owamp:subject id="subject-1">
- <nmwgt:endPointPair>
- </nmwgt:endPointPair>
- </owamp:subject>
- <nmwg:eventType>http://ggf.org/ns/nmwg/tools/owamp/2.0
- </nmwg:eventType>
- </nmwg:metadata>
-
- <nmwg:data id="data1" metadataIdRef="meta1" />
-
-</nmwg:message>
-
-

Deleted:
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-owamp-2.xml
===================================================================
---
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-owamp-2.xml
2012-11-30 11:48:50 UTC (rev 6046)
+++
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-owamp-2.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<nmwg:message type="MetadataKeyRequest"
- id="metadataKeyRequest1"
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
- xmlns:owamp="http://ggf.org/ns/nmwg/tools/owamp/2.0/";
- xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
-
-
- <nmwg:metadata id="meta1">
- <owamp:subject id="subject-1">
- <nmwgt:endPointPair>
- <nmwgt:src type="ipv4" value="222.22.22.22" />
- <nmwgt:dst type="ipv4" value="111.11.11.11" />
- </nmwgt:endPointPair>
- </owamp:subject>
- <nmwg:eventType>http://ggf.org/ns/nmwg/tools/owamp/2.0
- </nmwg:eventType>
- </nmwg:metadata>
-
- <nmwg:data id="data1" metadataIdRef="meta1" />
-
-</nmwg:message>
-
-

Deleted:
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-Discards-1.xml
===================================================================
---
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-Discards-1.xml
2012-11-30 11:48:50 UTC (rev 6046)
+++
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-Discards-1.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<nmwg:message type="SetupDataRequest"
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
-
xmlns:discards="http://ggf.org/ns/nmwg/characteristic/discards/2.0/";
- xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
- xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";>
-
-
- <nmwg:metadata id="m1">
- <discards:subject id="s1">
- <nmwgt:interface>
- <nmwgt:ifAddress type="ipv4">10.1.2.3</nmwgt:ifAddress>
- <nmwgt:ifName>test-0</nmwgt:ifName>
- <nmwgt:direction>in</nmwgt:direction>
- </nmwgt:interface>
- </discards:subject>
-
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/discards/2.0</nmwg:eventType>
- </nmwg:metadata>
-
- <nmwg:metadata id="m2">
- <select:subject id="s2" metadataIdRef="m1"/>
- <nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>
- <select:parameters id="sp1">
- <nmwg:parameter name="startTime">1187948870</nmwg:parameter>
- <nmwg:parameter name="endTime">1187948888</nmwg:parameter>
- </select:parameters>
- </nmwg:metadata>
-
- <nmwg:data id="d1" metadataIdRef="m2"/>
-
-
-</nmwg:message>
\ No newline at end of file

Deleted:
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-Errors-1.xml
===================================================================
---
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-Errors-1.xml
2012-11-30 11:48:50 UTC (rev 6046)
+++
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-Errors-1.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<nmwg:message type="SetupDataRequest"
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
-
xmlns:errors="http://ggf.org/ns/nmwg/characteristic/errors/2.0/";
- xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
- xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";>
-
-
- <nmwg:metadata id="m1">
- <errors:subject id="s1">
- <nmwgt:interface>
- <nmwgt:ifAddress type="ipv4">10.1.2.3</nmwgt:ifAddress>
- <nmwgt:ifName>test-0</nmwgt:ifName>
- <nmwgt:direction>in</nmwgt:direction>
- </nmwgt:interface>
- </errors:subject>
-
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/errors/2.0</nmwg:eventType>
- </nmwg:metadata>
-
- <nmwg:metadata id="m2">
- <select:subject id="s2" metadataIdRef="m1"/>
- <nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>
- <select:parameters id="sp1">
- <nmwg:parameter name="startTime">1187948870</nmwg:parameter>
- <nmwg:parameter name="endTime">1187948888</nmwg:parameter>
- </select:parameters>
- </nmwg:metadata>
-
- <nmwg:data id="d1" metadataIdRef="m2"/>
-
-
-</nmwg:message>
\ No newline at end of file

Deleted:
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-L2Status-1.xml
===================================================================
---
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-L2Status-1.xml
2012-11-30 11:48:50 UTC (rev 6046)
+++
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-L2Status-1.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,31 +0,0 @@
-<nmwg:message type="SetupDataRequest"
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
- xmlns:nmtl2="http://ggf.org/ns/nmwg/topology/l2/3.0/";
- xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";>
-
-
-
- <nmwg:metadata id="meta1">
- <nmwg:subject id="subject1">
- <nmtl2:link>
- <nmtl2:globalName
type="logical">PSNC-DFN-MUE-003</nmtl2:globalName>
- </nmtl2:link>
- </nmwg:subject>
- <nmwg:eventType>Path.Status</nmwg:eventType>
- </nmwg:metadata>
-
-
- <nmwg:metadata id="meta2">
- <select:subject id="iusub2" metadataIdRef="meta1"/>
- <select:parameters id="param1">
- <nmwg:parameter name="time">now</nmwg:parameter>
- </select:parameters>
-
<nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>
- </nmwg:metadata>
-
-
-
- <nmwg:data id="data1" metadataIdRef="meta2"/>
-
-
- </nmwg:message>
\ No newline at end of file

Deleted:
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-L2Status-2.xml
===================================================================
---
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-L2Status-2.xml
2012-11-30 11:48:50 UTC (rev 6046)
+++
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-L2Status-2.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,32 +0,0 @@
-<nmwg:message type="SetupDataRequest"
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
- xmlns:nmtl2="http://ggf.org/ns/nmwg/topology/l2/3.0/";
- xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";>
-
-
-
- <nmwg:metadata id="meta1">
- <nmwg:subject id="subject1">
- <nmtl2:link>
- <nmtl2:globalName
type="logical">PSNC-DFN-MUE-003</nmtl2:globalName>
- </nmtl2:link>
- </nmwg:subject>
- <nmwg:eventType>Path.Status</nmwg:eventType>
- </nmwg:metadata>
-
-
- <nmwg:metadata id="meta2">
- <select:subject id="iusub2" metadataIdRef="meta1"/>
- <select:parameters id="param1">
- <nmwg:parameter name="startTime">1144318523</nmwg:parameter>
- <nmwg:parameter name="endTime">1147960133</nmwg:parameter>
- </select:parameters>
-
<nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>
- </nmwg:metadata>
-
-
-
- <nmwg:data id="data1" metadataIdRef="meta2"/>
-
-
- </nmwg:message>
\ No newline at end of file

Deleted:
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-L2Status-3.xml
===================================================================
---
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-L2Status-3.xml
2012-11-30 11:48:50 UTC (rev 6046)
+++
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-L2Status-3.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,54 +0,0 @@
-<nmwg:message type="SetupDataRequest"
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
- xmlns:nmtl2="http://ggf.org/ns/nmwg/topology/l2/3.0/";
- xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
- xmlns:nmwgtopo3="http://ggf.org/ns/nmwg/topology/base/3.0/";>
-
-
- <nmwg:metadata id="meta1">
- <nmwg:subject id="subject1">
- <nmtl2:link>
-
- <!--
- <nmwgtopo3:node>
- <nmwgtopo3:name type="logical">DFN-LRZ</nmwgtopo3:name>
- <nmwgtopo3:country>Germany</nmwgtopo3:country>
- <nmwgtopo3:city>Munich</nmwgtopo3:city>
- <nmwgtopo3:institution>Leibniz
Rechenzentrum</nmwgtopo3:institution>
- <nmwgtopo3:role>EndPoint</nmwgtopo3:role>
- </nmwgtopo3:node>
- -->
-
- <nmwgtopo3:node>
- <nmwgtopo3:name type="logical">PSNC-PL</nmwgtopo3:name>
- <nmwgtopo3:country>Poland</nmwgtopo3:country>
- <nmwgtopo3:city>Poznan</nmwgtopo3:city>
- <nmwgtopo3:institution>PSNC</nmwgtopo3:institution>
- </nmwgtopo3:node>
-
- <nmwgtopo3:node>
- <nmwgtopo3:name type="logical">DFN-MUE</nmwgtopo3:name>
- <nmwgtopo3:country>Germany</nmwgtopo3:country>
- <nmwgtopo3:city>Muenster</nmwgtopo3:city>
- <nmwgtopo3:institution>DFN-Verein</nmwgtopo3:institution>
- </nmwgtopo3:node>
-
- </nmtl2:link>
- </nmwg:subject>
- <nmwg:eventType>Path.Status</nmwg:eventType>
- </nmwg:metadata>
-
-
- <nmwg:metadata id="meta2">
- <select:subject id="iusub2" metadataIdRef="meta1"/>
- <select:parameters id="param1">
- <nmwg:parameter name="time">now</nmwg:parameter>
- </select:parameters>
-
<nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>
- </nmwg:metadata>
-
-
- <nmwg:data id="data1" metadataIdRef="meta2"/>
-
-
- </nmwg:message>
\ No newline at end of file

Deleted:
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-L2Status-4.xml
===================================================================
---
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-L2Status-4.xml
2012-11-30 11:48:50 UTC (rev 6046)
+++
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-L2Status-4.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<nmwg:message type="SetupDataRequest"
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
- xmlns:nmtl2="http://ggf.org/ns/nmwg/topology/l2/3.0/";
- xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
- xmlns:nmwgtopo3="http://ggf.org/ns/nmwg/topology/base/3.0/";>
-
-
- <nmwg:metadata id="meta1">
- <nmwg:subject id="subject1">
- <nmtl2:link>
-
- <nmwgtopo3:node>
- <nmwgtopo3:name type="logical">PSNC-PL</nmwgtopo3:name>
- <nmwgtopo3:country>Poland</nmwgtopo3:country>
- <nmwgtopo3:city>Poznan</nmwgtopo3:city>
- <nmwgtopo3:institution>PSNC</nmwgtopo3:institution>
- </nmwgtopo3:node>
-
- <nmwgtopo3:node>
- <nmwgtopo3:name type="logical">DFN-MUE</nmwgtopo3:name>
- <nmwgtopo3:country>Germany</nmwgtopo3:country>
- <nmwgtopo3:city>Muenster</nmwgtopo3:city>
- <nmwgtopo3:institution>DFN-Verein</nmwgtopo3:institution>
- </nmwgtopo3:node>
-
- </nmtl2:link>
- </nmwg:subject>
- <nmwg:eventType>Path.Status</nmwg:eventType>
- </nmwg:metadata>
-
-
- <nmwg:metadata id="meta2">
- <select:subject id="iusub2" metadataIdRef="meta1"/>
- <select:parameters id="param1">
- <nmwg:parameter name="startTime">1144318523</nmwg:parameter>
- <nmwg:parameter name="endTime">1147960133</nmwg:parameter>
- </select:parameters>
-
<nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>
- </nmwg:metadata>
-
-
- <nmwg:data id="data1" metadataIdRef="meta2"/>
-
-
- </nmwg:message>
\ No newline at end of file

Deleted:
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-L2Status-5.xml
===================================================================
---
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-L2Status-5.xml
2012-11-30 11:48:50 UTC (rev 6046)
+++
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-L2Status-5.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<nmwg:message type="SetupDataRequest"
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
- xmlns:nmtl2="http://ggf.org/ns/nmwg/topology/l2/3.0/";
- xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";>
-
-
- <nmwg:metadata id="meta1">
- <nmwg:key id="localhost.517272ee:10c24fb1ce1:-7ff0">
- <nmwg:parameters id="localhost.517272ee:10c24fb1ce1:-7fef">
- <nmwg:parameter
name="pathId">PSNC-DFN-MUE-Link-1001</nmwg:parameter>
- <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-L2-status-domain.xml</nmwg:parameter>
- <nmwg:parameter name="eventType">Path.Status</nmwg:parameter>
- </nmwg:parameters>
- </nmwg:key>
- </nmwg:metadata>
-
-
- <nmwg:metadata id="meta2">
- <select:subject id="iusub2" metadataIdRef="meta1"/>
- <select:parameters id="param1">
- <nmwg:parameter name="time">now</nmwg:parameter>
- </select:parameters>
-
<nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>
- </nmwg:metadata>
-
-
-
- <nmwg:data id="data1" metadataIdRef="meta2"/>
-
-
-</nmwg:message>

Deleted:
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-L2Status-6.xml
===================================================================
---
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-L2Status-6.xml
2012-11-30 11:48:50 UTC (rev 6046)
+++
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-L2Status-6.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<nmwg:message type="SetupDataRequest"
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
- xmlns:nmtl2="http://ggf.org/ns/nmwg/topology/l2/3.0/";
- xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";>
-
-
- <nmwg:metadata id="meta1">
- <nmwg:eventType>Path.Status</nmwg:eventType>
- </nmwg:metadata>
-
-
- <nmwg:data id="data1" metadataIdRef="meta1"/>
-
-
-</nmwg:message>
\ No newline at end of file

Deleted:
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-Ping-1.xml
===================================================================
--- trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-Ping-1.xml
2012-11-30 11:48:50 UTC (rev 6046)
+++ trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-Ping-1.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<nmwg:message type="SetupDataRequest"
- id="setupDataRequest1"
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
- xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
- xmlns:ping="http://ggf.org/ns/nmwg/tools/ping/2.0/";
- xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";>
-
-
- <nmwg:metadata id="m1">
- <ping:subject id="sub1">
- <nmwgt:endPointPair>
- <nmwgt:src type="ipv4" value="222.22.22.22"/>
- <nmwgt:dst type="ipv4" value="111.11.11.11"/>
- </nmwgt:endPointPair>
- </ping:subject>
-
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/ping/2.0</nmwg:eventType>
- </nmwg:metadata>
-
- <nmwg:metadata id="m2">
- <select:subject id="iusub2" metadataIdRef="m1"/>
- <select:parameters id="param1">
- <nmwg:parameter name="startTime">1216644761</nmwg:parameter>
- <nmwg:parameter name="endTime">1216644790</nmwg:parameter>
- <!--
- <nmwg:parameter name="startTime">
- <nmtm:time type="ISO" value="2005-07-16T00:00:00Z"/>
- </nmwg:parameter>
- <nmwg:parameter name="endTime">
- <nmtm:time type="ISO" value="2005-07-21T00:00:00Z"/>
- </nmwg:parameter>
- -->
- </select:parameters>
-
<nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>
- </nmwg:metadata>
-
- <nmwg:data id="d1" metadataIdRef="m2"/>
-
-
-</nmwg:message>
\ No newline at end of file

Deleted:
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-Ping-2.xml
===================================================================
--- trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-Ping-2.xml
2012-11-30 11:48:50 UTC (rev 6046)
+++ trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-Ping-2.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<nmwg:message type="SetupDataRequest"
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
-
-
- <nmwg:metadata id="m1">
- <nmwg:key id="k1">
- <nmwg:parameters id="p1">
- <nmwg:parameter name="eventType"
value="http://ggf.org/ns/nmwg/tools/ping/2.0"/>
- <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-clmp-ping.xml</nmwg:parameter>
- <nmwg:parameter name="metadataId">ping-meta1</nmwg:parameter>
- </nmwg:parameters>
- </nmwg:key>
- </nmwg:metadata>
-
-
- <nmwg:data id="d1" metadataIdRef="m1"/>
-
-
-</nmwg:message>
\ No newline at end of file

Deleted:
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-Utilization-1.xml
===================================================================
---
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-Utilization-1.xml
2012-11-30 11:48:50 UTC (rev 6046)
+++
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-Utilization-1.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,62 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<!-- Purpose: We send down metadata (no key) and some filter parameters,
- we hope to get back just data. -->
-<!-- Version: $Id$ -->
-
-<nmwg:message id="msg4"
- type="SetupDataRequest"
-
xmlns:netutil="http://ggf.org/ns/nmwg/characteristic/utilization/2.0/";
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
- xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
- xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
- xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";>
-
-
- <nmwg:metadata id="meta1">
- <netutil:subject id="iusub1">
- <nmwgt:interface>
-
- <nmwgt:ifAddress type="ipv4">10.1.2.3</nmwgt:ifAddress>
- <nmwgt:direction>in</nmwgt:direction>
- <nmwgt:hostName>test-hostName</nmwgt:hostName>
- <nmwgt:ifName>test-0</nmwgt:ifName>
- <nmwgt:authRealm>TestRealm</nmwgt:authRealm>
- <nmwgt:capacity>1000BaseT</nmwgt:capacity>
-
- </nmwgt:interface>
- </netutil:subject>
-
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:eventType>
- </nmwg:metadata>
-
-
- <!-- The second metadata is used to filter the results of the first
operation,
- this basically means our 'subject' is the first metadata block, then
we
- apply a parameter block to limit/transform the resulting data. -->
- <nmwg:metadata id="meta2">
- <select:subject id="iusub2" metadataIdRef="meta1"/>
-
- <select:parameters id="param1">
-
- <nmwg:parameter name="startTime">1121472000</nmwg:parameter>
- <nmwg:parameter name="endTime">1121904000</nmwg:parameter>
- <!--
- <nmwg:parameter name="startTime">
- <nmtm:time type="ISO" value="2005-07-16T00:00:00Z"/>
- </nmwg:parameter>
- <nmwg:parameter name="endTime">
- <nmtm:time type="ISO" value="2005-07-21T00:00:00Z"/>
- </nmwg:parameter>
- -->
- <nmwg:parameter name="consolidationFunction">AVERAGE</nmwg:parameter>
- <nmwg:parameter name="resolution">60</nmwg:parameter>
- </select:parameters>
-
- <nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>
-
- </nmwg:metadata>
-
- <!-- This is the specific data we wish to see -->
- <nmwg:data id="data1" metadataIdRef="meta2"/>
-
-</nmwg:message>

Deleted:
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-Utilization-2.xml
===================================================================
---
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-Utilization-2.xml
2012-11-30 11:48:50 UTC (rev 6046)
+++
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-Utilization-2.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,39 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-
-<!-- $Id$ -->
-
-<!-- example for SQL MA -->
-
-
-<nmwg:message type="SetupDataRequest"
- id="mdrq1"
-
xmlns:netutil="http://ggf.org/ns/nmwg/characteristic/utilization/2.0/";
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
- xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
- xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";>
-
-
- <nmwg:metadata id="meta1">
- <nmwg:key id="localhost.648d2dab:10c33bffe91:-7fa9">
- <nmwg:parameters id="localhost.648d2dab:10c33bffe91:-7fa8">
- <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-utilization.xml</nmwg:parameter>
- <nmwg:parameter name="metadataId">meta1-test</nmwg:parameter>
- <nmwg:parameter
name="eventType">http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:parameter>
- </nmwg:parameters>
- </nmwg:key>
- </nmwg:metadata>
-
-
- <nmwg:metadata id="meta2">
- <select:subject id="iusub2" metadataIdRef="meta1"/>
- <select:parameters id="param1">
- <nmwg:parameter name="time">now</nmwg:parameter>
- </select:parameters>
- <nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>
- </nmwg:metadata>
-
-
- <nmwg:data id="1" metadataIdRef="meta2"/>
-
-</nmwg:message>

Deleted:
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-Utilization-3.xml
===================================================================
---
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-Utilization-3.xml
2012-11-30 11:48:50 UTC (rev 6046)
+++
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-Utilization-3.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,57 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-
-<!-- $Id$ -->
-
-<!-- example for SQL MA -->
-
-
-<nmwg:message type="SetupDataRequest"
- id="mdrq1"
-
xmlns:netutil="http://ggf.org/ns/nmwg/characteristic/utilization/2.0/";
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
- xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
- xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
- xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";>
-
-
- <nmwg:metadata id="meta1">
- <nmwg:key id="localhost.648d2dab:10c33bffe91:-7fa9">
- <nmwg:parameters id="localhost.648d2dab:10c33bffe91:-7fa8">
- <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-utilization.xml</nmwg:parameter>
- <nmwg:parameter name="metadataId">meta1-test</nmwg:parameter>
- <nmwg:parameter
name="eventType">http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:parameter>
- </nmwg:parameters>
- </nmwg:key>
- </nmwg:metadata>
-
-
- <nmwg:metadata id="meta2">
- <select:subject id="iusub2" metadataIdRef="meta1"/>
- <select:parameters id="param1">
- <!--
- <nmwg:parameter name="startTime">
- <nmtm:time type="ISO" value="2006-03-22T13:38:24Z"/>
- </nmwg:parameter>
- <nmwg:parameter name="endTime">
- <nmtm:time type="ISO" value="2006-03-22T13:38:26Z"/>
- </nmwg:parameter>
- -->
- <!--
- <nmwg:parameter name="startTime">
- <nmtm:time type="unix" value="1143034704"/>
- </nmwg:parameter>
- <nmwg:parameter name="endTime">
- <nmtm:time type="unix" value="1143034706"/>
- </nmwg:parameter>
- -->
- <nmwg:parameter name="startTime">1143034704</nmwg:parameter>
- <nmwg:parameter name="endTime">1143034706</nmwg:parameter>
- </select:parameters>
- <nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>
- </nmwg:metadata>
-
-
- <nmwg:data id="1" metadataIdRef="meta2"/>
-
-</nmwg:message>

Deleted:
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-iperf-1.xml
===================================================================
--- trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-iperf-1.xml
2012-11-30 11:48:50 UTC (rev 6046)
+++ trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-iperf-1.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-<nmwg:message type="SetupDataRequest"
- id="setupDataRequest1"
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
- xmlns:iperf="http://ggf.org/ns/nmwg/tools/iperf/2.0/";
- xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
-
-
- <nmwg:metadata id="m1">
- <iperf:subject id="subject-1">
- <nmwgt:endPointPair>
- <nmwgt:src type="ipv4" value="198.32.8.170" port="5433"/>
- <nmwgt:dst type="ipv4" value="198.32.8.174" port="5433"/>
- </nmwgt:endPointPair>
- </iperf:subject>
- <nmwg:eventType>http://ggf.org/ns/nmwg/tools/iperf/2.0</nmwg:eventType>
- <!--
- <nmwg:parameters id="parameters-1">
- <nmwg:parameter name="protocol">TCP</nmwg:parameter>
- </nmwg:parameters>
- -->
- </nmwg:metadata>
-
- <nmwg:data id="d1" metadataIdRef="m1" />
-
-
-</nmwg:message>

Deleted:
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-iperf-2.xml
===================================================================
--- trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-iperf-2.xml
2012-11-30 11:48:50 UTC (rev 6046)
+++ trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-iperf-2.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,38 +0,0 @@
-<?xml version="1.0"?>
-<nmwg:message type="SetupDataRequest"
- id="setupDataRequest1"
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
- xmlns:iperf="http://ggf.org/ns/nmwg/tools/iperf/2.0/";
- xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
- xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
- xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";>
-
-
- <nmwg:metadata id="m1">
- <iperf:subject id="subject-1">
- <nmwgt:endPointPair>
- <nmwgt:src type="ipv4" value="198.32.8.170" port="5433"/>
- <nmwgt:dst type="ipv4" value="198.32.8.174" port="5433"/>
- </nmwgt:endPointPair>
- </iperf:subject>
- <nmwg:eventType>http://ggf.org/ns/nmwg/tools/iperf/2.0</nmwg:eventType>
- <!--
- <nmwg:parameters id="parameters-1">
- <nmwg:parameter name="protocol">TCP</nmwg:parameter>
- </nmwg:parameters>
- -->
- </nmwg:metadata>
-
- <nmwg:metadata id="m1c">
- <select:subject id="s1c" metadataIdRef="m1"/>
- <select:parameters id="p1c">
- <nmwg:parameter name="startTime">1105452600</nmwg:parameter>
- <nmwg:parameter name="endTime">1105453100</nmwg:parameter>
- </select:parameters>
- <nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>
- </nmwg:metadata>
-
- <nmwg:data id="d1" metadataIdRef="m1c"/>
-
-
-</nmwg:message>

Deleted:
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-iperf-3.xml
===================================================================
--- trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-iperf-3.xml
2012-11-30 11:48:50 UTC (rev 6046)
+++ trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-iperf-3.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<nmwg:message type="SetupDataRequest"
- id="setupDataRequest1"
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
-
-
- <nmwg:metadata id="m1">
- <nmwg:key id="k1">
- <nmwg:parameters id="p1">
- <nmwg:parameter
name="eventType">http://ggf.org/ns/nmwg/tools/iperf/2.0</nmwg:parameter>
- <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-iperf.xml</nmwg:parameter>
- <nmwg:parameter name="metadataId">meta1-iperf-test</nmwg:parameter>
- </nmwg:parameters>
- </nmwg:key>
- </nmwg:metadata>
-
- <nmwg:data id="d1" metadataIdRef="m1" />
-
-
-</nmwg:message>

Deleted:
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-iperf-4.xml
===================================================================
--- trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-iperf-4.xml
2012-11-30 11:48:50 UTC (rev 6046)
+++ trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-iperf-4.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<nmwg:message type="SetupDataRequest"
- id="setupDataRequest1"
- xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
-
- <nmwg:metadata id="m1">
- <nmwg:key id="k1">
- <nmwg:parameters id="p1">
- <nmwg:parameter
name="eventType">http://ggf.org/ns/nmwg/tools/iperf/2.0</nmwg:parameter>
- <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-iperf.xml</nmwg:parameter>
- <nmwg:parameter name="metadataId">meta1-iperf-test</nmwg:parameter>
- </nmwg:parameters>
- </nmwg:key>
- </nmwg:metadata>
-
- <nmwg:metadata id="m1c">
- <select:subject id="s1c" metadataIdRef="m1"/>
- <select:parameters id="p1c">
- <nmwg:parameter name="startTime">1105452600</nmwg:parameter>
- <nmwg:parameter name="endTime">1105453100</nmwg:parameter>
- </select:parameters>
- <nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>
- </nmwg:metadata>
-
- <nmwg:data id="d1" metadataIdRef="m1c"/>
-
-
-</nmwg:message>

Deleted:
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-iperf-5.xml
===================================================================
--- trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-iperf-5.xml
2012-11-30 11:48:50 UTC (rev 6046)
+++ trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-iperf-5.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-<nmwg:message type="SetupDataRequest"
- id="setuDataRequest1"
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
- xmlns:iperf="http://ggf.org/ns/nmwg/tools/iperf/2.0/";
- xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
-
-
- <!-- fetching all -->
-
- <nmwg:metadata id="m1">
- <iperf:subject id="subject-1">
- <nmwgt:endPointPair>
- </nmwgt:endPointPair>
- </iperf:subject>
- <nmwg:eventType>http://ggf.org/ns/nmwg/tools/iperf/2.0</nmwg:eventType>
- </nmwg:metadata>
-
- <nmwg:data id="d1" metadataIdRef="m1" />
-
-
-</nmwg:message>

Deleted:
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-owamp-1.xml
===================================================================
--- trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-owamp-1.xml
2012-11-30 11:48:50 UTC (rev 6046)
+++ trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-owamp-1.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,22 +0,0 @@
-<nmwg:message type="SetupDataRequest" id="datarq2-1"
- xmlns="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";
- xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
- xmlns:owamp="http://ggf.org/ns/nmwg/tools/owamp/2.0/";
- xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";
- xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
- xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
-
- <nmwg:metadata id="meta1">
- <owamp:subject id="subj1">
- <nmwgt:endPointPair>
- <nmwgt:src type="ipv4" value="222.22.22.22"
/> <!-- The host where is OWAMP M -->
- <nmwgt:dst type="ipv4" value="111.11.11.11"
/> <!-- destination host -->
- </nmwgt:endPointPair>
- </owamp:subject>
-
-
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/owamp/2.0</nmwg:eventType>
- </nmwg:metadata>
- <nmwg:data id="1" metadataIdRef="meta1" />
-
-</nmwg:message>
\ No newline at end of file

Deleted:
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-owamp-2.xml
===================================================================
--- trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-owamp-2.xml
2012-11-30 11:48:50 UTC (rev 6046)
+++ trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-owamp-2.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,27 +0,0 @@
-<nmwg:message type="SetupDataRequest" id="datarq2-1"
- xmlns="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";
- xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
- xmlns:owamp="http://ggf.org/ns/nmwg/tools/owamp/2.0/";
- xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";
- xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
- xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
-
- <nmwg:metadata id="meta1">
- <owamp:subject id="sub1">
- <nmwgt:endPointPair>
- <nmwgt:src type="ipv4" value="222.22.22.21" />
- <nmwgt:dst type="ipv4" value="111.11.11.12" />
- </nmwgt:endPointPair>
- </owamp:subject>
-
- <owamp:parameters id="param1">
- <nmwg:parameter name="direction">to</nmwg:parameter>
- <nmwg:parameter
name="output">summary</nmwg:parameter><!--It is parameter for summary
request. It is very important that this parameter has this format -->
- </owamp:parameters>
-
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/owamp/2.0</nmwg:eventType>
- </nmwg:metadata>
-
- <nmwg:data id="1" metadataIdRef="meta1" />
-
-</nmwg:message>
\ No newline at end of file

Deleted: trunk/perfsonar-java-sql-ma/samples/responses/EchoResponse.xml
===================================================================
--- trunk/perfsonar-java-sql-ma/samples/responses/EchoResponse.xml
2012-11-30 11:48:50 UTC (rev 6046)
+++ trunk/perfsonar-java-sql-ma/samples/responses/EchoResponse.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<nmwg:message id="id1_resp"
- messageIdRef="id1"
- type="EchoResponse"
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
- <nmwg:metadata id="resultCodeMetadata">
- <nmwg:eventType>success.echo</nmwg:eventType>
- </nmwg:metadata>
- <nmwg:data id="resultDescriptionData_for_resultCodeMetadata"
metadataIdRef="resultCodeMetadata">
- <nmwgr:datum xmlns:nmwgr="http://ggf.org/ns/nmwg/result/2.0/";>
- This is the echo response from the service.
- </nmwgr:datum>
- </nmwg:data>
-</nmwg:message>

Deleted:
trunk/perfsonar-java-sql-ma/samples/responses/MeasurementArchiveStoreResponse-owamp-1.xml
===================================================================
---
trunk/perfsonar-java-sql-ma/samples/responses/MeasurementArchiveStoreResponse-owamp-1.xml
2012-11-30 11:48:50 UTC (rev 6046)
+++
trunk/perfsonar-java-sql-ma/samples/responses/MeasurementArchiveStoreResponse-owamp-1.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<nmwg:message id="datarq2-1_resp"
- messageIdRef="datarq2-1"
- type="MeasurementArchiveStoreResponse"
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
-
- <nmwg:metadata id="resultCodeMetadata">
- <nmwg:eventType>success.ma.write</nmwg:eventType>
- </nmwg:metadata>
- <nmwg:data id="resultDescriptionData_for_resultCodeMetadata"
metadataIdRef="resultCodeMetadata">
- <nmwgr:datum
xmlns:nmwgr="http://ggf.org/ns/nmwg/result/2.0/";>Data have been
stored</nmwgr:datum>
- </nmwg:data>
-</nmwg:message>
\ No newline at end of file

Deleted:
trunk/perfsonar-java-sql-ma/samples/responses/MetadataKeyResponse-owamp-1.xml
===================================================================
---
trunk/perfsonar-java-sql-ma/samples/responses/MetadataKeyResponse-owamp-1.xml
2012-11-30 11:48:50 UTC (rev 6046)
+++
trunk/perfsonar-java-sql-ma/samples/responses/MetadataKeyResponse-owamp-1.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,64 +0,0 @@
-<nmwg:message
- type="MetadataKeyResponse"
- id="metadataKeyResponse1"
- messageIdRef="metadataKeyRequest1"
- xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
- xmlns:owamp="http://ggf.org/ns/nmwg/tools/owamp/2.0/";
- xmlns="http://ggf.org/ns/nmwg/base/2.0/";>
-
- <nmwg:metadata id="owamp-meta1">
- <owamp:subject id="sub1">
- <nmwgt:endPointPair>
- <nmwgt:src type="ipv4" value="222.22.22.22" />
- <nmwgt:dst type="ipv4" value="111.11.11.11" />
- </nmwgt:endPointPair>
- </owamp:subject>
-
- <owamp:parameters id="param1">
- <nmwg:parameter name="direction">to</nmwg:parameter>
- </owamp:parameters>
-
- <nmwg:eventType>http://ggf.org/ns/nmwg/tools/owamp/2.0
- </nmwg:eventType>
- </nmwg:metadata>
-
- <nmwg:metadata id="owamp-meta2">
- <owamp:subject id="sub1">
- <nmwgt:endPointPair>
- <nmwgt:src type="ipv4" value="222.22.22.21" />
- <nmwgt:dst type="ipv4" value="111.11.11.12" />
- </nmwgt:endPointPair>
- </owamp:subject>
-
- <owamp:parameters id="param1">
- <nmwg:parameter name="direction">to</nmwg:parameter>
- <nmwg:parameter
name="output">summary</nmwg:parameter><!--It is parameter for summary
request. It is very important that this parameter has this format -->
- </owamp:parameters>
-
- <nmwg:eventType>http://ggf.org/ns/nmwg/tools/owamp/2.0
- </nmwg:eventType>
- </nmwg:metadata>
-
- <nmwg:data id="data1-owamp" metadataIdRef="owamp-meta1">
- <nmwg:key>
- <nmwg:parameters>
- <nmwg:parameter
name="metadataId">owamp-meta1</nmwg:parameter>
- <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-clmp-owamp.xml</nmwg:parameter>
- </nmwg:parameters>
- </nmwg:key>
- </nmwg:data>
-
- <nmwg:data id="data2-owamp" metadataIdRef="owamp-meta2">
- <nmwg:key>
- <nmwg:parameters>
- <nmwg:parameter
name="metadataId">owamp-meta2</nmwg:parameter>
- <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-owamp-aggregation.xml</nmwg:parameter>
- </nmwg:parameters>
- </nmwg:key>
- </nmwg:data>
-
-</nmwg:message>
-
-
-

Deleted:
trunk/perfsonar-java-sql-ma/samples/responses/MetadataKeyResponse-owamp-2.xml
===================================================================
---
trunk/perfsonar-java-sql-ma/samples/responses/MetadataKeyResponse-owamp-2.xml
2012-11-30 11:48:50 UTC (rev 6046)
+++
trunk/perfsonar-java-sql-ma/samples/responses/MetadataKeyResponse-owamp-2.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,38 +0,0 @@
-<nmwg:message
- type="MetadataKeyResponse"
- id="metadataKeyResponse1"
- messageIdRef="metadataKeyRequest1"
- xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
- xmlns:owamp="http://ggf.org/ns/nmwg/tools/owamp/2.0/";
- xmlns="http://ggf.org/ns/nmwg/base/2.0/";>
-
- <nmwg:metadata id="owamp-meta1">
- <owamp:subject id="sub1">
- <nmwgt:endPointPair>
- <nmwgt:src type="ipv4" value="222.22.22.22" />
- <nmwgt:dst type="ipv4" value="111.11.11.11" />
- </nmwgt:endPointPair>
- </owamp:subject>
-
- <owamp:parameters id="param1">
- <nmwg:parameter name="direction">to</nmwg:parameter>
- </owamp:parameters>
-
- <nmwg:eventType>http://ggf.org/ns/nmwg/tools/owamp/2.0
- </nmwg:eventType>
- </nmwg:metadata>
-
- <nmwg:data id="data1-owamp" metadataIdRef="owamp-meta1">
- <nmwg:key>
- <nmwg:parameters>
- <nmwg:parameter
name="metadataId">owamp-meta1</nmwg:parameter>
- <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-clmp-owamp.xml</nmwg:parameter>
- </nmwg:parameters>
- </nmwg:key>
- </nmwg:data>
-
-</nmwg:message>
-
-
-

Deleted:
trunk/perfsonar-java-sql-ma/samples/responses/SetupDataResponse-owamp-1.xml
===================================================================
---
trunk/perfsonar-java-sql-ma/samples/responses/SetupDataResponse-owamp-1.xml
2012-11-30 11:48:50 UTC (rev 6046)
+++
trunk/perfsonar-java-sql-ma/samples/responses/SetupDataResponse-owamp-1.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,31 +0,0 @@
-<nmwg:message id="datarq2-1_resp"
- messageIdRef="datarq2-1"
- type="SetupDataResponse"
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
-
- <nmwg:metadata id="owamp-meta1">
- <owamp:subject id="sub1"
xmlns:owamp="http://ggf.org/ns/nmwg/tools/owamp/2.0/";>
- <nmwgt:endPointPair
xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
- <nmwgt:src type="ipv4" value="222.22.22.22" />
- <nmwgt:dst type="ipv4" value="111.11.11.11" />
- </nmwgt:endPointPair>
- </owamp:subject>
- <owamp:parameters id="param1"
xmlns:owamp="http://ggf.org/ns/nmwg/tools/owamp/2.0/";>
- <!-- parameters are setup in metadata xml config file. This
is only example of one type of parameters -->
- <nmwg:parameter name="direction">to</nmwg:parameter>
- </owamp:parameters>
-
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/owamp/2.0</nmwg:eventType>
- </nmwg:metadata>
-
- <nmwg:data id="data1" metadataIdRef="owamp-meta1">
- <owamp:datum receiveSynchronized="1"
receiveTime="15080301494633990766"
- receiveTimeError="1.00583E-6" sendSynchronized="1"
sendTime="15080301494378967368"
- sendTimeError="4.91142E-5" seqNum="0" ttl="243"
- xmlns:owamp="http://ggf.org/ns/nmwg/tools/owamp/2.0/";
/>
- <owamp:datum receiveSynchronized="1"
receiveTime="15080301494633990766"
- receiveTimeError="1.00483E-6" sendSynchronized="1"
sendTime="15080301494378967368"
- sendTimeError="4.81142E-5" seqNum="1" ttl="243"
- xmlns:owamp="http://ggf.org/ns/nmwg/tools/owamp/2.0/";
/>
- </nmwg:data>
-
-</nmwg:message>
\ No newline at end of file

Deleted:
trunk/perfsonar-java-sql-ma/samples/responses/SetupDataResponse-owamp-2.xml
===================================================================
---
trunk/perfsonar-java-sql-ma/samples/responses/SetupDataResponse-owamp-2.xml
2012-11-30 11:48:50 UTC (rev 6046)
+++
trunk/perfsonar-java-sql-ma/samples/responses/SetupDataResponse-owamp-2.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<nmwg:message id="datarq2-1_resp" messageIdRef="datarq2-1"
- type="SetupDataResponse"
xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
- <nmwg:metadata id="owamp-meta2">
- <owamp:subject id="sub1"
xmlns:owamp="http://ggf.org/ns/nmwg/tools/owamp/2.0/";>
- <nmwgt:endPointPair
xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
- <nmwgt:src type="ipv4" value="222.22.22.21" />
- <nmwgt:dst type="ipv4" value="111.11.11.12" />
- </nmwgt:endPointPair>
- </owamp:subject>
- <owamp:parameters id="param1"
xmlns:owamp="http://ggf.org/ns/nmwg/tools/owamp/2.0/";>
- <nmwg:parameter name="direction">to</nmwg:parameter>
- <nmwg:parameter name="output">summary</nmwg:parameter>
- </owamp:parameters>
-
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/owamp/2.0</nmwg:eventType>
- </nmwg:metadata>
- <nmwg:data id="localhost.-1c8a5775:132d4088af3:-7fcc"
metadataIdRef="owamp-meta2">
- <owamp:datum delayUnits="ms" duplicates="2" error="1.0"
- errorUnits="ms" hops="12" jitter="0.1"
jitterUnits="ms" loss="1"
- lostPercent="10.0" maxDelay="1.5" medDelay="2.0"
minDelay="1.0"
- receiver="host2" sender="host1" sent="1"
- xmlns:owamp="http://ggf.org/ns/nmwg/tools/owamp/2.0/";
/>
- </nmwg:data>
-</nmwg:message>

Copied: trunk/perfsonar-java-sql-ma/src/main/resources/i18n.properties (from
rev 6046,
trunk/perfsonar-java-sql-ma/conf/axis-1.4/WEB-INF/classes/i18n.properties)
===================================================================
--- trunk/perfsonar-java-sql-ma/src/main/resources/i18n.properties
(rev 0)
+++ trunk/perfsonar-java-sql-ma/src/main/resources/i18n.properties
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,132 @@
+############################################################
+# i18n settings for the Axis Web-Application
+#
+
+#################### [i18n global setting] #################
+#
+locales=en ja
+
+#################### [index.jsp] ###########################
+#
+
+### Header ###
+#
+language=Language
+welcomeMessage=Hello! Welcome to Apache-Axis.
+
+### Operation list ###
+#
+operationType=What do you want to do today?
+
+# Validation
+validation=Validation
+validationURL=happyaxis.jsp
+validationFootnote00=Validate the local installation's configuration
+validationFootnote01=see below if this does not work.
+
+# List
+serviceList=List
+serviceListURL=servlet/AxisServlet
+serviceListFootnote=View the list of deployed Web services
+
+# Call
+callAnEndpoint=Call
+callAnEndpointURL=EchoHeaders.jws?method=list
+callAnEndpointFootnote00=Call a local endpoint that list's the caller's http
headers
+callAnEndpointFootnote01=(or see its <a
href="EchoHeaders.jws?wsdl">WSDL</a>).
+
+# Visit
+visit=Visit
+visitURL=http://ws.apache.org/axis/
+visitFootnote=Visit the Apache-Axis Home Page
+
+# Admin
+admin=Administer Axis
+adminURL=servlet/AdminServlet
+adminFootnote=[disabled by default for security reasons]
+
+# SOAPMonitor
+soapMonitor=SOAPMonitor
+soapMonitorURL=SOAPMonitor
+soapMonitorFootnote=[disabled by default for security reasons]
+
+# Sidenote
+sideNote=To enable the disabled features, uncomment the appropriate
declarations in WEB-INF/web.xml in the webapplication and restart it.
+
+### Validating Axis ###
+#
+
+# Title
+validatingAxis=Validating Axis
+
+# Note 0
+validationNote00=If the "happyaxis" validation page displays an exception
instead of a status page, the likely cause is that you have multiple XML
parsers in your classpath. Clean up your classpath by eliminating extraneous
parsers.
+
+# Note 1
+validationNote01=If you have problems getting Axis to work, consult the Axis
<a href="http://wiki.apache.org/ws/FrontPage/Axis";>Wiki</a> and then try the
Axis user mailing list.
+
+#
+#################### [index.jsp] ###########################
+
+#################### [happyaxis.jsp] #######################
+#
+
+pageTitle=Axis Happiness Page
+pageRole=Examining webapp configuration
+
+### Needed Components ###
+#
+neededComponents=Needed Components
+error=Error
+warning=Warning
+criticalErrorMessage=Axis will not work.
+uncertainErrorMessage=Axis may not work.
+# parameters = url, name
+seeHomepage=<br> See <a href="{0}">{0}</a>
+# parameters = category, classname, jarFile, errorText, url
+couldNotFound=<p> {0}: could not find class {1} from file <b>{2}</b><br> {3}
{4}<p>
+# parameters = description, classname
+foundClass00=Found {0} ( {1} )
+# parameters = description, classname
+foundClass01=Found {0} ( {1} ) at {2}
+# parameters = category, classname, errorText, url
+couldNotFoundDep=<p> {0}: could not find a dependency of class {1} from file
<b>{2}</b><br> {3} {4}
+# parameters = ncdfe.getMessage(), classname
+theRootCause=<br>The root cause was: {0}<br>This can happen e.g. if {1} is
in the 'common' classpath, but a dependency like activation.jar is only in
the webapp classpath.<p>
+# parameters = location
+invalidSAAJ=<b>Error:</b> Invalid version of SAAJ API found in {0}. Make
sure that Axis' saaj.jar precedes {0} in CLASSPATH.<br>
+axisInstallation=Axis installation instructions
+
+### Optional Components ###
+#
+
+optionalComponents=Optional Components
+attachmentsError=Attachments will not work.
+xmlSecurityError=XML Security is not supported.
+httpsError=https is not supported.
+
+happyResult00=<i>The core axis libraries are present.</i>
+happyResult01=<i>The optional components are present.</i>
+# parameters = needed(num of missing libraries)
+unhappyResult00=<i>{0} core axis library(ies) are missing</i>
+# parameters = wanted(num of missing libraries)
+unhappyResult01=<i>{0} wanted optional axis librar(ies) are missing</i>
+
+hintString=<B><I>Note:</I></B> On Tomcat 4.x and Java1.4, you may need to
put libraries that contain java.* or javax.* packages into
CATALINA_HOME/common/lib <br>jaxrpc.jar and saaj.jar are two such
libraries.<p/>
+noteString=<B><I>Note:</I></B> Even if everything this page probes for is
present, there is no guarantee your web service will work, because there are
many configuration options that we do not check for. These tests are
<i>necessary</i> but not <i>sufficient</i><hr>
+
+### Examining Application Server ###
+#
+apsExamining=Examining Application Server
+recommendedParser=<b>We recommend <a
href="http://xml.apache.org/xerces2-j/";>Xerces 2</a> over Crimson as the XML
parser for Axis</b>
+couldNotCreateParser=Could not create an XML Parser
+
+### Examining System Properties ###
+#
+sysExamining=Examining System Properties
+sysPropError=System properties are not accessible.<p>
+classFoundError=an unknown location
+apsPlatform=Platform
+
+#
+#################### [happyaxis.jsp] #######################
\ No newline at end of file

Copied:
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/components.properties
(from rev 6046, trunk/perfsonar-java-sql-ma/conf/components.properties)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/components.properties
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/components.properties
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,30 @@
+
+# $Id$
+
+
+# File contains components to load
+# Config and logger MUST be loaded first!
+
+
+# Configuration component - must be the first one!
+config=org.perfsonar.base.auxiliary.components.configuration.properties.PropertiesConfigurationComponent
+
+
+# Logger component - must be the second one!
+logger=org.perfsonar.base.auxiliary.components.logger.log4j.Log4jLoggerComponent
+
+
+# Simple scheduler
+#ma_scheduler=org.perfsonar.base.auxiliary.components.simplescheduler.Scheduler
+
+
+# Registration in LS
+#registrator=org.perfsonar.service.measurementArchive.register.LSRegistrationComponent
+
+
+eventType_config=org.perfsonar.service.measurementArchive.eventTypeConfig.EventTypeConfigurationComponent
+
+
+# Group=AuthN
+# Description=Authentication component
+authn=org.perfsonar.base.auxiliary.components.authn.wssec.WSSecAuthNComponent
\ No newline at end of file

Copied:
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/eventType-map.xml
(from rev 6046, trunk/perfsonar-java-sql-ma/conf/eventType-map.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/eventType-map.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/eventType-map.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+<!-- $Id$ -->
+<!-- romradz -->
+
+
+<eventType-config>
+
+ <eventType>
+ <name>http://ggf.org/ns/nmwg/characteristic/utilization/2.0</name>
+
<metadataQueryGenerator>org.perfsonar.service.measurementArchive.metadataConfig.queryGenerator.UtilizationQueryGenerator</metadataQueryGenerator>
+
<responseGenerator>org.perfsonar.service.measurementArchive.sqlType.fetch.UtilizationResponseGenerator</responseGenerator>
+
<storeRequestProcess>org.perfsonar.service.measurementArchive.sqlType.store.UtilizationStoreRequestProcess</storeRequestProcess>
+ <ibatisConfig>ibatis-SqlMapConfig-utilization.xml</ibatisConfig>
+ </eventType>
+
+ <eventType>
+ <name>http://ggf.org/ns/nmwg/characteristic/errors/2.0</name>
+
<metadataQueryGenerator>org.perfsonar.service.measurementArchive.metadataConfig.queryGenerator.ErrorsQueryGenerator</metadataQueryGenerator>
+
<responseGenerator>org.perfsonar.service.measurementArchive.sqlType.fetch.ErrorsResponseGenerator</responseGenerator>
+
<storeRequestProcess>org.perfsonar.service.measurementArchive.sqlType.store.ErrorsStoreRequestProcess</storeRequestProcess>
+ <ibatisConfig>ibatis-SqlMapConfig-errors.xml</ibatisConfig>
+ </eventType>
+
+ <eventType>
+ <name>http://ggf.org/ns/nmwg/characteristic/discards/2.0</name>
+
<metadataQueryGenerator>org.perfsonar.service.measurementArchive.metadataConfig.queryGenerator.DiscardsQueryGenerator</metadataQueryGenerator>
+
<responseGenerator>org.perfsonar.service.measurementArchive.sqlType.fetch.DiscardsResponseGenerator</responseGenerator>
+
<storeRequestProcess>org.perfsonar.service.measurementArchive.sqlType.store.DiscardsStoreRequestProcess</storeRequestProcess>
+ <ibatisConfig>ibatis-SqlMapConfig-discards.xml</ibatisConfig>
+ </eventType>
+
+ <eventType>
+ <name>http://ggf.org/ns/nmwg/topology/l2/3.0/link/status</name>
+
<metadataQueryGenerator>org.perfsonar.service.measurementArchive.metadataConfig.queryGenerator.L2PathStatusQueryGenerator</metadataQueryGenerator>
+
<metadataKeyGenerator>org.perfsonar.service.measurementArchive.metadataConfig.keyGenerator.L2PathStatusKeyGenerator</metadataKeyGenerator>
+
<responseGenerator>org.perfsonar.service.measurementArchive.sqlType.fetch.L2PathStatusResponseGenerator</responseGenerator>
+
<storeRequestProcess>org.perfsonar.service.measurementArchive.sqlType.store.L2PathStatusStoreRequestProcess</storeRequestProcess>
+ <ibatisConfig>ibatis-SqlMapConfig-L2-status.xml</ibatisConfig>
+ </eventType>
+
+ <eventType>
+ <name>Path.Status</name>
+
<metadataQueryGenerator>org.perfsonar.service.measurementArchive.metadataConfig.queryGenerator.L2PathStatusQueryGeneratorTMP</metadataQueryGenerator>
+
<metadataKeyGenerator>org.perfsonar.service.measurementArchive.metadataConfig.keyGenerator.L2PathStatusKeyGenerator</metadataKeyGenerator>
+
<responseGenerator>org.perfsonar.service.measurementArchive.sqlType.fetch.L2PathStatusResponseGenerator</responseGenerator>
+
<storeRequestProcess>org.perfsonar.service.measurementArchive.sqlType.store.L2PathStatusStoreRequestProcess</storeRequestProcess>
+ <ibatisConfig>ibatis-SqlMapConfig-L2-status.xml</ibatisConfig>
+ </eventType>
+
+ <eventType>
+
<name>http://schemas.perfsonar.net/tools/admin/selftest/1.0/xmldb-access-test</name>
+
<metadataQueryGenerator>org.perfsonar.service.measurementArchive.metadataConfig.queryGenerator.XmlDbAccessTestQueryGenerator</metadataQueryGenerator>
+ </eventType>
+
+ <eventType>
+
<name>http://schemas.perfsonar.net/tools/admin/selftest/1.0/xmldb-content-test</name>
+
<metadataQueryGenerator>org.perfsonar.service.measurementArchive.metadataConfig.queryGenerator.XmlDbContentTestQueryGenerator</metadataQueryGenerator>
+ </eventType>
+
+ <eventType>
+
<name>http://schemas.perfsonar.net/tools/admin/selftest/1.0/random-fetch-test</name>
+
<metadataQueryGenerator>org.perfsonar.service.measurementArchive.metadataConfig.queryGenerator.RandomFetchTestQueryGenerator</metadataQueryGenerator>
+ </eventType>
+
+ <eventType>
+ <name>http://ggf.org/ns/nmwg/tools/owamp/2.0</name>
+
<metadataQueryGenerator>org.perfsonar.service.measurementArchive.metadataConfig.queryGenerator.OwampQueryGenerator</metadataQueryGenerator>
+
<responseGenerator>org.perfsonar.service.measurementArchive.sqlType.fetch.OwampResponseGenerator</responseGenerator>
+
<storeRequestProcess>org.perfsonar.service.measurementArchive.sqlType.store.OwampStoreRequestProcess</storeRequestProcess>
+ </eventType>
+
+ <eventType>
+ <name>http://ggf.org/ns/nmwg/tools/bwctl/2.0</name>
+
<metadataQueryGenerator>org.perfsonar.service.measurementArchive.metadataConfig.queryGenerator.BwctlQueryGenerator</metadataQueryGenerator>
+
<responseGenerator>org.perfsonar.service.measurementArchive.sqlType.fetch.BwctlResponseGenerator</responseGenerator>
+
<storeRequestProcess>org.perfsonar.service.measurementArchive.sqlType.store.BwctlStoreRequestProcess</storeRequestProcess>
+ </eventType>
+
+ <eventType>
+ <name>http://ggf.org/ns/nmwg/tools/bwctl/2.0/</name>
+
<metadataQueryGenerator>org.perfsonar.service.measurementArchive.metadataConfig.queryGenerator.BwctlQueryGenerator</metadataQueryGenerator>
+
<responseGenerator>org.perfsonar.service.measurementArchive.sqlType.fetch.BwctlResponseGenerator</responseGenerator>
+
<storeRequestProcess>org.perfsonar.service.measurementArchive.sqlType.store.BwctlStoreRequestProcess</storeRequestProcess>
+ </eventType>
+
+ <eventType>
+ <name>http://ggf.org/ns/nmwg/tools/iperf/2.0</name>
+
<metadataQueryGenerator>org.perfsonar.service.measurementArchive.metadataConfig.queryGenerator.IperfQueryGenerator</metadataQueryGenerator>
+
<responseGenerator>org.perfsonar.service.measurementArchive.sqlType.fetch.IperfResponseGenerator</responseGenerator>
+
<storeRequestProcess>org.perfsonar.service.measurementArchive.sqlType.store.IperfStoreRequestProcess</storeRequestProcess>
+ <ibatisConfig>ibatis-SqlMapConfig-iperf.xml</ibatisConfig>
+ </eventType>
+
+ <eventType>
+ <name>http://ggf.org/ns/nmwg/tools/iperf/2.0/</name>
+
<metadataQueryGenerator>org.perfsonar.service.measurementArchive.metadataConfig.queryGenerator.IperfQueryGenerator</metadataQueryGenerator>
+
<responseGenerator>org.perfsonar.service.measurementArchive.sqlType.fetch.IperfResponseGenerator</responseGenerator>
+
<storeRequestProcess>org.perfsonar.service.measurementArchive.sqlType.store.IperfStoreRequestProcess</storeRequestProcess>
+ <ibatisConfig>ibatis-SqlMapConfig-iperf.xml</ibatisConfig>
+ </eventType>
+
+ <eventType>
+ <name>http://ggf.org/ns/nmwg/tools/ping/2.0</name>
+
<metadataQueryGenerator>org.perfsonar.service.measurementArchive.metadataConfig.queryGenerator.PingQueryGenerator</metadataQueryGenerator>
+
<responseGenerator>org.perfsonar.service.measurementArchive.sqlType.fetch.PingResponseGenerator</responseGenerator>
+
<storeRequestProcess>org.perfsonar.service.measurementArchive.sqlType.store.PingStoreRequestProcess</storeRequestProcess>
+ <ibatisConfig>ibatis-SqlMapConfig-clmp-ping.xml</ibatisConfig>
+ </eventType>
+
+</eventType-config>

Copied:
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/eventType-rules.xml
(from rev 6046, trunk/perfsonar-java-sql-ma/conf/eventType-rules.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/eventType-rules.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/eventType-rules.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+<!-- $Id$ -->
+<!-- romradz -->
+
+
+<digester-rules>
+
+ <object-create-rule
+ pattern="eventType-config"
+
classname="org.perfsonar.service.measurementArchive.eventTypeConfig.EventTypeConfiguration"
/>
+
+ <pattern value="eventType-config/eventType">
+ <object-create-rule
+
classname="org.perfsonar.service.measurementArchive.eventTypeConfig.EventType"
/>
+ <call-method-rule pattern="name" methodname="setName"
+ paramcount="0" />
+ <call-method-rule pattern="metadataQueryGenerator"
methodname="setMetadataQueryGenerator"
+ paramcount="0" />
+ <call-method-rule pattern="metadataKeyGenerator"
methodname="setMetadataKeyGenerator"
+ paramcount="0" />
+ <call-method-rule pattern="responseGenerator"
methodname="setResponseGenerator"
+ paramcount="0" />
+ <call-method-rule pattern="storeRequestProcess"
methodname="setStoreRequestProcess"
+ paramcount="0" />
+ <call-method-rule pattern="baseChainingMerger"
methodname="setBaseChainingMerger"
+ paramcount="0" />
+ <call-method-rule pattern="ibatisConfig"
methodname="setIbatisConfig"
+ paramcount="0" />
+ <set-next-rule methodname="setEventType" />
+ </pattern>
+
+</digester-rules>
\ No newline at end of file

Copied:
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/log4j.properties
(from rev 6046, trunk/perfsonar-java-sql-ma/conf/log4j.properties)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/log4j.properties
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/log4j.properties
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,13 @@
+## $Id$
+## project : perfSONAR
+## author: romradz
+
+
+log4j.rootLogger=DEBUG, psRootAppender
+
+log4j.appender.psRootAppender=org.apache.log4j.RollingFileAppender
+log4j.appender.psRootAppender.MaxBackupIndex=11
+log4j.appender.psRootAppender.File=/var/log/geant2-java-sql-ma/perfsonar_debug_sqlma.log
+log4j.appender.psRootAppender.layout=org.apache.log4j.PatternLayout
+log4j.appender.psRootAppender.layout.ConversionPattern=%d %5p - %m%n
+log4j.appender.psRootAppender.MaxFileSize=2000KB

Copied:
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/log4j.syslog.properties
(from rev 6046, trunk/perfsonar-java-sql-ma/conf/log4j.syslog.properties)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/log4j.syslog.properties
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/log4j.syslog.properties
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,248 @@
+## $Id$
+## project : perfSONAR
+## author: romradz
+
+
+
+##
+## All log levels in one log file.
+## By default debug level is switched off (commented).
+##
+
+# Group=Log levels
+# Description=Assigns debug log messages to the specified log appender.
+#log4j.logger.sonar-debug=DEBUG, SYSLOG, psRootAppender
+
+# Group=Log levels
+# Description=Assigns info log messages to the specified log appender.
+log4j.logger.sonar-info=INFO, SYSLOG, psRootAppender
+
+# Group=Log levels
+# Description=Assigns warn log messages to the specified log appender.
+log4j.logger.sonar-warn=WARN, SYSLOG, psRootAppender
+
+# Group=Log levels
+# Description=Assigns error log messages to the specified log appender.
+log4j.logger.sonar-error=ERROR, SYSLOG, psRootAppender
+
+# Group=Log levels
+# Description=Assigns fatal log messages to the specified log appender.
+log4j.logger.sonar-fatal=FATAL, SYSLOG, psRootAppender
+
+
+
+##
+## Uncomment this block (and comment the one above)
+## if you want to have log levels in separate log files
+##
+## this section is only for developer tests
+##
+#log4j.logger.sonar-debug=DEBUG, SYSLOG, debugAppender, psRootAppender
+#log4j.logger.sonar-info=INFO, SYSLOG, infoAppender, psRootAppender
+#log4j.logger.sonar-warn=WARN, SYSLOG, warnAppender, psRootAppender
+#log4j.logger.sonar-error=ERROR, SYSLOG, errorAppender, psRootAppender
+#log4j.logger.sonar-fatal=FATAL, SYSLOG, fatalAppender, psRootAppender
+
+
+
+
+######################################### DEBUG
#######################################
+
+# Group=Debug message logging
+# Description=The maximum number of backup log files to create.
+log4j.appender.debugAppender.MaxBackupIndex=11
+
+# Group=Debug message logging
+# Description=The path to the log file, including the log file's name.
+log4j.appender.debugAppender.File=/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/log/perfsonar_debug.log
+
+# Group=Debug message logging
+# Description=The class responsible for the logging layout.
+log4j.appender.debugAppender.layout=org.apache.log4j.PatternLayout
+
+# Group=Debug message logging
+# Description=The log message format.
+log4j.appender.debugAppender.layout.ConversionPattern=%d
%%GEANT2-JAVA-SQL-MA.%p%% %m%n
+
+# Group=Debug message logging
+# Description=The maximum size the log file can reach before it replaces the
oldest backup file and a new log file is started.
+log4j.appender.debugAppender.MaxFileSize=500KB
+
+# Group=Debug message logging
+# Description=The class responsible for appending log messages to the log
file.
+log4j.appender.debugAppender=org.apache.log4j.RollingFileAppender
+
+
+
+######################################### INFO
########################################
+
+# Group=Info message logging
+# Description=The maximum number of backup log files to create.
+log4j.appender.infoAppender.MaxBackupIndex=11
+
+# Group=Info message logging
+# Description=The path to the log file, including the log file's name.
+log4j.appender.infoAppender.File=/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/log/perfsonar_info.log
+
+# Group=Info message logging
+# Description=The class responsible for the logging layout.
+log4j.appender.infoAppender.layout=org.apache.log4j.PatternLayout
+
+# Group=Info message logging
+# Description=The log message format.
+log4j.appender.infoAppender.layout.ConversionPattern=%d
%%GEANT2-JAVA-SQL-MA.%p%% %m%n
+
+# Group=Info message logging
+# Description=The maximum size the log file can reach before it replaces the
oldest backup file and a new log file is started.
+log4j.appender.infoAppender.MaxFileSize=500KB
+
+# Group=Info message logging
+# Description=The class responsible for appending log messages to the log
file.
+log4j.appender.infoAppender=org.apache.log4j.RollingFileAppender
+
+
+
+######################################### WARN
########################################
+
+# Group=Warn message logging
+# Description=The maximum number of backup log files to create.
+log4j.appender.warnAppender.MaxBackupIndex=11
+
+# Group=Warn message logging
+# Description=The path to the log file, including the log file's name.
+log4j.appender.warnAppender.File=/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/log/perfsonar_warn.log
+
+# Group=Warn message logging
+# Description=The class responsible for the logging layout.
+log4j.appender.warnAppender.layout=org.apache.log4j.PatternLayout
+
+# Group=Warn message logging
+# Description=The log message format.
+log4j.appender.warnAppender.layout.ConversionPattern=%d
%%GEANT2-JAVA-SQL-MA.%p%% %m%n
+
+# Group=Warn message logging
+# Description=The maximum size the log file can reach before it replaces the
oldest backup file and a new log file is started.
+log4j.appender.warnAppender.MaxFileSize=500KB
+
+# Group=Warn message logging
+# Description=The class responsible for appending log messages to the log
file.
+log4j.appender.warnAppender=org.apache.log4j.RollingFileAppender
+
+
+
+######################################### ERROR
#######################################
+
+# Group=Error message logging
+# Description=The maximum number of backup log files to create.
+log4j.appender.errorAppender.MaxBackupIndex=11
+
+# Group=Error message logging
+# Description=The path to the log file, including the log file's name.
+log4j.appender.errorAppender.File=/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/log/perfsonar_error.log
+
+# Group=Error message logging
+# Description=The class responsible for the logging layout.
+log4j.appender.errorAppender.layout=org.apache.log4j.PatternLayout
+
+# Group=Error message logging
+# Description=The log message format.
+log4j.appender.errorAppender.layout.ConversionPattern=%d
%%GEANT2-JAVA-SQL-MA.%p%% %m%n
+
+# Group=Error message logging
+# Description=The maximum size the log file can reach before it replaces the
oldest backup file and a new log file is started.
+log4j.appender.errorAppender.MaxFileSize=500KB
+
+# Group=Error message logging
+# Description=The class responsible for appending log messages to the log
file.
+log4j.appender.errorAppender=org.apache.log4j.RollingFileAppender
+
+
+
+######################################### FATAL
#######################################
+
+# Group=Fatal message logging
+# Description=The maximum number of backup log files to create.
+log4j.appender.fatalAppender.MaxBackupIndex=11
+
+# Group=Fatal message logging
+# Description=The path to the log file, including the log file's name.
+log4j.appender.fatalAppender.File=/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/log/perfsonar_fatal.log
+
+# Group=Fatal message logging
+# Description=The class responsible for the logging layout.
+log4j.appender.fatalAppender.layout=org.apache.log4j.PatternLayout
+
+# Group=Fatal message logging
+# Description=The log message format.
+log4j.appender.fatalAppender.layout.ConversionPattern=%d
%%GEANT2-JAVA-SQL-MA.%p%% %m%n
+
+# Group=Fatal message logging
+# Description=The maximum size the log file can reach before it replaces the
oldest backup file and a new log file is started.
+log4j.appender.fatalAppender.MaxFileSize=500KB
+
+# Group=Fatal message logging
+# Description=The class responsible for appending log messages to the log
file.
+log4j.appender.fatalAppender=org.apache.log4j.RollingFileAppender
+
+
+
+######################################### ALL
#########################################
+
+# Group=All message logging
+# Description=The maximum number of backup log files to create.
+log4j.appender.psRootAppender.MaxBackupIndex=11
+
+# Group=All message logging
+# Description=The path to the log file, including the log file's name.
+log4j.appender.psRootAppender.File=/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/log/perfsonar.log
+
+# Group=All message logging
+# Description=The class responsible for the logging layout.
+log4j.appender.psRootAppender.layout=org.apache.log4j.PatternLayout
+
+# Group=All message logging
+# Description=The log message format.
+log4j.appender.psRootAppender.layout.ConversionPattern=%d
%%GEANT2-JAVA-SQL-MA.%p%% %m%n
+
+# Group=All message logging
+# Description=The maximum size the log file can reach before it replaces the
oldest backup file and a new log file is started.
+log4j.appender.psRootAppender.MaxFileSize=500KB
+
+# Group=All message logging
+# Description=The class responsible for appending log messages to the log
file.
+log4j.appender.psRootAppender=org.apache.log4j.RollingFileAppender
+
+
+
+######################################### SYSLOG
#########################################
+
+# Group=Syslog logging
+# Description=The class responsible for appending log messages to the syslog
file.
+log4j.appender.SYSLOG=org.apache.log4j.net.SyslogAppender
+
+# Group=Syslog logging
+# Description=The IP address of the host executing syslog-ng.
+log4j.appender.SYSLOG.syslogHost=127.0.0.1
+
+# Group=Syslog logging
+# Description=The class responsible for the logging layout.
+log4j.appender.SYSLOG.layout=org.apache.log4j.PatternLayout
+
+# Group=Syslog logging
+# Description=The log message format. This can include @Location after
PERFSONAR-AS.
+log4j.appender.SYSLOG.layout.ConversionPattern=\%GEANT2-JAVA-SQL-MA.%p\% %m%n
+
+
+
+######################################### ROOT
#########################################
+
+# this section is only for developer's tests
+
+# ROOT
+#log4j.appender.rootAppender.MaxBackupIndex=11
+#log4j.appender.rootAppender.File=/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/log/perfsonar_root.log
+#log4j.appender.rootAppender.layout=org.apache.log4j.PatternLayout
+#log4j.appender.rootAppender.layout.ConversionPattern=%d
%%GEANT2-JAVA-SQL-MA.%p%% %m%n
+#log4j.rootLogger=DEBUG, rootAppender
+#log4j.appender.rootAppender.MaxFileSize=500KB
+#log4j.appender.rootAppender=org.apache.log4j.RollingFileAppender
\ No newline at end of file

Copied:
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/mysql-sqlma-dbremove.sql
(from rev 6046, trunk/perfsonar-java-sql-ma/conf/mysql-sqlma-dbremove.sql)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/mysql-sqlma-dbremove.sql
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/mysql-sqlma-dbremove.sql
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,64 @@
+
+# $Id: mysql-sqlma-dbremove.sql 1540 2006-08-11 10:19:44Z roman $
+# project: perfSONAR
+# author: romradz
+
+
+# SQL Measurement Archive (MA)
+# sql script for mysql db
+
+
+# running:
+# mysql -u root -p < /opt/sonar/perfsonar/conf/mysql-sqlma-dbremove.sql
+
+
+
+
+USE perfsonar_ma
+
+
+DROP TABLE
+ perfsonar_utilization;
+
+
+DROP TABLE
+ perfsonar_errors;
+
+
+DROP TABLE
+ perfsonar_discards;
+
+
+DROP TABLE
+ domain_link;
+
+
+DROP TABLE
+ interdomain_link;
+
+
+DROP TABLE
+ perfsonar_links;
+
+
+DROP TABLE
+ perfsonar_iperf;
+
+
+#DROP TABLE
+# clmp_owamp;
+
+
+#DROP TABLE
+# clmp_bwctl;
+
+
+DROP TABLE
+ clmp_ping;
+
+
+DROP USER
+ perfsonar_ma;
+
+
+

Copied:
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/mysql-sqlma-dbsetup.sql
(from rev 6046, trunk/perfsonar-java-sql-ma/conf/mysql-sqlma-dbsetup.sql)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/mysql-sqlma-dbsetup.sql
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/mysql-sqlma-dbsetup.sql
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,298 @@
+
+# $Id: mysql-sqlma-dbsetup.sql 1592 2006-09-01 18:37:40Z fernandes $
+# project: perfSONAR
+# author: romradz
+
+
+# SQL Measurement Archive (MA)
+# sql script for mysql db
+
+
+# running:
+# mysql -u root -p < /opt/sonar/perfsonar/conf/mysql-sqlma-dbsetup.sql
+
+
+
+
+CREATE DATABASE
+ perfsonar_ma;
+
+
+USE perfsonar_ma
+
+
+CREATE USER
+ perfsonar_ma;
+
+
+GRANT
+ SELECT, INSERT, UPDATE, DELETE ON
+ perfsonar_ma.* TO 'perfsonar_ma'@'localhost'
+ IDENTIFIED BY 'testpass';
+
+
+CREATE TABLE
+ perfsonar_utilization
+ (metadataId VARCHAR(30) NOT NULL, # id of metadata which
is stored in xml database
+ value FLOAT (16,4) NOT NULL, # measurement value
+ valueUnits VARCHAR(30) NULL, # unit of value
+ timeValue INT NOT NULL, # seconds since
`00:00:00 1970-01-01 UTC'
+ ts TIMESTAMP DEFAULT NOW()); # time of inserting
+
+
+CREATE TABLE
+ perfsonar_errors
+ (metadataId VARCHAR(30) NOT NULL,
+ value FLOAT (16,4) NOT NULL,
+ valueUnits VARCHAR(30) NULL,
+ timeValue INT NOT NULL,
+ ts TIMESTAMP DEFAULT NOW());
+
+
+CREATE TABLE
+ perfsonar_discards
+ (metadataId VARCHAR(30) NOT NULL,
+ value FLOAT (16,4) NOT NULL,
+ valueUnits VARCHAR(30) NULL,
+ timeValue INT NOT NULL,
+ ts TIMESTAMP DEFAULT NOW());
+
+
+CREATE TABLE
+ domain_link
+ (id VARCHAR(255) NOT NULL,
+ time TIMESTAMP DEFAULT NOW(),
+ status_oper VARCHAR(255) DEFAULT 'UNKNOWN',
+ status_admin VARCHAR(255) DEFAULT 'UNKNOWN',
+ alarm_id_set VARCHAR(255),
+ comments VARCHAR(255));
+
+
+CREATE TABLE
+ interdomain_link
+ (id VARCHAR(255) NOT NULL,
+ time TIMESTAMP DEFAULT NOW(),
+ status_oper VARCHAR(255) DEFAULT 'UNKNOWN',
+ status_admin VARCHAR(255) DEFAULT 'UNKNOWN',
+ alarm_id_set VARCHAR(255),
+ comments VARCHAR(255));
+
+
+CREATE TABLE
+ perfsonar_links
+ (id VARCHAR(255) NOT NULL,
+ time TIMESTAMP DEFAULT NOW(),
+ status_oper VARCHAR(255) DEFAULT 'UNKNOWN',
+ status_admin VARCHAR(255) DEFAULT 'UNKNOWN',
+ alarm_id_set VARCHAR(255),
+ comments VARCHAR(255));
+
+CREATE TABLE
+ perfsonar_iperf
+ (metadataId VARCHAR(30) NOT NULL,
+ value FLOAT (16,4) NULL,
+ valueUnits VARCHAR(30) NULL,
+ throughput FLOAT (16,4) NULL,
+ jitter FLOAT (16,4) NULL,
+ loss VARCHAR(15) NULL,
+ numBytes NUMERIC(40) NULL,
+ numBytesUnits VARCHAR(15) NULL,
+ interv VARCHAR(30) NULL,
+ time INT NOT NULL,
+ format VARCHAR(30) NULL,
+ protocol VARCHAR(10) NULL,
+ bufferLength INT NULL,
+ windowSize INT NULL,
+ windowSizeRequest VARCHAR(30) NULL,
+ timeDuration VARCHAR(30) NULL,
+ arguments VARCHAR(50) NULL,
+ test_session_id VARCHAR(30) NULL,
+ ts TIMESTAMP DEFAULT NOW());
+
+
+
+
+#INSERT
+# INTO owamp_agg
+# VALUES ('owamp-meta2', 'host1', 'host2', 1, 1, '10.0', 2, '1.0',
'2.0', '1.5', 'ms', '1.0', 'ms', '0.1', 'ms', 12, default);
+
+
+
+############### Create table for BWCTL data ################
+#CREATE TABLE `clmp_bwctl` (
+# `metadataId` varchar(255) NOT NULL,
+# `intervalEnd` varchar(30) default NULL,
+# `intervalStart` varchar(30) default NULL,
+# `intervalUnit` varchar(30) default NULL,
+# `numBytes` varchar(30) default NULL,
+# `numBytesUnits` varchar(30) default NULL,
+# `tcpAdapterType` varchar(30) default NULL,
+# `tcpMSSSize` varchar(30) default NULL,
+# `timeType` varchar(30) default NULL,
+# `timeValue` mediumtext NOT NULL,
+# `value` mediumtext NOT NULL,
+# `valueUnits` varchar(30) default NULL,
+# `tcpMSSUnit` varchar(30) default NULL,
+# `tcpMTUSize` varchar(30) default NULL,
+# `tcpMTUUnit` varchar(30) default NULL,
+# `tcpWindowSize` varchar(30) default NULL,
+# `tcpWindowUnit` varchar(30) default NULL,
+# `udpBufferSize` varchar(30) default NULL,
+# `udpBufferUnit` varchar(30) default NULL,
+# `udpJitter` varchar(30) default NULL,
+# `udpJitterUnit` varchar(30) default NULL,
+# `udpPacketLoss` varchar(30) default NULL,
+# `udpPacketLossPercentage` varchar(30) default NULL,
+# `udpPacketSent` varchar(30) default NULL,
+# `ts` timestamp NOT NULL default CURRENT_TIMESTAMP);
+###########################################################
+
+############### Create table for ping data ################
+CREATE TABLE
+ clmp_ping
+ (metadataId VARCHAR(255) NOT NULL,
+ seqNum INT UNSIGNED NULL DEFAULT 0,
+ value FLOAT (16,4) NOT NULL,
+ valueUnits VARCHAR(4) NULL,
+ ttl TINYINT UNSIGNED NULL DEFAULT 0,
+ numBytes INT NULL DEFAULT 0,
+ numBytesUnits VARCHAR(10) NULL,
+ timeValue LONG NOT NULL,
+ timeType VARCHAR(4) NULL,
+ ts TIMESTAMP DEFAULT NOW());
+############################################################
+
+# insert statements for testing perfsonar_utilization table
+
+INSERT
+ INTO perfsonar_utilization
+ VALUES ('meta1-test', 2, 'Bps', 1143034705, default);
+
+INSERT
+ INTO
+ perfsonar_utilization
+ VALUES ('meta2-test', 3, 'Bps', 1143034706, default);
+
+INSERT
+ INTO
+ perfsonar_utilization
+ VALUES ('meta3-test', 4, 'Bps', 1143034707, default);
+
+INSERT
+ INTO
+ perfsonar_utilization
+ VALUES ('meta4-test', 5, 'Bps', 1143034709, default);
+
+
+
+# insert statements for testing perfsonar_errors table
+
+INSERT
+ INTO perfsonar_errors
+ VALUES ('meta1-errors-test', 1, 'Eps', 1187948870, default);
+
+INSERT
+ INTO
+ perfsonar_errors
+ VALUES ('meta1-errors-test', 0, 'Eps', 1187948875, default);
+
+INSERT
+ INTO
+ perfsonar_errors
+ VALUES ('meta1-errors-test', 4, 'Eps', 1187948882, default);
+
+INSERT
+ INTO
+ perfsonar_errors
+ VALUES ('meta1-errors-test', 2, 'Eps', 1187948888, default);
+
+
+
+# insert statements for testing perfsonar_discards table
+
+INSERT
+ INTO perfsonar_discards
+ VALUES ('meta1-discards-test', 1, 'Dps', 1187948870, default);
+
+INSERT
+ INTO
+ perfsonar_discards
+ VALUES ('meta1-discards-test', 0, 'Dps', 1187948875, default);
+
+INSERT
+ INTO
+ perfsonar_discards
+ VALUES ('meta1-discards-test', 4, 'Dps', 1187948882, default);
+
+INSERT
+ INTO
+ perfsonar_discards
+ VALUES ('meta1-discards-test', 2, 'Dps', 1187948888, default);
+
+
+# insert statements for testing domain_link table
+
+INSERT
+ INTO domain_link (id, status_oper, time)
+ VALUES ('DFN-link-1234', 'down', '2006-04-06 12:15:23');
+
+INSERT
+ INTO domain_link (id, status_oper, time)
+ VALUES ('DFN-Surfnet-Link-5678', 'up', '2006-04-06 12:15:24');
+
+INSERT
+ INTO domain_link (id, status_oper, time)
+ VALUES ('PSNC-DFN-MUE-Link-1001', 'down', '2006-04-06 12:15:25');
+
+
+
+# insert statements for testing domain_link table
+
+INSERT
+ INTO interdomain_link (id, status_oper, time)
+ VALUES ('PSNC-2-DFN-MUE-Link-1002', 'up', '2006-04-06 12:17:33');
+
+
+
+# insert statements for testing perfsonar_links table
+
+INSERT
+ INTO perfsonar_links (id, status_oper, time)
+ VALUES ('PSNC-2-DFN-MUE-Link-1002', 'up', '2006-04-06 12:17:33');
+
+
+
+# insert statements for testing perfsonar_iperf table
+INSERT
+INTO perfsonar_iperf
+VALUES ('meta1-iperf-test', 165214869, 'bits/sec', 1.00, 1.830, '0/837',
123911152, 'Bytes', '0.0- 6.0', 1332320400, NULL, 'TCP', NULL, NULL, NULL,
NULL, NULL, NULL, default);
+
+INSERT
+INTO perfsonar_iperf
+VALUES ('meta1-iperf-test', 49782240, 'bits/sec', 1.50, 1.830, '0/837',
37336680, 'Bytes', '6.0-12.0', 1332320400, NULL, 'TCP', NULL, NULL, NULL,
NULL, NULL, NULL, default);
+
+INSERT
+INTO perfsonar_iperf
+VALUES ('meta1-iperf-test', 28124021, 'bits/sec', 2.00, 1.830, '0/837',
21093016, 'Bytes', '12.0-18.0', 1332320400, NULL, 'TCP', NULL, NULL, NULL,
NULL, NULL, NULL, default);
+
+INSERT
+INTO perfsonar_iperf
+VALUES ('meta1-iperf-test', 34060821, 'bits/sec', 2.50, 1.830, '0/837',
25545616, 'Bytes', '18.0-24.0', 1332320400, NULL, 'TCP', NULL, NULL, NULL,
NULL, NULL, NULL, default);
+
+INSERT
+INTO perfsonar_iperf
+VALUES ('meta1-iperf-test', 34946997, 'bits/sec', 3.00, 1.830, '0/837',
26210248, 'Bytes', '24.0-30.0', 1332320400, NULL, 'TCP', NULL, NULL, NULL,
NULL, NULL, NULL, default);
+
+INSERT
+INTO perfsonar_iperf
+VALUES ('meta1-iperf-test', 61428990, 'bits/sec', 3.50, 1.830, '0/837',
239779840, 'Bytes', '0.0-30.3', 1332320400, NULL, 'TCP', NULL, NULL, NULL,
NULL, NULL, NULL, default);
+
+# insert statements for testing clmp_ping table
+
+INSERT
+ INTO clmp_ping
+ VALUES ('ping-meta1', 1, 5.3, 'ms', 253, 8, 'Bytes', 1233655716, 'unix',
default);
+
+INSERT
+ INTO clmp_ping
+ VALUES ('ping-meta1', 2, 2.5, 'ms', 253, 8, 'Bytes', 1233655718, 'unix',
default);

Copied:
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/mysql-sqlma-dbupdate-owamp.sql
(from rev 6046,
trunk/perfsonar-java-sql-ma/conf/mysql-sqlma-dbupdate-owamp.sql)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/mysql-sqlma-dbupdate-owamp.sql
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/mysql-sqlma-dbupdate-owamp.sql
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,56 @@
+#$Id : mysql-sqlma-dbupdate-owamp.sql
+#project: perfsonar
+#author: Piotr Pikusa
+
+# SQL Measurement Archive (MA)
+# sql script for upgrading mysql db. It updates db schema from the last
stable version (not rc) to the db schema for current version
+
+# running:
+# mysql -u root -p < /etc/mysql-sqlma-dbupdate-owamp.sql
+
+USE perfsonar_ma
+
+# Create table for OWAMP data
+CREATE TABLE
+ owamp
+ (metadataId VARCHAR(255) NOT NULL ,
+ receiveSynchronized INT(1) NULL DEFAULT -1,
+ receiveTime VARCHAR(21) NOT NULL DEFAULT '-1',
+ receiveTimeError FLOAT NULL DEFAULT -1.0,
+ sendSynchronized INT(1) NULL DEFAULT -1,
+ sendTime VARCHAR(21) NOT NULL DEFAULT '-1',
+ sendTimeError FLOAT NULL DEFAULT -1.0,
+ seqNum INTEGER NULL DEFAULT -1,
+ ttl SMALLINT NULL DEFAULT -1,
+ ts TIMESTAMP DEFAULT NOW());
+
+INSERT
+ INTO owamp
+ VALUES ('owamp-meta1', 1, '15080301494633990766', 1.00583e-06, 1,
15080301494378967368, 4.91142e-05, 0, 243 ,default);
+INSERT
+ INTO owamp
+ VALUES ('owamp-meta1', 1, '15080301494633990766', 1.00483e-06, 1,
15080301494378967368, 4.81142e-05, 1, 243 ,default);
+
+ CREATE TABLE
+ owamp_agg
+ (metadataId VARCHAR(255) NOT NULL,
+ sender VARCHAR(255) NOT NULL DEFAULT '-1',
+ receiver VARCHAR(255) NOT NULL DEFAULT '-1',
+ sent INT NULL DEFAULT -1,
+ loss INT NULL DEFAULT -1,
+ lostPercent FLOAT NULL DEFAULT -1.0,
+ duplicates INT NULL DEFAULT -1,
+ minDelay FLOAT NULL DEFAULT -1.0,
+ medDelay FLOAT NULL DEFAULT -1.0,
+ maxDelay FLOAT NULL DEFAULT -1.0,
+ delayUnits VARCHAR(10) NULL DEFAULT '-1',
+ error FLOAT NULL DEFAULT -1.0,
+ errorUnits VARCHAR (10) NULL DEFAULT '-1',
+ jitter FLOAT NULL DEFAULT -1.0,
+ jitterUnits VARCHAR(10) NULL DEFAULT '-1',
+ hops INT NULL DEFAULT -1,
+ ts TIMESTAMP DEFAULT NOW());
+
+INSERT
+ INTO owamp_agg
+ VALUES ('owamp-meta2', 'host1', 'host2', 1, 1, '10.0', 2, '1.0',
'2.0', '1.5', 'ms', '1.0', 'ms', '0.1', 'ms', 12, default);

Copied:
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/mysql-sqlma-dbupdate-owamp_v2.sql
(from rev 6046,
trunk/perfsonar-java-sql-ma/conf/mysql-sqlma-dbupdate-owamp_v2.sql)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/mysql-sqlma-dbupdate-owamp_v2.sql
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/mysql-sqlma-dbupdate-owamp_v2.sql
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,56 @@
+#$Id : mysql-sqlma-dbupdate-owamp.sql
+#project: perfsonar
+#author: Piotr Pikusa
+
+# SQL Measurement Archive (MA)
+# sql script for upgrading mysql db. It updates db schema from the last
stable version (not rc) to the db schema for current version
+
+# running:
+# mysql -u root -p < /etc/mysql-sqlma-dbupdate-owamp.sql
+
+USE perfsonar_ma
+
+#Create table for OWAMP data
+CREATE TABLE
+ owamp
+ (metadataId VARCHAR(255) NOT NULL ,
+ receiveSynchronized INT(1) NOT NULL,
+ receiveTime VARCHAR(21) NOT NULL,
+ receiveTimeError FLOAT NOT NULL,
+ sendSynchronized INT(1) NOT NULL,
+ sendTime VARCHAR(21) NOT NULL,
+ sendTimeError FLOAT NOT NULL,
+ seqNum INTEGER NOT NULL,
+ ttl SMALLINT NOT NULL,
+ ts TIMESTAMP DEFAULT NOW());
+
+INSERT
+ INTO owamp
+ VALUES ('owamp-meta1', 1, '15080301494633990766', 1.00583e-06, 1,
15080301494378967368, 4.91142e-05, 0, 243 ,default);
+INSERT
+ INTO owamp
+ VALUES ('owamp-meta1', 1, '15080301494633990766', 1.00483e-06, 1,
15080301494378967368, 4.81142e-05, 1, 243 ,default);
+
+ CREATE TABLE
+ owamp_agg
+ (metadataId VARCHAR(255) NOT NULL,
+ sender VARCHAR(255) NOT NULL,
+ receiver VARCHAR(255) NOT NULL,
+ sent INT NOT NULL,
+ loss INT NOT NULL,
+ lostPercent FLOAT NOT NULL,
+ duplicates INT NOT NULL,
+ minDelay FLOAT NOT NULL,
+ medDelay FLOAT NOT NULL,
+ maxDelay FLOAT NOT NULL,
+ delayUnits VARCHAR(10) NOT NULL,
+ error FLOAT NOT NULL,
+ errorUnits VARCHAR (10) NOT NULL,
+ jitter FLOAT NULL NOT NULL,
+ jitterUnits VARCHAR(10) NOT NULL,
+ hops INT NOT NULL,
+ ts TIMESTAMP DEFAULT NOW());
+
+INSERT
+ INTO owamp_agg
+ VALUES ('owamp-meta2', 'host1', 'host2', 1, 1, '10.0', 2, '1.0',
'2.0', '1.5', 'ms', '1.0', 'ms', '0.1', 'ms', 12, default);

Copied:
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/mysql-sqlma-dbupdate.sql
(from rev 6046, trunk/perfsonar-java-sql-ma/conf/mysql-sqlma-dbupdate.sql)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/mysql-sqlma-dbupdate.sql
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/mysql-sqlma-dbupdate.sql
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,71 @@
+#$Id : mysql-sqlma-dbupdate.sql
+#project: perfsonar
+#author: Piotr Pikusa
+
+# SQL Measurement Archive (MA)
+# sql script for upgrading mysql db. It updates db schema from the last
stable version (not rc) to the db schema for current version
+
+# running:
+# mysql -u root -p < /etc/mysql-sqlma-dbupdate.sql
+
+
+USE perfsonar_ma
+
+CREATE TABLE
+ perfsonar_iperf
+ (metadataId VARCHAR(30) NOT NULL,
+ value FLOAT (16,4) NULL,
+ valueUnits VARCHAR(30) NULL,
+ throughput FLOAT (16,4) NULL,
+ jitter FLOAT (16,4) NULL,
+ loss VARCHAR(15) NULL,
+ numBytes NUMERIC(40) NULL,
+ numBytesUnits VARCHAR(15) NULL,
+ interv VARCHAR(30) NULL,
+ time INT NOT NULL,
+ format VARCHAR(30) NULL,
+ protocol VARCHAR(10) NULL,
+ bufferLength INT NULL,
+ windowSize INT NULL,
+ windowSizeRequest VARCHAR(30) NULL,
+ timeDuration VARCHAR(30) NULL,
+ arguments VARCHAR(50) NULL,
+ test_session_id VARCHAR(30) NULL,
+ ts TIMESTAMP DEFAULT NOW());
+
+
+CREATE TABLE
+ clmp_ping
+ (metadataId VARCHAR(255) NOT NULL,
+ seqNum INT UNSIGNED NULL DEFAULT 0,
+ value FLOAT (16,4) NOT NULL,
+ valueUnits VARCHAR(4) NULL,
+ ttl TINYINT UNSIGNED NULL DEFAULT 0,
+ numBytes INT NULL DEFAULT 0,
+ numBytesUnits VARCHAR(10) NULL,
+ timeValue LONG NOT NULL,
+ timeType VARCHAR(4) NULL,
+ ts TIMESTAMP DEFAULT NOW());
+
+
+# insert statements for testing perfsonar_iperf table
+
+INSERT
+ INTO perfsonar_iperf
+ VALUES ('meta1-iperf-test', NULL, 'bits/sec', 2.88, 1.830, '0/837',
23484640, 'Bytes', NULL, 1197642642, NULL, 'TCP', NULL, NULL, NULL, NULL,
NULL, NULL, default);
+
+INSERT
+ INTO perfsonar_iperf
+ VALUES ('meta2-iperf-test', NULL, 'bits/sec', 1.45, 1.806, '5/851',
23484640, 'Bytes', NULL, 1197642662, NULL, 'UDP', NULL, NULL, NULL, NULL,
NULL, NULL, default);
+
+
+
+# insert statements for testing clmp_ping table
+
+INSERT
+ INTO clmp_ping
+ VALUES ('ping-meta1', 1, 5.3, 'ms', 253, 8, 'Bytes', 1233655716, 'unix',
default);
+
+INSERT
+ INTO clmp_ping
+ VALUES ('ping-meta1', 2, 2.5, 'ms', 253, 8, 'Bytes', 1233655718, 'unix',
default);

Copied:
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/objects.config
(from rev 6046, trunk/perfsonar-java-sql-ma/conf/objects.config)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/objects.config
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/objects.config
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,186 @@
+http://ggf.org/ns/nmwg/base/2.0/subject/
org.ggf.ns.nmwg.base.v2_0.Subject
+http://ggf.org/ns/nmwg/base/2.0/parameters/
org.ggf.ns.nmwg.base.v2_0.Parameters
+http://ggf.org/ns/nmwg/base/2.0/commonTime/
org.ggf.ns.nmwg.base.v2_0.CommonTime
+http://ggf.org/ns/nmwg/base/2.0/data/ org.ggf.ns.nmwg.base.v2_0.Data
+http://ggf.org/ns/nmwg/base/2.0/datum/ org.ggf.ns.nmwg.base.v2_0.Datum
+http://ggf.org/ns/nmwg/base/2.0/parameter/
org.ggf.ns.nmwg.base.v2_0.Parameter
+http://ggf.org/ns/nmwg/base/2.0/metadata/
org.ggf.ns.nmwg.base.v2_0.Metadata
+http://ggf.org/ns/nmwg/base/2.0/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/store/ org.ggf.ns.nmwg.base.v2_0.Store
+http://ggf.org/ns/nmwg/characteristic/utilization/2.0/subject/
org.ggf.ns.nmwg.characteristic.utilization.v2_0.Subject
+http://ggf.org/ns/nmwg/characteristic/utilization/2.0/parameters/
org.ggf.ns.nmwg.characteristic.utilization.v2_0.Parameters
+http://ggf.org/ns/nmwg/characteristic/utilization/2.0/datum/
org.ggf.ns.nmwg.characteristic.utilization.v2_0.Datum
+http://ggf.org/ns/nmwg/characteristic/errors/2.0/subject/
org.ggf.ns.nmwg.characteristic.errors.v2_0.Subject
+http://ggf.org/ns/nmwg/characteristic/errors/2.0/parameters/
org.ggf.ns.nmwg.characteristic.errors.v2_0.Parameters
+http://ggf.org/ns/nmwg/characteristic/errors/2.0/datum/
org.ggf.ns.nmwg.characteristic.errors.v2_0.Datum
+http://ggf.org/ns/nmwg/characteristic/discards/2.0/subject/
org.ggf.ns.nmwg.characteristic.discards.v2_0.Subject
+http://ggf.org/ns/nmwg/characteristic/discards/2.0/parameters/
org.ggf.ns.nmwg.characteristic.discards.v2_0.Parameters
+http://ggf.org/ns/nmwg/characteristic/discards/2.0/datum/
org.ggf.ns.nmwg.characteristic.discards.v2_0.Datum
+http://ggf.org/ns/nmwg/event/status/base/2.0/stateOper/
org.ggf.ns.nmwg.event.status.base.v2_0.StateOper
+http://ggf.org/ns/nmwg/event/status/base/2.0/stateAdmin/
org.ggf.ns.nmwg.event.status.base.v2_0.StateAdmin
+http://ggf.org/ns/nmwg/event/status/base/2.0/datum/
org.ggf.ns.nmwg.event.status.base.v2_0.Datum
+http://ggf.org/ns/nmwg/ops/average/2.0/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
+http://ggf.org/ns/nmwg/ops/cdf/2.0/parameters/
org.ggf.ns.nmwg.ops.cdf.v2_0.Parameters
+http://ggf.org/ns/nmwg/ops/histogram/2.0/subject/
org.ggf.ns.nmwg.ops.histogram.v2_0.Subject
+http://ggf.org/ns/nmwg/ops/histogram/2.0/parameters/
org.ggf.ns.nmwg.ops.histogram.v2_0.Parameters
+http://ggf.org/ns/nmwg/ops/max/2.0/subject/
org.ggf.ns.nmwg.ops.max.v2_0.Subject
+http://ggf.org/ns/nmwg/ops/max/2.0/parameters/
org.ggf.ns.nmwg.ops.max.v2_0.Parameters
+http://ggf.org/ns/nmwg/ops/mean/2.0/subject/
org.ggf.ns.nmwg.ops.mean.v2_0.Subject
+http://ggf.org/ns/nmwg/ops/mean/2.0/parameters/
org.ggf.ns.nmwg.ops.mean.v2_0.Parameters
+http://ggf.org/ns/nmwg/ops/median/2.0/subject/
org.ggf.ns.nmwg.ops.median.v2_0.Subject
+http://ggf.org/ns/nmwg/ops/median/2.0/parameters/
org.ggf.ns.nmwg.ops.median.v2_0.Parameters
+http://ggf.org/ns/nmwg/ops/min/2.0/subject/
org.ggf.ns.nmwg.ops.min.v2_0.Subject
+http://ggf.org/ns/nmwg/ops/min/2.0/parameters/
org.ggf.ns.nmwg.ops.min.v2_0.Parameters
+http://ggf.org/ns/nmwg/ops/select/2.0/subject/
org.ggf.ns.nmwg.ops.select.v2_0.Subject
+http://ggf.org/ns/nmwg/ops/select/2.0/parameters/
org.ggf.ns.nmwg.ops.select.v2_0.Parameters
+http://ggf.org/ns/nmwg/result/2.0/datum/
org.ggf.ns.nmwg.result.v2_0.Datum
+http://ggf.org/ns/nmwg/time/2.0/end/ org.ggf.ns.nmwg.time.v2_0.End
+http://ggf.org/ns/nmwg/time/2.0/value/ org.ggf.ns.nmwg.time.v2_0.Value
+http://ggf.org/ns/nmwg/time/2.0/start/ org.ggf.ns.nmwg.time.v2_0.Start
+http://ggf.org/ns/nmwg/time/2.0/time/ org.ggf.ns.nmwg.time.v2_0.Time
+http://ggf.org/ns/nmwg/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/iperf/2.0/subject/
org.ggf.ns.nmwg.tools.iperf.v2_0.Subject
+http://ggf.org/ns/nmwg/tools/iperf/2.0/parameters/
org.ggf.ns.nmwg.tools.iperf.v2_0.Parameters
+http://ggf.org/ns/nmwg/tools/iperf/2.0/datum/
org.ggf.ns.nmwg.tools.iperf.v2_0.Datum
+http://ggf.org/ns/nmwg/tools/netflow/2.0/subject/
org.ggf.ns.nmwg.tools.netflow.v2_0.Subject
+http://ggf.org/ns/nmwg/tools/netflow/2.0/flowFormat/
org.ggf.ns.nmwg.tools.netflow.v2_0.FlowFormat
+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/router/
org.ggf.ns.nmwg.tools.netflow.v2_0.Router
+http://ggf.org/ns/nmwg/tools/netflow/2.0/description/
org.ggf.ns.nmwg.tools.netflow.v2_0.Description
+http://ggf.org/ns/nmwg/tools/netflow/2.0/flowFormats/
org.ggf.ns.nmwg.tools.netflow.v2_0.FlowFormats
+http://ggf.org/ns/nmwg/tools/netflow/2.0/parameters/
org.ggf.ns.nmwg.tools.netflow.v2_0.Parameters
+http://ggf.org/ns/nmwg/tools/netflow/2.0/transportFormat/
org.ggf.ns.nmwg.tools.netflow.v2_0.TransportFormat
+http://ggf.org/ns/nmwg/tools/netflow/2.0/transportFormats/
org.ggf.ns.nmwg.tools.netflow.v2_0.TransportFormats
+http://ggf.org/ns/nmwg/tools/org/perfsonar/service/lookup/sql/1.0/subject/
org.ggf.ns.nmwg.tools.org.perfsonar.service.lookup.sql.v1_0.Subject
+http://ggf.org/ns/nmwg/tools/org/perfsonar/service/lookup/sql/1.0/parameters/
org.ggf.ns.nmwg.tools.org.perfsonar.service.lookup.sql.v1_0.Parameters
+http://ggf.org/ns/nmwg/tools/org/perfsonar/service/lookup/sql/1.0/datum/
org.ggf.ns.nmwg.tools.org.perfsonar.service.lookup.sql.v1_0.Datum
+http://ggf.org/ns/nmwg/tools/org/perfsonar/service/lookup/xpath/1.0/subject/
org.ggf.ns.nmwg.tools.org.perfsonar.service.lookup.xpath.v1_0.Subject
+http://ggf.org/ns/nmwg/tools/org/perfsonar/service/lookup/xpath/1.0/parameters/

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

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

Copied:
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/psql-sqlma-dbremove.sql
(from rev 6046, trunk/perfsonar-java-sql-ma/conf/psql-sqlma-dbremove.sql)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/psql-sqlma-dbremove.sql
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/psql-sqlma-dbremove.sql
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,53 @@
+
+-- $Id: psql-sqlma-dbremove.sql 1540 2006-08-11 10:19:44Z roman $
+-- project: perfSONAR
+-- author: romradz
+
+-- SQL Measurement Archive (MA)
+-- sql script for postgresql db
+
+
+-- running:
+-- psql -f psql-sqlma-dbremove.conf
+
+
+-- perfsonar_ma user
+
+\c perfsonar_ma perfsonar_ma
+
+drop trigger trigger1 on perfsonar_utilization;
+
+drop table perfsonar_utilization;
+
+drop table perfsonar_errors;
+
+drop table perfsonar_discards;
+
+drop table domain_link;
+
+drop table interdomain_link;
+
+drop table perfsonar_links;
+
+drop table perfsonar_iperf;
+
+drop table clmp_ping;
+
+
+-- root (postgres) user
+
+\c perfsonar_ma postgres
+
+drop function fun1();
+
+drop language plpgsql;
+
+\c postgres postgres
+
+drop database perfsonar_ma;
+
+drop role perfsonar_ma;
+
+
+
+

Copied:
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/psql-sqlma-dbsetup.sql
(from rev 6046, trunk/perfsonar-java-sql-ma/conf/psql-sqlma-dbsetup.sql)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/psql-sqlma-dbsetup.sql
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/psql-sqlma-dbsetup.sql
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,251 @@
+
+-- $Id: psql-sqlma-dbsetup.sql 1545 2006-08-11 12:12:24Z roman $
+-- project: perfSONAR
+-- author: romradz
+
+-- SQL Measurement Archive (MA)
+-- sql script for postgresql db
+
+
+-- running:
+-- psql -f psql-sqlma-dbsetup.conf
+
+
+-- root (postgres) user
+
+
+create user perfsonar_ma login password 'testpass';
+
+create database perfsonar_ma owner perfsonar_ma;
+
+\c perfsonar_ma
+
+create language plpgsql;
+
+create function fun1() returns trigger AS '
+ declare
+ nr integer;
+ mintm integer;
+ begin
+ select into nr count(metadataId) from perfsonar_utilization;
+ select into mintm min(timeValue) from perfsonar_utilization;
+ delete from perfsonar_utilization
+ where
+ metadataId =
+ (select metadataId from perfsonar_utilization
+ where timeValue = mintm limit 1)
+ and nr > 10000;
+ return OLD;
+ end;
+ ' language plpgsql;
+
+
+
+-- perfsonar_ma user
+
+\c perfsonar_ma perfsonar_ma
+
+create table
+ perfsonar_utilization
+ (metadataId varchar(30) not null, -- id of metadata which is
stored in xml database
+ value double precision not null, -- measurement value
+ valueUnits varchar(30) null, -- unit of value
+ timeValue integer not null, -- seconds since `00:00:00
1970-01-01 UTC'
+ ts timestamp default now() -- time of inserting
+ );
+
+create table
+ perfsonar_errors
+ (metadataId varchar(30) not null,
+ value double precision not null,
+ valueUnits varchar(30) null,
+ timeValue integer not null,
+ ts timestamp default now()
+ );
+
+create table
+ perfsonar_discards
+ (metadataId varchar(30) not null,
+ value double precision not null,
+ valueUnits varchar(30) null,
+ timeValue integer not null,
+ ts timestamp default now()
+ );
+
+create table
+ domain_link
+ (id varchar(255) not null,
+ time timestamp default now(),
+ status_oper varchar(255) default 'unknown',
+ status_admin varchar(255) default 'unknown',
+ alarm_id_set varchar(255),
+ comments varchar(255)
+ );
+
+create table
+ interdomain_link
+ (id varchar(255) not null,
+ time timestamp default now(),
+ status_oper varchar(255) default 'unknown',
+ status_admin varchar(255) default 'unknown',
+ alarm_id_set varchar(255),
+ comments varchar(255)
+ );
+
+create table
+ perfsonar_links
+ (id varchar(255) not null,
+ time timestamp default now(),
+ status_oper varchar(255) default 'unknown',
+ status_admin varchar(255) default 'unknown',
+ alarm_id_set varchar(255),
+ comments varchar(255)
+ );
+
+create table
+ perfsonar_iperf
+ (metadataId varchar(30) not null,
+ value double precision null,
+ valueUnits varchar(30) null,
+ throughput double precision null,
+ jitter double precision null,
+ loss varchar(15) null,
+ numBytes NUMERIC(40) null,
+ numBytesUnits varchar(15) null,
+ interv varchar(30) null,
+ time integer not null,
+ format varchar(30) null,
+ protocol varchar(10) null,
+ bufferLength integer null,
+ windowSize integer null,
+ windowSizeRequest varchar(30) null,
+ timeDuration varchar(30) null,
+ arguments varchar(50) null,
+ test_session_id varchar(30) null,
+ ts timestamp default now()
+ );
+
+create table
+ clmp_ping
+ (metadataId varchar(255) not null,
+ seqNum integer null default 0,
+ value double precision not null,
+ valueUnits varchar(4) null,
+ ttl smallint null default 0,
+ numBytes integer null default 0,
+ numBytesUnits varchar(10) null,
+ timeValue integer not null,
+ timeType varchar(4) null,
+ ts timestamp default now()
+ );
+
+
+-- insert statements for testing perfsonar_utilization table
+
+insert
+ into perfsonar_utilization
+ values ('meta1-test', 2, 'Bps', 1143034705);
+
+insert
+ into perfsonar_utilization
+ values ('meta2-test', 3, 'Bps', 1143034706);
+
+insert
+ into perfsonar_utilization
+ values ('meta3-test', 4, 'Bps', 1143034707);
+
+insert
+ into perfsonar_utilization
+ values ('meta4-test', 5, 'Bps', 1143034709);
+
+
+-- insert statements for testing perfsonar_errors table
+
+insert
+ into perfsonar_errors
+ values ('meta1-errors-test', 1, 'Eps', 1187948870);
+
+insert
+ into perfsonar_errors
+ values ('meta1-errors-test', 0, 'Eps', 1187948875);
+
+insert
+ into perfsonar_errors
+ values ('meta1-errors-test', 4, 'Eps', 1187948882);
+
+insert
+ into perfsonar_errors
+ values ('meta1-errors-test', 2, 'Eps', 1187948888);
+
+
+-- insert statements for testing perfsonar_discards table
+
+insert
+ into perfsonar_discards
+ values ('meta1-discards-test', 1, 'Dps', 1187948870);
+
+insert
+ into perfsonar_discards
+ values ('meta1-discards-test', 0, 'Dps', 1187948875);
+
+insert
+ into perfsonar_discards
+ values ('meta1-discards-test', 4, 'Dps', 1187948882);
+
+insert
+ into perfsonar_discards
+ values ('meta1-discards-test', 2, 'Dps', 1187948888);
+
+
+-- insert statements for testing domain_link table
+
+insert
+ into domain_link (id, status_oper, time)
+ values ('DFN-link-1234', 'down', '2006-04-06 12:15:23');
+
+insert
+ into domain_link (id, status_oper, time)
+ values ('DFN-Surfnet-Link-5678', 'up', '2006-04-06 12:15:24');
+
+insert
+ into domain_link (id, status_oper, time)
+ values ('PSNC-DFN-MUE-Link-1001', 'down', '2006-04-06 12:15:25');
+
+
+-- insert statements for testing interdomain_link table
+
+insert
+ into interdomain_link (id, status_oper, time)
+ values ('PSNC-2-DFN-MUE-Link-1002', 'up', '2006-04-06 12:17:33');
+
+
+-- insert statements for testing perfsonar_iperf table
+
+insert
+ into perfsonar_iperf
+ values ('meta1-iperf-test', null, 'bits/sec', 2.88, 1.830, '0/837',
23484640, 'Bytes', null, 1197642642, null, 'TCP', null, null, null, null,
null, null, default);
+
+insert
+ into perfsonar_iperf
+ values ('meta2-iperf-test', null, 'bits/sec', 1.45, 1.806, '5/851',
23484640, 'Bytes', null, 1197642662, null, 'UDP', null, null, null, null,
null, null, default);
+
+
+-- insert statements for testing clmp_ping table
+
+insert
+ into clmp_ping
+ values ('ping-meta1', 1, 5.3, 'ms', 253, 8, 'Bytes', 1233655716, 'unix',
default);
+
+insert
+ into clmp_ping
+ values ('ping-meta1', 2, 2.5, 'ms', 253, 8, 'Bytes', 1233655718, 'unix',
default);
+
+
+
+-- trigger
+
+create trigger trigger1
+ after insert on perfsonar_utilization
+ for each row
+ execute procedure fun1();
+

Copied:
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/service.properties
(from rev 6046, trunk/perfsonar-java-sql-ma/conf/service.properties)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/service.properties
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/service.properties
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,175 @@
+
+
+# this template file is prepared for the releases with web admin stuff and
packaged in rpm form
+# $Id$
+# romradz
+
+
+
+#
-----------------------------------------------------------------------------------------------
+# Configuration of the internal implementation structures
+
+
+# Group=Internal
+# Description=The type of service used to select the correct message handler
implementation.
+service.r.type=ma
+
+# Group=Internal
+# Description=The service name.
+service.name=geant2-java-sql-ma-2.3-1
+
+# Group=Internal
+# Description=The java class file which implements the ServiceEngine
interface.
+service.ma.class_name=org.perfsonar.service.measurementArchive.sqlType.SQLTypeMAServiceEngine
+
+# Group=Internal
+# Description=A CSV of request message types supported by the service.
+service.ma.message_types=MeasurementArchiveStoreKeyRequest,MeasurementArchiveStoreRequest,MetadataKeyRequest,SetupDataRequest,EchoRequest,LookupInfoRequest
+
+# Group=Internal
+# Description=The java class file which implements the base chaining of
requests.
+service.ma.base_chaining_mergers=org.perfsonar.service.measurementArchive.sqlType.NMWGInterfaceBaseChaining
+
+# Group=Internal
+# Description=The path to the file objects.config, including the NMWG
parser's configuration settings. The parser reads the request or metadata
configuration files, and creates internally used objects that represent these
files.
+service.sax_parser.config=/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/perfsonar/conf/objects.config
+
+# Group=Internal
+# Description=The path to the log4j.properties configuration file. If you
want to enable syslog message logging, enter the path to the
log4j.syslog.properties file instead.
+service.log.log4j.config=/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/perfsonar/conf/log4j.properties
+
+# Group=Internal
+# Description=The path to the metadata configuration file, including the
file's name.
+service.ma.conf_file=/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/perfsonar/conf/sql-database_TEST.xml
+
+
+
+#
-----------------------------------------------------------------------------------------------
+# Configuration of storing metadata configuration file in xml db eXist
+
+
+# Group=eXist
+# Description=Determines whether the xmld db (eXist) is used as a storage
for the metadata configuration file (on) or not (off). Currently only the
value 'on' is needed to run the service correctly.
+component.ma.xmldb.db_status=on
+
+# Group=eXist
+# Description=The type of connection to the eXist DB (xmlrpc or http). The
http type is not recommended when transfers of many data are expected.
+component.ma.xmldb.db_access=xmlrpc
+
+# Group=eXist
+# Description=URI address of the collection in the eXist DB that contains
the metadata configuration file.
+component.ma.xmldb.db_uri=xmldb:exist://localhost:8080/exist/xmlrpc/db/sqlmaconfig
+
+# Group=eXist
+# Description=The username for the eXist DB.
+component.ma.xmldb.db_username=sqlmaservice
+
+# Group=eXist
+# Description=The user password for the eXist DB.
+component.ma.xmldb.db_password=sqlmaservice
+
+# Group=eXist
+# Description=The administrator password for the eXist DB.
+component.ma.xmldb.db_adminpassword=
+
+# Group=eXist
+# Description=Determines how the eXist DB is installed (webapp or
stand-alone).
+component.ma.xmldb.type=webapp
+
+
+
+#
-----------------------------------------------------------------------------------------------
+# Configuration of LS functionality
+
+
+# Group=LS
+# Description=The service type.
+service.r.service_type=ma
+
+# Group=LS
+# Description=The URL address of the LS service (more LS addresses can be
separated by commas).
+service.r.ls_url=http://somewhere
+
+# Group=LS
+# Description=The URL address of the service configured by this
configuration file.
+service.r.access_point=http://somewhere:8080/geant2-java-sql-ma/services/MeasurementArchiveService
+
+# Group=LS
+# Description=The name of the organisation who is deploying the service.
+service.r.organization_name=X
+
+# Group=LS
+# Description=The name of the service (can contain multiple words).
+service.r.service_name=pS java sql ma
+
+# Group=LS
+# Description=The version number of the service.
+service.r.service_version=2.3-1
+
+# Group=LS
+# Description=The email address of the person who manages the service.
+service.r.contact_email=user@domain
+
+# Group=LS
+# Description=The description of the service.
+service.r.service_description=perfSONAR service
+
+# Group=LS
+# Description=The time (seconds) between register requests to the LS service
(default value is 43200 secs; 12 hours).
+component.registrator.interval=43200
+
+# Group=LS
+# Description=The name of the scheduler component (the implementation of
this component must also be declared in the components.properties file).
+component.registrator.scheduler_component=ma_scheduler
+
+# Group=LS
+# Description=Enter 'xmldb' to take metadata elements for register requests
from the XML database, or 'file' to take them from the XML metadata
configuration file.
+service.ma.conf_file.store_type=xmldb
+
+
+
+#
-----------------------------------------------------------------------------------------------
+# Configuration of AuthN functionality
+
+
+# Group=Authentication
+# Description=The URL address of the Authentication Service.
+service.as.point=http\://homer.rediris.es\:8080/perfSONAR-AS/services/AuthService
+
+# Group=Authentication
+# Description=The types of messages for which authentication is to be
enabled (if required).
+service.as.authn_for_msg_types=MeasurementArchiveStoreKeyRequest,MeasurementArchiveStoreRequest,SetupDataRequest,MetadataKeyRequest
+
+# Group=Authentication
+# Description=Determines if authentication is enabled (on) or not (off).
+service.as.authn_active=off
+
+
+
+#
-----------------------------------------------------------------------------------------------
+# Configuration of store functionality
+
+
+# Group=Store
+# Description=Determines whether new data sent to the service is stored (on)
or not (off).
+service.ma.xmldb.db_store=on
+
+
+#
-----------------------------------------------------------------------------------------------
+# Configuration of database settings
+
+# Group=JDBC
+# Description=The JDBC driver name
+service.ma.jdbc.driver=com.mysql.jdbc.Driver
+
+# Group=JDBC
+# Description=The JDBC connection URL
+service.ma.jdbc.url=jdbc:mysql://127.0.0.1/perfsonar_ma
+
+# Group=JDBC
+# Description=Database user name
+service.ma.jdbc.username=perfsonar_ma
+
+# Group=JDBC
+# Description=Database password
+service.ma.jdbc.password=testpass
\ No newline at end of file

Copied:
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/servlet.properties
(from rev 6046, trunk/perfsonar-java-sql-ma/conf/servlet.properties)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/servlet.properties
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/servlet.properties
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,22 @@
+#The type of the service
+servlet.service_type=sqlma
+
+#The ConfigurationHandler interface implementation used by the Wizard Servlet
+servlet.wizard.external_handler=perfSONARWebAdmin.admin.wizard.services.RRDMAHandler

+
+#The username used for authentication reasons when accessing properties
configuration and Wizard servlets
+servlet.username=perfsonaruser
+
+#The password used for authentication reasons when accessing properties
configuration and Wizard servlets
+servlet.password=perfsonarpass
+
+
+#The property inside the service.properties file that holds the admin
password for the eXist db
+servlet.exist_adminpass.property=component.ma.xmldb.db_adminpassword
+
+#The property inside the service.properties file that holds the location of
the eXist db
+servlet.exist_location.property=component.ma.xmldb.db_uri
+
+
+#Controls the use of advanced features in the properties management servlet.
Default value is “off”
+servlet.extra_functionalities=off
\ No newline at end of file

Copied:
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/sql-database-L2status_TEST.xml
(from rev 6046,
trunk/perfsonar-java-sql-ma/conf/sql-database-L2status_TEST.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/sql-database-L2status_TEST.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/sql-database-L2status_TEST.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,229 @@
+<nmwg:store xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+ xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";
+ xmlns:nmwgtopo3="http://ggf.org/ns/nmwg/topology/base/3.0/";
+ xmlns:nmtl2="http://ggf.org/ns/nmwg/topology/l2/3.0/";
+ xmlns:nmtl3="http://ggf.org/ns/nmwg/topology/l3/3.0/";>
+
+
+
+ <nmwg:metadata id="md1">
+ <nmwg:subject id="sub-DFN-LRZ">
+ <nmwgtopo3:node id="DFN-LRZ">
+ <nmwgtopo3:type>TopologyPoint</nmwgtopo3:type>
+ <nmwgtopo3:name type="logical">DFN-LRZ</nmwgtopo3:name>
+ <nmwgtopo3:country>Germany</nmwgtopo3:country>
+ <nmwgtopo3:city>Munich</nmwgtopo3:city>
+ <nmwgtopo3:institution>Leibniz
Rechenzentrum</nmwgtopo3:institution>
+ <nmwgtopo3:latitude>0</nmwgtopo3:latitude>
+ <nmwgtopo3:longitude>0</nmwgtopo3:longitude>
+ </nmwgtopo3:node>
+ </nmwg:subject>
+ </nmwg:metadata>
+
+
+ <nmwg:metadata id="md2">
+ <nmwg:subject id="sub-DFN-MUE">
+ <nmwgtopo3:node id="DFN-MUE">
+ <nmwgtopo3:type>TopologyPoint</nmwgtopo3:type>
+ <nmwgtopo3:name type="logical">DFN-MUE</nmwgtopo3:name>
+ <nmwgtopo3:country>Germany</nmwgtopo3:country>
+ <nmwgtopo3:city>Muenster</nmwgtopo3:city>
+ <nmwgtopo3:institution>DFN-Verein</nmwgtopo3:institution>
+ <nmwgtopo3:latitude>0</nmwgtopo3:latitude>
+ <nmwgtopo3:longitude>0</nmwgtopo3:longitude>
+ </nmwgtopo3:node>
+ </nmwg:subject>
+ </nmwg:metadata>
+
+
+ <nmwg:metadata id="md3">
+ <nmwg:subject id="sub-SURFnet-MUE">
+ <nmwgtopo3:node id="SURFnet-MUE">
+ <nmwgtopo3:type>TopologyPoint</nmwgtopo3:type>
+ <nmwgtopo3:name type="logical">SURFnet-MUE</nmwgtopo3:name>
+ <nmwgtopo3:country>Netherlands</nmwgtopo3:country>
+ <nmwgtopo3:city>Amsterdam</nmwgtopo3:city>
+ <nmwgtopo3:institution>Surfnet</nmwgtopo3:institution>
+ <nmwgtopo3:latitude>0</nmwgtopo3:latitude>
+ <nmwgtopo3:longitude>0</nmwgtopo3:longitude>
+ </nmwgtopo3:node>
+ </nmwg:subject>
+ </nmwg:metadata>
+
+
+ <nmwg:metadata id="md4">
+ <nmwg:subject id="sub-PSNC-PL">
+ <nmwgtopo3:node id="PSNC-PL">
+ <nmwgtopo3:type>TopologyPoint</nmwgtopo3:type>
+ <nmwgtopo3:name type="logical">PSNC-PL</nmwgtopo3:name>
+ <nmwgtopo3:country>Poland</nmwgtopo3:country>
+ <nmwgtopo3:city>Poznan</nmwgtopo3:city>
+ <nmwgtopo3:institution>PSNC</nmwgtopo3:institution>
+ <nmwgtopo3:latitude>0</nmwgtopo3:latitude>
+ <nmwgtopo3:longitude>0</nmwgtopo3:longitude>
+ </nmwgtopo3:node>
+ </nmwg:subject>
+ </nmwg:metadata>
+
+
+ <nmwg:metadata id="md5">
+ <nmwg:subject id="sub-PSNC-PL-2">
+ <nmwgtopo3:node id="PSNC-PL-2">
+ <nmwgtopo3:type>TopologyPoint</nmwgtopo3:type>
+ <nmwgtopo3:name type="logical">PSNC-PL-2</nmwgtopo3:name>
+ <nmwgtopo3:country>Poland</nmwgtopo3:country>
+ <nmwgtopo3:city>Poznan</nmwgtopo3:city>
+ <nmwgtopo3:institution>PSNC</nmwgtopo3:institution>
+ <nmwgtopo3:latitude>0</nmwgtopo3:latitude>
+ <nmwgtopo3:longitude>0</nmwgtopo3:longitude>
+ </nmwgtopo3:node>
+ </nmwg:subject>
+ </nmwg:metadata>
+
+
+ <nmwg:metadata id="md-link-LRZ-SARA-DEISA-001">
+ <nmwg:subject id="sub1">
+ <nmtl2:link>
+
+ <nmtl2:name type="logical">DFN-link-1234</nmtl2:name>
+ <nmtl2:globalName
type="logical">LRZ-SARA-DEISA-001</nmtl2:globalName>
+ <nmtl2:type>NREN_Link</nmtl2:type>
+
+ <nmwgtopo3:node nodeIdRef="DFN-LRZ">
+ <nmwgtopo3:role>EndPoint</nmwgtopo3:role>
+ </nmwgtopo3:node>
+
+ <nmwgtopo3:node nodeIdRef="DFN-MUE">
+ <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
+ </nmwgtopo3:node>
+
+ </nmtl2:link>
+ </nmwg:subject>
+ <nmwg:parameters>
+ <nmwg:parameter
name="supportedEventType">Path.Status</nmwg:parameter>
+ <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
+ </nmwg:parameters>
+ <!-- <nmwg:eventType>Path.Status</nmwg:eventType> -->
+ </nmwg:metadata>
+
+
+ <nmwg:metadata id="md-link-LRZ-SARA-DEISA-002">
+ <nmwg:subject id="sub1">
+ <nmtl2:link>
+
+ <nmtl2:name type="logical">DFN-Surfnet-Link-5678</nmtl2:name>
+ <nmtl2:globalName
type="logical">LRZ-SARA-DEISA-002</nmtl2:globalName>
+ <nmtl2:type>ID_Link</nmtl2:type>
+
+ <nmwgtopo3:node nodeIdRef="DFN-MUE">
+ <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
+ </nmwgtopo3:node>
+
+ <nmwgtopo3:node nodeIdRef="SURFnet-MUE">
+ <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
+ </nmwgtopo3:node>
+
+ </nmtl2:link>
+ </nmwg:subject>
+ <nmwg:parameters>
+ <nmwg:parameter
name="supportedEventType">Path.Status</nmwg:parameter>
+ <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
+ </nmwg:parameters>
+ <!-- <nmwg:eventType>Path.Status</nmwg:eventType> -->
+ </nmwg:metadata>
+
+
+ <nmwg:metadata id="md-link-PSNC-DFN-MUE-003">
+ <nmwg:subject id="sub1">
+ <nmtl2:link>
+
+ <nmtl2:name
type="logical">PSNC-DFN-MUE-Link-1001</nmtl2:name>
+ <nmtl2:globalName
type="logical">PSNC-DFN-MUE-003</nmtl2:globalName>
+ <nmtl2:type>ID_Link</nmtl2:type>
+
+ <nmwgtopo3:node nodeIdRef="PSNC-PL">
+ <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
+ </nmwgtopo3:node>
+
+ <nmwgtopo3:node nodeIdRef="DFN-MUE">
+ <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
+ </nmwgtopo3:node>
+
+ </nmtl2:link>
+ </nmwg:subject>
+ <nmwg:parameters>
+ <nmwg:parameter
name="supportedEventType">Path.Status</nmwg:parameter>
+ <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
+ </nmwg:parameters>
+ <!-- <nmwg:eventType>Path.Status</nmwg:eventType> -->
+ </nmwg:metadata>
+
+
+ <nmwg:metadata id="md-link-PSNC-2-DFN-MUE-004">
+ <nmwg:subject id="sub1">
+ <nmtl2:link>
+
+ <nmtl2:name
type="logical">PSNC-2-DFN-MUE-Link-1002</nmtl2:name>
+ <nmtl2:globalName
type="logical">PSNC-2-DFN-MUE-004</nmtl2:globalName>
+ <nmtl2:type>ID_Link</nmtl2:type>
+
+ <nmwgtopo3:node nodeIdRef="PSNC-PL-2">
+ <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
+ </nmwgtopo3:node>
+
+ <nmwgtopo3:node nodeIdRef="DFN-MUE">
+ <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
+ </nmwgtopo3:node>
+
+ </nmtl2:link>
+ </nmwg:subject>
+ <nmwg:parameters>
+ <nmwg:parameter
name="supportedEventType">Path.Status</nmwg:parameter>
+ <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
+ </nmwg:parameters>
+ <!-- <nmwg:eventType>Path.Status</nmwg:eventType> -->
+ </nmwg:metadata>
+
+
+ <nmwg:data id="d1" metadataIdRef="md-link-LRZ-SARA-DEISA-001">
+ <nmwg:key>
+ <nmwg:parameters>
+ <nmwg:parameter name="pathId">DFN-link-1234</nmwg:parameter>
+ <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-L2-status-domain.xml</nmwg:parameter>
+ </nmwg:parameters>
+ </nmwg:key>
+ </nmwg:data>
+
+
+ <nmwg:data id="d2" metadataIdRef="md-link-LRZ-SARA-DEISA-002">
+ <nmwg:key>
+ <nmwg:parameters>
+ <nmwg:parameter
name="pathId">DFN-Surfnet-Link-5678</nmwg:parameter>
+ <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-L2-status-domain.xml</nmwg:parameter>
+ </nmwg:parameters>
+ </nmwg:key>
+ </nmwg:data>
+
+
+ <nmwg:data id="d3" metadataIdRef="md-link-PSNC-DFN-MUE-003">
+ <nmwg:key>
+ <nmwg:parameters>
+ <nmwg:parameter
name="pathId">PSNC-DFN-MUE-Link-1001</nmwg:parameter>
+ <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-L2-status-domain.xml</nmwg:parameter>
+ </nmwg:parameters>
+ </nmwg:key>
+ </nmwg:data>
+
+
+ <nmwg:data id="d4" metadataIdRef="md-link-PSNC-2-DFN-MUE-004">
+ <nmwg:key>
+ <nmwg:parameters>
+ <nmwg:parameter
name="pathId">PSNC-2-DFN-MUE-Link-1002</nmwg:parameter>
+ <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-L2-status-interdomain.xml</nmwg:parameter>
+ </nmwg:parameters>
+ </nmwg:key>
+ </nmwg:data>
+
+
+
+</nmwg:store>
\ No newline at end of file

Copied:
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/sql-database_TEST.xml
(from rev 6046, trunk/perfsonar-java-sql-ma/conf/sql-database_TEST.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/sql-database_TEST.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/sql-database_TEST.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,415 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<nmwg:store xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
+ xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+ xmlns:netutil="http://ggf.org/ns/nmwg/characteristic/utilization/2.0/";
+ xmlns:nmwgtopo="http://ggf.org/ns/nmwg/topology/2.0/";
+ xmlns:nmwgtopo3="http://ggf.org/ns/nmwg/topology/base/3.0/";
+ xmlns:nmtl2="http://ggf.org/ns/nmwg/topology/l2/3.0/";
+ xmlns:errors="http://ggf.org/ns/nmwg/characteristic/errors/2.0/";
+ xmlns:discards="http://ggf.org/ns/nmwg/characteristic/discards/2.0/";
+ xmlns:iperf="http://ggf.org/ns/nmwg/tools/iperf/2.0/";
+ xmlns:ping="http://ggf.org/ns/nmwg/tools/ping/2.0/";
+ xmlns="http://ggf.org/ns/nmwg/base/2.0/";>
+
+
+
+ <!-- utilization metadata section -->
+
+
+ <nmwg:metadata id="meta1-test">
+ <netutil:subject id="subj1">
+ <nmwgt:interface>
+ <nmwgt:hostName>test-hostName</nmwgt:hostName>
+ <nmwgt:ifAddress type="ipv4">10.1.2.3</nmwgt:ifAddress>
+ <nmwgt:ifName>test-0</nmwgt:ifName>
+ <nmwgt:ifDescription>test description</nmwgt:ifDescription>
+ <nmwgt:direction>in</nmwgt:direction>
+ <nmwgt:capacity>1000BaseT</nmwgt:capacity>
+ </nmwgt:interface>
+ </netutil:subject>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:eventType>
+ <nmwg:parameters id="params1">
+ <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
+ </nmwg:parameters>
+ </nmwg:metadata>
+
+
+ <nmwg:data id="data1-test" metadataIdRef="meta1-test">
+ <nmwg:key>
+ <nmwg:parameters>
+ <nmwg:parameter name="metadataId">meta1-test</nmwg:parameter>
+ <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-utilization.xml</nmwg:parameter>
+ <nmwg:parameter
name="eventType">http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:parameter>
+ </nmwg:parameters>
+ </nmwg:key>
+ </nmwg:data>
+
+
+ <!-- errors metadata section -->
+
+
+ <nmwg:metadata id="meta1-errors-test">
+ <errors:subject id="subj1">
+ <nmwgt:interface>
+ <nmwgt:hostName>test-hostName</nmwgt:hostName>
+ <nmwgt:ifAddress type="ipv4">10.1.2.3</nmwgt:ifAddress>
+ <nmwgt:ifName>test-0</nmwgt:ifName>
+ <nmwgt:ifIndex>2</nmwgt:ifIndex>
+ <nmwgt:direction>in</nmwgt:direction>
+ <nmwgt:capacity>1000000000</nmwgt:capacity>
+ </nmwgt:interface>
+ </errors:subject>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/errors/2.0</nmwg:eventType>
+ <nmwg:parameters id="params1">
+ <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
+ </nmwg:parameters>
+ </nmwg:metadata>
+
+
+ <nmwg:data id="data1-errors-test" metadataIdRef="meta1-errors-test">
+ <nmwg:key>
+ <nmwg:parameters>
+ <nmwg:parameter
name="metadataId">meta1-errors-test</nmwg:parameter>
+ <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-errors.xml</nmwg:parameter>
+ <nmwg:parameter
name="eventType">http://ggf.org/ns/nmwg/characteristic/errors/2.0</nmwg:parameter>
+ </nmwg:parameters>
+ </nmwg:key>
+ </nmwg:data>
+
+
+ <!-- discards metadata section -->
+
+
+ <nmwg:metadata id="meta1-discards-test">
+ <discards:subject id="subj1">
+ <nmwgt:interface>
+ <nmwgt:hostName>test-hostName</nmwgt:hostName>
+ <nmwgt:ifAddress type="ipv4">10.1.2.3</nmwgt:ifAddress>
+ <nmwgt:ifName>test-0</nmwgt:ifName>
+ <nmwgt:ifIndex>2</nmwgt:ifIndex>
+ <nmwgt:direction>in</nmwgt:direction>
+ <nmwgt:capacity>1000000000</nmwgt:capacity>
+ </nmwgt:interface>
+ </discards:subject>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/discards/2.0</nmwg:eventType>
+ <nmwg:parameters id="params1">
+ <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
+ </nmwg:parameters>
+ </nmwg:metadata>
+
+
+ <nmwg:data id="data1-discards-test" metadataIdRef="meta1-discards-test">
+ <nmwg:key>
+ <nmwg:parameters>
+ <nmwg:parameter
name="metadataId">meta1-discards-test</nmwg:parameter>
+ <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-discards.xml</nmwg:parameter>
+ <nmwg:parameter
name="eventType">http://ggf.org/ns/nmwg/characteristic/discards/2.0</nmwg:parameter>
+ </nmwg:parameters>
+ </nmwg:key>
+ </nmwg:data>
+
+
+ <!-- L2 status section -->
+
+
+ <nmwg:metadata id="md1">
+ <nmwg:subject id="sub-DFN-LRZ">
+ <nmwgtopo3:node id="DFN-LRZ">
+ <nmwgtopo3:type>TopologyPoint</nmwgtopo3:type>
+ <nmwgtopo3:name type="logical">DFN-LRZ</nmwgtopo3:name>
+ <nmwgtopo3:country>Germany</nmwgtopo3:country>
+ <nmwgtopo3:city>Munich</nmwgtopo3:city>
+ <nmwgtopo3:institution>Leibniz
Rechenzentrum</nmwgtopo3:institution>
+ <nmwgtopo3:latitude>0</nmwgtopo3:latitude>
+ <nmwgtopo3:longitude>0</nmwgtopo3:longitude>
+ </nmwgtopo3:node>
+ </nmwg:subject>
+ </nmwg:metadata>
+
+
+ <nmwg:metadata id="md2">
+ <nmwg:subject id="sub-DFN-MUE">
+ <nmwgtopo3:node id="DFN-MUE">
+ <nmwgtopo3:type>TopologyPoint</nmwgtopo3:type>
+ <nmwgtopo3:name type="logical">DFN-MUE</nmwgtopo3:name>
+ <nmwgtopo3:country>Germany</nmwgtopo3:country>
+ <nmwgtopo3:city>Muenster</nmwgtopo3:city>
+ <nmwgtopo3:institution>DFN-Verein</nmwgtopo3:institution>
+ <nmwgtopo3:latitude>0</nmwgtopo3:latitude>
+ <nmwgtopo3:longitude>0</nmwgtopo3:longitude>
+ </nmwgtopo3:node>
+ </nmwg:subject>
+ </nmwg:metadata>
+
+
+ <nmwg:metadata id="md3">
+ <nmwg:subject id="sub-SURFnet-MUE">
+ <nmwgtopo3:node id="SURFnet-MUE">
+ <nmwgtopo3:type>TopologyPoint</nmwgtopo3:type>
+ <nmwgtopo3:name type="logical">SURFnet-MUE</nmwgtopo3:name>
+ <nmwgtopo3:country>Netherlands</nmwgtopo3:country>
+ <nmwgtopo3:city>Amsterdam</nmwgtopo3:city>
+ <nmwgtopo3:institution>Surfnet</nmwgtopo3:institution>
+ <nmwgtopo3:latitude>0</nmwgtopo3:latitude>
+ <nmwgtopo3:longitude>0</nmwgtopo3:longitude>
+ </nmwgtopo3:node>
+ </nmwg:subject>
+ </nmwg:metadata>
+
+
+ <nmwg:metadata id="md4">
+ <nmwg:subject id="sub-PSNC-PL">
+ <nmwgtopo3:node id="PSNC-PL">
+ <nmwgtopo3:type>TopologyPoint</nmwgtopo3:type>
+ <nmwgtopo3:name type="logical">PSNC-PL</nmwgtopo3:name>
+ <nmwgtopo3:country>Poland</nmwgtopo3:country>
+ <nmwgtopo3:city>Poznan</nmwgtopo3:city>
+ <nmwgtopo3:institution>PSNC</nmwgtopo3:institution>
+ <nmwgtopo3:latitude>0</nmwgtopo3:latitude>
+ <nmwgtopo3:longitude>0</nmwgtopo3:longitude>
+ </nmwgtopo3:node>
+ </nmwg:subject>
+ </nmwg:metadata>
+
+
+ <nmwg:metadata id="md5">
+ <nmwg:subject id="sub-PSNC-PL-2">
+ <nmwgtopo3:node id="PSNC-PL-2">
+ <nmwgtopo3:type>TopologyPoint</nmwgtopo3:type>
+ <nmwgtopo3:name type="logical">PSNC-PL-2</nmwgtopo3:name>
+ <nmwgtopo3:country>Poland</nmwgtopo3:country>
+ <nmwgtopo3:city>Poznan</nmwgtopo3:city>
+ <nmwgtopo3:institution>PSNC</nmwgtopo3:institution>
+ <nmwgtopo3:latitude>0</nmwgtopo3:latitude>
+ <nmwgtopo3:longitude>0</nmwgtopo3:longitude>
+ </nmwgtopo3:node>
+ </nmwg:subject>
+ </nmwg:metadata>
+
+
+ <nmwg:metadata id="md-link-LRZ-SARA-DEISA-001">
+ <nmwg:subject id="sub1">
+ <nmtl2:link>
+
+ <nmtl2:name type="logical">DFN-link-1234</nmtl2:name>
+ <nmtl2:globalName
type="logical">LRZ-SARA-DEISA-001</nmtl2:globalName>
+ <nmtl2:type>NREN_Link</nmtl2:type>
+
+ <nmwgtopo3:node nodeIdRef="DFN-LRZ">
+ <nmwgtopo3:role>EndPoint</nmwgtopo3:role>
+ </nmwgtopo3:node>
+
+ <nmwgtopo3:node nodeIdRef="DFN-MUE">
+ <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
+ </nmwgtopo3:node>
+
+ </nmtl2:link>
+ </nmwg:subject>
+ <nmwg:parameters>
+ <!-- supportedEventType parameter can replace the eventType
'Path.Status' -->
+ <!-- <nmwg:parameter
name="supportedEventType">Path.Status</nmwg:parameter> -->
+ <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
+ </nmwg:parameters>
+ <nmwg:eventType>Path.Status</nmwg:eventType>
+ </nmwg:metadata>
+
+
+ <nmwg:metadata id="md-link-LRZ-SARA-DEISA-002">
+ <nmwg:subject id="sub1">
+ <nmtl2:link>
+
+ <nmtl2:name type="logical">DFN-Surfnet-Link-5678</nmtl2:name>
+ <nmtl2:globalName
type="logical">LRZ-SARA-DEISA-002</nmtl2:globalName>
+ <nmtl2:type>ID_Link</nmtl2:type>
+
+ <nmwgtopo3:node nodeIdRef="DFN-MUE">
+ <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
+ </nmwgtopo3:node>
+
+ <nmwgtopo3:node nodeIdRef="SURFnet-MUE">
+ <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
+ </nmwgtopo3:node>
+
+ </nmtl2:link>
+ </nmwg:subject>
+ <nmwg:parameters>
+ <!-- supportedEventType parameter can replace the eventType
'Path.Status' -->
+ <!-- <nmwg:parameter
name="supportedEventType">Path.Status</nmwg:parameter> -->
+ <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
+ </nmwg:parameters>
+ <nmwg:eventType>Path.Status</nmwg:eventType>
+ </nmwg:metadata>
+
+
+ <nmwg:metadata id="md-link-PSNC-DFN-MUE-003">
+ <nmwg:subject id="sub1">
+ <nmtl2:link>
+
+ <nmtl2:name
type="logical">PSNC-DFN-MUE-Link-1001</nmtl2:name>
+ <nmtl2:globalName
type="logical">PSNC-DFN-MUE-003</nmtl2:globalName>
+ <nmtl2:type>ID_Link</nmtl2:type>
+
+ <nmwgtopo3:node nodeIdRef="PSNC-PL">
+ <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
+ </nmwgtopo3:node>
+
+ <nmwgtopo3:node nodeIdRef="DFN-MUE">
+ <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
+ </nmwgtopo3:node>
+
+ </nmtl2:link>
+ </nmwg:subject>
+ <nmwg:parameters>
+ <!-- supportedEventType parameter can replace the eventType
'Path.Status' -->
+ <!-- <nmwg:parameter
name="supportedEventType">Path.Status</nmwg:parameter> -->
+ <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
+ </nmwg:parameters>
+ <nmwg:eventType>Path.Status</nmwg:eventType>
+ </nmwg:metadata>
+
+
+ <nmwg:metadata id="md-link-PSNC-2-DFN-MUE-004">
+ <nmwg:subject id="sub1">
+ <nmtl2:link>
+
+ <nmtl2:name
type="logical">PSNC-2-DFN-MUE-Link-1002</nmtl2:name>
+ <nmtl2:globalName
type="logical">PSNC-2-DFN-MUE-004</nmtl2:globalName>
+ <nmtl2:type>ID_Link</nmtl2:type>
+
+ <nmwgtopo3:node nodeIdRef="PSNC-PL-2">
+ <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
+ </nmwgtopo3:node>
+
+ <nmwgtopo3:node nodeIdRef="DFN-MUE">
+ <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
+ </nmwgtopo3:node>
+
+ </nmtl2:link>
+ </nmwg:subject>
+ <nmwg:parameters>
+ <!-- supportedEventType parameter can replace the eventType
'Path.Status' -->
+ <!-- <nmwg:parameter
name="supportedEventType">Path.Status</nmwg:parameter> -->
+ <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
+ </nmwg:parameters>
+ <nmwg:eventType>Path.Status</nmwg:eventType>
+ </nmwg:metadata>
+
+
+ <nmwg:data id="d1" metadataIdRef="md-link-LRZ-SARA-DEISA-001">
+ <nmwg:key>
+ <nmwg:parameters>
+ <nmwg:parameter name="pathId">DFN-link-1234</nmwg:parameter>
+ <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-L2-status.xml</nmwg:parameter>
+ </nmwg:parameters>
+ </nmwg:key>
+ </nmwg:data>
+
+
+ <nmwg:data id="d2" metadataIdRef="md-link-LRZ-SARA-DEISA-002">
+ <nmwg:key>
+ <nmwg:parameters>
+ <nmwg:parameter
name="pathId">DFN-Surfnet-Link-5678</nmwg:parameter>
+ <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-L2-status.xml</nmwg:parameter>
+ </nmwg:parameters>
+ </nmwg:key>
+ </nmwg:data>
+
+
+ <nmwg:data id="d3" metadataIdRef="md-link-PSNC-DFN-MUE-003">
+ <nmwg:key>
+ <nmwg:parameters>
+ <nmwg:parameter
name="pathId">PSNC-DFN-MUE-Link-1001</nmwg:parameter>
+ <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-L2-status.xml</nmwg:parameter>
+ </nmwg:parameters>
+ </nmwg:key>
+ </nmwg:data>
+
+
+ <nmwg:data id="d4" metadataIdRef="md-link-PSNC-2-DFN-MUE-004">
+ <nmwg:key>
+ <nmwg:parameters>
+ <nmwg:parameter
name="pathId">PSNC-2-DFN-MUE-Link-1002</nmwg:parameter>
+ <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-L2-status.xml</nmwg:parameter>
+ </nmwg:parameters>
+ </nmwg:key>
+ </nmwg:data>
+
+
+ <!-- iperf/bwctl metadata section -->
+
+
+ <nmwg:metadata id="meta1-iperf-test">
+ <iperf:subject id="subject-1">
+ <nmwgt:endPointPair
xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
+ <nmwgt:src type="ipv4" value="198.32.8.170" port="5433"/>
+ <nmwgt:dst type="ipv4" value="198.32.8.174" port="5433"/>
+ </nmwgt:endPointPair>
+ </iperf:subject>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/iperf/2.0</nmwg:eventType>
+ <nmwg:parameters id="params1">
+ <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
+ </nmwg:parameters>
+ </nmwg:metadata>
+
+ <nmwg:data id="data1-iperf-test" metadataIdRef="meta1-iperf-test">
+ <nmwg:key>
+ <nmwg:parameters>
+ <nmwg:parameter
name="metadataId">meta1-iperf-test</nmwg:parameter>
+ <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-iperf.xml</nmwg:parameter>
+ <nmwg:parameter
name="eventType">http://ggf.org/ns/nmwg/tools/iperf/2.0</nmwg:parameter>
+ </nmwg:parameters>
+ </nmwg:key>
+ </nmwg:data>
+
+
+ <nmwg:metadata id="meta2-iperf-test">
+ <iperf:subject id="subject-1">
+ <nmwgt:endPointPair
xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
+ <nmwgt:src type="ipv4" value="150.254.0.1" port="5422"/>
+ <nmwgt:dst type="ipv4" value="150.254.0.2" port="5422"/>
+ </nmwgt:endPointPair>
+ </iperf:subject>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/iperf/2.0</nmwg:eventType>
+ <nmwg:parameters id="params1">
+ <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
+ </nmwg:parameters>
+ </nmwg:metadata>
+
+ <nmwg:data id="data2-iperf-test" metadataIdRef="meta2-iperf-test">
+ <nmwg:key>
+ <nmwg:parameters>
+ <nmwg:parameter
name="metadataId">meta2-iperf-test</nmwg:parameter>
+ <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-iperf.xml</nmwg:parameter>
+ <nmwg:parameter
name="eventType">http://ggf.org/ns/nmwg/tools/iperf/2.0</nmwg:parameter>
+ </nmwg:parameters>
+ </nmwg:key>
+ </nmwg:data>
+
+
+ <!-- ping metadata section -->
+
+
+ <nmwg:metadata id="ping-meta1">
+ <ping:subject id="sub1">
+ <nmwgt:endPointPair>
+ <nmwgt:src type="ipv4" value="222.22.22.22"/>
+ <nmwgt:dst type="ipv4" value="111.11.11.11"/>
+ </nmwgt:endPointPair>
+ </ping:subject>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/ping/2.0</nmwg:eventType>
+ </nmwg:metadata>
+
+ <nmwg:data id="ping-data1" metadataIdRef="ping-meta1">
+ <nmwg:key>
+ <nmwg:parameters>
+ <nmwg:parameter name="metadataId">ping-meta1</nmwg:parameter>
+ <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-clmp-ping.xml</nmwg:parameter>
+ <nmwg:parameter
name="eventType">http://ggf.org/ns/nmwg/tools/ping/2.0</nmwg:parameter>
+ </nmwg:parameters>
+ </nmwg:key>
+ </nmwg:data>
+
+
+</nmwg:store>
\ No newline at end of file

Copied:
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/sql-database_clmp-owamp.xml
(from rev 6046, trunk/perfsonar-java-sql-ma/conf/sql-database_clmp-owamp.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/sql-database_clmp-owamp.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/sql-database_clmp-owamp.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,65 @@
+<nmwg:store xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
xmlns:owamp="http://ggf.org/ns/nmwg/tools/owamp/2.0/";
+ xmlns="http://ggf.org/ns/nmwg/base/2.0/";>
+
+ <nmwg:metadata id="owamp-meta1">
+ <owamp:subject id="sub1">
+ <nmwgt:endPointPair>
+ <nmwgt:src type="ipv4" value="222.22.22.22" />
+ <nmwgt:dst type="ipv4" value="111.11.11.11" />
+ </nmwgt:endPointPair>
+ </owamp:subject>
+
+ <owamp:parameters id="param1">
+ <nmwg:parameter name="direction">to</nmwg:parameter>
+ <nmwg:parameter name="count" value="10"/>
+ <nmwg:parameter name="size" value="10"/>
+ </owamp:parameters>
+
+ <nmwg:eventType>http://ggf.org/ns/nmwg/tools/owamp/2.0
+ </nmwg:eventType>
+ </nmwg:metadata>
+
+ <nmwg:data id="data1-owamp" metadataIdRef="owamp-meta1">
+ <nmwg:key>
+ <nmwg:parameters>
+ <nmwg:parameter name="metadataId">owamp-meta1
+ </nmwg:parameter>
+ <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-clmp-owamp.xml</nmwg:parameter>
+ </nmwg:parameters>
+ </nmwg:key>
+ </nmwg:data>
+
+ <!-- This is metadata to store SUMMARY (aggregated) data -->
+ <nmwg:metadata id="owamp-meta2">
+ <owamp:subject id="sub1">
+ <nmwgt:endPointPair>
+ <nmwgt:src type="ipv4" value="222.22.22.21" />
+ <nmwgt:dst type="ipv4" value="111.11.11.12" />
+ </nmwgt:endPointPair>
+ </owamp:subject>
+
+ <owamp:parameters id="param1">
+ <nmwg:parameter name="direction">to</nmwg:parameter>
+ <nmwg:parameter name="count" value="10"/>
+ <nmwg:parameter name="size" value="10"/>
+ <nmwg:parameter name="output">summary</nmwg:parameter>
+ </owamp:parameters>
+
+ <nmwg:eventType>http://ggf.org/ns/nmwg/tools/owamp/2.0
+ </nmwg:eventType>
+ </nmwg:metadata>
+
+ <nmwg:data id="data2-owamp" metadataIdRef="owamp-meta2">
+ <nmwg:key>
+ <nmwg:parameters>
+ <nmwg:parameter
name="metadataId">owamp-meta2</nmwg:parameter>
+ <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-owamp-aggregation.xml</nmwg:parameter>
+ </nmwg:parameters>
+ </nmwg:key>
+ </nmwg:data>
+
+</nmwg:store>
+
+
+

Copied:
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/sql-database_clmp-ping.xml
(from rev 6046, trunk/perfsonar-java-sql-ma/conf/sql-database_clmp-ping.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/sql-database_clmp-ping.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/sql-database_clmp-ping.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,28 @@
+<nmwg:store xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+ xmlns:ping="http://ggf.org/ns/nmwg/tools/ping/2.0/";
+ xmlns="http://ggf.org/ns/nmwg/base/2.0/";>
+
+
+ <nmwg:metadata id="ping-meta1">
+ <ping:subject id="sub1">
+ <nmwgt:endPointPair>
+ <nmwgt:src type="ipv4" value="222.22.22.22"/>
+ <nmwgt:dst type="ipv4" value="111.11.11.11"/>
+ </nmwgt:endPointPair>
+ </ping:subject>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/ping/2.0</nmwg:eventType>
+ </nmwg:metadata>
+
+ <nmwg:data id="ping-data1" metadataIdRef="ping-meta1">
+ <nmwg:key>
+ <nmwg:parameters>
+ <nmwg:parameter name="metadataId">ping-meta1</nmwg:parameter>
+ <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-clmp-ping.xml</nmwg:parameter>
+ <nmwg:parameter
name="eventType">http://ggf.org/ns/nmwg/tools/ping/2.0</nmwg:parameter>
+ </nmwg:parameters>
+ </nmwg:key>
+ </nmwg:data>
+
+
+</nmwg:store>
\ No newline at end of file

Copied:
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/sql-database_discards_TEST.xml
(from rev 6046,
trunk/perfsonar-java-sql-ma/conf/sql-database_discards_TEST.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/sql-database_discards_TEST.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/sql-database_discards_TEST.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<nmwg:store xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
+ xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+ xmlns:nmwgtopo="http://ggf.org/ns/nmwg/topology/2.0/";
+ xmlns:nmwgtopo3="http://ggf.org/ns/nmwg/topology/base/3.0/";
+ xmlns:nmtl2="http://ggf.org/ns/nmwg/topology/l2/3.0/";
+ xmlns:discards="http://ggf.org/ns/nmwg/characteristic/discards/2.0/";
+ xmlns="http://ggf.org/ns/nmwg/base/2.0/";>
+
+
+ <nmwg:metadata id="meta1-discards-test">
+ <discards:subject id="subj1">
+ <nmwgt:interface>
+ <nmwgt:hostName>test-hostName</nmwgt:hostName>
+ <nmwgt:ifAddress type="ipv4">10.1.2.3</nmwgt:ifAddress>
+ <nmwgt:ifName>test-0</nmwgt:ifName>
+ <nmwgt:ifIndex>2</nmwgt:ifIndex>
+ <nmwgt:direction>in</nmwgt:direction>
+ <nmwgt:capacity>1000000000</nmwgt:capacity>
+ </nmwgt:interface>
+ </discards:subject>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/discards/2.0</nmwg:eventType>
+ <nmwg:parameters id="params1">
+ <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
+ </nmwg:parameters>
+ </nmwg:metadata>
+
+
+ <nmwg:data id="data1-discards-test" metadataIdRef="meta1-discards-test">
+ <nmwg:key>
+ <nmwg:parameters>
+ <nmwg:parameter
name="metadataId">meta1-discards-test</nmwg:parameter>
+ <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-discards.xml</nmwg:parameter>
+ <nmwg:parameter
name="eventType">http://ggf.org/ns/nmwg/characteristic/discards/2.0</nmwg:parameter>
+ </nmwg:parameters>
+ </nmwg:key>
+ </nmwg:data>
+
+
+</nmwg:store>
\ No newline at end of file

Copied:
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/sql-database_errors_TEST.xml
(from rev 6046,
trunk/perfsonar-java-sql-ma/conf/sql-database_errors_TEST.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/sql-database_errors_TEST.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/sql-database_errors_TEST.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<nmwg:store xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
+ xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+ xmlns:nmwgtopo="http://ggf.org/ns/nmwg/topology/2.0/";
+ xmlns:nmwgtopo3="http://ggf.org/ns/nmwg/topology/base/3.0/";
+ xmlns:nmtl2="http://ggf.org/ns/nmwg/topology/l2/3.0/";
+ xmlns:errors="http://ggf.org/ns/nmwg/characteristic/errors/2.0/";
+ xmlns="http://ggf.org/ns/nmwg/base/2.0/";>
+
+
+ <nmwg:metadata id="meta1-errors-test">
+ <errors:subject id="subj1">
+ <nmwgt:interface>
+ <nmwgt:hostName>test-hostName</nmwgt:hostName>
+ <nmwgt:ifAddress type="ipv4">10.1.2.3</nmwgt:ifAddress>
+ <nmwgt:ifName>test-0</nmwgt:ifName>
+ <nmwgt:ifIndex>2</nmwgt:ifIndex>
+ <nmwgt:direction>in</nmwgt:direction>
+ <nmwgt:capacity>1000000000</nmwgt:capacity>
+ </nmwgt:interface>
+ </errors:subject>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/errors/2.0</nmwg:eventType>
+ <nmwg:parameters id="params1">
+ <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
+ </nmwg:parameters>
+ </nmwg:metadata>
+
+
+ <nmwg:data id="data1-errors-test" metadataIdRef="meta1-errors-test">
+ <nmwg:key>
+ <nmwg:parameters>
+ <nmwg:parameter
name="metadataId">meta1-errors-test</nmwg:parameter>
+ <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-errors.xml</nmwg:parameter>
+ <nmwg:parameter
name="eventType">http://ggf.org/ns/nmwg/characteristic/errors/2.0</nmwg:parameter>
+ </nmwg:parameters>
+ </nmwg:key>
+ </nmwg:data>
+
+
+</nmwg:store>
\ No newline at end of file

Copied:
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/sql-database_iperf_TEST.xml
(from rev 6046, trunk/perfsonar-java-sql-ma/conf/sql-database_iperf_TEST.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/sql-database_iperf_TEST.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/sql-database_iperf_TEST.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<nmwg:store xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+ xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
+ xmlns:iperf="http://ggf.org/ns/nmwg/tools/iperf/2.0/";
+ xmlns="http://ggf.org/ns/nmwg/base/2.0/";>
+
+
+ <nmwg:metadata id="meta1-iperf-test">
+ <iperf:subject id="subject-1">
+ <nmwgt:endPointPair
xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
+ <nmwgt:src type="ipv4" value="198.32.8.170" port="5433"/>
+ <nmwgt:dst type="ipv4" value="198.32.8.174" port="5433"/>
+ </nmwgt:endPointPair>
+ </iperf:subject>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/iperf/2.0</nmwg:eventType>
+ <nmwg:parameters id="params1">
+ <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
+ </nmwg:parameters>
+ </nmwg:metadata>
+
+ <nmwg:data id="data1-iperf-test" metadataIdRef="meta1-iperf-test">
+ <nmwg:key>
+ <nmwg:parameters>
+ <nmwg:parameter
name="metadataId">meta1-iperf-test</nmwg:parameter>
+ <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-iperf.xml</nmwg:parameter>
+ <nmwg:parameter
name="eventType">http://ggf.org/ns/nmwg/tools/iperf/2.0</nmwg:parameter>
+ </nmwg:parameters>
+ </nmwg:key>
+ </nmwg:data>
+
+</nmwg:store>
\ No newline at end of file

Copied:
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/sql-database_utilization_TEST.xml
(from rev 6046,
trunk/perfsonar-java-sql-ma/conf/sql-database_utilization_TEST.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/sql-database_utilization_TEST.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/sql-database_utilization_TEST.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<nmwg:store xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
+ xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+
xmlns:netutil="http://ggf.org/ns/nmwg/characteristic/utilization/2.0/";
+ xmlns:nmwgtopo="http://ggf.org/ns/nmwg/topology/2.0/";
+ xmlns:nmwgtopo3="http://ggf.org/ns/nmwg/topology/base/3.0/";
+ xmlns:nmtl2="http://ggf.org/ns/nmwg/topology/l2/3.0/";
+ xmlns="http://ggf.org/ns/nmwg/base/2.0/";>
+
+
+
+ <nmwg:metadata id="meta1-test">
+ <netutil:subject id="subj1">
+ <nmwgt:interface>
+ <nmwgt:hostName>test-hostName</nmwgt:hostName>
+ <nmwgt:ifAddress type="ipv4">10.1.2.3</nmwgt:ifAddress>
+ <nmwgt:ifName>test-0</nmwgt:ifName>
+ <nmwgt:ifDescription>test description</nmwgt:ifDescription>
+ <nmwgt:direction>in</nmwgt:direction>
+ <nmwgt:capacity>1000BaseT</nmwgt:capacity>
+ </nmwgt:interface>
+ </netutil:subject>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:eventType>
+ <nmwg:parameters id="params1">
+ <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
+ </nmwg:parameters>
+ </nmwg:metadata>
+
+
+ <nmwg:data id="data1-test" metadataIdRef="meta1-test">
+ <nmwg:key>
+ <nmwg:parameters>
+ <nmwg:parameter name="metadataId">meta1-test</nmwg:parameter>
+ <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-utilization.xml</nmwg:parameter>
+ <nmwg:parameter
name="eventType">http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:parameter>
+ </nmwg:parameters>
+ </nmwg:key>
+ </nmwg:data>
+
+
+
+</nmwg:store>
\ No newline at end of file

Copied:
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/wizard.properties
(from rev 6046, trunk/perfsonar-java-sql-ma/conf/wizard.properties)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/wizard.properties
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/wizard.properties
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,206 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE properties [
+ <!ELEMENT properties ( comment?, property* )>
+<!ATTLIST properties version CDATA #FIXED "0.1">
+<!ELEMENT comment (#PCDATA) >
+<!ELEMENT property (entry,Comment,ProposedValue,Group+,AcceptedValue*) >
+<!ELEMENT entry (#PCDATA) >
+<!ATTLIST entry
+key CDATA #REQUIRED
+ password (true|false) #IMPLIED
+ required (true|false) #IMPLIED >
+<!ELEMENT Comment (#PCDATA) >
+<!ELEMENT ProposedValue (#PCDATA) >
+<!ELEMENT Group (#PCDATA) >
+<!ATTLIST Group
+ order CDATA #REQUIRED
+ check (true|false) #IMPLIED
+>
+<!ELEMENT AcceptedValue (#PCDATA) >
+]>
+
+
+<properties>
+
+
+ <comment>$Id$</comment>
+
+
+
+ <property>
+ <entry key="component.ma.xmldb.db_uri"
required="true">xmldb:exist://localhost:8080/exist/xmlrpc</entry>
+ <Comment>Enter the URI location of the eXist database:</Comment>
+ <ProposedValue>xmldb:exist://localhost:8080/exist/xmlrpc</ProposedValue>
+ <Group order="1">eXist</Group>
+ </property>
+
+ <property>
+ <entry key="component.ma.xmldb.db_username"
required="true">sqlmaservice</entry>
+ <Comment>Enter the service username for the eXist user:</Comment>
+ <ProposedValue>sqlmaservice</ProposedValue>
+ <Group order="2">eXist</Group>
+ </property>
+
+ <property>
+ <entry key="component.ma.xmldb.db_password" required="true"
password="true">sqlmaservice</entry>
+ <Comment>Enter the password for the eXist user:</Comment>
+ <ProposedValue>sqlmaservice</ProposedValue>
+ <Group order="3">eXist</Group>
+ </property>
+
+ <property>
+ <entry key="create_user" required="true">no</entry>
+ <Comment>Do you wish to create a user with this name?</Comment>
+ <ProposedValue>yes</ProposedValue>
+ <Group order="4" check="true">eXist</Group>
+ <AcceptedValue>yes</AcceptedValue>
+ <AcceptedValue>no</AcceptedValue>
+ </property>
+
+ <property>
+ <entry key="old_adminpassword_1" required="true" password="true" />
+ <Comment>Set an eXist administration password:</Comment>
+ <ProposedValue />
+ <Group order="5" dependsOn="4">eXist</Group>
+ </property>
+
+ <property>
+ <entry key="service.ma.conf_file"
required="true">/etc/geant2-java-sql-ma/sql-database_TEST.xml</entry>
+ <Comment>Enter the full path of the metadata configuration
file:</Comment>
+
<ProposedValue>/etc/geant2-java-sql-ma/sql-database_TEST.xml</ProposedValue>
+ <Group order="6">eXist</Group>
+ </property>
+
+ <property>
+ <entry key="change_admin_pass" required="true">no</entry>
+ <Comment>Do you wish to change the exist Admin password?</Comment>
+ <ProposedValue>yes</ProposedValue>
+ <Group order="7" check="true">eXist</Group>
+ <AcceptedValue>yes</AcceptedValue>
+ <AcceptedValue>no</AcceptedValue>
+ </property>
+
+ <property>
+ <entry key="component.ma.xmldb.db_adminpassword" required="true"
password="true" />
+ <Comment>Set an eXist administration password:</Comment>
+ <ProposedValue />
+ <Group order="8" dependsOn="7">eXist</Group>
+ </property>
+
+ <property>
+ <entry key="component.ma.xmldb.db_adminpassword_confirm" required="true"
password="true" />
+ <Comment>Confirm new eXist administration password:</Comment>
+ <ProposedValue />
+ <Group order="9" dependsOn="7">eXist</Group>
+ </property>
+
+ <property>
+ <entry key="old_adminpassword" required="true" password="true" />
+ <Comment>Enter the old eXist administration password:</Comment>
+ <ProposedValue />
+ <Group order="99" dependsOn="7">eXist</Group>
+ </property>
+
+
+
+
+
+ <property>
+ <entry key="service.r.service_name" required="true">perfSONAR Java SQL
MA</entry>
+ <Comment>Enter the service name:</Comment>
+ <ProposedValue>perfSONAR Java SQL MA</ProposedValue>
+ <Group order="1">LS</Group>
+ </property>
+
+ <property>
+ <entry key="service.r.service_description">perfSONAR Java SQL MA</entry>
+ <Comment>Enter a description for the service:</Comment>
+ <ProposedValue>perfSONAR Java SQL MA</ProposedValue>
+ <Group order="2">LS</Group>
+ </property>
+
+ <property>
+ <entry
key="service.r.contact_email">user@domain</entry>
+ <Comment>Enter the service administrator's email address:</Comment>
+
<ProposedValue>user@domain</ProposedValue>
+ <Group order="3">LS</Group>
+ </property>
+
+ <property>
+ <entry key="service.r.organization_name">Institution</entry>
+ <Comment>Enter the name of the organisation running this
service:</Comment>
+ <ProposedValue>Institution</ProposedValue>
+ <Group order="4">LS</Group>
+ </property>
+
+ <property>
+ <entry key="service.r.ls_url" required="true">http://somewhere</entry>
+ <Comment>Enter the LS URL (more LS addresses can be separated by
commas):</Comment>
+ <ProposedValue>http://somewhere</ProposedValue>
+ <Group order="5">LS</Group>
+ </property>
+
+ <property>
+ <entry key="component.registrator.interval">43200</entry>
+ <Comment>Set the registration interval (seconds):</Comment>
+ <ProposedValue>43200</ProposedValue>
+ <Group order="6">LS</Group>
+ </property>
+
+ <property>
+ <entry key="service.r.access_point"
required="true">http://somewhere</entry>
+ <Comment>Enter the service access point:</Comment>
+ <ProposedValue>http://somewhere</ProposedValue>
+ <Group order="7">LS</Group>
+ </property>
+
+
+
+
+
+ <property>
+ <entry key="servlet.username" required="true">perfsonaruser</entry>
+ <Comment>Enter the username for logging in to the admin pages:</Comment>
+ <ProposedValue>perfsonaruser</ProposedValue>
+ <Group order="1" check="false">Administration</Group>
+ </property>
+
+ <property>
+ <entry key="servlet.password" required="true"
password="true">perfsonarpass</entry>
+ <Comment>Enter the password for logging in to the admin pages:</Comment>
+ <ProposedValue>perfsonarpass</ProposedValue>
+ <Group order="2">Administration</Group>
+ </property>
+
+
+
+
+
+ <property>
+ <entry key="service.as.authn_active" required="true">no</entry>
+ <Comment>Do you wish to enable authentication?</Comment>
+ <ProposedValue>yes</ProposedValue>
+ <Group order="1" check="true">Authentication</Group>
+ <AcceptedValue>yes</AcceptedValue>
+ <AcceptedValue>no</AcceptedValue>
+ </property>
+
+ <property>
+ <entry key="service.as.point"
required="true">http://homer.rediris.es:8080/perfSONAR-AS/services/AuthService</entry>
+ <Comment>Enter the URL address of the Authentication Service:</Comment>
+
<ProposedValue>http://homer.rediris.es:8080/perfSONAR-AS/services/AuthService</ProposedValue>
+ <Group order="2">Authentication</Group>
+ </property>
+
+ <property>
+ <entry key="service.as.authn_for_msg_types"
required="true">SetupDataRequest,MetadataKeyRequest</entry>
+ <Comment>Enter the message types which should be authenticated:</Comment>
+
<ProposedValue>MeasurementArchiveStoreKeyRequest,MeasurementArchiveStoreRequest,SetupDataRequest,MetadataKeyRequest</ProposedValue>
+ <Group order="3">Authentication</Group>
+ </property>
+
+
+
+
+
+</properties>

Copied:
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/wizardproperties.dtd
(from rev 6046, trunk/perfsonar-java-sql-ma/conf/wizardproperties.dtd)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/wizardproperties.dtd
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/wizardproperties.dtd
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+ <!-- DTD for wizard properties -->
+ <!ELEMENT properties ( comment?, property* )>
+ <!ATTLIST properties version CDATA #FIXED "0.1">
+ <!ELEMENT comment (#PCDATA) >
+ <!ELEMENT property
(entry,Comment,ProposedValue,Group+,AcceptedValue*) >
+ <!ELEMENT entry (#PCDATA) >
+ <!ATTLIST entry
+ key CDATA #REQUIRED
+ password (true|false) #IMPLIED
+ required (true|false) #IMPLIED >
+ <!ELEMENT Comment (#CDATA) >
+ <!ELEMENT ProposedValue (#PCDATA) >
+ <!ELEMENT Group (#PCDATA) >
+ <!ATTLIST Group
+ order CDATA #REQUIRED
+ check (true|false) #IMPLIED
+ >
+ <!ELEMENT AcceptedValue (#PCDATA) >
+
+
\ No newline at end of file

Copied: trunk/perfsonar-java-sql-ma/src/main/webapp/Service_Admin.js (from
rev 6046, trunk/perfsonar-java-sql-ma/conf/axis-1.4/Service_Admin.js)
===================================================================
--- trunk/perfsonar-java-sql-ma/src/main/webapp/Service_Admin.js
(rev 0)
+++ trunk/perfsonar-java-sql-ma/src/main/webapp/Service_Admin.js
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,128 @@
+/**
+ * @author Michalis Michael,Cynet
+ */
+function setTip(el, description, color){
+ var text = '<span style=\"font-size: 12px; width:20px;\">' + description
+ '</span>';
+ var width;
+ if (el) {
+ el.style.cursor = 'pointer';
+ width = 250;
+ }
+ else {
+ width = 0;
+ }
+
+ Tip(text, BGCOLOR, color, WIDTH, width, TEXTALIGN, 'justify', ABOVE,
true);
+}
+
+function FloatPosition(){
+ var ns = (navigator.appName.indexOf("Netscape") != -1);
+ var x = screen.width;
+ var y = screen.height;
+ var button = document.getElementById("Button");
+ var reset_button = document.getElementById("ResetButton");
+ if (reset_button) {
+ var width = reset_button.parentNode.offsetWidth;
+ var offset = reset_button.parentNode.offsetLeft;
+ var leftoffset = parent
+ if (reset_button != null) {
+ if (y == 768) {
+ reset_button.style.top = 95 + '%';
+ reset_button.style.left = 83 + '%';
+ }
+ else {
+ //alert("Not 768 "+x);
+ reset_button.style.top = 95 + '%';
+ reset_button.style.left = 67 + '%';
+ }
+ }
+ if (button != null) {
+ if (y == 768) {
+ button.style.top = 95 + '%';
+ button.style.left = 91.5 + '%';
+ }
+ else {
+ button.style.top = 95 + '%';
+ button.style.left = 74 + '%';
+ }
+ }
+ }
+
+}
+
+onload = FloatPosition;
+onscroll = FloatPosition;
+onresize = FloatPosition;
+
+function checkStarFields(){
+
+ var divs = document.getElementsByTagName("div");
+ var filled = true;
+
+ for (var i = 0; i < divs.length; i++) {
+
+ var div = divs[i];
+ if (div.style.display == "block") {
+ var input_array = div.getElementsByTagName("input");
+
+ var text = document.createElement("td");
+ var ex = document.getElementById("extra");
+ if (ex != null) {
+ var p = ex.parentNode;
+ p.removeChild(ex);
+ }
+ text.id = "extra";
+ text.innerHTML = '<p style=\"color:red;\">Please fill in the
field!</p>';
+
+ for (var j = 0; j < input_array.length; j++) {
+
+ var input = input_array[j];
+
+ if (input.id == "required") {
+
+ var parent = input.parentNode.parentNode;
+ if (input.value == null || input.value == "" ||
input.value == " ") {
+ if
(parent.parentNode.parentNode.parentNode.style.display == "block") {
+ filled = false;
+ parent.appendChild(text);
+ return filled;
+ }
+
+ }
+
+ }
+
+ }
+ }
+
+ }
+
+ return filled;
+
+}
+
+function getDate(){
+
+ var date = document.getElementById("date");
+
+ var stampdays = new Array("Sunday", "Monday", "Tuesday", "Wednesday",
"Thursday", "Friday", "Saturday");
+
+ var stampmonths = new Array("January", "February", "March", "April",
"May", "June", "July", "August", "September", "October", "November",
"December");
+
+ var thedate = new Date();
+
+ date.innerHTML = stampdays[thedate.getDay()] + ", " +
stampmonths[thedate.getMonth()] + " " + thedate.getDate() + ", " +
thedate.getFullYear();
+
+}
+
+function highlight(el){
+ alert("Highlighted");
+ var links = document.getElementsByTagName("a");
+ for (var i = 0; i < links.length; i++) {
+
+ var link = links[i];
+
+ link.className
+ }
+}
+

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/CompleteMetadataStoreRequest.xml
(from rev 6046,
trunk/perfsonar-java-sql-ma/samples/requests/CompleteMetadataStoreRequest.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/CompleteMetadataStoreRequest.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/CompleteMetadataStoreRequest.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,138 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!--
+ This request replaces metadata configfuration file in the service
+ with elements present here.
+ This message contains also stattus data for new metadata elements.
+-->
+
+<nmwg:message id="msg1"
+ type="CompleteMetadataStoreRequest"
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+ xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";
+ xmlns:nmwgtopo3="http://ggf.org/ns/nmwg/topology/base/3.0/";
+ xmlns:nmtl2="http://ggf.org/ns/nmwg/topology/l2/3.0/";
+ xmlns:nmtl3="http://ggf.org/ns/nmwg/topology/l3/3.0/";
+ xmlns:ifevt="http://ggf.org/ns/nmwg/event/status/base/2.0/";>
+
+
+ <nmwg:metadata id="node-md0">
+ <nmwg:subject id="sub-PSNC-N1">
+ <nmwgtopo3:node id="PSNC-N1">
+ <nmwgtopo3:type>TopologyPoint</nmwgtopo3:type>
+ <nmwgtopo3:name type="logical">PSNC-N1</nmwgtopo3:name>
+ <nmwgtopo3:country>Poland</nmwgtopo3:country>
+ <nmwgtopo3:city>Poznan</nmwgtopo3:city>
+ <nmwgtopo3:institution>UAM</nmwgtopo3:institution>
+ <nmwgtopo3:latitude>0</nmwgtopo3:latitude>
+ <nmwgtopo3:longitude>0</nmwgtopo3:longitude>
+ </nmwgtopo3:node>
+ </nmwg:subject>
+ </nmwg:metadata>
+
+
+ <nmwg:metadata id="node-md1">
+ <nmwg:subject id="sub-DFN-LRZ">
+ <nmwgtopo3:node id="DFN-LRZ">
+ <nmwgtopo3:type>TopologyPoint</nmwgtopo3:type>
+ <nmwgtopo3:name type="logical">DFN-LRZ</nmwgtopo3:name>
+ <nmwgtopo3:country>Germany</nmwgtopo3:country>
+ <nmwgtopo3:city>Munich</nmwgtopo3:city>
+ <nmwgtopo3:institution>Leibniz
Rechenzentrum</nmwgtopo3:institution>
+ <nmwgtopo3:latitude>0</nmwgtopo3:latitude>
+ <nmwgtopo3:longitude>0</nmwgtopo3:longitude>
+ </nmwgtopo3:node>
+ </nmwg:subject>
+ </nmwg:metadata>
+
+
+ <nmwg:metadata id="node-md2">
+ <nmwg:subject id="sub-DFN-MUE">
+ <nmwgtopo3:node id="DFN-MUE">
+ <nmwgtopo3:type>TopologyPoint</nmwgtopo3:type>
+ <nmwgtopo3:name type="logical">DFN-MUE</nmwgtopo3:name>
+ <nmwgtopo3:country>Germany</nmwgtopo3:country>
+ <nmwgtopo3:city>Muenster</nmwgtopo3:city>
+ <nmwgtopo3:institution>DFN-Verein</nmwgtopo3:institution>
+ <nmwgtopo3:latitude>0</nmwgtopo3:latitude>
+ <nmwgtopo3:longitude>0</nmwgtopo3:longitude>
+ </nmwgtopo3:node>
+ </nmwg:subject>
+ </nmwg:metadata>
+
+
+ <nmwg:metadata id="link-md1">
+ <nmwg:subject id="sub1">
+ <nmtl2:link>
+
+ <nmtl2:name
type="logical">DFN-MUE-LRZ-Link-100-TEST-0000</nmtl2:name>
+ <nmtl2:globalName
type="logical">DFN-MUE-LRZ</nmtl2:globalName>
+ <nmtl2:type>ID_Link</nmtl2:type>
+
+ <nmwgtopo3:node nodeIdRef="DFN-LRZ">
+ <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
+ </nmwgtopo3:node>
+
+ <nmwgtopo3:node nodeIdRef="DFN-MUE">
+ <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
+ </nmwgtopo3:node>
+
+ </nmtl2:link>
+ </nmwg:subject>
+ <nmwg:eventType>Path.Status</nmwg:eventType>
+ <nmwg:parameters>
+ <!-- if the parameter 'ibatisConfig' is not provided in the
request then the default value of it is taken by the service -->
+ <!-- <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-L2-status-domain.xml</nmwg:parameter>
-->
+ <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
+ </nmwg:parameters>
+ </nmwg:metadata>
+
+
+
+ <nmwg:metadata id="link-md2">
+ <nmwg:subject id="sub1">
+ <nmtl2:link>
+
+ <nmtl2:name
type="logical">PSNC-DFN-LRZ-Link-200-TEST-1111</nmtl2:name>
+ <nmtl2:globalName type="logical">PSNC-DFN-LRZ</nmtl2:globalName>
+ <nmtl2:type>ID_Link</nmtl2:type>
+
+ <nmwgtopo3:node nodeIdRef="DFN-LRZ">
+ <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
+ </nmwgtopo3:node>
+
+ <nmwgtopo3:node nodeIdRef="PSNC-N1">
+ <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
+ </nmwgtopo3:node>
+
+ </nmtl2:link>
+ </nmwg:subject>
+ <nmwg:eventType>Path.Status</nmwg:eventType>
+ <nmwg:parameters>
+ <!-- if the parameter 'ibatisConfig' is not provided in the request
then the default value of it is taken by the service -->
+ <!-- <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-L2-status-interdomain.xml</nmwg:parameter>
-->
+ <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
+ </nmwg:parameters>
+ </nmwg:metadata>
+
+
+
+ <nmwg:data id="data1" metadataIdRef="link-md1">
+ <ifevt:datum timeType="unix" timeValue="1214997801">
+ <ifevt:stateAdmin>TEST-20080702-1</ifevt:stateAdmin>
+ <ifevt:stateOper>down</ifevt:stateOper>
+ </ifevt:datum>
+ </nmwg:data>
+
+
+ <nmwg:data id="data2" metadataIdRef="link-md2">
+ <ifevt:datum timeType="unix" timeValue="1214997801">
+ <ifevt:stateAdmin>TEST-20080702-1</ifevt:stateAdmin>
+ <ifevt:stateOper>up</ifevt:stateOper>
+ </ifevt:datum>
+ </nmwg:data>
+
+
+
+
+</nmwg:message>

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/EchoRequest-random-fetch-test.xml
(from rev 6046,
trunk/perfsonar-java-sql-ma/samples/requests/EchoRequest-random-fetch-test.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/EchoRequest-random-fetch-test.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/EchoRequest-random-fetch-test.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,16 @@
+<!-- $Id$ -->
+
+
+<nmwg:message type="EchoRequest"
+ id="id1"
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
+
+
+ <nmwg:metadata id="meta">
+
<nmwg:eventType>http://schemas.perfsonar.net/tools/admin/selftest/1.0/random-fetch-test</nmwg:eventType>
+ </nmwg:metadata>
+
+ <nmwg:data id="data" metadataIdRef="meta"/>
+
+
+</nmwg:message>
\ No newline at end of file

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/EchoRequest-self-test.xml
(from rev 6046,
trunk/perfsonar-java-sql-ma/samples/requests/EchoRequest-self-test.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/EchoRequest-self-test.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/EchoRequest-self-test.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,16 @@
+<!-- $Id$ -->
+
+
+<nmwg:message type="EchoRequest"
+ id="id1"
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
+
+
+ <nmwg:metadata id="meta">
+
<nmwg:eventType>http://schemas.perfsonar.net/tools/admin/selftest/1.0</nmwg:eventType>
+ </nmwg:metadata>
+
+ <nmwg:data id="data" metadataIdRef="meta"/>
+
+
+</nmwg:message>
\ No newline at end of file

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/EchoRequest-xmldb-access-test.xml
(from rev 6046,
trunk/perfsonar-java-sql-ma/samples/requests/EchoRequest-xmldb-access-test.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/EchoRequest-xmldb-access-test.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/EchoRequest-xmldb-access-test.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,16 @@
+<!-- $Id$ -->
+
+
+<nmwg:message type="EchoRequest"
+ id="id1"
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
+
+
+ <nmwg:metadata id="meta">
+
<nmwg:eventType>http://schemas.perfsonar.net/tools/admin/selftest/1.0/xmldb-access-test</nmwg:eventType>
+ </nmwg:metadata>
+
+ <nmwg:data id="data" metadataIdRef="meta"/>
+
+
+</nmwg:message>
\ No newline at end of file

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/EchoRequest-xmldb-content-test.xml
(from rev 6046,
trunk/perfsonar-java-sql-ma/samples/requests/EchoRequest-xmldb-content-test.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/EchoRequest-xmldb-content-test.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/EchoRequest-xmldb-content-test.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,16 @@
+<!-- $Id$ -->
+
+
+<nmwg:message type="EchoRequest"
+ id="id1"
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
+
+
+ <nmwg:metadata id="meta">
+
<nmwg:eventType>http://schemas.perfsonar.net/tools/admin/selftest/1.0/xmldb-content-test</nmwg:eventType>
+ </nmwg:metadata>
+
+ <nmwg:data id="data" metadataIdRef="meta"/>
+
+
+</nmwg:message>
\ No newline at end of file

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/EchoRequest.xml
(from rev 6046, trunk/perfsonar-java-sql-ma/samples/requests/EchoRequest.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/EchoRequest.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/EchoRequest.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,16 @@
+<!-- $Id$ -->
+
+
+<nmwg:message type="EchoRequest"
+ id="id1"
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
+
+
+ <nmwg:metadata id="meta">
+
<nmwg:eventType>http://schemas.perfsonar.net/tools/admin/echo/2.0</nmwg:eventType>
+ </nmwg:metadata>
+
+ <nmwg:data id="data" metadataIdRef="meta"/>
+
+
+</nmwg:message>
\ No newline at end of file

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/LookupInfoRequest.xml
(from rev 6046,
trunk/perfsonar-java-sql-ma/samples/requests/LookupInfoRequest.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/LookupInfoRequest.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/LookupInfoRequest.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,14 @@
+<!-- $Id$ -->
+
+
+<nmwg:message type="LookupInfoRequest"
+ id="id1"
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
+
+ <nmwg:metadata id="meta">
+
<nmwg:eventType>http://schemas.perfsonar.net/tools/admin/lookupinfo/2.0</nmwg:eventType>
+ </nmwg:metadata>
+
+ <nmwg:data id="data" metadataIdRef="meta"/>
+
+</nmwg:message>
\ No newline at end of file

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MeasurementArchiveStoreRequest-Discards-1.xml
(from rev 6046,
trunk/perfsonar-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-Discards-1.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MeasurementArchiveStoreRequest-Discards-1.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MeasurementArchiveStoreRequest-Discards-1.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,33 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!-- Purpose: Submitting a measurement (either metadata or data, there
+ may be be multiple blocks) for storage into a
+ MeasurementArchive -->
+<!-- Version: $Id$ -->
+
+<nmwg:message id="msg4"
+ type="MeasurementArchiveStoreRequest"
+
xmlns:discards="http://ggf.org/ns/nmwg/characteristic/discards/2.0/";
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+ xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
+
+
+ <nmwg:metadata id="meta1">
+ <discards:subject id="subj1">
+ <nmwgt:interface>
+ <nmwgt:hostName>test-hostName</nmwgt:hostName>
+ <nmwgt:ifAddress type="ipv4">10.1.2.3</nmwgt:ifAddress>
+ <nmwgt:ifName>test-0</nmwgt:ifName>
+ <nmwgt:ifIndex>2</nmwgt:ifIndex>
+ <nmwgt:direction>in</nmwgt:direction>
+ <nmwgt:capacity>1000000000</nmwgt:capacity>
+ </nmwgt:interface>
+ </discards:subject>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/discards/2.0</nmwg:eventType>
+ </nmwg:metadata>
+
+ <nmwg:data id="data1" metadataIdRef="meta1">
+ <nmwg:datum value="6" timeValue="1188986354" timeType="unix"
valueUnits="Dps" />
+ </nmwg:data>
+
+</nmwg:message>

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MeasurementArchiveStoreRequest-Errors-1.xml
(from rev 6046,
trunk/perfsonar-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-Errors-1.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MeasurementArchiveStoreRequest-Errors-1.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MeasurementArchiveStoreRequest-Errors-1.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,33 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!-- Purpose: Submitting a measurement (either metadata or data, there
+ may be be multiple blocks) for storage into a
+ MeasurementArchive -->
+<!-- Version: $Id$ -->
+
+<nmwg:message id="msg4"
+ type="MeasurementArchiveStoreRequest"
+
xmlns:errors="http://ggf.org/ns/nmwg/characteristic/errors/2.0/";
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+ xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
+
+
+ <nmwg:metadata id="meta1">
+ <errors:subject id="subj1">
+ <nmwgt:interface>
+ <nmwgt:hostName>test-hostName</nmwgt:hostName>
+ <nmwgt:ifAddress type="ipv4">10.1.2.3</nmwgt:ifAddress>
+ <nmwgt:ifName>test-0</nmwgt:ifName>
+ <nmwgt:ifIndex>2</nmwgt:ifIndex>
+ <nmwgt:direction>in</nmwgt:direction>
+ <nmwgt:capacity>1000000000</nmwgt:capacity>
+ </nmwgt:interface>
+ </errors:subject>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/errors/2.0</nmwg:eventType>
+ </nmwg:metadata>
+
+ <nmwg:data id="data1" metadataIdRef="meta1">
+ <nmwg:datum value="4" timeValue="1188986354" timeType="unix"
valueUnits="Eps" />
+ </nmwg:data>
+
+</nmwg:message>

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MeasurementArchiveStoreRequest-L2Status-1.xml
(from rev 6046,
trunk/perfsonar-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-L2Status-1.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MeasurementArchiveStoreRequest-L2Status-1.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MeasurementArchiveStoreRequest-L2Status-1.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,31 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!-- Purpose: Submitting a measurement (either metadata or data, there
+ may be be multiple blocks) for storage into a
+ MeasurementArchive -->
+<!-- Version: $Id$ -->
+
+<nmwg:message id="msg4"
+ type="MeasurementArchiveStoreRequest"
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+ xmlns:nmtl2="http://ggf.org/ns/nmwg/topology/l2/3.0/";
+ xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
+ xmlns:ifevt="http://ggf.org/ns/nmwg/event/status/base/2.0/";>
+
+ <nmwg:metadata id="meta1">
+ <nmwg:subject id="subject1">
+ <nmtl2:link>
+ <nmtl2:globalName type="logical">PSNC-DFN-MUE-003</nmtl2:globalName>
+ </nmtl2:link>
+ </nmwg:subject>
+ <nmwg:eventType>Path.Status</nmwg:eventType>
+ </nmwg:metadata>
+
+ <nmwg:data id="data1" metadataIdRef="meta1">
+ <ifevt:datum timeType="unix" timeValue="1157107685">
+ <ifevt:stateAdmin>TEST2</ifevt:stateAdmin>
+ <ifevt:stateOper>up</ifevt:stateOper>
+ </ifevt:datum>
+ </nmwg:data>
+
+</nmwg:message>

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MeasurementArchiveStoreRequest-L2Status-2.xml
(from rev 6046,
trunk/perfsonar-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-L2Status-2.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MeasurementArchiveStoreRequest-L2Status-2.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MeasurementArchiveStoreRequest-L2Status-2.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,59 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!-- Purpose: Submitting a measurement (either metadata or data, there
+ may be be multiple blocks) for storage into a
+ MeasurementArchive -->
+<!-- Version: $Id$ -->
+
+<nmwg:message id="msg"
+ type="MeasurementArchiveStoreRequest"
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+ xmlns:nmtl2="http://ggf.org/ns/nmwg/topology/l2/3.0/";
+ xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
+ xmlns:nmwgtopo3="http://ggf.org/ns/nmwg/topology/base/3.0/";
+ xmlns:ifevt="http://ggf.org/ns/nmwg/event/status/base/2.0/";>
+
+
+
+
+ <nmwg:metadata id="meta1">
+ <nmwg:subject id="sub1">
+ <nmtl2:link>
+
+ <nmtl2:name type="logical">PSNC-DFN-MUE-Link-1001</nmtl2:name>
+ <nmtl2:globalName type="logical">PSNC-DFN-MUE-003</nmtl2:globalName>
+ <nmtl2:type>ID_Link</nmtl2:type>
+
+
+ <nmwgtopo3:node nodeIdRef="PSNC-PL">
+ <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
+ </nmwgtopo3:node>
+
+ <nmwgtopo3:node nodeIdRef="DFN-MUE">
+ <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
+ </nmwgtopo3:node>
+
+ </nmtl2:link>
+ </nmwg:subject>
+ <nmwg:eventType>Path.Status</nmwg:eventType>
+ <nmwg:parameters>
+ <nmwg:parameter name="pathId">PSNC-DFN-MUE-Link-1001</nmwg:parameter>
+ <!--
+ <nmwg:parameter name="ibatisConfig">
+ ibatis-SqlMapConfig-L2-status-domain.xml
+ </nmwg:parameter>
+ -->
+ </nmwg:parameters>
+ </nmwg:metadata>
+
+
+
+
+ <nmwg:data id="data1" metadataIdRef="meta1">
+ <ifevt:datum timeType="unix" timeValue="1208948131">
+ <ifevt:stateAdmin>TEST-20080423-3</ifevt:stateAdmin>
+ <ifevt:stateOper>down</ifevt:stateOper>
+ </ifevt:datum>
+ </nmwg:data>
+
+</nmwg:message>

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MeasurementArchiveStoreRequest-L2Status-3.xml
(from rev 6046,
trunk/perfsonar-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-L2Status-3.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MeasurementArchiveStoreRequest-L2Status-3.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MeasurementArchiveStoreRequest-L2Status-3.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,68 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!-- Purpose: Submitting a measurement (either metadata or data, there
+ may be be multiple blocks) for storage into a
+ MeasurementArchive -->
+<!-- Version: $Id$ -->
+
+<nmwg:message id="msg"
+ type="MeasurementArchiveStoreRequest"
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+ xmlns:nmtl2="http://ggf.org/ns/nmwg/topology/l2/3.0/";
+ xmlns:nmwgtopo3="http://ggf.org/ns/nmwg/topology/base/3.0/";
+ xmlns:ifevt="http://ggf.org/ns/nmwg/event/status/base/2.0/";>
+
+
+
+ <nmwg:metadata id="meta1">
+ <nmwg:subject id="sub1">
+ <nmtl2:link>
+
+ <nmtl2:name type="logical">PSNC-DFN-MUE-Link-1001</nmtl2:name>
+ <nmtl2:globalName type="logical">PSNC-DFN-MUE-003</nmtl2:globalName>
+ <nmtl2:type>ID_Link</nmtl2:type>
+
+
+ <nmwgtopo3:node id="PSNC-PL">
+ <nmwgtopo3:type>TopologyPoint</nmwgtopo3:type>
+ <nmwgtopo3:name type="logical">PSNC-PL</nmwgtopo3:name>
+ <nmwgtopo3:country>Poland</nmwgtopo3:country>
+ <nmwgtopo3:city>Poznan</nmwgtopo3:city>
+ <nmwgtopo3:institution>PSNC</nmwgtopo3:institution>
+ <nmwgtopo3:latitude>0</nmwgtopo3:latitude>
+ <nmwgtopo3:longitude>0</nmwgtopo3:longitude>
+ </nmwgtopo3:node>
+
+ <nmwgtopo3:node id="DFN-MUE">
+ <nmwgtopo3:type>TopologyPoint</nmwgtopo3:type>
+ <nmwgtopo3:name type="logical">DFN-MUE</nmwgtopo3:name>
+ <nmwgtopo3:country>Germany</nmwgtopo3:country>
+ <nmwgtopo3:city>Muenster</nmwgtopo3:city>
+ <nmwgtopo3:institution>DFN-Verein</nmwgtopo3:institution>
+ <nmwgtopo3:latitude>0</nmwgtopo3:latitude>
+ <nmwgtopo3:longitude>0</nmwgtopo3:longitude>
+ </nmwgtopo3:node>
+
+ </nmtl2:link>
+ </nmwg:subject>
+ <nmwg:eventType>Path.Status</nmwg:eventType>
+ <nmwg:parameters>
+ <nmwg:parameter name="pathId">PSNC-DFN-MUE-Link-1001</nmwg:parameter>
+ <!--
+ <nmwg:parameter name="ibatisConfig">
+ ibatis-SqlMapConfig-L2-status-domain.xml
+ </nmwg:parameter>
+ -->
+ </nmwg:parameters>
+ </nmwg:metadata>
+
+
+
+ <nmwg:data id="data1" metadataIdRef="meta1">
+ <ifevt:datum timeType="unix" timeValue="1208948131">
+ <ifevt:stateAdmin>TEST-20080423-3</ifevt:stateAdmin>
+ <ifevt:stateOper>down</ifevt:stateOper>
+ </ifevt:datum>
+ </nmwg:data>
+
+</nmwg:message>

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MeasurementArchiveStoreRequest-L2Status-4.xml
(from rev 6046,
trunk/perfsonar-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-L2Status-4.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MeasurementArchiveStoreRequest-L2Status-4.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MeasurementArchiveStoreRequest-L2Status-4.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,62 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!-- Purpose: Submitting a measurement (either metadata or data, there
+ may be be multiple blocks) for storage into a
+ MeasurementArchive -->
+<!-- Version: $Id$ -->
+
+<nmwg:message id="msg"
+ type="MeasurementArchiveStoreRequest"
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+ xmlns:nmtl2="http://ggf.org/ns/nmwg/topology/l2/3.0/";
+ xmlns:nmwgtopo3="http://ggf.org/ns/nmwg/topology/base/3.0/";
+ xmlns:ifevt="http://ggf.org/ns/nmwg/event/status/base/2.0/";>
+
+
+
+ <nmwg:metadata id="meta1">
+ <nmwg:subject id="sub1">
+ <nmtl2:link>
+
+ <nmtl2:name type="logical">PSNC-DFN-MUE-Link-1001</nmtl2:name>
+ <nmtl2:globalName type="logical">PSNC-DFN-MUE-003</nmtl2:globalName>
+ <nmtl2:type>ID_Link</nmtl2:type>
+
+
+ <nmwgtopo3:node id="PSNC-PL">
+ <nmwgtopo3:type>TopologyPoint</nmwgtopo3:type>
+ <nmwgtopo3:name type="logical">PSNC-PL</nmwgtopo3:name>
+ <nmwgtopo3:country>Poland</nmwgtopo3:country>
+ <nmwgtopo3:city>Poznan</nmwgtopo3:city>
+ <nmwgtopo3:institution>PSNC</nmwgtopo3:institution>
+ <nmwgtopo3:latitude>0</nmwgtopo3:latitude>
+ <nmwgtopo3:longitude>0</nmwgtopo3:longitude>
+ </nmwgtopo3:node>
+
+ <nmwgtopo3:node nodeIdRef="DFN-MUE">
+ <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
+ </nmwgtopo3:node>
+
+ </nmtl2:link>
+ </nmwg:subject>
+ <nmwg:eventType>Path.Status</nmwg:eventType>
+ <nmwg:parameters>
+ <nmwg:parameter name="pathId">PSNC-DFN-MUE-Link-1001</nmwg:parameter>
+ <!--
+ <nmwg:parameter name="ibatisConfig">
+ ibatis-SqlMapConfig-L2-status-domain.xml
+ </nmwg:parameter>
+ -->
+ </nmwg:parameters>
+ </nmwg:metadata>
+
+
+
+ <nmwg:data id="data1" metadataIdRef="meta1">
+ <ifevt:datum timeType="unix" timeValue="1208948495">
+ <ifevt:stateAdmin>TEST-20080423-4</ifevt:stateAdmin>
+ <ifevt:stateOper>down</ifevt:stateOper>
+ </ifevt:datum>
+ </nmwg:data>
+
+</nmwg:message>

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MeasurementArchiveStoreRequest-Ping-1.xml
(from rev 6046,
trunk/perfsonar-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-Ping-1.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MeasurementArchiveStoreRequest-Ping-1.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MeasurementArchiveStoreRequest-Ping-1.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,33 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!-- Version: $Id$ -->
+
+<nmwg:message id="msg1"
+ type="MeasurementArchiveStoreRequest"
+ xmlns:ping="http://ggf.org/ns/nmwg/tools/ping/2.0/";
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+ xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
+
+
+ <nmwg:metadata id="meta1">
+ <ping:subject id="sub1">
+ <nmwgt:endPointPair>
+ <nmwgt:src type="ipv4" value="222.22.22.22"/>
+ <nmwgt:dst type="ipv4" value="111.11.11.11"/>
+ </nmwgt:endPointPair>
+ </ping:subject>
+ <nmwg:eventType>http://ggf.org/ns/nmwg/tools/ping/2.0</nmwg:eventType>
+ </nmwg:metadata>
+
+
+ <nmwg:data id="data1" metadataIdRef="meta1">
+ <ping:datum numBytes="56" numBytesUnits="bytes" seqNum="0"
+ timeType="unix" timeValue="1233920540" ttl="252"
+ value="23.00" valueUnits="ms"/>
+ <ping:datum numBytes="56" numBytesUnits="bytes" seqNum="0"
+ timeType="unix" timeValue="1233920541" ttl="252"
+ value="4.25" valueUnits="ms"/>
+ </nmwg:data>
+
+
+</nmwg:message>
\ No newline at end of file

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MeasurementArchiveStoreRequest-Ping-2.xml
(from rev 6046,
trunk/perfsonar-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-Ping-2.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MeasurementArchiveStoreRequest-Ping-2.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MeasurementArchiveStoreRequest-Ping-2.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,33 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!-- Version: $Id$ -->
+
+<nmwg:message id="msg1"
+ type="MeasurementArchiveStoreRequest"
+ xmlns:ping="http://ggf.org/ns/nmwg/tools/ping/2.0/";
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+ xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
+
+
+ <nmwg:metadata id="meta1">
+ <nmwg:key>
+ <nmwg:parameters>
+ <nmwg:parameter
name="eventType">http://ggf.org/ns/nmwg/tools/ping/2.0</nmwg:parameter>
+ <nmwg:parameter name="metadataId">ping-meta1</nmwg:parameter>
+ <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-clmp-ping.xml</nmwg:parameter>
+ </nmwg:parameters>
+ </nmwg:key>
+ </nmwg:metadata>
+
+
+ <nmwg:data id="data1" metadataIdRef="meta1">
+ <ping:datum numBytes="56" numBytesUnits="bytes" seqNum="0"
+ timeType="unix" timeValue="1233920725" ttl="252"
+ value="23.00" valueUnits="ms"/>
+ <ping:datum numBytes="56" numBytesUnits="bytes" seqNum="0"
+ timeType="unix" timeValue="1233920726" ttl="252"
+ value="14.49" valueUnits="ms"/>
+ </nmwg:data>
+
+
+</nmwg:message>
\ No newline at end of file

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MeasurementArchiveStoreRequest-Utilization-1.xml
(from rev 6046,
trunk/perfsonar-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-Utilization-1.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MeasurementArchiveStoreRequest-Utilization-1.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MeasurementArchiveStoreRequest-Utilization-1.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,34 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!-- Purpose: Submitting a measurement (either metadata or data, there
+ may be be multiple blocks) for storage into a
+ MeasurementArchive -->
+<!-- Version: $Id$ -->
+
+<nmwg:message id="msg4"
+ type="MeasurementArchiveStoreRequest"
+
xmlns:netutil="http://ggf.org/ns/nmwg/characteristic/utilization/2.0/";
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+ xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
+
+
+ <nmwg:metadata id="meta1">
+ <netutil:subject id="subj1">
+ <nmwgt:interface>
+ <nmwgt:hostName>test-hostName</nmwgt:hostName>
+ <nmwgt:ifAddress type="ipv4">10.1.2.3</nmwgt:ifAddress>
+ <nmwgt:ifName>test-0</nmwgt:ifName>
+ <nmwgt:ifDescription>test description</nmwgt:ifDescription>
+ <nmwgt:direction>in</nmwgt:direction>
+ <nmwgt:authRealm>TestRealm</nmwgt:authRealm>
+ <nmwgt:capacity>1000BaseT</nmwgt:capacity>
+ </nmwgt:interface>
+ </netutil:subject>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:eventType>
+ </nmwg:metadata>
+
+ <nmwg:data id="data1" metadataIdRef="meta1">
+ <nmwg:datum value="12345" timeValue="1187688523" timeType="unix"
valueUnits="Bps" />
+ </nmwg:data>
+
+</nmwg:message>

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MeasurementArchiveStoreRequest-bwctl-iperf-1.xml
(from rev 6046,
trunk/perfsonar-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-bwctl-iperf-1.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MeasurementArchiveStoreRequest-bwctl-iperf-1.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MeasurementArchiveStoreRequest-bwctl-iperf-1.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,47 @@
+<?xml version="1.0"?>
+<nmwg:message xmlns="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+ xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";
+ xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
+ xmlns:bwctl="http://ggf.org/ns/nmwg/tools/bwctl/2.0/";
+ xmlns:iperf="http://ggf.org/ns/nmwg/tools/iperf/2.0/";
+ xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
+ type="MeasurementArchiveStoreRequest"
+ id="bwctl-iperf-request">
+
+
+ <nmwg:metadata id="bwctl-metadata">
+ <bwctl:subject id="bwctl-subject">
+ <nmwgt:endPoint type="ipv4" value="131.188.81.12"/>
+ </bwctl:subject>
+ <nmwg:eventType>http://ggf.org/ns/nmwg/tools/bwctl/2.0</nmwg:eventType>
+ <bwctl:parameters id="bwctl-parameters">
+ <nmwg:parameter name="duration" value="5"/>
+ </bwctl:parameters>
+ </nmwg:metadata>
+
+ <nmwg:metadata id="iperf-metadata">
+ <iperf:subject id="iperf-subject" metadataIdRef="bwctl-metadata">
+ <nmwgt:endPointPair>
+ <nmwgt:src type="ipv4" value="131.188.81.61"/>
+ <nmwgt:dst type="ipv4" value="131.188.81.12"/>
+ </nmwgt:endPointPair>
+ </iperf:subject>
+ <!--
+ <iperf:parameters id="iperf-parameters">
+ <nmwg:parameter name="interval" value="2"/>
+ <nmwg:parameter name="protocol" value="tcp"/>
+ </iperf:parameters>
+ -->
+ <nmwg:eventType>http://ggf.org/ns/nmwg/tools/iperf/2.0</nmwg:eventType>
+ </nmwg:metadata>
+
+
+ <nmwg:data id="1" metadataIdRef="iperf-metadata">
+ <iperf:datum throughput="1.03" jitter="1.23" loss="0/837"
numBytes="23484640" numBytesUnits="Bytes" timeType="unix"
timeValue="1234273826" valueUnits="bits/sec"/>
+ <iperf:datum throughput="4.46" jitter="1.11" loss="3/835"
numBytes="23484640" numBytesUnits="Bytes" timeType="unix"
timeValue="1234273836" valueUnits="bits/sec"/>
+ <iperf:datum throughput="3.22" jitter="1.42" loss="5/855"
numBytes="23484640" numBytesUnits="Bytes" timeType="unix"
timeValue="1234273846" valueUnits="bits/sec"/>
+ </nmwg:data>
+
+
+</nmwg:message>

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MeasurementArchiveStoreRequest-bwctl-iperf-2.xml
(from rev 6046,
trunk/perfsonar-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-bwctl-iperf-2.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MeasurementArchiveStoreRequest-bwctl-iperf-2.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MeasurementArchiveStoreRequest-bwctl-iperf-2.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<nmwg:message xmlns="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+ xmlns:iperf="http://ggf.org/ns/nmwg/tools/iperf/2.0/";
+ type="MeasurementArchiveStoreRequest"
+ id="bwctl-iperf-request">
+
+
+ <nmwg:metadata id="m1">
+ <nmwg:key id="k1">
+ <nmwg:parameters id="p1">
+ <nmwg:parameter
name="eventType">http://ggf.org/ns/nmwg/tools/iperf/2.0</nmwg:parameter>
+ <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-iperf.xml</nmwg:parameter>
+ <nmwg:parameter name="metadataId">meta1-iperf-test</nmwg:parameter>
+ </nmwg:parameters>
+ </nmwg:key>
+ </nmwg:metadata>
+
+ <nmwg:data id="d1" metadataIdRef="m1">
+ <iperf:datum throughput="1.03" jitter="1.23" loss="0/837"
numBytes="23484640" numBytesUnits="Bytes" timeType="unix"
timeValue="1234273826" valueUnits="bits/sec"/>
+ <iperf:datum throughput="4.46" jitter="1.11" loss="3/835"
numBytes="23484640" numBytesUnits="Bytes" timeType="unix"
timeValue="1234273836" valueUnits="bits/sec"/>
+ <iperf:datum throughput="3.22" jitter="1.42" loss="5/855"
numBytes="23484640" numBytesUnits="Bytes" timeType="unix"
timeValue="1234273846" valueUnits="bits/sec"/>
+ </nmwg:data>
+
+
+</nmwg:message>
\ No newline at end of file

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MeasurementArchiveStoreRequest-owamp-1.xml
(from rev 6046,
trunk/perfsonar-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-owamp-1.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MeasurementArchiveStoreRequest-owamp-1.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MeasurementArchiveStoreRequest-owamp-1.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,27 @@
+<nmwg:message type="MeasurementArchiveStoreRequest" id="datarq2-1"
+ xmlns="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";
+ xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+ xmlns:owamp="http://ggf.org/ns/nmwg/tools/owamp/2.0/";
+ xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";
+ xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
+ xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
+
+ <nmwg:metadata id="meta1">
+ <owamp:subject id="subj1">
+ <nmwgt:endPointPair>
+ <nmwgt:src type="ipv4" value="222.22.22.22"
/> <!-- The host where is OWAMP M -->
+ <nmwgt:dst type="ipv4" value="111.11.11.11"
/> <!-- destination host -->
+ </nmwgt:endPointPair>
+ </owamp:subject>
+ <nmwg:eventType>http://ggf.org/ns/nmwg/tools/owamp/2.0
+ </nmwg:eventType>
+ </nmwg:metadata>
+
+ <nmwg:data id="data1" metadataIdRef="meta1">
+ <owamp:datum receiveSynchronized="1"
receiveTime="15080301494633990768"
+ receiveTimeError="1.00583E-6" sendSynchronized="1"
sendTime="15080301494378967370"
+ sendTimeError="4.91142E-5" seqNum="0" ttl="243" />
+ </nmwg:data>
+
+</nmwg:message>
\ No newline at end of file

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MetadataKeyRequest-Discards-1.xml
(from rev 6046,
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-Discards-1.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MetadataKeyRequest-Discards-1.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MetadataKeyRequest-Discards-1.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<nmwg:message type="MetadataKeyRequest"
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+
xmlns:discards="http://ggf.org/ns/nmwg/characteristic/discards/2.0/";
+ xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
+ xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";>
+
+ <nmwg:metadata id="m1">
+ <discards:subject id="s1">
+ <nmwgt:interface>
+ <nmwgt:ifAddress type="ipv4">10.1.2.3</nmwgt:ifAddress>
+ <nmwgt:ifName>test-0</nmwgt:ifName>
+ <nmwgt:direction>in</nmwgt:direction>
+ </nmwgt:interface>
+ </discards:subject>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/discards/2.0</nmwg:eventType>
+ </nmwg:metadata>
+
+ <nmwg:metadata id="m2">
+ <select:subject id="s2" metadataIdRef="m1"/>
+ <nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>
+ <select:parameters id="sp1">
+ <nmwg:parameter name="startTime">1187948870</nmwg:parameter>
+ <nmwg:parameter name="endTime">1187948888</nmwg:parameter>
+ </select:parameters>
+ </nmwg:metadata>
+
+ <nmwg:data id="d1" metadataIdRef="m2"/>
+
+
+
+</nmwg:message>
\ No newline at end of file

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MetadataKeyRequest-Errors-1.xml
(from rev 6046,
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-Errors-1.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MetadataKeyRequest-Errors-1.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MetadataKeyRequest-Errors-1.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<nmwg:message type="MetadataKeyRequest"
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+
xmlns:errors="http://ggf.org/ns/nmwg/characteristic/errors/2.0/";
+ xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
+ xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";>
+
+ <nmwg:metadata id="m1">
+ <errors:subject id="s1">
+ <nmwgt:interface>
+ <nmwgt:ifAddress type="ipv4">10.1.2.3</nmwgt:ifAddress>
+ <nmwgt:ifName>test-0</nmwgt:ifName>
+ <nmwgt:direction>in</nmwgt:direction>
+ </nmwgt:interface>
+ </errors:subject>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/errors/2.0</nmwg:eventType>
+ </nmwg:metadata>
+
+ <nmwg:metadata id="m2">
+ <select:subject id="s2" metadataIdRef="m1"/>
+ <nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>
+ <select:parameters id="sp1">
+ <nmwg:parameter name="startTime">1187948870</nmwg:parameter>
+ <nmwg:parameter name="endTime">1187948888</nmwg:parameter>
+ </select:parameters>
+ </nmwg:metadata>
+
+ <nmwg:data id="d1" metadataIdRef="m2"/>
+
+
+
+</nmwg:message>
\ No newline at end of file

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MetadataKeyRequest-L2Status-1.xml
(from rev 6046,
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-L2Status-1.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MetadataKeyRequest-L2Status-1.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MetadataKeyRequest-L2Status-1.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,31 @@
+<nmwg:message type="MetadataKeyRequest"
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+ xmlns:nmtl2="http://ggf.org/ns/nmwg/topology/l2/3.0/";
+ xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";>
+
+
+
+ <nmwg:metadata id="meta1">
+ <nmwg:subject id="subject1">
+ <nmtl2:link>
+ <nmtl2:globalName
type="logical">PSNC-DFN-MUE-003</nmtl2:globalName>
+ </nmtl2:link>
+ </nmwg:subject>
+ <nmwg:eventType>Path.Status</nmwg:eventType>
+ </nmwg:metadata>
+
+
+ <nmwg:metadata id="meta2">
+ <select:subject id="iusub2" metadataIdRef="meta1"/>
+ <select:parameters id="param1">
+ <nmwg:parameter name="time">now</nmwg:parameter>
+ </select:parameters>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>
+ </nmwg:metadata>
+
+
+
+ <nmwg:data id="data1" metadataIdRef="meta2"/>
+
+
+ </nmwg:message>
\ No newline at end of file

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MetadataKeyRequest-L2Status-2.xml
(from rev 6046,
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-L2Status-2.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MetadataKeyRequest-L2Status-2.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MetadataKeyRequest-L2Status-2.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,54 @@
+<nmwg:message type="MetadataKeyRequest"
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+ xmlns:nmtl2="http://ggf.org/ns/nmwg/topology/l2/3.0/";
+ xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
+ xmlns:nmwgtopo3="http://ggf.org/ns/nmwg/topology/base/3.0/";>
+
+
+ <nmwg:metadata id="meta1">
+ <nmwg:subject id="subject1">
+ <nmtl2:link>
+
+ <!--
+ <nmwgtopo3:node>
+ <nmwgtopo3:name type="logical">DFN-LRZ</nmwgtopo3:name>
+ <nmwgtopo3:country>Germany</nmwgtopo3:country>
+ <nmwgtopo3:city>Munich</nmwgtopo3:city>
+ <nmwgtopo3:institution>Leibniz
Rechenzentrum</nmwgtopo3:institution>
+ <nmwgtopo3:role>EndPoint</nmwgtopo3:role>
+ </nmwgtopo3:node>
+ -->
+
+ <nmwgtopo3:node>
+ <nmwgtopo3:name type="logical">PSNC-PL</nmwgtopo3:name>
+ <nmwgtopo3:country>Poland</nmwgtopo3:country>
+ <nmwgtopo3:city>Poznan</nmwgtopo3:city>
+ <nmwgtopo3:institution>PSNC</nmwgtopo3:institution>
+ </nmwgtopo3:node>
+
+ <nmwgtopo3:node>
+ <nmwgtopo3:name type="logical">DFN-MUE</nmwgtopo3:name>
+ <nmwgtopo3:country>Germany</nmwgtopo3:country>
+ <nmwgtopo3:city>Muenster</nmwgtopo3:city>
+ <nmwgtopo3:institution>DFN-Verein</nmwgtopo3:institution>
+ </nmwgtopo3:node>
+
+ </nmtl2:link>
+ </nmwg:subject>
+ <nmwg:eventType>Path.Status</nmwg:eventType>
+ </nmwg:metadata>
+
+
+ <nmwg:metadata id="meta2">
+ <select:subject id="iusub2" metadataIdRef="meta1"/>
+ <select:parameters id="param1">
+ <nmwg:parameter name="time">now</nmwg:parameter>
+ </select:parameters>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>
+ </nmwg:metadata>
+
+
+ <nmwg:data id="data1" metadataIdRef="meta2"/>
+
+
+ </nmwg:message>
\ No newline at end of file

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MetadataKeyRequest-L2Status-3.xml
(from rev 6046,
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-L2Status-3.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MetadataKeyRequest-L2Status-3.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MetadataKeyRequest-L2Status-3.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,16 @@
+<nmwg:message type="MetadataKeyRequest"
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+ xmlns:nmtl2="http://ggf.org/ns/nmwg/topology/l2/3.0/";
+ xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
+ xmlns:nmwgtopo3="http://ggf.org/ns/nmwg/topology/base/3.0/";>
+
+
+ <nmwg:metadata id="meta1">
+ <nmwg:eventType>Path.Status</nmwg:eventType>
+ </nmwg:metadata>
+
+
+ <nmwg:data id="data1" metadataIdRef="meta1"/>
+
+
+ </nmwg:message>
\ No newline at end of file

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MetadataKeyRequest-Ping-1.xml
(from rev 6046,
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-Ping-1.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MetadataKeyRequest-Ping-1.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MetadataKeyRequest-Ping-1.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<nmwg:message type="MetadataKeyRequest"
+ id="metadataKeyRequest1"
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+ xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
+ xmlns:ping="http://ggf.org/ns/nmwg/tools/ping/2.0/";
+ xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";>
+
+
+ <nmwg:metadata id="m1">
+ <ping:subject id="sub1">
+ <nmwgt:endPointPair>
+ <nmwgt:src type="ipv4" value="222.22.22.22"/>
+ <nmwgt:dst type="ipv4" value="111.11.11.11"/>
+ </nmwgt:endPointPair>
+ </ping:subject>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/ping/2.0</nmwg:eventType>
+ </nmwg:metadata>
+
+
+ <nmwg:data id="d1" metadataIdRef="m1"/>
+
+
+</nmwg:message>
\ No newline at end of file

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MetadataKeyRequest-Ping-2.xml
(from rev 6046,
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-Ping-2.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MetadataKeyRequest-Ping-2.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MetadataKeyRequest-Ping-2.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<nmwg:message type="MetadataKeyRequest"
+ id="metadataKeyRequest1"
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+ xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
+ xmlns:ping="http://ggf.org/ns/nmwg/tools/ping/2.0/";
+ xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";>
+
+
+ <!-- fetching all -->
+
+ <nmwg:metadata id="m1">
+ <ping:subject id="sub1">
+ <nmwgt:endPointPair>
+ </nmwgt:endPointPair>
+ </ping:subject>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/ping/2.0</nmwg:eventType>
+ </nmwg:metadata>
+
+
+ <nmwg:data id="d1" metadataIdRef="m1"/>
+
+
+</nmwg:message>
\ No newline at end of file

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MetadataKeyRequest-Utilization-1.xml
(from rev 6046,
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-Utilization-1.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MetadataKeyRequest-Utilization-1.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MetadataKeyRequest-Utilization-1.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,38 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!-- Purpose: Requesting data from a partial metadata request. -->
+<!-- Version: $Id$ -->
+
+<nmwg:message type="MetadataKeyRequest"
+ id="mdrq1"
+
xmlns:netutil="http://ggf.org/ns/nmwg/characteristic/utilization/2.0/";
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+ xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
+
+
+<!-- Metadata sent in - can be partially specified.
+ The response should fill it in. The response will point
+ at "key" versions of the metadata. Those versions will reference
+ completely filled in metadata blocks. -->
+
+ <nmwg:metadata id="meta1">
+ <netutil:subject id="subj1">
+ <nmwgt:interface>
+ <nmwgt:ifAddress type="ipv4">10.1.2.3</nmwgt:ifAddress>
+ <nmwgt:hostName>test-hostName</nmwgt:hostName>
+ </nmwgt:interface>
+ </netutil:subject>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:eventType>
+ <!-- The parameter 'keyword' can be also used as a filter -->
+ <!-- but only if the interface (<nmwgt:interface></nmwgt:interface>)
filter is not empty. -->
+ <!--
+ <nmwg:parameters id="params1">
+ <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
+ </nmwg:parameters>
+ -->
+ </nmwg:metadata>
+
+ <!-- This is the specific data we wish to see -->
+ <nmwg:data id="1" metadataIdRef="meta1"/>
+
+</nmwg:message>

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MetadataKeyRequest-Utilization-2.xml
(from rev 6046,
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-Utilization-2.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MetadataKeyRequest-Utilization-2.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MetadataKeyRequest-Utilization-2.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,24 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+
+<!-- $Id$ -->
+
+<nmwg:message type="MetadataKeyRequest"
+ id="mdrq1"
+
xmlns:netutil="http://ggf.org/ns/nmwg/characteristic/utilization/2.0/";
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+ xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
+
+ <!-- getting all metadata for utilization -->
+
+ <nmwg:metadata id="meta1">
+ <netutil:subject id="subj1">
+ <nmwgt:interface>
+ </nmwgt:interface>
+ </netutil:subject>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:eventType>
+ </nmwg:metadata>
+
+ <nmwg:data id="1" metadataIdRef="meta1"/>
+
+</nmwg:message>

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MetadataKeyRequest-iperf-1.xml
(from rev 6046,
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-iperf-1.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MetadataKeyRequest-iperf-1.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MetadataKeyRequest-iperf-1.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<nmwg:message type="MetadataKeyRequest" id="metadataKeyRequest1"
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+ xmlns:iperf="http://ggf.org/ns/nmwg/tools/iperf/2.0/";
+ xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
+
+
+ <nmwg:metadata id="m1">
+ <iperf:subject id="subject-1">
+ <nmwgt:endPointPair>
+ <nmwgt:src type="ipv4" value="198.32.8.170" port="5433"/>
+ <nmwgt:dst type="ipv4" value="198.32.8.174" port="5433"/>
+ </nmwgt:endPointPair>
+ </iperf:subject>
+ <nmwg:eventType>http://ggf.org/ns/nmwg/tools/iperf/2.0</nmwg:eventType>
+ <!--
+ <nmwg:parameters id="parameters-1">
+ <nmwg:parameter name="protocol">TCP</nmwg:parameter>
+ </nmwg:parameters>
+ -->
+ </nmwg:metadata>
+
+ <nmwg:data id="d1" metadataIdRef="m1" />
+
+
+</nmwg:message>

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MetadataKeyRequest-iperf-2.xml
(from rev 6046,
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-iperf-2.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MetadataKeyRequest-iperf-2.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MetadataKeyRequest-iperf-2.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<nmwg:message type="MetadataKeyRequest" id="metadataKeyRequest1"
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+ xmlns:iperf="http://ggf.org/ns/nmwg/tools/iperf/2.0/";
+ xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
+ xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
+ xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";>
+
+
+ <nmwg:metadata id="m1">
+ <iperf:subject id="subject-1">
+ <nmwgt:endPointPair>
+ <nmwgt:src type="ipv4" value="198.32.8.170" port="5433"/>
+ <nmwgt:dst type="ipv4" value="198.32.8.174" port="5433"/>
+ </nmwgt:endPointPair>
+ </iperf:subject>
+ <nmwg:eventType>http://ggf.org/ns/nmwg/tools/iperf/2.0</nmwg:eventType>
+ <!--
+ <nmwg:parameters id="parameters-1">
+ <nmwg:parameter name="protocol">TCP</nmwg:parameter>
+ </nmwg:parameters>
+ -->
+ </nmwg:metadata>
+
+ <nmwg:metadata id="m1c">
+ <select:subject id="s1c" metadataIdRef="m1"/>
+ <select:parameters id="p1c">
+ <nmwg:parameter name="startTime"
type="unix">1105452600</nmwg:parameter>
+ <nmwg:parameter name="endTime">1105453100</nmwg:parameter>
+ </select:parameters>
+ <nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>
+ </nmwg:metadata>
+
+ <nmwg:data id="d1" metadataIdRef="m1c"/>
+
+
+</nmwg:message>

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MetadataKeyRequest-iperf-3.xml
(from rev 6046,
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-iperf-3.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MetadataKeyRequest-iperf-3.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MetadataKeyRequest-iperf-3.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<nmwg:message type="MetadataKeyRequest" id="metadataKeyRequest1"
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
+
+
+ <nmwg:metadata id="m1">
+ <nmwg:key id="k1">
+ <nmwg:parameters id="p1">
+ <nmwg:parameter
name="eventType">http://ggf.org/ns/nmwg/tools/iperf/2.0</nmwg:parameter>
+ <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-iperf.xml</nmwg:parameter>
+ <nmwg:parameter name="metadataId">meta1-iperf-test</nmwg:parameter>
+ </nmwg:parameters>
+ </nmwg:key>
+ </nmwg:metadata>
+
+ <nmwg:data id="d1" metadataIdRef="m1" />
+
+
+</nmwg:message>

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MetadataKeyRequest-iperf-4.xml
(from rev 6046,
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-iperf-4.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MetadataKeyRequest-iperf-4.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MetadataKeyRequest-iperf-4.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<nmwg:message type="MetadataKeyRequest" id="metadataKeyRequest1"
+ xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
+
+ <nmwg:metadata id="m1">
+ <nmwg:key id="k1">
+ <nmwg:parameters id="p1">
+ <nmwg:parameter
name="eventType">http://ggf.org/ns/nmwg/tools/iperf/2.0</nmwg:parameter>
+ <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-iperf.xml</nmwg:parameter>
+ <nmwg:parameter name="metadataId">meta1-iperf-test</nmwg:parameter>
+ </nmwg:parameters>
+ </nmwg:key>
+ </nmwg:metadata>
+
+ <nmwg:metadata id="m1c">
+ <select:subject id="s1c" metadataIdRef="m1"/>
+ <select:parameters id="p1c">
+ <nmwg:parameter name="startTime">1105452600</nmwg:parameter>
+ <nmwg:parameter name="endTime">1105453100</nmwg:parameter>
+ </select:parameters>
+ <nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>
+ </nmwg:metadata>
+
+ <nmwg:data id="d1" metadataIdRef="m1c"/>
+
+
+</nmwg:message>

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MetadataKeyRequest-iperf-5.xml
(from rev 6046,
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-iperf-5.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MetadataKeyRequest-iperf-5.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MetadataKeyRequest-iperf-5.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<nmwg:message type="MetadataKeyRequest" id="metadataKeyRequest1"
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+ xmlns:iperf="http://ggf.org/ns/nmwg/tools/iperf/2.0/";
+ xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
+
+
+ <!-- fetching all -->
+
+ <nmwg:metadata id="m1">
+ <iperf:subject id="subject-1">
+ <nmwgt:endPointPair>
+ </nmwgt:endPointPair>
+ </iperf:subject>
+ <nmwg:eventType>http://ggf.org/ns/nmwg/tools/iperf/2.0</nmwg:eventType>
+ </nmwg:metadata>
+
+ <nmwg:data id="d1" metadataIdRef="m1" />
+
+
+</nmwg:message>

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MetadataKeyRequest-owamp-1.xml
(from rev 6046,
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-owamp-1.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MetadataKeyRequest-owamp-1.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MetadataKeyRequest-owamp-1.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<nmwg:message type="MetadataKeyRequest"
+ id="metadataKeyRequest1"
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+ xmlns:owamp="http://ggf.org/ns/nmwg/tools/owamp/2.0/";
+ xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
+
+
+ <nmwg:metadata id="meta1">
+ <owamp:subject id="subject-1">
+ <nmwgt:endPointPair>
+ </nmwgt:endPointPair>
+ </owamp:subject>
+ <nmwg:eventType>http://ggf.org/ns/nmwg/tools/owamp/2.0
+ </nmwg:eventType>
+ </nmwg:metadata>
+
+ <nmwg:data id="data1" metadataIdRef="meta1" />
+
+</nmwg:message>
+
+

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MetadataKeyRequest-owamp-2.xml
(from rev 6046,
trunk/perfsonar-java-sql-ma/samples/requests/MetadataKeyRequest-owamp-2.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MetadataKeyRequest-owamp-2.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/MetadataKeyRequest-owamp-2.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<nmwg:message type="MetadataKeyRequest"
+ id="metadataKeyRequest1"
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+ xmlns:owamp="http://ggf.org/ns/nmwg/tools/owamp/2.0/";
+ xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
+
+
+ <nmwg:metadata id="meta1">
+ <owamp:subject id="subject-1">
+ <nmwgt:endPointPair>
+ <nmwgt:src type="ipv4" value="222.22.22.22" />
+ <nmwgt:dst type="ipv4" value="111.11.11.11" />
+ </nmwgt:endPointPair>
+ </owamp:subject>
+ <nmwg:eventType>http://ggf.org/ns/nmwg/tools/owamp/2.0
+ </nmwg:eventType>
+ </nmwg:metadata>
+
+ <nmwg:data id="data1" metadataIdRef="meta1" />
+
+</nmwg:message>
+
+

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-Discards-1.xml
(from rev 6046,
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-Discards-1.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-Discards-1.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-Discards-1.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<nmwg:message type="SetupDataRequest"
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+
xmlns:discards="http://ggf.org/ns/nmwg/characteristic/discards/2.0/";
+ xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
+ xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";>
+
+
+ <nmwg:metadata id="m1">
+ <discards:subject id="s1">
+ <nmwgt:interface>
+ <nmwgt:ifAddress type="ipv4">10.1.2.3</nmwgt:ifAddress>
+ <nmwgt:ifName>test-0</nmwgt:ifName>
+ <nmwgt:direction>in</nmwgt:direction>
+ </nmwgt:interface>
+ </discards:subject>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/discards/2.0</nmwg:eventType>
+ </nmwg:metadata>
+
+ <nmwg:metadata id="m2">
+ <select:subject id="s2" metadataIdRef="m1"/>
+ <nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>
+ <select:parameters id="sp1">
+ <nmwg:parameter name="startTime">1187948870</nmwg:parameter>
+ <nmwg:parameter name="endTime">1187948888</nmwg:parameter>
+ </select:parameters>
+ </nmwg:metadata>
+
+ <nmwg:data id="d1" metadataIdRef="m2"/>
+
+
+</nmwg:message>
\ No newline at end of file

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-Errors-1.xml
(from rev 6046,
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-Errors-1.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-Errors-1.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-Errors-1.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<nmwg:message type="SetupDataRequest"
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+
xmlns:errors="http://ggf.org/ns/nmwg/characteristic/errors/2.0/";
+ xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
+ xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";>
+
+
+ <nmwg:metadata id="m1">
+ <errors:subject id="s1">
+ <nmwgt:interface>
+ <nmwgt:ifAddress type="ipv4">10.1.2.3</nmwgt:ifAddress>
+ <nmwgt:ifName>test-0</nmwgt:ifName>
+ <nmwgt:direction>in</nmwgt:direction>
+ </nmwgt:interface>
+ </errors:subject>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/errors/2.0</nmwg:eventType>
+ </nmwg:metadata>
+
+ <nmwg:metadata id="m2">
+ <select:subject id="s2" metadataIdRef="m1"/>
+ <nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>
+ <select:parameters id="sp1">
+ <nmwg:parameter name="startTime">1187948870</nmwg:parameter>
+ <nmwg:parameter name="endTime">1187948888</nmwg:parameter>
+ </select:parameters>
+ </nmwg:metadata>
+
+ <nmwg:data id="d1" metadataIdRef="m2"/>
+
+
+</nmwg:message>
\ No newline at end of file

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-L2Status-1.xml
(from rev 6046,
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-L2Status-1.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-L2Status-1.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-L2Status-1.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,31 @@
+<nmwg:message type="SetupDataRequest"
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+ xmlns:nmtl2="http://ggf.org/ns/nmwg/topology/l2/3.0/";
+ xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";>
+
+
+
+ <nmwg:metadata id="meta1">
+ <nmwg:subject id="subject1">
+ <nmtl2:link>
+ <nmtl2:globalName
type="logical">PSNC-DFN-MUE-003</nmtl2:globalName>
+ </nmtl2:link>
+ </nmwg:subject>
+ <nmwg:eventType>Path.Status</nmwg:eventType>
+ </nmwg:metadata>
+
+
+ <nmwg:metadata id="meta2">
+ <select:subject id="iusub2" metadataIdRef="meta1"/>
+ <select:parameters id="param1">
+ <nmwg:parameter name="time">now</nmwg:parameter>
+ </select:parameters>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>
+ </nmwg:metadata>
+
+
+
+ <nmwg:data id="data1" metadataIdRef="meta2"/>
+
+
+ </nmwg:message>
\ No newline at end of file

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-L2Status-2.xml
(from rev 6046,
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-L2Status-2.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-L2Status-2.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-L2Status-2.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,32 @@
+<nmwg:message type="SetupDataRequest"
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+ xmlns:nmtl2="http://ggf.org/ns/nmwg/topology/l2/3.0/";
+ xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";>
+
+
+
+ <nmwg:metadata id="meta1">
+ <nmwg:subject id="subject1">
+ <nmtl2:link>
+ <nmtl2:globalName
type="logical">PSNC-DFN-MUE-003</nmtl2:globalName>
+ </nmtl2:link>
+ </nmwg:subject>
+ <nmwg:eventType>Path.Status</nmwg:eventType>
+ </nmwg:metadata>
+
+
+ <nmwg:metadata id="meta2">
+ <select:subject id="iusub2" metadataIdRef="meta1"/>
+ <select:parameters id="param1">
+ <nmwg:parameter name="startTime">1144318523</nmwg:parameter>
+ <nmwg:parameter name="endTime">1147960133</nmwg:parameter>
+ </select:parameters>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>
+ </nmwg:metadata>
+
+
+
+ <nmwg:data id="data1" metadataIdRef="meta2"/>
+
+
+ </nmwg:message>
\ No newline at end of file

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-L2Status-3.xml
(from rev 6046,
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-L2Status-3.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-L2Status-3.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-L2Status-3.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,54 @@
+<nmwg:message type="SetupDataRequest"
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+ xmlns:nmtl2="http://ggf.org/ns/nmwg/topology/l2/3.0/";
+ xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
+ xmlns:nmwgtopo3="http://ggf.org/ns/nmwg/topology/base/3.0/";>
+
+
+ <nmwg:metadata id="meta1">
+ <nmwg:subject id="subject1">
+ <nmtl2:link>
+
+ <!--
+ <nmwgtopo3:node>
+ <nmwgtopo3:name type="logical">DFN-LRZ</nmwgtopo3:name>
+ <nmwgtopo3:country>Germany</nmwgtopo3:country>
+ <nmwgtopo3:city>Munich</nmwgtopo3:city>
+ <nmwgtopo3:institution>Leibniz
Rechenzentrum</nmwgtopo3:institution>
+ <nmwgtopo3:role>EndPoint</nmwgtopo3:role>
+ </nmwgtopo3:node>
+ -->
+
+ <nmwgtopo3:node>
+ <nmwgtopo3:name type="logical">PSNC-PL</nmwgtopo3:name>
+ <nmwgtopo3:country>Poland</nmwgtopo3:country>
+ <nmwgtopo3:city>Poznan</nmwgtopo3:city>
+ <nmwgtopo3:institution>PSNC</nmwgtopo3:institution>
+ </nmwgtopo3:node>
+
+ <nmwgtopo3:node>
+ <nmwgtopo3:name type="logical">DFN-MUE</nmwgtopo3:name>
+ <nmwgtopo3:country>Germany</nmwgtopo3:country>
+ <nmwgtopo3:city>Muenster</nmwgtopo3:city>
+ <nmwgtopo3:institution>DFN-Verein</nmwgtopo3:institution>
+ </nmwgtopo3:node>
+
+ </nmtl2:link>
+ </nmwg:subject>
+ <nmwg:eventType>Path.Status</nmwg:eventType>
+ </nmwg:metadata>
+
+
+ <nmwg:metadata id="meta2">
+ <select:subject id="iusub2" metadataIdRef="meta1"/>
+ <select:parameters id="param1">
+ <nmwg:parameter name="time">now</nmwg:parameter>
+ </select:parameters>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>
+ </nmwg:metadata>
+
+
+ <nmwg:data id="data1" metadataIdRef="meta2"/>
+
+
+ </nmwg:message>
\ No newline at end of file

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-L2Status-4.xml
(from rev 6046,
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-L2Status-4.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-L2Status-4.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-L2Status-4.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<nmwg:message type="SetupDataRequest"
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+ xmlns:nmtl2="http://ggf.org/ns/nmwg/topology/l2/3.0/";
+ xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
+ xmlns:nmwgtopo3="http://ggf.org/ns/nmwg/topology/base/3.0/";>
+
+
+ <nmwg:metadata id="meta1">
+ <nmwg:subject id="subject1">
+ <nmtl2:link>
+
+ <nmwgtopo3:node>
+ <nmwgtopo3:name type="logical">PSNC-PL</nmwgtopo3:name>
+ <nmwgtopo3:country>Poland</nmwgtopo3:country>
+ <nmwgtopo3:city>Poznan</nmwgtopo3:city>
+ <nmwgtopo3:institution>PSNC</nmwgtopo3:institution>
+ </nmwgtopo3:node>
+
+ <nmwgtopo3:node>
+ <nmwgtopo3:name type="logical">DFN-MUE</nmwgtopo3:name>
+ <nmwgtopo3:country>Germany</nmwgtopo3:country>
+ <nmwgtopo3:city>Muenster</nmwgtopo3:city>
+ <nmwgtopo3:institution>DFN-Verein</nmwgtopo3:institution>
+ </nmwgtopo3:node>
+
+ </nmtl2:link>
+ </nmwg:subject>
+ <nmwg:eventType>Path.Status</nmwg:eventType>
+ </nmwg:metadata>
+
+
+ <nmwg:metadata id="meta2">
+ <select:subject id="iusub2" metadataIdRef="meta1"/>
+ <select:parameters id="param1">
+ <nmwg:parameter name="startTime">1144318523</nmwg:parameter>
+ <nmwg:parameter name="endTime">1147960133</nmwg:parameter>
+ </select:parameters>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>
+ </nmwg:metadata>
+
+
+ <nmwg:data id="data1" metadataIdRef="meta2"/>
+
+
+ </nmwg:message>
\ No newline at end of file

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-L2Status-5.xml
(from rev 6046,
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-L2Status-5.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-L2Status-5.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-L2Status-5.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<nmwg:message type="SetupDataRequest"
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+ xmlns:nmtl2="http://ggf.org/ns/nmwg/topology/l2/3.0/";
+ xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";>
+
+
+ <nmwg:metadata id="meta1">
+ <nmwg:key id="localhost.517272ee:10c24fb1ce1:-7ff0">
+ <nmwg:parameters id="localhost.517272ee:10c24fb1ce1:-7fef">
+ <nmwg:parameter
name="pathId">PSNC-DFN-MUE-Link-1001</nmwg:parameter>
+ <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-L2-status-domain.xml</nmwg:parameter>
+ <nmwg:parameter name="eventType">Path.Status</nmwg:parameter>
+ </nmwg:parameters>
+ </nmwg:key>
+ </nmwg:metadata>
+
+
+ <nmwg:metadata id="meta2">
+ <select:subject id="iusub2" metadataIdRef="meta1"/>
+ <select:parameters id="param1">
+ <nmwg:parameter name="time">now</nmwg:parameter>
+ </select:parameters>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>
+ </nmwg:metadata>
+
+
+
+ <nmwg:data id="data1" metadataIdRef="meta2"/>
+
+
+</nmwg:message>

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-L2Status-6.xml
(from rev 6046,
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-L2Status-6.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-L2Status-6.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-L2Status-6.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<nmwg:message type="SetupDataRequest"
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+ xmlns:nmtl2="http://ggf.org/ns/nmwg/topology/l2/3.0/";
+ xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";>
+
+
+ <nmwg:metadata id="meta1">
+ <nmwg:eventType>Path.Status</nmwg:eventType>
+ </nmwg:metadata>
+
+
+ <nmwg:data id="data1" metadataIdRef="meta1"/>
+
+
+</nmwg:message>
\ No newline at end of file

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-Ping-1.xml
(from rev 6046,
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-Ping-1.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-Ping-1.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-Ping-1.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<nmwg:message type="SetupDataRequest"
+ id="setupDataRequest1"
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+ xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
+ xmlns:ping="http://ggf.org/ns/nmwg/tools/ping/2.0/";
+ xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";>
+
+
+ <nmwg:metadata id="m1">
+ <ping:subject id="sub1">
+ <nmwgt:endPointPair>
+ <nmwgt:src type="ipv4" value="222.22.22.22"/>
+ <nmwgt:dst type="ipv4" value="111.11.11.11"/>
+ </nmwgt:endPointPair>
+ </ping:subject>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/ping/2.0</nmwg:eventType>
+ </nmwg:metadata>
+
+ <nmwg:metadata id="m2">
+ <select:subject id="iusub2" metadataIdRef="m1"/>
+ <select:parameters id="param1">
+ <nmwg:parameter name="startTime">1216644761</nmwg:parameter>
+ <nmwg:parameter name="endTime">1216644790</nmwg:parameter>
+ <!--
+ <nmwg:parameter name="startTime">
+ <nmtm:time type="ISO" value="2005-07-16T00:00:00Z"/>
+ </nmwg:parameter>
+ <nmwg:parameter name="endTime">
+ <nmtm:time type="ISO" value="2005-07-21T00:00:00Z"/>
+ </nmwg:parameter>
+ -->
+ </select:parameters>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>
+ </nmwg:metadata>
+
+ <nmwg:data id="d1" metadataIdRef="m2"/>
+
+
+</nmwg:message>
\ No newline at end of file

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-Ping-2.xml
(from rev 6046,
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-Ping-2.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-Ping-2.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-Ping-2.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<nmwg:message type="SetupDataRequest"
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
+
+
+ <nmwg:metadata id="m1">
+ <nmwg:key id="k1">
+ <nmwg:parameters id="p1">
+ <nmwg:parameter name="eventType"
value="http://ggf.org/ns/nmwg/tools/ping/2.0"/>
+ <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-clmp-ping.xml</nmwg:parameter>
+ <nmwg:parameter name="metadataId">ping-meta1</nmwg:parameter>
+ </nmwg:parameters>
+ </nmwg:key>
+ </nmwg:metadata>
+
+
+ <nmwg:data id="d1" metadataIdRef="m1"/>
+
+
+</nmwg:message>
\ No newline at end of file

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-Utilization-1.xml
(from rev 6046,
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-Utilization-1.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-Utilization-1.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-Utilization-1.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,62 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!-- Purpose: We send down metadata (no key) and some filter parameters,
+ we hope to get back just data. -->
+<!-- Version: $Id$ -->
+
+<nmwg:message id="msg4"
+ type="SetupDataRequest"
+
xmlns:netutil="http://ggf.org/ns/nmwg/characteristic/utilization/2.0/";
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+ xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
+ xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
+ xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";>
+
+
+ <nmwg:metadata id="meta1">
+ <netutil:subject id="iusub1">
+ <nmwgt:interface>
+
+ <nmwgt:ifAddress type="ipv4">10.1.2.3</nmwgt:ifAddress>
+ <nmwgt:direction>in</nmwgt:direction>
+ <nmwgt:hostName>test-hostName</nmwgt:hostName>
+ <nmwgt:ifName>test-0</nmwgt:ifName>
+ <nmwgt:authRealm>TestRealm</nmwgt:authRealm>
+ <nmwgt:capacity>1000BaseT</nmwgt:capacity>
+
+ </nmwgt:interface>
+ </netutil:subject>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:eventType>
+ </nmwg:metadata>
+
+
+ <!-- The second metadata is used to filter the results of the first
operation,
+ this basically means our 'subject' is the first metadata block, then
we
+ apply a parameter block to limit/transform the resulting data. -->
+ <nmwg:metadata id="meta2">
+ <select:subject id="iusub2" metadataIdRef="meta1"/>
+
+ <select:parameters id="param1">
+
+ <nmwg:parameter name="startTime">1121472000</nmwg:parameter>
+ <nmwg:parameter name="endTime">1121904000</nmwg:parameter>
+ <!--
+ <nmwg:parameter name="startTime">
+ <nmtm:time type="ISO" value="2005-07-16T00:00:00Z"/>
+ </nmwg:parameter>
+ <nmwg:parameter name="endTime">
+ <nmtm:time type="ISO" value="2005-07-21T00:00:00Z"/>
+ </nmwg:parameter>
+ -->
+ <nmwg:parameter name="consolidationFunction">AVERAGE</nmwg:parameter>
+ <nmwg:parameter name="resolution">60</nmwg:parameter>
+ </select:parameters>
+
+ <nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>
+
+ </nmwg:metadata>
+
+ <!-- This is the specific data we wish to see -->
+ <nmwg:data id="data1" metadataIdRef="meta2"/>
+
+</nmwg:message>

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-Utilization-2.xml
(from rev 6046,
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-Utilization-2.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-Utilization-2.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-Utilization-2.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,39 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+
+<!-- $Id$ -->
+
+<!-- example for SQL MA -->
+
+
+<nmwg:message type="SetupDataRequest"
+ id="mdrq1"
+
xmlns:netutil="http://ggf.org/ns/nmwg/characteristic/utilization/2.0/";
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+ xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
+ xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";>
+
+
+ <nmwg:metadata id="meta1">
+ <nmwg:key id="localhost.648d2dab:10c33bffe91:-7fa9">
+ <nmwg:parameters id="localhost.648d2dab:10c33bffe91:-7fa8">
+ <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-utilization.xml</nmwg:parameter>
+ <nmwg:parameter name="metadataId">meta1-test</nmwg:parameter>
+ <nmwg:parameter
name="eventType">http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:parameter>
+ </nmwg:parameters>
+ </nmwg:key>
+ </nmwg:metadata>
+
+
+ <nmwg:metadata id="meta2">
+ <select:subject id="iusub2" metadataIdRef="meta1"/>
+ <select:parameters id="param1">
+ <nmwg:parameter name="time">now</nmwg:parameter>
+ </select:parameters>
+ <nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>
+ </nmwg:metadata>
+
+
+ <nmwg:data id="1" metadataIdRef="meta2"/>
+
+</nmwg:message>

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-Utilization-3.xml
(from rev 6046,
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-Utilization-3.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-Utilization-3.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-Utilization-3.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,57 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+
+<!-- $Id$ -->
+
+<!-- example for SQL MA -->
+
+
+<nmwg:message type="SetupDataRequest"
+ id="mdrq1"
+
xmlns:netutil="http://ggf.org/ns/nmwg/characteristic/utilization/2.0/";
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+ xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
+ xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
+ xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";>
+
+
+ <nmwg:metadata id="meta1">
+ <nmwg:key id="localhost.648d2dab:10c33bffe91:-7fa9">
+ <nmwg:parameters id="localhost.648d2dab:10c33bffe91:-7fa8">
+ <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-utilization.xml</nmwg:parameter>
+ <nmwg:parameter name="metadataId">meta1-test</nmwg:parameter>
+ <nmwg:parameter
name="eventType">http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:parameter>
+ </nmwg:parameters>
+ </nmwg:key>
+ </nmwg:metadata>
+
+
+ <nmwg:metadata id="meta2">
+ <select:subject id="iusub2" metadataIdRef="meta1"/>
+ <select:parameters id="param1">
+ <!--
+ <nmwg:parameter name="startTime">
+ <nmtm:time type="ISO" value="2006-03-22T13:38:24Z"/>
+ </nmwg:parameter>
+ <nmwg:parameter name="endTime">
+ <nmtm:time type="ISO" value="2006-03-22T13:38:26Z"/>
+ </nmwg:parameter>
+ -->
+ <!--
+ <nmwg:parameter name="startTime">
+ <nmtm:time type="unix" value="1143034704"/>
+ </nmwg:parameter>
+ <nmwg:parameter name="endTime">
+ <nmtm:time type="unix" value="1143034706"/>
+ </nmwg:parameter>
+ -->
+ <nmwg:parameter name="startTime">1143034704</nmwg:parameter>
+ <nmwg:parameter name="endTime">1143034706</nmwg:parameter>
+ </select:parameters>
+ <nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>
+ </nmwg:metadata>
+
+
+ <nmwg:data id="1" metadataIdRef="meta2"/>
+
+</nmwg:message>

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-iperf-1.xml
(from rev 6046,
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-iperf-1.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-iperf-1.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-iperf-1.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<nmwg:message type="SetupDataRequest"
+ id="setupDataRequest1"
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+ xmlns:iperf="http://ggf.org/ns/nmwg/tools/iperf/2.0/";
+ xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
+
+
+ <nmwg:metadata id="m1">
+ <iperf:subject id="subject-1">
+ <nmwgt:endPointPair>
+ <nmwgt:src type="ipv4" value="198.32.8.170" port="5433"/>
+ <nmwgt:dst type="ipv4" value="198.32.8.174" port="5433"/>
+ </nmwgt:endPointPair>
+ </iperf:subject>
+ <nmwg:eventType>http://ggf.org/ns/nmwg/tools/iperf/2.0</nmwg:eventType>
+ <!--
+ <nmwg:parameters id="parameters-1">
+ <nmwg:parameter name="protocol">TCP</nmwg:parameter>
+ </nmwg:parameters>
+ -->
+ </nmwg:metadata>
+
+ <nmwg:data id="d1" metadataIdRef="m1" />
+
+
+</nmwg:message>

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-iperf-2.xml
(from rev 6046,
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-iperf-2.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-iperf-2.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-iperf-2.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<nmwg:message type="SetupDataRequest"
+ id="setupDataRequest1"
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+ xmlns:iperf="http://ggf.org/ns/nmwg/tools/iperf/2.0/";
+ xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
+ xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
+ xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";>
+
+
+ <nmwg:metadata id="m1">
+ <iperf:subject id="subject-1">
+ <nmwgt:endPointPair>
+ <nmwgt:src type="ipv4" value="198.32.8.170" port="5433"/>
+ <nmwgt:dst type="ipv4" value="198.32.8.174" port="5433"/>
+ </nmwgt:endPointPair>
+ </iperf:subject>
+ <nmwg:eventType>http://ggf.org/ns/nmwg/tools/iperf/2.0</nmwg:eventType>
+ <!--
+ <nmwg:parameters id="parameters-1">
+ <nmwg:parameter name="protocol">TCP</nmwg:parameter>
+ </nmwg:parameters>
+ -->
+ </nmwg:metadata>
+
+ <nmwg:metadata id="m1c">
+ <select:subject id="s1c" metadataIdRef="m1"/>
+ <select:parameters id="p1c">
+ <nmwg:parameter name="startTime">1105452600</nmwg:parameter>
+ <nmwg:parameter name="endTime">1105453100</nmwg:parameter>
+ </select:parameters>
+ <nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>
+ </nmwg:metadata>
+
+ <nmwg:data id="d1" metadataIdRef="m1c"/>
+
+
+</nmwg:message>

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-iperf-3.xml
(from rev 6046,
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-iperf-3.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-iperf-3.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-iperf-3.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<nmwg:message type="SetupDataRequest"
+ id="setupDataRequest1"
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
+
+
+ <nmwg:metadata id="m1">
+ <nmwg:key id="k1">
+ <nmwg:parameters id="p1">
+ <nmwg:parameter
name="eventType">http://ggf.org/ns/nmwg/tools/iperf/2.0</nmwg:parameter>
+ <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-iperf.xml</nmwg:parameter>
+ <nmwg:parameter name="metadataId">meta1-iperf-test</nmwg:parameter>
+ </nmwg:parameters>
+ </nmwg:key>
+ </nmwg:metadata>
+
+ <nmwg:data id="d1" metadataIdRef="m1" />
+
+
+</nmwg:message>

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-iperf-4.xml
(from rev 6046,
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-iperf-4.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-iperf-4.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-iperf-4.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<nmwg:message type="SetupDataRequest"
+ id="setupDataRequest1"
+ xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
+
+ <nmwg:metadata id="m1">
+ <nmwg:key id="k1">
+ <nmwg:parameters id="p1">
+ <nmwg:parameter
name="eventType">http://ggf.org/ns/nmwg/tools/iperf/2.0</nmwg:parameter>
+ <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-iperf.xml</nmwg:parameter>
+ <nmwg:parameter name="metadataId">meta1-iperf-test</nmwg:parameter>
+ </nmwg:parameters>
+ </nmwg:key>
+ </nmwg:metadata>
+
+ <nmwg:metadata id="m1c">
+ <select:subject id="s1c" metadataIdRef="m1"/>
+ <select:parameters id="p1c">
+ <nmwg:parameter name="startTime">1105452600</nmwg:parameter>
+ <nmwg:parameter name="endTime">1105453100</nmwg:parameter>
+ </select:parameters>
+ <nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>
+ </nmwg:metadata>
+
+ <nmwg:data id="d1" metadataIdRef="m1c"/>
+
+
+</nmwg:message>

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-iperf-5.xml
(from rev 6046,
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-iperf-5.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-iperf-5.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-iperf-5.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<nmwg:message type="SetupDataRequest"
+ id="setuDataRequest1"
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+ xmlns:iperf="http://ggf.org/ns/nmwg/tools/iperf/2.0/";
+ xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
+
+
+ <!-- fetching all -->
+
+ <nmwg:metadata id="m1">
+ <iperf:subject id="subject-1">
+ <nmwgt:endPointPair>
+ </nmwgt:endPointPair>
+ </iperf:subject>
+ <nmwg:eventType>http://ggf.org/ns/nmwg/tools/iperf/2.0</nmwg:eventType>
+ </nmwg:metadata>
+
+ <nmwg:data id="d1" metadataIdRef="m1" />
+
+
+</nmwg:message>

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-owamp-1.xml
(from rev 6046,
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-owamp-1.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-owamp-1.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-owamp-1.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,22 @@
+<nmwg:message type="SetupDataRequest" id="datarq2-1"
+ xmlns="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";
+ xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+ xmlns:owamp="http://ggf.org/ns/nmwg/tools/owamp/2.0/";
+ xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";
+ xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
+ xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
+
+ <nmwg:metadata id="meta1">
+ <owamp:subject id="subj1">
+ <nmwgt:endPointPair>
+ <nmwgt:src type="ipv4" value="222.22.22.22"
/> <!-- The host where is OWAMP M -->
+ <nmwgt:dst type="ipv4" value="111.11.11.11"
/> <!-- destination host -->
+ </nmwgt:endPointPair>
+ </owamp:subject>
+
+
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/owamp/2.0</nmwg:eventType>
+ </nmwg:metadata>
+ <nmwg:data id="1" metadataIdRef="meta1" />
+
+</nmwg:message>
\ No newline at end of file

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-owamp-2.xml
(from rev 6046,
trunk/perfsonar-java-sql-ma/samples/requests/SetupDataRequest-owamp-2.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-owamp-2.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/requests/SetupDataRequest-owamp-2.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,27 @@
+<nmwg:message type="SetupDataRequest" id="datarq2-1"
+ xmlns="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";
+ xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+ xmlns:owamp="http://ggf.org/ns/nmwg/tools/owamp/2.0/";
+ xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";
+ xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
+ xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
+
+ <nmwg:metadata id="meta1">
+ <owamp:subject id="sub1">
+ <nmwgt:endPointPair>
+ <nmwgt:src type="ipv4" value="222.22.22.21" />
+ <nmwgt:dst type="ipv4" value="111.11.11.12" />
+ </nmwgt:endPointPair>
+ </owamp:subject>
+
+ <owamp:parameters id="param1">
+ <nmwg:parameter name="direction">to</nmwg:parameter>
+ <nmwg:parameter
name="output">summary</nmwg:parameter><!--It is parameter for summary
request. It is very important that this parameter has this format -->
+ </owamp:parameters>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/owamp/2.0</nmwg:eventType>
+ </nmwg:metadata>
+
+ <nmwg:data id="1" metadataIdRef="meta1" />
+
+</nmwg:message>
\ No newline at end of file

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/responses/EchoResponse.xml
(from rev 6046,
trunk/perfsonar-java-sql-ma/samples/responses/EchoResponse.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/responses/EchoResponse.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/responses/EchoResponse.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<nmwg:message id="id1_resp"
+ messageIdRef="id1"
+ type="EchoResponse"
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
+ <nmwg:metadata id="resultCodeMetadata">
+ <nmwg:eventType>success.echo</nmwg:eventType>
+ </nmwg:metadata>
+ <nmwg:data id="resultDescriptionData_for_resultCodeMetadata"
metadataIdRef="resultCodeMetadata">
+ <nmwgr:datum xmlns:nmwgr="http://ggf.org/ns/nmwg/result/2.0/";>
+ This is the echo response from the service.
+ </nmwgr:datum>
+ </nmwg:data>
+</nmwg:message>

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/responses/MeasurementArchiveStoreResponse-owamp-1.xml
(from rev 6046,
trunk/perfsonar-java-sql-ma/samples/responses/MeasurementArchiveStoreResponse-owamp-1.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/responses/MeasurementArchiveStoreResponse-owamp-1.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/responses/MeasurementArchiveStoreResponse-owamp-1.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<nmwg:message id="datarq2-1_resp"
+ messageIdRef="datarq2-1"
+ type="MeasurementArchiveStoreResponse"
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
+
+ <nmwg:metadata id="resultCodeMetadata">
+ <nmwg:eventType>success.ma.write</nmwg:eventType>
+ </nmwg:metadata>
+ <nmwg:data id="resultDescriptionData_for_resultCodeMetadata"
metadataIdRef="resultCodeMetadata">
+ <nmwgr:datum
xmlns:nmwgr="http://ggf.org/ns/nmwg/result/2.0/";>Data have been
stored</nmwgr:datum>
+ </nmwg:data>
+</nmwg:message>
\ No newline at end of file

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/responses/MetadataKeyResponse-owamp-1.xml
(from rev 6046,
trunk/perfsonar-java-sql-ma/samples/responses/MetadataKeyResponse-owamp-1.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/responses/MetadataKeyResponse-owamp-1.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/responses/MetadataKeyResponse-owamp-1.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,64 @@
+<nmwg:message
+ type="MetadataKeyResponse"
+ id="metadataKeyResponse1"
+ messageIdRef="metadataKeyRequest1"
+ xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+ xmlns:owamp="http://ggf.org/ns/nmwg/tools/owamp/2.0/";
+ xmlns="http://ggf.org/ns/nmwg/base/2.0/";>
+
+ <nmwg:metadata id="owamp-meta1">
+ <owamp:subject id="sub1">
+ <nmwgt:endPointPair>
+ <nmwgt:src type="ipv4" value="222.22.22.22" />
+ <nmwgt:dst type="ipv4" value="111.11.11.11" />
+ </nmwgt:endPointPair>
+ </owamp:subject>
+
+ <owamp:parameters id="param1">
+ <nmwg:parameter name="direction">to</nmwg:parameter>
+ </owamp:parameters>
+
+ <nmwg:eventType>http://ggf.org/ns/nmwg/tools/owamp/2.0
+ </nmwg:eventType>
+ </nmwg:metadata>
+
+ <nmwg:metadata id="owamp-meta2">
+ <owamp:subject id="sub1">
+ <nmwgt:endPointPair>
+ <nmwgt:src type="ipv4" value="222.22.22.21" />
+ <nmwgt:dst type="ipv4" value="111.11.11.12" />
+ </nmwgt:endPointPair>
+ </owamp:subject>
+
+ <owamp:parameters id="param1">
+ <nmwg:parameter name="direction">to</nmwg:parameter>
+ <nmwg:parameter
name="output">summary</nmwg:parameter><!--It is parameter for summary
request. It is very important that this parameter has this format -->
+ </owamp:parameters>
+
+ <nmwg:eventType>http://ggf.org/ns/nmwg/tools/owamp/2.0
+ </nmwg:eventType>
+ </nmwg:metadata>
+
+ <nmwg:data id="data1-owamp" metadataIdRef="owamp-meta1">
+ <nmwg:key>
+ <nmwg:parameters>
+ <nmwg:parameter
name="metadataId">owamp-meta1</nmwg:parameter>
+ <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-clmp-owamp.xml</nmwg:parameter>
+ </nmwg:parameters>
+ </nmwg:key>
+ </nmwg:data>
+
+ <nmwg:data id="data2-owamp" metadataIdRef="owamp-meta2">
+ <nmwg:key>
+ <nmwg:parameters>
+ <nmwg:parameter
name="metadataId">owamp-meta2</nmwg:parameter>
+ <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-owamp-aggregation.xml</nmwg:parameter>
+ </nmwg:parameters>
+ </nmwg:key>
+ </nmwg:data>
+
+</nmwg:message>
+
+
+

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/responses/MetadataKeyResponse-owamp-2.xml
(from rev 6046,
trunk/perfsonar-java-sql-ma/samples/responses/MetadataKeyResponse-owamp-2.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/responses/MetadataKeyResponse-owamp-2.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/responses/MetadataKeyResponse-owamp-2.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,38 @@
+<nmwg:message
+ type="MetadataKeyResponse"
+ id="metadataKeyResponse1"
+ messageIdRef="metadataKeyRequest1"
+ xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+ xmlns:owamp="http://ggf.org/ns/nmwg/tools/owamp/2.0/";
+ xmlns="http://ggf.org/ns/nmwg/base/2.0/";>
+
+ <nmwg:metadata id="owamp-meta1">
+ <owamp:subject id="sub1">
+ <nmwgt:endPointPair>
+ <nmwgt:src type="ipv4" value="222.22.22.22" />
+ <nmwgt:dst type="ipv4" value="111.11.11.11" />
+ </nmwgt:endPointPair>
+ </owamp:subject>
+
+ <owamp:parameters id="param1">
+ <nmwg:parameter name="direction">to</nmwg:parameter>
+ </owamp:parameters>
+
+ <nmwg:eventType>http://ggf.org/ns/nmwg/tools/owamp/2.0
+ </nmwg:eventType>
+ </nmwg:metadata>
+
+ <nmwg:data id="data1-owamp" metadataIdRef="owamp-meta1">
+ <nmwg:key>
+ <nmwg:parameters>
+ <nmwg:parameter
name="metadataId">owamp-meta1</nmwg:parameter>
+ <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-clmp-owamp.xml</nmwg:parameter>
+ </nmwg:parameters>
+ </nmwg:key>
+ </nmwg:data>
+
+</nmwg:message>
+
+
+

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/responses/SetupDataResponse-owamp-1.xml
(from rev 6046,
trunk/perfsonar-java-sql-ma/samples/responses/SetupDataResponse-owamp-1.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/responses/SetupDataResponse-owamp-1.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/responses/SetupDataResponse-owamp-1.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,31 @@
+<nmwg:message id="datarq2-1_resp"
+ messageIdRef="datarq2-1"
+ type="SetupDataResponse"
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
+
+ <nmwg:metadata id="owamp-meta1">
+ <owamp:subject id="sub1"
xmlns:owamp="http://ggf.org/ns/nmwg/tools/owamp/2.0/";>
+ <nmwgt:endPointPair
xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
+ <nmwgt:src type="ipv4" value="222.22.22.22" />
+ <nmwgt:dst type="ipv4" value="111.11.11.11" />
+ </nmwgt:endPointPair>
+ </owamp:subject>
+ <owamp:parameters id="param1"
xmlns:owamp="http://ggf.org/ns/nmwg/tools/owamp/2.0/";>
+ <!-- parameters are setup in metadata xml config file. This
is only example of one type of parameters -->
+ <nmwg:parameter name="direction">to</nmwg:parameter>
+ </owamp:parameters>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/owamp/2.0</nmwg:eventType>
+ </nmwg:metadata>
+
+ <nmwg:data id="data1" metadataIdRef="owamp-meta1">
+ <owamp:datum receiveSynchronized="1"
receiveTime="15080301494633990766"
+ receiveTimeError="1.00583E-6" sendSynchronized="1"
sendTime="15080301494378967368"
+ sendTimeError="4.91142E-5" seqNum="0" ttl="243"
+ xmlns:owamp="http://ggf.org/ns/nmwg/tools/owamp/2.0/";
/>
+ <owamp:datum receiveSynchronized="1"
receiveTime="15080301494633990766"
+ receiveTimeError="1.00483E-6" sendSynchronized="1"
sendTime="15080301494378967368"
+ sendTimeError="4.81142E-5" seqNum="1" ttl="243"
+ xmlns:owamp="http://ggf.org/ns/nmwg/tools/owamp/2.0/";
/>
+ </nmwg:data>
+
+</nmwg:message>
\ No newline at end of file

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/responses/SetupDataResponse-owamp-2.xml
(from rev 6046,
trunk/perfsonar-java-sql-ma/samples/responses/SetupDataResponse-owamp-2.xml)
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/responses/SetupDataResponse-owamp-2.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/samples/responses/SetupDataResponse-owamp-2.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<nmwg:message id="datarq2-1_resp" messageIdRef="datarq2-1"
+ type="SetupDataResponse"
xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
+ <nmwg:metadata id="owamp-meta2">
+ <owamp:subject id="sub1"
xmlns:owamp="http://ggf.org/ns/nmwg/tools/owamp/2.0/";>
+ <nmwgt:endPointPair
xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
+ <nmwgt:src type="ipv4" value="222.22.22.21" />
+ <nmwgt:dst type="ipv4" value="111.11.11.12" />
+ </nmwgt:endPointPair>
+ </owamp:subject>
+ <owamp:parameters id="param1"
xmlns:owamp="http://ggf.org/ns/nmwg/tools/owamp/2.0/";>
+ <nmwg:parameter name="direction">to</nmwg:parameter>
+ <nmwg:parameter name="output">summary</nmwg:parameter>
+ </owamp:parameters>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/owamp/2.0</nmwg:eventType>
+ </nmwg:metadata>
+ <nmwg:data id="localhost.-1c8a5775:132d4088af3:-7fcc"
metadataIdRef="owamp-meta2">
+ <owamp:datum delayUnits="ms" duplicates="2" error="1.0"
+ errorUnits="ms" hops="12" jitter="0.1"
jitterUnits="ms" loss="1"
+ lostPercent="10.0" maxDelay="1.5" medDelay="2.0"
minDelay="1.0"
+ receiver="host2" sender="host1" sent="1"
+ xmlns:owamp="http://ggf.org/ns/nmwg/tools/owamp/2.0/";
/>
+ </nmwg:data>
+</nmwg:message>

Added:
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/services/MeasurementArchiveService/META-INF/services.xml
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/services/MeasurementArchiveService/META-INF/services.xml
(rev 0)
+++
trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/services/MeasurementArchiveService/META-INF/services.xml
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,9 @@
+<service name="MeasurementArchiveService" scope="application">
+ <description>
+ perfSONAR RRD Measurement Archive Service
+ </description>
+ <operation name="message">
+ <messageReceiver
class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
+ </operation>
+ <parameter
name="ServiceClass">org.perfsonar.service.base.web.RequestHandlerAxis2</parameter>
+</service>

Added: trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/web.xml
(rev 0)
+++ trunk/perfsonar-java-sql-ma/src/main/webapp/WEB-INF/web.xml 2012-12-03
13:50:47 UTC (rev 6047)
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web
+Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd";>
+
+<web-app>
+ <display-name>PerfSONAR SQL MA</display-name>
+
+ <listener>
+
<listener-class>org.perfsonar.service.base.container.listeners.StartupInitializer</listener-class>
+ </listener>
+
+ <servlet>
+ <servlet-name>AxisServlet</servlet-name>
+ <display-name>Apache-Axis Servlet</display-name>
+
<servlet-class>org.apache.axis2.transport.http.AxisServlet</servlet-class>
+ <!--<init-param>-->
+ <!--<param-name>axis2.xml.path</param-name>-->
+ <!--<param-value>/WEB-INF/conf/axis2.xml</param-value>-->
+ <!--<param-name>axis2.xml.url</param-name>-->
+ <!--<param-value>http://localhot/myrepo/axis2.xml</param-value>-->
+ <!--<param-name>axis2.repository.path</param-name>-->
+ <!--<param-value>/WEB-INF</param-value>-->
+ <!--<param-name>axis2.repository.url</param-name>-->
+ <!--<param-value>http://localhot/myrepo</param-value>-->
+ <!--</init-param>-->
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>AxisAdminServlet</servlet-name>
+ <display-name>Apache-Axis AxisAdmin Servlet (Web
Admin)</display-name>
+ <servlet-class>
+ org.apache.axis2.transport.http.AxisAdminServlet</servlet-class>
+ </servlet>
+
+ <servlet>
+ <servlet-name>
+ ServiceAdmin
+ </servlet-name>
+ <servlet-class>
+ perfSONARWebAdmin.admin.service.Admin
+ </servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>
+ ServiceAdmin
+ </servlet-name>
+ <url-pattern>
+ /ServiceAdmin
+ </url-pattern>
+ </servlet-mapping>
+
+
+ <servlet>
+ <servlet-name>
+ eXistAdmin
+ </servlet-name>
+ <servlet-class>
+ perfSONARWebAdmin.admin.exist.eXistAdmin
+ </servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>
+ eXistAdmin
+ </servlet-name>
+ <url-pattern>
+ /eXistAdmin
+ </url-pattern>
+ </servlet-mapping>
+
+
+ <servlet>
+ <servlet-name>
+ Wizard
+ </servlet-name>
+ <servlet-class>
+ perfSONARWebAdmin.admin.wizard.Wizard
+ </servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>
+ Wizard
+ </servlet-name>
+ <url-pattern>
+ /Wizard
+ </url-pattern>
+ </servlet-mapping>
+
+
+ <servlet>
+ <servlet-name>
+ SQLMAdmin
+ </servlet-name>
+ <servlet-class>
+ perfSONARWebAdmin.admin.sqlma.SQLMAdmin
+ </servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>
+ SQLMAdmin
+ </servlet-name>
+ <url-pattern>
+ /SQLMAdmin
+ </url-pattern>
+ </servlet-mapping>
+
+
+ <!-- end -->
+ <!-- pS extension -->
+
+
+ <servlet-mapping>
+ <servlet-name>AxisServlet</servlet-name>
+ <url-pattern>/servlet/AxisServlet</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>AxisServlet</servlet-name>
+ <url-pattern>*.jws</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>AxisServlet</servlet-name>
+ <url-pattern>/services/*</url-pattern>
+ </servlet-mapping>
+
+ <!-- uncomment this if you want the admin servlet -->
+ <!--
+ <servlet-mapping>
+ <servlet-name>AdminServlet</servlet-name>
+ <url-pattern>/servlet/AdminServlet</url-pattern>
+ </servlet-mapping>
+ -->
+
+ <session-config>
+ <!-- Default to 5 minute session timeouts -->
+ <session-timeout>5</session-timeout>
+ </session-config>
+
+ <!-- currently the W3C havent settled on a media type for WSDL;
+ http://www.w3.org/TR/2003/WD-wsdl12-20030303/#ietf-draft
+ for now we go with the basic 'it's XML' response -->
+ <mime-mapping>
+ <extension>wsdl</extension>
+ <mime-type>text/xml</mime-type>
+ </mime-mapping>
+
+
+ <mime-mapping>
+ <extension>xsd</extension>
+ <mime-type>text/xml</mime-type>
+ </mime-mapping>
+
+ <welcome-file-list id="WelcomeFileList">
+ <welcome-file>index.jsp</welcome-file>
+ <welcome-file>index.html</welcome-file>
+ <welcome-file>index.jws</welcome-file>
+ </welcome-file-list>
+
+</web-app>

Copied: trunk/perfsonar-java-sql-ma/src/main/webapp/default.css (from rev
6046, trunk/perfsonar-java-sql-ma/conf/axis-1.4/default.css)
===================================================================
--- trunk/perfsonar-java-sql-ma/src/main/webapp/default.css
(rev 0)
+++ trunk/perfsonar-java-sql-ma/src/main/webapp/default.css 2012-12-03
13:50:47 UTC (rev 6047)
@@ -0,0 +1,801 @@
+
+/* standard elements */
+html {
+ min-height: 100%;
+}
+
+* {
+ margin: 0;
+ padding: 0;
+}
+
+body {
+ background-color: #ffffff;
+ font-family: arial;
+}
+
+a img{
+ border: none;
+}
+/* Wizard CSS */
+.top {
+ display: block;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+ color: #468C46;
+ margin: 0% 1% 0 1%;
+ border-bottom: 1px dotted #468C46;
+ padding: 7px;
+ background: #ffffff;
+}
+
+.greenasterisk {
+ font-size: 130%;
+ color: #468C46;
+}
+
+.properties {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+ padding: 10px;
+ margin: 0% 1% 0 1%;
+}
+
+.properties p {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+}
+
+.properties table {
+ border-bottom: 1px dotted #468C46;
+ margin-bottom: 20px;
+}
+
+.inner_properties {
+ padding:0px;
+ margin:0px;
+}
+.inner_properties table{
+ border: none;
+ margin:0px;
+ padding:0px;
+}
+
+.properties td {
+ padding: 15px;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+}
+
+.properties em {
+ display: block;
+ color: red;
+ font-size: 95%;
+}
+
+.info_wizard {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+ color: #468C46;
+}
+
+.info_wizard p {
+}
+/* General Purpose CSS*/
+.welcometextlavender {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+ font-weight: bold;
+ color: #4169E1;
+ border-bottom-width: 1px;
+ border-bottom-style: dotted;
+ border-bottom-color: #4169E1;
+ clip: rect( auto, auto, auto, auto );
+ margin-left: 0%;
+}
+
+.formated_text {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+}
+
+.blueheader {
+ text-align: left;
+ color: #4169E1;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+}
+
+.info {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+ color: #4169E1;
+ float: none;
+ margin: 0% 0% 0% 1%;
+}
+
+.info p {
+ float: none;
+ text-align: justify;
+}
+
+.lightgrey {
+ background-color: #f1f3f1;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 10px;
+}
+
+.lightgrey td {
+ padding: 5px;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 10px;
+}
+
+.darkgrey {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 10px;
+ background-color: #e1e5e1;
+}
+
+.darkgrey td {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 10px;
+ padding: 5px;
+}
+
+.hilighted {
+ color: #4169E1;
+ border-bottom: 1px solid #4169E1;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+}
+
+.underlined {
+ border-bottom: 1px solid #4169E1;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+}
+
+.tablessContent {
+ margin: 2% 0 0 0.3%;
+ background: #ffffff;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+}
+
+.input_style_blue {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 10px;
+}
+
+.headerlavender {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+ background-color: #A0A0D8;
+ margin-right: 0px;
+ margin-left: 0px;
+ padding: 5px;
+}
+/*eXist Admin CSS*/
+.content {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+ margin: 2% 0% 0 0%;
+ background: #ffffff;
+}
+
+.content ul {
+ margin-top: 5px;
+ display: block;
+ list-style: none outside;
+ padding: 5px;
+}
+
+.content li {
+ margin: 0 0 0 0;
+ padding: 0px;
+ display: block;
+ float: left;
+ position: relative;
+ top: -1.32em;
+}
+
+.manage_exist {
+ background: #ffffff;
+ margin: 0% 0% 0% 0%;
+ padding: 0px;
+}
+
+.showResource {
+ float: none;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+ text-indent: 0%;
+ margin-top: 5px;
+ margin-left: 0.3%;
+ padding: 0px;
+ text-align: inherit;
+}
+
+.showResource table {
+ left: -100px;
+ position: static;
+ margin-top: 0px;
+ border-spacing: 1px 0px;
+}
+
+.showResource th {
+ padding: 10px;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 12px;
+ background-color: #C7C7F2;
+}
+
+.showResource td {
+ padding: 10px;
+}
+
+.showResource p {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+ border: none;
+ padding: 5px;
+ margin: 0% 0% 0% 0%;
+}
+
+.exist_welcome_text {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+ font-weight: bold;
+ padding: 5px;
+ color: #4169E1;
+ font-weight: bold;
+ border-bottom-width: 1px;
+ border-bottom-style: dotted;
+ border-bottom-color: #4169E1;
+ clip: rect( auto, auto, auto, auto );
+ margin-left: 0%;
+}
+
+.input {
+ padding: 1em;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+}
+
+.input_style {
+ border-color: #468C46;
+ border-style: solid;
+ border-width: 1px;
+}
+
+.login_table {
+ background-color: #E6E6FA;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+}
+
+.login_table td {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+}
+
+.logout {
+ margin-top: 10px;
+ margin-left: 48%;
+}
+
+.logout a {
+ padding: 5px;
+ text-decoration: none;
+ color: green;
+ background: transparent url(graphics/logout_button.gif) no-repeat center
top;
+ width: 64px;
+ height: 28px;
+ display: block;
+}
+
+.logout a:hover {
+ background: transparent url(graphics/logout_button.gif) no-repeat center
top;
+ color: #049;
+}
+
+.input_table {
+ border: 1px solid #4169E1;
+ border-spacing: 0px 1px;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+}
+
+.input_table td {
+ padding: 5px;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+}
+
+.input_table th {
+ padding: 5px;
+ text-align: left;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+}
+/*Exist Buttons CSS*/
+.collections_option_on a {
+ padding: 7px 80px 7px 80px;
+ width: 210px;
+ height: 28px;
+ text-decoration: none;
+ background: transparent url(graphics/manage_collections_on_tab.gif)
no-repeat center top;
+}
+
+
+.collections_option_off a {
+ padding: 7px 80px 7px 80px;
+ width: 210px;
+ height: 28px;
+ text-decoration: none;
+ background: transparent url(graphics/manage_collections_off_tab.gif)
no-repeat center top;
+}
+
+
+.users_option_off a{
+ padding: 7px 65px 7px 65px;
+ width: 210px;
+ height: 28px;
+ text-decoration: none;
+ background: transparent url(graphics/manage_users_off_tab.gif) no-repeat
center top;
+}
+
+.users_option_on a {
+ padding: 7px 65px 7px 65px;
+ width: 210px;
+ height: 28px;
+ text-decoration: none;
+ background: transparent url(graphics/manage_users_on_tab.gif) no-repeat
center top;
+}
+
+
+.login_button {
+ width: 54px;
+ height: 28px;
+ margin: 0;
+ padding: 0;
+ border: 0px;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 90%;
+ font-weight: bold;
+ text-align: center;
+ clip: rect( auto, auto, auto, auto );
+ cursor: pointer;
+ background: transparent url(graphics/button_1_small.gif) no-repeat
center top;
+ float: left;
+}
+
+.edit_button_res {
+ display: block;
+ margin-top: 5px;
+ margin-left: 0px;
+ width: 120px;
+ height: 28px;
+ float: left;
+ outline: none;
+ border: none;
+ text-align: center;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 90%;
+ font-weight: bold;
+ text-decoration: none;
+ background: url(graphics/button_1_large.gif) no-repeat center;
+ cursor: pointer;
+}
+
+.create_button_res {
+ display: block;
+ margin-top: 5px;
+ width: 120px;
+ height: 28px;
+ float: left;
+ border: none;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 90%;
+ font-weight: 600;
+ text-decoration: none;
+ cursor: pointer;
+ background: transparent url(graphics/button_1_large.gif) no-repeat
center;
+}
+
+.delete_button_res {
+ display: block;
+ margin-top: 5px;
+ width: 120px;
+ height: 28px;
+ float: none;
+ border: none;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 90%;
+ font-weight: 600;
+ text-decoration: none;
+ cursor: pointer;
+ background: transparent url(graphics/button_1_large.gif) no-repeat
center top;
+}
+
+.input_Edit_button {
+ width: 54px;
+ height: 28px;
+ margin: 0;
+ border: 0;
+ padding: 0;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 90%;
+ font-weight: 600;
+ cursor: pointer;
+ background: transparent url(graphics/button_1_small.gif) no-repeat
center top;
+ float: left;
+}
+
+.input_Create_button {
+ width: 54px;
+ height: 28px;
+ margin: 0;
+ border: 0;
+ padding: 0;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 90%;
+ font-weight: 600;
+ cursor: pointer;
+ background: transparent url(graphics/button_1_small.gif) no-repeat
center top;
+ float: left;
+}
+
+.execute_button_users {
+ width: 54px;
+ height: 28px;
+ margin: 0;
+ border: 0;
+ padding: 0;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 90%;
+ font-weight: 600;
+ cursor: pointer;
+ background: transparent url(graphics/button_1_small.gif) no-repeat
center top;
+ float: right;
+}
+/*Properties CSS */
+.groupheading {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 10px;
+ color: #468C46;
+}
+
+.manage {
+ background: #ffffff;
+ margin: 0 0.3% 0 0.3%;
+ padding: 0px;
+}
+
+.manage table {
+ padding: 3px;
+ border-spacing: 1px 0px;
+}
+
+.manage th {
+ padding-top: 8px;
+ padding-bottom: 8px;
+ padding-left: 5px;
+ text-align: left;
+}
+
+.manage td {
+ padding-top: 8px;
+ padding-bottom: 8px;
+ padding-left: 5px;
+}
+/*Properties Buttons CSS*/
+.floatResetButton {
+ position: fixed;
+ width: 64px;
+ height: 28px;
+ margin: 0;
+ padding: 0;
+ border: 0;
+ text-indent: -1000em;
+ cursor: pointer;
+ background: transparent url(graphics/cancel_button.gif) no-repeat center
top;
+ float: right;
+}
+
+.floatSubmitButton {
+ position: fixed;;
+ width: 53px;
+ height: 28px;
+ margin: 0;
+ border: 0;
+ padding: 0;
+ text-indent: -1000em;
+ cursor: pointer;
+ background: transparent url(graphics/apply_button_2.gif) no-repeat
center top;
+ float: right;
+}
+
+.submit_button {
+ width: 53px;
+ height: 28px;
+ margin: 0;
+ border: 0;
+ padding: 0;
+ text-indent: -1000em;
+ cursor: pointer;
+ background: transparent url(graphics/apply_button.gif) no-repeat center
top;
+ float: none;
+}
+/* SQLMA Admin CSS*/
+.manage_slqma {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+ margin: 0% 1% 0% 1%;
+}
+
+.Options {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+ margin: 0% 1% 0% 1%;
+}
+
+#options {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+ margin: 0% 1% 0% 1%;
+}
+
+#EditFile {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+ margin: 0% 1% 0% 1%;
+ float: none;
+}
+
+#CreateNewFile {
+ margin: 0% 1% 0% 1%;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+ float: none;
+}
+
+.execute_button_sqlma {
+ display: block;
+ margin-top: 5px;
+ width: 120px;
+ height: 28px;
+ float: left;
+ border: none;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 90%;
+ font-weight: 600;
+ text-decoration: none;
+ cursor: pointer;
+ background: transparent url(graphics/button_1_large.gif) no-repeat
center;
+}
+
+.execute_button_sqlma_small {
+ display: block;
+ margin-top: 5px;
+ width: 54px;
+ height: 28px;
+ float: left;
+ border: none;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 90%;
+ font-weight: 600;
+ text-decoration: none;
+ cursor: pointer;
+ background: transparent url(graphics/button_1_small.gif) no-repeat
center;
+}
+
+.execute_button_sqlma_large {
+ display: block;
+ margin-top: 5px;
+ width: 120px;
+ height: 28px;
+ float: left;
+ border: none;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 90%;
+ font-weight: 600;
+ text-decoration: none;
+ cursor: pointer;
+ background: transparent url(graphics/button_1_large.gif) no-repeat
center;
+}
+
+.sqlmaheader {
+ margin-left: 1%;
+ color: #4169E1;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 13px;
+}
+
+init_table {
+ margin-left: 1%;
+ float: left;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 13px;
+}
+
+.init_table td {
+ padding: 8px;
+ text-align: left;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 13px;
+}
+
+.init_table th {
+ padding: 8px;
+ text-align: left;
+ color: #4169E1;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 13px;
+}
+
+.test_table {
+ background-color: #99ff99;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+}
+
+.test_table td {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+}
+
+/* Stitching Servlet*/
+
+#main_iface_panel{
+ margin-top: 2%;
+ margin-left:2%;
+ background-color: #ffffff;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+ height:100%
+
+}
+#main_iface_panel a{
+
+}
+
+#main_iface_panel a:visited a:active{
+
+}
+#iface_panel_body table{
+
+}
+#iface_panel_body td{
+ vertical-align:top;
+ height:100%;
+ padding:0px;
+}
+#file_management{
+ border: 1px solid blue;
+ padding:10px;
+ font-weight:bold;
+}
+
+#file_management table{
+ width:100%;
+}
+#file_info{
+ background-color:#BBBBE6;
+ padding:0px;
+}
+
+#file_info table{
+ width:100%;
+}
+#file_info th{
+
+ background-color:#8282C9;
+ color:#000000;
+ padding: 5px;
+ text-align:left;
+}
+#file_info_header{
+ color:white;
+ background-color:#8282C9;
+ font-weight:bold;
+}
+#file_info td{
+
+ padding: 5px;
+ text-align:left;
+}
+
+#iface_panel_header{
+
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+ padding: 5px;
+ background-color: #E6E6FA;
+ margin:1px;
+
+}
+#panel_body_sidebar{
+
+ background-color: #CBCBED;
+}
+#panel_body_sidebar_devices{
+ height:100%;
+ background-color: #CBCBED;
+ float:left;
+ padding: 5px;
+ margin:1px;
+
+}
+
+#panel_body_sidebar table{
+ width:100%;
+ height:100%;
+}
+#panel_body_sidebar tr{
+ height:100%;
+}
+#panel_body_sidebar td{
+ padding: 8px;
+}
+
+#panel_body_sidebar a a:visited a:link{
+ padding: 0px;
+ margin:0px
+}
+
+#panel_body_ifaces{
+ background-color: #DEDEF9;
+ float:left;
+ padding-left: 10px;
+ padding-right: 10px;
+ padding-bottom:20px;
+ padding-top:8px;
+ margin:0px;
+}
+#host_name{
+ font-size:15px;
+ font-weight:bold;
+}
+
+#ifaces_table{
+ margin-top: 15px;
+ background-color:#ECECFC;
+ width:100%;
+ border-spacing: 1px 0px;
+
+}
+
+#ifaces_table td{
+ padding: 5px;
+ border-top:none;
+}
+
+
+.ifaces_header1{
+ text-align:left;
+ font-weight:bold;
+ background-color:#8282C9;
+}
+.ifaces_header2{
+ background-color:#8282C9;
+ font-weight:bold;
+ text-align:center;
+}
+
+.execute_button_stitching {
+ display: block;
+ margin: 0px;
+ width: 120px;
+ height: 28px;
+ float: left;
+ border: none;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 90%;
+ font-weight: 600;
+ text-decoration: none;
+ cursor: pointer;
+ background: transparent url(graphics/button_1_large.gif) no-repeat
center;
+}
+

Copied: trunk/perfsonar-java-sql-ma/src/main/webapp/fingerprint.jsp (from rev
6046, trunk/perfsonar-java-sql-ma/conf/axis-1.4/fingerprint.jsp)
===================================================================
--- trunk/perfsonar-java-sql-ma/src/main/webapp/fingerprint.jsp
(rev 0)
+++ trunk/perfsonar-java-sql-ma/src/main/webapp/fingerprint.jsp 2012-12-03
13:50:47 UTC (rev 6047)
@@ -0,0 +1,272 @@
+<%@ page import="java.io.File,
+ java.io.IOException,
+ java.util.Date"
+ session="false" %>
+<html>
+<head>
+<title>System Fingerprint</title>
+</head>
+<body bgcolor=#ffffff>
+<%!
+
+ /*
+ * Fingerprint the users system. This is mainly for use in
+ * diagnosing classpath problems. It is intended to dump out
+ * a copy of the environment this webapp is running in,
+ * and additionally attempt to identify versions of each jar
+ * in the classpath.
+ *
+ * @author Brian Ewins
+ */
+
+ private java.util.Properties versionProps=new java.util.Properties();
+
+ /**
+ * Identify the version of a jar file. This uses a properties file
+ * containing known names and sizes in the format
+ * 'name(size)=version'. Version strings should be like 'xerces-1.4'
+ * ie they should include the name of the library.
+ */
+ public String getFileVersion(File file) throws IOException {
+ String key="<td>"+file.getName()+"</td>";
+ key+= "<td>"+file.length()+"</td>";
+ Date timestamp=new Date(file.lastModified());
+ key+= "<td>"+timestamp.toString()+"</td>";
+ return key;
+
+ /* TODO: implement
+ String value=versionProps.getProperty(key);
+ if (value==null) {
+ // make it possible to have jars without version nos
+ value=versionProps.getProperty(file.getName());
+ }
+ if (value==null) {
+ // fall back on something obvious
+ value=key;
+ Date timestamp=new Date(file.lastModified());
+ value+=" / "+timestamp.toString();
+ }
+ return value;
+ */
+ }
+
+ /**
+ * Split up a classpath-like variable. Returns a list of files.
+ * TODO: this can't cope with relative paths. I think theres code in
BCEL that
+ * can be used for this?
+ */
+ File[] splitClasspath(String path) throws IOException {
+ java.util.StringTokenizer st=
+ new java.util.StringTokenizer(path,
+ System.getProperty("path.separator"));
+ int toks=st.countTokens();
+ File[] files=new File[toks];
+ for(int i=0;i<toks;i++) {
+ files[i]=new File(st.nextToken());
+ }
+ return files;
+ }
+
+ /** given a list of files, return a list of jars which actually exist */
+ File[] scanFiles(File[] files) throws IOException {
+ File[] jars=new File[files.length];
+ int found=0;
+ for (int i=0; i<files.length; i++) {
+ if (files[i].getName().toLowerCase().endsWith(".jar")
+ && files[i].exists()) {
+ jars[found]=files[i];
+ found++;
+ }
+ }
+ if (found<files.length) {
+ File[] temp=new File[found];
+ System.arraycopy(jars,0,temp,0,found);
+ jars=temp;
+ }
+ return jars;
+ }
+
+ private static final File[] NO_FILES=new File[0];
+
+ /** scan a directory for jars */
+ public File[] scanDir(String dir) throws IOException
+ {
+ if(dir==null) {
+ return NO_FILES;
+ }
+ return scanDir(new File(dir));
+ }
+
+ public File[] scanDir(File dir) throws IOException {
+ if (!dir.exists() || !dir.isDirectory()) {
+ return NO_FILES;
+ }
+ return scanFiles(dir.listFiles());
+ }
+
+ /** scan a classpath for jars */
+ public File[] scanClasspath(String path) throws IOException {
+ if (path==null) {
+ return NO_FILES;
+ }
+ return scanFiles(splitClasspath(path));
+ }
+
+ /**
+ * scan a 'dirpath' (like the java.ext.dirs system property) for jars
+ */
+ public File[] scanDirpath(String path) throws IOException {
+ if (path==null) {
+ return NO_FILES;
+ }
+ File[] current=new File[0];
+ File[] dirs=splitClasspath(path);
+ for(int i=0; i<dirs.length; i++) {
+ File[] jars=scanDir(dirs[i]);
+ File[] temp=new File[current.length+jars.length];
+ System.arraycopy(current,0,temp,0,current.length);
+ System.arraycopy(jars,0,temp,current.length,jars.length);
+ current=temp;
+ }
+ return scanFiles(current);
+ }
+
+ /** print out the jar versions for a directory */
+ public void listDirectory(String title, JspWriter out,String dir, String
comment) throws IOException {
+ listVersions(title, out,scanDir(dir), comment);
+ }
+
+ /** print out the jar versions for a directory-like system property */
+ public void listDirProperty(String title, JspWriter out,String key,
String comment) throws IOException {
+ listVersions(title, out,scanDir(System.getProperty(key)), comment);
+ }
+
+ /** print out the jar versions for a classpath-like system property */
+ public void listClasspathProperty(String title, JspWriter out,String
key, String comment) throws IOException {
+ listVersions(title, out,scanClasspath(System.getProperty(key)),
comment);
+ }
+
+ /** print out the jar versions for a 'java.ext.dirs'-like system
property */
+ public void listDirpathProperty(String title, JspWriter out,String key,
String comment) throws IOException {
+ listVersions(title, out,scanDirpath(System.getProperty(key)),
comment);
+ }
+
+ /** print out the jar versions for a context-relative directory */
+ public void listContextPath(String title, JspWriter out, String path,
String comment) throws IOException {
+ listVersions(title,
out,scanDir(getServletConfig().getServletContext().getRealPath(path)),
comment);
+ }
+
+ /** print out the jar versions for a given list of files */
+ public void listVersions(String title, JspWriter out,File[] jars, String
comment) throws IOException {
+ out.print("<h2>");
+ out.print(title);
+ out.println("</h2>");
+ out.println("<table>");
+ for (int i=0; i<jars.length; i++) {
+ out.println("<tr>"+getFileVersion(jars[i])+"</tr>");
+ }
+ out.println("</table>");
+ if(comment!=null && comment.length()>0) {
+ out.println("<p>");
+ out.println(comment);
+ out.println("<p>");
+ }
+ }
+
+%>
+<h1>System Fingerprint</h1>
+<h2>JVM and Server Version</h2>
+<table>
+<tr>
+ <td>Servlet Engine</td>
+ <td><%= getServletConfig().getServletContext().getServerInfo() %></td>
+ <td><%= getServletConfig().getServletContext().getMajorVersion() %></td>
+ <td><%= getServletConfig().getServletContext().getMinorVersion() %></td>
+</tr>
+<tr>
+ <td>Java VM</td>
+ <td><%= System.getProperty("java.vm.vendor") %></td>
+ <td><%= System.getProperty("java.vm.name") %></td>
+ <td><%= System.getProperty("java.vm.version") %></td>
+</tr>
+<tr>
+ <td>Java RE</td>
+ <td><%= System.getProperty("java.vendor") %></td>
+ <td><%= System.getProperty("java.version") %></td>
+ <td> </td>
+</tr>
+<tr>
+ <td>Platform</td>
+ <td><%= System.getProperty("os.name") %></td>
+ <td><%= System.getProperty("os.arch") %></td>
+ <td><%= System.getProperty("os.version") %></td>
+</tr>
+</table>
+
+<%
+listClasspathProperty("Boot jars", out,"sun.boot.class.path", "Only valid on
a sun jvm");
+listClasspathProperty("System jars", out,"java.class.path", null);
+listDirpathProperty("Extra system jars", out,"java.ext.dirs", null);
+listContextPath("Webapp jars", out, "/WEB-INF/lib", null);
+// identify the container...
+String container=getServletConfig().getServletContext().getServerInfo();
+if (container.startsWith("Tomcat Web Server/3.2")) {
+ String home=System.getProperty("tomcat.home");
+ if(home!=null) {
+ listDirectory("Tomcat 3.2 Common Jars", out,
+ home+File.separator
+ +"lib",
+ null);
+ }
+} else if (container.startsWith("Tomcat Web Server/3.3")) {
+ String home=System.getProperty("tomcat.home");
+ if(home!=null) {
+ listDirectory("Tomcat 3.3 Container Jars", out,
+ home+File.separator
+ +"lib"+File.separator
+ +"container",
+ null);
+ listDirectory("Tomcat 3.3 Common Jars", out,
+ home+File.separator
+ +"lib"+File.separator
+ +"common",
+ null);
+ }
+} else if (container.startsWith("Apache Tomcat/4.0")) {
+ //handle catalina common dir
+ String home=System.getProperty("catalina.home");
+ if(home!=null) {
+ listDirectory("Tomcat 4.0 Common Jars", out,
+ home+File.separator
+ +"common"+File.separator
+ +"lib",
+ null);
+ }
+} else if (container.startsWith("Apache Tomcat/4.1")) {
+ //handle catalina common dir
+ String home=System.getProperty("catalina.home");
+ if(home!=null) {
+ listDirectory("Tomcat 4.1 Common Jars", out,
+ home+File.separator
+ +"shared"+File.separator
+ +"lib",
+ null);
+ }
+} else if (System.getProperty("resin.home")!=null) {
+ String home=System.getProperty("resin.home");
+ if(home!=null) {
+ listDirectory("Resin Common Jars", out,
+ home+File.separator
+ +"lib",
+ null);
+ }
+} else if (System.getProperty("weblogic.httpd.servlet.classpath")!=null) {
+ listClasspathProperty("Weblogic Servlet Jars", out,
+ "weblogic.httpd.servlet.classpath",
+ null);
+} else {
+ //TODO: identify more servlet engine classpaths.
+}
+%>
+</body>
+</html>
\ No newline at end of file

Copied: trunk/perfsonar-java-sql-ma/src/main/webapp/graphics/Thumbs.db (from
rev 6046, trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/Thumbs.db)
===================================================================
(Binary files differ)

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/graphics/admin_home_target.gif
(from rev 6046,
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/admin_home_target.gif)
===================================================================
(Binary files differ)

Copied: trunk/perfsonar-java-sql-ma/src/main/webapp/graphics/apply_button.gif
(from rev 6046,
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/apply_button.gif)
===================================================================
(Binary files differ)

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/graphics/apply_button_2.gif (from
rev 6046,
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/apply_button_2.gif)
===================================================================
(Binary files differ)

Copied: trunk/perfsonar-java-sql-ma/src/main/webapp/graphics/arrow_icon.gif
(from rev 6046,
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/arrow_icon.gif)
===================================================================
(Binary files differ)

Copied: trunk/perfsonar-java-sql-ma/src/main/webapp/graphics/arrow_icon2.gif
(from rev 6046,
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/arrow_icon2.gif)
===================================================================
(Binary files differ)

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/graphics/button_1_large.gif (from
rev 6046,
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/button_1_large.gif)
===================================================================
(Binary files differ)

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/graphics/button_1_small.gif (from
rev 6046,
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/button_1_small.gif)
===================================================================
(Binary files differ)

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/graphics/button_2_large.gif (from
rev 6046,
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/button_2_large.gif)
===================================================================
(Binary files differ)

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/graphics/button_2_small.gif (from
rev 6046,
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/button_2_small.gif)
===================================================================
(Binary files differ)

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/graphics/cancel_button.gif (from
rev 6046,
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/cancel_button.gif)
===================================================================
(Binary files differ)

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/graphics/create_resource_button.gif
(from rev 6046,
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/create_resource_button.gif)
===================================================================
(Binary files differ)

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/graphics/delete_red_button.gif
(from rev 6046,
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/delete_red_button.gif)
===================================================================
(Binary files differ)

Copied: trunk/perfsonar-java-sql-ma/src/main/webapp/graphics/edit_button.gif
(from rev 6046,
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/edit_button.gif)
===================================================================
(Binary files differ)

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/graphics/edit_green_button.gif
(from rev 6046,
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/edit_green_button.gif)
===================================================================
(Binary files differ)

Copied: trunk/perfsonar-java-sql-ma/src/main/webapp/graphics/login_panel.gif
(from rev 6046,
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/login_panel.gif)
===================================================================
(Binary files differ)

Copied: trunk/perfsonar-java-sql-ma/src/main/webapp/graphics/logos.gif (from
rev 6046, trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/logos.gif)
===================================================================
(Binary files differ)

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/graphics/logout_button.gif (from
rev 6046,
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/logout_button.gif)
===================================================================
(Binary files differ)

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/graphics/manage_collections_off_tab.gif
(from rev 6046,
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/manage_collections_off_tab.gif)
===================================================================
(Binary files differ)

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/graphics/manage_collections_on_tab.gif
(from rev 6046,
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/manage_collections_on_tab.gif)
===================================================================
(Binary files differ)

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/graphics/manage_users_off_tab.gif
(from rev 6046,
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/manage_users_off_tab.gif)
===================================================================
(Binary files differ)

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/graphics/manage_users_on_tab.gif
(from rev 6046,
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/manage_users_on_tab.gif)
===================================================================
(Binary files differ)

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/graphics/step_1_bottom.gif (from
rev 6046,
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/step_1_bottom.gif)
===================================================================
(Binary files differ)

Copied: trunk/perfsonar-java-sql-ma/src/main/webapp/graphics/step_1_slice.gif
(from rev 6046,
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/step_1_slice.gif)
===================================================================
(Binary files differ)

Copied: trunk/perfsonar-java-sql-ma/src/main/webapp/graphics/step_1_top.gif
(from rev 6046,
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/step_1_top.gif)
===================================================================
(Binary files differ)

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/graphics/step_2_bottom.gif (from
rev 6046,
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/step_2_bottom.gif)
===================================================================
(Binary files differ)

Copied: trunk/perfsonar-java-sql-ma/src/main/webapp/graphics/step_2_slice.gif
(from rev 6046,
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/step_2_slice.gif)
===================================================================
(Binary files differ)

Copied: trunk/perfsonar-java-sql-ma/src/main/webapp/graphics/step_2_top.gif
(from rev 6046,
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/step_2_top.gif)
===================================================================
(Binary files differ)

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/graphics/testdepl_fail.gif (from
rev 6046,
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/testdepl_fail.gif)
===================================================================
(Binary files differ)

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/graphics/testdepl_main.gif (from
rev 6046,
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/testdepl_main.gif)
===================================================================
(Binary files differ)

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/graphics/testdepl_return.gif
(from rev 6046,
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/testdepl_return.gif)
===================================================================
(Binary files differ)

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/graphics/testdepl_startbn.gif
(from rev 6046,
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/testdepl_startbn.gif)
===================================================================
(Binary files differ)

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/graphics/testdepl_succ.gif (from
rev 6046,
trunk/perfsonar-java-sql-ma/conf/axis-1.4/graphics/testdepl_succ.gif)
===================================================================
(Binary files differ)

Copied: trunk/perfsonar-java-sql-ma/src/main/webapp/happyaxis.jsp (from rev
6046, trunk/perfsonar-java-sql-ma/conf/axis-1.4/happyaxis.jsp)
===================================================================
--- trunk/perfsonar-java-sql-ma/src/main/webapp/happyaxis.jsp
(rev 0)
+++ trunk/perfsonar-java-sql-ma/src/main/webapp/happyaxis.jsp 2012-12-03
13:50:47 UTC (rev 6047)
@@ -0,0 +1,491 @@
+<html>
+<%@ page contentType="text/html; charset=utf-8"
+ import="java.io.InputStream,
+ java.io.IOException,
+ javax.xml.parsers.SAXParser,
+ java.lang.reflect.*,
+ javax.xml.parsers.SAXParserFactory"
+ session="false" %>
+<%
+/*
+ * Copyright 2002,2004,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+%>
+
+<%!
+ /*
+ * Happiness tests for axis. These look at the classpath and warn if
things
+ * are missing. Normally addng this much code in a JSP page is mad
+ * but here we want to validate JSP compilation too, and have a drop-in
+ * page for easy re-use
+ * @author Steve 'configuration problems' Loughran
+ * @author dims
+ * @author Brian Ewins
+ */
+
+ /**
+ * test for a class existing
+ * @param classname
+ * @return class iff present
+ */
+ Class classExists(String classname) {
+ try {
+ return Class.forName(classname);
+ } catch (ClassNotFoundException e) {
+ return null;
+ }
+ }
+
+ /**
+ * test for resource on the classpath
+ * @param resource
+ * @return true iff present
+ */
+ boolean resourceExists(String resource) {
+ boolean found;
+ InputStream instream=this.getClass().getResourceAsStream(resource);
+ found=instream!=null;
+ if(instream!=null) {
+ try {
+ instream.close();
+ } catch (IOException e) {
+ }
+ }
+ return found;
+ }
+
+ /**
+ * probe for a class, print an error message is missing
+ * @param out stream to print stuff
+ * @param category text like "warning" or "error"
+ * @param classname class to look for
+ * @param jarFile where this class comes from
+ * @param errorText extra error text
+ * @param homePage where to d/l the library
+ * @return the number of missing classes
+ * @throws IOException
+ */
+ int probeClass(JspWriter out,
+ String category,
+ String classname,
+ String jarFile,
+ String description,
+ String errorText,
+ String homePage) throws IOException {
+ try {
+ Class clazz = classExists(classname);
+ if(clazz == null) {
+ String url="";
+ if(homePage!=null) {
+ url=getMessage("seeHomepage",homePage,homePage);
+ }
+
out.write(getMessage("couldNotFound",category,classname,jarFile,errorText,url));
+ return 1;
+ } else {
+ String location = getLocation(out, clazz);
+
+ if(location == null) {
+
out.write("<li>"+getMessage("foundClass00",description,classname)+"</li><br>");
+ }
+ else {
+
out.write("<li>"+getMessage("foundClass01",description,classname,location)+"</li><br>");
+ }
+ return 0;
+ }
+ } catch(NoClassDefFoundError ncdfe) {
+ String url="";
+ if(homePage!=null) {
+ url=getMessage("seeHomepage",homePage,homePage);
+ }
+ out.write(getMessage("couldNotFoundDep",category, classname,
errorText, url));
+ out.write(getMessage("theRootCause",ncdfe.getMessage(),
classname));
+ return 1;
+ }
+ }
+
+ /**
+ * get the location of a class
+ * @param out
+ * @param clazz
+ * @return the jar file or path where a class was found
+ */
+
+ String getLocation(JspWriter out,
+ Class clazz) {
+ try {
+ java.net.URL url =
clazz.getProtectionDomain().getCodeSource().getLocation();
+ String location = url.toString();
+ if(location.startsWith("jar")) {
+ url =
((java.net.JarURLConnection)url.openConnection()).getJarFileURL();
+ location = url.toString();
+ }
+
+ if(location.startsWith("file")) {
+ java.io.File file = new java.io.File(url.getFile());
+ return file.getAbsolutePath();
+ } else {
+ return url.toString();
+ }
+ } catch (Throwable t){
+ }
+ return getMessage("classFoundError");
+ }
+
+ /**
+ * a class we need if a class is missing
+ * @param out stream to print stuff
+ * @param classname class to look for
+ * @param jarFile where this class comes from
+ * @param errorText extra error text
+ * @param homePage where to d/l the library
+ * @throws IOException when needed
+ * @return the number of missing libraries (0 or 1)
+ */
+ int needClass(JspWriter out,
+ String classname,
+ String jarFile,
+ String description,
+ String errorText,
+ String homePage) throws IOException {
+ return probeClass(out,
+ "<b>"+getMessage("error")+"</b>",
+ classname,
+ jarFile,
+ description,
+ errorText,
+ homePage);
+ }
+
+ /**
+ * print warning message if a class is missing
+ * @param out stream to print stuff
+ * @param classname class to look for
+ * @param jarFile where this class comes from
+ * @param errorText extra error text
+ * @param homePage where to d/l the library
+ * @throws IOException when needed
+ * @return the number of missing libraries (0 or 1)
+ */
+ int wantClass(JspWriter out,
+ String classname,
+ String jarFile,
+ String description,
+ String errorText,
+ String homePage) throws IOException {
+ return probeClass(out,
+ "<b>"+getMessage("warning")+"</b>",
+ classname,
+ jarFile,
+ description,
+ errorText,
+ homePage);
+ }
+
+ /**
+ * get servlet version string
+ *
+ */
+
+ public String getServletVersion() {
+ ServletContext context=getServletConfig().getServletContext();
+ int major = context.getMajorVersion();
+ int minor = context.getMinorVersion();
+ return Integer.toString(major) + '.' + Integer.toString(minor);
+ }
+
+ /**
+ * what parser are we using.
+ * @return the classname of the parser
+ */
+ private String getParserName() {
+ SAXParser saxParser = getSAXParser();
+ if (saxParser == null) {
+ return getMessage("couldNotCreateParser");
+ }
+
+ // check to what is in the classname
+ String saxParserName = saxParser.getClass().getName();
+ return saxParserName;
+ }
+
+ /**
+ * Create a JAXP SAXParser
+ * @return parser or null for trouble
+ */
+ private SAXParser getSAXParser() {
+ SAXParserFactory saxParserFactory = SAXParserFactory.newInstance();
+ if (saxParserFactory == null) {
+ return null;
+ }
+ SAXParser saxParser = null;
+ try {
+ saxParser = saxParserFactory.newSAXParser();
+ } catch (Exception e) {
+ }
+ return saxParser;
+ }
+
+ /**
+ * get the location of the parser
+ * @return path or null for trouble in tracking it down
+ */
+
+ private String getParserLocation(JspWriter out) {
+ SAXParser saxParser = getSAXParser();
+ if (saxParser == null) {
+ return null;
+ }
+ String location = getLocation(out,saxParser.getClass());
+ return location;
+ }
+
+ /**
+ * Check if class implements specified interface.
+ * @param Class clazz
+ * @param String interface name
+ * @return boolean
+ */
+ private boolean implementsInterface(Class clazz, String interfaceName) {
+ if (clazz == null) {
+ return false;
+ }
+ Class[] interfaces = clazz.getInterfaces();
+ if (interfaces.length != 0) {
+ for (int i = 0; i < interfaces.length; i++) {
+ if (interfaces[i].getName().equals(interfaceName)) {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+ %>
+
+<%@ include file="i18nLib.jsp" %>
+
+<%
+ // initialize a private HttpServletRequest
+ setRequest(request);
+
+ // set a resouce base
+ setResouceBase("i18n");
+%>
+
+<head>
+<title><%= getMessage("pageTitle") %></title>
+</head>
+<body bgcolor='#ffffff'>
+
+<%
+ out.print("<h1>"+ getMessage("pageTitle") +"</h1>");
+ out.print("<h2>"+ getMessage("pageRole") +"</h2><p/>");
+%>
+
+<%= getLocaleChoice() %>
+
+<%
+ out.print("<h3>"+ getMessage("neededComponents") +"</h3>");
+%>
+
+<UL>
+<%
+ int needed=0,wanted=0;
+
+ /**
+ * the essentials, without these Axis is not going to work
+ */
+
+ // need to check if the available version of SAAJ API meets requirements
+ String className = "javax.xml.soap.SOAPPart";
+ String interfaceName = "org.w3c.dom.Document";
+ Class clazz = classExists(className);
+ if (clazz == null || implementsInterface(clazz, interfaceName)) {
+ needed = needClass(out, "javax.xml.soap.SOAPMessage",
+ "saaj.jar",
+ "SAAJ API",
+ getMessage("criticalErrorMessage"),
+ "http://ws.apache.org/axis/";);
+ } else {
+ String location = getLocation(out, clazz);
+
+ out.print(getMessage("invalidSAAJ",location));
+ out.print(getMessage("criticalErrorMessage"));
+
out.print(getMessage("seeHomepage","http://ws.apache.org/axis/java/install.html",getMessage("axisInstallation")));
+ out.print("<br>");
+ }
+
+ needed+=needClass(out, "javax.xml.rpc.Service",
+ "jaxrpc.jar",
+ "JAX-RPC API",
+ getMessage("criticalErrorMessage"),
+ "http://ws.apache.org/axis/";);
+
+ needed+=needClass(out, "org.apache.axis.transport.http.AxisServlet",
+ "axis.jar",
+ "Apache-Axis",
+ getMessage("criticalErrorMessage"),
+ "http://ws.apache.org/axis/";);
+
+ needed+=needClass(out, "org.apache.commons.discovery.Resource",
+ "commons-discovery.jar",
+ "Jakarta-Commons Discovery",
+ getMessage("criticalErrorMessage"),
+ "http://jakarta.apache.org/commons/discovery/";);
+
+ needed+=needClass(out, "org.apache.commons.logging.Log",
+ "commons-logging.jar",
+ "Jakarta-Commons Logging",
+ getMessage("criticalErrorMessage"),
+ "http://jakarta.apache.org/commons/logging/";);
+
+ needed+=needClass(out, "org.apache.log4j.Layout",
+ "log4j-1.2.8.jar",
+ "Log4j",
+ getMessage("uncertainErrorMessage"),
+ "http://jakarta.apache.org/log4j";);
+
+ //should we search for a javax.wsdl file here, to hint that it needs
+ //to go into an approved directory? because we dont seem to need to do
that.
+ needed+=needClass(out, "com.ibm.wsdl.factory.WSDLFactoryImpl",
+ "wsdl4j.jar",
+ "IBM's WSDL4Java",
+ getMessage("criticalErrorMessage"),
+ null);
+
+ needed+=needClass(out, "javax.xml.parsers.SAXParserFactory",
+ "xerces.jar",
+ "JAXP implementation",
+ getMessage("criticalErrorMessage"),
+ "http://xml.apache.org/xerces-j/";);
+
+ needed+=needClass(out,"javax.activation.DataHandler",
+ "activation.jar",
+ "Activation API",
+ getMessage("criticalErrorMessage"),
+ "http://java.sun.com/products/javabeans/glasgow/jaf.html";);
+%>
+</UL>
+<%
+ out.print("<h3>"+ getMessage("optionalComponents") +"</h3>");
+%>
+<UL>
+<%
+ /*
+ * now the stuff we can live without
+ */
+ wanted+=wantClass(out,"javax.mail.internet.MimeMessage",
+ "mail.jar",
+ "Mail API",
+ getMessage("attachmentsError"),
+ "http://java.sun.com/products/javamail/";);
+
+ wanted+=wantClass(out,"org.apache.xml.security.Init",
+ "xmlsec.jar",
+ "XML Security API",
+ getMessage("xmlSecurityError"),
+ "http://xml.apache.org/security/";);
+
+ wanted += wantClass(out, "javax.net.ssl.SSLSocketFactory",
+ "jsse.jar or java1.4+ runtime",
+ "Java Secure Socket Extension",
+ getMessage("httpsError"),
+ "http://java.sun.com/products/jsse/";);
+ /*
+ * resources on the classpath path
+ */
+ /* add more libraries here */
+
+%>
+</UL>
+<%
+ out.write("<h3>");
+ //is everythng we need here
+ if(needed==0) {
+ //yes, be happy
+ out.write(getMessage("happyResult00"));
+ } else {
+ //no, be very unhappy
+ response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+ out.write(getMessage("unhappyResult00",Integer.toString(needed)));
+ }
+ //now look at wanted stuff
+ if(wanted>0) {
+ out.write(getMessage("unhappyResult01",Integer.toString(wanted)));
+ } else {
+ out.write(getMessage("happyResult01"));
+ }
+ out.write("</h3>");
+%>
+<UL>
+<%
+
+ //hint if anything is missing
+ if(needed>0 || wanted>0 ) {
+ out.write(getMessage("hintString"));
+ }
+
+ out.write(getMessage("noteString"));
+%>
+</UL>
+
+ <h2><%= getMessage("apsExamining") %></h2>
+
+<UL>
+ <%
+ String servletVersion=getServletVersion();
+ String xmlParser=getParserName();
+ String xmlParserLocation = getParserLocation(out);
+ %>
+ <table border="1" cellpadding="10">
+ <tr><td>Servlet version</td><td><%= servletVersion %></td></tr>
+ <tr><td>XML Parser</td><td><%= xmlParser %></td></tr>
+ <tr><td>XML ParserLocation</td><td><%= xmlParserLocation %></td></tr>
+ </table>
+</UL>
+
+<% if(xmlParser.indexOf("crimson")>=0) { %>
+ <p>
+ <%= getMessage("recommendedParser") %>
+ </p>
+<% } %>
+
+ <h2><%= getMessage("sysExamining") %></h2>
+<UL>
+<%
+ /**
+ * Dump the system properties
+ */
+ java.util.Enumeration e=null;
+ try {
+ e= System.getProperties().propertyNames();
+ } catch (SecurityException se) {
+ }
+ if(e!=null) {
+ out.write("<pre>");
+ for (;e.hasMoreElements();) {
+ String key = (String) e.nextElement();
+ out.write(key + "=" + System.getProperty(key)+"\n");
+ }
+ out.write("</pre><p>");
+ } else {
+ out.write(getMessage("sysPropError"));
+ }
+%>
+</UL>
+ <hr>
+ <%= getMessage("apsPlatform") %>:
+ <%= getServletConfig().getServletContext().getServerInfo() %>
+</body>
+</html>

Copied: trunk/perfsonar-java-sql-ma/src/main/webapp/i18nLib.jsp (from rev
6046, trunk/perfsonar-java-sql-ma/conf/axis-1.4/i18nLib.jsp)
===================================================================
--- trunk/perfsonar-java-sql-ma/src/main/webapp/i18nLib.jsp
(rev 0)
+++ trunk/perfsonar-java-sql-ma/src/main/webapp/i18nLib.jsp 2012-12-03
13:50:47 UTC (rev 6047)
@@ -0,0 +1,221 @@
+<%@ page import="java.util.*" %>
+<%
+/*
+ * Copyright 2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+%>
+
+<%!
+ /*
+ * A library file to produce i18n web applications. This can be easily
+ * reused from your jsp(s) - just include and call any methods.
+ * @author toshi
+ */
+
+ // private variable
+ HttpServletRequest _req = null;
+
+ // private variable
+ String _strResourceName = null;
+
+ /**
+ * Set a HttpServletRequest to a private variable.
+ * @param request HttpServletRequest
+ */
+ void setRequest(HttpServletRequest request) {
+ _req = request;
+ }
+
+ /**
+ * Get the private variable of the HttpServletRequest.
+ * @return HttpServletRequest
+ */
+ HttpServletRequest getRequest() {
+ return _req;
+ }
+
+ /**
+ * Set a resouce base name to a private variable.
+ * @param resouce The resouce base name
+ */
+ void setResouceBase(String resource) {
+ _strResourceName = resource;
+ }
+
+ /**
+ * Get the private variable of the resouce base name.
+ * @return resouce The resouce base name
+ */
+ String getResouceBase() {
+ return _strResourceName;
+ }
+
+ /**
+ * Get a ResourceBundle object.
+ * @return a ResourceBundle object
+ */
+ ResourceBundle getRB() {
+ String strLocale = getRequest().getParameter("locale");
+ ResourceBundle objRb = null;
+ Locale objLcl = null;
+
+ if (strLocale!=null) {
+ objLcl=new Locale(strLocale,"");
+ } else {
+ objLcl=getRequest().getLocale();
+ }
+
+ Locale.setDefault(objLcl);
+ objRb = ResourceBundle.getBundle(getResouceBase(),objLcl);
+
+ return objRb;
+ }
+
+ /**
+ * Get a list of locale choice
+ * @return a list of supported locales
+ */
+ String getLocaleChoice() {
+ String choice = getMessage("locales");
+ StringBuffer buf = new StringBuffer();
+
+ buf.append("<div align=\"right\">\n");
+ buf.append(getMessage("language"));
+ buf.append(": ");
+
+ StringTokenizer st = new StringTokenizer(choice);
+ String locale = null;
+ while (st.hasMoreTokens()) {
+ locale = st.nextToken();
+ buf.append("[<a href=\"?locale="+ locale +"\">"+ locale +"</a>]
");
+ }
+ buf.append("\n</div>\n");
+
+ return buf.toString();
+ }
+
+ /**
+ * Get a message from i18n.properties with several arguments.
+ * @param key The resource key
+ * @return The formatted message
+ */
+ String getMessage(String key) {
+ return getMessage(key, null, null, null, null, null);
+ }
+
+ /**
+ * Get a message from i18n.properties with several arguments.
+ * @param key The resource key
+ * @param arg0 The argument to place in variable {0}
+ * @return The formatted message
+ */
+ String getMessage(String key, String arg0) {
+ return getMessage(key, arg0, null, null, null, null);
+ }
+
+ /**
+ * Get a message from i18n.properties with several arguments.
+ * @param key The resource key
+ * @param arg0 The argument to place in variable {0}
+ * @param arg1 The argument to place in variable {1}
+ * @return The formatted message
+ */
+ String getMessage(String key, String arg0, String arg1) {
+ return getMessage(key, arg0, arg1, null, null, null);
+ }
+
+ /**
+ * Get a message from i18n.properties with several arguments.
+ * @param key The resource key
+ * @param arg0 The argument to place in variable {0}
+ * @param arg1 The argument to place in variable {1}
+ * @param arg2 The argument to place in variable {2}
+ * @return The formatted message
+ */
+ String getMessage(String key, String arg0, String arg1, String arg2) {
+ return getMessage(key, arg0, arg1, arg2, null, null);
+ }
+
+ /**
+ * Get a message from i18n.properties with several arguments.
+ * @param key The resource key
+ * @param arg0 The argument to place in variable {0}
+ * @param arg1 The argument to place in variable {1}
+ * @param arg2 The argument to place in variable {2}
+ * @param arg3 The argument to place in variable {3}
+ * @return The formatted message
+ */
+ String getMessage(String key, String arg0, String arg1,
+ String arg2, String arg3) {
+ return getMessage(key, arg0, arg1, arg2, arg3, null);
+ }
+
+ /**
+ * Get a message from i18n.properties with several arguments.
+ * @param key The resource key
+ * @param arg0 The argument to place in variable {0}
+ * @param arg1 The argument to place in variable {1}
+ * @param arg2 The argument to place in variable {2}
+ * @param arg3 The argument to place in variable {3}
+ * @param arg4 The argument to place in variable {4}
+ * @return The formatted message
+ */
+ String getMessage(String key, String arg0, String arg1,
+ String arg2, String arg3, String arg4) {
+ String strPattern = getRB().getString(key);
+
+ String [] params = { arg0, arg1, arg2, arg3, arg4 };
+ for (int i=0; i<5; i++) {
+ if (params[i]!=null) params[i]=replaceAll(params[i],"%20"," ");
+ }
+
+ if (arg0!=null) strPattern = replaceAll(strPattern,"{0}",params[0]);
+ if (arg1!=null) strPattern = replaceAll(strPattern,"{1}",params[1]);
+ if (arg2!=null) strPattern = replaceAll(strPattern,"{2}",params[2]);
+ if (arg3!=null) strPattern = replaceAll(strPattern,"{3}",params[3]);
+ if (arg4!=null) strPattern = replaceAll(strPattern,"{4}",params[4]);
+
+ return strPattern;
+ }
+
+ /**
+ * Get a replaced string by the specified message.
+ * @param source The original message
+ * @param pattern The key message for replacing
+ * @param replace The message to place in the key variable - 'pattern'
+ * @return The replaced message
+ */
+ String replaceAll(String source, String pattern, String replace)
+ {
+ int i=0;
+ boolean ret = false;
+ StringBuffer buf = new StringBuffer();
+
+ int lenSource = source.length();
+ int lenPattern = pattern.length();
+
+ for (i=0; i<lenSource; i++) {
+ ret = source.regionMatches(i, pattern, 0, lenPattern);
+ if (ret) {
+ buf.append(source.substring(0,i));
+ buf.append(replace);
+ buf.append(source.substring(i+lenPattern));
+ source = replaceAll(buf.toString(), pattern, replace);
+ break;
+ }
+ }
+ return source;
+ }
+%>
\ No newline at end of file

Copied: trunk/perfsonar-java-sql-ma/src/main/webapp/index.jsp (from rev 6046,
trunk/perfsonar-java-sql-ma/conf/axis-1.4/index.jsp)
===================================================================
--- trunk/perfsonar-java-sql-ma/src/main/webapp/index.jsp
(rev 0)
+++ trunk/perfsonar-java-sql-ma/src/main/webapp/index.jsp 2012-12-03
13:50:47 UTC (rev 6047)
@@ -0,0 +1,156 @@
+<%@ page
import="perfSONARWebAdmin.auxiliary.PerfsonarProperties,perfSONARWebAdmin.auxiliary.PerfsonarPropertiesImpl,perfSONARWebAdmin.auxiliary.PerfsonarProperty,java.io.File,java.io.FileInputStream,java.io.FileOutputStream,java.io.IOException"
%>
+
+<html>
+ <head>
+ <title>perfSONAR Service Web Administration page</title>
+ <link rel="stylesheet" type="text/css" href="main.css"/>
+ <meta http-equiv="Content-Type" content="text/html;
charset=iso-8859-1">
+ <script src="Service_Admin.js"></script>
+ <script src="liveclock.js"></script>
+
+ <style type="text/css">
+ <!--
+
+ a {
+ }
+
+ .style3 {
+ color: #8585c1;
+ font-size: 13px;
+ }
+
+ .style3 a:link {
+ color: #8585C1;
+ cursor: pointer;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 12px;
+ }
+
+ .style3 a:active {
+ color: #117721;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 12px;
+ }
+
+ .style3 a:visited {
+ color: #8585C1;
+ cursor: auto;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 12px;
+ /*font-weight: bold;*/
+ }
+
+
+ .style3 a:hover {
+ color: #8585C1;
+ cursor: pointer;
+ text-decoration: underline;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 12px;
+ }
+ -->
+ </style>
+ </head>
+ <body>
+ <%
+ String confPath = "WEB-INF/classes/perfsonar/conf/";
+ String ServicePropertiesPath = confPath+ "service.properties";
+ ServletContext sc = getServletContext();
+ String ServicePath = sc.getRealPath("/");
+ PerfsonarProperty property = new PerfsonarProperty();
+ PerfsonarProperties serviceProperties = new PerfsonarPropertiesImpl();
+ serviceProperties.loadProperties(new FileInputStream(ServicePath
+ + ServicePropertiesPath));
+
+ String serviceName=
serviceProperties.getProperty("service.r.service_name").getValue().trim();
+ String serviceVersion=
serviceProperties.getProperty("service.r.service_version").getValue().trim();
+
+
+ %>
+ <div class="adminPanel">
+ <div class="banner">
+ <table border="0" align="left" cellpadding="0" cellspacing="0">
+ <tr>
+ <td>
+ <a href="welcome.htm" target="main"><img
src="perfsonar_logo.gif" alt="perfSONAR" width="192" height="94" border="0"
align="right"></a>
+ </td>
+ <td>
+ <table>
+ <tr>
+ <td id="date">
+ <script type="text/javascript">
+ <!--
+ show_clock();
+ //-->
+ </script>
+ </td>
+ </tr>
+ <tr>
+ <td id="serviceName"><%=serviceName %>
&nbsp;<%=serviceVersion%></td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ </div>
+ <div class="mainWindow">
+ <div class="sidebar">
+ <table border="0" cellpadding="0" cellspacing="0">
+ <tr>
+ <th>
+ <a href="welcome.htm" class="button"
target="main">Admin home &nbsp; &nbsp; &nbsp;</a>
+ </th>
+ </tr>
+ <tr>
+ <td>
+ <p>
+ <span class="navtexheading">Basic
+ <br>
+ Configuration
+ </span>
+ </p>
+ <p>
+ <span class="navtex"><a href="Wizard"
target="main">Service</a></span>
+ <br>
+ <a href="testdepl.jsp"
target="main">Test</a>
+ </p>
+ </td>
+ </tr>
+
+ <tr>
+ <td>
+ <p>
+ <span class="navtexheading
style3">Advanced
+ <br>
+ Configuration
+ </span>
+ </p>
+ <p>
+ <span class="navtex style3"><a
href="ServiceAdmin?serviceProperties" target="main">Service</a>
+ <br>
+ <a
href="ServiceAdmin?loggingProperties" target="main">Logging</a>
+ <br>
+ <a href="eXistAdmin"
target="main">eXist Database</a>
+ <br>
+ <a href="SQLMAdmin"
target="main">SQL MA Admin</a>
+ <br>
+ </span>
+ </p>
+ </td>
+ </tr>
+ <tr>
+ </tr>
+ </table>
+ <img src="graphics/logos.gif" alt="perfSONAR project
partners" width="117" height="263" border="0" align="top"/>
+ </div>
+ <div class="centerWindow">
+ <object data="welcome.htm" type="text/html" name="main"
width="99%" height="100%">
+ </object>
+ </div>
+ </div>
+ <div class="footer">
+ PERFormance Service-Oriented Network monitoring ARchitecture
&nbsp;
+ </div>
+ </div>
+ </body>
+</html>

Copied: trunk/perfsonar-java-sql-ma/src/main/webapp/liveclock.js (from rev
6046, trunk/perfsonar-java-sql-ma/conf/axis-1.4/liveclock.js)
===================================================================
--- trunk/perfsonar-java-sql-ma/src/main/webapp/liveclock.js
(rev 0)
+++ trunk/perfsonar-java-sql-ma/src/main/webapp/liveclock.js 2012-12-03
13:50:47 UTC (rev 6047)
@@ -0,0 +1,173 @@
+///////////////////////////////////////////////////////////
+// "Live Clock Advanced" script - Version 1.0
+// By Mark Plachetta
()
+//
+// Get the latest version at:
+// http://www.zip.com.au/~astroboy/liveclock/
+//
+// Based on the original script: "Upper Corner Live Clock"
+// available at:
+// - Dynamic Drive (http://www.dynamicdrive.com)
+// - Website Abstraction (http://www.wsabstract.com)
+// ========================================================
+// CHANGES TO ORIGINAL SCRIPT:
+// - Gave more flexibility in positioning of clock
+// - Added date construct (Advanced version only)
+// - User configurable
+// ========================================================
+// Both "Advanced" and "Lite" versions are available free
+// of charge, see the website for more information on the
+// two scripts.
+///////////////////////////////////////////////////////////
+
+///////////////////////////////////////////////////////////
+/////////////// CONFIGURATION /////////////////////////////
+
+ // Set the clock's font face:
+ var myfont_face = "Verdana";
+
+ // Set the clock's font size (in point):
+ var myfont_size = "10";
+
+ // Set the clock's font color:
+ var myfont_color = "#000000";
+
+ // Set the clock's background color:
+ var myback_color = "#FFFFFF";
+
+ // Set the text to display before the clock:
+ var mypre_text = "";
+
+ // Set the width of the clock (in pixels):
+ var mywidth = 300;
+
+ // Display the time in 24 or 12 hour time?
+ // 0 = 24, 1 = 12
+ var my12_hour = 0;
+
+ // How often do you want the clock updated?
+ // 0 = Never, 1 = Every Second, 2 = Every Minute
+ // If you pick 0 or 2, the seconds will not be displayed
+ var myupdate = 1;
+
+ // Display the date?
+ // 0 = No, 1 = Yes
+ var DisplayDate = 1;
+
+/////////////// END CONFIGURATION /////////////////////////
+///////////////////////////////////////////////////////////
+
+// Browser detect code
+ var ie4=document.all
+ var ns4=document.layers
+ var ns6=document.getElementById&&!document.all
+
+// Global varibale definitions:
+
+ var dn = "";
+ var mn = "th";
+ var old = "";
+
+// The following arrays contain data which is used in the clock's
+// date function. Feel free to change values for Days and Months
+// if needed (if you wanted abbreviated names for example).
+ var DaysOfWeek = new Array(7);
+ DaysOfWeek[0] = "Sun";
+ DaysOfWeek[1] = "Mon";
+ DaysOfWeek[2] = "Tue";
+ DaysOfWeek[3] = "Wed";
+ DaysOfWeek[4] = "Thu";
+ DaysOfWeek[5] = "Fri";
+ DaysOfWeek[6] = "Sat";
+
+ var MonthsOfYear = new Array(12);
+ MonthsOfYear[0] = "Jan";
+ MonthsOfYear[1] = "Feb";
+ MonthsOfYear[2] = "Mar";
+ MonthsOfYear[3] = "Apr";
+ MonthsOfYear[4] = "May";
+ MonthsOfYear[5] = "Jun";
+ MonthsOfYear[6] = "Jul";
+ MonthsOfYear[7] = "Aug";
+ MonthsOfYear[8] = "Sep";
+ MonthsOfYear[9] = "Oct";
+ MonthsOfYear[10] = "Nov";
+ MonthsOfYear[11] = "Dec";
+
+// This array controls how often the clock is updated,
+// based on your selection in the configuration.
+ var ClockUpdate = new Array(3);
+ ClockUpdate[0] = 0;
+ ClockUpdate[1] = 1000;
+ ClockUpdate[2] = 60000;
+
+
+// The main part of the script:
+ function show_clock() {
+ if (old == "die") { return; }
+
+ //show clock in NS 4
+ if (ns4)
+ document.ClockPosNS.visibility="show"
+ // Get all our date variables:
+ var Digital = new Date();
+ var day = Digital.getDay();
+ var mday = Digital.getDate();
+ var month = Digital.getMonth();
+ var hours = Digital.getHours();
+
+ var minutes = Digital.getMinutes();
+ var seconds = Digital.getSeconds();
+
+ // Fix the "mn" variable if needed:
+ if (mday == 1) { mn = "st"; }
+ else if (mday == 2) { mn = "nd"; }
+ else if (mday == 3) { mn = "rd"; }
+ else if (mday == 21) { mn = "st"; }
+ else if (mday == 22) { mn = "nd"; }
+ else if (mday == 23) { mn = "rd"; }
+ else if (mday == 31) { mn = "st"; }
+ mn = "";
+
+ // Set up the hours for either 24 or 12 hour display:
+ if (my12_hour) {
+ dn = "AM";
+ if (hours > 12) { dn = "PM"; hours = hours - 12; }
+ if (hours == 0) { hours = 12; }
+ } else {
+ dn = "";
+ }
+ if (minutes <= 9) { minutes = "0"+minutes; }
+ if (seconds <= 9) { seconds = "0"+seconds; }
+
+ // This is the actual HTML of the clock. If you're going to play
around
+ // with this, be careful to keep all your quotations in tact.
+ myclock = '';
+ myclock += '<font style="color:'+myfont_color+';
font-family:'+myfont_face+'; font-size:'+myfont_size+'pt;">';
+ myclock += Digital.toGMTString();
+ myclock += '</font>';
+
+ document.getElementById("date").innerHTML = myclock
+ //document.write(myclock);
+ if (old == "true") {
+ old = "die";
+ return;
+ }
+
+ // Write the clock to the layer:
+ /*
+ if (ns4) {
+ clockpos = document.ClockPosNS;
+ liveclock = clockpos.document.LiveClockNS;
+ liveclock.document.write(myclock);
+ liveclock.document.close();
+ } else if (ie4) {
+ LiveClockIE.innerHTML = myclock;
+ } else if (ns6){
+ document.getElementById("LiveClockIE").innerHTML =
myclock;
+ }
+ */
+
+
+ if (myupdate != 0) {
setTimeout("show_clock()",ClockUpdate[myupdate]); }
+}

Copied: trunk/perfsonar-java-sql-ma/src/main/webapp/main.css (from rev 6046,
trunk/perfsonar-java-sql-ma/conf/axis-1.4/main.css)
===================================================================
--- trunk/perfsonar-java-sql-ma/src/main/webapp/main.css
(rev 0)
+++ trunk/perfsonar-java-sql-ma/src/main/webapp/main.css 2012-12-03
13:50:47 UTC (rev 6047)
@@ -0,0 +1,487 @@
+/* standard elements */
+
+html {min-height: 100%;}
+
+
+
+* {
+ margin: 0;
+ padding: 0;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ text-decoration: none;
+ border-top-style: none;
+ border-right-style: none;
+ border-bottom-style: none;
+ border-left-style: none;
+}
+
+
+body{
+ background-color: #C0C0C0;
+ width: 100%;
+ height: 100%;
+ }
+a:link {
+ color: #468C46;
+ cursor: pointer;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+}
+a:active {
+ color: #117721;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+ font-weight: bold;
+}
+a:visited {
+ color: #468C46;
+ cursor: auto;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+}
+a:hover {
+ color: #468C46;
+ cursor: pointer;
+ text-decoration: underline;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+}
+
+.adminPanel{
+ width: 94%;
+ height: 50%;
+ float:left;
+ margin-left: 3%;
+ margin-right: 5%;
+ background-color: #ffffff;
+ margin-bottom: 2%;
+}
+.navtex {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+ color: #468C46;
+ text-align: right;
+ font-style: normal;
+ font-weight: normal;
+ line-height: 28px;
+ background-image: none;
+}
+
+.navtexheading {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+ color: #468C46;
+ text-align: right;
+ font-style: normal;
+ font-weight: bold;
+ line-height: normal;
+
+}
+.welcometext {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+ color: #468C46;
+ border-bottom-width: 1px;
+ border-bottom-style: dotted;
+ border-bottom-color: #468C46;
+ padding-top: 10px;
+ padding-bottom: 8px;
+ padding-right: 0px;
+ clip: rect(auto,auto,auto,auto);
+ margin-right: 0px;
+ margin-left: 2%;
+}
+.heading1 {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 14px;
+ color: #468C46;
+ padding-top: 23px;
+ padding-bottom: 23px;
+ font-weight: bold;
+ margin-left: 2%;
+}
+
+.bodytext1 {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 11px;
+ color: #333333;
+ width: 100%;
+ margin-left: 18%;
+ font-weight: normal;
+ line-height: 22px;
+}
+
+.bodytextgreenline {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 11px;
+ color: #333333;
+ margin-left: 18%;
+ font-weight: normal;
+ line-height: 18px;
+ border-bottom-width: 1px;
+ border-bottom-style: dotted;
+ border-bottom-color: #468C46;
+ padding-bottom: 11pt;
+}
+
+.contenttable {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 12px;
+ color: #468C46;
+ padding-top: 0px;
+ margin-left: 20px;
+ font-weight: bold;
+ background-color: #FFFFFF;
+}
+.configheadinglavender {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 12px;
+ color: #8585C1;
+ font-weight: bold;
+ background-image: url(graphics/arrow_icon2.gif);
+ background-repeat: no-repeat;
+ background-position: 17px top;
+ padding-left: 38px;
+}
+
+.configheadinglavender a:link {
+ color: #8585C1;
+ cursor: pointer;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+}
+.configheadinglavender a:active {
+ color: #117721;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+ font-weight: bold;
+}
+.configheadinglavender a:visited {
+ color: #8585C1;
+ cursor: auto;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+}
+.configheadinglavender a:hover {
+ color: #8585C1;
+ cursor: pointer;
+ text-decoration: underline;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+}
+
+
+.configheading {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 12px;
+ color: #27752C;
+ font-weight: bold;
+ background-image: url(graphics/arrow_icon.gif);
+ background-repeat: no-repeat;
+ background-position: 17px top;
+ padding-left: 38px;
+}
+
+.configheading a:link {
+ color: #27752C;
+ cursor: pointer;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+}
+.configheading a:active {
+ color: #117721;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+ font-weight: bold;
+}
+.configheading a:visited {
+ color: #27752C;
+ cursor: auto;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+}
+.configheading a:hover {
+ color: #27752C;
+ cursor: pointer;
+ text-decoration: underline;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+}
+
+.banner{
+ margin: 5px;
+ width: 99%;
+ height: 94px;
+ background-image: url(top_slice.gif);
+ background-color: #FFFFFF;
+ padding: 0px;
+ clip: rect(auto,auto,auto,auto);
+ float:left;
+}
+#date{
+ padding-top:5px;
+ float:right;
+ text-align:right;
+ margin-left: 79.5%;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+}
+
+#serviceName{
+ padding-top:5px;
+ float:right;
+ text-align:right;
+ margin-left: 79.5%;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+ font-weight:bold;
+}
+
+.mainWindow{
+ border: none;
+ padding: 0px;
+ width: 100%;
+ height: 750px;
+ background-color: #ffffff;
+}
+.centerWindow{
+ background-color: #FFFFFF;
+ width: 82%;
+ height:80%;
+ margin-right: 5px;
+ margin-bottom: 5px;
+ margin-left: 0;
+ float: left;
+}
+.centerWindow object{
+ width: 101%;
+ height: 105%;
+ background-color: #FFFFFF;
+}
+
+.welcomepage{
+ background-color: #FFFFFF;
+ width: 100%;
+ height: 100%;
+}
+
+/* Sidebar*/
+
+.sidebar{
+ width: 15%;
+ height: 71.1%;
+ padding-bottom: 12.1%;
+ padding-right: 0px;
+ float: left;
+ border-right-width: 1px;
+ border-right-style: solid;
+ border-right-color: #61AF61;
+ margin-top: 0px;
+ margin-right: 5px;
+ margin-bottom: 5px;
+ margin-left: 5px;
+}
+.sidebar th{
+ color: #ffffff;
+ text-align: right;
+ background-color: #61AF61;
+ width: 15%;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 12px;
+ font-weight: normal;
+ text-decoration:none;
+ background-repeat: no-repeat;
+
+ padding-top: 10px;
+ padding-right: 8%;
+ padding-bottom: 10px;
+ padding-left: 10px;
+}
+.sidebar td{
+ text-align: right;
+ background-color: #ffffff;
+ padding: 10px;
+ border-bottom-width: 1px;
+ border-bottom-style: dotted;
+ border-bottom-color: #92C992;
+}
+.sidebar a.button {
+ color: #ffffff;
+ text-align:left;
+ background-color: #61AF61;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 12px;
+ font-weight: normal;
+ text-decoration:none;
+ background-position: 100% 50%;
+ background-image: url(graphics/admin_home_target.gif);
+ background-repeat: no-repeat;
+
+}
+
+
+
+.sidebar a{
+ font-weight: normal;
+ padding-top: 0px;
+ padding-right: 0px;
+ padding-bottom: 0px;
+ padding-left: 0px;
+ margin-bottom: 0px;
+}
+
+.sidebar img{
+ float: right;
+ border: none;
+ padding-top: 0px;
+ padding-right: 0px;
+ padding-bottom: 0px;
+}
+
+
+.footer{
+ height: 20px;
+ text-align: right;
+ color: #61AF61;
+ background-color: #ffffff;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 10px;
+ border-top-width: 1px;
+ border-top-style: dotted;
+ border-top-color: #61AF61;
+ padding-top: 12px;
+ width: 100%;
+ border-right-style: none;
+ border-right-color: #FFFFFF;
+ border-left-color: #FFFFFF;
+ float: none;
+}
+.footermain {
+ height: 20px;
+ text-align: right;
+ color: #61AF61;
+ background-color: #ffffff;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 10px;
+ border-top-width: 1px;
+ border-top-style: dotted;
+ border-top-color: #61AF61;
+ padding-top: 5px;
+ width: 100%;
+ border-right-style: none;
+ border-right-color: #FFFFFF;
+ border-left-color: #FFFFFF;
+ }
+
+.execute_button_testdepl {
+ display: block;
+ margin-top: 5px;
+ width: 120px;
+ height: 30px;
+ float: right;
+ border: none;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 60%;
+ font-weight: 400;
+ text-decoration: none;
+ cursor: pointer;
+ background: transparent url(graphics/button_2_medium.gif) no-repeat
center;
+}
+
+.testdeplmain {
+ text-align: left;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 12px;
+/* font-weight:bold;;*/
+/* margin-left: -20%;*/
+ margin-left: 2%;
+ border-width: 1px;
+ border-color: #61AF61;
+ padding: 5px;
+ width: 556px;
+ height:108px;
+ background: transparent url(graphics/testdepl_main.gif) no-repeat
center;
+}
+
+.testdeplsucc {
+ text-align: left;
+ float: left;
+ /*font-weight:bold;;*/
+ text-decoration: none;
+/* margin-left: -20%;*/
+ margin-left: 2%;
+ padding: 5px;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 12px;
+ border:solid;
+ border-width: 1px;
+ border-color: #61AF61;
+ width: 544px;
+ height: 220px;
+ background: transparent url(graphics/testdepl_succ.gif) no-repeat center;
+}
+
+.testdeplfail {
+ text-align: left;
+ float: left;
+/* font-weight:bold;;*/
+ text-decoration: none;
+ padding: 5px;
+ margin-left: 2%;
+ /*margin-left: -20%;*/
+ height: 105px;
+ width:555px;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 12px;
+ border:solid;
+ border-width: 1px;
+ border-color: #61AF61;
+ background: transparent url(graphics/testdepl_fail.gif) no-repeat
center;
+}
+
+.testdeplstartbn {
+ display: block;
+ margin-top: 5px;
+ width: 120px;
+ height: 30px;
+ float: right;
+ border: none;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 60%;
+ font-weight: 400;
+ text-decoration: none;
+ cursor: pointer;
+ background: transparent url(graphics/testdepl_startbn.gif) no-repeat
center;
+}
+
+.testdeplretbn {
+ display: block;
+ margin-top: 5px;
+ width: 150px;
+ height: 30px;
+ float: none;;
+ border: none;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 60%;
+ font-weight: 400;
+ text-decoration: none;
+ cursor: pointer;
+ background: transparent url(graphics/testdepl_return.gif) no-repeat
center;
+}
+
+.testdeplretbn2 {
+ display: block;
+ margin-top: 5px;
+ width: 150px;
+ height: 30px;
+ float: right;
+ border: none;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 60%;
+ font-weight: 400;
+ text-decoration: none;
+ cursor: pointer;
+ background: transparent url(graphics/testdepl_return.gif) no-repeat
center;
+}
+
+

Copied: trunk/perfsonar-java-sql-ma/src/main/webapp/partners.gif (from rev
6046, trunk/perfsonar-java-sql-ma/conf/axis-1.4/partners.gif)
===================================================================
(Binary files differ)

Copied: trunk/perfsonar-java-sql-ma/src/main/webapp/perfsonar.png (from rev
6046, trunk/perfsonar-java-sql-ma/conf/axis-1.4/perfsonar.png)
===================================================================
(Binary files differ)

Copied: trunk/perfsonar-java-sql-ma/src/main/webapp/perfsonar_logo.gif (from
rev 6046, trunk/perfsonar-java-sql-ma/conf/axis-1.4/perfsonar_logo.gif)
===================================================================
(Binary files differ)

Copied: trunk/perfsonar-java-sql-ma/src/main/webapp/sqlma_admin_script.js
(from rev 6046,
trunk/perfsonar-java-sql-ma/conf/axis-1.4/sqlma_admin_script.js)
===================================================================
--- trunk/perfsonar-java-sql-ma/src/main/webapp/sqlma_admin_script.js
(rev 0)
+++ trunk/perfsonar-java-sql-ma/src/main/webapp/sqlma_admin_script.js
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,137 @@
+/**
+ * @author Michalis Michael
+ *
+ */
+function confirmForm(userform){
+
+ var password = userform.userPassword.value;
+ var confirmpassword = userform.confirmPassword.value;
+
+ //alert("Hi "+password+ " "+confirmpassword );
+ if (password == confirmpassword) {
+ if (userform.metricType.value != null) {
+ //alert("file name");
+ if (userform.fileName.value == "") {
+ alert("Please enter the name of the file.")
+ return false;
+ }
+ else {
+ //alert("database url");
+ if ((userform.dataBaseURL.value == "") ||
(!isUrl(userform.dataBaseURL.value))) {
+ alert("Please enter the database
URL[jdbc:mysql://127.0.0.1]")
+ return false;
+ }
+ else {
+ //alert("database name");
+ if (userform.databaseName.value == "") {
+ alert("Please enter the name of the database.")
+ return false;
+ }
+ else {
+ //alert("user name");
+ if (userform.userName.value == "") {
+ alert("Please enter the name of the database
user.")
+ return false;
+ }
+ else {
+ //alert("table name");
+ if (userform.tableName.value == "") {
+ alert("Please enter the name of the table.")
+ return false;
+ }
+ else {
+
+ //document.userform.submit();
+ return true;
+
+
+ }
+
+ }
+
+ }
+ }
+
+
+ }
+
+
+ }
+
+ else {
+ // document.userform.submit();
+ return true;
+ }
+ }
+ else {
+ alert("Passwords don't match, re-enter matching passwords!");
+ return false;
+ }
+
+
+}
+
+function confirmDelete(form){
+
+ var res = confirm("This action will delete the selected ibatis files
pair. Are you sure you want to continue?");
+ if (res) {
+ return true;
+ //var res2 = confirm("Do you want to delete the contents of
the table containing the data?");
+ /*if (res2) {
+
+ var el = document.createElement("input");
+ el.type = "hidden";
+ el.name = "deleteData";
+ el.value = "Yes";
+ form.appendChild(el);
+ // document.form.submit();
+ return true;
+ }
+ else {
+ //document.form.submit();
+ return true;
+ }*/
+
+ }
+ else {
+ return false;
+ }
+
+
+
+}
+
+function isUrl(s){
+ //alert("checking url");
+ var regexp = /(jdbc):(mysql|psql)(:\/\/[A-Za-z0-9-]+\.[A-Za-z0-9]+)/
+ return regexp.test(s);
+}
+
+function createFile(){
+ if (document.getElementById('EditFile') != null) {
+ document.getElementById('EditFile').style.display = "none";
+ }
+ document.getElementById('CreateNewFile').style.display = "block";
+}
+
+function showOptions(){
+
+ document.getElementById('options').style.display = "block";
+}
+
+function sendRequest(file){
+ document.body.style.cursor = 'wait';
+ var input = document.createElement("input");
+ input.type = "hidden";
+ input.name = "ibatisFile";
+ input.value = file;
+ var form = document.createElement("form");
+ form.name = "ShowForm"
+ form.method = 'post';
+ form.action = 'SQLMAdmin';
+ form.appendChild(input);
+ document.getElementById('EditFile').appendChild(form);
+ document.ShowForm.submit();
+
+}
+

Copied: trunk/perfsonar-java-sql-ma/src/main/webapp/testdepl.jsp (from rev
6046, trunk/perfsonar-java-sql-ma/conf/axis-1.4/testdepl.jsp)
===================================================================
--- trunk/perfsonar-java-sql-ma/src/main/webapp/testdepl.jsp
(rev 0)
+++ trunk/perfsonar-java-sql-ma/src/main/webapp/testdepl.jsp 2012-12-03
13:50:47 UTC (rev 6047)
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
+<%@ page session="false" %>
+<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
+ <head>
+
+ <meta http-equiv="Content-Type" content="text/html;
charset=iso-8859-1"/>
+ <title>Untitled Document</title>
+ <link rel="stylesheet" type="text/css" href="main.css"/>
+ </head>
+ <body style="background-color: #FFFFFF" >
+
+ <div class="centerWindow" >
+ <p class="welcometext">Welcome to the perfSONAR service web
administration interface</p>
+ <p class="heading1">
+ Deployment test
+ </p>
+
+
+ <%
+ ServletContext sc = getServletContext();
+ // Getting the service path
+ String parm,
+ rootPath = sc.getRealPath("/");;
+ if( (parm=request.getParameter("testit")) != null &&
parm.equals("true") )
+ {
+ String requestURL =
request.getRequestURL().toString();
+ String requestURI = request.getRequestURI();
+ String baseURL = requestURL.substring(0,
requestURL.indexOf(requestURI)) + "/";
+
+ String
+ endpoint = baseURL +
perfSONARWebAdmin.admin.service.soapclient.SoapClient.
+
guessWebServiceUrl(rootPath) , /* this path */
+ filein = rootPath +
"/WEB-INF/samples/requests/EchoRequest.xml",
+ fileout= rootPath +
"/WEB-INF/samples/responses/EchoResponse.xml";
+ int ret = 0;
+
+ if( endpoint.equals(baseURL) == false )
+
+ {
+ // out.println("<br/><br/>Root path:" +
(new java.io.File(rootPath)).getCanonicalPath() );
+ //out.println("<br/><br/>Contacted
endpoint:");
+ //out.println("<br/><br/>" + endpoint);
+ ret =
perfSONARWebAdmin.admin.service.soapclient.SoapClient.
+
testDeployment(endpoint,perfSONARWebAdmin.admin.service.soapclient.SoapClient.Level.DEBUG,null,filein,fileout)?
+ 0:1;
+ //if( result )
out.println("<br/><br/>Deployment test successful");
+ //else
out.println("<br/><br/>Deployment test failed.");
+ }
+ else ret = -1;
+ // out.println("<br/> Internal failure. Please
contact the web admin.");
+ String result = "";
+ String parms1 = "", cssName2 = "";
+
+ switch(ret)
+ {
+ case 0:
+ result = "<br/>Contacted endpoint
:<br/><br/>" + endpoint + "<br/><br/> Deployment test successful.";
+ parms1 = " class=\"testdeplsucc\"";
+ cssName2 = "\"testdeplretbn\"";
+ break;
+ default:
+ result = "";
+ parms1 = " style=\"width:550px;height:150px\"
class=\"testdeplfail\"";
+ cssName2 = "\"testdeplretbn2\"";
+ break;
+
+ }
+ %>
+
+ <table align="center" <%=parms1 %> >
+ <tr> <td ></td> </tr>
+ <tr> <td > &nbsp;
+ <%= result %>
+ </td> </tr>
+ </table>
+
+
+ <% } else { %>
+
+ <table align="left" class="testdeplmain" >
+ <tr> <td> </td>
</tr>
+ <tr> <td >
+ Click on the <b>start test</b> button to check if
you have deployed the <%=new java.io.File(rootPath).getName()%> web service
correctly.
+ </td> </tr>
+
+ <tr>
+ <td>
+ <center> <br/>
+ <a href="?testit=true" target="_self"
+ class="testdeplstartbn"></a>
+ </center>
+ </td>
+
+ </tr>
+ </table>
+
+ <% } %>
+
+
+ </div>
+ </body>
+</html>
+

Copied: trunk/perfsonar-java-sql-ma/src/main/webapp/tick.gif (from rev 6046,
trunk/perfsonar-java-sql-ma/conf/axis-1.4/tick.gif)
===================================================================
(Binary files differ)

Copied: trunk/perfsonar-java-sql-ma/src/main/webapp/top_slice.gif (from rev
6046, trunk/perfsonar-java-sql-ma/conf/axis-1.4/top_slice.gif)
===================================================================
(Binary files differ)

Copied: trunk/perfsonar-java-sql-ma/src/main/webapp/welcome.htm (from rev
6046, trunk/perfsonar-java-sql-ma/conf/axis-1.4/welcome.htm)
===================================================================
--- trunk/perfsonar-java-sql-ma/src/main/webapp/welcome.htm
(rev 0)
+++ trunk/perfsonar-java-sql-ma/src/main/webapp/welcome.htm 2012-12-03
13:50:47 UTC (rev 6047)
@@ -0,0 +1,141 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
"http://www.w3.org/TR/html4/strict.dtd";>
+<html>
+ <head>
+ <meta http-equiv="Content-Type" content="text/html;
charset=iso-8859-1"/>
+ <title>Untitled Document</title>
+ <link rel="stylesheet" type="text/css" href="main.css"/>
+ </head>
+ <body style="background-color: #FFFFFF" >
+ <div class="centerWindow" >
+ <p class="welcometext">Welcome to the perfSONAR service web
admin administration interface</p>
+ <p class="heading1">
+ Configuration Settings
+ </p>
+ <table width="0" border="0" cellpadding="0" cellspacing="0">
+ <tr>
+ <td>
+ <table width="0" border="0" cellpadding="0"
cellspacing="0" background="graphics/step_1_slice.gif" class="contenttable">
+ <tr>
+ <td>
+ <img src="graphics/step_1_top.gif"
width="350" height="122">
+ </td>
+ </tr>
+ <tr>
+ <td class="configheading">
+ <p>
+ <a href="Wizard"
target="main">Service Settings</a>
+ </p>
+ <p>
+ &nbsp;
+ </p>
+ <p>
+ &nbsp;
+ </p>
+ </td>
+ </tr>
+ <tr>
+ <td >
+ <p>
+ &nbsp;
+ </p>
+ <p>
+ &nbsp;
+ </p>
+ <p>
+ &nbsp;
+ </p>
+ </td>
+ </tr>
+ <tr>
+ <td >
+ <p>
+ &nbsp;
+ </p>
+ <p>
+ &nbsp;
+ </p>
+ <p>
+ &nbsp;
+ </p>
+ </td>
+ </tr>
+ <tr><td> </td></tr>
+ <tr>
+ <td>
+ <img src="graphics/step_1_bottom.gif"
width="350" height="18">
+ </td>
+ </tr>
+ </table>
+ </td>
+ <td>
+ <table width="0" border="0" cellpadding="0"
cellspacing="0" background="graphics/step_2_slice.gif" class="contenttable">
+ <tr>
+ <td>
+ <img src="graphics/step_2_top.gif"
width="350" height="118">
+ </td>
+ </tr>
+ <tr>
+ <td class="configheadinglavender">
+ <p>
+ <a
href="ServiceAdmin?serviceProperties" target="main">Service Settings</a>
+ </p>
+ <p>
+ &nbsp;
+ </p>
+ <p>
+ &nbsp;
+ </p>
+ </td>
+ </tr>
+ <tr>
+ <td class="configheadinglavender">
+ <p>
+ <a
href="ServiceAdmin?loggingProperties" target="main">Logging Settings</a>
+ </p>
+ <p>
+ &nbsp;
+ </p>
+ <p>
+ &nbsp;
+ </p>
+ </td>
+ </tr>
+ <tr>
+ <td class="configheadinglavender">
+ <p>
+ <a href="SQLMAdmin"
target="main">SQL MA Administration </a>
+ </p>
+ <p>
+ &nbsp;
+ </p>
+ <p>
+ &nbsp;
+ </p>
+ </td>
+ </tr>
+ <tr>
+ <td class="configheadinglavender">
+ <p>
+ <a href="eXistAdmin"
target="main">eXist Database Settings</a>
+ </p>
+ <p>
+ &nbsp;
+ </p>
+ <p>
+ &nbsp;
+ </p>
+ </td>
+ </tr>
+
+ <tr>
+ <td>
+ <img src="graphics/step_2_bottom.gif"
width="350" height="18">
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ </div>
+ </body>
+</html>
\ No newline at end of file

Copied: trunk/perfsonar-java-sql-ma/src/main/webapp/wsdd/service-deploy.wsdd
(from rev 6046, trunk/perfsonar-java-sql-ma/conf/wsdd/service-deploy.wsdd)
===================================================================
--- trunk/perfsonar-java-sql-ma/src/main/webapp/wsdd/service-deploy.wsdd
(rev 0)
+++ trunk/perfsonar-java-sql-ma/src/main/webapp/wsdd/service-deploy.wsdd
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,16 @@
+<deployment xmlns="http://xml.apache.org/axis/wsdd/";
+xmlns:java="http://xml.apache.org/axis/wsdd/providers/java";>
+
+<service name="MeasurementArchiveService" style="message">
+<Documentation>Defines the name of the service and the type of service. The
style if message which for some reason makes communication cleaner and does
not affect anything. It implicitly uses Document style </Documentation>
+
+<parameter name="className"
value="org.perfsonar.service.base.web.RequestHandler"/>
+<Documentation> Define the name of the class to be used for the service.
This will remain the same regardless of the service </Documentation>
+
+<parameter name="allowedMethods" value="acceptCall"/>
+<Documentation> specified the methods that can be accessed. Only one method
for now and that is acceptCall</Documentation>
+
+<namespace>http://perfsonar.org/services/measurementArchive</namespace>
+<Documentation> namespace associated with the service </Documentation>
+</service>
+</deployment>

Copied:
trunk/perfsonar-java-sql-ma/src/main/webapp/wsdd/service-undeploy.wsdd (from
rev 6046, trunk/perfsonar-java-sql-ma/conf/wsdd/service-undeploy.wsdd)
===================================================================
--- trunk/perfsonar-java-sql-ma/src/main/webapp/wsdd/service-undeploy.wsdd
(rev 0)
+++ trunk/perfsonar-java-sql-ma/src/main/webapp/wsdd/service-undeploy.wsdd
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,3 @@
+<undeployment xmlns="http://xml.apache.org/axis/wsdd/";>
+ <service name="MeasurementArchiveService"/>
+</undeployment>

Copied: trunk/perfsonar-java-sql-ma/src/main/webapp/wz_tooltip.js (from rev
6046, trunk/perfsonar-java-sql-ma/conf/axis-1.4/wz_tooltip.js)
===================================================================
--- trunk/perfsonar-java-sql-ma/src/main/webapp/wz_tooltip.js
(rev 0)
+++ trunk/perfsonar-java-sql-ma/src/main/webapp/wz_tooltip.js 2012-12-03
13:50:47 UTC (rev 6047)
@@ -0,0 +1,1149 @@
+/* This notice must be untouched at all times.
+
+wz_tooltip.js v. 4.12
+
+The latest version is available at
+http://www.walterzorn.com
+or http://www.devira.com
+or http://www.walterzorn.de
+
+Copyright (c) 2002-2007 Walter Zorn. All rights reserved.
+Created 1.12.2002 by Walter Zorn (Web: http://www.walterzorn.com )
+Last modified: 13.7.2007
+
+Easy-to-use cross-browser tooltips.
+Just include the script at the beginning of the <body> section, and invoke
+Tip('Tooltip text') from within the desired HTML onmouseover eventhandlers.
+No container DIV, no onmouseouts required.
+By default, width of tooltips is automatically adapted to content.
+Is even capable of dynamically converting arbitrary HTML elements to tooltips
+by calling TagToTip('ID_of_HTML_element_to_be_converted') instead of Tip(),
+which means you can put important, search-engine-relevant stuff into
tooltips.
+Appearance of tooltips can be individually configured
+via commands passed to Tip() or TagToTip().
+
+Tab Width: 4
+LICENSE: LGPL
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License (LGPL) as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+For more details on the GNU Lesser General Public License,
+see http://www.gnu.org/copyleft/lesser.html
+*/
+
+var config = new Object();
+
+
+//=================== GLOBAL TOOPTIP CONFIGURATION
=========================//
+var tt_Debug = true // false or true - recommended: false once
you release your page to the public
+var tt_Enabled = true // Allows to (temporarily) suppress
tooltips, e.g. by providing the user with a button that sets this global
variable to false
+var TagsToTip = true // false or true - if true, the script is
capable of converting HTML elements to tooltips
+
+// For each of the following config variables there exists a command, which
is
+// just the variablename in uppercase, to be passed to Tip() or TagToTip() to
+// configure tooltips individually. Individual commands override global
+// configuration. Order of commands is arbitrary.
+// Example: onmouseover="Tip('Tooltip text', LEFT, true, BGCOLOR, '#FF9900',
FADEIN, 400)"
+
+config. Above = false // false or true - tooltip
above mousepointer?
+config. BgColor = '#E4E7FF' // Background color
+config. BgImg = '' // Path to background image,
none if empty string ''
+config. BorderColor = '#002299'
+config. BorderStyle = 'solid' // Any permitted CSS value, but I
recommend 'solid', 'dotted' or 'dashed'
+config. BorderWidth = 1
+config. CenterMouse = false // false or true - center the tip
horizontally below (or above) the mousepointer
+config. ClickClose = false // false or true - close
tooltip if the user clicks somewhere
+config. CloseBtn = false // false or true -
closebutton in titlebar
+config. CloseBtnColors = ['#990000', '#FFFFFF', '#DD3333', '#FFFFFF'] //
[Background, text, hovered background, hovered text] - use empty strings ''
to inherit title colors
+config. CloseBtnText = '&nbsp;X&nbsp;' // Close button text (may
also be an image tag)
+config. CopyContent = true // When converting a HTML
element to a tooltip, copy only the element's content, rather than converting
the element by its own
+config. Delay = 400 // Time span in ms until
tooltip shows up
+config. Duration = 0 // Time span in ms after
which the tooltip disappears; 0 for infinite duration
+config. FadeIn = 0 // Fade-in duration in ms,
e.g. 400; 0 for no animation
+config. FadeOut = 0
+config. FadeInterval = 30 // Duration of each fade step in ms
(recommended: 30) - shorter is smoother but causes more CPU-load
+config. Fix = null // Fixated position - x- an
y-oordinates in brackets, e.g. [210, 480], or null for no fixation
+config. FollowMouse = true // false or true - tooltip
follows the mouse
+config. FontColor = '#000044'
+config. FontFace = 'Verdana,Geneva,sans-serif'
+config. FontSize = '12px' // E.g. '9pt' or '12px' -
unit is mandatory
+config. FontWeight = 'normal' // 'normal' or 'bold';
+config. Left = false // false or true - tooltip on
the left of the mouse
+config. OffsetX = 14 // Horizontal offset of
left-top corner from mousepointer
+config. OffsetY = 8 // Vertical offset
+config. Opacity = 100 // Integer between 0 and 100
- opacity of tooltip in percent
+config. Padding = 3 // Spacing between border and
content
+config. Shadow = false // false or true
+config. ShadowColor = '#C0C0C0'
+config. ShadowWidth = 5
+config. Sticky = false // Do NOT hide tooltip on
mouseout? false or true
+config. TextAlign = 'left' // 'left', 'right' or
'justify'
+config. Title = '' // Default title text applied
to all tips (no default title: empty string '')
+config. TitleAlign = 'left' // 'left' or 'right' - text
alignment inside the title bar
+config. TitleBgColor = '' // If empty string '', BorderColor
will be used
+config. TitleFontColor = '#ffffff' // Color of title text - if '',
BgColor (of tooltip body) will be used
+config. TitleFontFace = '' // If '' use FontFace (boldified)
+config. TitleFontSize = '' // If '' use FontSize
+config. Width = 0 // Tooltip width; 0 for
automatic adaption to tooltip content
+//======= END OF TOOLTIP CONFIG, DO NOT CHANGE ANYTHING BELOW
==============//
+
+
+
+
+//====================== PUBLIC
============================================//
+function Tip()
+{
+ tt_Tip(arguments, null);
+}
+function TagToTip()
+{
+ if(TagsToTip)
+ {
+ var t2t = tt_GetElt(arguments[0]);
+ if(t2t)
+ tt_Tip(arguments, t2t);
+ }
+}
+
+//================== PUBLIC EXTENSION API
==================================//
+// Extension eventhandlers currently supported:
+// OnLoadConfig, OnCreateContentString, OnSubDivsCreated, OnShow,
OnMoveBefore,
+// OnMoveAfter, OnHideInit, OnHide, OnKill
+
+var tt_aElt = new Array(10), // Container DIV, outer title & body DIVs,
inner title & body TDs, closebutton SPAN, shadow DIVs, and IFRAME to cover
windowed elements in IE
+tt_aV = new Array(), // Caches and enumerates config data for currently
active tooltip
+tt_sContent, // Inner tooltip text or HTML
+tt_scrlX = 0, tt_scrlY = 0,
+tt_musX, tt_musY,
+tt_over,
+tt_x, tt_y, tt_w, tt_h; // Position, width and height of currently displayed
tooltip
+
+function tt_Extension()
+{
+ tt_ExtCmdEnum();
+ tt_aExt[tt_aExt.length] = this;
+ return this;
+}
+function tt_SetTipPos(x, y)
+{
+ var css = tt_aElt[0].style;
+
+ tt_x = x;
+ tt_y = y;
+ css.left = x + "px";
+ css.top = y + "px";
+ if(tt_ie56)
+ {
+ var ifrm = tt_aElt[tt_aElt.length - 1];
+ if(ifrm)
+ {
+ ifrm.style.left = css.left;
+ ifrm.style.top = css.top;
+ }
+ }
+}
+function tt_Hide()
+{
+ if(tt_db && tt_iState)
+ {
+ if(tt_iState & 0x2)
+ {
+ tt_aElt[0].style.visibility = "hidden";
+ tt_ExtCallFncs(0, "Hide");
+ }
+ tt_tShow.EndTimer();
+ tt_tHide.EndTimer();
+ tt_tDurt.EndTimer();
+ tt_tFade.EndTimer();
+ if(!tt_op && !tt_ie)
+ {
+ tt_tWaitMov.EndTimer();
+ tt_bWait = false;
+ }
+ if(tt_aV[CLICKCLOSE])
+ tt_RemEvtFnc(document, "mouseup", tt_HideInit);
+ tt_AddRemOutFnc(false);
+ tt_ExtCallFncs(0, "Kill");
+ // In case of a TagToTip tooltip, hide converted DOM node and
+ // re-insert it into document
+ if(tt_t2t && !tt_aV[COPYCONTENT])
+ {
+ tt_t2t.style.display = "none";
+ tt_MovDomNode(tt_t2t, tt_aElt[6], tt_t2tDad);
+ }
+ tt_iState = 0;
+ tt_over = null;
+ tt_ResetMainDiv();
+ if(tt_aElt[tt_aElt.length - 1])
+ tt_aElt[tt_aElt.length - 1].style.display = "none";
+ }
+}
+function tt_GetElt(id)
+{
+ return(document.getElementById ? document.getElementById(id)
+ : document.all ? document.all[id]
+ : null);
+}
+function tt_GetDivW(el)
+{
+ return(el ? (el.offsetWidth || el.style.pixelWidth || 0) : 0);
+}
+function tt_GetDivH(el)
+{
+ return(el ? (el.offsetHeight || el.style.pixelHeight || 0) : 0);
+}
+function tt_GetScrollX()
+{
+ return(window.pageXOffset || (tt_db ? (tt_db.scrollLeft || 0) : 0));
+}
+function tt_GetScrollY()
+{
+ return(window.pageYOffset || (tt_db ? (tt_db.scrollTop || 0) : 0));
+}
+function tt_GetClientW()
+{
+ return(document.body && (typeof(document.body.clientWidth) != tt_u) ?
document.body.clientWidth
+ : (typeof(window.innerWidth) != tt_u) ?
window.innerWidth
+ : tt_db ? (tt_db.clientWidth || 0)
+ : 0);
+}
+function tt_GetClientH()
+{
+ // Exactly this order seems to yield correct values in all major
browsers
+ return(document.body && (typeof(document.body.clientHeight) != tt_u)
? document.body.clientHeight
+ : (typeof(window.innerHeight) != tt_u) ?
window.innerHeight
+ : tt_db ? (tt_db.clientHeight || 0)
+ : 0);
+}
+function tt_GetEvtX(e)
+{
+ return (e ? ((typeof(e.pageX) != tt_u) ? e.pageX : (e.clientX +
tt_scrlX)) : 0);
+}
+function tt_GetEvtY(e)
+{
+ return (e ? ((typeof(e.pageY) != tt_u) ? e.pageY : (e.clientY +
tt_scrlY)) : 0);
+}
+function tt_AddEvtFnc(el, sEvt, PFnc)
+{
+ if(el)
+ {
+ if(el.addEventListener)
+ el.addEventListener(sEvt, PFnc, false);
+ else
+ el.attachEvent("on" + sEvt, PFnc);
+ }
+}
+function tt_RemEvtFnc(el, sEvt, PFnc)
+{
+ if(el)
+ {
+ if(el.removeEventListener)
+ el.removeEventListener(sEvt, PFnc, false);
+ else
+ el.detachEvent("on" + sEvt, PFnc);
+ }
+}
+
+//====================== PRIVATE
===========================================//
+var tt_aExt = new Array(), // Array of extension objects
+
+tt_db, tt_op, tt_ie, tt_ie56, tt_bBoxOld, // Browser flags
+tt_body,
+tt_flagOpa, // Opacity support: 1=IE, 2=Khtml, 3=KHTML,
4=Moz, 5=W3C
+tt_maxPosX, tt_maxPosY,
+tt_iState = 0, // Tooltip active |= 1, shown |= 2, move with
mouse |= 4
+tt_opa, // Currently applied opacity
+tt_bJmpVert, // Tip above mouse (or ABOVE tip below mouse)
+tt_t2t, tt_t2tDad, // Tag converted to tip, and its parent
element in the document
+tt_elDeHref, // The tag from which Opera has removed the
href attribute
+// Timer
+tt_tShow = new Number(0), tt_tHide = new Number(0), tt_tDurt = new Number(0),
+tt_tFade = new Number(0), tt_tWaitMov = new Number(0),
+tt_bWait = false,
+tt_u = "undefined";
+
+
+function tt_Init()
+{
+ tt_MkCmdEnum();
+ // Send old browsers instantly to hell
+ if(!tt_Browser() || !tt_MkMainDiv())
+ return;
+ tt_IsW3cBox();
+ tt_OpaSupport();
+ tt_AddEvtFnc(document, "mousemove", tt_Move);
+ // In Debug mode we search for TagToTip() calls in order to notify
+ // the user if they've forgotten to set the TagsToTip config flag
+ if(TagsToTip || tt_Debug)
+ tt_SetOnloadFnc();
+ tt_AddEvtFnc(window, "scroll",
+ function()
+ {
+ tt_scrlX = tt_GetScrollX();
+ tt_scrlY = tt_GetScrollY();
+ if(tt_iState && !(tt_aV[STICKY] && (tt_iState & 2)))
+ tt_HideInit();
+ } );
+ // Ensure the tip be hidden when the page unloads
+ tt_AddEvtFnc(window, "unload", tt_Hide);
+ tt_Hide();
+}
+// Creates command names by translating config variable names to upper case
+function tt_MkCmdEnum()
+{
+ var n = 0;
+ for(var i in config)
+ eval("window." + i.toString().toUpperCase() + " = " + n++);
+ tt_aV.length = n;
+}
+function tt_Browser()
+{
+ var n, nv, n6, w3c;
+
+ n = navigator.userAgent.toLowerCase(),
+ nv = navigator.appVersion;
+ tt_op = (document.defaultView && typeof(eval("w" + "indow" + "." +
"o" + "p" + "er" + "a")) != tt_u);
+ tt_ie = n.indexOf("msie") != -1 && document.all && !tt_op;
+ if(tt_ie)
+ {
+ var ieOld = (!document.compatMode || document.compatMode ==
"BackCompat");
+ tt_db = !ieOld ? document.documentElement : (document.body ||
null);
+ if(tt_db)
+ tt_ie56 = parseFloat(nv.substring(nv.indexOf("MSIE")
+ 5)) >= 5.5
+ && typeof
document.body.style.maxHeight == tt_u;
+ }
+ else
+ {
+ tt_db = document.documentElement || document.body ||
+ (document.getElementsByTagName ?
document.getElementsByTagName("body")[0]
+ : null);
+ if(!tt_op)
+ {
+ n6 = document.defaultView && typeof
document.defaultView.getComputedStyle != tt_u;
+ w3c = !n6 && document.getElementById;
+ }
+ }
+ tt_body = (document.getElementsByTagName ?
document.getElementsByTagName("body")[0]
+ : (document.body || null));
+ if(tt_ie || n6 || tt_op || w3c)
+ {
+ if(tt_body && tt_db)
+ {
+ if(document.attachEvent || document.addEventListener)
+ return true;
+ }
+ else
+ tt_Err("wz_tooltip.js must be included INSIDE the
body section,"
+ + " immediately after the opening
<body> tag.");
+ }
+ tt_db = null;
+ return false;
+}
+function tt_MkMainDiv()
+{
+ // Create the tooltip DIV
+ if(tt_body.insertAdjacentHTML)
+ tt_body.insertAdjacentHTML("afterBegin", tt_MkMainDivHtm());
+ else if(typeof tt_body.innerHTML != tt_u && document.createElement &&
tt_body.appendChild)
+ tt_body.appendChild(tt_MkMainDivDom());
+ // FireFox Alzheimer bug
+ if(window.tt_GetMainDivRefs && tt_GetMainDivRefs())
+ return true;
+ tt_db = null;
+ return false;
+}
+function tt_MkMainDivHtm()
+{
+ return('<div id="WzTtDiV"></div>' +
+ (tt_ie56 ? ('<iframe id="WzTtIfRm"
src="javascript:false" scrolling="no" frameborder="0"
style="filter:Alpha(opacity=0);position:absolute;top:0px;left:0px;display:none;"></iframe>')
+ : ''));
+}
+function tt_MkMainDivDom()
+{
+ var el = document.createElement("div");
+ if(el)
+ el.id = "WzTtDiV";
+ return el;
+}
+function tt_GetMainDivRefs()
+{
+ tt_aElt[0] = tt_GetElt("WzTtDiV");
+ if(tt_ie56 && tt_aElt[0])
+ {
+ tt_aElt[tt_aElt.length - 1] = tt_GetElt("WzTtIfRm");
+ if(!tt_aElt[tt_aElt.length - 1])
+ tt_aElt[0] = null;
+ }
+ if(tt_aElt[0])
+ {
+ var css = tt_aElt[0].style;
+
+ css.visibility = "hidden";
+ css.position = "absolute";
+ css.overflow = "hidden";
+ return true;
+ }
+ return false;
+}
+function tt_ResetMainDiv()
+{
+ var w = (window.screen && screen.width) ? screen.width : 10000;
+
+ tt_SetTipPos(-w, 0);
+ tt_aElt[0].innerHTML = "";
+ tt_aElt[0].style.width = (w - 1) + "px";
+}
+function tt_IsW3cBox()
+{
+ var css = tt_aElt[0].style;
+
+ css.padding = "10px";
+ css.width = "40px";
+ tt_bBoxOld = (tt_GetDivW(tt_aElt[0]) == 40);
+ css.padding = "0px";
+ tt_ResetMainDiv();
+}
+function tt_OpaSupport()
+{
+ var css = tt_body.style;
+
+ tt_flagOpa = (typeof(css.filter) != tt_u) ? 1
+ : (typeof(css.KhtmlOpacity) != tt_u) ? 2
+ : (typeof(css.KHTMLOpacity) != tt_u) ? 3
+ : (typeof(css.MozOpacity) != tt_u) ? 4
+ : (typeof(css.opacity) != tt_u) ? 5
+ : 0;
+}
+// Ported from http://dean.edwards.name/weblog/2006/06/again/
+// (Dean Edwards et al.)
+function tt_SetOnloadFnc()
+{
+ tt_AddEvtFnc(document, "DOMContentLoaded", tt_HideSrcTags);
+ tt_AddEvtFnc(window, "load", tt_HideSrcTags);
+ if(tt_body.attachEvent)
+ tt_body.attachEvent("onreadystatechange",
+ function() {
+ if(tt_body.readyState == "complete")
+ tt_HideSrcTags();
+ } );
+ if(/WebKit|KHTML/i.test(navigator.userAgent))
+ {
+ var t = setInterval(function() {
+
if(/loaded|complete/.test(document.readyState))
+ {
+ clearInterval(t);
+ tt_HideSrcTags();
+ }
+ }, 10);
+ }
+}
+function tt_HideSrcTags()
+{
+ if(!window.tt_HideSrcTags || window.tt_HideSrcTags.done)
+ return;
+ window.tt_HideSrcTags.done = true;
+ if(!tt_HideSrcTagsRecurs(tt_body))
+ tt_Err("To enable the capability to convert HTML elements to
tooltips,"
+ + " you must set TagsToTip in the global
tooltip configuration"
+ + " to true.");
+}
+function tt_HideSrcTagsRecurs(dad)
+{
+ var a, ovr, asT2t;
+
+ // Walk the DOM tree for tags that have an onmouseover attribute
+ // containing a TagToTip('...') call.
+ // (.childNodes first since .children is bugous in Safari)
+ a = dad.childNodes || dad.children || null;
+ for(var i = a ? a.length : 0; i;)
+ {--i;
+ if(!tt_HideSrcTagsRecurs(a[i]))
+ return false;
+ ovr = a[i].getAttribute ? a[i].getAttribute("onmouseover")
+ : (typeof a[i].onmouseover == "function") ?
a[i].onmouseover
+ : null;
+ if(ovr)
+ {
+ asT2t =
ovr.toString().match(/TagToTip\s*\(\s*'[^'.]+'\s*[\),]/);
+ if(asT2t && asT2t.length)
+ {
+ if(!tt_HideSrcTag(asT2t[0]))
+ return false;
+ }
+ }
+ }
+ return true;
+}
+function tt_HideSrcTag(sT2t)
+{
+ var id, el;
+
+ // The ID passed to the found TagToTip() call identifies an HTML
element
+ // to be converted to a tooltip, so hide that element
+ id = sT2t.replace(/.+'([^'.]+)'.+/, "$1");
+ el = tt_GetElt(id);
+ if(el)
+ {
+ if(tt_Debug && !TagsToTip)
+ return false;
+ else
+ el.style.display = "none";
+ }
+ else
+ tt_Err("Invalid ID\n'" + id + "'\npassed to TagToTip()."
+ + " There exists no HTML element with that
ID.");
+ return true;
+}
+function tt_Tip(arg, t2t)
+{
+ if(!tt_db)
+ return;
+ if(tt_iState)
+ tt_Hide();
+ if(!tt_Enabled)
+ return;
+ tt_t2t = t2t;
+ if(!tt_ReadCmds(arg))
+ return;
+ tt_iState = 0x1 | 0x4;
+ tt_AdaptConfig1();
+ tt_MkTipContent(arg);
+ tt_MkTipSubDivs();
+ tt_FormatTip();
+ tt_bJmpVert = false;
+ tt_maxPosX = tt_GetClientW() + tt_scrlX - tt_w - 1;
+ tt_maxPosY = tt_GetClientH() + tt_scrlY - tt_h - 1;
+ tt_AdaptConfig2();
+ // We must fake the first mousemove in order to ensure the tip
+ // be immediately shown and positioned
+ tt_Move();
+ tt_ShowInit();
+}
+function tt_ReadCmds(a)
+{
+ var i;
+
+ // First load the global config values, to initialize also values
+ // for which no command has been passed
+ i = 0;
+ for(var j in config)
+ tt_aV[i++] = config[j];
+ // Then replace each cached config value for which a command has been
+ // passed (ensure the # of command args plus value args be even)
+ if(a.length & 1)
+ {
+ for(i = a.length - 1; i > 0; i -= 2)
+ tt_aV[a[i - 1]] = a[i];
+ return true;
+ }
+ tt_Err("Incorrect call of Tip() or TagToTip().\n"
+ + "Each command must be followed by a value.");
+ return false;
+}
+function tt_AdaptConfig1()
+{
+ tt_ExtCallFncs(0, "LoadConfig");
+ // Inherit unspecified title formattings from body
+ if(!tt_aV[TITLEBGCOLOR].length)
+ tt_aV[TITLEBGCOLOR] = tt_aV[BORDERCOLOR];
+ if(!tt_aV[TITLEFONTCOLOR].length)
+ tt_aV[TITLEFONTCOLOR] = tt_aV[BGCOLOR];
+ if(!tt_aV[TITLEFONTFACE].length)
+ tt_aV[TITLEFONTFACE] = tt_aV[FONTFACE];
+ if(!tt_aV[TITLEFONTSIZE].length)
+ tt_aV[TITLEFONTSIZE] = tt_aV[FONTSIZE];
+ if(tt_aV[CLOSEBTN])
+ {
+ // Use title colors for non-specified closebutton colors
+ if(!tt_aV[CLOSEBTNCOLORS])
+ tt_aV[CLOSEBTNCOLORS] = new Array("", "", "", "");
+ for(var i = 4; i;)
+ {--i;
+ if(!tt_aV[CLOSEBTNCOLORS][i].length)
+ tt_aV[CLOSEBTNCOLORS][i] = (i & 1) ?
tt_aV[TITLEFONTCOLOR] : tt_aV[TITLEBGCOLOR];
+ }
+ // Enforce titlebar be shown
+ if(!tt_aV[TITLE].length)
+ tt_aV[TITLE] = " ";
+ }
+ // Circumvents broken display of images and fade-in flicker in Geckos
< 1.8
+ if(tt_aV[OPACITY] == 100 && typeof tt_aElt[0].style.MozOpacity !=
tt_u && !Array.every)
+ tt_aV[OPACITY] = 99;
+ // Smartly shorten the delay for fade-in tooltips
+ if(tt_aV[FADEIN] && tt_flagOpa && tt_aV[DELAY] > 100)
+ tt_aV[DELAY] = Math.max(tt_aV[DELAY] - tt_aV[FADEIN], 100);
+}
+function tt_AdaptConfig2()
+{
+ if(tt_aV[CENTERMOUSE])
+ tt_aV[OFFSETX] -= ((tt_w - (tt_aV[SHADOW] ?
tt_aV[SHADOWWIDTH] : 0)) >> 1);
+}
+// Expose content globally so extensions can modify it
+function tt_MkTipContent(a)
+{
+ if(tt_t2t)
+ {
+ if(tt_aV[COPYCONTENT])
+ tt_sContent = tt_t2t.innerHTML;
+ else
+ tt_sContent = "";
+ }
+ else
+ tt_sContent = a[0];
+ tt_ExtCallFncs(0, "CreateContentString");
+}
+function tt_MkTipSubDivs()
+{
+ var sCss =
'position:relative;margin:0px;padding:0px;border-width:0px;left:0px;top:0px;line-height:normal;width:auto;',
+ sTbTrTd = ' cellspacing=0 cellpadding=0 border=0 style="' + sCss +
'"><tbody style="' + sCss + '"><tr><td ';
+
+ tt_aElt[0].innerHTML =
+ (''
+ + (tt_aV[TITLE].length ?
+ ('<div id="WzTiTl"
style="position:relative;z-index:1;">'
+ + '<table id="WzTiTlTb"' + sTbTrTd + 'id="WzTiTlI"
style="' + sCss + '">'
+ + tt_aV[TITLE]
+ + '</td>'
+ + (tt_aV[CLOSEBTN] ?
+ ('<td align="right" style="' + sCss
+ + 'text-align:right;">'
+ + '<span id="WzClOsE"
style="padding-left:2px;padding-right:2px;'
+ + 'cursor:' + (tt_ie ? 'hand' : 'pointer')
+ + ';" onmouseover="tt_OnCloseBtnOver(1)"
onmouseout="tt_OnCloseBtnOver(0)" onclick="tt_HideInit()">'
+ + tt_aV[CLOSEBTNTEXT]
+ + '</span></td>')
+ : '')
+ + '</tr></tbody></table></div>')
+ : '')
+ + '<div id="WzBoDy" style="position:relative;z-index:0;">'
+ + '<table' + sTbTrTd + 'id="WzBoDyI" style="' + sCss + '">'
+ + tt_sContent
+ + '</td></tr></tbody></table></div>'
+ + (tt_aV[SHADOW]
+ ? ('<div id="WzTtShDwR"
style="position:absolute;overflow:hidden;"></div>'
+ + '<div id="WzTtShDwB"
style="position:relative;overflow:hidden;"></div>')
+ : '')
+ );
+ tt_GetSubDivRefs();
+ // Convert DOM node to tip
+ if(tt_t2t && !tt_aV[COPYCONTENT])
+ {
+ // Store the tag's parent element so we can restore that DOM
branch
+ // once the tooltip is hidden
+ tt_t2tDad = tt_t2t.parentNode || tt_t2t.parentElement ||
tt_t2t.offsetParent || null;
+ if(tt_t2tDad)
+ {
+ tt_MovDomNode(tt_t2t, tt_t2tDad, tt_aElt[6]);
+ tt_t2t.style.display = "block";
+ }
+ }
+ tt_ExtCallFncs(0, "SubDivsCreated");
+}
+function tt_GetSubDivRefs()
+{
+ var aId = new Array("WzTiTl", "WzTiTlTb", "WzTiTlI", "WzClOsE",
"WzBoDy", "WzBoDyI", "WzTtShDwB", "WzTtShDwR");
+
+ for(var i = aId.length; i; --i)
+ tt_aElt[i] = tt_GetElt(aId[i - 1]);
+}
+function tt_FormatTip()
+{
+ var css, w, iOffY, iOffSh;
+
+ //--------- Title DIV ----------
+ if(tt_aV[TITLE].length)
+ {
+ css = tt_aElt[1].style;
+ css.background = tt_aV[TITLEBGCOLOR];
+ css.paddingTop = (tt_aV[CLOSEBTN] ? 2 : 0) + "px";
+ css.paddingBottom = "1px";
+ css.paddingLeft = css.paddingRight = tt_aV[PADDING] + "px";
+ css = tt_aElt[3].style;
+ css.color = tt_aV[TITLEFONTCOLOR];
+ css.fontFamily = tt_aV[TITLEFONTFACE];
+ css.fontSize = tt_aV[TITLEFONTSIZE];
+ css.fontWeight = "bold";
+ css.textAlign = tt_aV[TITLEALIGN];
+ // Close button DIV
+ if(tt_aElt[4])
+ {
+ css.paddingRight = (tt_aV[PADDING] << 1) + "px";
+ css = tt_aElt[4].style;
+ css.background = tt_aV[CLOSEBTNCOLORS][0];
+ css.color = tt_aV[CLOSEBTNCOLORS][1];
+ css.fontFamily = tt_aV[TITLEFONTFACE];
+ css.fontSize = tt_aV[TITLEFONTSIZE];
+ css.fontWeight = "bold";
+ }
+ if(tt_aV[WIDTH] > 0)
+ tt_w = tt_aV[WIDTH] + ((tt_aV[PADDING] +
tt_aV[BORDERWIDTH]) << 1);
+ else
+ {
+ tt_w = tt_GetDivW(tt_aElt[3]) +
tt_GetDivW(tt_aElt[4]);
+ // Some spacing between title DIV and closebutton
+ if(tt_aElt[4])
+ tt_w += tt_aV[PADDING];
+ }
+ // Ensure the top border of the body DIV be covered by the
title DIV
+ iOffY = -tt_aV[BORDERWIDTH];
+ }
+ else
+ {
+ tt_w = 0;
+ iOffY = 0;
+ }
+
+ //-------- Body DIV ------------
+ css = tt_aElt[5].style;
+ css.top = iOffY + "px";
+ if(tt_aV[BORDERWIDTH])
+ {
+ css.borderColor = tt_aV[BORDERCOLOR];
+ css.borderStyle = tt_aV[BORDERSTYLE];
+ css.borderWidth = tt_aV[BORDERWIDTH] + "px";
+ }
+ if(tt_aV[BGCOLOR].length)
+ css.background = tt_aV[BGCOLOR];
+ if(tt_aV[BGIMG].length)
+ css.backgroundImage = "url(" + tt_aV[BGIMG] + ")";
+ css.padding = tt_aV[PADDING] + "px";
+ css.textAlign = tt_aV[TEXTALIGN];
+ // TD inside body DIV
+ css = tt_aElt[6].style;
+ css.color = tt_aV[FONTCOLOR];
+ css.fontFamily = tt_aV[FONTFACE];
+ css.fontSize = tt_aV[FONTSIZE];
+ css.fontWeight = tt_aV[FONTWEIGHT];
+ css.background = "";
+ css.textAlign = tt_aV[TEXTALIGN];
+ if(tt_aV[WIDTH] > 0)
+ w = tt_aV[WIDTH] + ((tt_aV[PADDING] + tt_aV[BORDERWIDTH]) <<
1);
+ else
+ // We measure the width of the body's inner TD, because some
browsers
+ // expand the width of the container and outer body DIV to
100%
+ w = tt_GetDivW(tt_aElt[6]) + ((tt_aV[PADDING] +
tt_aV[BORDERWIDTH]) << 1);
+ if(w > tt_w)
+ tt_w = w;
+
+ //--------- Shadow DIVs ------------
+ if(tt_aV[SHADOW])
+ {
+ tt_w += tt_aV[SHADOWWIDTH];
+ iOffSh = Math.floor((tt_aV[SHADOWWIDTH] * 4) / 3);
+ // Bottom shadow
+ css = tt_aElt[7].style;
+ css.top = iOffY + "px";
+ css.left = iOffSh + "px";
+ css.width = (tt_w - iOffSh - tt_aV[SHADOWWIDTH]) + "px";
+ css.height = tt_aV[SHADOWWIDTH] + "px";
+ css.background = tt_aV[SHADOWCOLOR];
+ // Right shadow
+ css = tt_aElt[8].style;
+ css.top = iOffSh + "px";
+ css.left = (tt_w - tt_aV[SHADOWWIDTH]) + "px";
+ css.width = tt_aV[SHADOWWIDTH] + "px";
+ css.background = tt_aV[SHADOWCOLOR];
+ }
+ else
+ iOffSh = 0;
+
+ //-------- Container DIV -------
+ tt_SetTipOpa(tt_aV[FADEIN] ? 0 : tt_aV[OPACITY]);
+ tt_FixSize(iOffY, iOffSh);
+}
+// Fixate the size so it can't dynamically change while the tooltip is
moving.
+function tt_FixSize(iOffY, iOffSh)
+{
+ var wIn, wOut, i;
+
+ tt_aElt[0].style.width = tt_w + "px";
+ tt_aElt[0].style.pixelWidth = tt_w;
+ wOut = tt_w - ((tt_aV[SHADOW]) ? tt_aV[SHADOWWIDTH] : 0);
+ // Body
+ wIn = wOut;
+ if(!tt_bBoxOld)
+ wIn -= ((tt_aV[PADDING] + tt_aV[BORDERWIDTH]) << 1);
+ tt_aElt[5].style.width = wIn + "px";
+ // Title
+ if(tt_aElt[1])
+ {
+ wIn = wOut - (tt_aV[PADDING] << 1);
+ if(!tt_bBoxOld)
+ wOut = wIn;
+ tt_aElt[1].style.width = wOut + "px";
+ tt_aElt[2].style.width = wIn + "px";
+ }
+ tt_h = tt_GetDivH(tt_aElt[0]) + iOffY;
+ // Right shadow
+ if(tt_aElt[8])
+ tt_aElt[8].style.height = (tt_h - iOffSh) + "px";
+ i = tt_aElt.length - 1;
+ if(tt_aElt[i])
+ {
+ tt_aElt[i].style.width = tt_w + "px";
+ tt_aElt[i].style.height = tt_h + "px";
+ }
+}
+function tt_DeAlt(el)
+{
+ var aKid;
+
+ if(el.alt)
+ el.alt = "";
+ if(el.title)
+ el.title = "";
+ aKid = el.childNodes || el.children || null;
+ if(aKid)
+ {
+ for(var i = aKid.length; i;)
+ tt_DeAlt(aKid[--i]);
+ }
+}
+// This hack removes the annoying native tooltips over links in Opera
+function tt_OpDeHref(el)
+{
+ if(!tt_op)
+ return;
+ if(tt_elDeHref)
+ tt_OpReHref();
+ while(el)
+ {
+ if(el.hasAttribute("href"))
+ {
+ el.t_href = el.getAttribute("href");
+ el.t_stats = window.status;
+ el.removeAttribute("href");
+ el.style.cursor = "hand";
+ tt_AddEvtFnc(el, "mousedown", tt_OpReHref);
+ window.status = el.t_href;
+ tt_elDeHref = el;
+ break;
+ }
+ el = el.parentElement;
+ }
+}
+function tt_ShowInit()
+{
+ tt_tShow.Timer("tt_Show()", tt_aV[DELAY], true);
+ if(tt_aV[CLICKCLOSE])
+ tt_AddEvtFnc(document, "mouseup", tt_HideInit);
+}
+function tt_OverInit(e)
+{
+ tt_over = e.target || e.srcElement;
+ tt_DeAlt(tt_over);
+ tt_OpDeHref(tt_over);
+ tt_AddRemOutFnc(true);
+}
+function tt_Show()
+{
+ var css = tt_aElt[0].style;
+
+ // Override the z-index of the topmost wz_dragdrop.js D&D item
+ css.zIndex = Math.max((window.dd && dd.z) ? (dd.z + 2) : 0, 1010);
+ if(tt_aV[STICKY] || !tt_aV[FOLLOWMOUSE])
+ tt_iState &= ~0x4;
+ if(tt_aV[DURATION] > 0)
+ tt_tDurt.Timer("tt_HideInit()", tt_aV[DURATION], true);
+ tt_ExtCallFncs(0, "Show")
+ css.visibility = "visible";
+ tt_iState |= 0x2;
+ if(tt_aV[FADEIN])
+ tt_Fade(0, 0, tt_aV[OPACITY], Math.round(tt_aV[FADEIN] /
tt_aV[FADEINTERVAL]));
+ tt_ShowIfrm();
+}
+function tt_ShowIfrm()
+{
+ if(tt_ie56)
+ {
+ var ifrm = tt_aElt[tt_aElt.length - 1];
+ if(ifrm)
+ {
+ var css = ifrm.style;
+ css.zIndex = tt_aElt[0].style.zIndex - 1;
+ css.display = "block";
+ }
+ }
+}
+function tt_Move(e)
+{
+ e = window.event || e;
+ if(e)
+ {
+ tt_musX = tt_GetEvtX(e);
+ tt_musY = tt_GetEvtY(e);
+ }
+ if(tt_iState)
+ {
+ if(!tt_over && e)
+ tt_OverInit(e);
+ if(tt_iState & 0x4)
+ {
+ // Protect some browsers against jam of mousemove
events
+ if(!tt_op && !tt_ie)
+ {
+ if(tt_bWait)
+ return;
+ tt_bWait = true;
+ tt_tWaitMov.Timer("tt_bWait = false;", 1,
true);
+ }
+ if(tt_aV[FIX])
+ {
+ tt_iState &= ~0x4;
+ tt_SetTipPos(tt_aV[FIX][0], tt_aV[FIX][1]);
+ }
+ else if(!tt_ExtCallFncs(e, "MoveBefore"))
+ tt_SetTipPos(tt_PosX(), tt_PosY());
+ tt_ExtCallFncs([tt_musX, tt_musY], "MoveAfter")
+ }
+ }
+}
+function tt_PosX()
+{
+ var x;
+
+ x = tt_musX;
+ if(tt_aV[LEFT])
+ x -= tt_w + tt_aV[OFFSETX] - (tt_aV[SHADOW] ?
tt_aV[SHADOWWIDTH] : 0);
+ else
+ x += tt_aV[OFFSETX];
+ // Prevent tip from extending past right/left clientarea boundary
+ if(x > tt_maxPosX)
+ x = tt_maxPosX;
+ return((x < tt_scrlX) ? tt_scrlX : x);
+}
+function tt_PosY()
+{
+ var y;
+
+ // Apply some hysteresis after the tip has snapped to the other side
of the
+ // mouse. In case of insufficient space above and below the mouse, we
place
+ // the tip below.
+ if(tt_aV[ABOVE] && (!tt_bJmpVert || tt_CalcPosYAbove() >= tt_scrlY +
16))
+ y = tt_DoPosYAbove();
+ else if(!tt_aV[ABOVE] && tt_bJmpVert && tt_CalcPosYBelow() >
tt_maxPosY - 16)
+ y = tt_DoPosYAbove();
+ else
+ y = tt_DoPosYBelow();
+ // Snap to other side of mouse if tip would extend past window
boundary
+ if(y > tt_maxPosY)
+ y = tt_DoPosYAbove();
+ if(y < tt_scrlY)
+ y = tt_DoPosYBelow();
+ return y;
+}
+function tt_DoPosYBelow()
+{
+ tt_bJmpVert = tt_aV[ABOVE];
+ return tt_CalcPosYBelow();
+}
+function tt_DoPosYAbove()
+{
+ tt_bJmpVert = !tt_aV[ABOVE];
+ return tt_CalcPosYAbove();
+}
+function tt_CalcPosYBelow()
+{
+ return(tt_musY + tt_aV[OFFSETY]);
+}
+function tt_CalcPosYAbove()
+{
+ var dy = tt_aV[OFFSETY] - (tt_aV[SHADOW] ? tt_aV[SHADOWWIDTH] : 0);
+ if(tt_aV[OFFSETY] > 0 && dy <= 0)
+ dy = 1;
+ return(tt_musY - tt_h - dy);
+}
+function tt_OnOut()
+{
+ tt_AddRemOutFnc(false);
+ if(!(tt_aV[STICKY] && (tt_iState & 0x2)))
+ tt_HideInit();
+}
+function tt_HideInit()
+{
+ tt_ExtCallFncs(0, "HideInit");
+ tt_iState &= ~0x4;
+ if(tt_flagOpa && tt_aV[FADEOUT])
+ {
+ tt_tFade.EndTimer();
+ if(tt_opa)
+ {
+ var n = Math.round(tt_aV[FADEOUT] /
(tt_aV[FADEINTERVAL] * (tt_aV[OPACITY] / tt_opa)));
+ tt_Fade(tt_opa, tt_opa, 0, n);
+ return;
+ }
+ }
+ tt_tHide.Timer("tt_Hide();", 1, false);
+}
+function tt_OpReHref()
+{
+ if(tt_elDeHref)
+ {
+ tt_elDeHref.setAttribute("href", tt_elDeHref.t_href);
+ tt_RemEvtFnc(tt_elDeHref, "mousedown", tt_OpReHref);
+ window.status = tt_elDeHref.t_stats;
+ tt_elDeHref = null;
+ }
+}
+function tt_Fade(a, now, z, n)
+{
+ if(n)
+ {
+ now += Math.round((z - now) / n);
+ if((z > a) ? (now >= z) : (now <= z))
+ now = z;
+ else
+ tt_tFade.Timer("tt_Fade("
+ + a + "," + now + ","
+ z + "," + (n - 1)
+ + ")",
+ tt_aV[FADEINTERVAL],
+ true);
+ }
+ now ? tt_SetTipOpa(now) : tt_Hide();
+}
+// To circumvent the opacity nesting flaws of IE, we set the opacity
+// for each sub-DIV separately, rather than for the container DIV.
+function tt_SetTipOpa(opa)
+{
+ tt_SetOpa(tt_aElt[5].style, opa);
+ if(tt_aElt[1])
+ tt_SetOpa(tt_aElt[1].style, opa);
+ if(tt_aV[SHADOW])
+ {
+ opa = Math.round(opa * 0.8);
+ tt_SetOpa(tt_aElt[7].style, opa);
+ tt_SetOpa(tt_aElt[8].style, opa);
+ }
+}
+function tt_OnCloseBtnOver(iOver)
+{
+ var css = tt_aElt[4].style;
+
+ iOver <<= 1;
+ css.background = tt_aV[CLOSEBTNCOLORS][iOver];
+ css.color = tt_aV[CLOSEBTNCOLORS][iOver + 1];
+}
+function tt_Int(x)
+{
+ var y;
+
+ return(isNaN(y = parseInt(x)) ? 0 : y);
+}
+// Adds or removes the document.mousemove or HoveredElem.mouseout handler
+// conveniently. Keeps track of those handlers to prevent them from being
+// set or removed redundantly.
+function tt_AddRemOutFnc(bAdd)
+{
+ var PSet = bAdd ? tt_AddEvtFnc : tt_RemEvtFnc;
+
+ if(bAdd != tt_AddRemOutFnc.bOn)
+ {
+ PSet(tt_over, "mouseout", tt_OnOut);
+ tt_AddRemOutFnc.bOn = bAdd;
+ if(!bAdd)
+ tt_OpReHref();
+ }
+}
+tt_AddRemOutFnc.bOn = false;
+Number.prototype.Timer = function(s, iT, bUrge)
+{
+ if(!this.value || bUrge)
+ this.value = window.setTimeout(s, iT);
+}
+Number.prototype.EndTimer = function()
+{
+ if(this.value)
+ {
+ window.clearTimeout(this.value);
+ this.value = 0;
+ }
+}
+function tt_SetOpa(css, opa)
+{
+ tt_opa = opa;
+ if(tt_flagOpa == 1)
+ {
+ // Hack for bugs of IE:
+ // A DIV cannot be made visible in a single step if an
opacity < 100
+ // has been applied while the DIV was hidden.
+ // Moreover, in IE6, applying an opacity < 100 has no effect
if the
+ // concerned element has no layout (position, size, zoom,
...).
+ if(opa < 100)
+ {
+ var bVis = css.visibility != "hidden";
+ css.zoom = "100%";
+ if(!bVis)
+ css.visibility = "visible";
+ css.filter = "alpha(opacity=" + opa + ")";
+ if(!bVis)
+ css.visibility = "hidden";
+ }
+ else
+ css.filter = "";
+ }
+ else
+ {
+ opa /= 100.0;
+ switch(tt_flagOpa)
+ {
+ case 2:
+ css.KhtmlOpacity = opa; break;
+ case 3:
+ css.KHTMLOpacity = opa; break;
+ case 4:
+ css.MozOpacity = opa; break;
+ case 5:
+ css.opacity = opa; break;
+ }
+ }
+}
+function tt_MovDomNode(el, dadFrom, dadTo)
+{
+ if(dadFrom)
+ dadFrom.removeChild(el);
+ if(dadTo)
+ dadTo.appendChild(el);
+}
+function tt_Err(sErr)
+{
+ if(tt_Debug)
+ alert("Tooltip Script Error Message:\n\n" + sErr);
+}
+
+//=========== DEALING WITH EXTENSIONS ==============//
+function tt_ExtCmdEnum()
+{
+ var s;
+
+ // Add new command(s) to the commands enum
+ for(var i in config)
+ {
+ s = "window." + i.toString().toUpperCase();
+ if(eval("typeof(" + s + ") == tt_u"))
+ {
+ eval(s + " = " + tt_aV.length);
+ tt_aV[tt_aV.length] = null;
+ }
+ }
+}
+function tt_ExtCallFncs(arg, sFnc)
+{
+ var b = false;
+ for(var i = tt_aExt.length; i;)
+ {--i;
+ var fnc = tt_aExt[i]["On" + sFnc];
+ // Call the method the extension has defined for this event
+ if(fnc && fnc(arg))
+ b = true;
+ }
+ return b;
+}
+
+tt_Init();

Modified: trunk/perfsonar_base/pom.xml
===================================================================
--- trunk/perfsonar_base/pom.xml 2012-11-30 11:48:50 UTC (rev 6046)
+++ trunk/perfsonar_base/pom.xml 2012-12-03 13:50:47 UTC (rev 6047)
@@ -71,12 +71,12 @@
<name>shibboleth repository</name>

<url>https://build.shibboleth.net/nexus/content/repositories/releases/</url>
</repository>
- <repository>
- <id>shibboleth-3rd-party</id>
- <name>shibboleth 3rd party</name>
-
<url>https://build.shibboleth.net/nexus/content/repositories/thirdparty/</url>
- </repository>
<repository>
+ <id>shibboleth-3rd-party</id>
+ <name>shibboleth 3rd party</name>
+
<url>https://build.shibboleth.net/nexus/content/repositories/thirdparty/</url>
+ </repository>
+ <repository>
<id>geant-repository</id>
<name>perfSONAR repository</name>
<url>https://artifactory.geant.net/artifactory/repo/</url>
@@ -88,25 +88,25 @@
</repository>
</repositories>

-
+
<dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.opensaml</groupId>
- <artifactId>xmltooling</artifactId>
- <version>1.1.0</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl104-over-slf4j</artifactId>
- <version>1.5.2</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>1.5.2</version>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>org.opensaml</groupId>
+ <artifactId>xmltooling</artifactId>
+ <version>1.1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl104-over-slf4j</artifactId>
+ <version>1.5.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.5.2</version>
+ </dependency>
+ </dependencies>
</dependencyManagement>

<dependencies>
@@ -122,6 +122,34 @@
</dependency>

<dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-jaxws</artifactId>
+ <version>1.4.1</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>stax-api</artifactId>
+ <groupId>javax.xml.stream</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>xalan</artifactId>
+ <groupId>xalan</groupId>
+ </exclusion>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.axis</groupId>
<artifactId>axis</artifactId>
<version>1.4</version>
@@ -146,6 +174,7 @@
<artifactId>axis-wsdl4j</artifactId>
<version>1.5.1</version>
</dependency>
+
<dependency>
<groupId>org.apache.xerces</groupId>
<artifactId>xercesImpl</artifactId>
@@ -182,27 +211,27 @@
<groupId>commons-discovery</groupId>
<artifactId>commons-discovery</artifactId>
<version>0.2</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
<version>1.1</version>
- <exclusions>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- </exclusions>
+ <exclusions>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
@@ -213,27 +242,27 @@
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.7.0</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
<version>1.7</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- </exclusions>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>

<dependency>
@@ -259,10 +288,10 @@
<version>1.2.17</version>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.5.2</version>
- </dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.5.2</version>
+ </dependency>

<dependency>
<groupId>xmldb</groupId>
@@ -274,17 +303,17 @@
<artifactId>exist</artifactId>
<version>1.2.6</version>
</dependency>
- <dependency>
- <artifactId>xmlrpc-client</artifactId>
- <groupId>org.apache.xmlrpc</groupId>
- <version>3.0</version>
- <exclusions>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+ <dependency>
+ <artifactId>xmlrpc-client</artifactId>
+ <groupId>org.apache.xmlrpc</groupId>
+ <version>3.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>

<dependency>
<groupId>antlr</groupId>
@@ -311,23 +340,23 @@
<groupId>org.opensaml</groupId>
<artifactId>opensaml</artifactId>
<version>2.1.0</version>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- </exclusion>
- </exclusions>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>log4j-over-slf4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.opensaml</groupId>
<artifactId>xmltooling</artifactId>
<version>1.1.0</version>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- </exclusion>
- </exclusions>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>log4j-over-slf4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.opensaml</groupId>
@@ -367,20 +396,20 @@
<artifactId>edugain</artifactId>
<version>1.0-RC4</version>
<optional>false</optional>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>opensaml</groupId>
- <artifactId>opensaml</artifactId>
- </exclusion>
- </exclusions>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>opensaml</groupId>
+ <artifactId>opensaml</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
<reporting>

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/base/util/XMLUtils.java
===================================================================
--- trunk/perfsonar_base/src/main/java/org/perfsonar/base/util/XMLUtils.java
2012-11-30 11:48:50 UTC (rev 6046)
+++ trunk/perfsonar_base/src/main/java/org/perfsonar/base/util/XMLUtils.java
2012-12-03 13:50:47 UTC (rev 6047)
@@ -159,8 +159,8 @@
return builtDoc;
}
} catch (Exception e) {
- throw new PerfSONARException(
- "error.common.parse_error", "Cannot convert Message to DOM");
+ throw new PerfSONARException(
+ "error.common.parse_error", "Cannot convert Message to
DOM");
}
}


Added:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/web/RequestHandlerAxis2.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/web/RequestHandlerAxis2.java
(rev 0)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/web/RequestHandlerAxis2.java
2012-12-03 13:50:47 UTC (rev 6047)
@@ -0,0 +1,265 @@
+package org.perfsonar.service.base.web;
+
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.impl.builder.StAXOMBuilder;
+import org.ggf.ns.nmwg.base.v2_0.Handler;
+import org.ggf.ns.nmwg.base.v2_0.Message;
+import org.perfsonar.base.auxiliary.AuxiliaryComponentManager;
+import org.perfsonar.base.auxiliary.ComponentNames;
+import org.perfsonar.base.auxiliary.components.authn.AuthNComponent;
+import
org.perfsonar.base.auxiliary.components.configuration.ConfigurationComponent;
+import org.perfsonar.base.auxiliary.components.logger.LoggerComponent;
+import org.perfsonar.base.exceptions.PerfSONARException;
+import org.perfsonar.base.util.XMLUtils;
+import org.perfsonar.service.base.messages.MessageHandler;
+import org.perfsonar.service.base.messages.MessageHandlerFactory;
+import org.perfsonar.service.base.util.ResultCodesUtil;
+import org.apache.axis2.context.ServiceContext;
+
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.StringReader;
+
+
+/**
+ * Class which handles web service requests.
+ *
+ * @author Loukik
+ * @author Maciej Glowiak
+ * @author Michael Bischoff
+ */
+public class RequestHandlerAxis2
+{
+ private static final String INIT_SERVICE_MESSAGE_TYPE = "InitService";
+ private static final String SAX_PARSER_CONFIG =
"service.sax_parser.config";
+
+ private AuxiliaryComponentManager componentManager;
+ private ConfigurationComponent configuration;
+ private LoggerComponent logger;
+ private AuthNComponent authnComponent;
+ private ServiceContext serviceContext;
+ private SAXParserFactory saxParserFactory;
+
+ /**
+ * Called by Axis2 during initialization.
+ */
+ public synchronized void init(ServiceContext sc) throws
PerfSONARException
+ {
+ serviceContext = sc;
+
+ componentManager = AuxiliaryComponentManager.getInstance();
+
+ configuration = (ConfigurationComponent)
componentManager.getComponent(ComponentNames.CONFIG);
+ if (configuration == null) {
+ throw new PerfSONARException(
+ "error.common.no_configuration",
+ "Cannot read configuration file"
+ );
+ }
+
+ logger = (LoggerComponent)
componentManager.getComponent(ComponentNames.LOGGER);
+ if (logger == null) {
+ throw new PerfSONARException(
+ "error.common.no_logger",
+ "Cannot find logger component"
+ );
+ }
+
+ String config = configuration.getProperty(SAX_PARSER_CONFIG);
+ File file = AuxiliaryComponentManager.lookupFile(config);
+ if (file == null) {
+ logger.error("Sax parser config could not be found. (lookup
failed for: " + config + " )");
+ throw new PerfSONARException(
+ "error.common.no_configuration",
+ "specified service.sax_parser.config not found"
+ );
+ }
+ logger.debug("Using file: " + file.getAbsolutePath() + " as
SAX_PARSER_CONFIG");
+
+ Handler.setConfigFile(file.getAbsolutePath());
+
+ saxParserFactory = SAXParserFactory.newInstance();
+ //saxParserFactory.setValidating(true);
+ saxParserFactory.setNamespaceAware(true);
+ }
+
+ /**
+ * Called by Axis 2.
+ */
+ public OMElement message(OMElement request)
+ {
+ try {
+ logger.info("RequestHandler: Service received a request");
+
+ long startTime = System.currentTimeMillis();
+ Message requestMessage = convertToMessage(request);
+ try {
+ logger.debug("RequestHandler: Message object constructed
from request. Request is of type: "
+ + requestMessage.getType());
+ OMElement response =
convertFromMessage(message(requestMessage));
+ logger.debug("RequestHandler: Service sent a successful
response");
+ return response;
+ } finally {
+ logExecutionTime(startTime, requestMessage.getId(),
requestMessage.getType());
+ }
+ } catch (PerfSONARException pex) {
+ try {
+ Message responseMessage =
ResultCodesUtil.createResultCodeMetadata(null, pex);
+ responseMessage.setType("ErrorResponse");
+ logger.warn("RequestHandler: Service sent a response with
error information");
+
+ return convertFromMessage(responseMessage);
+ } catch (PerfSONARException e) {
+ throw new RuntimeException("Failed to send error: " +
e.toString(), e);
+ }
+ }
+ }
+
+ private Message message(Message request) throws PerfSONARException
+ {
+ if (INIT_SERVICE_MESSAGE_TYPE.equalsIgnoreCase(request.getType())) {
+ throw new PerfSONARException(
+ "service.common.success",
+ "Service initialized correctly"
+ );
+ }
+
+ assertAuthentication(request);
+ MessageHandler handler =
MessageHandlerFactory.getMessageHandler(request.getType());
+
+ logger.debug("RequestHandler: Calling on MessageHandler [" +
request.getClass()
+ + "] to satisfy request");
+
+ return handler.execute(request);
+ }
+
+ private OMElement convertFromMessage(Message responseMessage) throws
PerfSONARException
+ {
+ try {
+ String xml = XMLUtils.serializeXML(responseMessage);
+ StringReader stringReader = new StringReader(xml);
+ XMLInputFactory xif = XMLInputFactory.newInstance();
+ XMLStreamReader reader = xif.createXMLStreamReader(stringReader);
+ StAXOMBuilder builder = new StAXOMBuilder(reader);
+ return builder.getDocumentElement();
+ } catch (XMLStreamException e) {
+ throw new PerfSONARException(
+ "error.common.parse_error", "Cannot serialize response: " +
e.toString(), e);
+ }
+ }
+
+ protected void assertAuthentication(Message requestMessage) throws
PerfSONARException
+ {
+ // Check if it's needed authorization for this type of message
+ String checkAuthRParam;
+ try {
+ checkAuthRParam =
configuration.getProperty(AuthNComponent.CHECK_AUTHR_PARAM);
+ } catch (PerfSONARException e) {
+ checkAuthRParam = null;
+ }
+ if (checkAuthRParam != null &&
checkAuthRParam.equals(AuthNComponent.YES_CHECK_AUTHN)) {
+ logger.debug("RequestHandler: Authorizing the message");
+ if (authnComponent == null) {
+ authnComponent = (AuthNComponent)
componentManager.getComponent(ComponentNames.AUTHN);
+ }
+ authnComponent.requestAuthR(requestMessage.getType(), null);
+ } else {
+ // Check if it's needed authentication for this type of message
+ String checkAuthNParam;
+ try {
+ checkAuthNParam =
configuration.getProperty(AuthNComponent.CHECK_AUTHN_PARAM);
+ } catch (PerfSONARException e) {
+ checkAuthNParam = null;
+ }
+ if (checkAuthNParam != null &&
checkAuthNParam.equals(AuthNComponent.YES_CHECK_AUTHN)) {
+ logger.debug("RequestHandler: Authenticating the message");
+ if (authnComponent == null) {
+ authnComponent = (AuthNComponent)
componentManager.getComponent(ComponentNames.AUTHN);
+ }
+ authnComponent.requestAuthN(requestMessage.getType());
+ } else {
+ logger.debug("RequestHandler: Automated authentication not
required");
+ }
+ }
+ }
+
+ /**
+ * Converts a Document to a Message.
+ *
+ * @param request
+ * @return a converted requestMessage or null on failure
+ * @throws org.perfsonar.base.exceptions.PerfSONARException
+ */
+ private Message convertToMessage(OMElement request) throws
PerfSONARException
+ {
+ try {
+ ByteArrayOutputStream boStream = new ByteArrayOutputStream();
+ request.serializeAndConsume(boStream);
+
+ org.ggf.ns.nmwg.base.v2_0.MessageHandler handler =
+ new org.ggf.ns.nmwg.base.v2_0.MessageHandler();
+
+ SAXParser saxParser = saxParserFactory.newSAXParser();
+ org.xml.sax.XMLReader parser = saxParser.getXMLReader();
+ parser.setFeature(XMLUtils.NAMESPACES_FEATURE_ID,
XMLUtils.DEFAULT_NAMESPACES);
+ parser.setFeature(XMLUtils.NAMESPACE_PREFIXES_FEATURE_ID,
XMLUtils.DEFAULT_NAMESPACE_PREFIXES);
+ parser.setContentHandler(handler);
+ parser.parse(new InputSource(
+ new ByteArrayInputStream(boStream.toByteArray())));
+ Message message = handler.getMessage();
+ if (message == null) {
+ logger.error("RequestHandler: Message object constructed as
null from request");
+ throw new PerfSONARException(
+ "error.common.parse_error",
+ "RequestHandler: Server could not construct a message
object from "
+ + "the request due to unknown error. Please check
request and try again"
+ );
+ }
+ return message;
+ } catch (SAXException e) {
+ throw new PerfSONARException("error.common.parse_error",
+ "Request could not be parsed
because "
+ + "of SAX exception. Error
message: "
+ + e.getMessage(), e);
+ } catch (IOException e) {
+ throw new PerfSONARException("error.common.parse_error",
+ "IO exception: "
+ + "encountered while reading
schema file "
+ + e.getMessage(), e);
+ } catch (ParserConfigurationException e) {
+ throw new PerfSONARException("error.common.parse_error", "Parser
Configuration "
+ + "Exception " + e.getMessage(), e);
+ } catch (Exception e) {
+ throw new PerfSONARException(
+ "error.common.parse_error",
+ "Parse/validation error, Cannot convert request to Message.",
+ e
+ );
+ }
+ }
+
+ /**
+ * Print out time of execution (to log).
+ *
+ * @param startTime
+ * @param messageType
+ * @param messageId
+ */
+ private void logExecutionTime(long startTime, String messageId, String
messageType)
+ {
+ long time = System.currentTimeMillis() - startTime;
+ logger.info(String.format("Execution Time of message type=[%s]
id=[%s] is [%3$tM]min [%3$tS]secs "
+ + "[%3$tL]milisec", messageType,
messageId, Long.valueOf(time)));
+ }
+}

---

• [pS-dev] [GEANT/SA2/ps-java-services] r6047 - in trunk: perfsonar-java-sql-ma perfsonar-java-sql-ma/co nf perfsonar-java-sql-ma/conf/axis-1.4 perfsonar-java-sq l-ma/conf/axis-1.4/WEB-INF perfsonar-java-sql-ma/conf/ax is-1.4/WEB-INF/classes perfsonar-java-sql-ma/conf/axis-1 .4/graphics perfsonar-java-sql-ma/conf/wsdd perfsonar-ja va-sql-ma/samples/requests perfsonar-java-sql-ma/samples/r esponses perfsonar-java-sql-ma/src/main perfsonar-java-sql -ma/src/main/resources perfsonar-java-sql-ma/src/main/reso urces/perfsonar perfsonar-java-sql-ma/src/main/resources/p erfsonar/conf perfsonar-java-sql-ma/src/main/webapp perfso nar-java-sql-ma/src/main/webapp/WEB-INF perfsonar-java-sql -ma/src/main/webapp/WEB-INF/samples perfsonar-java-sql-ma/ src/main/webapp/WEB-INF/samples/requests perfsonar-java-sq l-ma/src/main/webapp/WEB-INF/samples/responses perfsonar-j ava-sql-ma/src/main/webapp/WEB-INF/services perfsonar-java -sql-ma/src/main/webapp/WEB-INF/services/MeasurementArchiv eService perfsonar-java-sq l-ma/src/main/webapp/WEB-INF/se rvices/MeasurementArchiveService/META-INF perfsonar-java-s ql-ma/src/main/webapp/graphics perfsonar-java-sql-ma/src/m ain/webapp/wsdd perfsonar_base perfsonar_base/src/main /java/org/perfsonar/base/util perfsonar_base/src/main/ja va/org/perfsonar/service/base/web, svn-noreply, 12/03/2012

---

Archive powered by MHonArc 2.6.16.