perfsonar development work

Author: psnc.pietrzak
Date: 2013-01-16 12:05:48 +0000 (Wed, 16 Jan 2013)
New Revision: 6105

Added:
   
trunk/psBase3/perfsonar-base-annotations/src/main/java/net/geant/perfsonar/annotations/LookupServiceRegister.java
   
trunk/psBase3/perfsonar-base-annotations/src/main/java/net/geant/perfsonar/annotations/request/
   
trunk/psBase3/perfsonar-base-annotations/src/main/java/net/geant/perfsonar/annotations/request/MetadataKey.java
   
trunk/psBase3/perfsonar-base-annotations/src/main/java/net/geant/perfsonar/annotations/request/SetupData.java
   
trunk/psBase3/perfsonar-base-annotations/src/main/java/net/geant/perfsonar/annotations/request/package-info.java
Removed:
   
trunk/psBase3/perfsonar-base-annotations/src/main/java/net/geant/perfsonar/annotations/MetadataKey.java
   
trunk/psBase3/perfsonar-base-annotations/src/main/java/net/geant/perfsonar/annotations/Request.java
   
trunk/psBase3/perfsonar-base-annotations/src/main/java/net/geant/perfsonar/annotations/SetupData.java
Modified:
   trunk/psBase3/perfsonar-base-annotations/
   
trunk/psBase3/perfsonar-base-annotations/src/main/java/net/geant/perfsonar/annotations/Namespace.java
   
trunk/psBase3/perfsonar-base-annotations/src/main/java/net/geant/perfsonar/annotations/XPath.java
Log:
Code cleanup.


Property changes on: trunk/psBase3/perfsonar-base-annotations
___________________________________________________________________
Added: svn:ignore
   + .settings
.classpath
.project


Added: 
trunk/psBase3/perfsonar-base-annotations/src/main/java/net/geant/perfsonar/annotations/LookupServiceRegister.java
===================================================================
--- 
trunk/psBase3/perfsonar-base-annotations/src/main/java/net/geant/perfsonar/annotations/LookupServiceRegister.java
                           (rev 0)
+++ 
trunk/psBase3/perfsonar-base-annotations/src/main/java/net/geant/perfsonar/annotations/LookupServiceRegister.java
   2013-01-16 12:05:48 UTC (rev 6105)
@@ -0,0 +1,18 @@
+package net.geant.perfsonar.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Denotes the method that provides data to Lookup Service registration.
+ * 
+ * @author <a 
href="mailto:">Blazej
 Pietrzak</a>
+ *
+ */
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.SOURCE)
+public @interface LookupServiceRegister {
+
+}

Deleted: 
trunk/psBase3/perfsonar-base-annotations/src/main/java/net/geant/perfsonar/annotations/MetadataKey.java
===================================================================
--- 
trunk/psBase3/perfsonar-base-annotations/src/main/java/net/geant/perfsonar/annotations/MetadataKey.java
     2013-01-16 11:49:30 UTC (rev 6104)
+++ 
trunk/psBase3/perfsonar-base-annotations/src/main/java/net/geant/perfsonar/annotations/MetadataKey.java
     2013-01-16 12:05:48 UTC (rev 6105)
@@ -1,17 +0,0 @@
-package net.geant.perfsonar.annotations;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Annotates a method that processes MetadataKey requests.
- * 
- * @author <a 
href="mailto:">Blazej
 Pietrzak</a>
- */
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.SOURCE)
-public @interface MetadataKey {
-
-}

Modified: 
trunk/psBase3/perfsonar-base-annotations/src/main/java/net/geant/perfsonar/annotations/Namespace.java
===================================================================
--- 
trunk/psBase3/perfsonar-base-annotations/src/main/java/net/geant/perfsonar/annotations/Namespace.java
       2013-01-16 11:49:30 UTC (rev 6104)
+++ 
trunk/psBase3/perfsonar-base-annotations/src/main/java/net/geant/perfsonar/annotations/Namespace.java
       2013-01-16 12:05:48 UTC (rev 6105)
@@ -14,5 +14,5 @@
 @Retention(RetentionPolicy.SOURCE)
 public @interface Namespace {
     String prefix() default "";
-    String value();
+    String uri();
 }

Deleted: 
trunk/psBase3/perfsonar-base-annotations/src/main/java/net/geant/perfsonar/annotations/Request.java
===================================================================
--- 
trunk/psBase3/perfsonar-base-annotations/src/main/java/net/geant/perfsonar/annotations/Request.java
 2013-01-16 11:49:30 UTC (rev 6104)
+++ 
trunk/psBase3/perfsonar-base-annotations/src/main/java/net/geant/perfsonar/annotations/Request.java
 2013-01-16 12:05:48 UTC (rev 6105)
@@ -1,38 +0,0 @@
-package net.geant.perfsonar.annotations;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Object model is deserialized from the xml stream with the help of request
- * annotations. Request annotations are applied to types and fields. In this
- * annotation one provides the XPath expression to the field or class 
instance
- * together with required namespaces.
- * 
- * In the following example object of the class Person is deserialized from 
the
- * stream when it is a MetadataKey request. Please note that the XPath
- * expression within the class does not contain the whole path but is 
relative.
- * 
- * <code><br/>
- * 
{@literal
- *  
%Request(xpath=%XPath("/message/[%type='MetadataKeyRequest']/metadata",<br/>
- *                     
namespaces=%Namespace("http://ggf.org/ns/nmwg/base/2.0/";)))<br/>
- * public class Person {<br/>
- *     %Request(xpath=%XPath("/eventType"))<br/>
- *     private String name;<br/>
- *     ...<br/>
- * } }<br/>
- * </code>
- * 
- * @author <a 
href="mailto:">Blazej
 Pietrzak</a>
- * 
- */
-@Target({
 ElementType.FIELD, ElementType.TYPE })
-@Retention(RetentionPolicy.SOURCE)
-public @interface Request {
-       XPath xpath();
-
-       Namespace[] namespaces();
-}

Deleted: 
trunk/psBase3/perfsonar-base-annotations/src/main/java/net/geant/perfsonar/annotations/SetupData.java
===================================================================
--- 
trunk/psBase3/perfsonar-base-annotations/src/main/java/net/geant/perfsonar/annotations/SetupData.java
       2013-01-16 11:49:30 UTC (rev 6104)
+++ 
trunk/psBase3/perfsonar-base-annotations/src/main/java/net/geant/perfsonar/annotations/SetupData.java
       2013-01-16 12:05:48 UTC (rev 6105)
@@ -1,18 +0,0 @@
-package net.geant.perfsonar.annotations;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-
-/**
- * Annotates a method that processes SetupData requests.
- * 
- * @author <a 
href="">Blazej
 Pietrzak</a>
- */
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.SOURCE)
-public @interface SetupData {
-
-}

Modified: 
trunk/psBase3/perfsonar-base-annotations/src/main/java/net/geant/perfsonar/annotations/XPath.java
===================================================================
--- 
trunk/psBase3/perfsonar-base-annotations/src/main/java/net/geant/perfsonar/annotations/XPath.java
   2013-01-16 11:49:30 UTC (rev 6104)
+++ 
trunk/psBase3/perfsonar-base-annotations/src/main/java/net/geant/perfsonar/annotations/XPath.java
   2013-01-16 12:05:48 UTC (rev 6105)
@@ -7,6 +7,9 @@
 
 /**
  * Describes the simplified XPath expression.
+ * XPath is read from the stream instead of building DOM tree.
+ * Therefore XPath expressions cannot use parent and other functionalities 
that
+ * require building the whole DOM tree.
  * 
  * @author <a 
href="mailto:">Blazej
 Pietrzak</a>
  *
@@ -14,5 +17,6 @@
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.SOURCE)
 public @interface XPath {
-    String value();
+    String xpath();
+    Namespace[] namespaces() default {};
 }

Added: 
trunk/psBase3/perfsonar-base-annotations/src/main/java/net/geant/perfsonar/annotations/request/MetadataKey.java
===================================================================
--- 
trunk/psBase3/perfsonar-base-annotations/src/main/java/net/geant/perfsonar/annotations/request/MetadataKey.java
                             (rev 0)
+++ 
trunk/psBase3/perfsonar-base-annotations/src/main/java/net/geant/perfsonar/annotations/request/MetadataKey.java
     2013-01-16 12:05:48 UTC (rev 6105)
@@ -0,0 +1,17 @@
+package net.geant.perfsonar.annotations.request;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Annotates a method that processes MetadataKey requests.
+ * 
+ * @author <a 
href="mailto:">Blazej
 Pietrzak</a>
+ */
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.SOURCE)
+public @interface MetadataKey {
+
+}

Added: 
trunk/psBase3/perfsonar-base-annotations/src/main/java/net/geant/perfsonar/annotations/request/SetupData.java
===================================================================
--- 
trunk/psBase3/perfsonar-base-annotations/src/main/java/net/geant/perfsonar/annotations/request/SetupData.java
                               (rev 0)
+++ 
trunk/psBase3/perfsonar-base-annotations/src/main/java/net/geant/perfsonar/annotations/request/SetupData.java
       2013-01-16 12:05:48 UTC (rev 6105)
@@ -0,0 +1,18 @@
+package net.geant.perfsonar.annotations.request;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+
+/**
+ * Annotates a method that processes SetupData requests.
+ * 
+ * @author <a 
href="">Blazej
 Pietrzak</a>
+ */
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.SOURCE)
+public @interface SetupData {
+
+}

Added: 
trunk/psBase3/perfsonar-base-annotations/src/main/java/net/geant/perfsonar/annotations/request/package-info.java
===================================================================
--- 
trunk/psBase3/perfsonar-base-annotations/src/main/java/net/geant/perfsonar/annotations/request/package-info.java
                            (rev 0)
+++ 
trunk/psBase3/perfsonar-base-annotations/src/main/java/net/geant/perfsonar/annotations/request/package-info.java
    2013-01-16 12:05:48 UTC (rev 6105)
@@ -0,0 +1,4 @@
+/**
+ * This package contains annotations used for denoting methods that handle 
requests from users.
+ */
+package net.geant.perfsonar.annotations.request;
\ No newline at end of file