perfsonar development work

Author: fernandes
Date: 2006-10-04 13:57:50 -0400 (Wed, 04 Oct 2006)
New Revision: 1656

Added:
   
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/commandLine/tools/Bwctl.java
Modified:
   trunk/perfsonar/src/org/perfsonar/commons/messages/MeasurementRequest.java
   trunk/perfsonar/src/org/perfsonar/service/commons/engine/ActionType.java
   
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/OwampQueryGenerator.java
   
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/commandLine/CommandLineAction.java
   
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/commandLine/CommandLineExec.java
   
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/commandLine/CommandLineMPServiceEngine.java
   
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/commandLine/CommandLineToolBundleFactory.java
   
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/commandLine/tools/Owamp.java
   
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/commandLine/tools/Ping.java
   
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/commandLine/tools/Traceroute.java
Log:
Error codes added to Exceptions
Metadata linking support (MeasurementRequest now uses Request)
CommandLineExec FreeBSD bug fixed
Bwctl support



Modified: 
trunk/perfsonar/src/org/perfsonar/commons/messages/MeasurementRequest.java
===================================================================
--- 
trunk/perfsonar/src/org/perfsonar/commons/messages/MeasurementRequest.java  
2006-10-03 10:53:09 UTC (rev 1655)
+++ 
trunk/perfsonar/src/org/perfsonar/commons/messages/MeasurementRequest.java  
2006-10-04 17:57:50 UTC (rev 1656)
@@ -5,14 +5,14 @@
 
 package org.perfsonar.commons.messages;
 
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Map;
 
-import org.perfsonar.service.commons.exceptions.*;
+import org.perfsonar.service.commons.exceptions.SystemException;
+import org.perfsonar.service.commons.engine.ActionType;
 
-import org.ggf.ns.nmwg.base.v2_0.*;
+import org.ggf.ns.nmwg.base.v2_0.Metadata;
 
+import java.util.Map;
+
 /**
  * MessageHandler for MeasurementRequest messages
  *
@@ -21,11 +21,6 @@
 public class MeasurementRequest extends Request {
 
 
-
-    // ---------------------------------- class fields
-
-
-
     // ---------------------------------- constructors
 
 
@@ -33,145 +28,15 @@
     public MeasurementRequest()
         throws SystemException{
 
-        type = new String("MeasurementRequest");
+        super();
+        logger.debug("MeasurementRequest: MessageHandler created");
+        setType(ActionType.MAKE_MEASUREMENT);
+        
     }
 
-
-
     // ---------------------------------- public methods
 
-
-
-    public Message execute(Message reqMessage) {
-       
-       
-       // This method is just to eliminate errors related with exceptions.
-       // This class should be updated by its author!!!
-       
-       Message message = null;
-       
-       try {
-               
-               message = _execute(reqMessage);
-               
-       } catch (Exception ex) {
-
-               message = new Message(); 
-               
-       }
-       
-       return message;
-       
-    }
-
     
-    /**
-     * This method returns a Message that contains a Metadata describing
-     * the actual test that happened and a Data containing the data.
-     */
-    protected Message _execute(Message reqMessage)
-        throws 
SystemException,ResourceException,DataFormatException,RequestException{
-
-       logger.debug(getType() + ": MessageHandler.execute() message: " + 
reqMessage.toString());
-
-        Map mdMap = reqMessage.getMetadataMap();
-        Map dataMap = reqMessage.getDataMap();
-
-        Collection dataCollection = dataMap.values();
-        logger.debug("metadataMap: " + mdMap + "\tdataMap: " + dataMap + 
"\tdataCollection: " + dataCollection);
-
-        /*
-         * Prepare message to hold individual req's
-         */
-        Message atomReq = new Message();
-        atomReq.setType(reqMessage.getType());
-
-        Message respMessage = new Message();
-
-        // TODO: replace with message objects!!
-        logger.debug(getType() + ": Initialize service beans");
-        Message atomResp = null;
-
-        logger.debug(getType() + ": Iterate on data");
-
-        if(dataCollection.size() < 1){
-            logger.warn(getType() + ": No data element in request");
-        }
-
-        for (Iterator i = dataCollection.iterator(); i.hasNext(); ){
-            Data reqdata = (Data)i.next();
-            Metadata reqmd = (Metadata)mdMap.get(
-                    reqdata.getMetadataIdRef());
-
-            if(reqmd == null){
-                logger.fatal(
-                        getType() + ": Data element has empty 
metaDataIdRef");
-                throw new RequestException(
-                        getType() + ": Data element has empty 
metaDataIdRef");
-            }
-
-            // TODO: Eventually chaining probably needs to be handled!
-
-            logger.debug(
-                    getType() + ": Calling service engine");
-
-            atomReq.clearData();
-            atomReq.clearMetadata();
-
-            atomReq.addChild(reqdata);
-            atomReq.addChild(reqmd);
-
-            atomResp = serviceEngine.takeAction(getType(),atomReq);
-
-
-            // pull out data and metadata elements from atomResp
-            // and put them in the response message.    
-
-            int hasData=0;
-            for(Iterator j = 
atomResp.getDataIterator();j.hasNext();hasData++){
-                respMessage.addChild((Data)j.next());
-            }
-
-            // simplistic sanity checks
-
-            if (hasData < 1){
-                logger.fatal(
-                        "DataRequest.metaToKey: returned no data");
-                throw new RequestException(
-                        "DataRequest.metaToKey: returned no data");
-            }
-
-            int hasMd=0;
-            for(Iterator j 
=atomResp.getMetadataIterator();j.hasNext();hasMd++){
-                respMessage.addChild((Metadata)j.next());
-            }
-
-            // XXX: Do better than these simplistic sanity checks!!!
-
-            if (hasMd < 1){
-                logger.fatal(
-                        "DataRequest.metaToKey: returned no Metadata");
-                throw new RequestException(
-                        "DataRequest.metaToKey: returned no Metadata");
-            }
-
-            if(hasData > hasMd){
-                logger.fatal("MetadataKeyRequest: Invalid data/metadata " +
-                        "mapping returned from service");
-                throw new RequestException(
-                        "MetadataKeyRequest: Invalid data/metadata " +
-                        "mapping returned from service");
-
-            }
-        }
-
-        logger.debug(getType() +
-                "returning respMessage = " + respMessage.toString());
-
-        return respMessage;
-    }
-    
-    
     public Map<String,Metadata> mergeAllMetadata(Map<String,Metadata> 
metadatas) {
        
        return metadatas;

Modified: 
trunk/perfsonar/src/org/perfsonar/service/commons/engine/ActionType.java
===================================================================
--- trunk/perfsonar/src/org/perfsonar/service/commons/engine/ActionType.java  
  2006-10-03 10:53:09 UTC (rev 1655)
+++ trunk/perfsonar/src/org/perfsonar/service/commons/engine/ActionType.java  
  2006-10-04 17:57:50 UTC (rev 1656)
@@ -80,6 +80,17 @@
 
     public static final String ECHO = "ECHO";
 
+    
+    
+    // ------------------------------------------ Measurement Point Actions
 
 
+
+    /**
+     * Action type to request a measurement
+     */
+
+    public static final String MAKE_MEASUREMENT = "MeasurementRequest";
+
+
 }

Modified: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/OwampQueryGenerator.java
===================================================================
--- 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/OwampQueryGenerator.java
 2006-10-03 10:53:09 UTC (rev 1655)
+++ 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/OwampQueryGenerator.java
 2006-10-04 17:57:50 UTC (rev 1656)
@@ -84,12 +84,11 @@
                     "OwampQueryGenerator.getMetadataQuery: "
                     + "Input message is null");
 
-
+        String metaId         = "";
         String src            = "";
         String dst            = "";
         String direction      = "";
         String eventType      = "";
-       String metaId         = "";
 
         Metadata metadata = null;
         try {
@@ -107,15 +106,17 @@
         }
 
         if (metadata != null) {
-
-           metaId = metadata.getId();
+            
+            metaId = metadata.getId().trim();
             eventType = (metadata.getEventType() != null ?  
metadata.getEventType().getEventType().trim() : "");
+            
             Subject subject = (Subject) metadata.getSubject();
             EndPointPair end = subject.getEndPointPair();
             
             Parameters params = metadata.getParameters();
             Parameter paramDirection = 
params.getParameterByName("direction");
 
+            
             if (end != null) {
                 src        = (end.getSourceElement()    != null ? 
end.getSourceElement().getValue().trim()           : "");
                 dst        = (end.getDestinationElement()   != null ? 
end.getDestinationElement().getValue().trim()  : "");
@@ -124,7 +125,6 @@
             if (paramDirection != null)
                 direction  = (paramDirection.getParameterValue()   != null ? 
paramDirection.getParameterValue().trim() : "");
 
-
         }
 
         String xQuery = "\n"
@@ -135,10 +135,12 @@
         xQuery += 
                " let $res :=                                                 
          \n"
                + "    for $i in //nmwg:metadata                        \n"
-               + "    where 1                                                
          \n"
-               + "    and $i[(@id='" + metaId + "')] ";
+               + "    where 1                                                
          \n";
 
 
+        if (!(metaId.equals("allMetadatas")))
+               xQuery += "and $i[(@id='" + metaId + "')]";
+        
         if (eventType != "")
                xQuery += "and $i/nmwg:eventType[(text()='" + eventType + 
"')]";
 
@@ -170,12 +172,6 @@
             + " return ($res, $datas)                                        
  \n";
 
 
-        //logger.debug(
-        //             "OwampQueryGenerator.getMetadataQuery: "
-        //             + "meta query: "
-        //             + xQuery);
-
-
         return xQuery;
 
 

Modified: 
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/commandLine/CommandLineAction.java
===================================================================
--- 
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/commandLine/CommandLineAction.java
       2006-10-03 10:53:09 UTC (rev 1655)
+++ 
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/commandLine/CommandLineAction.java
       2006-10-04 17:57:50 UTC (rev 1656)
@@ -1,7 +1,5 @@
 package org.perfsonar.service.measurementPoint.commandLine;
 
-import java.util.*;
-
 import org.ggf.ns.nmwg.base.v2_0.Data;
 import org.ggf.ns.nmwg.base.v2_0.Metadata;
 import org.ggf.ns.nmwg.base.v2_0.Message;
@@ -10,10 +8,8 @@
 import 
org.perfsonar.commons.auxiliary.components.configuration.ConfigurationComponent;
 import org.perfsonar.commons.auxiliary.components.logger.LoggerComponent;
 
-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.measurementExecutor.MeasurementExecutor;
 
@@ -53,7 +49,27 @@
 
         configuration = (ConfigurationComponent)AuxiliaryComponentManager.
             getInstance().getComponent(ComponentNames.CONFIG);
+
+        // XXX: The configuration reader is instantiated but not used.
+        //      Is it necessary?
+        if (configuration == null) {
+            
+            throw new SystemException("error.common.no_configuration",
+                    ME_TYPE + ": "
+                    + "Could not get an instance of Configuration reader. "
+                    + "Cannot continue with the request");
+
+        }
         
+        if (logger == null) {
+            
+            throw new SystemException("error.common.no_logger",
+                       ME_TYPE + ": "
+                    + "Could not get an instance of the Logger Component. "
+                    + "Cannot continue with the request");
+
+        }
+        
     }
     
     // --------------- Public Methods
@@ -66,7 +82,7 @@
 
     public Message makeMeasurement(
             Message reqMess
-            ) throws SystemException, ResourceException, 
DataFormatException, RequestException{
+            ) throws SystemException, RequestException{
 
         if (!reqMess.getType().equals("MeasurementRequest")) {
                logger.error(
@@ -74,47 +90,41 @@
                     ": UNSUPPORTED: Can only handle MeasurementRequest 
message"
                     );
             throw new RequestException(
+                       "error.mp.clmp.validator.unsuported_message_type",
                     ME_TYPE +
                     ": UNSUPPORTED: Can only handle MeasurementRequest 
message"
                     );
         }
        
-       // Fetch eventType and dispatch appropriate "tool bundle"
-        Map mdMap = reqMess.getMetadataMap();
-        Collection mdCollection = mdMap.values();
-
-        // XXX: For now, CommandLineMP doesn't know how to deal with
-        // chaining!
-        if(mdCollection.size() != 1){
-            logger.fatal(
-                    ME_TYPE +
-                    ": UNSUPPORTED: Can only handle one MetaData currently"
-                    );
-            throw new RequestException(
-                    ME_TYPE +
-                    ": UNSUPPORTED: Can only handle one MetaData currently"
-                    );
+        // Fetch eventType and dispatch appropriate "tool bundle"
+        
+        Data[] data = reqMess.getDataArray();
+        
+        Metadata eventType = reqMess.getMetadata(data[0].getMetadataIdRef());
+               
+        while (eventType.getEventType() == null) {
+               
+               if (eventType.getMetadataIdRef().length() > 0)
+                       eventType = 
reqMess.getMetadata(eventType.getMetadataIdRef());
+               else {
+                       logger.fatal(
+                                       ME_TYPE +
+                                       ": Request must have at least one 
EventType defined in at least one MetaData."
+                       );
+                       throw new RequestException(
+                                       
"error.mp.clmp.validator.no_metadata_eventType",
+                                       ME_TYPE +
+                                       ": Request must have at least one 
EventType defined in at least one MetaData."
+                       );
+               }
         }
-
-        Metadata[] mdArr = (Metadata[])mdCollection.toArray(
-                                        new Metadata[1]);
+        
         CommandLineToolBundle tool =
             CommandLineToolBundleFactory.getCommandLineToolBundle(
-                    mdArr[0].getEventType());
-        if(tool == null){
-            logger.fatal(
-                    ME_TYPE +
-                    ": Unable to find Tool abstraction for eventType = " +
-                    mdArr[0].getEventType().getEventType()
-                    );
-            throw new SystemException(
-                    ME_TYPE +
-                    ": Unable to find Tool abstraction for eventType = " +
-                    mdArr[0].getEventType().getEventType()
-                    );
-        }
+                    eventType.getEventType());
 
         return tool.runTool(reqMess);
+        
     }
 
     // ------------------------------------------------------ Protected 
methods

Modified: 
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/commandLine/CommandLineExec.java
===================================================================
--- 
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/commandLine/CommandLineExec.java
 2006-10-03 10:53:09 UTC (rev 1655)
+++ 
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/commandLine/CommandLineExec.java
 2006-10-04 17:57:50 UTC (rev 1656)
@@ -16,8 +16,19 @@
  */
 package org.perfsonar.service.measurementPoint.commandLine;
 
-import java.io.*;
-import java.util.*;
+import java.io.File;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.BufferedReader;
+import java.io.PrintWriter;
+import java.io.InputStreamReader;
+import java.io.FileOutputStream;
+import java.io.IOException;
+
+import java.util.ArrayList;
+import java.util.Hashtable;
+import java.util.Enumeration;
+
 import org.ggf.ns.nmwg.base.v2_0.Parameters;
 import org.ggf.ns.nmwg.base.v2_0.Parameter;
 import org.perfsonar.service.commons.exceptions.SystemException;
@@ -84,7 +95,7 @@
                 while( (line = br.readLine()) != null){
                     if(pw != null)
                         pw.println(line);
-                    //System.out.println(line);
+                    System.out.println(line);
                 }
                 
                 pw.close();
@@ -121,9 +132,19 @@
                 ) throws java.io.IOException
         {
             Runtime run = Runtime.getRuntime();
-
-            proc = run.exec(cmdarr);
-
+            
+            String cmd = "";
+            
+            int i;
+            
+            for(i = 0; i < cmdarr.length-1; i++)
+                cmd += cmdarr[i] + " ";
+            cmd += cmdarr[i];
+            
+            System.out.println("CommandLineExec: Running "+cmd);
+            
+            proc = run.exec(cmd);
+            
             return;
         }
 
@@ -136,6 +157,7 @@
         {
             if(!done){
                 throw new SystemException(
+                               "error.mp.clmp.exec.exit_request",
                         "MyExec: Exit code requested for still running proc"
                         );
             }
@@ -200,17 +222,10 @@
      */
     public CommandLineExec(
                String      cmdname
-            //String      cmdname,
-            //String[]    cmdarr
-            //) throws IOException, SystemException
                ) throws IOException
     {
         // TODO: verify cmdarr
-        /*if(cmdarr.length < 1){
-            throw new SystemException("CommandLineExec: null cmd specified");
-        }
-        this.cmdarr = cmdarr;*/
-
+        
         // TODO: create TmpFile for stdout/stderr
         osFile = File.createTempFile(cmdname,".out");
         esFile = File.createTempFile(cmdname,".err");
@@ -287,8 +302,7 @@
     public void run_synchronous(
             int timeout_mills,
             String[] cmdarr
-            //) throws IOException
-               ) throws IOException, SystemException
+               ) throws IOException, SystemException
     {
        if(cmdarr.length < 1){
             throw new SystemException("CommandLineExec: null cmd specified");
@@ -325,33 +339,39 @@
                                p = params.getParameterByName(key);
                            if(p != null){
                                if (optionParts.length == 2) {
-                                       System.out.println(optionParts[0] + " 
" + p.getParameterName() + " " + optionParts[1]);
-                                       if 
(optionParts[0].equals(p.getParameterName()) && 
optionParts[1].equals("novalue"))
+                                       if 
(!optionParts[1].equals("novalue")) {
                                                cmd.add(optionParts[0]);
-                                       else
-                                               cmd.add(optionParts[0] + " " 
+ p.getParameterValue());
+                                               
cmd.add(p.getParameterValue());
+                                       } else
+                                               cmd.add(optionParts[0]);
                                }
-                               else
-                                       cmd.add(optionParts[0] + " " + 
p.getParameterValue());
+                               else {
+                                       cmd.add(optionParts[0]);
+                                       cmd.add(p.getParameterValue());
+                               }
                            }
                            else {
                                if (optionParts.length == 2){
                                        // default parameter + value
-                                       if (!optionParts[1].equals("novalue"))
-                                               cmd.add(optionParts[0] + " " 
+ optionParts[1]);
+                                       if 
(!optionParts[1].equals("novalue")) {
+                                               cmd.add(optionParts[0]);
+                                               cmd.add(optionParts[1]);
+                                       }
                                }
                            }
                        }
                        else {
                                if (optionParts.length == 2){
                                // default parameter + value
-                                       if (!optionParts[1].equals("novalue"))
-                                       cmd.add(optionParts[0] + " " + 
optionParts[1]);
+                                       if 
(!optionParts[1].equals("novalue")) {
+                                       cmd.add(optionParts[0]);
+                                       cmd.add(optionParts[1]);
+                                       }
                        }
                        }
                }
        }
-        return cmd;
+       return cmd;
     }
     
     // ------------------------------------------------------ Protected 
methods

Modified: 
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/commandLine/CommandLineMPServiceEngine.java
===================================================================
--- 
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/commandLine/CommandLineMPServiceEngine.java
      2006-10-03 10:53:09 UTC (rev 1655)
+++ 
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/commandLine/CommandLineMPServiceEngine.java
      2006-10-04 17:57:50 UTC (rev 1656)
@@ -14,24 +14,16 @@
  */
 package org.perfsonar.service.measurementPoint.commandLine;
 
-import java.util.Map;
-import java.util.Collection;
-
 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.perfsonar.commons.auxiliary.AuxiliaryComponentManager;
 import org.perfsonar.commons.auxiliary.ComponentNames;
 import org.perfsonar.commons.auxiliary.components.logger.LoggerComponent;
 
-import org.perfsonar.service.commons.engine.ActionType;
 import org.perfsonar.service.commons.engine.ServiceEngine;
 
-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;
 
 /**
  * ServiceEngine class for command-line MP's.
@@ -73,6 +65,15 @@
         logger = (LoggerComponent)AuxiliaryComponentManager.
             getInstance().getComponent(ComponentNames.LOGGER);
 
+        if (logger == null) {
+            
+            throw new SystemException("error.common.no_logger",
+                       "CommandLineMPServiceEngine: "
+                    + "Could not get an instance of the Logger Component. "
+                    + "Cannot continue with the request.");
+
+        }          
+        
         logger.debug("CommandLineMPServiceEngine: started... ");
         
         this.serviceEngineType = SERVICE_ENGINE_TYPE;
@@ -113,7 +114,7 @@
      *  @see org.perfsonar.service.commons.engine.ServiceEngine
      */
     public Message takeAction(String actionType, Message reqMess) 
-        throws SystemException, RequestException, DataFormatException, 
ResourceException{
+        throws SystemException, RequestException {
         
         
         logger.debug("CommandLineMPServiceEngine: takeAction for action [" +
@@ -138,10 +139,19 @@
 
             CommandLineAction action = new CommandLineAction();
             return action.makeMeasurement(reqMess);
+            
         }
         else {
-            throw new SystemException("CommandLineMPServiceEngine: Action ["
-                    +actionType+"] not supported");
+               
+            logger.fatal(
+                    "CommandLineMPServiceEngine.takeAction: ActionType 
specified: "
+                    + actionType + " is not supported");
+
+            throw new SystemException("error.common.action_not_suported",
+                    "CommandLineMPServiceEngine: "
+                    + "ActionType specified: "+ actionType
+                    + " is not supported");
+
         }
         
         // ------end of serving actions 
---------------------------------------

Modified: 
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/commandLine/CommandLineToolBundleFactory.java
===================================================================
--- 
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/commandLine/CommandLineToolBundleFactory.java
    2006-10-03 10:53:09 UTC (rev 1655)
+++ 
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/commandLine/CommandLineToolBundleFactory.java
    2006-10-04 17:57:50 UTC (rev 1656)
@@ -44,6 +44,14 @@
         LoggerComponent logger = (LoggerComponent)AuxiliaryComponentManager.
             getInstance().getComponent(ComponentNames.LOGGER);
 
+        if (logger == null) {
+            
+            throw new SystemException("error.common.no_logger",
+                       "CommandLineToolBundleFactory: "
+                    + "Could not get an instance of the Logger Component. "
+                    + "Cannot continue with the request.");
+
+        }            
         // one time initialization to determine what event types are
         // supported by the commandLine.ToolBundle abstraction.
         
@@ -53,6 +61,17 @@
                 AuxiliaryComponentManager.getInstance().
                 getComponent(ComponentNames.CONFIG);
 
+            // XXX: The configuration reader is instantiated but not used.
+            //      Is it necessary?
+            if (configManager == null) {
+                
+                throw new SystemException("error.common.no_configuration",
+                               "CommandLineToolBundleFactory: "
+                        + "Could not get an instance of Configuration 
reader. "
+                        + "Cannot continue with the request");
+
+            }
+            
             // XXX: Probably need a plug-in's directory and config info for
             // this, but for now just hardcode.
             m2c = new Hashtable();
@@ -62,11 +81,18 @@
                
"org.perfsonar.service.measurementPoint.commandLine.tools.Owamp");
             m2c.put("TRACEROUTE",
                        
"org.perfsonar.service.measurementPoint.commandLine.tools.Traceroute");
+            m2c.put("BWCTL",
+                       
"org.perfsonar.service.measurementPoint.commandLine.tools.Bwctl");
         }
 
 
         if (m2c == null){
             logger.error("CommandLineToolBundleFactory: hashtable not 
created");
+
+            throw new SystemException("error.mp.clmp.toolFactory.hashtable",
+                       "CommandLineToolBundleFactory: "
+                    + "Could not create tools hashtable. "
+                    + "Cannot continue with the request");
         }
 
 
@@ -93,6 +119,7 @@
                     " ToolBundle for: " + eventString +
                     " because: " + e.getMessage());
             throw new SystemException(
+                       "error.mp.clmp.toolFactory.cant_instantiate",
                     "CommandLineToolBundleFactory: Unable to Instantiate " +
                     "ToolBundle for: " + eventString +
                     "because: " + e.getMessage());
@@ -106,6 +133,7 @@
                     "because of IllegalAccessException: " +
                     e.getMessage());
             throw new SystemException(
+                       "error.mp.clmp.toolFactory.illegal_access",
                     "CommandLineToolBundleFactory: Unable to Instantiate " +
                     "ToolBundle for: " + eventString +
                     "because of IllegalAccessException: " +
@@ -118,6 +146,7 @@
                     "create ToolBundle for: " + eventString +
                     " because: " + e.getMessage());
             throw new SystemException(
+                       "error.mp.clmp.toolFactory.no_class",
                     "CommandLineToolBundleFactory: Unable to " +
                     "create ToolBundle for: " + eventString +
                     " because: " + e.getMessage());
@@ -130,6 +159,7 @@
                     "CommandLineToolBundleFactory: Unable to " +
                     "create ToolBundle for: " + eventString);
             throw new SystemException(
+                       "error.mp.clmp.toolFactory.cant_instantiate",
                     "CommandLineToolBundleFactory: Unable to " +
                     "create ToolBundle for: " + eventString);
 

Added: 
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/commandLine/tools/Bwctl.java


Property changes on: 
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/commandLine/tools/Bwctl.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: 
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/commandLine/tools/Owamp.java
===================================================================
--- 
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/commandLine/tools/Owamp.java
     2006-10-03 10:53:09 UTC (rev 1655)
+++ 
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/commandLine/tools/Owamp.java
     2006-10-04 17:57:50 UTC (rev 1656)
@@ -16,14 +16,26 @@
  */
 package org.perfsonar.service.measurementPoint.commandLine.tools;
 
-import java.util.*;
-import java.util.regex.*;
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.io.FileInputStream;
+import java.io.IOException;
 
-import org.ggf.ns.nmwg.base.v2_0.*;
+import java.util.Hashtable;
+import java.util.ArrayList;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.ggf.ns.nmwg.base.v2_0.Message;
+import org.ggf.ns.nmwg.base.v2_0.Data;
+import org.ggf.ns.nmwg.base.v2_0.Metadata;
+import org.ggf.ns.nmwg.base.v2_0.Parameters;
+import org.ggf.ns.nmwg.base.v2_0.Parameter;
 import org.ggf.ns.nmwg.tools.owamp.v2_0.Datum;
 
-import org.perfsonar.service.commons.exceptions.*;
+import org.perfsonar.service.commons.exceptions.RequestException;
+import org.perfsonar.service.commons.exceptions.SystemException;
 import org.perfsonar.commons.auxiliary.AuxiliaryComponentManager;
 import org.perfsonar.commons.auxiliary.ComponentNames;
 import 
org.perfsonar.commons.auxiliary.components.configuration.ConfigurationComponent;
@@ -61,7 +73,7 @@
         return "OS (Specific not implemented)";
     }
 
-    public Message runTool(Message reqMess) throws 
SystemException,ResourceException,DataFormatException,RequestException{
+    public Message runTool(Message reqMess) throws 
SystemException,RequestException{
 
        Metadata[] mdArr = (Metadata[])reqMess.getMetadataArray();
 

Modified: 
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/commandLine/tools/Ping.java
===================================================================
--- 
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/commandLine/tools/Ping.java
      2006-10-03 10:53:09 UTC (rev 1655)
+++ 
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/commandLine/tools/Ping.java
      2006-10-04 17:57:50 UTC (rev 1656)
@@ -16,14 +16,26 @@
  */
 package org.perfsonar.service.measurementPoint.commandLine.tools;
 
-import java.util.*;
-import java.util.regex.*;
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.io.FileInputStream;
+import java.io.IOException;
 
-import org.ggf.ns.nmwg.base.v2_0.*;
+import java.util.Hashtable;
+import java.util.ArrayList;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.ggf.ns.nmwg.base.v2_0.Message;
+import org.ggf.ns.nmwg.base.v2_0.Data;
+import org.ggf.ns.nmwg.base.v2_0.Metadata;
+import org.ggf.ns.nmwg.base.v2_0.Parameters;
+import org.ggf.ns.nmwg.base.v2_0.Parameter;
 import org.ggf.ns.nmwg.tools.ping.v2_0.Datum;
 
-import org.perfsonar.service.commons.exceptions.*;
+import org.perfsonar.service.commons.exceptions.RequestException;
+import org.perfsonar.service.commons.exceptions.SystemException;
 import org.perfsonar.commons.auxiliary.AuxiliaryComponentManager;
 import org.perfsonar.commons.auxiliary.ComponentNames;
 import 
org.perfsonar.commons.auxiliary.components.configuration.ConfigurationComponent;
@@ -61,7 +73,7 @@
         return "OS (Specific not implemented)";
     }
 
-    public Message runTool(Message reqMess) throws 
SystemException,ResourceException,DataFormatException,RequestException{
+    public Message runTool(Message reqMess) throws 
SystemException,RequestException{
 
        Metadata[] mdArr = (Metadata[])reqMess.getMetadataArray();
 

Modified: 
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/commandLine/tools/Traceroute.java
===================================================================
--- 
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/commandLine/tools/Traceroute.java
        2006-10-03 10:53:09 UTC (rev 1655)
+++ 
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/commandLine/tools/Traceroute.java
        2006-10-04 17:57:50 UTC (rev 1656)
@@ -16,14 +16,26 @@
  */
 package org.perfsonar.service.measurementPoint.commandLine.tools;
 
-import java.util.*;
-import java.util.regex.*;
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.io.FileInputStream;
+import java.io.IOException;
 
-import org.ggf.ns.nmwg.base.v2_0.*;
+import java.util.Hashtable;
+import java.util.ArrayList;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.ggf.ns.nmwg.base.v2_0.Message;
+import org.ggf.ns.nmwg.base.v2_0.Data;
+import org.ggf.ns.nmwg.base.v2_0.Metadata;
+import org.ggf.ns.nmwg.base.v2_0.Parameters;
+import org.ggf.ns.nmwg.base.v2_0.Parameter;
 import org.ggf.ns.nmwg.tools.traceroute.v2_0.Datum;
 
-import org.perfsonar.service.commons.exceptions.*;
+import org.perfsonar.service.commons.exceptions.RequestException;
+import org.perfsonar.service.commons.exceptions.SystemException;
 import org.perfsonar.commons.auxiliary.AuxiliaryComponentManager;
 import org.perfsonar.commons.auxiliary.ComponentNames;
 import 
org.perfsonar.commons.auxiliary.components.configuration.ConfigurationComponent;
@@ -62,7 +74,7 @@
         return "OS (Specific not implemented)";
     }
 
-    public Message runTool(Message reqMess) throws 
SystemException,ResourceException,DataFormatException,RequestException{
+    public Message runTool(Message reqMess) throws 
SystemException,RequestException{
 
        Metadata[] mdArr = (Metadata[])reqMess.getMetadataArray();