perfsonar development work

Author: fernandes
Date: 2007-02-27 07:57:54 -0500 (Tue, 27 Feb 2007)
New Revision: 2149

Added:
   branches/CL-MP-STABLE/perfsonar/conf/log4j.properties.template
   branches/CL-MP-STABLE/perfsonar/doc/mp/cliTypeMP/CLMP Interface 
Specification 1.4.doc
Removed:
   branches/CL-MP-STABLE/perfsonar/doc/mp/cliTypeMP/CLMP Interface 
Specification 1.3.doc
Modified:
   branches/CL-MP-STABLE/perfsonar/ant/axis-deploy-targets.xml
   branches/CL-MP-STABLE/perfsonar/ant/clmp/clmp-configure-targets.xml
   branches/CL-MP-STABLE/perfsonar/ant/configure-targets.xml
   branches/CL-MP-STABLE/perfsonar/ant/libs-download-targets.xml
   branches/CL-MP-STABLE/perfsonar/ant/pre-install-targets.xml
   branches/CL-MP-STABLE/perfsonar/conf/service.properties.clmp
   
branches/CL-MP-STABLE/perfsonar/src/org/perfsonar/commons/messages/EchoRequest.java
   
branches/CL-MP-STABLE/perfsonar/src/org/perfsonar/service/measurementPoint/commandLine/CommandLineExec.java
Log:
Modifications to ant targets for perfsonar bundle.



Modified: branches/CL-MP-STABLE/perfsonar/ant/axis-deploy-targets.xml
===================================================================
--- branches/CL-MP-STABLE/perfsonar/ant/axis-deploy-targets.xml 2007-02-27 
12:56:12 UTC (rev 2148)
+++ branches/CL-MP-STABLE/perfsonar/ant/axis-deploy-targets.xml 2007-02-27 
12:57:54 UTC (rev 2149)
@@ -34,6 +34,7 @@
         <mkdir dir="${service.home}/${deploy.root}/wsdd"/>
         <mkdir dir="${service.home}/${deploy.root}/WEB-INF"/>
         <mkdir dir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+        <mkdir dir="${service.home}/${deploy.root}/WEB-INF/logs"/>
         <mkdir dir="${service.home}/${deploy.root}/WEB-INF/classes"/>
         <mkdir 
dir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar"/>
         <mkdir 
dir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf"/>
@@ -61,6 +62,8 @@
 
         <copy file="./conf/service.properties"           
todir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf"/>
         <copy file="./conf/components.properties"        
todir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf"/>
+        <copy file="./conf/log4j.properties"             
todir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf"/>
+        <copy file="./src/objects.config"                
todir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf"/>
 
     </target>
 
@@ -73,10 +76,8 @@
         <copy 
file="./lib/repository/axis/axis-wsdl4j/1.5.1/axis-wsdl4j-1.5.1.jar"          
   todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
         <copy 
file="./lib/repository/commons-discovery/commons-discovery/0.2/commons-discovery-0.2.jar"
  todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
         <copy 
file="./lib/repository/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar"
    todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
-        <copy 
file="./lib/repository/commons-digester/commons-digester/1.7/commons-digester-1.7.jar"
            todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
-        <copy 
file="./lib/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar"
     todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
-        <copy 
file="./lib/repository/commons-collections/commons-collections/3.2/commons-collections-3.2.jar"
   todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
-        
+
+
         <copy file="./lib/repository/jdom/jdom/1.0b8/jdom-1.0b8.jar"         
                  todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
         <copy file="./lib/repository/xalan/xalan/2.7.0/xalan-2.7.0.jar"      
                  todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
         <copy 
file="./lib/repository/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar"          
   todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
@@ -101,10 +102,7 @@
         <delete 
file="${service.home}/${deploy.root}/WEB-INF/lib/axis-wsdl4j-1.5.1.jar"/>
         <delete 
file="${service.home}/${deploy.root}/WEB-INF/lib/commons-discovery-0.2.jar"/>
         <delete 
file="${service.home}/${deploy.root}/WEB-INF/lib/commons-logging-1.0.4.jar"/>
-        <delete 
file="${service.home}/${deploy.root}/WEB-INF/lib/commons-digester-1.7.jar"/>
-        <delete 
file="${service.home}/${deploy.root}/WEB-INF/lib/commons-beanutils-1.7.0.jar"/>
-        <delete 
file="${service.home}/${deploy.root}/WEB-INF/lib/commons-collections-3.2.jar"/>
-        
+
         <delete 
file="${service.home}/${deploy.root}/WEB-INF/lib/jdom-1.0b8.jar"/>
         <delete 
file="${service.home}/${deploy.root}/WEB-INF/lib/xalan-2.7.0.jar"/>
         <delete 
file="${service.home}/${deploy.root}/WEB-INF/lib/xercesImpl-2.6.2.jar"/>
@@ -138,6 +136,7 @@
 
         <delete 
file="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/service.properties"/>
         <delete 
file="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/components.properties"/>
+        <delete 
file="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/log4j.properties"/>
 
     </target>
 
@@ -220,8 +219,7 @@
         <echo message="        
docBase='${service.home}/${service.name}'&gt;"/>
         <echo message="    &lt;/Context&gt;"/>
         <echo></echo>
-        <echo>Please, do it now. I will wait for you.</echo>
-        <input message="Press Return key ..."/>
+        <input message="Press Enter when finished"/>
 
         <exec dir="${tomcat.home}/bin"
             executable="sh"
@@ -233,6 +231,8 @@
             <env key="CATALINA_BASE" path=""/>
         </exec>
 
+        <echo>Please, make sure that Tomcat is running.</echo>
+
     </target>
 
 
@@ -277,7 +277,7 @@
         <echo> than default one use ctrl+c to stop the script in this 
moment)</echo>
         <echo></echo>
 
-        <input message="Press Return key ..."/>
+        <input message="Press Enter"/>
 
     </target>
 
@@ -304,9 +304,9 @@
 
 
     <target name="start">
-        
+
         <antcall target="deploy-adminclient" />
-        
+
     </target>
 
 
@@ -318,4 +318,4 @@
 
 
 
-</project>
+</project>
\ No newline at end of file

Modified: branches/CL-MP-STABLE/perfsonar/ant/clmp/clmp-configure-targets.xml
===================================================================
--- branches/CL-MP-STABLE/perfsonar/ant/clmp/clmp-configure-targets.xml 
2007-02-27 12:56:12 UTC (rev 2148)
+++ branches/CL-MP-STABLE/perfsonar/ant/clmp/clmp-configure-targets.xml 
2007-02-27 12:57:54 UTC (rev 2149)
@@ -58,10 +58,9 @@
             <entry  key="service.r.service_type"        value="CL MP"/>
             <entry  key="service.r.service_description" value="Command Line 
MP, perfSONAR project"/>
 
-            <entry  key="service.log.log4j.config"  
value="${basedir}/conf/log4j.properties"/>
-            <entry  key="service.sax_parser.config" 
value="${basedir}/src/objects.config"/>
-
-            <entry  key="service.mp.message_types" 
value="MeasurementRequest"/>
+             <entry  key="service.log.log4j.config"  
value="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/log4j.properties"/>
+             <entry  key="service.sax_parser.config" 
value="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/objects.config"/>
+            <entry  key="service.mp.message_types" 
value="MeasurementRequest,EchoRequest"/>
             <entry  key="service.mp.class_name"    
value="org.perfsonar.service.measurementPoint.commandLine.CommandLineMPServiceEngine"/>
            
             <entry  key="service.ls.registration_file"              
value=""/>

Modified: branches/CL-MP-STABLE/perfsonar/ant/configure-targets.xml
===================================================================
--- branches/CL-MP-STABLE/perfsonar/ant/configure-targets.xml   2007-02-27 
12:56:12 UTC (rev 2148)
+++ branches/CL-MP-STABLE/perfsonar/ant/configure-targets.xml   2007-02-27 
12:57:54 UTC (rev 2149)
@@ -23,64 +23,12 @@
 
     <target name="set-log4j-properties">
 
-        <property name="logDir" value="${basedir}/log"/>
+        <property name="logDir" 
value="${service.home}/${deploy.root}/WEB-INF/logs"/>
 
-        <propertyfile file="conf/log4j.properties"
-                        comment="This file was created by the ant script.">
+        <delete file="${basedir}/conf/log4j.properties"/>
+        <copy file="${basedir}/conf/log4j.properties.template"     
tofile="${basedir}/conf/log4j.properties"/>
+        <replace file="${basedir}/conf/log4j.properties"           
token="_LOGPATH_" value="${logDir}"/>
 
-            <entry  key="logDir" value="${logDir}"/>
-
-            <entry  key="log4j.rootLogger" value="INFO, rootAppender"/>
-            <entry  key="log4j.logger.perfsonar-debug" value="DEBUG, 
debugAppender"/>
-            <entry  key="log4j.logger.perfsonar-info"  value="INFO, 
infoAppender"/>
-            <entry  key="log4j.logger.perfsonar-warn"  value="WARN, 
warnAppender"/>
-            <entry  key="log4j.logger.perfsonar-error" value="ERROR, 
errorAppender"/>
-            <entry  key="log4j.logger.perfsonar-fatal" value="FATAL, 
fatalAppender"/>
-
-            <entry  key="log4j.appender.rootAppender"                        
  value="org.apache.log4j.RollingFileAppender"/>
-            <entry  key="log4j.appender.rootAppender.File"                   
  value="${logDir}/perfsonar.log"/>
-            <entry  key="log4j.appender.rootAppender.MaxFileSize"            
  value="500KB"/>
-            <entry  key="log4j.appender.rootAppender.MaxBackupIndex"         
  value="1000"/>
-            <entry  key="log4j.appender.rootAppender.layout"                 
  value="org.apache.log4j.PatternLayout"/>
-            <entry  
key="log4j.appender.rootAppender.layout.ConversionPattern" value="%d %5p - 
%m%n"/>
-
-            <entry  key="log4j.appender.debugAppender"                       
   value="org.apache.log4j.RollingFileAppender"/>
-            <entry  key="log4j.appender.debugAppender.File"                  
   value="${logDir}/perfsonar_debug.log"/>
-            <entry  key="log4j.appender.debugAppender.MaxFileSize"           
   value="500KB"/>
-            <entry  key="log4j.appender.debugAppender.MaxBackupIndex"        
   value="1000"/>
-            <entry  key="log4j.appender.debugAppender.layout"                
   value="org.apache.log4j.PatternLayout"/>
-            <entry  
key="log4j.appender.debugAppender.layout.ConversionPattern" value="%d %5p - 
%m%n"/>
-
-            <entry  key="log4j.appender.infoAppender"                        
  value="org.apache.log4j.RollingFileAppender"/>
-            <entry  key="log4j.appender.infoAppender.File"                   
  value="${logDir}/perfsonar_info.log"/>
-            <entry  key="log4j.appender.infoAppender.MaxFileSize"            
  value="500KB"/>
-            <entry  key="log4j.appender.infoAppender.MaxBackupIndex"         
  value="1000"/>
-            <entry  key="log4j.appender.infoAppender.layout"                 
  value="org.apache.log4j.PatternLayout"/>
-            <entry  
key="log4j.appender.infoAppender.layout.ConversionPattern" value="%d %5p - 
%m%n"/>
-
-            <entry  key="log4j.appender.warnAppender"                        
  value="org.apache.log4j.RollingFileAppender"/>
-            <entry  key="log4j.appender.warnAppender.File"                   
  value="${logDir}/perfsonar_warn.log"/>
-            <entry  key="log4j.appender.warnAppender.MaxFileSize"            
  value="500KB"/>
-            <entry  key="log4j.appender.warnAppender.MaxBackupIndex"         
  value="1000"/>
-            <entry  key="log4j.appender.warnAppender.layout"                 
  value="org.apache.log4j.PatternLayout"/>
-            <entry  
key="log4j.appender.warnAppender.layout.ConversionPattern" value="%d %5p - 
%m%n"/>
-
-            <entry  key="log4j.appender.errorAppender"                       
   value="org.apache.log4j.RollingFileAppender"/>
-            <entry  key="log4j.appender.errorAppender.File"                  
   value="${logDir}/perfsonar_error.log"/>
-            <entry  key="log4j.appender.errorAppender.MaxFileSize"           
   value="500KB"/>
-            <entry  key="log4j.appender.errorAppender.MaxBackupIndex"        
   value="1000"/>
-            <entry  key="log4j.appender.errorAppender.layout"                
   value="org.apache.log4j.PatternLayout"/>
-            <entry  
key="log4j.appender.errorAppender.layout.ConversionPattern" value="%d %5p - 
%m%n"/>
-
-            <entry  key="log4j.appender.fatalAppender"                       
   value="org.apache.log4j.RollingFileAppender"/>
-            <entry  key="log4j.appender.fatalAppender.File"                  
   value="${logDir}/perfsonar_fatal.log"/>
-            <entry  key="log4j.appender.fatalAppender.MaxFileSize"           
   value="500KB"/>
-            <entry  key="log4j.appender.fatalAppender.MaxBackupIndex"        
   value="1000"/>
-            <entry  key="log4j.appender.fatalAppender.layout"                
   value="org.apache.log4j.PatternLayout"/>
-            <entry  
key="log4j.appender.fatalAppender.layout.ConversionPattern" value="%d %5p - 
%m%n"/>
-
-        </propertyfile>
-
     </target>
 
 
@@ -101,9 +49,10 @@
 
     <target name="register-fuctionality-question">
 
-        <input message="Do you want the service to register to a Lookup 
Service (LS)? "
+        <input message="Turn on service registration to Lookup Service? "
             addproperty="_functionality.register.decision"
-            validargs="y,n" />
+            validargs="y,n"
+            defaultvalue="n"/>
 
         <condition property="functionality.register.decision">
             <equals arg1="y" arg2="${_functionality.register.decision}"/>

Modified: branches/CL-MP-STABLE/perfsonar/ant/libs-download-targets.xml
===================================================================
--- branches/CL-MP-STABLE/perfsonar/ant/libs-download-targets.xml       
2007-02-27 12:56:12 UTC (rev 2148)
+++ branches/CL-MP-STABLE/perfsonar/ant/libs-download-targets.xml       
2007-02-27 12:57:54 UTC (rev 2149)
@@ -62,6 +62,10 @@
 
             <dependency groupId="log4j"                 artifactId="log4j"   
               version="1.2.9"/>
             <dependency groupId="exist"                 
artifactId="exist-xmldb"            version="1.0rc"/>
+            <dependency groupId="exist"                 
artifactId="exist-db"               version="1.0rc"/>
+            <dependency groupId="exist"                 
artifactId="exist-xmlrpc"           version="1.0rc"/>
+            <dependency groupId="exist"                 
artifactId="exist-optional"         version="1.0rc"/>
+            
             <localRepository refid="local.repository"/>
             <remoteRepository refid="remote.repository"/>
 

Modified: branches/CL-MP-STABLE/perfsonar/ant/pre-install-targets.xml
===================================================================
--- branches/CL-MP-STABLE/perfsonar/ant/pre-install-targets.xml 2007-02-27 
12:56:12 UTC (rev 2148)
+++ branches/CL-MP-STABLE/perfsonar/ant/pre-install-targets.xml 2007-02-27 
12:57:54 UTC (rev 2149)
@@ -18,10 +18,10 @@
 
 
     <!-- Download URLs -->
-    
+
     <property name="_tomcat.download.url"
-        
value="http://archive.apache.org/dist/tomcat/tomcat-5/v5.5.20/bin/apache-tomcat-5.5.20.tar.gz";
 />
-    <property name="tomcat.dir" value="apache-tomcat-5.5.20" />
+        
value="http://apache.forall.pl/tomcat/tomcat-6/v6.0.7/bin/apache-tomcat-6.0.7.tar.gz";
 />
+    <property name="tomcat.dir" value="apache-tomcat-6.0.7" />
 
     <property name="exist.war.file" value="exist-1.0.1.war" />
 
@@ -72,7 +72,8 @@
 
     <target name="_get-service-home">
 
-        <dirname property="__service.home" file="${basedir}"/>
+        <dirname property="___service.home" file="${basedir}"/>
+        <dirname property="__service.home" file="${___service.home}"/>
 
         <input message="Enter the path where you want to install the service 
[${__service.home}/webapps]:"
             addproperty="_service.home"
@@ -126,7 +127,7 @@
             addproperty="tomcat.download.url"
             defaultvalue="${_tomcat.download.url}"
         />
-        <echo message="Installing the Tomcat..."/>
+        <echo message="Installing the Tomcat (please be patient, this can 
take some time) ..."/>
 
     </target>
 
@@ -156,7 +157,7 @@
 
     <target name="webservice-container-question">
 
-        <input message="Do you want me to download and install the 
application server Tomcat for you? "
+        <input message="Do you want me to download and install the 
application server Tomcat (${tomcat.dir}) for you? "
             addproperty="_tomcat.install.decision"
             validargs="y,n"
             defaultvalue="n" />
@@ -199,7 +200,7 @@
         unless="tomcat.install.decision">
 
         <antcall target="get-tomcat-directory"/>
-        
+
     </target>
 
 
@@ -214,12 +215,12 @@
             <isset property="tomcat.home"/>
         </condition>
 
-    </target>    
+    </target>
 
 
     <target name="_get-tomcat-directory_1" depends="__get-tomcat-directory" 
if="tomcat.home.present">
 
-        <input message="Enter the path where Tomcat is, or will be, 
installed: [${tomcat.home}]:"
+        <input message="Enter the path for the Tomcat installation: 
[${tomcat.home}]:"
             addproperty="tomcat.install.location"
             defaultvalue="${tomcat.home}" />
 
@@ -228,7 +229,7 @@
 
     <target name="_get-tomcat-directory_2" depends="__get-tomcat-directory" 
unless="tomcat.home.present">
 
-        <input message="Enter the path where Tomcat is, or will be, 
installed: [/usr/local/tomcat]:"
+        <input message="Enter the path for the Tomcat installation: 
[/usr/local/tomcat]:"
             addproperty="tomcat.install.location"
             defaultvalue="/usr/local/tomcat" />
 
@@ -253,7 +254,7 @@
 
     <target name="get-server-address">
 
-        <input message="Enter the address of your application server Tomcat 
[localhost]:"
+        <input message="Enter the address (ip or hostname) of your 
application server Tomcat [localhost]:"
             addproperty="server.address"
             defaultvalue="localhost"
         />
@@ -282,8 +283,7 @@
         <echo>for the http communication. If not then configure the Tomcat 
in order</echo>
         <echo>to use this port number.</echo>
         <echo></echo>
-        <echo>Please, do it now. I will wait for you.</echo>
-        <input message="Press Return key ..."/>
+        <input message="Please do it now and press Enter when finished"/>
 
         <propertyfile file="ant/const.properties" 
             comment="This file was created by the Ant configuration script.">
@@ -296,4 +296,4 @@
 
 
 
-</project>
+</project>
\ No newline at end of file

Added: branches/CL-MP-STABLE/perfsonar/conf/log4j.properties.template

Modified: branches/CL-MP-STABLE/perfsonar/conf/service.properties.clmp
===================================================================
--- branches/CL-MP-STABLE/perfsonar/conf/service.properties.clmp        
2007-02-27 12:56:12 UTC (rev 2148)
+++ branches/CL-MP-STABLE/perfsonar/conf/service.properties.clmp        
2007-02-27 12:57:54 UTC (rev 2149)
@@ -60,4 +60,4 @@
 
service.mp.class_name=org.perfsonar.service.measurementPoint.commandLine.CommandLineMPServiceEngine
 
 # Message types supported by mp service
-service.mp.message_types=MeasurementRequest
+service.mp.message_types=MeasurementRequest,EchoRequest

Deleted: branches/CL-MP-STABLE/perfsonar/doc/mp/cliTypeMP/CLMP Interface 
Specification 1.3.doc

Added: branches/CL-MP-STABLE/perfsonar/doc/mp/cliTypeMP/CLMP Interface 
Specification 1.4.doc


Property changes on: branches/CL-MP-STABLE/perfsonar/doc/mp/cliTypeMP/CLMP 
Interface Specification 1.4.doc
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: 
branches/CL-MP-STABLE/perfsonar/src/org/perfsonar/commons/messages/EchoRequest.java
===================================================================
--- 
branches/CL-MP-STABLE/perfsonar/src/org/perfsonar/commons/messages/EchoRequest.java
 2007-02-27 12:56:12 UTC (rev 2148)
+++ 
branches/CL-MP-STABLE/perfsonar/src/org/perfsonar/commons/messages/EchoRequest.java
 2007-02-27 12:57:54 UTC (rev 2149)
@@ -6,11 +6,20 @@
 package org.perfsonar.commons.messages;
 
 
+import org.perfsonar.service.commons.exceptions.PerfSONARException;
+import org.perfsonar.service.commons.exceptions.DataFormatException;
+import org.perfsonar.service.commons.exceptions.RequestException;
 import org.perfsonar.service.commons.exceptions.SystemException;
+import org.perfsonar.service.commons.exceptions.ResourceException;
 import org.perfsonar.service.commons.engine.ActionType;
+import org.perfsonar.service.commons.util.ResultCodesUtil;
 
+import org.ggf.ns.nmwg.base.v2_0.Message;
 import org.ggf.ns.nmwg.base.v2_0.Metadata;
+import org.ggf.ns.nmwg.base.v2_0.Data;
+import org.ggf.ns.nmwg.base.v2_0.EventType;
 
+import java.util.ArrayList;
 import java.util.Map;
 
 
@@ -48,6 +57,116 @@
     }
 
 
+    public Message execute(Message reqMessage) {
 
+        ArrayList<Message> output = new ArrayList<Message>();
 
+        for (Message inputMessage: extractMultipleRequests(reqMessage)) {
+
+            try {
+
+                output.add(
+                        executeEcho(inputMessage));
+
+            } catch (PerfSONARException e) {
+
+                output.add(
+                    ResultCodesUtil.createResultCodeMetadata(
+                            null, e));
+
+            }   
+
+        }
+
+        //do one message from all result messages        
+        Message respMessage = mergeMultipleResponses(output);
+
+        //if no metadata inside, print error
+        if (respMessage.getMetadataMap().values().size() == 0) {
+            ResultCodesUtil.createResultCodeMetadata(
+                respMessage, 
+                new PerfSONARException(
+                        "warning.common.no_metadata",
+                        "No output metadata was returned by MessageHandler."+
+                        " Maybe there was no data trigger, or data trigger "+
+                        " didn't have valid metadataIdRef? ")
+                );
+
+        }
+
+        respMessage.setId(reqMessage.getId() + "_resp");
+        respMessage.setType(reqMessage.getType().replaceFirst("Request", 
"Response"));
+        respMessage.setMessageIdRef(reqMessage.getId());
+
+        return respMessage;
+
+    }
+
+
+    protected Message executeEcho(Message request)
+       throws SystemException, RequestException, DataFormatException, 
ResourceException {
+
+       Data data = request.getDataArray()[0];
+       Metadata metadata = request.getMetadata(data.getMetadataIdRef());
+
+       EventType eventType = metadata.getEventType();
+       if (eventType == null) {
+               logger.debug("EchoRequest.executeEcho: The request does not 
contain "
+                               + "eventType element");
+               throw new SystemException(
+                               "error.request",
+                               "EchoRequest.executeEcho: The request does 
not contain "
+                               + "eventType element");
+       }
+
+       Message response = null;
+       
+       if (eventType.getEventType().equals("echo")) {
+               response = executeSimpleEcho();
+       } else if (eventType.getEventType().equals("")) {
+               response = getEmptyEventTypeResponse();
+       } else {
+               response = serviceEngine.takeAction(getType(), request);
+       }
+
+       return response;
+
+    }
+
+
+    protected Message executeSimpleEcho() {
+
+       logger.debug("EchoRequest: executeSimpleEcho()");
+
+       Message response = new Message();
+
+       PerfSONARException pex =
+               new PerfSONARException(
+                               "success.echo",
+                               "This is the echo response from the 
service.");
+
+       ResultCodesUtil.createResultCodeMetadata(response, pex);
+
+       return response;
+
+    }
+
+
+    protected Message getEmptyEventTypeResponse() {
+
+       Message response = new Message();
+
+       PerfSONARException pex =
+               new PerfSONARException(
+                               "error.echo",
+                               "EventType is empty.");
+
+       ResultCodesUtil.createResultCodeMetadata(response, pex);
+
+       return response;
+
+    }
+
+
+
 } //EchoRequest

Modified: 
branches/CL-MP-STABLE/perfsonar/src/org/perfsonar/service/measurementPoint/commandLine/CommandLineExec.java
===================================================================
--- 
branches/CL-MP-STABLE/perfsonar/src/org/perfsonar/service/measurementPoint/commandLine/CommandLineExec.java
 2007-02-27 12:56:12 UTC (rev 2148)
+++ 
branches/CL-MP-STABLE/perfsonar/src/org/perfsonar/service/measurementPoint/commandLine/CommandLineExec.java
 2007-02-27 12:57:54 UTC (rev 2149)
@@ -305,7 +305,7 @@
                ) throws IOException, SystemException
     {
        if(cmdarr.length < 1){
-            throw new SystemException("CommandLineExec: null cmd specified");
+            throw new SystemException("error.mp.clmp.exec", 
"CommandLineExec: null cmd specified");
         }
         this.cmdarr = cmdarr;