perfsonar-dev - [pS-dev] [GEANT/SA2/ps-java-services] r5918 - in trunk/perfsonar-java-xml-ls: . doc/schema doc/schem a/rnc packaging packaging/debian samples/requests samples/ responses samples/store/sample src/main/java/org/perfsonar /service/lookupservice src/main/java/org/perfsonar/service /lookupservice/registration/summarization src/main/java/or g/perfsonar/service/lookupservice/servlets src/main/java/o rg/perfsonar/service/lookupservice/summarization src/main/ resources/org/perfsonar/resources src/main/resources/perfs onar/conf src/main/webapp src/main/webapp/WEB-INF/conf src /main/webapp/WEB-INF/services/LookupService/META-INF src/m ain/webapp/db src/test/java/org/perfsonar/tests/components src/test/java/org/perfsonar/tests/utilities src/test/soap UI/src/org/perfsonar/soapUI/ls

Subject: perfsonar development work

List archive

[pS-dev] [GEANT/SA2/ps-java-services] r5918 - in trunk/perfsonar-java-xml-ls: . doc/schema doc/schem a/rnc packaging packaging/debian samples/requests samples/ responses samples/store/sample src/main/java/org/perfsonar /service/lookupservice src/main/java/org/perfsonar/service /lookupservice/registration/summarization src/main/java/or g/perfsonar/service/lookupservice/servlets src/main/java/o rg/perfsonar/service/lookupservice/summarization src/main/ resources/org/perfsonar/resources src/main/resources/perfs onar/conf src/main/webapp src/main/webapp/WEB-INF/conf src /main/webapp/WEB-INF/services/LookupService/META-INF src/m ain/webapp/db src/test/java/org/perfsonar/tests/components src/test/java/org/perfsonar/tests/utilities src/test/soap UI/src/org/perfsonar/soapUI/ls

From:
To:
Subject: [pS-dev] [GEANT/SA2/ps-java-services] r5918 - in trunk/perfsonar-java-xml-ls: . doc/schema doc/schem a/rnc packaging packaging/debian samples/requests samples/ responses samples/store/sample src/main/java/org/perfsonar /service/lookupservice src/main/java/org/perfsonar/service /lookupservice/registration/summarization src/main/java/or g/perfsonar/service/lookupservice/servlets src/main/java/o rg/perfsonar/service/lookupservice/summarization src/main/ resources/org/perfsonar/resources src/main/resources/perfs onar/conf src/main/webapp src/main/webapp/WEB-INF/conf src /main/webapp/WEB-INF/services/LookupService/META-INF src/m ain/webapp/db src/test/java/org/perfsonar/tests/components src/test/java/org/perfsonar/tests/utilities src/test/soap UI/src/org/perfsonar/soapUI/ls
Date: Fri, 6 Apr 2012 21:15:12 +0100 (BST)

Author: dante.delvaux
Date: 2012-04-06 21:15:12 +0100 (Fri, 06 Apr 2012)
New Revision: 5918

Added:
trunk/perfsonar-java-xml-ls/doc/schema/rnc/filter.rnc
trunk/perfsonar-java-xml-ls/doc/schema/rnc/nmbase.rnc
trunk/perfsonar-java-xml-ls/doc/schema/rnc/nmtime.rnc
trunk/perfsonar-java-xml-ls/doc/schema/rnc2xsd.sh
trunk/perfsonar-java-xml-ls/packaging/debian/perfsonar-java-xml-ls.links
trunk/perfsonar-java-xml-ls/src/main/webapp/db/
trunk/perfsonar-java-xml-ls/src/main/webapp/db/README
Removed:
trunk/perfsonar-java-xml-ls/db/
trunk/perfsonar-java-xml-ls/src/main/webapp/db/LSStore.xml
trunk/perfsonar-java-xml-ls/src/main/webapp/db/eXist/
Modified:
trunk/perfsonar-java-xml-ls/
trunk/perfsonar-java-xml-ls/packaging/debian/changelog
trunk/perfsonar-java-xml-ls/packaging/debian/copyright
trunk/perfsonar-java-xml-ls/packaging/debian/perfsonar-java-xml-ls.dirs
trunk/perfsonar-java-xml-ls/packaging/debian/perfsonar-java-xml-ls.postinst
trunk/perfsonar-java-xml-ls/packaging/debian/perfsonar-java-xml-ls.postrm
trunk/perfsonar-java-xml-ls/packaging/debian/perfsonar-java-xml-ls.preinst
trunk/perfsonar-java-xml-ls/packaging/debian/perfsonar-java-xml-ls.prerm
trunk/perfsonar-java-xml-ls/packaging/debian/rules
trunk/perfsonar-java-xml-ls/packaging/package.sh
trunk/perfsonar-java-xml-ls/pom.xml
trunk/perfsonar-java-xml-ls/samples/requests/EchoRequest.xml
trunk/perfsonar-java-xml-ls/samples/requests/LSControlRequest-join.xml
trunk/perfsonar-java-xml-ls/samples/requests/LSDeregisterRequest.xml
trunk/perfsonar-java-xml-ls/samples/requests/LSKeepaliveRequest.xml
trunk/perfsonar-java-xml-ls/samples/requests/LSQueryRequest-Discovery.xml
trunk/perfsonar-java-xml-ls/samples/requests/LSQueryRequest.xml
trunk/perfsonar-java-xml-ls/samples/requests/LSRegisterRequest-Update.xml
trunk/perfsonar-java-xml-ls/samples/requests/LSRegisterRequest.xml
trunk/perfsonar-java-xml-ls/samples/responses/LSQueryResponse-Discovery.xml
trunk/perfsonar-java-xml-ls/samples/store/sample/LSStore-control.xml
trunk/perfsonar-java-xml-ls/samples/store/sample/LSStore-summary.xml

trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/ThreadPoolComponent.java

trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/registration/summarization/SummarizeIpAddrs.java

trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/servlets/ExistDbInitializerServlet.java

trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/summarization/SummarizationBuilder.java

trunk/perfsonar-java-xml-ls/src/main/resources/org/perfsonar/resources/resources.properties

trunk/perfsonar-java-xml-ls/src/main/resources/perfsonar/conf/configuration-rules.xml

trunk/perfsonar-java-xml-ls/src/main/resources/perfsonar/conf/webAdminConfig.xml
trunk/perfsonar-java-xml-ls/src/main/webapp/WEB-INF/conf/axis2.xml

trunk/perfsonar-java-xml-ls/src/main/webapp/WEB-INF/services/LookupService/META-INF/services.xml
trunk/perfsonar-java-xml-ls/src/main/webapp/db/LSStore-control.xml
trunk/perfsonar-java-xml-ls/src/main/webapp/db/LSStore-summary.xml

trunk/perfsonar-java-xml-ls/src/test/java/org/perfsonar/tests/components/XMLDBComponentTest.java

trunk/perfsonar-java-xml-ls/src/test/java/org/perfsonar/tests/utilities/ExistDBInitializerTests.java

trunk/perfsonar-java-xml-ls/src/test/soapUI/src/org/perfsonar/soapUI/ls/TestUtil.java
Log:
Improving the overall build and packaging processes.

Property changes on: trunk/perfsonar-java-xml-ls
___________________________________________________________________
Modified: svn:ignore
- jars

bin

target

.classpath

.project

.settings

.gitignore

.externalToolBuilders

logs

+ target

.classpath

.project

.settings

.gitignore

.externalToolBuilders

logs

Added: trunk/perfsonar-java-xml-ls/doc/schema/rnc/filter.rnc
===================================================================
--- trunk/perfsonar-java-xml-ls/doc/schema/rnc/filter.rnc
(rev 0)
+++ trunk/perfsonar-java-xml-ls/doc/schema/rnc/filter.rnc 2012-04-06
20:15:12 UTC (rev 5918)
@@ -0,0 +1,162 @@
+# ##############################################################
+#
+# File: filter.rnc - Extensions to support different
+# namespaced parameters.
+# Version: $Id$
+# Purpose: This extension to the basic parameters could be
+# used to help make any implementation code decide
+# on unmarshalling how to handle special cases.
+# Our particular purpose with these constructs is
+# to apply database or statistical operations to
+# datasets.
+# Reference: http://books.xmlschemata.org/relaxng/page2.html
+#
+# ##############################################################
+
+
+# ##############################################################
+# Namespace definitions
+# ##############################################################
+namespace select = "http://ggf.org/ns/nmwg/ops/select/2.0/";
+namespace average = "http://ggf.org/ns/nmwg/ops/average/2.0/";
+namespace mean = "http://ggf.org/ns/nmwg/ops/mean/2.0/";
+namespace median = "http://ggf.org/ns/nmwg/ops/median/2.0/";
+namespace max = "http://ggf.org/ns/nmwg/ops/max/2.0/";
+namespace min = "http://ggf.org/ns/nmwg/ops/min/2.0/";
+namespace cdf = "http://ggf.org/ns/nmwg/ops/cdf/2.0/";
+namespace histogram = "http://ggf.org/ns/nmwg/ops/histogram/2.0/";
+
+
+# ##############################################################
+# TBD
+#
+# Example (using select):
+#
+#
+# ##############################################################
+
+FilterMetadataBlock =
+ (
+ SelectSubject? &
+ (
+ SelectParameters |
+ Parameters
+ )?
+ ) |
+ (
+ AverageSubject? &
+ (
+ AverageParameters |
+ Parameters
+ )?
+ ) |
+ (
+ MeanSubject? &
+ (
+ MeanParameters |
+ Parameters
+ )?
+ ) |
+ (
+ MedianSubject? &
+ (
+ MedianParameters |
+ Parameters
+ )?
+ ) |
+ (
+ MaxSubject? &
+ (
+ MaxParameters |
+ Parameters
+ )?
+ ) |
+ (
+ MinSubject? &
+ (
+ MinParameters |
+ Parameters
+ )?
+ ) |
+ (
+ CDFSubject? &
+ (
+ CDFParameters |
+ Parameters
+ )?
+ ) |
+ (
+ HistogramSubject? &
+ (
+ HistogramParameters |
+ Parameters
+ )?
+ )
+
+FilterParameters =
+ (
+ SelectParameters |
+ AverageParameters |
+ MeanParameters |
+ MedianParameters |
+ MaxParameters |
+ MinParameters |
+ CDFParameters |
+ HistogramParameters
+ )
+
+
+SelectSubject =
+ element select:subject { SubjectContent }
+
+SelectParameters =
+ element select:parameters { ParametersContent }
+
+
+AverageSubject =
+ element average:subject { SubjectContent }
+
+AverageParameters =
+ element average:parameters { ParametersContent }
+
+
+MeanSubject =
+ element mean:subject { SubjectContent }
+
+MeanParameters =
+ element mean:parameters { ParametersContent }
+
+
+MedianSubject =
+ element median:subject { SubjectContent }
+
+MedianParameters =
+ element median:parameters { ParametersContent }
+
+
+MaxSubject =
+ element max:subject { SubjectContent }
+
+MaxParameters =
+ element max:parameters { ParametersContent }
+
+
+MinSubject =
+ element min:subject { SubjectContent }
+
+MinParameters =
+ element min:parameters { ParametersContent }
+
+
+CDFSubject =
+ element cdf:subject { SubjectContent }
+
+CDFParameters =
+ element cdf:parameters { ParametersContent }
+
+
+HistogramSubject =
+ element histogram:subject { SubjectContent }
+
+HistogramParameters =
+ element histogram:parameters { ParametersContent }

Added: trunk/perfsonar-java-xml-ls/doc/schema/rnc/nmbase.rnc
===================================================================
--- trunk/perfsonar-java-xml-ls/doc/schema/rnc/nmbase.rnc
(rev 0)
+++ trunk/perfsonar-java-xml-ls/doc/schema/rnc/nmbase.rnc 2012-04-06
20:15:12 UTC (rev 5918)
@@ -0,0 +1,441 @@
+# ##############################################################
+#
+# File: nmbase.rnc - Main schema definition
+# Version: $Id$
+# Purpose: This is the main schema file, it defines the
+# general structure of an NMWG message or store
+#
+# ##############################################################
+
+
+# ##############################################################
+# Namespace definitions
+# ##############################################################
+namespace nmwg = "http://ggf.org/ns/nmwg/base/2.0/";
+
+
+# ##############################################################
+# Include additional functionality from other files
+# ##############################################################
+include "nmtime.rnc"
+include "filter.rnc"
+
+# ##############################################################
+# Every NMWG document should begin with either a 'store' or
+# 'message' element
+# Patterns are defined for the content of each element.
+#
+# Example (using message):
+#
+# <nmwg:message id="OPTIONAL_ID"
+# messageIdRef="OPTIONAL_REFERENCE_ID"
+# type="REQUIRED_TYPE"
+# xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
+#
+# <!- OPTIONAL PARAMETERS ->
+#
+# <!- OPTIONAL (MULTIPLE) METADATA ->
+#
+# <!- OPTIONAL (MULTIPLE) DATA ->
+#
+# </nmwg:message>
+#
+# ##############################################################
+
+start =
+ (
+ element nmwg:message {
+ MessageContent
+ } |
+ element nmwg:store {
+ StoreContent
+ }
+ )
+
+MessageContent =
+ Identifier? &
+ MessageIdentifierRef? &
+ Type &
+ Parameters? &
+ (
+ Metadata |
+ Data
+ )+
+
+
+StoreContent =
+ Identifier? &
+ MessageIdentifierRef? &
+ Type &
+ Parameters? &
+ (
+ Metadata |
+ Data
+ )+
+
+
+# ##############################################################
+# Metadata is the information that describes data. This
+# information doesn't change over time
+#
+#
+# Example:
+#
+# <nmwg:metadata id="REQUIRED_ID"
+# metadataIdRef="OPTIONAL_REFERENCE_ID"
+# xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
+#
+# <!- TBD OPTIONAL SUBJECT ->
+#
+# <!- TBD OPTIONAL PARAMETERS ->
+#
+# <!- TBD OPTIONAL EVENTTYPE ->
+#
+# <!- TBD OPTIONAL KEY ->
+#
+# <!- ANY OPTIONAL (MULTIPLE) ELEMENT IN ANY NAMESPACE ->
+#
+# </nmwg:metadata>
+#
+# ##############################################################
+
+Metadata =
+ element nmwg:metadata {
+ (
+ Identifier &
+ MetadataIdentifierRef? &
+ MetadataContent
+ ),
+ anyElement*
+ }
+
+MetadataBlock =
+ Subject? &
+ Parameters?
+
+MetadataContent =
+ (
+ MetadataBlock |
+ FilterMetadataBlock
+ ) &
+ EventType? &
+ Key?
+
+
+# ##############################################################
+# Subject identifies an endPoint (or points), perhaps the name of
+# a service or some other form of physical location. For the
+# purpose of the general case, we make no assumptions on potential
+# elements and allow all elements, in any namespace. Verification
+# can be handled in subsequent schema files.
+#
+# Example:
+#
+# <nmwg:subject id="REQUIRED_ID"
+# metadataIdRef="OPTIONAL_REFERENCE_ID"
+# xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
+#
+# <!- ANY ELEMENT IN ANY NAMESPACE ->
+#
+# </nmwg:subject>
+#
+# ##############################################################
+
+Subject =
+ element nmwg:subject {
+ SubjectContent
+ }
+
+SubjectContent =
+ (
+ Identifier &
+ MetadataIdentifierRef?
+ ),
+ anyElement*
+
+
+# ##############################################################
+# Parameters and Parameter elements can be used in a number of
+# ways in: 1) the message to signify items such as time stamp
+# or authorization or 2) metadata or data to specify filters or
+# special cases for the information. A 'parameters' block
+# has an id and encloses one to many 'parameter' elements.
+# These elements have a required 'name', and may contain
+# an attribute, element, or text value (only one please;
+# software using this should consider complex elements, then
+# text, and finally the value attribute; exceptions should
+# be thrown on duplicates).
+#
+# Example:
+#
+# <nmwg:parameters id="REQUIRED_ID"
+# xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
+#
+# <nmwg:parameter name="REQUIRED_NAME" value="OPTIONAL_VALUE"
+# xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
+#
+# <!- ANY TEXT, OR ANY ELEMENT ANY NAMESPACE (IF YOU DID NOT
+# USE THE VALUE ATTRIBUTE) ->
+#
+# </nmwg:parameter>
+#
+# <!- MORE PARAMETERS ->
+#
+# </nmwg:parameters>
+#
+# The namespaces can of course be different.
+#
+# ##############################################################
+
+Parameters =
+ element nmwg:parameters {
+ ParametersContent
+ }
+
+ParametersContent =
+ Identifier &
+ Parameter+
+
+Parameter =
+ element nmwg:parameter {
+ attribute name { xsd:string } &
+ (
+ attribute value { xsd:string } |
+ (
+ anyElement |
+ text
+ )
+ )
+ }
+
+
+# ##############################################################
+# Event type is a simple text element used to describe the
+# characteristic or event of the data.
+#
+# Example:
+#
+# <nmwg:eventType xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
+#
+# <!- TEXT ->
+#
+# </nmwg:eventType>
+#
+# ##############################################################
+
+EventType =
+ element nmwg:eventType { xsd:string }
+
+
+# ##############################################################
+# The key is used to return a 'pointer' or otherwise special piece
+# of identifying information in response to a request. For now,
+# this information is enclosed only within a parameters block.
+# The optional ID can be used to track past searches.
+#
+# Example:
+#
+# <nmwg:key id="OPTIONAL_ID"
+# xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
+#
+# <!- OPTIONAL PARAMETERS ->
+#
+# </nmwg:key>
+#
+# ##############################################################
+
+Key =
+ element nmwg:key {
+ Identifier? &
+ (
+ Parameters |
+ FilterParameters
+ )
+ }
+
+
+# ##############################################################
+# The data block is complex and has the potential to contain
+# many things. The data block can be used to return a metadata
+# block from a request, commonTime or datum elements, keys,
+# or something that we have perhaps not defined as of yet.
+#
+# Example:
+#
+# <nmwg:data id="REQUIRED_ID"
+# metadataIdRef="OPTIONAL_REFERENCE_ID"
+# xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
+#
+# <!- OPTIONAL (MULTIPLE) METADATA ->
+#
+# <!- OR ->
+#
+# <!- TBD OPTIONAL (MULTIPLE) COMMON TIME ELEMENTS AND
+# OPTIONAL (MULTIPLE) DATUM ELEMENTS ->
+#
+# <!- OR ->
+#
+# <!- TBD OPTIONAL (MULTIPLE) DATUM ELEMENTS ->
+#
+# <!- OR ->
+#
+# <!- OPTIONAL (MULTIPLE) KEY ELEMENTS ->
+#
+# <!- OR ->
+#
+# <!- ANY OPTIONAL (MULTIPLE) ELEMENT IN ANY NAMESPACE ->
+#
+# </nmwg:data>
+#
+# ##############################################################
+
+Data =
+ element nmwg:data {
+ (
+ Identifier &
+ MetadataIdentifierRef? &
+ (
+ Metadata* |
+ (
+ commonTime+ &
+ Datum*
+ ) |
+ Datum* |
+ Key*
+ )
+ ),
+ anyElement*
+ }
+
+# ##############################################################
+# CommonTime is used as a shortcut that is able to 'factor out'
+# a frequently occurring time range that a group of datum (or
+# other) elements might share, thus reducing the verbosity of the
+# XML representation. CommonTime is similar to the other NMWG time
+# stamps (from nmtime.rnc) in its potential time representations.
+#
+# It is unfortunate that it needs to be in this file and not
+# nmtime.rnc, but as it occurs outside the datum, it is here.
+#
+# Example:
+#
+# <nmwg:commonTime type="REQUIRED_TYPE" value="OPTIONAL_VALUE"
+# duration="OPTIONAL_DURATION"
+# inclusive="OPTIONAL_INCLUSIVE_FLAG"
+# xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
+#
+# <!- TBD OPTIONAL START TIME ELEMENT (USE END TIME OR
+# DURATION) ->
+#
+# <!- TBD OPTIONAL END TIME ELEMENT (ONLY WITH START TIME) ->
+#
+# <!- TBD OPTIONAL TIME VALUE ELEMENT (USE IF NO VALUE
+# ATTRIBUTE) ->
+#
+# <!- TBD OPTIONAL (MULTIPLE) DATUM ELEMENTS ->
+#
+# <!- ANY OPTIONAL (MULTIPLE) ELEMENT IN ANY NAMESPACE ->
+# </nmwg:commonTime>
+#
+# ##############################################################
+
+commonTime =
+ element nmwg:commonTime {
+ (
+ Type &
+ (
+ TimeStamp |
+ (
+ StartTime &
+ (
+ EndTime |
+ Duration
+ )
+ )
+ ) &
+ Datum*
+ ),
+ anyElement*
+ }
+
+
+# ##############################################################
+# The datum is meant to be generic in this case because specific
+# namespace declarations should be used to better define what
+# format that datum should have.
+#
+# Example:
+#
+# <nmwg:datum ANY_ATTRIBUTE
+# xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
+#
+# <!- ANY ELEMENT IN ANY NAMESPACE OR ANY TEXT ->
+#
+# </nmwg:datum>
+#
+# ##############################################################
+
+Datum =
+ element nmwg:datum {
+ anyThing
+ }
+
+
+# ##############################################################
+# Common elements are defined as named patterns as they are re-
+# used several times.
+# ##############################################################
+
+Identifier =
+ attribute id { xsd:string }
+
+MetadataIdentifierRef =
+ attribute metadataIdRef { xsd:string }
+
+MessageIdentifierRef =
+ attribute messageIdRef { xsd:string }
+
+Type =
+ attribute type { xsd:string }
+
+
+# ##############################################################
+# This sequence allows any element, attribute, or text (regardless
+# of name or namespace) into the document when invoked.
+# ##############################################################
+
+anyElement =
+ element * {
+ anyThing
+ }
+
+anyAttribute =
+ attribute * { text }
+
+anyThing =
+ (
+ anyElement |
+ anyAttribute |
+ text
+ )*
+
+
+# ##############################################################
+# This sequence allows any element, attribute, or text (only in the
+# NMWG namespace) into the document when invoked.
+# ##############################################################
+
+anyNMWGElement =
+ element nmwg:* {
+ anyNMWGThing
+ }
+
+anyNMWGAttribute =
+ attribute * { text }
+
+anyNMWGThing =
+ (
+ anyNMWGElement |
+ anyNMWGAttribute |
+ text
+ )*

Added: trunk/perfsonar-java-xml-ls/doc/schema/rnc/nmtime.rnc
===================================================================
--- trunk/perfsonar-java-xml-ls/doc/schema/rnc/nmtime.rnc
(rev 0)
+++ trunk/perfsonar-java-xml-ls/doc/schema/rnc/nmtime.rnc 2012-04-06
20:15:12 UTC (rev 5918)
@@ -0,0 +1,154 @@
+# ##############################################################
+#
+# File: nmtime.rnc - NMWG Time definitions
+# Version: $Id$
+# Purpose: This describes a set of time formats for
+# representing measurements.
+#
+# ##############################################################
+
+
+# ##############################################################
+# Namespace definitions
+# ##############################################################
+namespace nmtm = "http://ggf.org/ns/nmwg/time/20070914/";
+
+
+# ##############################################################
+# Regular time is attached to a specific datum instance; it is
+# essentially the same as before, but cannot have anything
+# 'inside' of it. The type can be simple, like UNIX, or it
+# could be something like timeRange or timeInterval. If this is
+# the case, we would then see the two extra time designators for
+# the start and end (or duration)
+#
+# Example:
+#
+# <nmtm:time type="REQUIRED_TYPE" value="OPTIONAL_VALUE"
+# duration="OPTIONAL_DURATION"
+# inclusive="OPTIONAL_INCLUSIVE_FLAG"
+# xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";>
+#
+# <!- TBD OPTIONAL START TIME ELEMENT (USE END TIME OR
+# DURATION) ->
+#
+# <!- TBD OPTIONAL END TIME ELEMENT (ONLY WITH START TIME) ->
+#
+# <!- TBD OPTIONAL TIME VALUE ELEMENT (USE IF NO VALUE
+# ATTRIBUTE) ->
+#
+# </nmtm:time>
+#
+#
+# Time types are enumerated as follows:
+#
+# * unix: integral seconds since Jan 1, 1970 (UTC)
+#
+# * iso9601/rfc3339:
+#
+# full date/time representation. Examples from RFC-339:
+#
+# Here are some examples of Internet date/time format.
+#
+# 1985-04-12T23:20:50.52Z
+#
+# This represents 20 minutes and 50.52 seconds after the 23rd hour of
+# April 12th, 1985 in UTC.
+#
+# 1996-12-19T16:39:57-08:00
+#
+# This represents 39 minutes and 57 seconds after the 16th hour of
+# December 19th, 1996 with an offset of -08:00 from UTC (Pacific
+# Standard Time). Note that this is equivalent to
1996-12-20T00:39:57Z
+# in UTC.
+#
+# 1990-12-31T23:59:60Z
+#
+# This represents the leap second inserted at the end of 1990.
+#
+# 1990-12-31T15:59:60-08:00
+#
+# This represents the same leap second in Pacific Standard Time, 8
+# hours behind UTC.
+#
+# 1937-01-01T12:00:27.87+00:20
+#
+# This represents the same instant of time as noon, January 1, 1937,
+# Netherlands time. Standard time in the Netherlands was exactly 19
+# minutes and 32.13 seconds ahead of UTC by law from 1909-05-01
through
+# 1937-06-30. This time zone cannot be represented exactly using the
+# HH:MM format, and this timestamp uses the closest representable UTC
+# offset.
+#
+# ##############################################################
+
+Time =
+ element nmtm:time {
+ attribute type { xsd:string } &
+ (
+ TimeStamp |
+ (
+ StartTime &
+ (
+ EndTime |
+ Duration
+ )
+ )
+ )
+ }
+
+# precisionUnits must be one of the recognized SI units
+# The most complete list I could currently find is at:
+# http://en.wikipedia.org/wiki/Orders_of_magnitude_%28time%29
+#
+# synchronized SHOULD be set true if the party generating the timestamp
+# has a clock that is synchronized to UTC using an external source
+# (e.g., the attribute should be set true if GPS hardware is used and it
+# indicates that it has acquired current position and time or if NTP is
+# used and it indicates that it has synchronized to an external source,
+# which includes stratum 0 source, etc.). If there is no notion of
+# external synchronization for the time source, the attribute SHOULD be set
+# to false. If the attribute is not set at all, the synchronization
+# status of the timestamp can not be determined except through external
+# knowledge.
+Precision =
+ (
+ (
+ attribute precision { xsd:unsignedInt } &
+ attribute precisionUnits { xsd:string } &
+ attribute synchronized { xsd:boolean }?
+ ) |
+ element nmtm:precision {
+ attribute precisionUnits { xsd:string } &
+ attribute synchronized { xsd:boolean }? &
+ xsd:unsignedInt
+ }
+ )
+
+
+TimeStamp =
+ (
+ (
+ attribute value { xsd:string } |
+ element nmtm:value { xsd:string }
+ ) &
+ Precision?
+ )
+
+Duration =
+ attribute duration { xsd:string }
+
+TimeContent =
+ attribute type { text } &
+ attribute inclusive { text }? &
+ TimeStamp
+
+StartTime =
+ element nmtm:start {
+ TimeContent
+ }
+
+EndTime =
+ element nmtm:end {
+ TimeContent
+ }

Added: trunk/perfsonar-java-xml-ls/doc/schema/rnc2xsd.sh
===================================================================
--- trunk/perfsonar-java-xml-ls/doc/schema/rnc2xsd.sh
(rev 0)
+++ trunk/perfsonar-java-xml-ls/doc/schema/rnc2xsd.sh 2012-04-06 20:15:12
UTC (rev 5918)
@@ -0,0 +1,10 @@
+#!/bin/bash
+# This script transforms all RNC schema files into XSD ones.
+# Trang is needed in order to perform the job, which should be
straightforward if done through maven
+# mvn exec:exec
+
+for FILE in `ls rnc/*.rnc`
+do
+ java -jar
~/.m2/repository/com/thaiopensource/trang/20091111/trang-20091111.jar ${FILE}
${FILE//rnc/xsd}
+done
+

Property changes on: trunk/perfsonar-java-xml-ls/doc/schema/rnc2xsd.sh
___________________________________________________________________
Added: svn:executable
+ *

Modified: trunk/perfsonar-java-xml-ls/packaging/debian/changelog
===================================================================
--- trunk/perfsonar-java-xml-ls/packaging/debian/changelog 2012-04-06
16:43:24 UTC (rev 5917)
+++ trunk/perfsonar-java-xml-ls/packaging/debian/changelog 2012-04-06
20:15:12 UTC (rev 5918)
@@ -1,4 +1,4 @@
-perfsonar-java-xml-ls (1.6-1) stable; urgency=low
+perfsonar-java-xml-ls (1.6-0a) stable; urgency=low

* New: Embedded eXist DB version 1.2.6
* Change: dependency against tomcat6

Modified: trunk/perfsonar-java-xml-ls/packaging/debian/copyright
===================================================================
--- trunk/perfsonar-java-xml-ls/packaging/debian/copyright 2012-04-06
16:43:24 UTC (rev 5917)
+++ trunk/perfsonar-java-xml-ls/packaging/debian/copyright 2012-04-06
20:15:12 UTC (rev 5918)
@@ -1,36 +1 @@
-This package was debianized by Maciej Glowiak
<>
on
-Tue, 17 Mar 2009.
-
-It was downloaded from http://www.perfsonar.net
-
-Upstream Author(s):
-
- Maciej Glowiak
<>
-
-License:
-
- Copyright (c) 2008, DANTE on behalf of the GEANT2 NRENs
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
met:
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- * Neither the name of the DANTE or GEANT2 nor the
- names of its contributors may be used to endorse or promote products
- derived from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY DANTE ``AS IS AND ANY
- EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL DANTE or the GEANT2 NRENS BE LIABLE FOR ANY
- DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
AND
- ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
+See enclosed doc/License.txt and doc/Collaboration.txt files for copyright
notice.
\ No newline at end of file

Modified:
trunk/perfsonar-java-xml-ls/packaging/debian/perfsonar-java-xml-ls.dirs
===================================================================
--- trunk/perfsonar-java-xml-ls/packaging/debian/perfsonar-java-xml-ls.dirs
2012-04-06 16:43:24 UTC (rev 5917)
+++ trunk/perfsonar-java-xml-ls/packaging/debian/perfsonar-java-xml-ls.dirs
2012-04-06 20:15:12 UTC (rev 5918)
@@ -1,5 +1,3 @@
usr/lib/perfsonar/services/perfsonar-java-xml-ls
-usr/lib/perfsonar/services/geant2-java-xml-ls
-var/run/perfsonar-java-xml-ls
var/log/perfsonar-java-xml-ls
var/lib/perfsonar-java-xml-ls
\ No newline at end of file

Added:
trunk/perfsonar-java-xml-ls/packaging/debian/perfsonar-java-xml-ls.links
===================================================================
--- trunk/perfsonar-java-xml-ls/packaging/debian/perfsonar-java-xml-ls.links
(rev 0)
+++ trunk/perfsonar-java-xml-ls/packaging/debian/perfsonar-java-xml-ls.links
2012-04-06 20:15:12 UTC (rev 5918)
@@ -0,0 +1,3 @@
+usr/lib/perfsonar/services/geant2-java-xml-ls
/var/lib/tomcat6/webapps/geant2-java-xml-ls
+usr/lib/perfsonar/services/perfsonar-java-xml-ls
/var/lib/tomcat6/webapps/perfsonar-java-xml-ls
+usr/lib/perfsonar/services/perfsonar-java-xml-ls/WEB-INF/classes/perfsonar/conf
/etc/perfsonar-java-xml-ls

Modified:
trunk/perfsonar-java-xml-ls/packaging/debian/perfsonar-java-xml-ls.postinst
===================================================================
---
trunk/perfsonar-java-xml-ls/packaging/debian/perfsonar-java-xml-ls.postinst
2012-04-06 16:43:24 UTC (rev 5917)
+++
trunk/perfsonar-java-xml-ls/packaging/debian/perfsonar-java-xml-ls.postinst
2012-04-06 20:15:12 UTC (rev 5918)
@@ -20,46 +20,27 @@
OLD_SERVICENAME="geant2-java-xml-ls"
SERVICENAME="perfsonar-java-xml-ls"
SERVICEPATH="/usr/lib/perfsonar/services"
+TOMCAT="tomcat6"

-
case "$1" in
configure)
- if [ -h /var/lib/tomcat6/webapps/$SERVICENAME ]
- then
- rm -rf /var/lib/tomcat6/webapps/$SERVICENAME
- fi
- ln -sf $SERVICEPATH/$SERVICENAME /var/lib/tomcat6/webapps/$SERVICENAME
|| true
- if [ -h /etc/$SERVICENAME ]
- then
- rm -rf /etc/$SERVICENAME
- fi
- ln -sf $SERVICEPATH/$SERVICENAME/WEB-INF/classes/perfsonar/conf
/etc/$SERVICENAME || true

- mkdir -p /var/log/$SERVICENAME || true
+ /etc/init.d/${TOMCAT} stop

- if [ -h /usr/share/doc/$SERVICENAME/spec ]
- then
- rm -rf /usr/share/doc/$SERVICENAME/spec
- fi
- ln -sf $SERVICEPATH/$SERVICENAME/doc /usr/share/doc/$SERVICENAME/spec ||
true
- # servlet-context-redirector
- ln -sf $SERVICEPATH/$OLD_SERVICENAME
/var/lib/tomcat6/webapps/$OLD_SERVICENAME
-
- # TODO: the writable conf files should be in /etc/ or /var/lib (if
changeable through the webinterface)
- chown -R tomcat6:tomcat6
$SERVICEPATH/$SERVICENAME/WEB-INF/classes/perfsonar/conf
- chown -R tomcat6:tomcat6 /var/log/$SERVICENAME
- chown -R tomcat6:tomcat6 /var/lib/$SERVICENAME
-
- /etc/init.d/tomcat6 stop
+ # TODO: the writable conf files should be in /etc/ or /var/lib (if
changeable through the webinterface), see PSSERVICES-614
+ chown ${TOMCAT}:${TOMCAT}
$SERVICEPATH/$SERVICENAME/WEB-INF/classes/perfsonar/conf/configuration.xml
+ chown -R ${TOMCAT}:${TOMCAT} /var/log/$SERVICENAME
+ chown -R ${TOMCAT}:${TOMCAT} /var/lib/$SERVICENAME

- if [ -f /etc/default/tomcat ]
+ if [ -f /etc/default/${TOMCAT} ]
then
# Increase memory allocated to Tomcat JVM, the default (128m is not
enough for eXist to work properly, see eXist site notes)
- sed -i 's/JAVA_OPTS="-Djava.awt.headless=true
-Xmx128m/JAVA_OPTS="-Djava.awt.headless=true -Xmx512m/' /etc/default/tomcat6
+ echo "Increasing ${TOMCAT} default memory allocation"
+ sed -i 's/JAVA_OPTS="-Djava.awt.headless=true
-Xmx128m/JAVA_OPTS="-Djava.awt.headless=true -Xmx512m/' /etc/default/${TOMCAT}
fi

- /etc/init.d/tomcat6 restart
+ /etc/init.d/${TOMCAT} restart
;;

abort-upgrade|abort-remove|abort-deconfigure)

Modified:
trunk/perfsonar-java-xml-ls/packaging/debian/perfsonar-java-xml-ls.postrm
===================================================================
--- trunk/perfsonar-java-xml-ls/packaging/debian/perfsonar-java-xml-ls.postrm
2012-04-06 16:43:24 UTC (rev 5917)
+++ trunk/perfsonar-java-xml-ls/packaging/debian/perfsonar-java-xml-ls.postrm
2012-04-06 20:15:12 UTC (rev 5918)
@@ -22,15 +22,12 @@
SERVICENAME="perfsonar-java-xml-ls"
OLD_SERVICENAME="geant2-java-xml-ls"
SERVICEPATH="/usr/lib/perfsonar/services"
+TOMCAT="tomcat6"

case "$1" in
purge)
- if [ -h /var/lib/tomcat6/webapps/$SERVICENAME ]
- then
- rm /var/lib/tomcat6/webapps/$SERVICENAME
- fi
-
+
if [ -h /etc/$SERVICENAME ]
then
rm /etc/$SERVICENAME
@@ -40,16 +37,12 @@
then
rm -rf /var/log/$SERVICENAME
fi
-
- if [ -h /usr/share/doc/$SERVICENAME/spec ]
- then
- rm /usr/share/doc/$SERVICENAME/spec
- fi

- if [ -h /usr/share/tomcat6/webapps/$OLD_SERVICENAME ]
+ if [ -h /var/lib/$SERVICENAME ]
then
- rm -rf /usr/share/tomcat6/webapps/$OLD_SERVICENAME
+ rm -rf /var/lib/$SERVICENAME
fi
+
;;

remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)

Modified:
trunk/perfsonar-java-xml-ls/packaging/debian/perfsonar-java-xml-ls.preinst
===================================================================
---
trunk/perfsonar-java-xml-ls/packaging/debian/perfsonar-java-xml-ls.preinst
2012-04-06 16:43:24 UTC (rev 5917)
+++
trunk/perfsonar-java-xml-ls/packaging/debian/perfsonar-java-xml-ls.preinst
2012-04-06 20:15:12 UTC (rev 5918)
@@ -51,11 +51,6 @@
rm -rf /var/log/$SERVICENAME
fi

- if [ -h /usr/share/doc/$SERVICENAME/spec ]
- then
- rm -rf /usr/share/doc/$SERVICENAME/spec
- fi
-
;;
abort-upgrade)
;;

Modified:
trunk/perfsonar-java-xml-ls/packaging/debian/perfsonar-java-xml-ls.prerm
===================================================================
--- trunk/perfsonar-java-xml-ls/packaging/debian/perfsonar-java-xml-ls.prerm
2012-04-06 16:43:24 UTC (rev 5917)
+++ trunk/perfsonar-java-xml-ls/packaging/debian/perfsonar-java-xml-ls.prerm
2012-04-06 20:15:12 UTC (rev 5918)
@@ -16,9 +16,21 @@
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package

+SERVICENAME="perfsonar-java-xml-ls"
+OLD_SERVICENAME="geant2-java-xml-ls"
+TOMCAT="tomcat6"

+
case "$1" in
remove|upgrade|deconfigure)
+ if [ -h /var/lib/${TOMCAT}/webapps/$SERVICENAME ]
+ then
+ rm /var/lib/${TOMCAT}/webapps/$SERVICENAME
+ fi
+ if [ -h /var/lib/${TOMCAT}/webapps/$OLD_SERVICENAME ]
+ then
+ rm /var/lib/${TOMCAT}/webapps/$OLD_SERVICENAME
+ fi
;;

failed-upgrade)

Modified: trunk/perfsonar-java-xml-ls/packaging/debian/rules
===================================================================
--- trunk/perfsonar-java-xml-ls/packaging/debian/rules 2012-04-06 16:43:24
UTC (rev 5917)
+++ trunk/perfsonar-java-xml-ls/packaging/debian/rules 2012-04-06 20:15:12
UTC (rev 5918)
@@ -20,7 +20,7 @@

# Optionnal: should install everything needed in the debian/ dir
install: build
- dh_clean -k
+ dh_prep
dh_installdirs

# Mandatory

Modified: trunk/perfsonar-java-xml-ls/packaging/package.sh
===================================================================
--- trunk/perfsonar-java-xml-ls/packaging/package.sh 2012-04-06 16:43:24
UTC (rev 5917)
+++ trunk/perfsonar-java-xml-ls/packaging/package.sh 2012-04-06 20:15:12
UTC (rev 5918)
@@ -104,12 +104,11 @@
# Creates the packages structure and filled with output from Maven build
# Should be done after a 'mvn clean compile war:exploded'
# then we have:
-# target/perfsonar-java-xml-ls/
-# We should add:
-# target/debian
-# target/wa -> ant script from ps-mdm-web-admin
-# target/geant2-java-xml-ls (how???)
-#
+# target/perfsonar-java-xml-ls/
+# And we need to add:
+# target/debian
+# target/wa -> ant script from ps-mdm-web-admin
+# target/geant2-java-xml-ls -> mvn for servlet-redirector
#
do_structure() {
echo -n "Creating packaging directory structure ... "
@@ -118,9 +117,6 @@
# We'll make the Debian package in debian/
BUILD_DIR="debian/"
mkdir -p ${BUILD_DIR}
- mkdir -p ${BUILD_DIR}doc
- rsync -r --exclude=.svn ${PROJECT_DIR}/doc/schema doc/
- cp -an ${PROJECT_DIR}/doc/*.txt doc/
# Adding WebAdmin interface
cp -an ${WEBADMIN_DIR}build/war/wa .
cp -an ${WEBADMIN_DIR}build/war/index.jsp .
@@ -146,7 +142,7 @@
cd $TARGET_DIR
# We build in the home directory of the current user
rsync -a --delete .
${DEB_BUILD_HOST}":~/"${SERVICE_NAME}-${DEB_VERSION}/
- ssh ${DEB_BUILD_HOST} "cd ${SERVICE_NAME}-${DEB_VERSION};
dpkg-buildpackage"
+ ssh ${DEB_BUILD_HOST} "cd ${SERVICE_NAME}-${DEB_VERSION};
dpkg-buildpackage; ~/gen_packages.sh"
echo "done!"
echo
}

Modified: trunk/perfsonar-java-xml-ls/pom.xml
===================================================================
--- trunk/perfsonar-java-xml-ls/pom.xml 2012-04-06 16:43:24 UTC (rev 5917)
+++ trunk/perfsonar-java-xml-ls/pom.xml 2012-04-06 20:15:12 UTC (rev 5918)
@@ -9,28 +9,28 @@
<description>perfSONAR GEANT Lookup Service</description>
<url>http://perfsonar.forge.geant.net</url>
<licenses>
- <license>
- <name>GÉANT Standard Open Source Software Outward Licence</name>
-
<url>https://intranet.geant.net/sites/Management/Coordination/IPR/Documents/GÉANT%20Standard%20Open%20Source%20Software%20Outward%20Licence.txt</url>
- <comments>See included License.txt file</comments>
- </license>
+ <license>
+ <name>GÉANT Standard Open Source Software Outward
Licence</name>
+
<url>https://intranet.geant.net/sites/Management/Coordination/IPR/Documents/GÉANT%20Standard%20Open%20Source%20Software%20Outward%20Licence.txt</url>
+ <comments>See included License.txt file</comments>
+ </license>
</licenses>

<properties>
<configurationFile>configuration.xml</configurationFile>
<configurationFile>configuration-rules.xml</configurationFile>
<configurationFile>resources.properties</configurationFile>
- <configurationFile>conf.xml</configurationFile>
- <configurationFile>log4j.xml</configurationFile>
+ <configurationFile>conf.xml</configurationFile>
+ <configurationFile>log4j.xml</configurationFile>
<axis2Id>axis2-1.4.1</axis2Id>
<packageName>perfsonar-java-xml-ls</packageName>

<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<log4j.version>1.2.15</log4j.version>
<exist.version>1.2.6</exist.version>
<xmlrpc.version>3.1.2</xmlrpc.version>
- <junit.version>4.7</junit.version>
- <datadir>data</datadir>
- <port>8080</port>
+ <junit.version>4.7</junit.version>
+ <datadir>data</datadir>
+ <port>8080</port>
</properties>

<scm>
@@ -51,34 +51,23 @@

<include>**/LSTestSuite.java</include>
</includes>
<argLine>-Xmx512m</argLine>
- <encoding>${project.build.sourceEncoding}</encoding>
-
<outputEncoding>${project.build.sourceEncoding}</outputEncoding>
+
<encoding>${project.build.sourceEncoding}</encoding>
+
<outputEncoding>${project.build.sourceEncoding}</outputEncoding>
+ <additionalClasspathElements>
+
<additionalClasspathElement>target/test-classes</additionalClasspathElement>
+ </additionalClasspathElements>
</configuration>
<version>2.7.2</version>
</plugin>
-
+
<plugin>
<artifactId>maven-war-plugin</artifactId>
<configuration>
<webResources>
<resource>
-
<directory>${basedir}/axis/</directory>
- <includes>
-
<include>services.xml</include>
- </includes>
-
<targetPath>WEB-INF/services/LookupService/META-INF/</targetPath>
- </resource>
- <resource>
-
<directory>${basedir}/db</directory>
- <includes>
-
<include>*.xml</include>
- </includes>
-
<targetPath>db</targetPath>
- </resource>
- <resource>

<directory>${basedir}/doc</directory>
<includes>
- <include>*.txt</include>
+
<include>*.txt</include>
</includes>

<targetPath>doc</targetPath>
</resource>
@@ -86,6 +75,7 @@

<directory>${basedir}/doc/schema</directory>
<includes>

<include>**/*.rnc</include>
+ <include>**/*.xsd</include>
</includes>

<targetPath>schema</targetPath>
</resource>
@@ -103,41 +93,41 @@
<minimumTokens>100</minimumTokens>
<targetJdk>1.6</targetJdk>
</configuration>
- <executions>
- <execution>
- <goals>
- <goal>pmd</goal>
- <goal>cpd</goal>
- </goals>
- <phase>verify</phase>
- </execution>
- </executions>
+ <executions>
+ <execution>
+ <goals>
+ <goal>pmd</goal>
+ <goal>cpd</goal>
+ </goals>
+ <phase>verify</phase>
+ </execution>
+ </executions>
</plugin>

- <plugin>
- <artifactId>cobertura-maven-plugin</artifactId>
- <groupId>org.codehaus.mojo</groupId>
- <version>2.5.1</version>
- <configuration>
- <formats>
- <format>xml</format>
- </formats>
- <check>
- <haltOnFailure>false</haltOnFailure>
- </check>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>clean</goal>
- <goal>check</goal>
- <goal>cobertura</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
<plugin>
+
<artifactId>cobertura-maven-plugin</artifactId>
+ <groupId>org.codehaus.mojo</groupId>
+ <version>2.5.1</version>
+ <configuration>
+ <formats>
+ <format>xml</format>
+ </formats>
+ <check>
+
<haltOnFailure>false</haltOnFailure>
+ </check>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>clean</goal>
+ <goal>check</goal>
+ <goal>cobertura</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>

<groupId>com.google.code.maven-replacer-plugin</groupId>
<artifactId>maven-replacer-plugin</artifactId>
<version>1.3</version>
@@ -159,23 +149,23 @@
</replacements>
</configuration>
</execution>
- <execution>
- <id>replace.exist</id>
- <goals>
- <goal>replace</goal>
- </goals>
- <configuration>
- <includes>
- <include>target/classes/conf.xml</include>
- </includes>
- <replacements>
- <replacement>
- <token>%DATADIR%</token>
- <value>${datadir}</value>
- </replacement>
- </replacements>
- </configuration>
- </execution>
+ <execution>
+ <id>replace.exist</id>
+ <goals>
+ <goal>replace</goal>
+ </goals>
+ <configuration>
+ <includes>
+
<include>target/classes/conf.xml</include>
+ </includes>
+ <replacements>
+ <replacement>
+
<token>%DATADIR%</token>
+
<value>${datadir}</value>
+ </replacement>
+ </replacements>
+ </configuration>
+ </execution>
</executions>
</plugin>
<plugin>
@@ -185,31 +175,48 @@
<configuration>
<source>1.6</source>
<target>1.6</target>
- <encoding>${project.build.sourceEncoding}</encoding>
+
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
</plugin>

- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>3.0</version>
- <configuration>
- <generateReports>true</generateReports>
- <generateSitemap>true</generateSitemap>
- <reportPlugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
-
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.2</version>
- <configuration>
-
<dependencyDetailsEnabled>false</dependencyDetailsEnabled>
-
<dependencyLocationsEnabled>false</dependencyLocationsEnabled>
- </configuration>
- </plugin>
- </reportPlugins>
- </configuration>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>3.0</version>
+ <configuration>
+
<generateReports>true</generateReports>
+
<generateSitemap>true</generateSitemap>
+ <reportPlugins>
+ <plugin>
+
<groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+
<dependencyDetailsEnabled>false</dependencyDetailsEnabled>
+
<dependencyLocationsEnabled>false</dependencyLocationsEnabled>
+ </configuration>
+ </plugin>
+ </reportPlugins>
+ </configuration>
+ </plugin>

+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.2.1</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <executable>./rnc2dtd.sh</executable>
+
<workingDirectory>doc/schema</workingDirectory>
+ </configuration>
+ </plugin>
+
</plugins>
<pluginManagement>
<plugins>
@@ -266,31 +273,38 @@
</plugin>
</plugins>
</pluginManagement>
-
+
<testResources>
- <testResource>
- <directory>${basedir}/src/test/resources</directory>
- <includes>
- <include>*.xml</include>
- </includes>
- </testResource>
- <testResource>
- <directory>${basedir}/src/main/webapp/data</directory>
- <targetPath>data</targetPath>
- <includes>
- <include>*</include>
- </includes>
- </testResource>
- </testResources>
+ <testResource>
+
<directory>${basedir}/src/test/resources</directory>
+ <includes>
+ <include>*.xml</include>
+ </includes>
+ </testResource>
+ <testResource>
+
<directory>${basedir}/src/main/webapp/data</directory>
+ <targetPath>data</targetPath>
+ <includes>
+ <include>*</include>
+ </includes>
+ </testResource>
+ <testResource>
+
<directory>${basedir}/src/main/webapp/db</directory>
+ <targetPath>db</targetPath>
+ <includes>
+ <include>*</include>
+ </includes>
+ </testResource>
+ </testResources>

- <resources>
- <resource>
- <directory>${basedir}/src/main/resources</directory>
- <includes>
- <include>*.xml</include>
- </includes>
- </resource>
+ <resources>
<resource>
+
<directory>${basedir}/src/main/resources</directory>
+ <includes>
+ <include>*.xml</include>
+ </includes>
+ </resource>
+ <resource>

<directory>${basedir}/src/main/resources/org/perfsonar/resources</directory>

<targetPath>org/perfsonar/resources</targetPath>
<includes>
@@ -412,12 +426,12 @@
<groupId>org.apache.xmlrpc</groupId>
<version>${xmlrpc.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.xmlrpc</groupId>
- <artifactId>xmlrpc-client</artifactId>
- <version>${xmlrpc.version}</version>
- </dependency>
<dependency>
+ <groupId>org.apache.xmlrpc</groupId>
+ <artifactId>xmlrpc-client</artifactId>
+ <version>${xmlrpc.version}</version>
+ </dependency>
+ <dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
<version>1.4</version>
@@ -526,21 +540,26 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>com.thaiopensource</groupId>
+ <artifactId>trang</artifactId>
+ <version>20091111</version>
+ </dependency>
</dependencies>

<profiles>
- <profile>
- <id>development</id>
- <distributionManagement>
- <repository>
- <id>build.dep</id>
- <name>Debian Build host</name>
- <url>scpexe://d6/home/antoine/</url>
- </repository>
- </distributionManagement>
- </profile>
-
<profile>
+ <id>development</id>
+ <distributionManagement>
+ <repository>
+ <id>build.dep</id>
+ <name>Debian Build host</name>
+ <url>scpexe://d6/home/antoine/</url>
+ </repository>
+ </distributionManagement>
+ </profile>
+ 
+ <profile>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
@@ -548,37 +567,37 @@
<distributionManagement>
<repository>
<id>build.dep</id>
- <name>Debian Build host</name>
- <url>scpexe://d6/home/antoine/</url>
- </repository>
- </distributionManagement>
+ <name>Debian Build host</name>
+ <url>scpexe://d6/home/antoine/</url>
+ </repository>
+ </distributionManagement>
</profile>
- <profile>
- <id>war</id>
- <properties>
- <datadir>../../data</datadir>
- </properties>
- </profile>
<profile>
+ <id>war</id>
+ <properties>
+ <datadir>../../data</datadir>
+ </properties>
+ </profile>
+ <profile>
<id>deb</id>
<properties>

<port>8080</port>
-
<datadir>/var/lib/perfsonar-java-xml-ls/</datadir>
+
<datadir>/var/lib/perfsonar-java-xml-ls/data/</datadir>
</properties>
</profile>
<profile>
<id>rpm</id>
<properties>
- <datadir>/var/lib/perfsonar-java-xml-ls/</datadir>
+ <datadir>/var/lib/perfsonar-java-xml-ls/data/
</datadir>
</properties>
</profile>
</profiles>

- <organization>
- <name>GEANT</name>
- <url>http://www.geant.net</url>
- </organization>
+ <organization>
+ <name>GEANT</name>
+ <url>http://www.geant.net</url>
+ </organization>
<issueManagement>

<url>https://forge.geant.net/forge/display/perfsonar/Contact</url>
<system>Jira</system>

Modified: trunk/perfsonar-java-xml-ls/samples/requests/EchoRequest.xml
===================================================================
--- trunk/perfsonar-java-xml-ls/samples/requests/EchoRequest.xml
2012-04-06 16:43:24 UTC (rev 5917)
+++ trunk/perfsonar-java-xml-ls/samples/requests/EchoRequest.xml
2012-04-06 20:15:12 UTC (rev 5918)
@@ -1,8 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>

-
-
-
<nmwg:message type="EchoRequest"
id="msg1"
xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>

Modified:
trunk/perfsonar-java-xml-ls/samples/requests/LSControlRequest-join.xml
===================================================================
--- trunk/perfsonar-java-xml-ls/samples/requests/LSControlRequest-join.xml
2012-04-06 16:43:24 UTC (rev 5917)
+++ trunk/perfsonar-java-xml-ls/samples/requests/LSControlRequest-join.xml
2012-04-06 20:15:12 UTC (rev 5918)
@@ -1,3 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
<nmwg:message type="LSControlRequest"
xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";

xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";

Modified: trunk/perfsonar-java-xml-ls/samples/requests/LSDeregisterRequest.xml
===================================================================
--- trunk/perfsonar-java-xml-ls/samples/requests/LSDeregisterRequest.xml
2012-04-06 16:43:24 UTC (rev 5917)
+++ trunk/perfsonar-java-xml-ls/samples/requests/LSDeregisterRequest.xml
2012-04-06 20:15:12 UTC (rev 5918)
@@ -1,10 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>

-
-
-
<nmwg:message type="LSDeregisterRequest"
- id="msg1"
+ id="msg1"
xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>

<nmwg:metadata id="deregister">

Modified: trunk/perfsonar-java-xml-ls/samples/requests/LSKeepaliveRequest.xml
===================================================================
--- trunk/perfsonar-java-xml-ls/samples/requests/LSKeepaliveRequest.xml
2012-04-06 16:43:24 UTC (rev 5917)
+++ trunk/perfsonar-java-xml-ls/samples/requests/LSKeepaliveRequest.xml
2012-04-06 20:15:12 UTC (rev 5918)
@@ -1,10 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>

-
-
-
<nmwg:message type="LSKeepaliveRequest"
- id="msg1"
+ id="msg1"
xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>

<nmwg:metadata id="key_to_keepalive">

Modified:
trunk/perfsonar-java-xml-ls/samples/requests/LSQueryRequest-Discovery.xml
===================================================================
--- trunk/perfsonar-java-xml-ls/samples/requests/LSQueryRequest-Discovery.xml
2012-04-06 16:43:24 UTC (rev 5917)
+++ trunk/perfsonar-java-xml-ls/samples/requests/LSQueryRequest-Discovery.xml
2012-04-06 20:15:12 UTC (rev 5918)
@@ -1,4 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
+
<nmwg:message type="LSQueryRequest"
id="LSDiscoveryRequest"

xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";

Modified: trunk/perfsonar-java-xml-ls/samples/requests/LSQueryRequest.xml
===================================================================
--- trunk/perfsonar-java-xml-ls/samples/requests/LSQueryRequest.xml
2012-04-06 16:43:24 UTC (rev 5917)
+++ trunk/perfsonar-java-xml-ls/samples/requests/LSQueryRequest.xml
2012-04-06 20:15:12 UTC (rev 5918)
@@ -16,14 +16,14 @@

data(/nmwg:store[@type='LSStore']/nmwg:metadata/@id)
</xquery:subject>
-
<nmwg:eventType>http://ogf.org/ns/nmwg/tools/org/perfsonar/service/lookup/query/xquery/2.0</nmwg:eventType>
- <xquery:parameters>
+
+ <xquery:parameters id="param.1">
+ <xquery:parameter name="lsOutput">native</xquery:parameter>
</xquery:parameters>
+
+
<nmwg:eventType>http://ogf.org/ns/nmwg/tools/org/perfsonar/service/lookup/query/xquery/2.0</nmwg:eventType>
</nmwg:metadata>

<nmwg:data metadataIdRef="meta1" id="d1"/>

-
-
</nmwg:message>
-

Modified:
trunk/perfsonar-java-xml-ls/samples/requests/LSRegisterRequest-Update.xml
===================================================================
--- trunk/perfsonar-java-xml-ls/samples/requests/LSRegisterRequest-Update.xml
2012-04-06 16:43:24 UTC (rev 5917)
+++ trunk/perfsonar-java-xml-ls/samples/requests/LSRegisterRequest-Update.xml
2012-04-06 20:15:12 UTC (rev 5918)
@@ -1,67 +1,64 @@
-
-
+<?xml version="1.0" encoding="UTF-8"?>

-<nmwg:message type="LSRegisterRequest"
- id="msg1"
-
xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
-
xmlns:psservice="http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/";
- xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
-
xmlns:netutil="http://ggf.org/ns/nmwg/characteristic/utilization/2.0/";>
-
- <nmwg:metadata id="serviceLookupInfo">
+<nmwg:message type="LSRegisterRequest" id="msg1"
+ xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
xmlns:psservice="http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/";
+ xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
xmlns:netutil="http://ggf.org/ns/nmwg/characteristic/utilization/2.0/";>

- 
- <nmwg:key>
- <nmwg:parameters id="param1">
- <nmwg:parameter
name="lsKey">http://shower.fr:8080/axis/services/MeasurementArchiveService</nmwg:parameter>
- </nmwg:parameters>
- </nmwg:key>

+ <nmwg:metadata id="serviceLookupInfo">

- 
-
- <perfsonar:subject id="subj.15977808">
- <psservice:service id="229.148.249.60.16283379">
- <psservice:serviceName>Java RRD MA</psservice:serviceName>
-
<psservice:accessPoint>http://shower.fr:8080/axis/services/MeasurementArchiveService</psservice:accessPoint>
- <psservice:serviceType>MA</psservice:serviceType>
- <psservice:serviceDescription>Java RRD MA, perfSONAR project,
229.148.249.60</psservice:serviceDescription>
- </psservice:service>
- </perfsonar:subject>
- </nmwg:metadata>
-
- <nmwg:data id="data1" metadataIdRef="serviceLookupInfo">
- <nmwg:metadata id="17155427">
- <netutil:subject id="17062918">
- <nmwgt:interface>
- <nmwgt:hostName>Monroe</nmwgt:hostName>
- <nmwgt:ifName>ge-1/1/0</nmwgt:ifName>
- <nmwgt:ifDescription>Monroe description:
ge-1/1/0</nmwgt:ifDescription>
- <nmwgt:ifAddress type="ipv4">229.148.7.224</nmwgt:ifAddress>
- <nmwgt:direction>in</nmwgt:direction>
- <nmwgt:authRealm>RemoveMe!!! authRealm NOT USED</nmwgt:authRealm>
- <nmwgt:capacity>250000000</nmwgt:capacity>
- </nmwgt:interface>
- </netutil:subject>
- <nmwg:eventType>utilization</nmwg:eventType>
- </nmwg:metadata>
- </nmwg:data>
-
- <nmwg:data id="data2" metadataIdRef="serviceLookupInfo">
- <nmwg:metadata id="17155427">
- <netutil:subject id="17062918">
- <nmwgt:interface>
- <nmwgt:hostName>Carcassone</nmwgt:hostName>
- <nmwgt:ifName>ge-1/1/0</nmwgt:ifName>
- <nmwgt:ifDescription>Carcassone description:
ge-2/2/0</nmwgt:ifDescription>
- <nmwgt:ifAddress type="ipv4">229.148.7.225</nmwgt:ifAddress>
- <nmwgt:direction>in</nmwgt:direction>
- <nmwgt:authRealm>RemoveMe!!! authRealm NOT USED</nmwgt:authRealm>
- <nmwgt:capacity>250000000</nmwgt:capacity>
- </nmwgt:interface>
- </netutil:subject>
- <nmwg:eventType>utilization</nmwg:eventType>
- </nmwg:metadata>
- </nmwg:data>
+ 
+ <nmwg:key>
+ <nmwg:parameters id="param1">
+ <nmwg:parameter
name="lsKey">http://shower.fr:8080/axis/services/MeasurementArchiveService</nmwg:parameter>
+ </nmwg:parameters>
+ </nmwg:key>

+ 
+
+ <perfsonar:subject id="subj.15977808">
+ <psservice:service id="229.148.249.60.16283379">
+ <psservice:serviceName>Java RRD
MA</psservice:serviceName>
+
<psservice:accessPoint>http://shower.fr:8080/axis/services/MeasurementArchiveService</psservice:accessPoint>
+
<psservice:serviceType>MA</psservice:serviceType>
+ <psservice:serviceDescription>Java RRD MA,
perfSONAR project,
+
229.148.249.60</psservice:serviceDescription>
+ </psservice:service>
+ </perfsonar:subject>
+ </nmwg:metadata>
+
+ <nmwg:data id="data1" metadataIdRef="serviceLookupInfo">
+ <nmwg:metadata id="17155427">
+ <netutil:subject id="17062918">
+ <nmwgt:interface>
+
<nmwgt:hostName>Monroe</nmwgt:hostName>
+ <nmwgt:ifName>ge-1/1/0</nmwgt:ifName>
+ <nmwgt:ifDescription>Monroe
description: ge-1/1/0</nmwgt:ifDescription>
+ <nmwgt:ifAddress
type="ipv4">229.148.7.224</nmwgt:ifAddress>
+ <nmwgt:direction>in</nmwgt:direction>
+ <nmwgt:authRealm>RemoveMe!!!
authRealm NOT USED</nmwgt:authRealm>
+
<nmwgt:capacity>250000000</nmwgt:capacity>
+ </nmwgt:interface>
+ </netutil:subject>
+ <nmwg:eventType>utilization</nmwg:eventType>
+ </nmwg:metadata>
+ </nmwg:data>
+
+ <nmwg:data id="data2" metadataIdRef="serviceLookupInfo">
+ <nmwg:metadata id="17155427">
+ <netutil:subject id="17062918">
+ <nmwgt:interface>
+
<nmwgt:hostName>Carcassone</nmwgt:hostName>
+ <nmwgt:ifName>ge-1/1/0</nmwgt:ifName>
+ <nmwgt:ifDescription>Carcassone
description: ge-2/2/0</nmwgt:ifDescription>
+ <nmwgt:ifAddress
type="ipv4">229.148.7.225</nmwgt:ifAddress>
+ <nmwgt:direction>in</nmwgt:direction>
+ <nmwgt:authRealm>RemoveMe!!!
authRealm NOT USED</nmwgt:authRealm>
+
<nmwgt:capacity>250000000</nmwgt:capacity>
+ </nmwgt:interface>
+ </netutil:subject>
+ <nmwg:eventType>utilization</nmwg:eventType>
+ </nmwg:metadata>
+ </nmwg:data>
+
</nmwg:message>

Modified: trunk/perfsonar-java-xml-ls/samples/requests/LSRegisterRequest.xml
===================================================================
--- trunk/perfsonar-java-xml-ls/samples/requests/LSRegisterRequest.xml
2012-04-06 16:43:24 UTC (rev 5917)
+++ trunk/perfsonar-java-xml-ls/samples/requests/LSRegisterRequest.xml
2012-04-06 20:15:12 UTC (rev 5918)
@@ -1,60 +1,63 @@
-<nmwg:message type="LSRegisterRequest"
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
- xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";

- xmlns:psservice="http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/";
- xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
- xmlns:netutil="http://ggf.org/ns/nmwg/characteristic/utilization/2.0/";>
-
- <nmwg:parameters>
- <nmwg:parameter name="lsTTL">10000</nmwg:parameter>
- </nmwg:parameters>
+<?xml version="1.0" encoding="UTF-8"?>

- <nmwg:metadata id="meta1">
- <perfsonar:subject id="subj.15977808">
- <psservice:service id="229.148.249.60.16283379">
- <psservice:serviceName>Java RRD MA</psservice:serviceName>
-
<psservice:accessPoint>http://TESTREGISTER.fr:8080/axis/services/MeasurementArchiveService</psservice:accessPoint>
- <psservice:serviceType>MA</psservice:serviceType>
- <psservice:serviceDescription>Java RRD MA, perfSONAR
project, 229.148.249.60</psservice:serviceDescription>
- <psservice:organization>Shower
France</psservice:organization>
-
<psservice:contactEmail></psservice:contactEmail>
- <psservice:serviceVersion>1.5</psservice:serviceVersion>
- </psservice:service>
- </perfsonar:subject>
- </nmwg:metadata>
+<nmwg:message type="LSRegisterRequest"
xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+ xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";
+
xmlns:psservice="http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/";
+ xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
+
xmlns:netutil="http://ggf.org/ns/nmwg/characteristic/utilization/2.0/";>

- <nmwg:data id="data1" metadataIdRef="meta1">
- <nmwg:metadata id="17155427">
- <netutil:subject id="17062918">
- <nmwgt:interface>
- <nmwgt:hostName>Gallup's.fr</nmwgt:hostName>
- <nmwgt:ifName>ge-1/1/0</nmwgt:ifName>
- <nmwgt:ifDescription>Gallup's description:
ge-1/1/0</nmwgt:ifDescription>
- <nmwgt:ifAddress
type="ipv4">229.148.7.224</nmwgt:ifAddress>
- <nmwgt:direction>in</nmwgt:direction>
- <nmwgt:authRealm>RemoveMe!!! authRealm NOT
USED</nmwgt:authRealm>
- <nmwgt:capacity>250000000</nmwgt:capacity>
- </nmwgt:interface>
- </netutil:subject>
- <nmwg:eventType>utilization</nmwg:eventType>
- </nmwg:metadata>
- </nmwg:data>
+ <nmwg:metadata id="meta1">

- <nmwg:data id="data2" metadataIdRef="meta1">
- <nmwg:metadata id="17155427">
- <netutil:subject id="17062918">
- <nmwgt:interface>
- <nmwgt:hostName>Paris</nmwgt:hostName>
- <nmwgt:ifName>ge-1/1/0</nmwgt:ifName>
- <nmwgt:ifDescription>Paris description:
ge-2/2/0</nmwgt:ifDescription>
- <nmwgt:ifAddress type="ipv4">229.148.7.225</nmwgt:ifAddress>
- <nmwgt:direction>in</nmwgt:direction>
- <nmwgt:authRealm>RemoveMe!!! authRealm NOT USED</nmwgt:authRealm>
- <nmwgt:capacity>250000000</nmwgt:capacity>
- </nmwgt:interface>
- </netutil:subject>
- <nmwg:eventType>utilization</nmwg:eventType>
- </nmwg:metadata>
- </nmwg:data>
-
+ <nmwg:parameters>
+ <nmwg:parameter name="lsTTL">10000</nmwg:parameter>
+ </nmwg:parameters>
+
+ <perfsonar:subject id="subj.15977808">
+ <psservice:service id="229.148.249.60.16283379">
+ <psservice:serviceName>Java RRD
MA</psservice:serviceName>
+
<psservice:accessPoint>http://TESTREGISTER.fr:8080/axis/services/MeasurementArchiveService</psservice:accessPoint>
+
<psservice:serviceType>MA</psservice:serviceType>
+ <psservice:serviceDescription>Java RRD MA,
perfSONAR project,
+
229.148.249.60</psservice:serviceDescription>
+ <psservice:organization>Shower
France</psservice:organization>
+
<psservice:contactEmail></psservice:contactEmail>
+
<psservice:serviceVersion>1.5</psservice:serviceVersion>
+ </psservice:service>
+ </perfsonar:subject>
+ </nmwg:metadata>
+
+ <nmwg:data id="data1" metadataIdRef="meta1">
+ <nmwg:metadata id="17155427">
+ <netutil:subject id="17062918">
+ <nmwgt:interface>
+
<nmwgt:hostName>Gallup's.fr</nmwgt:hostName>
+ <nmwgt:ifName>ge-1/1/0</nmwgt:ifName>
+ <nmwgt:ifDescription>Gallup's
description: ge-1/1/0</nmwgt:ifDescription>
+ <nmwgt:ifAddress
type="ipv4">229.148.7.224</nmwgt:ifAddress>
+ <nmwgt:direction>in</nmwgt:direction>
+ <nmwgt:authRealm>RemoveMe!!!
authRealm NOT USED</nmwgt:authRealm>
+
<nmwgt:capacity>250000000</nmwgt:capacity>
+ </nmwgt:interface>
+ </netutil:subject>
+ <nmwg:eventType>utilization</nmwg:eventType>
+ </nmwg:metadata>
+ </nmwg:data>
+
+ <nmwg:data id="data2" metadataIdRef="meta1">
+ <nmwg:metadata id="17155427">
+ <netutil:subject id="17062918">
+ <nmwgt:interface>
+ <nmwgt:hostName>Paris</nmwgt:hostName>
+ <nmwgt:ifName>ge-1/1/0</nmwgt:ifName>
+ <nmwgt:ifDescription>Paris
description: ge-2/2/0</nmwgt:ifDescription>
+ <nmwgt:ifAddress
type="ipv4">229.148.7.225</nmwgt:ifAddress>
+ <nmwgt:direction>in</nmwgt:direction>
+ <nmwgt:authRealm>RemoveMe!!!
authRealm NOT USED</nmwgt:authRealm>
+
<nmwgt:capacity>250000000</nmwgt:capacity>
+ </nmwgt:interface>
+ </netutil:subject>
+ <nmwg:eventType>utilization</nmwg:eventType>
+ </nmwg:metadata>
+ </nmwg:data>
+
</nmwg:message>

Modified:
trunk/perfsonar-java-xml-ls/samples/responses/LSQueryResponse-Discovery.xml
===================================================================
---
trunk/perfsonar-java-xml-ls/samples/responses/LSQueryResponse-Discovery.xml
2012-04-06 16:43:24 UTC (rev 5917)
+++
trunk/perfsonar-java-xml-ls/samples/responses/LSQueryResponse-Discovery.xml
2012-04-06 20:15:12 UTC (rev 5918)
@@ -1,4 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
+
<nmwg:message xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
messageIdRef="LSDiscoveryRequest"
id="message.11606947"

Modified: trunk/perfsonar-java-xml-ls/samples/store/sample/LSStore-control.xml
===================================================================
--- trunk/perfsonar-java-xml-ls/samples/store/sample/LSStore-control.xml
2012-04-06 16:43:24 UTC (rev 5917)
+++ trunk/perfsonar-java-xml-ls/samples/store/sample/LSStore-control.xml
2012-04-06 20:15:12 UTC (rev 5918)
@@ -1,4 +1,5 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
+
<nmwg:store xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
xmlns:psservice="http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/";
xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";
xmlns:netutil="http://ggf.org/ns/nmwg/characteristic/utilization/2.0/";
type="LSStore-control">
<nmwg:metadata
id="http://rrdma.perfsonar.pionier.net.pl:8180/geant2-java-rrd-ma/services/MeasurementArchiveService";>
<nmwg:parameters id="control-parameters">

Modified: trunk/perfsonar-java-xml-ls/samples/store/sample/LSStore-summary.xml
===================================================================
--- trunk/perfsonar-java-xml-ls/samples/store/sample/LSStore-summary.xml
2012-04-06 16:43:24 UTC (rev 5917)
+++ trunk/perfsonar-java-xml-ls/samples/store/sample/LSStore-summary.xml
2012-04-06 20:15:12 UTC (rev 5918)
@@ -1,3 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
<nmwg:store
xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";
xmlns:netutil="http://ggf.org/ns/nmwg/characteristic/utilization/2.0/";
xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
xmlns:psservice="http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/";
xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/"; type="LSStore-summary">

<nmwg:metadata
id="http://TESTREGISTER.fr123:8080/axis/services/MeasurementArchiveService";>

Modified:
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/ThreadPoolComponent.java
===================================================================
---
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/ThreadPoolComponent.java
2012-04-06 16:43:24 UTC (rev 5917)
+++
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/ThreadPoolComponent.java
2012-04-06 20:15:12 UTC (rev 5918)
@@ -6,6 +6,7 @@
import org.perfsonar.base2.service.configuration.Component;
import org.perfsonar.base2.service.exceptions.PerfSONARException;

+// TODO: this class is unused!!!
public class ThreadPoolComponent extends Component {

private ExecutorService pool = null;

Modified:
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/registration/summarization/SummarizeIpAddrs.java
===================================================================
---
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/registration/summarization/SummarizeIpAddrs.java
2012-04-06 16:43:24 UTC (rev 5917)
+++
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/registration/summarization/SummarizeIpAddrs.java
2012-04-06 20:15:12 UTC (rev 5918)
@@ -26,7 +26,7 @@
*/
public static Set<String> getSummary(Collection<String> ipAddresses) {

- //initialization of the root node in Tree
+ // Initialization of the root node in Tree
final TrieNode ROOTNODE = new TrieNode(-1, Constants.MAX_KEY_LENGTH);
Trie trie = new Trie(ROOTNODE);

@@ -36,7 +36,7 @@
long aLongValue = newIp.getAddrAsLong();
trie = trie.add(aLongValue, Constants.MAX_KEY_LENGTH, newIp);
} catch (InvalidIPAddressException e) {
- logger.warn("Ignoring address: " + newIpAddr);
+ logger.warn("Ignoring address: " + newIpAddr + " - Error: "
+ e.getMessage());
}
}

Modified:
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/servlets/ExistDbInitializerServlet.java
===================================================================
---
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/servlets/ExistDbInitializerServlet.java
2012-04-06 16:43:24 UTC (rev 5917)
+++
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/servlets/ExistDbInitializerServlet.java
2012-04-06 20:15:12 UTC (rev 5918)
@@ -33,10 +33,8 @@
private Logger logger =
Logger.getLogger(ExistDbInitializerServlet.class);

/**
+ * Main function which initializes database
*
- * main function which initializes database
- *
- *
* @param dbContentDirPath
* - path to directory where database resource files are
stored
* @param configManager
@@ -147,7 +145,7 @@
PrintWriter out = resp.getWriter();
ConfigurationManager configManager;
configManager = ConfigurationManager.getInstance();
- String dbContentDirPath =
getServletContext().getRealPath("/")+"/db";
+ String dbContentDirPath =
getServletContext().getRealPath("/")+"db";
initializeDatabase(dbContentDirPath,
configManager);
out.append("DbInitializer - success");
} catch (IOException e) {

Modified:
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/summarization/SummarizationBuilder.java
===================================================================
---
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/summarization/SummarizationBuilder.java
2012-04-06 16:43:24 UTC (rev 5917)
+++
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/summarization/SummarizationBuilder.java
2012-04-06 20:15:12 UTC (rev 5918)
@@ -141,8 +141,7 @@
String[] eventTypeResults = dao.queryEventTypeResults();
String[] keywordResults = dao.queryKeywordResults();

- logger
-
.debug("LSSummaryServiceContent.getAllServicesSummaries: got summary from
database. Number of: ");
+
logger.debug("LSSummaryServiceContent.getAllServicesSummaries: got summary
from database. Number of: ");
logger.debug("- IP: [" + ipResults.length + "]");
logger.debug("- domains: [" + domainResults.length + "]");
logger.debug("- eventvTypes: [" + eventTypeResults.length +
"]");
@@ -202,8 +201,7 @@
String[] params = line.split(",", 2);

if (params.length != 2) {
- logger.debug("suppressing line; invalid
format(value='" + line
- + "')");
+ logger.debug("suppressing line; invalid
format(value='" + line + "')");
break;
}

@@ -232,7 +230,7 @@
summary.getKeywords().add(content);
break;
default:
- System.err.print("Uknown
SummarizationVariableType");
+ logger.error("Uknown
SummarizationVariableType");
}

}

Modified:
trunk/perfsonar-java-xml-ls/src/main/resources/org/perfsonar/resources/resources.properties
===================================================================
---
trunk/perfsonar-java-xml-ls/src/main/resources/org/perfsonar/resources/resources.properties
2012-04-06 16:43:24 UTC (rev 5917)
+++
trunk/perfsonar-java-xml-ls/src/main/resources/org/perfsonar/resources/resources.properties
2012-04-06 20:15:12 UTC (rev 5918)
@@ -1,4 +1,4 @@

registration.lsTTL.accepted = Your lsTTL parameter is accepted
-registration.lsTTL.notANumber = Your lsTTLParameter is not a number !
-registration.lsTTL.outOfBound = Your lsTTL parameter is out of bound
({0},{1}) sec.
+registration.lsTTL.notANumber = Your lsTTL parameter is not a number !
+registration.lsTTL.outOfBound = Your lsTTL parameter is out of bound
({0},{1}) sec.

Modified:
trunk/perfsonar-java-xml-ls/src/main/resources/perfsonar/conf/configuration-rules.xml
===================================================================
---
trunk/perfsonar-java-xml-ls/src/main/resources/perfsonar/conf/configuration-rules.xml
2012-04-06 16:43:24 UTC (rev 5917)
+++
trunk/perfsonar-java-xml-ls/src/main/resources/perfsonar/conf/configuration-rules.xml
2012-04-06 20:15:12 UTC (rev 5918)
@@ -1,10 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>

-
-
<digester-rules>

-
<object-create-rule
pattern="configuration"
classname="org.perfsonar.base2.service.configuration.Configuration"
/>

Modified:
trunk/perfsonar-java-xml-ls/src/main/resources/perfsonar/conf/webAdminConfig.xml
===================================================================
---
trunk/perfsonar-java-xml-ls/src/main/resources/perfsonar/conf/webAdminConfig.xml
2012-04-06 16:43:24 UTC (rev 5917)
+++
trunk/perfsonar-java-xml-ls/src/main/resources/perfsonar/conf/webAdminConfig.xml
2012-04-06 20:15:12 UTC (rev 5918)
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>

-
<wa:interface
xmlns:wa="http://webadmin.perfsonar.org/base2/waschema/v20090201";>

Modified: trunk/perfsonar-java-xml-ls/src/main/webapp/WEB-INF/conf/axis2.xml
===================================================================
--- trunk/perfsonar-java-xml-ls/src/main/webapp/WEB-INF/conf/axis2.xml
2012-04-06 16:43:24 UTC (rev 5917)
+++ trunk/perfsonar-java-xml-ls/src/main/webapp/WEB-INF/conf/axis2.xml
2012-04-06 20:15:12 UTC (rev 5918)
@@ -1,3 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
<!--
~ Licensed to the Apache Software Foundation (ASF) under one
~ or more contributor license agreements. See the NOTICE file

Modified:
trunk/perfsonar-java-xml-ls/src/main/webapp/WEB-INF/services/LookupService/META-INF/services.xml
===================================================================
---
trunk/perfsonar-java-xml-ls/src/main/webapp/WEB-INF/services/LookupService/META-INF/services.xml
2012-04-06 16:43:24 UTC (rev 5917)
+++
trunk/perfsonar-java-xml-ls/src/main/webapp/WEB-INF/services/LookupService/META-INF/services.xml
2012-04-06 20:15:12 UTC (rev 5918)
@@ -1,3 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN"
"http://www.springframework.org/dtd/spring-beans.dtd";>
+
<service name="LookupService" scope="application">
<description>
perfSONAR Lookup Service

Modified: trunk/perfsonar-java-xml-ls/src/main/webapp/db/LSStore-control.xml
===================================================================
--- trunk/perfsonar-java-xml-ls/db/LSStore-control.xml 2012-04-04 15:16:31
UTC (rev 5914)
+++ trunk/perfsonar-java-xml-ls/src/main/webapp/db/LSStore-control.xml
2012-04-06 20:15:12 UTC (rev 5918)
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<nmwg:store xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
xmlns:psservice="http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/";
xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";
xmlns:netutil="http://ggf.org/ns/nmwg/characteristic/utilization/2.0/";
type="LSStore-control">

</nmwg:store>
\ No newline at end of file

Modified: trunk/perfsonar-java-xml-ls/src/main/webapp/db/LSStore-summary.xml
===================================================================
--- trunk/perfsonar-java-xml-ls/db/LSStore-summary.xml 2012-04-04 15:16:31
UTC (rev 5914)
+++ trunk/perfsonar-java-xml-ls/src/main/webapp/db/LSStore-summary.xml
2012-04-06 20:15:12 UTC (rev 5918)
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<nmwg:store
xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";
xmlns:netutil="http://ggf.org/ns/nmwg/characteristic/utilization/2.0/";
xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
xmlns:psservice="http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/";
xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/"; type="LSStore-summary">

</nmwg:store>
\ No newline at end of file

Deleted: trunk/perfsonar-java-xml-ls/src/main/webapp/db/LSStore.xml
===================================================================
--- trunk/perfsonar-java-xml-ls/db/LSStore.xml 2012-04-04 15:16:31 UTC (rev
5914)
+++ trunk/perfsonar-java-xml-ls/src/main/webapp/db/LSStore.xml 2012-04-06
20:15:12 UTC (rev 5918)
@@ -1,3 +0,0 @@
-<nmwg:store xmlns:errors="http://ggf.org/ns/nmwg/characteristic/errors/2.0/";
xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";
xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
xmlns:psservice="http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/";
xmlns:discards="http://ggf.org/ns/nmwg/characteristic/discards/2.0/";
xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";
xmlns:netutil="http://ggf.org/ns/nmwg/characteristic/utilization/2.0/";
xmlns="http://ggf.org/ns/nmwg/base/2.0/"; type="LSStore">
-
-</nmwg:store>
\ No newline at end of file

Added: trunk/perfsonar-java-xml-ls/src/main/webapp/db/README
===================================================================
--- trunk/perfsonar-java-xml-ls/src/main/webapp/db/README
(rev 0)
+++ trunk/perfsonar-java-xml-ls/src/main/webapp/db/README 2012-04-06
20:15:12 UTC (rev 5918)
@@ -0,0 +1 @@
+Directory containing XML documents to initialise the DB content. Those
files are read-only.
\ No newline at end of file

Modified:
trunk/perfsonar-java-xml-ls/src/test/java/org/perfsonar/tests/components/XMLDBComponentTest.java
===================================================================
---
trunk/perfsonar-java-xml-ls/src/test/java/org/perfsonar/tests/components/XMLDBComponentTest.java
2012-04-06 16:43:24 UTC (rev 5917)
+++
trunk/perfsonar-java-xml-ls/src/test/java/org/perfsonar/tests/components/XMLDBComponentTest.java
2012-04-06 20:15:12 UTC (rev 5918)
@@ -154,7 +154,7 @@

// Initializing and clearing the DB thanks to the servlet
ExistDbInitializerServlet servlet = new ExistDbInitializerServlet();
- servlet.initializeDatabase("db",
ConfigurationManager.getInstanceWithoutRunningComponents());
+ servlet.initializeDatabase("target/test-classes/db",
ConfigurationManager.getInstanceWithoutRunningComponents());
logger.debug("db initialized");

// Running threads
@@ -170,7 +170,7 @@
// We need our own XMLDBComponent to handle the DB
connection (XMLRPC clients)
XMLDBComponent myXmlDbComp = null;
try {
- myXmlDbComp = (XMLDBComponent) ((XMLDBComponent)
ConfigurationManager.getInstanceWithoutRunningComponents().getConfiguration().getAuxiliaryComponent("existAccessManager")).clone();
+ myXmlDbComp = getXMLDBComponent();
} catch (PerfSONARException ex) {
logger.error(ex.getMessage());
fail();
@@ -185,7 +185,7 @@
} catch (PerfSONARException ex) {
logger.error(name + ": Error
uploading file: " + ex.getMessage());
// We got an exception, but we're not
sure the document has been uploaded or not...
- // So we just decrement counter so
the test passes ... blame eXist (1.2.6 at least) for not be very clear on
what happened
+ // So we just decrement counter so
the test passes ... blame eXist (1.2.6 at least) for not being very clear on
what happened
docsCount--;
}
Integer newCount =
getDocumentCount(myXmlDbComp);

Modified:
trunk/perfsonar-java-xml-ls/src/test/java/org/perfsonar/tests/utilities/ExistDBInitializerTests.java
===================================================================
---
trunk/perfsonar-java-xml-ls/src/test/java/org/perfsonar/tests/utilities/ExistDBInitializerTests.java
2012-04-06 16:43:24 UTC (rev 5917)
+++
trunk/perfsonar-java-xml-ls/src/test/java/org/perfsonar/tests/utilities/ExistDBInitializerTests.java
2012-04-06 20:15:12 UTC (rev 5918)
@@ -60,11 +60,11 @@
XMLDBComponent component = getDBAccessManager();

ExistDbInitializerServlet emt = new
ExistDbInitializerServlet();
- emt.initializeDatabase("db",
ConfigurationManager.getInstanceWithoutRunningComponents());
+ emt.initializeDatabase("target/test-classes/db",
ConfigurationManager.getInstanceWithoutRunningComponents());

component.performXQuery("xmldb:remove('/db/ls')");

- emt.initializeDatabase("db",
ConfigurationManager.getInstanceWithoutRunningComponents());
+ emt.initializeDatabase("target/test-classes/db",
ConfigurationManager.getInstanceWithoutRunningComponents());

XMLDBResult rs =
component.performXQuery("xmldb:collection-exists('/db/ls')");

Modified:
trunk/perfsonar-java-xml-ls/src/test/soapUI/src/org/perfsonar/soapUI/ls/TestUtil.java
===================================================================
---
trunk/perfsonar-java-xml-ls/src/test/soapUI/src/org/perfsonar/soapUI/ls/TestUtil.java
2012-04-06 16:43:24 UTC (rev 5917)
+++
trunk/perfsonar-java-xml-ls/src/test/soapUI/src/org/perfsonar/soapUI/ls/TestUtil.java
2012-04-06 20:15:12 UTC (rev 5918)
@@ -80,7 +80,6 @@
sb.append(c);
}
String s = sb.toString();
-// System.out.println(s);
System.out.println("XSD validation: "+validateXSD(s, new
File(f), Logger.getLogger(TestUtil.class)));
}

@@ -97,7 +96,6 @@
sb.append(c);
}
String s = sb.toString();
-// System.out.println(s);
System.out.println("RNC validation: "+validateRNC(s, new
File(f), Logger.getLogger(TestUtil.class)));
}
}

[pS-dev] [GEANT/SA2/ps-java-services] r5918 - in trunk/perfsonar-java-xml-ls: . doc/schema doc/schem a/rnc packaging packaging/debian samples/requests samples/ responses samples/store/sample src/main/java/org/perfsonar /service/lookupservice src/main/java/org/perfsonar/service /lookupservice/registration/summarization src/main/java/or g/perfsonar/service/lookupservice/servlets src/main/java/o rg/perfsonar/service/lookupservice/summarization src/main/ resources/org/perfsonar/resources src/main/resources/perfs onar/conf src/main/webapp src/main/webapp/WEB-INF/conf src /main/webapp/WEB-INF/services/LookupService/META-INF src/m ain/webapp/db src/test/java/org/perfsonar/tests/components src/test/java/org/perfsonar/tests/utilities src/test/soap UI/src/org/perfsonar/soapUI/ls, svn-noreply, 04/06/2012

List archive