perfsonar development work

Author: psnc.pikusa
Date: 2012-08-16 23:28:32 +0100 (Thu, 16 Aug 2012)
New Revision: 5954

Modified:
   
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/persistence/MetadaKeyResponse.java
   
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/persistence/SetupDataKeyResponse.java
Log:
empty message bug fixed. Temp loggers removed

Modified: 
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/persistence/MetadaKeyResponse.java
===================================================================
--- 
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/persistence/MetadaKeyResponse.java
   2012-08-16 22:28:04 UTC (rev 5953)
+++ 
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/persistence/MetadaKeyResponse.java
   2012-08-16 22:28:32 UTC (rev 5954)
@@ -42,7 +42,6 @@
                        sb.append(fetchDataRowNmwg(intf));
                }
                
-               logger.info("PSNC DEBUG: MEtadataResponse" + sb.toString());
                return sb.toString();
                
        }
@@ -89,7 +88,6 @@
                                        + intf.getDirection() + 
"</nmwgt:direction>" + "\n");
                        metadata.append("<nmwgt:capacity>" + 
intf.getCapacity()
                                        + "</nmwgt:capacity>" + "\n");
-                       logger.info("PSNC DEBUG: CAPACITY = " + 
intf.getCapacity());
                        metadata.append("<nmwgt:authRealm></nmwgt:authRealm>" 
+ "\n");
                        metadata.append("</nmwgt:interface>" + "\n");
                        metadata.append("</"+subject+":subject>" + "\n");

Modified: 
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/persistence/SetupDataKeyResponse.java
===================================================================
--- 
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/persistence/SetupDataKeyResponse.java
        2012-08-16 22:28:04 UTC (rev 5953)
+++ 
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/persistence/SetupDataKeyResponse.java
        2012-08-16 22:28:32 UTC (rev 5954)
@@ -112,11 +112,6 @@
        
        private Metadata fetchMetadata(Interfaces intf) throws 
PerfSONARException{
                
-               Subject s = getSubject(intf);
-               
-               Metadata m = new Metadata();
-               m.setSubject(s);
-               
                Element interf = new Element("interface","nmwgt" 
,"http://ggf.org/ns/nmwg/topology/2.0/";);
                Element ifAddress = createElement("ifAddress", 
intf.getIfAddress());
                ifAddress.addAttribute("type", intf.getIfAddressType());
@@ -126,7 +121,12 @@
                interf.addChild(createElement("ifDescription", 
intf.getIfDescription()));
                interf.addChild(createElement("direction", 
intf.getDirection()));
                interf.addChild(createElement("capacity", 
intf.getCapacity()));
+               
+               Subject s = getSubject(intf);
                s.addChild(interf);
+               s.setId(interf.getId());
+               Metadata m = new Metadata();
+               m.setSubject(s);
                
                //m.addChild(interf);
                m.setEventType(new EventType(intf.getEventType(), "nmwg"));