perfsonar development work

Author: mac
Date: 2007-12-13 04:51:56 -0500 (Thu, 13 Dec 2007)
New Revision: 3121

Modified:
   
trunk/geant2_java-xml-ls/src/main/java/org/perfsonar/service/lookupService/xmlType/DLSJoin.java
   
trunk/geant2_java-xml-ls/src/main/java/org/perfsonar/service/lookupService/xmlType/DLSSummary.java
   
trunk/geant2_java-xml-ls/src/main/java/org/perfsonar/service/lookupService/xmlType/DLSToken.java
   
trunk/geant2_java-xml-ls/src/main/java/org/perfsonar/service/lookupService/xmlType/XmlTypeLSServiceEngine.java
Log:
Syntax error fixed. It seems something wrong happened during the last 
commitment to svn...




Modified: 
trunk/geant2_java-xml-ls/src/main/java/org/perfsonar/service/lookupService/xmlType/DLSJoin.java
===================================================================
--- 
trunk/geant2_java-xml-ls/src/main/java/org/perfsonar/service/lookupService/xmlType/DLSJoin.java
     2007-12-13 09:50:36 UTC (rev 3120)
+++ 
trunk/geant2_java-xml-ls/src/main/java/org/perfsonar/service/lookupService/xmlType/DLSJoin.java
     2007-12-13 09:51:56 UTC (rev 3121)
@@ -14,8 +14,8 @@
 
     @Override
     public Message performAction(Message request) throws PerfSONARException {
-        throw new PerfSONARException("error.common.action_not_supported",)
-        "This action is for distributed-LS module and is currently not 
supported");
+        throw new PerfSONARException("error.common.action_not_supported",
+            "This action is for distributed-LS module and is currently not 
supported");
     }
 
 }

Modified: 
trunk/geant2_java-xml-ls/src/main/java/org/perfsonar/service/lookupService/xmlType/DLSSummary.java
===================================================================
--- 
trunk/geant2_java-xml-ls/src/main/java/org/perfsonar/service/lookupService/xmlType/DLSSummary.java
  2007-12-13 09:50:36 UTC (rev 3120)
+++ 
trunk/geant2_java-xml-ls/src/main/java/org/perfsonar/service/lookupService/xmlType/DLSSummary.java
  2007-12-13 09:51:56 UTC (rev 3121)
@@ -15,8 +15,8 @@
 
     @Override
     public Message performAction(Message request) throws PerfSONARException {
-        throw new PerfSONARException("error.common.action_not_supported",)
-    "This action is for distributed-LS module and is currently not 
supported");
+        throw new PerfSONARException("error.common.action_not_supported",
+            "This action is for distributed-LS module and is currently not 
supported");
 
     }
 

Modified: 
trunk/geant2_java-xml-ls/src/main/java/org/perfsonar/service/lookupService/xmlType/DLSToken.java
===================================================================
--- 
trunk/geant2_java-xml-ls/src/main/java/org/perfsonar/service/lookupService/xmlType/DLSToken.java
    2007-12-13 09:50:36 UTC (rev 3120)
+++ 
trunk/geant2_java-xml-ls/src/main/java/org/perfsonar/service/lookupService/xmlType/DLSToken.java
    2007-12-13 09:51:56 UTC (rev 3121)
@@ -15,8 +15,8 @@
 
     @Override
     public Message performAction(Message request) throws PerfSONARException {
-        throw new PerfSONARException("error.common.action_not_supported",)
-    "This action is for distributed-LS module and is currently not 
supported");
+        throw new PerfSONARException("error.common.action_not_supported",
+            "This action is for distributed-LS module and is currently not 
supported");
 
     }
 

Modified: 
trunk/geant2_java-xml-ls/src/main/java/org/perfsonar/service/lookupService/xmlType/XmlTypeLSServiceEngine.java
===================================================================
--- 
trunk/geant2_java-xml-ls/src/main/java/org/perfsonar/service/lookupService/xmlType/XmlTypeLSServiceEngine.java
      2007-12-13 09:50:36 UTC (rev 3120)
+++ 
trunk/geant2_java-xml-ls/src/main/java/org/perfsonar/service/lookupService/xmlType/XmlTypeLSServiceEngine.java
      2007-12-13 09:51:56 UTC (rev 3121)
@@ -4,6 +4,8 @@
  */
 package org.perfsonar.service.lookupService.xmlType;
 
+import java.util.zip.DataFormatException;
+
 import org.ggf.ns.nmwg.base.v2_0.Message;
 import org.perfsonar.base.auxiliary.AuxiliaryComponentManager;
 import org.perfsonar.base.auxiliary.ComponentNames;
@@ -92,6 +94,8 @@
         
         this.serviceEngineType = SERVICE_ENGINE_TYPE;
 
+        //TODO: move LSCONTROL to ActionType
+        
         // set the accepted action types
         acceptedTypes = new String[] {
                 ActionType.LS_REGISTER, 
@@ -99,7 +103,8 @@
                 ActionType.LS_DEREGISTER,
                 ActionType.LS_KEEPALIVE,
                 ActionType.LS_CLEANUP,
-                ActionType.LS_CONTROL,
+                //ActionType.LS_CONTROL,
+                "LS_CONTROL",
                 ActionType.ECHO
                 };
         
@@ -202,9 +207,10 @@
             
             LSAction action = new LSCleanup(dao);
             response = action.performAction(request);
+
+        //TODO: move LSCONTROL to ActionType           
+        } else if (actionType.equals("LS_CONTROL")) {
             
-        } else if (actionType.equals(ActionType.LS_CONTROL)) {
-            
             LSAction action = new LSControlAction(dao);
             response = action.performAction(request);