[teiid-commits] teiid SVN: r1321 - in trunk: engine/src/main/resources/com/metamatrix/dqp and 1 other directories.

[teiid-commits at lists.jboss.org]

Author: shawkins
Date: 2009-09-11 13:43:30 -0400 (Fri, 11 Sep 2009)
New Revision: 1321

Modified:
   trunk/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java
   trunk/engine/src/main/resources/com/metamatrix/dqp/i18n.properties
   trunk/runtime/src/main/resources/com/metamatrix/dqp/embedded/i18n.properties
Log:
TEIID-825 cleanup of log messages seen in the debug log

Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java	2009-09-11 16:13:38 UTC (rev 1320)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java	2009-09-11 17:43:30 UTC (rev 1321)
@@ -364,7 +364,7 @@
     RequestWorkItem getRequestWorkItem(RequestID reqID) throws MetaMatrixProcessingException {
     	RequestWorkItem result = this.requests.get(reqID);
     	if (result == null) {
-    		throw new MetaMatrixProcessingException(DQPPlugin.Util.getString("DQPCore.The_request_has_been_cancelled.", reqID));//$NON-NLS-1$
+    		throw new MetaMatrixProcessingException(DQPPlugin.Util.getString("DQPCore.The_request_has_been_closed.", reqID));//$NON-NLS-1$
     	}
     	return result;
     }

Modified: trunk/engine/src/main/resources/com/metamatrix/dqp/i18n.properties
===================================================================
--- trunk/engine/src/main/resources/com/metamatrix/dqp/i18n.properties	2009-09-11 16:13:38 UTC (rev 1320)
+++ trunk/engine/src/main/resources/com/metamatrix/dqp/i18n.properties	2009-09-11 17:43:30 UTC (rev 1321)
@@ -128,7 +128,7 @@
 DQPCore.Clearing_prepared_plan_cache=Clearing prepared plan cache
 DQPCore.Clearing_code_table_cache=Clearing code table cache
 DQPCore.Unable_to_check_license_for_update_capability._Updates_will_not_be_allowed_3=Unable to check license for update capability. Updates will not be allowed
-DQPCore.The_request_has_been_cancelled.=The request {0} has been cancelled.
+DQPCore.The_request_has_been_closed.=The request {0} has been closed.
 DQPCore.The_atomic_request_has_been_cancelled=The atomic request {0} has been cancelled.
 DQPCore.The_atomic_request_cancelled_not_closed=The atomic request {0}.{1} has been cancelled, but closed yet.
 DQPCore.The_atomic_request_closed_queued=The atomic request {0} has queued to close, another request in progress.
@@ -154,7 +154,7 @@
 ProcessWorker.ProcessWorker.Failed_starting_processing._1=ProcessWorker.Failed_starting_processing.
 ProcessWorker.failed_rollback=Failed to properly rollback autowrap transaction properly
 ProcessWorker.error=Unexpected exception for request {0}
-ProcessWorker.processing_error=Processing exception ''{0}'' for request {1}.  Exception type {2} throw from {3}. Enable detail logging to see the entire stacktrace.
+ProcessWorker.processing_error=Processing exception ''{0}'' for request {1}.  Exception type {2} thrown from {3}. Enable more detailed logging to see the entire stacktrace.
 
 SharedCacheFinder.Didnt_find_caps=Unable to find capabilities for {0}
 

Modified: trunk/runtime/src/main/resources/com/metamatrix/dqp/embedded/i18n.properties
===================================================================
--- trunk/runtime/src/main/resources/com/metamatrix/dqp/embedded/i18n.properties	2009-09-11 16:13:38 UTC (rev 1320)
+++ trunk/runtime/src/main/resources/com/metamatrix/dqp/embedded/i18n.properties	2009-09-11 17:43:30 UTC (rev 1321)
@@ -267,7 +267,7 @@
 LogonImpl.Invalid_use_of_credentials_and_token=Conflicting use of both client session token and credentials.
 
 ServerWorkItem.Received_exception_processing_request=Unexpected exception for session {0}
-ServerWorkItem.processing_error=Processing exception ''{0}'' for session {1}.  Exception type {2} throw from {3}. Enable detail logging to see the entire stacktrace.
+ServerWorkItem.processing_error=Processing exception ''{0}'' for session {1}.  Exception type {2} thrown from {3}. Enable more detailed logging to see the entire stacktrace.
 ServerWorkItem.Component_Not_Found=Component not found: {0}
 
 SocketTransport.1=Bound to address {0} listening on port {1}