perfsonar development work

Author: mac
Date: 2008-10-15 04:45:08 -0400 (Wed, 15 Oct 2008)
New Revision: 4620

Modified:
   
trunk/geant2_java-xml-ls/src/main/java/org/perfsonar/service/lookupService/xmlType/LSLookupAction.java
Log:
new eventTypes supported

Modified: 
trunk/geant2_java-xml-ls/src/main/java/org/perfsonar/service/lookupService/xmlType/LSLookupAction.java
===================================================================
--- 
trunk/geant2_java-xml-ls/src/main/java/org/perfsonar/service/lookupService/xmlType/LSLookupAction.java
      2008-10-14 17:47:55 UTC (rev 4619)
+++ 
trunk/geant2_java-xml-ls/src/main/java/org/perfsonar/service/lookupService/xmlType/LSLookupAction.java
      2008-10-15 08:45:08 UTC (rev 4620)
@@ -13,6 +13,21 @@
 /**
  * LOOKUP Action
  * 
+ * Supported eventTypes:
+ * 
+ * Original (should be supported still, although the last two should be 
depricated): 
http://ggf.org/ns/nmwg/tools/org/perfsonar/service/lookup/xquery/1.0
+ *   - http://ggf.org/ns/nmwg/tools/org/perfsonar/service/lookup/xpath/1.0
+ *   - service.lookup.xpath
+ *   - service.lookup.xquery
+ *
+ * New & supported:
+ *   - 
http://ogf.org/ns/nmwg/tools/org/perfsonar/service/lookup/discovery/xquery/2.0
 http://ogf.org/ns/nmwg/tools/org/perfsonar/service/lookup/query/xquery/2.0
+ *   - 
http://ogf.org/ns/nmwg/tools/org/perfsonar/service/lookup/discovery/summary/2.0
+ *
+ * Not supported eventTypes yet (New, but non-functional):
+ *   - 
http://ogf.org/ns/nmwg/tools/org/perfsonar/service/lookup/discovery/control/xquery/2.0
+ *   - 
http://ogf.org/ns/nmwg/tools/org/perfsonar/service/lookup/query/control/xquery/2.0
 
+ * 
  * @author Maciej Glowiak
  *
  */
@@ -35,26 +50,14 @@
             
"http://ggf.org/ns/nmwg/tools/org/perfsonar/service/lookup/xquery/1.0/";, 
             
"http://ggf.org/ns/nmwg/tools/org/perfsonar/service/lookup/xpath/1.0";,
             
"http://ggf.org/ns/nmwg/tools/org/perfsonar/service/lookup/xpath/1.0/";,
-            
"http://ogf.org/ns/nmwg/tools/org/perfsonar/service/lookup/query/control/xquery/2.0";,
 
-            
"http://ogf.org/ns/nmwg/tools/org/perfsonar/service/lookup/query/control/xquery/2.0/";,
             
"http://ogf.org/ns/nmwg/tools/org/perfsonar/service/lookup/discovery/xquery/2.0";,
             
"http://ogf.org/ns/nmwg/tools/org/perfsonar/service/lookup/discovery/xquery/2.0/";,
             
"http://ogf.org/ns/nmwg/tools/org/perfsonar/service/lookup/query/xquery/2.0";,
             
"http://ogf.org/ns/nmwg/tools/org/perfsonar/service/lookup/query/xquery/2.0/";,
-
-/*
-      [] http://ggf.org/ns/nmwg/tools/org/perfsonar/service/lookup/xquery/1.0
-      [] 
http://ogf.org/ns/nmwg/tools/org/perfsonar/service/lookup/discovery/xquery/2.0
-      
http://ogf.org/ns/nmwg/tools/org/perfsonar/service/lookup/discovery/control/xquery/2.0
-      [] 
http://ogf.org/ns/nmwg/tools/org/perfsonar/service/lookup/query/xquery/2.0
-      
http://ogf.org/ns/nmwg/tools/org/perfsonar/service/lookup/query/control/xquery/2.0
-      
http://ogf.org/ns/nmwg/tools/org/perfsonar/service/lookup/discovery/summary/2.0
-*/
-            
-            
-            };
+        };
     
     
+    
     // ----------------------------------------------------------- 
Constructor
     
     
@@ -130,7 +133,7 @@
             ||
             
"http://ogf.org/ns/nmwg/tools/org/perfsonar/service/lookup/discovery/summary/2.0/".equals(queryType)
             ) {
-        
+            
             LSDiscoveryAction discovery = new LSDiscoveryAction(dao);
             return discovery.performAction(request, requestMetadata);
         }
@@ -147,7 +150,24 @@
                 break;
             }
         }
-               
+        
+        //reject if not implemneted
+        String[] notImplementedEventTypes = {
+                
"http://ogf.org/ns/nmwg/tools/org/perfsonar/service/lookup/discovery/control/xquery/2.0";,
+                
"http://ogf.org/ns/nmwg/tools/org/perfsonar/service/lookup/discovery/control/xquery/2.0/";,
+                
"http://ogf.org/ns/nmwg/tools/org/perfsonar/service/lookup/query/control/xquery/2.0";,
+                
"http://ogf.org/ns/nmwg/tools/org/perfsonar/service/lookup/query/control/xquery/2.0/";,
+            };
+        if (!queryTypeCanBeSatisfied)
+            for (String n : notImplementedEventTypes)
+                if (n.equals(queryType)){
+                    String m = "XmlTypeLSServiceEngine: EventType ["+ 
queryType + "] not implemented, will be used in the future!";
+                    logger.fatal(m);
+                    throw new 
PerfSONARException("error.ls.querytype_not_suported", m);                   
+                }
+        
+
+        //reject if cannot be satisfied
         if (!queryTypeCanBeSatisfied) {
             String m = "XmlTypeLSServiceEngine: Query Type specified: ["
                 + queryType + "] is not supported";