perfsonar development work

Author: roman
Date: 2007-03-20 07:39:18 -0400 (Tue, 20 Mar 2007)
New Revision: 2255

Modified:
   branches/JAVA-SQL-MA-STABLE/src/objects.config
   
branches/JAVA-SQL-MA-STABLE/src/org/perfsonar/commons/messages/EchoRequest.java
   
branches/JAVA-SQL-MA-STABLE/src/org/perfsonar/service/measurementArchive/sqlType/fetch/L2PathStatusResponseGenerator.java
Log:

merging

   svn merge -r 2239:2254 
https://svn.perfsonar.net/svn/perfsonar/trunk/perfsonar




Modified: branches/JAVA-SQL-MA-STABLE/src/objects.config
===================================================================
--- branches/JAVA-SQL-MA-STABLE/src/objects.config      2007-03-20 11:17:21 
UTC (rev 2254)
+++ branches/JAVA-SQL-MA-STABLE/src/objects.config      2007-03-20 11:39:18 
UTC (rev 2255)
@@ -110,11 +110,13 @@
 http://ggf.org/ns/nmwg/topology/base/3.0/address/      
org.ggf.ns.nmwg.topology.base.v3_0.Address
 http://ggf.org/ns/nmwg/topology/base/3.0/operSys/      
org.ggf.ns.nmwg.topology.base.v3_0.OperSys
 http://ggf.org/ns/nmwg/topology/base/3.0/type/ 
org.ggf.ns.nmwg.topology.base.v3_0.Type
+http://ggf.org/ns/nmwg/topology/base/3.0/long/ 
org.ggf.ns.nmwg.topology.base.v3_0.Long
 http://ggf.org/ns/nmwg/topology/base/3.0/longitude/    
org.ggf.ns.nmwg.topology.base.v3_0.Longitude
 http://ggf.org/ns/nmwg/topology/base/3.0/cpu/  
org.ggf.ns.nmwg.topology.base.v3_0.Cpu
 http://ggf.org/ns/nmwg/topology/base/3.0/ifDescription/        
org.ggf.ns.nmwg.topology.base.v3_0.IfDescription
 http://ggf.org/ns/nmwg/topology/base/3.0/floor/        
org.ggf.ns.nmwg.topology.base.v3_0.Floor
 http://ggf.org/ns/nmwg/topology/base/3.0/cage/ 
org.ggf.ns.nmwg.topology.base.v3_0.Cage
+http://ggf.org/ns/nmwg/topology/base/3.0/lat/  
org.ggf.ns.nmwg.topology.base.v3_0.Lat
 http://ggf.org/ns/nmwg/topology/base/3.0/latitude/     
org.ggf.ns.nmwg.topology.base.v3_0.Latitude
 http://ggf.org/ns/nmwg/topology/base/3.0/state/        
org.ggf.ns.nmwg.topology.base.v3_0.State
 http://ggf.org/ns/nmwg/topology/base/3.0/interface/    
org.ggf.ns.nmwg.topology.base.v3_0.Interface

Modified: 
branches/JAVA-SQL-MA-STABLE/src/org/perfsonar/commons/messages/EchoRequest.java
===================================================================
--- 
branches/JAVA-SQL-MA-STABLE/src/org/perfsonar/commons/messages/EchoRequest.java
     2007-03-20 11:17:21 UTC (rev 2254)
+++ 
branches/JAVA-SQL-MA-STABLE/src/org/perfsonar/commons/messages/EchoRequest.java
     2007-03-20 11:39:18 UTC (rev 2255)
@@ -129,9 +129,9 @@
 
        Message response = null;
        
-       if (eventType.getEventType().equals(ECHO_NAMESPACE)) {
+       if (eventType.getEventType().trim().equals(ECHO_NAMESPACE)) {
                response = executeSimpleEcho();
-       } else if (eventType.getEventType().equals("")) {
+       } else if (eventType.getEventType().trim().equals("")) {
                response = getEmptyEventTypeResponse();
        } else {
                response = serviceEngine.takeAction(getType(), request);

Modified: 
branches/JAVA-SQL-MA-STABLE/src/org/perfsonar/service/measurementArchive/sqlType/fetch/L2PathStatusResponseGenerator.java
===================================================================
--- 
branches/JAVA-SQL-MA-STABLE/src/org/perfsonar/service/measurementArchive/sqlType/fetch/L2PathStatusResponseGenerator.java
   2007-03-20 11:17:21 UTC (rev 2254)
+++ 
branches/JAVA-SQL-MA-STABLE/src/org/perfsonar/service/measurementArchive/sqlType/fetch/L2PathStatusResponseGenerator.java
   2007-03-20 11:39:18 UTC (rev 2255)
@@ -103,7 +103,7 @@
                     }
 
                     //logger.debug("SQLStorageManager.fetch: "
-                    //    + "column: " + column + ", value: " + strValue );
+                    //    + "column: " + column + ", value: " + strValue);
 
                 }
 
@@ -113,6 +113,7 @@
 
         }
 
+
         return data;
 
     }