perfsonar development work

Author: dante.delvaux
Date: 2013-03-25 11:04:30 +0000 (Mon, 25 Mar 2013)
New Revision: 6245

Modified:
   
trunk/perfsonar-java-rrd-ma-base3/src/main/java/net/geant/perfsonar/ma/rrd/Interface.java
   
trunk/perfsonar-java-rrd-ma-base3/src/main/java/net/geant/perfsonar/ma/rrd/RRDKey.java
   
trunk/perfsonar-java-rrd-ma-base3/src/main/java/net/geant/perfsonar/ma/rrd/RRDSelect.java
Log:
RRD MA base3: adding missing @Namespace annotations.

Modified: 
trunk/perfsonar-java-rrd-ma-base3/src/main/java/net/geant/perfsonar/ma/rrd/Interface.java
===================================================================
--- 
trunk/perfsonar-java-rrd-ma-base3/src/main/java/net/geant/perfsonar/ma/rrd/Interface.java
   2013-03-22 18:35:20 UTC (rev 6244)
+++ 
trunk/perfsonar-java-rrd-ma-base3/src/main/java/net/geant/perfsonar/ma/rrd/Interface.java
   2013-03-25 11:04:30 UTC (rev 6245)
@@ -30,7 +30,7 @@
 
     // TODO: Should be generalised in psBase3
     public static final String NMWG_URI = "http://ggf.org/ns/nmwg/base/2.0/";;
-    public static final String NMWG_TOPO_URI = 
"http://ggf.org/ns/nmwg/base/2.0/";;
+    public static final String NMWG_TOPO_URI = 
"http://ggf.org/ns/nmwg/topology/2.0/";;
     public static final String NMWG_PREFIX = "nmwg";
     public static final String NMWG_TOPO_PREFIX = "nmwgt";
 

Modified: 
trunk/perfsonar-java-rrd-ma-base3/src/main/java/net/geant/perfsonar/ma/rrd/RRDKey.java
===================================================================
--- 
trunk/perfsonar-java-rrd-ma-base3/src/main/java/net/geant/perfsonar/ma/rrd/RRDKey.java
      2013-03-22 18:35:20 UTC (rev 6244)
+++ 
trunk/perfsonar-java-rrd-ma-base3/src/main/java/net/geant/perfsonar/ma/rrd/RRDKey.java
      2013-03-25 11:04:30 UTC (rev 6245)
@@ -1,5 +1,6 @@
 package net.geant.perfsonar.ma.rrd;
 
+import net.geant.perfsonar.annotations.Namespace;
 import net.geant.perfsonar.annotations.XPath;
 
 /**
@@ -13,6 +14,10 @@
     private String valueUnits;
     private String eventType;
     
+    // TODO: Should be generalised in psBase3
+    public static final String NMWG_URI = "http://ggf.org/ns/nmwg/base/2.0/";;
+    public static final String NMWG_PREFIX = "nmwg";
+
     
     /**
      * All getters
@@ -35,26 +40,26 @@
      * All setters with their @XPath annotations
      */
 
-    // TODO: Add @Namespace annotation with NMWG constants
-    @XPath(xpath = 
"nmwg:message/nmwg:metadata/nmwg:key/nmwg:parameters/nmwg:parameter[name=file]/text()")
+    @XPath(xpath = 
"nmwg:message/nmwg:metadata/nmwg:key/nmwg:parameters/nmwg:parameter[name=file]/text()",
+            namespaces = @Namespace(prefix = NMWG_PREFIX, uri = NMWG_URI))
     public void setFile(String file) {
         this.file = file;
     }
 
-    // TODO: Add @Namespace annotation with NMWG constants
-    @XPath(xpath = 
"nmwg:message/nmwg:metadata/nmwg:key/nmwg:parameters/nmwg:parameter[name=dataSource]/text()")
+    @XPath(xpath = 
"nmwg:message/nmwg:metadata/nmwg:key/nmwg:parameters/nmwg:parameter[name=dataSource]/text()",
+            namespaces = @Namespace(prefix = NMWG_PREFIX, uri = NMWG_URI))
     public void setDataSource(String dataSource) {
         this.dataSource = dataSource;
     }
 
-    // TODO: Add @Namespace annotation with NMWG constants
-    @XPath(xpath = 
"nmwg:message/nmwg:metadata/nmwg:key/nmwg:parameters/nmwg:parameter[name=valueUnits]/text()")
+    @XPath(xpath = 
"nmwg:message/nmwg:metadata/nmwg:key/nmwg:parameters/nmwg:parameter[name=valueUnits]/text()",
+            namespaces = @Namespace(prefix = NMWG_PREFIX, uri = NMWG_URI))
     public void setValueUnits(String valueUnits) {
         this.valueUnits = valueUnits;
     }
 
-    // TODO: Add @Namespace annotation with NMWG constants
-    @XPath(xpath = 
"nmwg:message/nmwg:metadata/nmwg:key/nmwg:parameters/nmwg:parameter[name=eventType]/text()")
+    @XPath(xpath = 
"nmwg:message/nmwg:metadata/nmwg:key/nmwg:parameters/nmwg:parameter[name=eventType]/text()",
+            namespaces = @Namespace(prefix = NMWG_PREFIX, uri = NMWG_URI))
     public void setEventType(String eventType) {
         this.eventType = eventType;
     }

Modified: 
trunk/perfsonar-java-rrd-ma-base3/src/main/java/net/geant/perfsonar/ma/rrd/RRDSelect.java
===================================================================
--- 
trunk/perfsonar-java-rrd-ma-base3/src/main/java/net/geant/perfsonar/ma/rrd/RRDSelect.java
   2013-03-22 18:35:20 UTC (rev 6244)
+++ 
trunk/perfsonar-java-rrd-ma-base3/src/main/java/net/geant/perfsonar/ma/rrd/RRDSelect.java
   2013-03-25 11:04:30 UTC (rev 6245)
@@ -1,5 +1,6 @@
 package net.geant.perfsonar.ma.rrd;
 
+import net.geant.perfsonar.annotations.Namespace;
 import net.geant.perfsonar.annotations.XPath;
 
 /**
@@ -17,7 +18,13 @@
     private String consolidationFunction;
     private String resolution;
     
+    // TODO: Should be generalised in psBase3
+    public static final String NMWG_URI = "http://ggf.org/ns/nmwg/base/2.0/";;
+    public static final String NMWG_SELECT_URI = 
"http://ggf.org/ns/nmwg/ops/select/2.0/";;
+    public static final String NMWG_PREFIX = "nmwg";
+    public static final String NMWG_SELECT_PREFIX = "select";
     
+    
     /**
      * All getters
      */
@@ -39,26 +46,30 @@
      * All setters with their @XPath annotations
      */
 
-    // TODO: Add @Namespace annotation with NMWG constants
-    @XPath(xpath = 
"nmwg:message/nmwg:metadata/select:parameters/nmwg:parameter[name=startTime]/text()")
+    @XPath(xpath = 
"nmwg:message/nmwg:metadata/select:parameters/nmwg:parameter[name=startTime]/text()",
+            namespaces = { @Namespace(prefix = NMWG_PREFIX, uri = NMWG_URI), 
+                           @Namespace(prefix = NMWG_SELECT_PREFIX, uri = 
NMWG_SELECT_URI) })
     public void setStartTime(String startTime) {
         this.startTime = startTime;
     }
 
-    // TODO: Add @Namespace annotation with NMWG constants
-    @XPath(xpath = 
"nmwg:message/nmwg:metadata/select:parameters/nmwg:parameter[name=endTime]/text()")
+    @XPath(xpath = 
"nmwg:message/nmwg:metadata/select:parameters/nmwg:parameter[name=endTime]/text()",
+            namespaces = { @Namespace(prefix = NMWG_PREFIX, uri = NMWG_URI), 
+            @Namespace(prefix = NMWG_SELECT_PREFIX, uri = NMWG_SELECT_URI) })
     public void setEndTime(String endTime) {
         this.endTime = endTime;
     }
     
-    // TODO: Add @Namespace annotation with NMWG constants
-    @XPath(xpath = 
"nmwg:message/nmwg:metadata/select:parameters/nmwg:parameter[name=consolidationFunction]/text()")
+    @XPath(xpath = 
"nmwg:message/nmwg:metadata/select:parameters/nmwg:parameter[name=consolidationFunction]/text()",
+            namespaces = { @Namespace(prefix = NMWG_PREFIX, uri = NMWG_URI), 
+            @Namespace(prefix = NMWG_SELECT_PREFIX, uri = NMWG_SELECT_URI) })
     public void setConsolidationFunction(String consolidationFunction) {
         this.consolidationFunction = consolidationFunction;
     }
     
-    // TODO: Add @Namespace annotation with NMWG constants
-    @XPath(xpath = 
"nmwg:message/nmwg:metadata/select:parameters/nmwg:parameter[name=resolution]/text()")
+    @XPath(xpath = 
"nmwg:message/nmwg:metadata/select:parameters/nmwg:parameter[name=resolution]/text()",
+            namespaces = { @Namespace(prefix = NMWG_PREFIX, uri = NMWG_URI), 
+            @Namespace(prefix = NMWG_SELECT_PREFIX, uri = NMWG_SELECT_URI) })
     public void setResolution(String resolution) {
         this.resolution = resolution;
     }