perfsonar development work

Author: zurawski
Date: 2006-07-25 14:20:30 -0400 (Tue, 25 Jul 2006)
New Revision: 1487

Added:
   branches/multi-ls/perfsonar/conf/log4j.properties
   
branches/multi-ls/perfsonar/schema/example-instances/sonar/LS/test/LSGlobalToken.xml
   
branches/multi-ls/perfsonar/schema/example-instances/sonar/LS/test/LSLocalToken.xml
   
branches/multi-ls/perfsonar/src/org/perfsonar/commons/messages/LSGlobalToken.java
   
branches/multi-ls/perfsonar/src/org/perfsonar/commons/messages/LSLocalToken.java
   
branches/multi-ls/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSGlobalTokenAction.java
   
branches/multi-ls/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSLocalTokenAction.java
Removed:
   branches/multi-ls/perfsonar/conf/log4j.properties
Modified:
   branches/multi-ls/perfsonar/ant/xmlls/xmlls-client-run-targets.xml
   branches/multi-ls/perfsonar/conf/template/service.properties.ls-template
   
branches/multi-ls/perfsonar/src/org/perfsonar/service/commons/engine/ActionType.java
   
branches/multi-ls/perfsonar/src/org/perfsonar/service/lookupService/xmlType/XmlTypeLSServiceEngine.java
Log:
Skeleton code for the multi-ls.  This update adds the messages, and 
handlers/action chunks for said messages.  

-jason



Modified: branches/multi-ls/perfsonar/ant/xmlls/xmlls-client-run-targets.xml
===================================================================
--- branches/multi-ls/perfsonar/ant/xmlls/xmlls-client-run-targets.xml  
2006-07-25 14:05:28 UTC (rev 1486)
+++ branches/multi-ls/perfsonar/ant/xmlls/xmlls-client-run-targets.xml  
2006-07-25 18:20:30 UTC (rev 1487)
@@ -52,6 +52,28 @@
         </target>
 
 
+        <!-- Sends request to LS deployed in Tomcat, LS Local Token -->
+        <target name="ls-run-client-local"
+                description="Sends request to Tomcat: LOCALTOKEN">
+            <java classname="org.perfsonar.client.testHarness.SOAPClient"
+                  classpathref="classpath" fork="true">
+                <arg value="${ls.test.server}"/>
+                <arg 
value="${basedir}/schema/example-instances/sonar/LS/test/LSLocalToken.xml"/>
+                <arg 
value="${basedir}/schema/example-instances/sonar/LS/test/LSLocalTokenResponse.xml"/>
+            </java>
+        </target>
+       
+        <!-- Sends request to LS deployed in Tomcat, LS Global Token -->
+        <target name="ls-run-client-global"
+                description="Sends request to Tomcat: GLOBALTOKEN">
+            <java classname="org.perfsonar.client.testHarness.SOAPClient"
+                  classpathref="classpath" fork="true">
+                <arg value="${ls.test.server}"/>
+                <arg 
value="${basedir}/schema/example-instances/sonar/LS/test/LSGlobalToken.xml"/>
+                <arg 
value="${basedir}/schema/example-instances/sonar/LS/test/LSGlobalTokenResponse.xml"/>
+            </java>
+        </target>      
+
 </project>
 
 

Deleted: branches/multi-ls/perfsonar/conf/log4j.properties

Added: branches/multi-ls/perfsonar/conf/log4j.properties

Modified: 
branches/multi-ls/perfsonar/conf/template/service.properties.ls-template
===================================================================
--- branches/multi-ls/perfsonar/conf/template/service.properties.ls-template  
  2006-07-25 14:05:28 UTC (rev 1486)
+++ branches/multi-ls/perfsonar/conf/template/service.properties.ls-template  
  2006-07-25 18:20:30 UTC (rev 1487)
@@ -56,6 +56,6 @@
 # --- Service properties 
---------------------------------------------------------------
 
 
service.ls.class_name=org.perfsonar.service.lookupService.xmlType.XmlTypeLSServiceEngine
-service.ls.message_types=LSQueryRequest,LSRegisterRequest,LSDeregisterRequest,LSKeepaliveRequest
+service.ls.message_types=LSQueryRequest,LSRegisterRequest,LSDeregisterRequest,LSKeepaliveRequest,LSLocalToken,LSGlobalToken
 
-# ------- END 
--------------------------------------------------------------------------
\ No newline at end of file
+# ------- END 
--------------------------------------------------------------------------

Added: 
branches/multi-ls/perfsonar/schema/example-instances/sonar/LS/test/LSGlobalToken.xml

Added: 
branches/multi-ls/perfsonar/schema/example-instances/sonar/LS/test/LSLocalToken.xml

Added: 
branches/multi-ls/perfsonar/src/org/perfsonar/commons/messages/LSGlobalToken.java

Added: 
branches/multi-ls/perfsonar/src/org/perfsonar/commons/messages/LSLocalToken.java

Modified: 
branches/multi-ls/perfsonar/src/org/perfsonar/service/commons/engine/ActionType.java
===================================================================
--- 
branches/multi-ls/perfsonar/src/org/perfsonar/service/commons/engine/ActionType.java
        2006-07-25 14:05:28 UTC (rev 1486)
+++ 
branches/multi-ls/perfsonar/src/org/perfsonar/service/commons/engine/ActionType.java
        2006-07-25 18:20:30 UTC (rev 1487)
@@ -43,30 +43,39 @@
     // --------------------------------------------- Lookup Service Actions
 
 
-
     /**
-     *  Action type to request a measurement
+     *  Action type to register with an LS
      */    
     public static final String LS_REGISTER = "LS_REGISTER";
 
-
     /**
-     *  Action type to request a measurement
+     *  Action type to query an LS
      */    
     public static final String LS_LOOKUP = "LS_LOOKUP";
 
-
     /**
-     *  Action type to request a measurement
+     *  Action type to deregister with an LS
      */
     public static final String LS_DEREGISTER = "LS_DEREGISTER";
 
     /**
-     *  Action type to request a measurement
+     *  Action type to update the timestamp on LS data
      */
     public static final String LS_KEEPALIVE = "LS_KEEPALIVE";
 
     /**
+     *  Action type to pass a local summary token
+     */
+    public static final String LS_LOCALTOKEN = "LS_LOCALTOKEN";
+
+    /**
+     *  Action type to pass a global summary token
+     */
+    public static final String LS_GLOBALTOKEN = "LS_GLOBALTOKEN";
+
+
+
+    /**
      * Action type to request a full topology database download
      */
 

Added: 
branches/multi-ls/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSGlobalTokenAction.java

Added: 
branches/multi-ls/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSLocalTokenAction.java

Modified: 
branches/multi-ls/perfsonar/src/org/perfsonar/service/lookupService/xmlType/XmlTypeLSServiceEngine.java
===================================================================
--- 
branches/multi-ls/perfsonar/src/org/perfsonar/service/lookupService/xmlType/XmlTypeLSServiceEngine.java
     2006-07-25 14:05:28 UTC (rev 1486)
+++ 
branches/multi-ls/perfsonar/src/org/perfsonar/service/lookupService/xmlType/XmlTypeLSServiceEngine.java
     2006-07-25 18:20:30 UTC (rev 1487)
@@ -94,7 +94,9 @@
                 ActionType.LS_REGISTER, 
                 ActionType.LS_LOOKUP,
                 ActionType.LS_DEREGISTER,
-                ActionType.LS_KEEPALIVE
+                ActionType.LS_KEEPALIVE,
+                ActionType.LS_LOCALTOKEN,
+                ActionType.LS_GLOBALTOKEN
                 };
         
         smType = config.getProperty("service.ls.db_type");
@@ -203,6 +205,20 @@
             LSAction action = new LSKeepaliveAction(xmlDbStorageManager);
             response = action.performAction(request); 
                 
+        } else if (actionType.equals(ActionType.LS_LOCALTOKEN)) {
+
+            XmlDbStorageManager xmlDbStorageManager = 
+                getStorageManager(smType);
+            LSAction action = new LSLocalTokenAction(xmlDbStorageManager);
+            response = action.performAction(request); 
+                
+        } else if (actionType.equals(ActionType.LS_GLOBALTOKEN)) {
+
+            XmlDbStorageManager xmlDbStorageManager = 
+                getStorageManager(smType);
+            LSAction action = new LSGlobalTokenAction(xmlDbStorageManager);
+            response = action.performAction(request); 
+                
         } else {
             
             throw new SystemException("error.ls.action_not_suported",