perfsonar development work

Author: uros
Date: 2007-10-05 02:17:02 -0400 (Fri, 05 Oct 2007)
New Revision: 2909

Added:
   branches/new-structure/trunk/geant2_java-tc-mp/ant/axis-deploy-targets.xml
   branches/new-structure/trunk/geant2_java-tc-mp/ant/build.xml
   branches/new-structure/trunk/geant2_java-tc-mp/ant/compile-targets.xml
   branches/new-structure/trunk/geant2_java-tc-mp/ant/configure-targets.xml
   
branches/new-structure/trunk/geant2_java-tc-mp/ant/const.properties.template
   
branches/new-structure/trunk/geant2_java-tc-mp/ant/libs-download-targets.xml
   branches/new-structure/trunk/geant2_java-tc-mp/ant/pre-install-targets.xml
   branches/new-structure/trunk/geant2_java-tc-mp/ant/test-targets.xml
   
branches/new-structure/trunk/geant2_java-tc-mp/conf/components.properties.template
   
branches/new-structure/trunk/geant2_java-tc-mp/conf/log4j.properties.template
   branches/new-structure/trunk/geant2_java-tc-mp/conf/objects.config
   
branches/new-structure/trunk/geant2_java-tc-mp/conf/service.properties.template
   
branches/new-structure/trunk/geant2_java-tc-mp/samples/requests/TCMPCaptureRequest-AA-template.xml
   
branches/new-structure/trunk/geant2_java-tc-mp/samples/requests/TCMPCaptureRequest-local-1-template.xml
   
branches/new-structure/trunk/geant2_java-tc-mp/samples/requests/TCMPCaptureRequest-noAA-template.xml
Removed:
   branches/new-structure/trunk/geant2_java-tc-mp/build/
Modified:
   
branches/new-structure/trunk/geant2_java-tc-mp/conf/wsdd/service-deploy.wsdd
   
branches/new-structure/trunk/geant2_java-tc-mp/src/main/java/org/perfsonar/service/measurementPoint/tracefileCaptureType/TCMPTypeMeasurementExecutor.java
   
branches/new-structure/trunk/geant2_java-tc-mp/src/main/java/org/perfsonar/service/measurementPoint/tracefileCaptureType/TCMPTypeServiceEngine.java
   
branches/new-structure/trunk/geant2_java-tc-mp/src/main/java/org/perfsonar/service/measurementPoint/tracefileCaptureType/servlets/FileServerServlet.java
Log:
Final commit for the new directory structure.

Added: 
branches/new-structure/trunk/geant2_java-tc-mp/ant/axis-deploy-targets.xml

Added: branches/new-structure/trunk/geant2_java-tc-mp/ant/build.xml

Added: branches/new-structure/trunk/geant2_java-tc-mp/ant/compile-targets.xml

Added: 
branches/new-structure/trunk/geant2_java-tc-mp/ant/configure-targets.xml

Added: 
branches/new-structure/trunk/geant2_java-tc-mp/ant/const.properties.template

Added: 
branches/new-structure/trunk/geant2_java-tc-mp/ant/libs-download-targets.xml

Added: 
branches/new-structure/trunk/geant2_java-tc-mp/ant/pre-install-targets.xml

Added: branches/new-structure/trunk/geant2_java-tc-mp/ant/test-targets.xml

Added: 
branches/new-structure/trunk/geant2_java-tc-mp/conf/components.properties.template

Added: 
branches/new-structure/trunk/geant2_java-tc-mp/conf/log4j.properties.template

Added: branches/new-structure/trunk/geant2_java-tc-mp/conf/objects.config

Added: 
branches/new-structure/trunk/geant2_java-tc-mp/conf/service.properties.template

Modified: 
branches/new-structure/trunk/geant2_java-tc-mp/conf/wsdd/service-deploy.wsdd
===================================================================
--- 
branches/new-structure/trunk/geant2_java-tc-mp/conf/wsdd/service-deploy.wsdd  
      2007-10-04 15:25:35 UTC (rev 2908)
+++ 
branches/new-structure/trunk/geant2_java-tc-mp/conf/wsdd/service-deploy.wsdd  
      2007-10-05 06:17:02 UTC (rev 2909)
@@ -4,7 +4,7 @@
 <service name="MeasurementPointService" style="message">
 <Documentation>Defines the name of the service and the type of service. The 
style if message which for some reason makes communication cleaner and does 
not affect anything. It implicitly uses Document style </Documentation>
 
-<parameter name="className" 
value="org.perfsonar.service.web.RequestHandler"/>
+<parameter name="className" 
value="org.perfsonar.service.base.web.RequestHandler"/>
 <Documentation> Define the name of the class to be used for the service. 
This will remain the same regardless of the service </Documentation>
 
 <parameter name="allowedMethods" value="acceptCall"/>

Added: 
branches/new-structure/trunk/geant2_java-tc-mp/samples/requests/TCMPCaptureRequest-AA-template.xml

Added: 
branches/new-structure/trunk/geant2_java-tc-mp/samples/requests/TCMPCaptureRequest-local-1-template.xml

Added: 
branches/new-structure/trunk/geant2_java-tc-mp/samples/requests/TCMPCaptureRequest-noAA-template.xml

Modified: 
branches/new-structure/trunk/geant2_java-tc-mp/src/main/java/org/perfsonar/service/measurementPoint/tracefileCaptureType/TCMPTypeMeasurementExecutor.java
===================================================================
--- 
branches/new-structure/trunk/geant2_java-tc-mp/src/main/java/org/perfsonar/service/measurementPoint/tracefileCaptureType/TCMPTypeMeasurementExecutor.java
   2007-10-04 15:25:35 UTC (rev 2908)
+++ 
branches/new-structure/trunk/geant2_java-tc-mp/src/main/java/org/perfsonar/service/measurementPoint/tracefileCaptureType/TCMPTypeMeasurementExecutor.java
   2007-10-05 06:17:02 UTC (rev 2909)
@@ -27,22 +27,18 @@
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
-import org.perfsonar.service.commons.exceptions.DataFormatException;
 
-import org.perfsonar.service.commons.exceptions.PerfSONARException;
+import org.perfsonar.base.exceptions.PerfSONARException;
 
-import org.perfsonar.commons.auxiliary.AuxiliaryComponentManager;
-import org.perfsonar.commons.auxiliary.ComponentNames;
-import 
org.perfsonar.commons.auxiliary.components.configuration.ConfigurationComponent;
-import org.perfsonar.commons.auxiliary.components.logger.LoggerComponent;
-import org.perfsonar.commons.auxiliary.components.simplescheduler.Scheduler;
-import 
org.perfsonar.commons.auxiliary.components.simplescheduler.SchedulerAction;
-import 
org.perfsonar.commons.auxiliary.components.simplescheduler.SchedulerTask;
-import org.perfsonar.service.commons.exceptions.RequestException;
-import org.perfsonar.service.commons.exceptions.ResourceException;
-import org.perfsonar.service.commons.exceptions.SystemException;
+import org.perfsonar.base.auxiliary.AuxiliaryComponentManager;
+import org.perfsonar.base.auxiliary.ComponentNames;
+import 
org.perfsonar.base.auxiliary.components.configuration.ConfigurationComponent;
+import org.perfsonar.base.auxiliary.components.logger.LoggerComponent;
+import org.perfsonar.base.auxiliary.components.simplescheduler.Scheduler;
+import 
org.perfsonar.base.auxiliary.components.simplescheduler.SchedulerAction;
+import org.perfsonar.base.auxiliary.components.simplescheduler.SchedulerTask;
 
-import org.perfsonar.service.commons.measurementExecutor.MeasurementExecutor;
+import org.perfsonar.service.base.measurementExecutor.MeasurementExecutor;
 
 import org.ggf.ns.nmwg.base.v2_0.Data;
 import org.ggf.ns.nmwg.base.v2_0.EventType;
@@ -66,9 +62,9 @@
 import si.arnes.jra1.perfsonar.jni.mapijni.MAPIMonitorRequest;
 import si.arnes.jra1.perfsonar.jni.mapijni.MAPIException;
 
-import org.perfsonar.service.commons.transport.Location;
-import org.perfsonar.service.commons.transport.FileTransportFactory;
-import org.perfsonar.service.commons.transport.FileTransport;
+import org.perfsonar.service.base.transport.Location;
+import org.perfsonar.service.base.transport.FileTransportFactory;
+import org.perfsonar.service.base.transport.FileTransport;
 
 import 
org.perfsonar.service.measurementPoint.tracefileCaptureType.db.SqlManager;
 import 
org.perfsonar.service.measurementPoint.tracefileCaptureType.db.mysql.MySqlManager;
@@ -162,13 +158,10 @@
      * 
      * @param measurementExecutorRequest parameter of type 
MeasurementExecutorRequest
      * @return MeasurementExecutorResponse
-     * @throws SystemException
-     * @throws RequestException
-     * @throws ResourceException
-     * @throws DataFormatException
+     * @throws PerfSONARException
      */
     public Message makeMeasurement(Message request)
-        throws SystemException, RequestException, ResourceException, 
DataFormatException {
+        throws PerfSONARException {
         
         logger = 
(LoggerComponent)AuxiliaryComponentManager.getInstance().getComponent(ComponentNames.LOGGER);
         
@@ -176,7 +169,7 @@
         
         if (configuration == null) {
             
-            throw new SystemException("error.common.no_configuration",
+            throw new PerfSONARException("error.common.no_configuration",
                     type + ": "
                     + "Could not get an instance of Configuration reader."
                     + "Cannot continue with the request");
@@ -185,7 +178,7 @@
         
         if (logger == null) {
             
-            throw new SystemException("error.common.no_logger",
+            throw new PerfSONARException("error.common.no_logger",
                     type + ": "
                     + "Could not get an instance of Configuration reader."
                     + "Cannot continue with the request");
@@ -200,7 +193,7 @@
         Message response = new Message();
 
         // Verify the incoming request Message
-        // Throw either RequestException or DataFormatException
+        // Throw PerfSONARException
         TCMPTypeMeasurementRequest req = validateTCMPRequest(request);
         
         // If simultaneous.traces service property is false, and capture is
@@ -218,7 +211,7 @@
             logger.fatal(type + ".makeMeasurement: Simultaneous traces not"
                     + " allowed (simultaneous.traces is false and capture"
                     + " currently running)!");
-            throw new SystemException(
+            throw new PerfSONARException(
                     "error.mp.tcmp.simultaneous_traces_not_allowed",
                     "Simultaneous traces are administratively prohibited"
                     + " wait few minutes and try again");
@@ -240,7 +233,7 @@
                 pstmt.setString(1, req.getCredentials().getUsername());
                 rst = pstmt.executeQuery();
                 if (! rst.next())
-                    throw new ResourceException("error.common.sqldb_error",
+                    throw new PerfSONARException("error.common.sqldb_error",
                             "Unable to retrieve id for user '"
                             + req.getCredentials().getUsername() + "'");
                 int id = rst.getInt(1);
@@ -280,7 +273,7 @@
                 
                 logger.fatal(type + ".makeMeasurement: Unable to add 
tracefile"
                         + " entry to SQL db: " + se);
-                throw new ResourceException("error.common.sqldb_error",
+                throw new PerfSONARException("error.common.sqldb_error",
                         "Unable to add tracefile entry to SQL db: " + se);
                 
             } finally {
@@ -302,12 +295,12 @@
         // (first or both interfaces)
         // and pass them to the scheduler.
         Scheduler scheduler = (Scheduler)
-            
AuxiliaryComponentManager.getInstance().getComponent("scheduler");
+            
AuxiliaryComponentManager.getInstance().getComponent(ComponentNames.SCHEDULER);
 
         if (scheduler == null) {
 
             logger.fatal(type + ".makeMeasurement: Scheduler component 
missing");
-            throw new SystemException(
+            throw new PerfSONARException(
                 "error.common.no_scheduler",
                 "No scheduler component in TCMPTypeMeasurementExecutor");
             
@@ -819,19 +812,17 @@
      *   service.mp.tcmp.pcap.file.storage.dir.
      *
      * @param request Message
-     * @throws SystemException
-     * @throws RequestException
-     * @throws DataFormatException
+     * @throws PerfSONARException
      */
     private TCMPTypeMeasurementRequest validateTCMPRequest(Message request)
-        throws SystemException, RequestException, DataFormatException {
+        throws PerfSONARException {
 
         TCMPTypeMeasurementRequest req = new TCMPTypeMeasurementRequest();
         String fileSeparator = System.getProperty("file.separator");
 
         if (request == null) {
             
-            throw new 
RequestException("error.mp.tcmp.validator.missing_request",
+            throw new 
PerfSONARException("error.mp.tcmp.validator.missing_request",
                     type + ".validateTCMPRequest(): "
                     + "Request to the measurement executor cannot be null");
 
@@ -850,7 +841,7 @@
             logger.fatal(
                     type + ".validateTCMPRequest: No data elements "
                     + "found in request. At least one is required in the 
message");
-            throw new 
RequestException("error.mp.tcmp.validator.no_data_elements",
+            throw new 
PerfSONARException("error.mp.tcmp.validator.no_data_elements",
                     type + ".validateTCMPRequest: No data elements "
                     + "found in request. At least one is required in the 
message");
 
@@ -861,7 +852,7 @@
             logger.fatal(
                     type + ".validateTCMPRequest: No metadata elements "
                     + "found in request. At least one is required in the 
message");
-            throw new 
RequestException("error.mp.tcmp.validator.no_metadata_elements",
+            throw new 
PerfSONARException("error.mp.tcmp.validator.no_metadata_elements",
                     type + ".validateTCMPRequest: No metadata elements "
                     + "found in request. At least one is required in the 
message");
 
@@ -882,7 +873,7 @@
             logger.fatal(
                     type + ".validateTCMPRequest: No subject in metadata 
element "
                     + "of request.");
-            throw new 
RequestException("error.mp.tcmp.validator.no_metadata_subject",
+            throw new 
PerfSONARException("error.mp.tcmp.validator.no_metadata_subject",
                     type + ".validateTCMPRequest: No subject in metadata 
element "
                     + "of request.");
 
@@ -903,7 +894,7 @@
                 logger.fatal(
                         type + ".validateTCMPRequest: Either hostName or 
ipAddress element "
                         + "required in interface element.");
-                throw new 
RequestException("error.mp.tcmp.validator.no_interface_hostName_or_ipAddress",
+                throw new 
PerfSONARException("error.mp.tcmp.validator.no_interface_hostName_or_ipAddress",
                         type + ".validateTCMPRequest: Either hostName or 
ipAddress element "
                         + "required in interface element.");
 
@@ -922,7 +913,7 @@
                 logger.fatal(
                         type + ".validateTCMPRequest: ifName element "
                         + "required in interface element.");
-                throw new 
RequestException("error.mp.tcmp.validator.no_interface_ifName",
+                throw new 
PerfSONARException("error.mp.tcmp.validator.no_interface_ifName",
                         type + ".validateTCMPRequest: ifName element "
                         + "required in interface element.");
 
@@ -955,7 +946,7 @@
                 logger.fatal(
                         type + ".validateTCMPRequest: The only supported 
endPoint "
                         + "type is currently 'hostname'");
-                throw new 
RequestException("error.mp.tcmp.validator.unsupported_endPoint_type",
+                throw new 
PerfSONARException("error.mp.tcmp.validator.unsupported_endPoint_type",
                         type + ".validateTCMPRequest: The only supported 
endPoint "
                         + "type is currently 'hostname'");
 
@@ -965,7 +956,7 @@
 
                 logger.fatal(
                         type + ".validateTCMPRequest: endPoint value is 
required.");
-                throw new 
RequestException("error.mp.tcmp.validator.no_endPoint_value",
+                throw new 
PerfSONARException("error.mp.tcmp.validator.no_endPoint_value",
                         type + ".validateTCMPRequest: endPoint value is 
required.");
 
             }
@@ -975,7 +966,7 @@
 
                 logger.fatal(
                         type + ".validateTCMPRequest: endPoint port is 
required.");
-                throw new 
RequestException("error.mp.tcmp.validator.no_endPoint_port",
+                throw new 
PerfSONARException("error.mp.tcmp.validator.no_endPoint_port",
                         type + ".validateTCMPRequest: endPoint port is 
required.");
 
             }
@@ -991,7 +982,7 @@
                 logger.fatal(
                         type + ".validateTCMPRequest: endPointPair element 
requires "
                         + "both src and dst elements.");
-                throw new 
RequestException("error.mp.tcmp.validator.no_endPointPair_src_and_dst",
+                throw new 
PerfSONARException("error.mp.tcmp.validator.no_endPointPair_src_and_dst",
                         type + ".validateTCMPRequest: endPointPair element 
requires "
                         + "both src and dst elements.");
 
@@ -1006,7 +997,7 @@
                 logger.fatal(
                         type + ".validateTCMPRequest: The only supported 
endPoint "
                         + "type is currently 'hostname'");
-                throw new 
RequestException("error.mp.tcmp.validator.unsupported_endPoint_type",
+                throw new 
PerfSONARException("error.mp.tcmp.validator.unsupported_endPoint_type",
                         type + ".validateTCMPRequest: The only supported 
endPoint "
                         + "type is currently 'hostname'");
 
@@ -1016,7 +1007,7 @@
 
                 logger.fatal(
                         type + ".validateTCMPRequest: src endPoint value is 
required.");
-                throw new 
RequestException("error.mp.tcmp.validator.no_src_endPoint_value",
+                throw new 
PerfSONARException("error.mp.tcmp.validator.no_src_endPoint_value",
                         type + ".validateTCMPRequest: src endPoint value is 
required.");
 
             }
@@ -1026,7 +1017,7 @@
 
                 logger.fatal(
                         type + ".validateTCMPRequest: src endPoint port is 
required.");
-                throw new 
RequestException("error.mp.tcmp.validator.no_src_endPoint_port",
+                throw new 
PerfSONARException("error.mp.tcmp.validator.no_src_endPoint_port",
                         type + ".validateTCMPRequest: src endPoint port is 
required.");
 
             }
@@ -1037,7 +1028,7 @@
                 logger.fatal(
                         type + ".validateTCMPRequest: The only supported 
endPoint "
                         + "type is currently 'hostname'");
-                throw new 
RequestException("error.mp.tcmp.validator.unsupported_endPoint_type",
+                throw new 
PerfSONARException("error.mp.tcmp.validator.unsupported_endPoint_type",
                         type + ".validateTCMPRequest: The only supported 
endPoint "
                         + "type is currently 'hostname'");
 
@@ -1047,7 +1038,7 @@
 
                 logger.fatal(
                         type + ".validateTCMPRequest: dst endPoint value is 
required.");
-                throw new 
RequestException("error.mp.tcmp.validator.no_dst_endPoint_value",
+                throw new 
PerfSONARException("error.mp.tcmp.validator.no_dst_endPoint_value",
                         type + ".validateTCMPRequest: dst endPoint value is 
required.");
 
             }
@@ -1057,7 +1048,7 @@
 
                 logger.fatal(
                         type + ".validateTCMPRequest: dst endPoint port is 
required.");
-                throw new 
RequestException("error.mp.tcmp.validator.no_dst_endPoint_port",
+                throw new 
PerfSONARException("error.mp.tcmp.validator.no_dst_endPoint_port",
                         type + ".validateTCMPRequest: dst endPoint port is 
required.");
 
             }
@@ -1069,7 +1060,7 @@
                     type + ".validateTCMPRequest: Missing one of 
(nmwg:interface, "
                     + "nmwg:endPoint, nmwg:endPointPair) elements in subject 
element "
                     + "of request.");
-            throw new 
RequestException("error.mp.tcmp.validator.no_interface_or_endPoint_or_endPointPair",
+            throw new 
PerfSONARException("error.mp.tcmp.validator.no_interface_or_endPoint_or_endPointPair",
                     type + ".validateTCMPRequest: Missing one of 
(nmwg:interface, "
                     + "nmwg:endPoint, nmwg:endPointPair) elements in subject 
element "
                     + "of request.");
@@ -1099,7 +1090,7 @@
             logger.fatal(
                     type + ".validateTCMPRequest: No parameters in metadata 
element "
                     + "found in request.");
-            throw new 
RequestException("error.mp.tcmp.validator.no_metadata_parameters",
+            throw new 
PerfSONARException("error.mp.tcmp.validator.no_metadata_parameters",
                     type + ".validateTCMPRequest: No parameters in metadata 
element "
                     + "found in request.");
 
@@ -1123,7 +1114,7 @@
                 logger.fatal(
                         type + ".validateTCMPRequest: Credentials error:"
                         + e);
-                throw new RequestException(
+                throw new PerfSONARException(
                         "error.mp.tcmp.validator.credentials_error",
                         type + ".validateTCMPRequest: Credentials error: "
                         + e,
@@ -1152,7 +1143,7 @@
                 logger.fatal(
                         type + ".validateTCMPRequest: Authorization error:"
                         + e);
-            throw new RequestException(
+            throw new PerfSONARException(
                     "error.mp.tcmp.validator.authorization_error",
                     type + ".validateTCMPRequest: Credentials error: "
                     + e,
@@ -1255,7 +1246,7 @@
                     logger.fatal(
                             type + ".validateTCMPRequest: Parameter 
characteristics ("
                             + charact + ") is not positive Integer.");
-                    throw new 
RequestException("error.mp.tcmp.validator.invalid_characteristics_parameter",
+                    throw new 
PerfSONARException("error.mp.tcmp.validator.invalid_characteristics_parameter",
                             type + ".validateTCMPRequest: Parameter 
characteristics ("
                             + charact + ") is not positive Integer.");
 
@@ -1268,7 +1259,7 @@
                 logger.fatal(
                         type + ".validateTCMPRequest: Parameter 
characteristics ("
                         + charactStr + ") could not be converted to 
Integer.");
-                throw new 
RequestException("error.mp.tcmp.validator.invalid_characteristics_parameter",
+                throw new 
PerfSONARException("error.mp.tcmp.validator.invalid_characteristics_parameter",
                         type + ".validateTCMPRequest: Parameter 
characteristics ("
                         + charactStr + ") could not be converted to 
Integer.");
 
@@ -1292,7 +1283,7 @@
                     logger.fatal(
                             type + ".validateTCMPRequest: Parameter 
granularity ("
                             + gran + ") is not positive Integer.");
-                    throw new 
RequestException("error.mp.tcmp.validator.invalid_granularity_parameter",
+                    throw new 
PerfSONARException("error.mp.tcmp.validator.invalid_granularity_parameter",
                             type + ".validateTCMPRequest: Parameter 
granularity ("
                             + gran + ") is not positive Integer.");
 
@@ -1305,7 +1296,7 @@
                 logger.fatal(
                         type + ".validateTCMPRequest: Parameter granularity 
("
                         + granStr + ") could not be converted to Integer.");
-                throw new 
RequestException("error.mp.tcmp.validator.invalid_granularity_parameter",
+                throw new 
PerfSONARException("error.mp.tcmp.validator.invalid_granularity_parameter",
                         type + ".validateTCMPRequest: Parameter granularity 
("
                         + granStr + ") could not be converted to Integer.");
 
@@ -1323,7 +1314,7 @@
             logger.fatal(
                     type + ".validateTCMPRequest: Missing start_time 
parameter "
                     + "in request.");
-            throw new 
RequestException("error.mp.tcmp.validator.invalid_start_time_parameter",
+            throw new 
PerfSONARException("error.mp.tcmp.validator.invalid_start_time_parameter",
                     type + ".validateTCMPRequest: Missing start_time 
parameter "
                     + "in request.");
 
@@ -1336,7 +1327,7 @@
             logger.fatal(
                     type + ".validateTCMPRequest: Missing start_time(child) 
parameter "
                     + "in request.");
-            throw new 
RequestException("error.mp.tcmp.validator.invalid_start_time_parameter",
+            throw new 
PerfSONARException("error.mp.tcmp.validator.invalid_start_time_parameter",
                     type + ".validateTCMPRequest: Missing start_time(child) 
parameter "
                     + "in request.");
 
@@ -1358,7 +1349,7 @@
                 logger.fatal(
                         type + ".validateTCMPRequest: Parameter start_time ("
                         + unixTsStr + ") could not be converted from unix ts 
to Date.");
-                throw new 
DataFormatException("error.mp.tcmp.validator.invalid_start_time_parameter",
+                throw new 
PerfSONARException("error.mp.tcmp.validator.invalid_start_time_parameter",
                         type + ".validateTCMPRequest: Parameter start_time ("
                         + unixTsStr + ") could not be converted from unix ts 
to Date.");
 
@@ -1369,7 +1360,7 @@
             logger.fatal(
                     type + ".validateTCMPRequest: Only 'unix' type of 
start_time "
                     + "is currently supported.");
-            throw new 
RequestException("error.mp.tcmp.validator.unsupported_start_time_type",
+            throw new 
PerfSONARException("error.mp.tcmp.validator.unsupported_start_time_type",
                     type + ".validateTCMPRequest: Only 'unix' type of 
start_time "
                     + "is currently supported.");
 
@@ -1382,7 +1373,7 @@
             logger.fatal(
                     type + ".validateTCMPRequest: Missing end_time parameter 
"
                     + "in request.");
-            throw new 
RequestException("error.mp.tcmp.validator.invalid_end_time_parameter",
+            throw new 
PerfSONARException("error.mp.tcmp.validator.invalid_end_time_parameter",
                     type + ".validateTCMPRequest: Missing end_time parameter 
"
                     + "in request.");
 
@@ -1395,7 +1386,7 @@
             logger.fatal(
                     type + ".validateTCMPRequest: Missing end_time(child) 
parameter "
                     + "in request.");
-            throw new 
RequestException("error.mp.tcmp.validator.invalid_end_time_parameter",
+            throw new 
PerfSONARException("error.mp.tcmp.validator.invalid_end_time_parameter",
                     type + ".validateTCMPRequest: Missing end_time(child) 
parameter "
                     + "in request.");
 
@@ -1417,7 +1408,7 @@
                 logger.fatal(
                         type + ".validateTCMPRequest: Parameter end_time ("
                         + unixTsStr + ") could not be converted from unix ts 
to Date.");
-                throw new 
DataFormatException("error.mp.tcmp.validator.invalid_end_time_parameter",
+                throw new 
PerfSONARException("error.mp.tcmp.validator.invalid_end_time_parameter",
                         type + ".validateTCMPRequest: Parameter end_time ("
                         + unixTsStr + ") could not be converted from unix ts 
to Date.");
 
@@ -1428,7 +1419,7 @@
             logger.fatal(
                     type + ".validateTCMPRequest: Only 'unix' type of 
end_time "
                     + "is currently supported.");
-            throw new 
RequestException("error.mp.tcmp.validator.unsupported_end_time_type",
+            throw new 
PerfSONARException("error.mp.tcmp.validator.unsupported_end_time_type",
                     type + ".validateTCMPRequest: Only 'unix' type of 
end_time "
                     + "is currently supported.");
 
@@ -1444,7 +1435,7 @@
 
             logger.fatal(
                     type + ".validateTCMPRequest: Missing commonTime element 
inside datum element.");
-            throw new 
RequestException("error.mp.tcmp.validator.no_commonTime",
+            throw new 
PerfSONARException("error.mp.tcmp.validator.no_commonTime",
                     type + ".validateTCMPRequest: Missing commonTime element 
inside datum element.");
 
         }
@@ -1456,7 +1447,7 @@
 
             logger.fatal(
                     type + ".validateTCMPRequest: commonTime must contain at 
least one datum child.");
-            throw new 
RequestException("error.mp.tcmp.validator.no_datum_in_commonTime",
+            throw new 
PerfSONARException("error.mp.tcmp.validator.no_datum_in_commonTime",
                     type + ".validateTCMPRequest: commonTime must contain at 
least one datum child.");
 
         }
@@ -1468,7 +1459,7 @@
 
             logger.fatal(
                     type + ".validateTCMPRequest: First datum of commonTime 
must contain filename attribute.");
-            throw new 
RequestException("error.mp.tcmp.validator.no_first_datum_filename_attribute",
+            throw new 
PerfSONARException("error.mp.tcmp.validator.no_first_datum_filename_attribute",
                     type + ".validateTCMPRequest: First datum of commonTime 
must contain filename attribute.");
 
         }
@@ -1479,7 +1470,7 @@
             logger.fatal(
                     type + ".validateTCMPRequest: Filename attribute of 
first datum "
                     + "contains file separator char.");
-            throw new 
RequestException("error.mp.tcmp.validator.invalid_first_datum_filename_attribute",
+            throw new 
PerfSONARException("error.mp.tcmp.validator.invalid_first_datum_filename_attribute",
                     type + ".validateTCMPRequest: Filename attribute of 
first datum "
                     + "contains file separator char.");
 
@@ -1493,7 +1484,7 @@
 
                 logger.fatal(
                         type + ".validateTCMPRequest: commonTime must 
contain two datum childs.");
-                throw new 
RequestException("error.mp.tcmp.validator.no_second_datum_in_commonTime",
+                throw new 
PerfSONARException("error.mp.tcmp.validator.no_second_datum_in_commonTime",
                         type + ".validateTCMPRequest: commonTime must 
contain two datum childs.");
 
             }
@@ -1505,7 +1496,7 @@
 
                 logger.fatal(
                         type + ".validateTCMPRequest: Second datum of 
commonTime must contain filename attribute.");
-                throw new 
RequestException("error.mp.tcmp.validator.no_second_datum_filename_attribute",
+                throw new 
PerfSONARException("error.mp.tcmp.validator.no_second_datum_filename_attribute",
                         type + ".validateTCMPRequest: Second datum of 
commonTime must contain filename attribute.");
 
             }
@@ -1516,7 +1507,7 @@
                 logger.fatal(
                         type + ".validateTCMPRequest: Filename attribute of 
second datum "
                         + "contains file separator char.");
-                throw new 
RequestException("error.mp.tcmp.validator.invalid_second_datum_filename_attribute",
+                throw new 
PerfSONARException("error.mp.tcmp.validator.invalid_second_datum_filename_attribute",
                         type + ".validateTCMPRequest: Filename attribute of 
second datum "
                         + "contains file separator char.");
 
@@ -1528,7 +1519,7 @@
                 logger.fatal(
                         type + ".validateTCMPRequest: Filename attributes of 
first and second datum "
                         + "should not be equal.");
-                throw new 
DataFormatException("error.mp.tcmp.validator.invalid_second_datum_filename_attribute",
+                throw new 
PerfSONARException("error.mp.tcmp.validator.invalid_second_datum_filename_attribute",
                         type + ".validateTCMPRequest: Filename attributes of 
first and second datum "
                         + "should not be equal.");
 
@@ -1543,7 +1534,7 @@
             logger.fatal(
                     type + ".validateTCMPRequest: 
service.mp.tcmp.pcap.file.storage.dir "
                     + "property missing in service.properties.");
-            throw new 
SystemException("error.mp.tcmp.validator.no_pcap_storage_dir",
+            throw new 
PerfSONARException("error.mp.tcmp.validator.no_pcap_storage_dir",
                     type + ".validateTCMPRequest: 
service.mp.tcmp.pcap.file.storage.dir "
                     + "property missing in service.properties.");
 
@@ -1554,7 +1545,7 @@
             logger.fatal(
                     type + ".validateTCMPRequest: 
service.mp.tcmp.pcap.file.storage.dir "
                     + "property should point to a directory!");
-            throw new 
SystemException("error.mp.tcmp.validator.invalid_pcap_storage_dir",
+            throw new 
PerfSONARException("error.mp.tcmp.validator.invalid_pcap_storage_dir",
                     type + ".validateTCMPRequest: 
service.mp.tcmp.pcap.file.storage.dir "
                     + "property should point to a directory!");
 
@@ -1584,7 +1575,7 @@
             logger.fatal(
                     type + ".validateTCMPRequest: First datum filename (" + 
req.getFirstFilenameDatum()
                     + ") already exists. Use different datum filename.");
-            throw new 
SystemException("error.mp.tcmp.validator.first_datum_filename_exists",
+            throw new 
PerfSONARException("error.mp.tcmp.validator.first_datum_filename_exists",
                     type + ".validateTCMPRequest: First datum filename (" + 
req.getFirstFilenameDatum()
                     + ") already exists. Use different datum filename.");
 
@@ -1597,7 +1588,7 @@
                 logger.fatal(
                         type + ".validateTCMPRequest: Second datum filename 
(" + req.getSecondFilenameDatum()
                         + ") already exists. Use different datum filename.");
-                throw new 
SystemException("error.mp.tcmp.validator.second_datum_filename_exists",
+                throw new 
PerfSONARException("error.mp.tcmp.validator.second_datum_filename_exists",
                         type + ".validateTCMPRequest: Second datum filename 
(" + req.getSecondFilenameDatum()
                         + ") already exists. Use different datum filename.");
 
@@ -1639,7 +1630,7 @@
                             type + ".validateTCMPRequest: 
service.mp.tcmp.remote.interfaces "
                             + "property contains host:interface token (" + 
hostIf
                             + ") without ':' char.");
-                    throw new 
SystemException("error.mp.tcmp.validator.invalid_remote_interfaces_configuration",
+                    throw new 
PerfSONARException("error.mp.tcmp.validator.invalid_remote_interfaces_configuration",
                             type + ".validateTCMPRequest: 
service.mp.tcmp.remote.interfaces "
                             + "property contains host:interface token (" + 
hostIf
                             + ") without ':' char.");
@@ -1661,7 +1652,7 @@
                         type + ".validateTCMPRequest: Local Tracefile 
capture requested, but interface "
                         + req.getFirstEndPointInterface()
                         + " is not present in 
service.mp.tcmp.local.interfaces property.");
-                throw new 
SystemException("error.mp.tcmp.validator.denied_trace_on_interface",
+                throw new 
PerfSONARException("error.mp.tcmp.validator.denied_trace_on_interface",
                         type + ".validateTCMPRequest: Local Tracefile 
capture requested, but interface "
                         + req.getFirstEndPointInterface()
                         + " is not present in 
service.mp.tcmp.local.interfaces property.");
@@ -1675,7 +1666,7 @@
                     type + ".validateTCMPRequest: Remote Tracefile capture 
requested, but host:interface "
                     + req.getFirstEndPointHost().toLowerCase() + ":" + 
req.getFirstEndPointInterface()
                     + " is not present in service.mp.tcmp.remote.interfaces 
property.");
-            throw new 
SystemException("error.mp.tcmp.validator.remote_host_interface_not_configured",
+            throw new 
PerfSONARException("error.mp.tcmp.validator.remote_host_interface_not_configured",
                     type + ".validateTCMPRequest: Remote Tracefile capture 
requested, but host:interface "
                     + req.getFirstEndPointHost().toLowerCase() + ":" + 
req.getFirstEndPointInterface()
                     + " is not present in service.mp.tcmp.remote.interfaces 
property.");
@@ -1692,7 +1683,7 @@
                             type + ".validateTCMPRequest: Local Tracefile 
capture requested, but second interface "
                             + req.getSecondEndPointInterface()
                             + " is not present in 
service.mp.tcmp.local.interfaces property.");
-                    throw new 
SystemException("error.mp.tcmp.validator.denied_trace_on_second_interface",
+                    throw new 
PerfSONARException("error.mp.tcmp.validator.denied_trace_on_second_interface",
                             type + ".validateTCMPRequest: Local Tracefile 
capture requested, but second interface "
                             + req.getSecondEndPointInterface()
                             + " is not present in 
service.mp.tcmp.local.interfaces property.");
@@ -1706,7 +1697,7 @@
                         type + ".validateTCMPRequest: Remote Tracefile 
capture requested, but second host:interface "
                         + req.getSecondEndPointHost().toLowerCase() + ":" + 
req.getSecondEndPointInterface()
                         + " is not present in 
service.mp.tcmp.remote.interfaces property.");
-                throw new 
SystemException("error.mp.tcmp.validator.second_remote_interface_not_configured",
+                throw new 
PerfSONARException("error.mp.tcmp.validator.second_remote_interface_not_configured",
                         type + ".validateTCMPRequest: Remote Tracefile 
capture requested, but second host:interface "
                         + req.getSecondEndPointHost().toLowerCase() + ":" + 
req.getSecondEndPointInterface()
                         + " is not present in 
service.mp.tcmp.remote.interfaces property.");

Modified: 
branches/new-structure/trunk/geant2_java-tc-mp/src/main/java/org/perfsonar/service/measurementPoint/tracefileCaptureType/TCMPTypeServiceEngine.java
===================================================================
--- 
branches/new-structure/trunk/geant2_java-tc-mp/src/main/java/org/perfsonar/service/measurementPoint/tracefileCaptureType/TCMPTypeServiceEngine.java
 2007-10-04 15:25:35 UTC (rev 2908)
+++ 
branches/new-structure/trunk/geant2_java-tc-mp/src/main/java/org/perfsonar/service/measurementPoint/tracefileCaptureType/TCMPTypeServiceEngine.java
 2007-10-05 06:17:02 UTC (rev 2909)
@@ -12,21 +12,19 @@
 import org.ggf.ns.nmwg.base.v2_0.Data;
 import org.ggf.ns.nmwg.base.v2_0.Message;
 import org.ggf.ns.nmwg.base.v2_0.Metadata;
-import org.perfsonar.commons.auxiliary.AuxiliaryComponentManager;
-import org.perfsonar.commons.auxiliary.ComponentNames;
-import 
org.perfsonar.commons.auxiliary.components.configuration.ConfigurationComponent;
-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.PerfSONARException;
-import 
org.perfsonar.service.measurementPoint.register.LSRegistrationComponent;
+import org.perfsonar.base.auxiliary.AuxiliaryComponentManager;
+import org.perfsonar.base.auxiliary.ComponentNames;
+import 
org.perfsonar.base.auxiliary.components.configuration.ConfigurationComponent;
+import org.perfsonar.base.auxiliary.components.logger.LoggerComponent;
+import org.perfsonar.service.base.engine.ActionType;
+import org.perfsonar.service.base.engine.ServiceEngine;
+import org.perfsonar.base.exceptions.PerfSONARException;
 
+import org.perfsonar.service.base.registration.LSRegistrationComponent;
 
-import org.perfsonar.service.commons.exceptions.ResourceException;
-import org.perfsonar.service.commons.exceptions.SystemException;
-import org.perfsonar.service.commons.exceptions.RequestException;
-import org.perfsonar.service.commons.exceptions.DataFormatException;
 
+import org.perfsonar.base.exceptions.PerfSONARException;
+
 /**
  *  Object implementing the Measurement Point Service Engine which deals 
with Tracefile Capture
  *  measurement requests.
@@ -68,7 +66,7 @@
 
     /**
      * Construction for the service engine
-     * @throws SystemException 
+     * @throws PerfSONARException 
      */
     public TCMPTypeServiceEngine() throws PerfSONARException {
 
@@ -119,15 +117,12 @@
      *  @param Message object containing the request
      *  @return Message object containing the response
      *
-     *  @throws SystemException
-     *  @throws ResourceException
-     *  @throws RequestException
-     *  @throws DataFormatException
+     *  @throws PerfSONARException
      *
-     *  @see org.perfsonar.service.commons.engine.ServiceEngine
+     *  @see org.perfsonar.service.base.engine.ServiceEngine
      */
     public Message takeAction(String actionType, Message request)
-        throws SystemException, ResourceException, DataFormatException, 
RequestException {
+        throws PerfSONARException {
 
         logger.debug("TCMPTypeServiceEngine.takeAction: " +
                     "Received a request of type - " + actionType);
@@ -149,7 +144,7 @@
                     "TCMPTypeServiceEngine.takeAction: ActionType specified: 
"
                     + actionType + " is not supported");
 
-            throw new SystemException("error.common.action_not_suported",
+            throw new PerfSONARException("error.common.action_not_suported",
                     "TCMPTypeServiceEngine: "
                     + "ActionType specified: "+ actionType
                     + " is not supported");
@@ -177,13 +172,10 @@
      *  @param Message object containing the request
      *  @return Message object containing the response with measurement data
      *
-     *  @throws SystemException
-     *  @throws ResourceException
-     *  @throws RequestException
-     *  @throws DataFormatException
+     *  @throws PerfSONARException
      */
     protected Message makeMeasurement(Message request)
-        throws SystemException, ResourceException, DataFormatException, 
RequestException {
+        throws PerfSONARException {
 
         Message response = new Message();
         response.setType("SetupDataResponse");
@@ -226,7 +218,7 @@
                         "TCMPTypeServiceEngine.makeMeasurement: Data with id 
"
                         + data.getId() + " has a blank metadataIdRef");
     
-                throw new 
RequestException("error.mp.tcmp.data_missing_metadataIdRef",
+                throw new 
PerfSONARException("error.mp.tcmp.data_missing_metadataIdRef",
                         "TCMPTypeServiceEngine: "
                         + "Data with id "+ data.getId()
                         + " has a blank metadataIdRef");

Modified: 
branches/new-structure/trunk/geant2_java-tc-mp/src/main/java/org/perfsonar/service/measurementPoint/tracefileCaptureType/servlets/FileServerServlet.java
===================================================================
--- 
branches/new-structure/trunk/geant2_java-tc-mp/src/main/java/org/perfsonar/service/measurementPoint/tracefileCaptureType/servlets/FileServerServlet.java
    2007-10-04 15:25:35 UTC (rev 2908)
+++ 
branches/new-structure/trunk/geant2_java-tc-mp/src/main/java/org/perfsonar/service/measurementPoint/tracefileCaptureType/servlets/FileServerServlet.java
    2007-10-05 06:17:02 UTC (rev 2909)
@@ -17,12 +17,13 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.perfsonar.commons.auxiliary.AuxiliaryComponentManager;
-import org.perfsonar.commons.auxiliary.ComponentNames;
-import 
org.perfsonar.commons.auxiliary.components.configuration.ConfigurationComponent;
-import org.perfsonar.commons.auxiliary.components.logger.LoggerComponent;
-import org.perfsonar.service.commons.exceptions.PerfSONARException;
+import org.perfsonar.base.auxiliary.AuxiliaryComponentManager;
+import org.perfsonar.base.auxiliary.ComponentNames;
+import 
org.perfsonar.base.auxiliary.components.configuration.ConfigurationComponent;
+import org.perfsonar.base.auxiliary.components.logger.LoggerComponent;
 
+import org.perfsonar.base.exceptions.PerfSONARException;
+
 /**
  * This class is simple file servlet used for serving PCAP files
  * captured by TCMP. Verification for accessing those files is