perfsonar development work

Author: roman
Date: 2009-03-05 07:47:18 -0500 (Thu, 05 Mar 2009)
New Revision: 5027

Modified:
   
branches/new-structure-with-base2/ps-mdm-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/MetadataKeyServiceEngine.java
   
branches/new-structure-with-base2/ps-mdm-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/exist/ExistMetadataStorageDAOImpl.java
Log:
setting up the attributes type and MessageIdRef in MetadataKeyResponse message


Modified: 
branches/new-structure-with-base2/ps-mdm-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/MetadataKeyServiceEngine.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/MetadataKeyServiceEngine.java
        2009-03-05 12:45:53 UTC (rev 5026)
+++ 
branches/new-structure-with-base2/ps-mdm-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/MetadataKeyServiceEngine.java
        2009-03-05 12:47:18 UTC (rev 5027)
@@ -75,6 +75,7 @@
 
                 // getting data from configuration storage manager
                 Message query = new Message();
+                query.setType("MetadataKeyRequest");
                 query.addChild(metadata);
 
                 String results = dao.rawFetch(query);

Modified: 
branches/new-structure-with-base2/ps-mdm-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/exist/ExistMetadataStorageDAOImpl.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/exist/ExistMetadataStorageDAOImpl.java
       2009-03-05 12:45:53 UTC (rev 5026)
+++ 
branches/new-structure-with-base2/ps-mdm-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/exist/ExistMetadataStorageDAOImpl.java
       2009-03-05 12:47:18 UTC (rev 5027)
@@ -114,7 +114,7 @@
         String query = queryGeneratorManager.getQuery(request);
         String results =
             ((ExtendedExistHTTPDataStorage) 
dataStorage).getXQueryStringResult(
-                query, this.dataCollection, this.dataCredential);
+                query, this.dataCollection, this.dataCredential, request);
 
         return results;
 
@@ -181,7 +181,8 @@
         public String getXQueryStringResult(
             String xquery,
             String collection, 
-            DataCredential credential) throws PerfSONARException {
+            DataCredential credential,
+            Element request) throws PerfSONARException {
 
             try {
 
@@ -206,7 +207,8 @@
                 result = extractXMLTag(result, "exist:result");
 
                 sb = new StringBuffer();
-                sb.append("<nmwg:message 
xmlns:nmwg=\"http://ggf.org/ns/nmwg/base/2.0/\"; 
xmlns=\"http://ggf.org/ns/nmwg/base/2.0/\";>");
+                String type = (request.getAttribute("type") == null? "": 
request.getAttribute("type").replaceFirst("Request", "Response"));
+                sb.append("<nmwg:message type=\"" + type + "\" 
xmlns:nmwg=\"http://ggf.org/ns/nmwg/base/2.0/\"; 
xmlns=\"http://ggf.org/ns/nmwg/base/2.0/\";>");
                 sb.append(result);
                 sb.append("</nmwg:message>");