perfsonar development work

Author: uros
Date: 2006-07-31 08:08:05 -0400 (Mon, 31 Jul 2006)
New Revision: 1497

Modified:
   
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/tracefileCaptureType/TCMPTypeMeasurementExecutor.java
   
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/tracefileCaptureType/TCMPTypeServiceEngine.java
Log:
Corrected error codes naming acording to 
http://wiki.perfsonar.net/jra1-wiki/index.php/Result_code_hierarchy

Modified: 
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/tracefileCaptureType/TCMPTypeMeasurementExecutor.java
===================================================================
--- 
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/tracefileCaptureType/TCMPTypeMeasurementExecutor.java
    2006-07-28 10:32:57 UTC (rev 1496)
+++ 
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/tracefileCaptureType/TCMPTypeMeasurementExecutor.java
    2006-07-31 12:08:05 UTC (rev 1497)
@@ -150,7 +150,7 @@
         
         if (configuration == null) {
             
-            throw new SystemException("error.mp.no_configuration_reader",
+            throw new SystemException("error.common.no_configuration",
                     type + ": "
                     + "Could not get an instance of Configuration reader."
                     + "Cannot continue with the request");
@@ -159,7 +159,7 @@
         
         if (logger == null) {
             
-            throw new SystemException("error.mp.no_logger",
+            throw new SystemException("error.common.no_logger",
                     type + ": "
                     + "Could not get an instance of Configuration reader."
                     + "Cannot continue with the request");
@@ -268,6 +268,7 @@
             if (this.configuration == null) {
                 
                 throw new SystemException(
+                        "error.common.no_configuration",
                         "Could not get an instance of Configuration reader."
                         + "Cannot continue with the request");
     
@@ -276,6 +277,7 @@
             if (this.logger == null) {
                 
                 throw new SystemException(
+                        "error.common.no_logger",
                         "Could not get an instance of Configuration reader."
                         + "Cannot continue with the request");
     
@@ -318,7 +320,9 @@
                     break;
 
                 default:
-                    throw new SystemException("Unknown capture interface");
+                    throw new SystemException(
+                        "error.mp.tcmp.unknown_capture_interface",
+                        "Unknown capture interface");
             }
 
             // Create MAPI monitor request
@@ -443,7 +447,7 @@
 
         if (request == null) {
             
-            throw new SystemException("error.mp.validator.missing_request",
+            throw new 
SystemException("error.mp.tcmp.validator.missing_request",
                     type + ".validateTCMPRequest(): "
                     + "Request to the measurement executor cannot be null");
 
@@ -462,7 +466,7 @@
             logger.fatal(
                     type + ".validateTCMPRequest: No data elements "
                     + "found in request. At least one is required in the 
message");
-            throw new RequestException("error.mp.validator.no_data_elements",
+            throw new 
RequestException("error.mp.tcmp.validator.no_data_elements",
                     type + ".validateTCMPRequest: No data elements "
                     + "found in request. At least one is required in the 
message");
 
@@ -473,7 +477,7 @@
             logger.fatal(
                     type + ".validateTCMPRequest: No metadata elements "
                     + "found in request. At least one is required in the 
message");
-            throw new 
RequestException("error.mp.validator.no_metadata_elements",
+            throw new 
RequestException("error.mp.tcmp.validator.no_metadata_elements",
                     type + ".validateTCMPRequest: No metadata elements "
                     + "found in request. At least one is required in the 
message");
 
@@ -492,7 +496,7 @@
             logger.fatal(
                     type + ".validateTCMPRequest: No subject in metadata 
element "
                     + "of request.");
-            throw new 
RequestException("error.mp.validator.no_metadata_subject",
+            throw new 
RequestException("error.mp.tcmp.validator.no_metadata_subject",
                     type + ".validateTCMPRequest: No subject in metadata 
element "
                     + "of request.");
 
@@ -513,7 +517,7 @@
                 logger.fatal(
                         type + ".validateTCMPRequest: Either hostName or 
ipAddress element "
                         + "required in interface element.");
-                throw new 
RequestException("error.mp.validator.no_interface_hostName_or_ipAddress",
+                throw new 
RequestException("error.mp.tcmp.validator.no_interface_hostName_or_ipAddress",
                         type + ".validateTCMPRequest: Either hostName or 
ipAddress element "
                         + "required in interface element.");
 
@@ -532,7 +536,7 @@
                 logger.fatal(
                         type + ".validateTCMPRequest: ifName element "
                         + "required in interface element.");
-                throw new 
RequestException("error.mp.validator.no_interface_ifName",
+                throw new 
RequestException("error.mp.tcmp.validator.no_interface_ifName",
                         type + ".validateTCMPRequest: ifName element "
                         + "required in interface element.");
 
@@ -565,7 +569,7 @@
                 logger.fatal(
                         type + ".validateTCMPRequest: The only supported 
endPoint "
                         + "type is currently 'hostname'");
-                throw new 
RequestException("error.mp.validator.unsupported_endPoint_type",
+                throw new 
RequestException("error.mp.tcmp.validator.unsupported_endPoint_type",
                         type + ".validateTCMPRequest: The only supported 
endPoint "
                         + "type is currently 'hostname'");
 
@@ -575,7 +579,7 @@
 
                 logger.fatal(
                         type + ".validateTCMPRequest: endPoint value is 
required.");
-                throw new 
RequestException("error.mp.validator.no_endPoint_value",
+                throw new 
RequestException("error.mp.tcmp.validator.no_endPoint_value",
                         type + ".validateTCMPRequest: endPoint value is 
required.");
 
             }
@@ -585,7 +589,7 @@
 
                 logger.fatal(
                         type + ".validateTCMPRequest: endPoint port is 
required.");
-                throw new 
RequestException("error.mp.validator.no_endPoint_port",
+                throw new 
RequestException("error.mp.tcmp.validator.no_endPoint_port",
                         type + ".validateTCMPRequest: endPoint port is 
required.");
 
             }
@@ -601,7 +605,7 @@
                 logger.fatal(
                         type + ".validateTCMPRequest: endPointPair element 
requires "
                         + "both src and dst elements.");
-                throw new 
RequestException("error.mp.validator.no_endPointPair_src_and_dst",
+                throw new 
RequestException("error.mp.tcmp.validator.no_endPointPair_src_and_dst",
                         type + ".validateTCMPRequest: endPointPair element 
requires "
                         + "both src and dst elements.");
 
@@ -616,7 +620,7 @@
                 logger.fatal(
                         type + ".validateTCMPRequest: The only supported 
endPoint "
                         + "type is currently 'hostname'");
-                throw new 
RequestException("error.mp.validator.unsupported_endPoint_type",
+                throw new 
RequestException("error.mp.tcmp.validator.unsupported_endPoint_type",
                         type + ".validateTCMPRequest: The only supported 
endPoint "
                         + "type is currently 'hostname'");
 
@@ -626,7 +630,7 @@
 
                 logger.fatal(
                         type + ".validateTCMPRequest: src endPoint value is 
required.");
-                throw new 
RequestException("error.mp.validator.no_src_endPoint_value",
+                throw new 
RequestException("error.mp.tcmp.validator.no_src_endPoint_value",
                         type + ".validateTCMPRequest: src endPoint value is 
required.");
 
             }
@@ -636,7 +640,7 @@
 
                 logger.fatal(
                         type + ".validateTCMPRequest: src endPoint port is 
required.");
-                throw new 
RequestException("error.mp.validator.no_src_endPoint_port",
+                throw new 
RequestException("error.mp.tcmp.validator.no_src_endPoint_port",
                         type + ".validateTCMPRequest: src endPoint port is 
required.");
 
             }
@@ -647,7 +651,7 @@
                 logger.fatal(
                         type + ".validateTCMPRequest: The only supported 
endPoint "
                         + "type is currently 'hostname'");
-                throw new 
RequestException("error.mp.validator.unsupported_endPoint_type",
+                throw new 
RequestException("error.mp.tcmp.validator.unsupported_endPoint_type",
                         type + ".validateTCMPRequest: The only supported 
endPoint "
                         + "type is currently 'hostname'");
 
@@ -657,7 +661,7 @@
 
                 logger.fatal(
                         type + ".validateTCMPRequest: dst endPoint value is 
required.");
-                throw new 
RequestException("error.mp.validator.no_dst_endPoint_value",
+                throw new 
RequestException("error.mp.tcmp.validator.no_dst_endPoint_value",
                         type + ".validateTCMPRequest: dst endPoint value is 
required.");
 
             }
@@ -667,7 +671,7 @@
 
                 logger.fatal(
                         type + ".validateTCMPRequest: dst endPoint port is 
required.");
-                throw new 
RequestException("error.mp.validator.no_dst_endPoint_port",
+                throw new 
RequestException("error.mp.tcmp.validator.no_dst_endPoint_port",
                         type + ".validateTCMPRequest: dst endPoint port is 
required.");
 
             }
@@ -679,7 +683,7 @@
                     type + ".validateTCMPRequest: Missing one of 
(nmwg:interface, "
                     + "nmwg:endPoint, nmwg:endPointPair) elements in subject 
element "
                     + "of request.");
-            throw new 
RequestException("error.mp.validator.no_interface_or_endPoint_or_endPointPair",
+            throw new 
RequestException("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.");
@@ -709,7 +713,7 @@
             logger.fatal(
                     type + ".validateTCMPRequest: No parameters in metadata 
element "
                     + "found in request.");
-            throw new 
RequestException("error.mp.validator.no_metadata_parameters",
+            throw new 
RequestException("error.mp.tcmp.validator.no_metadata_parameters",
                     type + ".validateTCMPRequest: No parameters in metadata 
element "
                     + "found in request.");
 
@@ -737,7 +741,7 @@
                 logger.fatal(
                         type + ".validateTCMPRequest: Unknown flow_s_type 
parameter ("
                         + flowSType + ") found in request.");
-                throw new 
RequestException("error.mp.validator.unsupported_flow_s_type_parameter",
+                throw new 
RequestException("error.mp.tcmp.validator.unsupported_flow_s_type_parameter",
                         type + ".validateTCMPRequest: Unknown flow_s_type 
parameter ("
                         + flowSType + ") found in request.");
 
@@ -761,7 +765,7 @@
                     logger.fatal(
                             type + ".validateTCMPRequest: Parameter 
flow_s_thre ("
                             + flowSThre + ") is not positive Integer.");
-                    throw new 
RequestException("error.mp.validator.invalid_flow_s_thre_parameter",
+                    throw new 
RequestException("error.mp.tcmp.validator.invalid_flow_s_thre_parameter",
                             type + ".validateTCMPRequest: Parameter 
flow_s_thre ("
                             + flowSThre + ") is not positive Integer.");
 
@@ -774,7 +778,7 @@
                 logger.fatal(
                         type + ".validateTCMPRequest: Parameter flow_s_thre 
("
                         + flowSThreStr + ") could not be converted to 
Integer.");
-                throw new 
RequestException("error.mp.validator.invalid_flow_s_thre_parameter",
+                throw new 
RequestException("error.mp.tcmp.validator.invalid_flow_s_thre_parameter",
                         type + ".validateTCMPRequest: Parameter flow_s_thre 
("
                         + flowSThreStr + ") could not be converted to 
Integer.");
 
@@ -808,7 +812,7 @@
                     logger.fatal(
                             type + ".validateTCMPRequest: Parameter 
characteristics ("
                             + charact + ") is not positive Integer.");
-                    throw new 
RequestException("error.mp.validator.invalid_characteristics_parameter",
+                    throw new 
RequestException("error.mp.tcmp.validator.invalid_characteristics_parameter",
                             type + ".validateTCMPRequest: Parameter 
characteristics ("
                             + charact + ") is not positive Integer.");
 
@@ -821,7 +825,7 @@
                 logger.fatal(
                         type + ".validateTCMPRequest: Parameter 
characteristics ("
                         + charactStr + ") could not be converted to 
Integer.");
-                throw new 
RequestException("error.mp.validator.invalid_characteristics_parameter",
+                throw new 
RequestException("error.mp.tcmp.validator.invalid_characteristics_parameter",
                         type + ".validateTCMPRequest: Parameter 
characteristics ("
                         + charactStr + ") could not be converted to 
Integer.");
 
@@ -845,7 +849,7 @@
                     logger.fatal(
                             type + ".validateTCMPRequest: Parameter 
granularity ("
                             + gran + ") is not positive Integer.");
-                    throw new 
RequestException("error.mp.validator.invalid_granularity_parameter",
+                    throw new 
RequestException("error.mp.tcmp.validator.invalid_granularity_parameter",
                             type + ".validateTCMPRequest: Parameter 
granularity ("
                             + gran + ") is not positive Integer.");
 
@@ -858,7 +862,7 @@
                 logger.fatal(
                         type + ".validateTCMPRequest: Parameter granularity 
("
                         + granStr + ") could not be converted to Integer.");
-                throw new 
RequestException("error.mp.validator.invalid_granularity_parameter",
+                throw new 
RequestException("error.mp.tcmp.validator.invalid_granularity_parameter",
                         type + ".validateTCMPRequest: Parameter granularity 
("
                         + granStr + ") could not be converted to Integer.");
 
@@ -876,7 +880,7 @@
             logger.fatal(
                     type + ".validateTCMPRequest: Missing start_time 
parameter "
                     + "in request.");
-            throw new 
RequestException("error.mp.validator.invalid_start_time_parameter",
+            throw new 
RequestException("error.mp.tcmp.validator.invalid_start_time_parameter",
                     type + ".validateTCMPRequest: Missing start_time 
parameter "
                     + "in request.");
 
@@ -889,7 +893,7 @@
             logger.fatal(
                     type + ".validateTCMPRequest: Missing start_time(child) 
parameter "
                     + "in request.");
-            throw new 
RequestException("error.mp.validator.invalid_start_time_parameter",
+            throw new 
RequestException("error.mp.tcmp.validator.invalid_start_time_parameter",
                     type + ".validateTCMPRequest: Missing start_time(child) 
parameter "
                     + "in request.");
 
@@ -911,7 +915,7 @@
                 logger.fatal(
                         type + ".validateTCMPRequest: Parameter start_time ("
                         + unixTsStr + ") could not be converted from unix ts 
to Date.");
-                throw new 
RequestException("error.mp.validator.invalid_start_time_parameter",
+                throw new 
RequestException("error.mp.tcmp.validator.invalid_start_time_parameter",
                         type + ".validateTCMPRequest: Parameter start_time ("
                         + unixTsStr + ") could not be converted from unix ts 
to Date.");
 
@@ -922,7 +926,7 @@
             logger.fatal(
                     type + ".validateTCMPRequest: Only 'unix' type of 
start_time "
                     + "is currently supported.");
-            throw new 
RequestException("error.mp.validator.unsupported_start_time_type",
+            throw new 
RequestException("error.mp.tcmp.validator.unsupported_start_time_type",
                     type + ".validateTCMPRequest: Only 'unix' type of 
start_time "
                     + "is currently supported.");
 
@@ -935,7 +939,7 @@
             logger.fatal(
                     type + ".validateTCMPRequest: Missing end_time parameter 
"
                     + "in request.");
-            throw new 
RequestException("error.mp.validator.invalid_end_time_parameter",
+            throw new 
RequestException("error.mp.tcmp.validator.invalid_end_time_parameter",
                     type + ".validateTCMPRequest: Missing end_time parameter 
"
                     + "in request.");
 
@@ -948,7 +952,7 @@
             logger.fatal(
                     type + ".validateTCMPRequest: Missing end_time(child) 
parameter "
                     + "in request.");
-            throw new 
RequestException("error.mp.validator.invalid_end_time_parameter",
+            throw new 
RequestException("error.mp.tcmp.validator.invalid_end_time_parameter",
                     type + ".validateTCMPRequest: Missing end_time(child) 
parameter "
                     + "in request.");
 
@@ -970,7 +974,7 @@
                 logger.fatal(
                         type + ".validateTCMPRequest: Parameter end_time ("
                         + unixTsStr + ") could not be converted from unix ts 
to Date.");
-                throw new 
RequestException("error.mp.validator.invalid_end_time_parameter",
+                throw new 
RequestException("error.mp.tcmp.validator.invalid_end_time_parameter",
                         type + ".validateTCMPRequest: Parameter end_time ("
                         + unixTsStr + ") could not be converted from unix ts 
to Date.");
 
@@ -981,7 +985,7 @@
             logger.fatal(
                     type + ".validateTCMPRequest: Only 'unix' type of 
end_time "
                     + "is currently supported.");
-            throw new 
RequestException("error.mp.validator.unsupported_end_time_type",
+            throw new 
RequestException("error.mp.tcmp.validator.unsupported_end_time_type",
                     type + ".validateTCMPRequest: Only 'unix' type of 
end_time "
                     + "is currently supported.");
 
@@ -997,7 +1001,7 @@
 
             logger.fatal(
                     type + ".validateTCMPRequest: Missing commonTime element 
inside datum element.");
-            throw new RequestException("error.mp.validator.no_commonTime",
+            throw new 
RequestException("error.mp.tcmp.validator.no_commonTime",
                     type + ".validateTCMPRequest: Missing commonTime element 
inside datum element.");
 
         }
@@ -1008,7 +1012,7 @@
 
             logger.fatal(
                     type + ".validateTCMPRequest: commonTime must contain at 
least one datum child.");
-            throw new 
RequestException("error.mp.validator.no_datum_in_commonTime",
+            throw new 
RequestException("error.mp.tcmp.validator.no_datum_in_commonTime",
                     type + ".validateTCMPRequest: commonTime must contain at 
least one datum child.");
 
         }
@@ -1019,7 +1023,7 @@
 
             logger.fatal(
                     type + ".validateTCMPRequest: First datum of commonTime 
must contain filename attribute.");
-            throw new 
RequestException("error.mp.validator.no_first_datum_filename_attribute",
+            throw new 
RequestException("error.mp.tcmp.validator.no_first_datum_filename_attribute",
                     type + ".validateTCMPRequest: First datum of commonTime 
must contain filename attribute.");
 
         }
@@ -1030,7 +1034,7 @@
             logger.fatal(
                     type + ".validateTCMPRequest: Filename attribute of 
first datum "
                     + "contains file separator char.");
-            throw new 
RequestException("error.mp.validator.invalid_first_datum_filename_attribute",
+            throw new 
RequestException("error.mp.tcmp.validator.invalid_first_datum_filename_attribute",
                     type + ".validateTCMPRequest: Filename attribute of 
first datum "
                     + "contains file separator char.");
 
@@ -1044,7 +1048,7 @@
 
                 logger.fatal(
                         type + ".validateTCMPRequest: commonTime must 
contain two datum childs.");
-                throw new 
RequestException("error.mp.validator.no_second_datum_in_commonTime",
+                throw new 
RequestException("error.mp.tcmp.validator.no_second_datum_in_commonTime",
                         type + ".validateTCMPRequest: commonTime must 
contain two datum childs.");
 
             }
@@ -1055,7 +1059,7 @@
 
                 logger.fatal(
                         type + ".validateTCMPRequest: Second datum of 
commonTime must contain filename attribute.");
-                throw new 
RequestException("error.mp.validator.no_second_datum_filename_attribute",
+                throw new 
RequestException("error.mp.tcmp.validator.no_second_datum_filename_attribute",
                         type + ".validateTCMPRequest: Second datum of 
commonTime must contain filename attribute.");
 
             }
@@ -1066,7 +1070,7 @@
                 logger.fatal(
                         type + ".validateTCMPRequest: Filename attribute of 
second datum "
                         + "contains file separator char.");
-                throw new 
RequestException("error.mp.validator.invalid_second_datum_filename_attribute",
+                throw new 
RequestException("error.mp.tcmp.validator.invalid_second_datum_filename_attribute",
                         type + ".validateTCMPRequest: Filename attribute of 
second datum "
                         + "contains file separator char.");
 
@@ -1078,7 +1082,7 @@
                 logger.fatal(
                         type + ".validateTCMPRequest: Filename attributes of 
first and second datum "
                         + "should not be equal.");
-                throw new 
RequestException("error.mp.validator.invalid_second_datum_filename_attribute",
+                throw new 
RequestException("error.mp.tcmp.validator.invalid_second_datum_filename_attribute",
                         type + ".validateTCMPRequest: Filename attributes of 
first and second datum "
                         + "should not be equal.");
 
@@ -1093,7 +1097,7 @@
             logger.fatal(
                     type + ".validateTCMPRequest: 
service.mp.tcmp.pcap.file.storage.dir "
                     + "property missing in service.properties.");
-            throw new 
RequestException("error.mp.validator.no_pcap_storage_dir",
+            throw new 
RequestException("error.mp.tcmp.validator.no_pcap_storage_dir",
                     type + ".validateTCMPRequest: 
service.mp.tcmp.pcap.file.storage.dir "
                     + "property missing in service.properties.");
 
@@ -1104,7 +1108,7 @@
             logger.fatal(
                     type + ".validateTCMPRequest: 
service.mp.tcmp.pcap.file.storage.dir "
                     + "property should point to a directory!");
-            throw new 
RequestException("error.mp.validator.invalid_pcap_storage_dir",
+            throw new 
RequestException("error.mp.tcmp.validator.invalid_pcap_storage_dir",
                     type + ".validateTCMPRequest: 
service.mp.tcmp.pcap.file.storage.dir "
                     + "property should point to a directory!");
 
@@ -1128,7 +1132,7 @@
             logger.fatal(
                     type + ".validateTCMPRequest: First datum filename (" + 
req.getFirstFilenameDatum()
                     + ") already exists. Use different datum filename.");
-            throw new 
RequestException("error.mp.validator.first_datum_filename_exists",
+            throw new 
RequestException("error.mp.tcmp.validator.first_datum_filename_exists",
                     type + ".validateTCMPRequest: First datum filename (" + 
req.getFirstFilenameDatum()
                     + ") already exists. Use different datum filename.");
 
@@ -1141,7 +1145,7 @@
                 logger.fatal(
                         type + ".validateTCMPRequest: Second datum filename 
(" + req.getSecondFilenameDatum()
                         + ") already exists. Use different datum filename.");
-                throw new 
RequestException("error.mp.validator.second_datum_filename_exists",
+                throw new 
RequestException("error.mp.tcmp.validator.second_datum_filename_exists",
                         type + ".validateTCMPRequest: Second datum filename 
(" + req.getSecondFilenameDatum()
                         + ") already exists. Use different datum filename.");
 
@@ -1183,7 +1187,7 @@
                             type + ".validateTCMPRequest: 
service.mp.tcmp.remote.interfaces "
                             + "property contains host:interface token (" + 
hostIf
                             + ") without ':' char.");
-                    throw new 
RequestException("error.mp.validator.invalid_remote_interfaces_configuration",
+                    throw new 
RequestException("error.mp.tcmp.validator.invalid_remote_interfaces_configuration",
                             type + ".validateTCMPRequest: 
service.mp.tcmp.remote.interfaces "
                             + "property contains host:interface token (" + 
hostIf
                             + ") without ':' char.");
@@ -1205,7 +1209,7 @@
                         type + ".validateTCMPRequest: Local Tracefile 
capture requested, but interface "
                         + req.getFirstEndPointInterface()
                         + " is not present in 
service.mp.tcmp.local.interfaces property.");
-                throw new 
RequestException("error.mp.validator.denied_trace_on_interface",
+                throw new 
RequestException("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.");
@@ -1219,7 +1223,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 
RequestException("error.mp.validator.remote_host_interface_not_configured",
+            throw new 
RequestException("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.");
@@ -1236,7 +1240,7 @@
                             type + ".validateTCMPRequest: Local Tracefile 
capture requested, but second interface "
                             + req.getSecondEndPointInterface()
                             + " is not present in 
service.mp.tcmp.local.interfaces property.");
-                    throw new 
RequestException("error.mp.validator.denied_trace_on_second_interface",
+                    throw new 
RequestException("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.");
@@ -1250,7 +1254,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 
RequestException("error.mp.validator.second_remote_interface_not_configured",
+                throw new 
RequestException("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: 
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/tracefileCaptureType/TCMPTypeServiceEngine.java
===================================================================
--- 
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/tracefileCaptureType/TCMPTypeServiceEngine.java
  2006-07-28 10:32:57 UTC (rev 1496)
+++ 
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/tracefileCaptureType/TCMPTypeServiceEngine.java
  2006-07-31 12:08:05 UTC (rev 1497)
@@ -153,7 +153,7 @@
                     "TCMPTypeServiceEngine.takeAction: ActionType specified: 
"
                     + actionType + " is not supported");
 
-            throw new SystemException("error.mp.action_not_suported",
+            throw new SystemException("error.common.action_not_suported",
                     "TCMPTypeServiceEngine: "
                     + "ActionType specified: "+ actionType
                     + " is not supported");
@@ -229,7 +229,7 @@
                         "TCMPTypeServiceEngine.makeMeasurement: Data with id 
"
                         + data.getId() + " has a blank metadataIdRef");
     
-                throw new 
SystemException("error.mp.data_missing_metadataIdRef",
+                throw new 
SystemException("error.mp.tcmp.data_missing_metadataIdRef",
                         "TCMPTypeServiceEngine: "
                         + "Data with id "+ data.getId()
                         + " has a blank metadataIdRef");