perfsonar development work

Author: psnc.trzaszczka
Date: 2010-04-07 13:21:28 +0100 (Wed, 07 Apr 2010)
New Revision: 5583

Modified:
   
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/requesthandler/axis2/Axis2RequestHandler.java
Log:
error response from psBase2 improved - BUG PSSERVICES-476

Modified: 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/requesthandler/axis2/Axis2RequestHandler.java
===================================================================
--- 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/requesthandler/axis2/Axis2RequestHandler.java
  2010-04-07 11:15:33 UTC (rev 5582)
+++ 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/requesthandler/axis2/Axis2RequestHandler.java
  2010-04-07 12:21:28 UTC (rev 5583)
@@ -168,6 +168,8 @@
               </nmwg:data>
             </nmwg:message>
         */
+       
+       //TODO : common error message builder
         OMFactory fac = OMAbstractFactory.getOMFactory();
         OMNamespace def = fac.createOMNamespace("", "");
         OMNamespace nmwg = 
fac.createOMNamespace("http://ggf.org/ns/nmwg/base/2.0/";, "nmwg");
@@ -177,8 +179,10 @@
         message.addAttribute(fac.createOMAttribute("type", def, 
"ResultCode"));
         message.addAttribute(fac.createOMAttribute("id", def, "error"));
 
+        String metadataId="rescode";
+        
         OMElement meta = fac.createOMElement("metadata", nmwg);
-        meta.addAttribute(fac.createOMAttribute("id",def,"rescode"));
+        meta.addAttribute(fac.createOMAttribute("id",def,metadataId));
         message.addChild(meta);
 
         OMElement evt = fac.createOMElement("eventType", nmwg);
@@ -186,8 +190,8 @@
         meta.addChild(evt);
 
         OMElement data = fac.createOMElement("data", nmwg);
-        meta.addAttribute(fac.createOMAttribute("id",def,"rescode-desc"));
-        
meta.addAttribute(fac.createOMAttribute("metadataIdRef",def,"rescode"));
+        data.addAttribute(fac.createOMAttribute("id",def,"rescode-desc"));
+        
data.addAttribute(fac.createOMAttribute("metadataIdRef",def,metadataId));
         message.addChild(data);
 
         OMElement datum = fac.createOMElement("datum", nmwgr);