perfsonar development work

Author: psnc.jedrzejewski
Date: 2010-10-05 12:00:01 +0100 (Tue, 05 Oct 2010)
New Revision: 5763

Added:
   trunk/perfsonar-java-xml-ls/doc/Collaboration.txt
   trunk/perfsonar-java-xml-ls/doc/LS_configuration_files.doc
   trunk/perfsonar-java-xml-ls/doc/LS_functionality_specification.doc
   trunk/perfsonar-java-xml-ls/doc/LS_installation_actions.doc
   trunk/perfsonar-java-xml-ls/doc/LS_interface_appendix.doc
   trunk/perfsonar-java-xml-ls/doc/LS_interface_specification.doc
   trunk/perfsonar-java-xml-ls/doc/License.txt
   trunk/perfsonar-java-xml-ls/doc/changelog.txt
   trunk/perfsonar-java-xml-ls/doc/diagrams/
   
trunk/perfsonar-java-xml-ls/doc/diagrams/LS-workflow_LSDeregisterRequest.dia
   trunk/perfsonar-java-xml-ls/doc/diagrams/LS-workflow_LSQueryRequest.dia
   trunk/perfsonar-java-xml-ls/doc/diagrams/LS-workflow_LSRegisterRequest.dia
   trunk/perfsonar-java-xml-ls/doc/diagrams/LS_classdiagram_MessageHandler.dia
   trunk/perfsonar-java-xml-ls/doc/diagrams/LS_classdiagram_ServiceEngine.dia
   trunk/perfsonar-java-xml-ls/doc/schema/
   trunk/perfsonar-java-xml-ls/doc/schema/rnc/
   trunk/perfsonar-java-xml-ls/doc/schema/rnc/EchoRequest.rnc
   trunk/perfsonar-java-xml-ls/doc/schema/rnc/EchoResponse.rnc
   trunk/perfsonar-java-xml-ls/doc/schema/rnc/LSDeregisterRequest.rnc
   trunk/perfsonar-java-xml-ls/doc/schema/rnc/LSDeregisterResponse.rnc
   trunk/perfsonar-java-xml-ls/doc/schema/rnc/LSKeepaliveRequest.rnc
   trunk/perfsonar-java-xml-ls/doc/schema/rnc/LSKeepaliveResponse.rnc
   trunk/perfsonar-java-xml-ls/doc/schema/rnc/LSQueryRequest.rnc
   trunk/perfsonar-java-xml-ls/doc/schema/rnc/LSQueryResponse.rnc
   trunk/perfsonar-java-xml-ls/doc/schema/rnc/LSRegisterRequest.rnc
   trunk/perfsonar-java-xml-ls/doc/schema/rnc/LSRegisterResponse.rnc
Removed:
   trunk/perfsonar-java-xml-ls/doc/changelog
Modified:
   trunk/perfsonar-java-xml-ls/pom.xml
Log:
documentation added

Added: trunk/perfsonar-java-xml-ls/doc/Collaboration.txt
===================================================================
--- trunk/perfsonar-java-xml-ls/doc/Collaboration.txt                         
  (rev 0)
+++ trunk/perfsonar-java-xml-ls/doc/Collaboration.txt   2010-10-05 11:00:01 
UTC (rev 5763)
@@ -0,0 +1,27 @@
+
+This software is the result of join efforts of the following perfSONAR 
project participants:
+
+- Arnes
+- CARnet
+- Cesnet
+- Dante
+- Belnet
+- Das Deutsche Forschungsnetz (DFN)
+- Energy Sciences Network (ESnet)
+- FCCN
+- GARR
+- GRnet
+- Internet2
+- IST
+- Poznan Supercomputing and Networking Center (PSNC)
+- Rede Nacional de Ensino e Pesquisa (RNP)
+- RedIRIS
+- Renater
+- SURFnet
+- SWITCH
+- Uninett
+- University of Delaware
+
+
+
+ -- Roman Lapacz 
<>
  Mon, 05 Jan 2009 12:00:00 +0200

Added: trunk/perfsonar-java-xml-ls/doc/LS_configuration_files.doc
===================================================================
(Binary files differ)


Property changes on: 
trunk/perfsonar-java-xml-ls/doc/LS_configuration_files.doc
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/perfsonar-java-xml-ls/doc/LS_functionality_specification.doc
===================================================================
(Binary files differ)


Property changes on: 
trunk/perfsonar-java-xml-ls/doc/LS_functionality_specification.doc
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/perfsonar-java-xml-ls/doc/LS_installation_actions.doc
===================================================================
(Binary files differ)


Property changes on: 
trunk/perfsonar-java-xml-ls/doc/LS_installation_actions.doc
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/perfsonar-java-xml-ls/doc/LS_interface_appendix.doc
===================================================================
(Binary files differ)


Property changes on: trunk/perfsonar-java-xml-ls/doc/LS_interface_appendix.doc
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/perfsonar-java-xml-ls/doc/LS_interface_specification.doc
===================================================================
(Binary files differ)


Property changes on: 
trunk/perfsonar-java-xml-ls/doc/LS_interface_specification.doc
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/perfsonar-java-xml-ls/doc/License.txt
===================================================================
--- trunk/perfsonar-java-xml-ls/doc/License.txt                         (rev 
0)
+++ trunk/perfsonar-java-xml-ls/doc/License.txt 2010-10-05 11:00:01 UTC (rev 
5763)
@@ -0,0 +1,24 @@
+* 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.

Deleted: trunk/perfsonar-java-xml-ls/doc/changelog
===================================================================
--- trunk/perfsonar-java-xml-ls/doc/changelog   2010-10-04 15:05:26 UTC (rev 
5762)
+++ trunk/perfsonar-java-xml-ls/doc/changelog   2010-10-05 11:00:01 UTC (rev 
5763)
@@ -1,64 +0,0 @@
-perfsonar-java-xml-ls (1.5-1)
-  
-  * Fixes: bugs fixes PSSERVICES-503
-  * New: old naming policy supported geant2-java-xml-ls - improved
-  * Fixes: bugs fixes PSSERVICES-443, PSSERVICES-479
-  * New: old naming policy supported geant2-java-xml-ls
-  * Fixes: bugs fixes
-  * Fixes: bugs fixes
-  * Change: new naming policy(perfsonar-java-xml-ls)
-  * Change: psBase2 used instead psBase1
-  * New: new web-admin
-  * New: summarization added
-
-perfsonar-java-xml-ls (1.4-1)
-  
-  * Change: removed admin-guide document
-  * Change: changed package name to perfsonar-java-xml-ls
-
-geant2-java-xml-ls (1.3.1-1)
-
-  * bug fix in gLS registration
-  * Final release, license added
-  * Change: nmwg-jar=nmwg-1.0.20090304.jar
-  * Change: ps-antxml-ver=1.0.20080204
-  * Change: ps-jar-ver=1.0.20090316
-  * Change: ps-webadmin=0.9.8b
-
-geant2-java-xml-ls (1.3-12)
-
-  * Final release, license added
-  * Change: nmwg-jar=nmwg-1.0.20081015.jar
-  * Change: ps-antxml-ver=1.0.20080204
-  * Change: ps-jar-ver=1.0.20080924
-  * Change: ps-webadmin=0.9.8b
-
-geant2-java-xml-ls (1.3-11)
-
-  * Change: Webadmin deployment test works
-  * Fixes bugs 649, 690, 685, 680
-  * Change: nmwg-jar=nmwg-1.0.20081015.jar
-  * Change: ps-antxml-ver=1.0.20080204
-  * Change: ps-jar-ver=1.0.20080924
-  * Change: ps-webadmin=0.9.8b
- 
- geant2-java-xml-ls (1.3-10)
-
-  * Change: Webadmin deployment test works
-  * Fixes in scripts
-  * New: WebAdmin wizard script improvements
-  * New: Support for OWAMP
-  * New: Support for more eventTypes
-  * New: XQuery supports 'escaped' parameter, rejects other
-  * New: XQuery return eventType
-  * New: LSDiscovery for hLS
-  * New: Global LS implementation
-  * New: Registration to LS (hLS to gLS) 
-  * New: IP addresses summarization (hLS)
-  * New: Self test implemented
-  * New: Packaging (DEB+RPM)
-  * New: Authentication
-  * Change: nmwg-jar=nmwg-1.0.20081015.jar
-  * Change: ps-antxml-ver=1.0.20080204
-  * Change: ps-jar-ver=1.0.20080924
-  * Change: ps-webadmin=0.9.8b

Added: trunk/perfsonar-java-xml-ls/doc/changelog.txt
===================================================================
--- trunk/perfsonar-java-xml-ls/doc/changelog.txt                             
  (rev 0)
+++ trunk/perfsonar-java-xml-ls/doc/changelog.txt       2010-10-05 11:00:01 
UTC (rev 5763)
@@ -0,0 +1,129 @@
+Lookup Service changelog 
+============================
+
+XML LS 1.5  
+- Fixes: bugs fixes PSSERVICES-503
+- New: old naming policy supported geant2-java-xml-ls - improved
+- Fixes: bugs fixes PSSERVICES-443, PSSERVICES-479
+- New: old naming policy supported geant2-java-xml-ls
+- Fixes: bugs fixes
+- Fixes: bugs fixes
+- Change: new naming policy(perfsonar-java-xml-ls)
+- Change: psBase2 used instead psBase1
+- New: new web-admin
+- New: summarization added
+
+XML LS 1.4
+- Change: removed admin-guide document
+- Change: changed package name to perfsonar-java-xml-ls
+
+XML LS 1.3 RC7
+- New: XQuery supports 'escaped' parameter, rejects other
+- New: XQuery return eventType
+- New: LSDiscovery for hLS
+- Jar versions:
+    nmwg-jar-ver=1.0.20080911
+    ps-antxml-ver=1.0.20080911
+    ps-jar-ver=1.0.20080717
+    ps-webadmin=0.8.3b
+
+XML LS 1.3 RC6
+- LS Discovery
+- bootstrapping for hLS to register to gLS from root.hints
+- Jar versions:
+    nmwg-jar-ver=1.0.20080911
+    ps-antxml-ver=1.0.20080911
+    ps-jar-ver=1.0.20080717
+    ps-webadmin=0.8.3b
+
+XML LS 1.3 RC4
+- home/global LS
+- home LS registration to global LS
+- summarization (eventTYpes, IPs, domains, keywords)
+- self test
+- Jar versions:
+    nmwg-jar-ver=1.0.20080630
+    ps-antxml-ver=1.0.20080204
+    ps-jar-ver=1.0.20080717
+    ps-webadmin=0.8.3b
+
+XML LS 1.2
+
+- final version
+
+XML LS 1.2 RC7
+- path for log4j log file corrected (now points to /opt/perfsonar)
+- Jar versions:
+    nmwg-jar-ver=1.0.20080124
+    ps-antxml-ver=1.0.20080204
+    ps-jar-ver=1.0.20080310
+    ps-webadmin=0.8.3b
+
+XML LS 1.2 RC6
+- new package_builder script used
+- installation in /opt/perfsonar now instead of /home/perfsonar
+- Jar versions:
+    nmwg-jar-ver=1.0.20080124
+    ps-antxml-ver=1.0.20080204
+    ps-jar-ver=1.0.20080310
+    ps-webadmin=0.8.3b
+    
+XML LS 1.2 RC5
+- ErrorResponse introduced to the documentation. RNC files modified
+- RPM installer scripts (new package_builder script used)
+- Jar versions:
+    nmwg-jar-ver=1.0.20080124
+    ps-antxml-ver=1.0.20080204
+    ps-jar-ver=1.0.20080310
+    ps-webadmin=0.8.1b
+
+
+XML LS 1.2 RC4
+- new ps-base containing ErrorResponse changes
+- web admin comments, wizard changes
+- helper scripts for creating RPMs
+- comments in config files
+- Jar versions:
+    nmwg-jar-ver=1.0.20080124
+    ps-antxml-ver=1.0.20080204
+    ps-jar-ver=1.0.20080310
+    ps-webadmin=0.7b
+    
+XML LS 1.2 RC2
+- bug fix "nmwgr" namespace in response result code
+- new RNC files
+- webadmin servlets
+- new documentation
+    
+XML LS 1.2 RC1
+- NMWG classes fix (text fields)
+- new internal structure (DAO)
+- most of internal queries/updates rewritten
+- Faster "Multiple files storage" implemneted
+- new Message Handler for handling LSRegisterRequest
+- LS Registrator component improved (supports keepalives)
+- new directory structure (new SVN structure)
+- new configuration/installation scripts (including exist configuration)
+    
+XML LS 1.1.1
+- ant targets fixes
+
+2007-03-26 XML LS 1.1
+- New Message Handler
+- Exist HTTP access
+- Result codes
+- Performance improvements, bugs fixes
+- Echo Request (with LS-echo functionality for testing DB connection and 
configuration)
+- LS Cleanup rewritten
+- New installation/configuration (ant targets)
+
+------------------------------------
+Planned 
+/XML LS 1.3-planned functionality:
+/- manual TTL for registration
+/- LSCleanup time in new format!
+
+/XML LS 2.0-planned
+/- multi LS protocol (with separate DAO)
+/- base2 impl.
+

Added: 
trunk/perfsonar-java-xml-ls/doc/diagrams/LS-workflow_LSDeregisterRequest.dia
===================================================================
(Binary files differ)


Property changes on: 
trunk/perfsonar-java-xml-ls/doc/diagrams/LS-workflow_LSDeregisterRequest.dia
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/perfsonar-java-xml-ls/doc/diagrams/LS-workflow_LSQueryRequest.dia
===================================================================
(Binary files differ)


Property changes on: 
trunk/perfsonar-java-xml-ls/doc/diagrams/LS-workflow_LSQueryRequest.dia
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: 
trunk/perfsonar-java-xml-ls/doc/diagrams/LS-workflow_LSRegisterRequest.dia
===================================================================
(Binary files differ)


Property changes on: 
trunk/perfsonar-java-xml-ls/doc/diagrams/LS-workflow_LSRegisterRequest.dia
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: 
trunk/perfsonar-java-xml-ls/doc/diagrams/LS_classdiagram_MessageHandler.dia
===================================================================
(Binary files differ)


Property changes on: 
trunk/perfsonar-java-xml-ls/doc/diagrams/LS_classdiagram_MessageHandler.dia
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: 
trunk/perfsonar-java-xml-ls/doc/diagrams/LS_classdiagram_ServiceEngine.dia
===================================================================
(Binary files differ)


Property changes on: 
trunk/perfsonar-java-xml-ls/doc/diagrams/LS_classdiagram_ServiceEngine.dia
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/perfsonar-java-xml-ls/doc/schema/rnc/EchoRequest.rnc
===================================================================
--- trunk/perfsonar-java-xml-ls/doc/schema/rnc/EchoRequest.rnc                
          (rev 0)
+++ trunk/perfsonar-java-xml-ls/doc/schema/rnc/EchoRequest.rnc  2010-10-05 
11:00:01 UTC (rev 5763)
@@ -0,0 +1,54 @@
+namespace nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+
+start = element nmwg:message { MessageContent }
+
+MessageContent =
+        Identifier? &
+        MessageIdentifierRef? &
+        Type &
+        Metadata+ &
+        Data+
+
+Identifier =
+        attribute id { xsd:string }
+
+MessageIdentifierRef =
+        attribute messageIdRef { xsd:string }
+
+Type =
+        attribute type { "EchoRequest" }
+
+Metadata =
+        element nmwg:metadata {
+                (       Identifier &
+                        MetadataIdentifierRef?
+                )
+                & EventType
+                & Parameters?
+        }
+
+MetadataIdentifierRef =
+        attribute metadataIdRef { xsd:string }
+
+EventType =
+        element nmwg:eventType {
+            "http://schemas.perfsonar.net/tools/admin/echo/ls/2.0"; |
+            "http://schemas.perfsonar.net/tools/admin/echo/2.0";
+            }
+
+Parameters = 
+       element nmwg:parameters { Parameter* }
+
+Parameter =
+       element nmwg:parameter {
+           attribute name { xsd:string } &
+           attribute value { xsd:string } &
+           text?
+       }
+
+Data =
+        element nmwg:data {
+                        Identifier &
+                        MetadataIdentifierRef
+        }
+        
\ No newline at end of file

Added: trunk/perfsonar-java-xml-ls/doc/schema/rnc/EchoResponse.rnc
===================================================================
--- trunk/perfsonar-java-xml-ls/doc/schema/rnc/EchoResponse.rnc               
          (rev 0)
+++ trunk/perfsonar-java-xml-ls/doc/schema/rnc/EchoResponse.rnc 2010-10-05 
11:00:01 UTC (rev 5763)
@@ -0,0 +1,44 @@
+namespace nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+namespace nmwgr="http://ggf.org/ns/nmwg/result/2.0/";
+
+
+start = element nmwg:message { MessageContent }
+
+MessageContent =
+        Identifier? &
+        MessageIdentifierRef? &
+        Type? &
+        Metadata+ &
+        Data+
+
+Identifier =
+        attribute id { xsd:string }
+
+MessageIdentifierRef =
+        attribute messageIdRef { xsd:string }
+
+Type =
+        attribute type { "EchoResponse" | "ErrorResponse" }
+
+Metadata =
+        element nmwg:metadata {
+                  Identifier &
+                  MetadataIdentifierRef? &
+                  ResultCode
+        }
+
+MetadataIdentifierRef =
+        attribute metadataIdRef { xsd:string }
+
+ResultCode =
+        element nmwg:eventType { xsd:string }
+
+Data =
+        element nmwg:data {
+                        Identifier &
+                        MetadataIdentifierRef &
+                        ResultCodeDatum
+        }
+
+ResultCodeDatum =
+        element nmwgr:datum { xsd:string }
\ No newline at end of file

Added: trunk/perfsonar-java-xml-ls/doc/schema/rnc/LSDeregisterRequest.rnc
===================================================================
--- trunk/perfsonar-java-xml-ls/doc/schema/rnc/LSDeregisterRequest.rnc        
                  (rev 0)
+++ trunk/perfsonar-java-xml-ls/doc/schema/rnc/LSDeregisterRequest.rnc  
2010-10-05 11:00:01 UTC (rev 5763)
@@ -0,0 +1,55 @@
+namespace nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+
+start = element nmwg:message { MessageContent }
+
+MessageContent =
+        Identifier? &
+        MessageIdentifierRef? &
+        Type &
+        Metadata+ &
+        Data+
+
+Identifier =
+        attribute id { xsd:string }
+
+MessageIdentifierRef =
+        attribute messageIdRef { xsd:string }
+
+Type =
+        attribute type { "LSDeregisterRequest" }
+
+Metadata =
+        element nmwg:metadata {
+            Identifier & 
+            MetadataIdentifierRef? &
+            Key
+        }
+
+Key =
+        element nmwg:key { 
+            Identifier? & 
+            ParametersBlock 
+        }
+
+ParametersBlock = 
+        element nmwg:parameters {
+            Identifier? &
+            Parameter+ 
+        }
+
+Parameter = 
+        element nmwg:parameter {
+            attribute name { "lsKey" } & 
+            (attribute value { xsd:string })? &
+            text?
+}
+
+
+Data =
+        element nmwg:data {
+            Identifier &
+            MetadataIdentifierRef
+        }
+
+MetadataIdentifierRef =
+        attribute metadataIdRef { xsd:string }
\ No newline at end of file

Added: trunk/perfsonar-java-xml-ls/doc/schema/rnc/LSDeregisterResponse.rnc
===================================================================
--- trunk/perfsonar-java-xml-ls/doc/schema/rnc/LSDeregisterResponse.rnc       
                  (rev 0)
+++ trunk/perfsonar-java-xml-ls/doc/schema/rnc/LSDeregisterResponse.rnc 
2010-10-05 11:00:01 UTC (rev 5763)
@@ -0,0 +1,44 @@
+namespace nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+namespace nmwgr="http://ggf.org/ns/nmwg/result/2.0/";
+
+
+start = element nmwg:message { MessageContent }
+
+MessageContent =
+        Identifier? &
+        MessageIdentifierRef? &
+        Type? &
+        Metadata+ &
+        Data+
+
+Identifier =
+        attribute id { xsd:string }
+
+MessageIdentifierRef =
+        attribute messageIdRef { xsd:string }
+
+Type =
+        attribute type { "LSDeregisterResponse" | "ErrorResponse"  }
+
+Metadata =
+        element nmwg:metadata {
+                  Identifier &
+                  MetadataIdentifierRef? &
+                  ResultCode
+        }
+
+MetadataIdentifierRef =
+        attribute metadataIdRef { xsd:string }
+
+ResultCode =
+        element nmwg:eventType { xsd:string }
+
+Data =
+        element nmwg:data {
+                        Identifier &
+                        MetadataIdentifierRef &
+                        ResultCodeDatum
+        }
+
+ResultCodeDatum =
+        element nmwgr:datum { xsd:string }
\ No newline at end of file

Added: trunk/perfsonar-java-xml-ls/doc/schema/rnc/LSKeepaliveRequest.rnc
===================================================================
--- trunk/perfsonar-java-xml-ls/doc/schema/rnc/LSKeepaliveRequest.rnc         
                  (rev 0)
+++ trunk/perfsonar-java-xml-ls/doc/schema/rnc/LSKeepaliveRequest.rnc   
2010-10-05 11:00:01 UTC (rev 5763)
@@ -0,0 +1,51 @@
+namespace nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+
+start = element nmwg:message { MessageContent }
+
+MessageContent =
+        Identifier? &
+        MessageIdentifierRef? &
+        Type &
+        Metadata+ & 
+        Data+
+
+Identifier =
+        attribute id { xsd:string }
+
+MessageIdentifierRef =
+        attribute messageIdRef { xsd:string }
+
+Type =
+        attribute type { "LSKeepaliveRequest" }
+
+Metadata =
+        element nmwg:metadata {
+            Identifier & 
+            MetadataIdentifierRef? &
+            Key
+        }
+
+Key =
+        element nmwg:key { ParametersBlock }
+
+ParametersBlock = 
+        element nmwg:parameters {
+            Identifier &
+            Parameter+ 
+        }
+
+Parameter = 
+        element nmwg:parameter {
+            attribute name { "lsKey" } & 
+            (attribute value { xsd:string })? &
+            text?
+}
+
+Data =
+        element nmwg:data {
+            Identifier &
+            MetadataIdentifierRef
+        }
+
+MetadataIdentifierRef =
+        attribute metadataIdRef { xsd:string }
\ No newline at end of file

Added: trunk/perfsonar-java-xml-ls/doc/schema/rnc/LSKeepaliveResponse.rnc
===================================================================
--- trunk/perfsonar-java-xml-ls/doc/schema/rnc/LSKeepaliveResponse.rnc        
                  (rev 0)
+++ trunk/perfsonar-java-xml-ls/doc/schema/rnc/LSKeepaliveResponse.rnc  
2010-10-05 11:00:01 UTC (rev 5763)
@@ -0,0 +1,44 @@
+namespace nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+namespace nmwgr="http://ggf.org/ns/nmwg/result/2.0/";
+
+
+start = element nmwg:message { MessageContent }
+
+MessageContent =
+        Identifier? &
+        MessageIdentifierRef? &
+        Type? &
+        Metadata+ &
+        Data+
+
+Identifier =
+        attribute id { xsd:string }
+
+MessageIdentifierRef =
+        attribute messageIdRef { xsd:string }
+
+Type =
+        attribute type { "LSKeepaliveResponse" | "ErrorResponse"  }
+
+Metadata =
+        element nmwg:metadata {
+                  Identifier &
+                  MetadataIdentifierRef? &
+                  ResultCode
+        }
+
+MetadataIdentifierRef =
+        attribute metadataIdRef { xsd:string }
+
+ResultCode =
+        element nmwg:eventType { xsd:string }
+
+Data =
+        element nmwg:data {
+                        Identifier &
+                        MetadataIdentifierRef &
+                        ResultCodeDatum
+        }
+
+ResultCodeDatum =
+        element nmwgr:datum { xsd:string }
\ No newline at end of file

Added: trunk/perfsonar-java-xml-ls/doc/schema/rnc/LSQueryRequest.rnc
===================================================================
--- trunk/perfsonar-java-xml-ls/doc/schema/rnc/LSQueryRequest.rnc             
                  (rev 0)
+++ trunk/perfsonar-java-xml-ls/doc/schema/rnc/LSQueryRequest.rnc       
2010-10-05 11:00:01 UTC (rev 5763)
@@ -0,0 +1,58 @@
+namespace nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+namespace 
xquery="http://ggf.org/ns/nmwg/tools/org/perfsonar/service/lookup/xquery/1.0/";
+start = element nmwg:message { MessageContent }
+
+MessageContent =
+        Identifier? &
+        MessageIdentifierRef? &
+        Type &
+        Metadata+ &
+        Data+
+
+Identifier =
+        attribute id { xsd:string }
+
+MessageIdentifierRef =
+        attribute messageIdRef { xsd:string }
+
+Type =
+        attribute type { "LSQueryRequest" }
+
+Metadata =
+        element nmwg:metadata {
+            Identifier & 
+            MetadataIdentifierRef? &
+            QuerySubject &
+            QueryType
+        }
+
+QuerySubject =
+        element xquery:subject { 
+            Identifier? &
+            text 
+        }
+        
+# usually textual XQuery, but may contain other tags!        
+#AnyElement =
+#  element * {
+#    (attribute * { text }
+#     | text
+#     | AnyElement)*
+#  }        
+        
+QueryType =
+        element nmwg:eventType { 
+          "service.lookup.xquery" |  
+          "service.lookup.xpath" |
+          "http://www.w3.org/TR/xquery/"; |
+          "http://www.w3.org/TR/xpath";
+          }
+
+Data =
+        element nmwg:data {
+            Identifier &
+            MetadataIdentifierRef
+        }
+
+MetadataIdentifierRef =
+        attribute metadataIdRef { xsd:string }
\ No newline at end of file

Added: trunk/perfsonar-java-xml-ls/doc/schema/rnc/LSQueryResponse.rnc
===================================================================
--- trunk/perfsonar-java-xml-ls/doc/schema/rnc/LSQueryResponse.rnc            
                  (rev 0)
+++ trunk/perfsonar-java-xml-ls/doc/schema/rnc/LSQueryResponse.rnc      
2010-10-05 11:00:01 UTC (rev 5763)
@@ -0,0 +1,56 @@
+namespace nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+namespace nmwgr="http://ggf.org/ns/nmwg/result/2.0/";
+namespace psservice="http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/";
+
+start = element nmwg:message { MessageContent }
+
+MessageContent =
+        Identifier? &
+        MessageIdentifierRef? &
+        Type? &
+        Metadata+ & 
+        Data+
+
+Identifier =
+        attribute id { xsd:string }
+
+MessageIdentifierRef =
+        attribute messageIdRef { xsd:string }
+
+Type =
+        attribute type { "LSQueryResponse" | "ErrorResponse"  }
+
+Metadata =
+        element nmwg:metadata {
+                Identifier &
+                MetadataIdentifierRef? &
+                ResultCode ?
+        }
+
+MetadataIdentifierRef =
+        attribute metadataIdRef { xsd:string }
+
+ResultCode =
+        element nmwg:eventType { xsd:string }
+
+Data =
+        element nmwg:data {
+                        Identifier &
+                        MetadataIdentifierRef &
+                        (XQueryResults* | DatumResultCode)
+        }
+
+       
+DatumResultCode =
+        element nmwgr:datum { xsd:string }
+        
+
+XQueryResults =
+        element psservice:datum { AnyElement* }
+        
+AnyElement =
+  element * {
+    (attribute * { text }
+     | text
+     | AnyElement)*
+  }        
\ No newline at end of file

Added: trunk/perfsonar-java-xml-ls/doc/schema/rnc/LSRegisterRequest.rnc
===================================================================
--- trunk/perfsonar-java-xml-ls/doc/schema/rnc/LSRegisterRequest.rnc          
                  (rev 0)
+++ trunk/perfsonar-java-xml-ls/doc/schema/rnc/LSRegisterRequest.rnc    
2010-10-05 11:00:01 UTC (rev 5763)
@@ -0,0 +1,69 @@
+namespace nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+namespace nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
+namespace psservice="http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/";
+namespace perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";
+
+start = element nmwg:message { MessageContent }
+
+MessageContent =
+        Identifier? &
+        MessageIdentifierRef? &
+        Type &
+        Metadata+ &
+        Data+
+
+Identifier =
+        attribute id { xsd:string }
+
+MessageIdentifierRef =
+        attribute messageIdRef { xsd:string }
+
+Type =
+        attribute type { "LSRegisterRequest" }
+
+Metadata=
+        element nmwg:metadata {
+              Identifier &
+              MetadataIdentifierRef? &
+              AnyElement*
+                  
+        }
+
+#Metadata accepts any subelement...
+AnyElement =
+  element * {
+    (attribute * { text }
+     | text
+     | AnyElement)*
+  }
+
+
+MetadataIdentifierRef =
+        attribute metadataIdRef { xsd:string }
+
+#ServiceSubject = element perfsonar:subject {
+#              Identifier? &
+#              ServiceInfo
+#        }
+#
+# ServiceInfo =
+#        element psservice:service {
+#                (
+#                        Identifier? &
+#                        element psservice:serviceName        {text}   &
+#                        element psservice:accessPoint        {text}   &
+#                        element psservice:serviceType        {text}   &
+#                        element psservice:serviceDescription {text} ? &
+#                        element psservice:organization       {text} ? &
+#                        element psservice:contactEmail       {text} ? &
+#                        element psservice:serviceVersion     {text} ?
+#                )
+#        }
+
+Data =
+        element nmwg:data {
+              Identifier &
+              MetadataIdentifierRef &
+              Metadata ?             
+        }
+

Added: trunk/perfsonar-java-xml-ls/doc/schema/rnc/LSRegisterResponse.rnc
===================================================================
--- trunk/perfsonar-java-xml-ls/doc/schema/rnc/LSRegisterResponse.rnc         
                  (rev 0)
+++ trunk/perfsonar-java-xml-ls/doc/schema/rnc/LSRegisterResponse.rnc   
2010-10-05 11:00:01 UTC (rev 5763)
@@ -0,0 +1,72 @@
+namespace nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+namespace nmwgr="http://ggf.org/ns/nmwg/result/2.0/";
+
+start = element nmwg:message { MessageContent }
+
+MessageContent =
+        Identifier? &
+        MessageIdentifierRef? &
+        Type &
+        Metadata+ &
+        Data+
+
+Identifier =
+        attribute id { xsd:string }
+
+MessageIdentifierRef =
+        attribute messageIdRef { xsd:string }
+
+Type =
+        attribute type { "LSRegisterResponse" | "ErrorResponse"  }
+
+Metadata =
+        element nmwg:metadata {
+            Identifier &
+            MetadataIdentifierRef? &
+            ResultCode &
+            Key?
+        }
+
+Key =
+        element nmwg:key { 
+            Identifier? & 
+            ParametersBlock }
+
+ParametersBlock = 
+        element nmwg:parameters {
+            Identifier? &
+            Parameter+ 
+        }
+
+Parameter = 
+        element nmwg:parameter {
+            attribute name { "lsKey" } & 
+            (attribute value { xsd:string })? &
+            text?
+}
+
+MetadataIdentifierRef =
+        attribute metadataIdRef { xsd:string }
+
+ResultCode =
+        element nmwg:eventType { 
+             xsd:string    
+        }
+
+Parameters =
+        element nmwg:parameters {
+                Identifier? &
+                Parameter
+        }
+
+
+Data =
+        element nmwg:data
+        {
+                Identifier &
+                MetadataIdentifierRef &
+                Datum
+        }
+
+Datum =
+        element nmwgr:datum { xsd:string }
\ No newline at end of file

Modified: trunk/perfsonar-java-xml-ls/pom.xml
===================================================================
--- trunk/perfsonar-java-xml-ls/pom.xml 2010-10-04 15:05:26 UTC (rev 5762)
+++ trunk/perfsonar-java-xml-ls/pom.xml 2010-10-05 11:00:01 UTC (rev 5763)
@@ -127,8 +127,8 @@
                                                                <replacement>
                                                                        
<token>%PORT%</token>
                                                                        
<value>${port}</value>
-                                           </replacement>
-                                       </replacements>              
+                                                               </replacement>
+                                                       </replacements>
                                                </configuration>
                                        </execution>
                                </executions>
@@ -166,28 +166,28 @@
        <repositories>
 
                <repository>
-      <id>ibiblio</id> 
-      <name>ibiblio repository</name> 
-      <url>http://www.ibiblio.org/maven2</url> 
-    </repository>
-    
-    <repository>
-      <id>geant-repository</id>
-      <name>perfSONAR repository</name>
-      <url>http://maven.geant.net/repo</url>
-    </repository>
-  </repositories>
-  
-  <distributionManagement>
-    <repository>
-      <id>geant-developers-repository</id>
-      <name>perfSONAR repository</name>
-      
<url>scpexe:///repo</url>
-      <uniqueVersion>false</uniqueVersion>
-    </repository>
-  </distributionManagement>
+                       <id>ibiblio</id>
+                       <name>ibiblio repository</name>
+                       <url>http://www.ibiblio.org/maven2</url>
+               </repository>
 
+               <repository>
+                       <id>geant-repository</id>
+                       <name>perfSONAR repository</name>
+                       <url>http://maven.geant.net/repo</url>
+               </repository>
+       </repositories>
 
+       <distributionManagement>
+               <repository>
+                       <id>geant-developers-repository</id>
+                       <name>perfSONAR repository</name>
+                       
<url>scpexe:///repo</url>
+                       <uniqueVersion>false</uniqueVersion>
+               </repository>
+       </distributionManagement>
+
+
        <dependencies>
                <dependency>
                        <groupId>javax.servlet</groupId>
@@ -215,9 +215,9 @@
                <!-- taken from axis2 sources -->
 
                <dependency>
-                       <groupId>perfsonar</groupId>
+                       <groupId>net.geant.perfsonar</groupId>
                        <artifactId>ps-mdm-base2</artifactId>
-                       <version>1.0.4</version>
+                       <version>1.0.5</version>
                </dependency>
 
                <dependency>