perfsonar development work

Author: mac
Date: 2007-02-20 10:46:19 -0500 (Tue, 20 Feb 2007)
New Revision: 2092

Added:
   
branches/XML-LS-RELEASE-1.1/src/org/perfsonar/service/lookupService/xmlType/EchoRequestAction.java
Modified:
   branches/XML-LS-RELEASE-1.1/ant/xmlls/test-targets.xml
   
branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/LS/test/EchoRequest.xml
   
branches/XML-LS-RELEASE-1.1/src/org/perfsonar/service/lookupService/xmlType/XmlTypeLSServiceEngine.java
Log:
EchoRequest for LS updated. Now EchoRequest supports two parameters :
  <nmwg:parameter name="testDBConnection" value="yes"/>
  <nmwg:parameter name="testDBSchema" value="yes"/>
that give more information about service. It is suggested to use EchoRequest 
with at least the second one, just to check if everything with the DB is all 
right.
If running echo-request withot parameters it may return success.echo even if 
DB is not run.

More description on that will be provided in the release documentation

Modified: branches/XML-LS-RELEASE-1.1/ant/xmlls/test-targets.xml
===================================================================
--- branches/XML-LS-RELEASE-1.1/ant/xmlls/test-targets.xml      2007-02-20 
11:52:51 UTC (rev 2091)
+++ branches/XML-LS-RELEASE-1.1/ant/xmlls/test-targets.xml      2007-02-20 
15:46:19 UTC (rev 2092)
@@ -12,7 +12,7 @@
 
     -->
 
-    <target name="test" depends="">
+    <target name="test" depends="">      
 
       <echo>For testing web service please run:</echo>
       <echo/>
@@ -24,10 +24,14 @@
       
       <echo>For testing service without Tomcat (just service functionality) 
please run:</echo>
       <echo/>
+      <echo>  ant -f build-xmlls.xml test-echo</echo>
       <echo>  ant -f build-xmlls.xml test-register</echo>
       <echo>  ant -f build-xmlls.xml test-query</echo>
       <echo>  ant -f build-xmlls.xml test-keepalive</echo>
       <echo>  ant -f build-xmlls.xml test-deregister</echo>
+
+      <echo>We suggest to run "test-echo" first.</echo>      
+      <echo>  ant -f build-xmlls.xml test-echo</echo>
     
     </target>
 
@@ -140,11 +144,9 @@
             <copy file="conf/components.properties" 
todir="build/perfsonar/conf"/>
             <copy file="conf/service.properties" 
todir="build/perfsonar/conf"/>
             <copy file="conf/log4j.properties" todir="build/perfsonar/conf"/>
-        </target>
+        </target>        
 
-        
 
-
         <!-- LS Lookup (Query) test -->
 
         <target name="test-query"

Modified: 
branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/LS/test/EchoRequest.xml
===================================================================
--- 
branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/LS/test/EchoRequest.xml
      2007-02-20 11:52:51 UTC (rev 2091)
+++ 
branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/LS/test/EchoRequest.xml
      2007-02-20 15:46:19 UTC (rev 2092)
@@ -8,7 +8,13 @@
                    xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
                             
     <nmwg:metadata id="meta">
-         <nmwg:eventType>echo</nmwg:eventType>
+         <nmwg:eventType>echo.ls</nmwg:eventType>
+        <nmwg:parameters>
+        
+             <nmwg:parameter name="testDBConnection" value="yes"/>
+             <nmwg:parameter name="testDBSchema" value="yes"/>
+            
+        </nmwg:parameters>
     </nmwg:metadata>
                                     
     <nmwg:data id="data" metadataIdRef="meta"/>

Added: 
branches/XML-LS-RELEASE-1.1/src/org/perfsonar/service/lookupService/xmlType/EchoRequestAction.java


Property changes on: 
branches/XML-LS-RELEASE-1.1/src/org/perfsonar/service/lookupService/xmlType/EchoRequestAction.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: 
branches/XML-LS-RELEASE-1.1/src/org/perfsonar/service/lookupService/xmlType/XmlTypeLSServiceEngine.java
===================================================================
--- 
branches/XML-LS-RELEASE-1.1/src/org/perfsonar/service/lookupService/xmlType/XmlTypeLSServiceEngine.java
     2007-02-20 11:52:51 UTC (rev 2091)
+++ 
branches/XML-LS-RELEASE-1.1/src/org/perfsonar/service/lookupService/xmlType/XmlTypeLSServiceEngine.java
     2007-02-20 15:46:19 UTC (rev 2092)
@@ -208,7 +208,10 @@
 
         } else if (actionType.equals(ActionType.ECHO)) {
             
-            response = getEcho(request);
+            XmlDbStorageManager xmlDbStorageManager = 
+                getStorageManager(smType);
+            LSAction action = new EchoRequestAction(xmlDbStorageManager);    
        
+            response = action.performAction(request); 
             
         } else {
             
@@ -254,22 +257,8 @@
         
     }
     
-    protected Message getEcho(Message request)
-        throws SystemException, RequestException, DataFormatException {
 
-        Message response = new Message();
     
-        PerfSONARException pex =
-            new PerfSONARException(
-                    "success.echo",
-                    "This is the echo response from the Lookup Service");
     
-        ResultCodesUtil.createResultCodeMetadata(response, pex);
-        
-        return response;
-
-    }
     
-    
-    
 } //XmlTypeLSServiceEngine