Author: rareddy Date: 2010-09-07 20:37:02 -0400 (Tue, 07 Sep 2010) New Revision: 2540 Modified: branches/7.1.x/client/src/main/resources/org/teiid/net/i18n.properties branches/7.1.x/common-core/src/main/java/org/teiid/core/TeiidRuntimeException.java branches/7.1.x/common-core/src/main/java/org/teiid/core/util/StringUtil.java branches/7.1.x/common-core/src/main/resources/org/teiid/core/i18n.properties branches/7.1.x/connectors/translator-jdbc/src/main/resources/org/teiid/translator/jdbc/i18n.properties branches/7.1.x/engine/src/main/resources/org/teiid/query/i18n.properties branches/7.1.x/runtime/src/main/resources/org/teiid/runtime/i18n.properties Log: TEIID-1027: verbose messages in the "i18N.properties" file. These are legacy messages did not get deleted when the code got refactored. Modified: branches/7.1.x/client/src/main/resources/org/teiid/net/i18n.properties =================================================================== --- branches/7.1.x/client/src/main/resources/org/teiid/net/i18n.properties 2010-09-07 23:28:26 UTC (rev 2539) +++ branches/7.1.x/client/src/main/resources/org/teiid/net/i18n.properties 2010-09-08 00:37:02 UTC (rev 2540) @@ -20,8 +20,6 @@ # 02110-1301 USA. # -SessionToken.session_compare_null = Attempt to compare null to SessionToken. -TrustedSessionToken.token_null = The trusted token for a session token may not be null. StreamImpl.Unable_to_read_data_from_stream=Unable to read data from the stream: {0} RequestMessage.invalid_txnAutoWrap=''{0}'' is an invalid transaction autowrap mode. @@ -58,13 +56,8 @@ SocketServerInstance.Connection_Error.Unknown_Host = Error establishing socket. Unknown host: {0} SocketServerInstance.Connection_Error.Connect_Failed = Error establishing socket to host and port: {0}:{1}. Reason: {2} -SocketServerInstance.Connection_Error.Connect_Failed_to_HostInfo_Max_Attempts = Failed to connect to {0} on try [{1}]. Maximum number of retries reached. -SocketServerInstance.Connection_Warning.Connect_Failed_to_HostInfo_Will_retry = Failed to connect to {0} on try [{1}]. Will attempt up to [{2}] time(s). -SocketServerInstance.Connection_Detail.Connected_to_HostInfo = Connected to {0} on attempt number [{1}]. -SocketServerInstance.Connection_Detail.Connecting_to_HostInfo = Connecting to {0}. Attempt [{1}] of [{2}]. - ERR.014.001.0001 = Lost communication with the AdminAPI - the connection has been closed. ERR.014.001.0002 = Lost communication with the AdminAPI. Modified: branches/7.1.x/common-core/src/main/java/org/teiid/core/TeiidRuntimeException.java =================================================================== --- branches/7.1.x/common-core/src/main/java/org/teiid/core/TeiidRuntimeException.java 2010-09-07 23:28:26 UTC (rev 2539) +++ branches/7.1.x/common-core/src/main/java/org/teiid/core/TeiidRuntimeException.java 2010-09-08 00:37:02 UTC (rev 2540) @@ -41,7 +41,7 @@ public static final long serialVersionUID = -4035276728007979320L; private static final String EMPTY_STRING = ""; //$NON-NLS-1$ - public static final String CAUSED_BY_STRING = CorePlugin.Util.getString("MetaMatrixRuntimeException.Caused_by"); //$NON-NLS-1$ + public static final String CAUSED_BY_STRING = CorePlugin.Util.getString("RuntimeException.Caused_by"); //$NON-NLS-1$ //############################################################################################################################ //# Static Methods # Modified: branches/7.1.x/common-core/src/main/java/org/teiid/core/util/StringUtil.java =================================================================== --- branches/7.1.x/common-core/src/main/java/org/teiid/core/util/StringUtil.java 2010-09-07 23:28:26 UTC (rev 2539) +++ branches/7.1.x/common-core/src/main/java/org/teiid/core/util/StringUtil.java 2010-09-08 00:37:02 UTC (rev 2540) @@ -549,7 +549,7 @@ // ... and the previous character is not uppercase, then insert if ( !previousCharUppercase ) { // ... and this is not the 'M' of 'MetaMatrix' ... - if ( currentChar != 'M' || i < 4 || (!newName.substring(i-4).startsWith(CorePlugin.Util.getString("StringUtil.Displayable.MetaMatrix"))) ) { //$NON-NLS-1$ + if ( currentChar != 'M' || i < 4 || (!newName.substring(i-4).startsWith(CorePlugin.Util.getString("StringUtil.Displayable"))) ) { //$NON-NLS-1$ newName.insert(i, ' ' ); ++i; // skip, since we just move the character back one position } Modified: branches/7.1.x/common-core/src/main/resources/org/teiid/core/i18n.properties =================================================================== --- branches/7.1.x/common-core/src/main/resources/org/teiid/core/i18n.properties 2010-09-07 23:28:26 UTC (rev 2539) +++ branches/7.1.x/common-core/src/main/resources/org/teiid/core/i18n.properties 2010-09-08 00:37:02 UTC (rev 2540) @@ -20,18 +20,8 @@ # 02110-1301 USA. # -PlatformLogger._NullLogEntry_exception = A null log entry was logged -SystemLogger._NullLogEntry_exception = A null log entry was logged +StringUtil.Displayable=Teiid -Stopwatch.Stopwatch_Statistics =Stopwatch Statistics: -Stopwatch.Statistics_Total =\ \ Total = {0} -Stopwatch.Statistics_Previous =\ \ Previous = {0} -Stopwatch.Statistics_Count =\ \ Count = {0} -Stopwatch.Statistics_Average =\ \ Average = {0} -Stopwatch.Statistics_Minimum =\ \ Minimum = {0} -Stopwatch.Statistics_Maximum =\ \ Maximum = {0} -StringUtil.Displayable.MetaMatrix=MetaMatrix - ArgCheck.isNonNegativeInt=Expected argument to be non-negative but argument= {0} ArgCheck.isNonPositiveInt=Expected argument to be non-positive but argument= {0} ArgCheck.isNegativeInt=Expected argument to be negative but argument= {0} @@ -70,14 +60,12 @@ UUIDFactory.Description=An universally unique identifier that is composed of a 36-character formatted string. ParsedObjectID.The_stringified_ObjectID_does_not_have_a_protocol=The stringified ObjectID does not have a protocol ParsedObjectID.The_stringified_ObjectID_does_not_have_the_required_protocol_{0}=The stringified ObjectID does not have the required protocol {0} -DebuggerImpl.conflictWarning = Debug context "{0}" is defined in both plugins "{1}" and "{2}"; context from plugin "{1}" will be ignored. -DebuggerImpl.timerStop =TIMER STOPPED | TIME={1} ms |ID = {0} | {2} ObjectConverterUtil.Error_translating_results_from_data_type_to_a_byte[]._1=Error translating results from data type {0} to a byte[]. ObjectConverterUtil.Error_translating_results_from_data_type_to_a_byte[]._2=Error translating results from data type {0} to a byte[]. ObjectConverterUtil.Object_type_not_supported_for_object_conversion._3=Object type {0} not supported for object conversion. FileUtils.File_does_not_exist._1=File {0} does not exist. FileUtils.Not_a_directory=\"{0}\" is not a directory. -MetaMatrixRuntimeException.Caused_by=Caused by: +RuntimeException.Caused_by=Caused by: IDGenerator.The_protocol_may_not_be_null=The protocol may not be null IDGenerator.The_stringified_ID_may_not_be_null=The stringified ID may not be null FileUtils.The_name_of_the_file_may_not_be_null=The name of the file may not be null @@ -90,18 +78,6 @@ FileUtils.File_already_exists=File "\{0}\" already exists -#================================================================================================================================= -# PluginUtilImpl - -PluginUtilImpl.invalidJavaVersionMessage = {0} requires Java version {1} or higher. Currently executing Java version {2}. - -#================================================================================================================================= -# AspectJ - - - - - StringIDFactory.The_specified_ID_value_is_invalid=The specified ID value \"{0}\" is invalid for the protocol \"{1}\". Modified: branches/7.1.x/connectors/translator-jdbc/src/main/resources/org/teiid/translator/jdbc/i18n.properties =================================================================== --- branches/7.1.x/connectors/translator-jdbc/src/main/resources/org/teiid/translator/jdbc/i18n.properties 2010-09-07 23:28:26 UTC (rev 2539) +++ branches/7.1.x/connectors/translator-jdbc/src/main/resources/org/teiid/translator/jdbc/i18n.properties 2010-09-08 00:37:02 UTC (rev 2540) @@ -26,8 +26,6 @@ JDBCQueryExecution.Error_executing_query__1 = {0}\n\nExecuting statement:\n\n {1} -JDBCQueryExecution.Error_executing_query__2 = {0}\n\nAfter executing batch statements:\n -JDBCQueryExecution.Error_executing_query__3 = {0}\n\nWhile executing batch statements:\n ConnectionListener.failed_to_report_jdbc_connection_details=Failed to report the JDBC driver and connection information Modified: branches/7.1.x/engine/src/main/resources/org/teiid/query/i18n.properties =================================================================== --- branches/7.1.x/engine/src/main/resources/org/teiid/query/i18n.properties 2010-09-07 23:28:26 UTC (rev 2539) +++ branches/7.1.x/engine/src/main/resources/org/teiid/query/i18n.properties 2010-09-08 00:37:02 UTC (rev 2540) @@ -274,7 +274,6 @@ ValidationVisitor.invalid_lookup_key=Expressions of type OBJECT, CLOB, BLOB, or XML cannot be used as LOOKUP key columns: {0}. ValidationVisitor.limit_not_valid_for_xml=The limit clause cannot be used on an XML document query. ValidationVisitor.translated_or=Translated user criteria must not contain OR criteria -ValidateCriteriaVistitor.element_not_comparable = The following data elements are not supported in comparison criteria: {0}. ValidationVisitor.union_insert = Select into is not allowed under a set operation: {0}. ERR.015.012.0028 = The following data elements are not supported in match criteria: {0}. ERR.015.012.0029 = INSERT, UPDATE, and DELETE not allowed on XML documents Modified: branches/7.1.x/runtime/src/main/resources/org/teiid/runtime/i18n.properties =================================================================== --- branches/7.1.x/runtime/src/main/resources/org/teiid/runtime/i18n.properties 2010-09-07 23:28:26 UTC (rev 2539) +++ branches/7.1.x/runtime/src/main/resources/org/teiid/runtime/i18n.properties 2010-09-08 00:37:02 UTC (rev 2540) @@ -24,35 +24,12 @@ LocalBufferService.Failed_initializing_buffer_manager._8=Failed initializing buffer manager. -VDBConfigFileReader.No_connector_binding_in_config = A model \"{0}\" specifies a connection factory "{1}" for which there is no definition found in the configuration or VDB definition files. - VDBService.VDB_does_not_exist._1=VDB \"{0}\" version \"{1}\" does not exist. VDBService.VDB_does_not_exist._2=VDB \"{0}\" version \"{1}\" is not in "active" status. - - - - - - - - -# authorization service -AuthorizationServiceImpl.wrong_realms = Permission collection contains requests from different realms. - -# membership service -MembershipServiceImpl.loaded = Loaded membership domain: "{0}". -MembershipServiceImpl.failed_to_create = Unable to create membership domain {0} -MembershipServiceImpl.unable_to_create = Unable to create membership domain "{0}". Factory class not found in environment properties. -MembershipServiceImpl.invalid_principal = The principal "{0}" is invalid. -MembershipServiceImpl.error_shuting_down = Error shutting down domain after ''killService'' method received. - - - # session service SessionServiceImpl.invalid_session=The specified session ID "{0}" is invalid. It cannot be found in the userbase. -SessionServiceImpl.reached_max_sessions = The server has reached the maximum number of sessions of {0} as defined by the property metamatrix.session.max.connections. If more sessions are required, modify this property value in the MetaMatrix Console. -SessionServiceImpl.failed_to_getprincipal = Membership service encountered an error getting the principal for user "{0}". +SessionServiceImpl.reached_max_sessions = The server has reached the maximum number of sessions of {0} as defined by the property "sessionMaxLimit". If more sessions are required, modify this property value in the "teiid-jboss-beans.xml" file. SessionServiceImpl.expireSession = Expiring session {0} SessionServiceImpl.keepaliveFailed = Keepalive failed for session {0} SessionServiceImpl.The_username_0_and/or_password_are_incorrect=The username "{0}" and/or password and/or payload token could not be authenticated by any membership domain.