[teiid-commits] teiid SVN: r4155 - in trunk: admin/src/main/resources/org/teiid/adminapi and 36 other directories.

Author: shawkins Date: 2012-06-01 13:30:30 -0400 (Fri, 01 Jun 2012) New Revision: 4155 Modified: trunk/admin/src/main/java/org/teiid/adminapi/AdminFactory.java trunk/admin/src/main/java/org/teiid/adminapi/AdminPlugin.java trunk/admin/src/main/resources/org/teiid/adminapi/i18n.properties trunk/api/src/main/java/org/teiid/connector/DataPlugin.java trunk/api/src/main/java/org/teiid/translator/ExecutionFactory.java trunk/api/src/main/resources/org/teiid/connector/i18n.properties trunk/client/src/main/java/org/teiid/client/util/ExceptionUtil.java trunk/client/src/main/java/org/teiid/jdbc/FilteredResultsMetadata.java trunk/client/src/main/resources/org/teiid/jdbc/i18n.properties trunk/common-core/src/main/java/org/teiid/core/CorePlugin.java trunk/common-core/src/main/java/org/teiid/core/crypto/BasicCryptor.java trunk/common-core/src/main/java/org/teiid/core/types/basic/StringToTimeTransform.java trunk/common-core/src/main/java/org/teiid/core/util/ObjectConverterUtil.java trunk/common-core/src/main/resources/org/teiid/core/i18n.properties trunk/engine/src/main/java/org/teiid/dqp/internal/process/TransactionServerImpl.java trunk/engine/src/main/java/org/teiid/query/QueryPlugin.java trunk/engine/src/main/java/org/teiid/query/eval/Evaluator.java trunk/engine/src/main/java/org/teiid/query/function/FunctionMethods.java trunk/engine/src/main/java/org/teiid/query/function/metadata/FunctionMetadataValidator.java trunk/engine/src/main/java/org/teiid/query/metadata/NativeMetadataRepository.java trunk/engine/src/main/java/org/teiid/query/metadata/TempMetadataAdapter.java trunk/engine/src/main/java/org/teiid/query/metadata/TransformationMetadata.java trunk/engine/src/main/java/org/teiid/query/parser/QueryParser.java trunk/engine/src/main/java/org/teiid/query/processor/relational/ArrayTableNode.java trunk/engine/src/main/java/org/teiid/query/processor/relational/TextTableNode.java trunk/engine/src/main/java/org/teiid/query/resolver/command/ExecResolver.java trunk/engine/src/main/java/org/teiid/query/resolver/util/ResolverUtil.java trunk/engine/src/main/java/org/teiid/query/resolver/util/ResolverVisitor.java trunk/engine/src/main/java/org/teiid/query/util/CommandContext.java trunk/engine/src/main/javacc/org/teiid/query/parser/SQLParser.jj trunk/engine/src/main/resources/org/teiid/query/i18n.properties trunk/engine/src/test/java/org/teiid/cdk/CommandBuilder.java trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestTransactionServer.java trunk/engine/src/test/java/org/teiid/query/parser/TestParser.java trunk/engine/src/test/java/org/teiid/query/processor/eval/TestExpressionEvaluator.java trunk/engine/src/test/java/org/teiid/query/resolver/TestResolver.java trunk/jboss-integration/src/main/java/org/teiid/jboss/IntegrationPlugin.java trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBDeployer.java trunk/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties trunk/runtime/src/main/java/org/teiid/deployers/SystemVDBDeployer.java trunk/runtime/src/main/java/org/teiid/deployers/TranslatorUtil.java trunk/runtime/src/main/java/org/teiid/deployers/VDBRepository.java trunk/runtime/src/main/java/org/teiid/deployers/VDBStatusChecker.java trunk/runtime/src/main/java/org/teiid/runtime/RuntimePlugin.java trunk/runtime/src/main/java/org/teiid/services/BufferServiceImpl.java trunk/runtime/src/main/java/org/teiid/transport/LogonImpl.java trunk/runtime/src/main/java/org/teiid/transport/SocketConfiguration.java trunk/runtime/src/main/resources/org/teiid/runtime/i18n.properties Log: TEIID-2022 removing duplicate error codes based upon their messages Modified: trunk/admin/src/main/java/org/teiid/adminapi/AdminFactory.java =================================================================== --- trunk/admin/src/main/java/org/teiid/adminapi/AdminFactory.java 2012-05-31 20:36:33 UTC (rev 4154) +++ trunk/admin/src/main/java/org/teiid/adminapi/AdminFactory.java 2012-06-01 17:30:30 UTC (rev 4155) @@ -726,7 +726,7 @@ } catch (OperationFormatException e) { throw new AdminProcessingException(AdminPlugin.Event.TEIID70016, e, AdminPlugin.Util.gs(AdminPlugin.Event.TEIID70016)); } catch (IOException e) { - throw new AdminProcessingException(AdminPlugin.Event.TEIID70017, e, AdminPlugin.Util.gs(AdminPlugin.Event.TEIID70017)); + throw new AdminProcessingException(AdminPlugin.Event.TEIID70016, e, AdminPlugin.Util.gs(AdminPlugin.Event.TEIID70016)); } } Modified: trunk/admin/src/main/java/org/teiid/adminapi/AdminPlugin.java =================================================================== --- trunk/admin/src/main/java/org/teiid/adminapi/AdminPlugin.java 2012-05-31 20:36:33 UTC (rev 4154) +++ trunk/admin/src/main/java/org/teiid/adminapi/AdminPlugin.java 2012-06-01 17:30:30 UTC (rev 4155) @@ -45,7 +45,6 @@ TEIID70014, TEIID70015, TEIID70016, - TEIID70017, TEIID70020, TEIID70021, TEIID70022, Modified: trunk/admin/src/main/resources/org/teiid/adminapi/i18n.properties =================================================================== --- trunk/admin/src/main/resources/org/teiid/adminapi/i18n.properties 2012-05-31 20:36:33 UTC (rev 4154) +++ trunk/admin/src/main/resources/org/teiid/adminapi/i18n.properties 2012-06-01 17:30:30 UTC (rev 4155) @@ -86,7 +86,6 @@ TEIID70003=Data source with name {0} already exists; choose a different deployment name TEIID70008=Data Source with name {0} does not exists in the system. Check the deployment name. TEIID70016=Failed to build operation -TEIID70017=Failed to build operation unexpected_element1=Unexpected Element {0} encountered, expecting one of {1} unexpected_element2=Unexpected Element {0} encountered, expecting one of {1} {2} unexpected_element3=Unexpected Element {0} encountered, expecting one of {1} {2} {3} Modified: trunk/api/src/main/java/org/teiid/connector/DataPlugin.java =================================================================== --- trunk/api/src/main/java/org/teiid/connector/DataPlugin.java 2012-05-31 20:36:33 UTC (rev 4154) +++ trunk/api/src/main/java/org/teiid/connector/DataPlugin.java 2012-06-01 17:30:30 UTC (rev 4155) @@ -36,8 +36,6 @@ public static enum Event implements BundleUtil.Event { TEIID60000, TEIID60001, - TEIID60002, - TEIID60003, TEIID60004, TEIID60005, TEIID60008, Modified: trunk/api/src/main/java/org/teiid/translator/ExecutionFactory.java =================================================================== --- trunk/api/src/main/java/org/teiid/translator/ExecutionFactory.java 2012-05-31 20:36:33 UTC (rev 4154) +++ trunk/api/src/main/java/org/teiid/translator/ExecutionFactory.java 2012-06-01 17:30:30 UTC (rev 4155) @@ -259,17 +259,17 @@ @SuppressWarnings("unused") public ResultSetExecution createResultSetExecution(QueryExpression command, ExecutionContext executionContext, RuntimeMetadata metadata, C connection) throws TranslatorException { - throw new TranslatorException(DataPlugin.Event.TEIID60001, DataPlugin.Util.gs(DataPlugin.Event.TEIID60001)); + throw new TranslatorException(DataPlugin.Event.TEIID60001, DataPlugin.Util.gs(DataPlugin.Event.TEIID60001, "createResultSetExecution")); //$NON-NLS-1$ } @SuppressWarnings("unused") public ProcedureExecution createProcedureExecution(Call command, ExecutionContext executionContext, RuntimeMetadata metadata, C connection) throws TranslatorException { - throw new TranslatorException(DataPlugin.Event.TEIID60002, DataPlugin.Util.gs(DataPlugin.Event.TEIID60002)); + throw new TranslatorException(DataPlugin.Event.TEIID60001, DataPlugin.Util.gs(DataPlugin.Event.TEIID60001, "createProcedureExecution")); //$NON-NLS-1$ } @SuppressWarnings("unused") public UpdateExecution createUpdateExecution(Command command, ExecutionContext executionContext, RuntimeMetadata metadata, C connection) throws TranslatorException { - throw new TranslatorException(DataPlugin.Event.TEIID60003, DataPlugin.Util.gs(DataPlugin.Event.TEIID60003)); + throw new TranslatorException(DataPlugin.Event.TEIID60001, DataPlugin.Util.gs(DataPlugin.Event.TEIID60001, "createUpdateExecution")); //$NON-NLS-1$ } /** Modified: trunk/api/src/main/resources/org/teiid/connector/i18n.properties =================================================================== --- trunk/api/src/main/resources/org/teiid/connector/i18n.properties 2012-05-31 20:36:33 UTC (rev 4154) +++ trunk/api/src/main/resources/org/teiid/connector/i18n.properties 2012-06-01 17:30:30 UTC (rev 4155) @@ -20,9 +20,6 @@ # 02110-1301 USA. # - - - DelegatingHierarchyVisitor.The_pre-_and_post-processing_visitors_cannot_both_be_null._1=The pre- and post-processing visitors cannot both be null. TEIID60012=Duplicate Schema {0} TEIID60013=Duplicate Table {0} @@ -38,8 +35,6 @@ Schema.duplicate_procedure=Duplicate procedure {0} Schema.duplicate_function=Duplicate function {0} -TEIID60003=Unsupported Execution -TEIID60002=Unsupported Execution -TEIID60001=Unsupported Execution +TEIID60001=Unsupported Execution {0} TEIID60010=No unique key defined for table {0} for columns {1} TEIID60004=Neither class name nor default class specified to create an instance Modified: trunk/client/src/main/java/org/teiid/client/util/ExceptionUtil.java =================================================================== --- trunk/client/src/main/java/org/teiid/client/util/ExceptionUtil.java 2012-05-31 20:36:33 UTC (rev 4154) +++ trunk/client/src/main/java/org/teiid/client/util/ExceptionUtil.java 2012-06-01 17:30:30 UTC (rev 4155) @@ -48,7 +48,6 @@ public static Throwable convertException(Method method, Throwable exception) { boolean canThrowXATransactionException = false; boolean canThrowComponentException = false; - boolean canThrowAdminException = false; Class<?>[] exceptionClasses = method.getExceptionTypes(); for (int i = 0; i < exceptionClasses.length; i++) { if (exception.getClass().isAssignableFrom(exceptionClasses[i])) { Modified: trunk/client/src/main/java/org/teiid/jdbc/FilteredResultsMetadata.java =================================================================== --- trunk/client/src/main/java/org/teiid/jdbc/FilteredResultsMetadata.java 2012-05-31 20:36:33 UTC (rev 4154) +++ trunk/client/src/main/java/org/teiid/jdbc/FilteredResultsMetadata.java 2012-06-01 17:30:30 UTC (rev 4155) @@ -33,10 +33,6 @@ private ResultSetMetaData delegate; private int actualColumnCount; - static FilteredResultsMetadata newInstance (ResultSetMetaData rsmd, int actualColumnCount) { - return new FilteredResultsMetadata(rsmd, actualColumnCount); - } - FilteredResultsMetadata(ResultSetMetaData rsmd, int actualColumnCount) { this.delegate = rsmd; this.actualColumnCount = actualColumnCount; @@ -48,7 +44,7 @@ private void verifyColumnIndex(int index) throws SQLException { if(index > actualColumnCount) { - throw new SQLException(JDBCPlugin.Util.getString("FilteredResultsMetadata.Invalid_index", index)); //$NON-NLS-1$ + throw new SQLException(JDBCPlugin.Util.getString("StaticMetadataProvider.Invalid_column", index)); //$NON-NLS-1$ } } Modified: trunk/client/src/main/resources/org/teiid/jdbc/i18n.properties =================================================================== --- trunk/client/src/main/resources/org/teiid/jdbc/i18n.properties 2012-05-31 20:36:33 UTC (rev 4154) +++ trunk/client/src/main/resources/org/teiid/jdbc/i18n.properties 2012-06-01 17:30:30 UTC (rev 4155) @@ -102,7 +102,6 @@ MMXAConnection.connection_is_closed=Connection is closed and can not be reused. StaticMetadataProvider.Invalid_column=Invalid column index: {0} DeferredMetadataProvider.Invalid_data=Invalid data for DeferredMetadataProvider: {0}, {1} -FilteredResultsMetadata.Invalid_index=Invalid column index: {0} MMStatement.Timeout_ocurred_in_Statement.=Timeout occurred in Statement. MMStatement.Error_timing_out.=Error timing out. MMStatement.Bad_timeout_value=Invalid timeout value supplied. Valid range is greater than or equal to zero. Modified: trunk/common-core/src/main/java/org/teiid/core/CorePlugin.java =================================================================== --- trunk/common-core/src/main/java/org/teiid/core/CorePlugin.java 2012-05-31 20:36:33 UTC (rev 4154) +++ trunk/common-core/src/main/java/org/teiid/core/CorePlugin.java 2012-06-01 17:30:30 UTC (rev 4155) @@ -60,14 +60,11 @@ TEIID10016, TEIID10017, TEIID10018, - TEIID10019, - TEIID10020, TEIID10021, TEIID10022, TEIID10023, TEIID10024, TEIID10030, - TEIID10031, TEIID10032, TEIID10033, TEIID10034, @@ -98,7 +95,6 @@ TEIID10061, TEIID10063, TEIID10068, - TEIID10069, TEIID10070, TEIID10071, TEIID10072, Modified: trunk/common-core/src/main/java/org/teiid/core/crypto/BasicCryptor.java =================================================================== --- trunk/common-core/src/main/java/org/teiid/core/crypto/BasicCryptor.java 2012-05-31 20:36:33 UTC (rev 4154) +++ trunk/common-core/src/main/java/org/teiid/core/crypto/BasicCryptor.java 2012-06-01 17:30:30 UTC (rev 4155) @@ -144,7 +144,7 @@ } catch (CryptoException err) { //shouldn't happen } - throw new CryptoException(CorePlugin.Event.TEIID10012, CorePlugin.Util.gs(CorePlugin.Event.TEIID10012, e.getClass().getName(), e.getMessage())); + throw new CryptoException(CorePlugin.Event.TEIID10006, CorePlugin.Util.gs(CorePlugin.Event.TEIID10006, e.getClass().getName(), e.getMessage())); } } @@ -205,9 +205,6 @@ } public synchronized Object sealObject(Object object) throws CryptoException { - if (object != null && !(object instanceof Serializable)) { - throw new CryptoException(CorePlugin.Event.TEIID10019, CorePlugin.Util.gs(CorePlugin.Event.TEIID10019)); - } try { return new SealedObject((Serializable)object, encryptCipher); } catch ( Exception e ) { @@ -216,7 +213,7 @@ } catch (CryptoException err) { //shouldn't happen } - throw new CryptoException(CorePlugin.Event.TEIID10020, CorePlugin.Util.gs(CorePlugin.Event.TEIID10020, e.getMessage())); + throw new CryptoException(CorePlugin.Event.TEIID10013, CorePlugin.Util.gs(CorePlugin.Event.TEIID10013, e.getMessage())); } } Modified: trunk/common-core/src/main/java/org/teiid/core/types/basic/StringToTimeTransform.java =================================================================== --- trunk/common-core/src/main/java/org/teiid/core/types/basic/StringToTimeTransform.java 2012-05-31 20:36:33 UTC (rev 4154) +++ trunk/common-core/src/main/java/org/teiid/core/types/basic/StringToTimeTransform.java 2012-06-01 17:30:30 UTC (rev 4155) @@ -26,6 +26,7 @@ import java.util.regex.Pattern; import org.teiid.core.CorePlugin; +import org.teiid.core.types.DataTypeManager; import org.teiid.core.types.Transform; import org.teiid.core.types.TransformationException; @@ -58,12 +59,12 @@ result = Time.valueOf((String)value); } catch(Exception e) { if (!validate && pattern.matcher((String)value).matches()) { - throw new TransformationException(CorePlugin.Event.TEIID10069, CorePlugin.Util.gs(CorePlugin.Event.TEIID10069, value, getTargetType().getSimpleName())); + throw new TransformationException(CorePlugin.Event.TEIID10060, CorePlugin.Util.gs(CorePlugin.Event.TEIID10060, value, getTargetType().getSimpleName())); } throw new TransformationException(CorePlugin.Event.TEIID10068, e, CorePlugin.Util.gs(CorePlugin.Event.TEIID10068, value)); } if (validate && !result.toString().equals(value)) { - throw new TransformationException(CorePlugin.Event.TEIID10069, CorePlugin.Util.gs(CorePlugin.Event.TEIID10069, value, getTargetType().getSimpleName())); + throw new TransformationException(CorePlugin.Event.TEIID10060, CorePlugin.Util.gs(CorePlugin.Event.TEIID10060, value, getTargetType().getSimpleName())); } return result; } @@ -72,16 +73,16 @@ * Type of the incoming value. * @return Source type */ - public Class getSourceType() { - return String.class; + public Class<?> getSourceType() { + return DataTypeManager.DefaultDataClasses.STRING; } /** * Type of the outgoing value. * @return Target type */ - public Class getTargetType() { - return Time.class; + public Class<?> getTargetType() { + return DataTypeManager.DefaultDataClasses.TIME; } @Override Modified: trunk/common-core/src/main/java/org/teiid/core/util/ObjectConverterUtil.java =================================================================== --- trunk/common-core/src/main/java/org/teiid/core/util/ObjectConverterUtil.java 2012-05-31 20:36:33 UTC (rev 4154) +++ trunk/common-core/src/main/java/org/teiid/core/util/ObjectConverterUtil.java 2012-06-01 17:30:30 UTC (rev 4155) @@ -22,21 +22,8 @@ package org.teiid.core.util; -import java.io.BufferedInputStream; -import java.io.BufferedOutputStream; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.FileWriter; -import java.io.IOException; -import java.io.InputStream; +import java.io.*; import java.io.InputStreamReader; -import java.io.OutputStream; -import java.io.Reader; -import java.io.StringWriter; -import java.io.Writer; import java.sql.SQLException; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; @@ -59,7 +46,7 @@ throw new TeiidException(CorePlugin.Event.TEIID10030, ioe,CorePlugin.Util.gs(CorePlugin.Event.TEIID10030,params)); } catch (SQLException sqe) { final Object[] params = new Object[]{data.getClass().getName()}; - throw new TeiidException(CorePlugin.Event.TEIID10031, sqe,CorePlugin.Util.gs(CorePlugin.Event.TEIID10031,params)); + throw new TeiidException(CorePlugin.Event.TEIID10030, sqe,CorePlugin.Util.gs(CorePlugin.Event.TEIID10030,params)); } } Modified: trunk/common-core/src/main/resources/org/teiid/core/i18n.properties =================================================================== --- trunk/common-core/src/main/resources/org/teiid/core/i18n.properties 2012-05-31 20:36:33 UTC (rev 4154) +++ trunk/common-core/src/main/resources/org/teiid/core/i18n.properties 2012-06-01 17:30:30 UTC (rev 4155) @@ -44,40 +44,16 @@ Assertion.isNull=ASSERTION FAILED: expected reference to be null Assertion.isNotNull=ASSERTION FAILED: expected reference to be not null Assertion.invalidClassMessage=ASSERTION FAILED: The object {0} was expected to be an instance of {1} but was instance of {2} -IDGenerator.The_specified_ObjectID_protocol___8=The specified ObjectID protocol "{0}" is unknown -IDGenerator.The_stringified_ObjectID_has_an_unknown_protocol___16=The stringified ObjectID has an unknown protocol: -InvalidIDException.Invalid_ID_1=Invalid ID -IntegerIDFactory.The_specified_ID_value_is_invalid=The specified ID value "{0}" is invalid for the "{1}" protocol -LongIDFactory.The_specified_ID_value_is_invalid=The specified ID value "{0}" is invalid for the "{1}" protocol -UUID.ID_must_be_of_type_UUID_1=ID must be of type UUID -UUID.ID_must_be_of_type_UUID_to_parse_2=ID must be of type UUID to parse -UUID.InvalidFormatForProtocol=The specified ID value "{0}" is invalid for the "{1}" protocol -IDGenerator.No_default_id_factory_has_been_defined=No default id factory has been defined -IntegerIDFactory.Description=An identifier that is composed of an integer value -LongIDFactory.Description=An identifier that is composed of an integer value -StringIDFactory.Description=An identifier that is composed of an integer value -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} TEIID10030=Error translating results from data type {0} to a byte[]. -TEIID10031=Error translating results from data type {0} to a byte[]. TEIID10032=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. 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 FileUtils.The_file_extension_may_not_be_null=The file extension may not be null FileUtils.File_already_exists=File "\{0}\" already exists - -StringIDFactory.The_specified_ID_value_is_invalid=The specified ID value \"{0}\" is invalid for the protocol \"{1}\". - - - - stream_closed=The stream already closed TEIID10080=Failed to convert {0} into {1} TEIID10070=Value is not valid XML @@ -113,14 +89,11 @@ TEIID10008=Could not decode Base-64 ciphertext. {0} TEIID10009=Could not get instance of cipher for encryption, invalid algorithm specified: {0} TEIID10010=Could not get instance of cipher for encryption, invalid padding specified: {0} {1} {2} -TEIID10018=Could not initialize cipher for decryption, invalid key specified: {0} {1} TEIID10011=Could not get encrypt cipher''s encoded algorithm parameters due to encoding error: {0} {1} -TEIID10012=Decryption failed: {0} {1} TEIID10013=Encryption failed: {0} -TEIID10016=Could not get instance of cipher for encryption, invalid algorithm specified: {0} -TEIID10017=Attempt to encrypt null cleartext. -TEIID10019=Encryption failed: {0} -TEIID10020=Encryption failed: {0} +TEIID10016=Could not get instance of cipher for decryption, invalid algorithm specified: {0} +TEIID10017=Could not get instance of cipher for decryption, invalid padding specified: {0} {1} {2} +TEIID10018=Could not get decrypt cipher''s encoded algorithm parameters due to encoding error: {0} {1} # PROPERTIES_ERR @@ -130,7 +103,6 @@ ExceptionHolder.converted_exception=Remote {1}: {0} TEIID10042=failed to completely resolve the property value for key {0} -TEIID10069=The string representation ''{0}'' of a {1} value is not valid. TEIID10058=The {1} value ''{0}'' is outside the of range for {2} MMClob_MMBlob.0=Invalid column index: {0} Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/TransactionServerImpl.java =================================================================== --- trunk/engine/src/main/java/org/teiid/dqp/internal/process/TransactionServerImpl.java 2012-05-31 20:36:33 UTC (rev 4154) +++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/TransactionServerImpl.java 2012-06-01 17:30:30 UTC (rev 4155) @@ -329,7 +329,7 @@ if (!threadBound) { tc = transactions.getOrCreateTransactionContext(threadId); if (tc.getTransactionType() != TransactionContext.Scope.NONE) { - throw new XATransactionException(QueryPlugin.Event.TEIID30523, XAException.XAER_PROTO, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30523, new Object[] {xid, threadId})); + throw new XATransactionException(QueryPlugin.Event.TEIID30517, XAException.XAER_PROTO, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30517)); } } return null; @@ -353,12 +353,9 @@ try { if (tc.getTransactionType() != TransactionContext.Scope.NONE) { - if (tc.getTransactionType() != TransactionContext.Scope.LOCAL) { - throw new InvalidTransactionException(QueryPlugin.Util.getString("TransactionServer.existing_transaction")); //$NON-NLS-1$ + if (tc.getTransactionType() != TransactionContext.Scope.LOCAL || !transactionExpected) { + throw new XATransactionException(QueryPlugin.Event.TEIID30517, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30517)); } - if (!transactionExpected) { - throw new InvalidTransactionException(QueryPlugin.Util.getString("TransactionServer.existing_transaction")); //$NON-NLS-1$ - } transactionManager.resume(tc.getTransaction()); } else if (transactionExpected) { throw new InvalidTransactionException(QueryPlugin.Util.getString("TransactionServer.no_transaction", threadId)); //$NON-NLS-1$ @@ -469,7 +466,7 @@ */ public void begin(TransactionContext context) throws XATransactionException{ if (context.getTransactionType() != TransactionContext.Scope.NONE) { - throw new XATransactionException(QueryPlugin.Event.TEIID30540, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30540)); + throw new XATransactionException(QueryPlugin.Event.TEIID30517, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30517)); } beginDirect(context); context.setTransactionType(TransactionContext.Scope.REQUEST); Modified: trunk/engine/src/main/java/org/teiid/query/QueryPlugin.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/QueryPlugin.java 2012-05-31 20:36:33 UTC (rev 4154) +++ trunk/engine/src/main/java/org/teiid/query/QueryPlugin.java 2012-06-01 17:30:30 UTC (rev 4155) @@ -115,9 +115,7 @@ TEIID30072, TEIID30074, TEIID30075, - TEIID30076, TEIID30077, - TEIID30078, TEIID30079, TEIID30082, TEIID30083, @@ -129,7 +127,6 @@ TEIID30089, TEIID30090, TEIID30091, - TEIID30092, TEIID30093, TEIID30094, TEIID30095, @@ -166,7 +163,6 @@ TEIID30139, TEIID30140, TEIID30141, - TEIID30142, TEIID30143, TEIID30144, TEIID30145, @@ -205,13 +201,10 @@ TEIID30182, TEIID30183, TEIID30184, - TEIID30185, TEIID30186, TEIID30187, TEIID30188, - TEIID30189, TEIID30190, - TEIID30191, TEIID30192, TEIID30193, TEIID30194, @@ -319,7 +312,6 @@ TEIID30320, TEIID30323, TEIID30324, - TEIID30325, TEIID30326, TEIID30327, TEIID30328, @@ -338,10 +330,7 @@ TEIID30343, TEIID30344, TEIID30345, - TEIID30346, TEIID30347, - TEIID30348, - TEIID30349, TEIID30350, TEIID30351, TEIID30352, @@ -352,9 +341,6 @@ TEIID30357, TEIID30358, TEIID30359, - TEIID30360, - TEIID30361, - TEIID30362, TEIID30363, TEIID30364, TEIID30365, @@ -370,7 +356,6 @@ TEIID30376, TEIID30377, TEIID30378, - TEIID30380, TEIID30381, TEIID30382, TEIID30384, @@ -413,7 +398,6 @@ TEIID30430, TEIID30431, TEIID30432, - TEIID30433, TEIID30434, TEIID30435, TEIID30436, @@ -450,7 +434,6 @@ TEIID30477, TEIID30478, TEIID30479, - TEIID30480, TEIID30481, TEIID30482, TEIID30483, @@ -487,7 +470,6 @@ TEIID30520, TEIID30521, TEIID30522, - TEIID30523, TEIID30524, TEIID30525, TEIID30526, @@ -497,7 +479,6 @@ TEIID30535, TEIID30537, TEIID30538, - TEIID30540, TEIID30541, TEIID30542, TEIID30543, @@ -560,5 +541,6 @@ TEIID31097, TEIID31098, //alter imported TEIID31099, //vdb loading + TEIID31100, //parse exception } } Modified: trunk/engine/src/main/java/org/teiid/query/eval/Evaluator.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/eval/Evaluator.java 2012-05-31 20:36:33 UTC (rev 4154) +++ trunk/engine/src/main/java/org/teiid/query/eval/Evaluator.java 2012-06-01 17:30:30 UTC (rev 4155) @@ -930,13 +930,9 @@ private Object evaluate(SearchedCaseExpression expr, List<?> tuple) throws ExpressionEvaluationException, BlockedException, TeiidComponentException { for (int i = 0; i < expr.getWhenCount(); i++) { - try { - if (evaluate(expr.getWhenCriteria(i), tuple)) { - return internalEvaluate(expr.getThenExpression(i), tuple); - } - } catch (ExpressionEvaluationException e) { - throw new ExpressionEvaluationException(QueryPlugin.Event.TEIID30346, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30346, "CASE", expr.getWhenCriteria(i))); //$NON-NLS-1$ - } + if (evaluate(expr.getWhenCriteria(i), tuple)) { + return internalEvaluate(expr.getThenExpression(i), tuple); + } } if (expr.getElseExpression() != null) { return internalEvaluate(expr.getElseExpression(), tuple); @@ -1027,7 +1023,7 @@ private CommandContext getContext(LanguageObject expression) throws TeiidComponentException { if (context == null) { - throw new TeiidComponentException(QueryPlugin.Event.TEIID30346, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30346, expression, "No value was available")); //$NON-NLS-1$ + throw new TeiidComponentException(QueryPlugin.Event.TEIID30328, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30328, expression, QueryPlugin.Util.getString("Evaluator.no_value"))); //$NON-NLS-1$ } return context; } Modified: trunk/engine/src/main/java/org/teiid/query/function/FunctionMethods.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/function/FunctionMethods.java 2012-05-31 20:36:33 UTC (rev 4154) +++ trunk/engine/src/main/java/org/teiid/query/function/FunctionMethods.java 2012-06-01 17:30:30 UTC (rev 4155) @@ -702,7 +702,7 @@ public static String trim(String trimSpec, String trimChar, String string) throws FunctionExecutionException { if (trimChar.length() != 1) { - throw new FunctionExecutionException(QueryPlugin.Event.TEIID30398, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30398, "trim char", trimChar));//$NON-NLS-1$ + throw new FunctionExecutionException(QueryPlugin.Event.TEIID30398, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30398, "TRIM CHAR", trimChar));//$NON-NLS-1$ } if (!trimSpec.equalsIgnoreCase(SQLConstants.Reserved.LEADING)) { string = rightTrim(string, trimChar.charAt(0)); Modified: trunk/engine/src/main/java/org/teiid/query/function/metadata/FunctionMetadataValidator.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/function/metadata/FunctionMetadataValidator.java 2012-05-31 20:36:33 UTC (rev 4154) +++ trunk/engine/src/main/java/org/teiid/query/function/metadata/FunctionMetadataValidator.java 2012-06-01 17:30:30 UTC (rev 4155) @@ -279,7 +279,7 @@ char ch = identifier.charAt(i); if(! Character.isJavaIdentifierPart(ch)) { if(! allowMultiple || ! (ch == '.')) { - throw new FunctionMetadataException(QueryPlugin.Event.TEIID30433, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30433,strName, new Character(ch))); + throw new FunctionMetadataException(QueryPlugin.Event.TEIID30431, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30431,strName, new Character(ch))); } } } Modified: trunk/engine/src/main/java/org/teiid/query/metadata/NativeMetadataRepository.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/metadata/NativeMetadataRepository.java 2012-05-31 20:36:33 UTC (rev 4154) +++ trunk/engine/src/main/java/org/teiid/query/metadata/NativeMetadataRepository.java 2012-06-01 17:30:30 UTC (rev 4155) @@ -54,7 +54,7 @@ try { unwrapped = ((WrappedConnection)connection).unwrap(); } catch (ResourceException e) { - throw new TranslatorException(QueryPlugin.Event.TEIID30480, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30480)); + throw new TranslatorException(QueryPlugin.Event.TEIID30477, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30477)); } } Modified: trunk/engine/src/main/java/org/teiid/query/metadata/TempMetadataAdapter.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/metadata/TempMetadataAdapter.java 2012-05-31 20:36:33 UTC (rev 4154) +++ trunk/engine/src/main/java/org/teiid/query/metadata/TempMetadataAdapter.java 2012-06-01 17:30:30 UTC (rev 4155) @@ -126,9 +126,7 @@ if(tempID != null) { return tempID; } - Object[] params = new Object[]{elementName}; - String msg = QueryPlugin.Util.getString("TempMetadataAdapter.Element_____{0}_____not_found._1", params); //$NON-NLS-1$ - throw new QueryMetadataException(QueryPlugin.Event.TEIID30350, msg); + throw new QueryMetadataException(QueryPlugin.Event.TEIID30350, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30350, elementName)); } /** @@ -151,9 +149,7 @@ if(tempID != null) { return tempID; } - Object[] params = new Object[]{groupName}; - String msg = QueryPlugin.Util.getString("TempMetadataAdapter.Group_____{0}_____not_found._1", params); //$NON-NLS-1$ - throw new QueryMetadataException(QueryPlugin.Event.TEIID30351, msg); + throw new QueryMetadataException(QueryPlugin.Event.TEIID30351, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30351, groupName)); } @Override Modified: trunk/engine/src/main/java/org/teiid/query/metadata/TransformationMetadata.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/metadata/TransformationMetadata.java 2012-05-31 20:36:33 UTC (rev 4154) +++ trunk/engine/src/main/java/org/teiid/query/metadata/TransformationMetadata.java 2012-06-01 17:30:30 UTC (rev 4155) @@ -478,7 +478,7 @@ Table tableRecord = (Table) groupID; if (!tableRecord.isVirtual()) { - throw new QueryMetadataException(QueryPlugin.Event.TEIID30359, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30359, tableRecord.getFullName())); + throw new QueryMetadataException(QueryPlugin.Event.TEIID30359, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30359, tableRecord.getFullName(), "Query")); //$NON-NLS-1$ } LiveTableQueryNode queryNode = new LiveTableQueryNode(tableRecord); @@ -497,7 +497,7 @@ ArgCheck.isInstanceOf(Table.class, groupID); Table tableRecordImpl = (Table)groupID; if (!tableRecordImpl.isVirtual()) { - throw new QueryMetadataException(QueryPlugin.Event.TEIID30360, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30360, tableRecordImpl.getFullName())); + throw new QueryMetadataException(QueryPlugin.Event.TEIID30359, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30359, tableRecordImpl.getFullName(), "Insert")); //$NON-NLS-1$ } return tableRecordImpl.isInsertPlanEnabled()?tableRecordImpl.getInsertPlan():null; } @@ -506,7 +506,7 @@ ArgCheck.isInstanceOf(Table.class, groupID); Table tableRecordImpl = (Table)groupID; if (!tableRecordImpl.isVirtual()) { - throw new QueryMetadataException(QueryPlugin.Event.TEIID30361, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30361,tableRecordImpl.getFullName())); + throw new QueryMetadataException(QueryPlugin.Event.TEIID30359, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30359, tableRecordImpl.getFullName(), "Update")); //$NON-NLS-1$ } return tableRecordImpl.isUpdatePlanEnabled()?tableRecordImpl.getUpdatePlan():null; } @@ -515,7 +515,7 @@ ArgCheck.isInstanceOf(Table.class, groupID); Table tableRecordImpl = (Table)groupID; if (!tableRecordImpl.isVirtual()) { - throw new QueryMetadataException(QueryPlugin.Event.TEIID30362, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30362,tableRecordImpl.getFullName())); + throw new QueryMetadataException(QueryPlugin.Event.TEIID30359, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30359, tableRecordImpl.getFullName(), "Delete")); //$NON-NLS-1$ } return tableRecordImpl.isDeletePlanEnabled()?tableRecordImpl.getDeletePlan():null; } Modified: trunk/engine/src/main/java/org/teiid/query/parser/QueryParser.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/parser/QueryParser.java 2012-05-31 20:36:33 UTC (rev 4154) +++ trunk/engine/src/main/java/org/teiid/query/parser/QueryParser.java 2012-06-01 17:30:30 UTC (rev 4155) @@ -158,9 +158,9 @@ return result; } - public CacheHint parseCacheHint(String sql) throws QueryParserException { + public CacheHint parseCacheHint(String sql) { if(sql == null || sql.length() == 0) { - throw new QueryParserException(QueryPlugin.Event.TEIID30380, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30380)); + return null; } return SQLParserUtil.getQueryCacheOption(sql); } @@ -194,7 +194,7 @@ } private QueryParserException convertParserException(ParseException pe) { - QueryParserException qpe = new QueryParserException(QueryPlugin.Util.getString("QueryParser.parsingError", getMessage(pe, 1, 10))); //$NON-NLS-1$ + QueryParserException qpe = new QueryParserException(QueryPlugin.Util.gs(QueryPlugin.Event.TEIID31100, getMessage(pe, 1, 10))); qpe.setParseException(pe); if (pe.currentToken == null) { pe.currentToken = parser.token; Modified: trunk/engine/src/main/java/org/teiid/query/processor/relational/ArrayTableNode.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/processor/relational/ArrayTableNode.java 2012-05-31 20:36:33 UTC (rev 4154) +++ trunk/engine/src/main/java/org/teiid/query/processor/relational/ArrayTableNode.java 2012-06-01 17:30:30 UTC (rev 4155) @@ -22,13 +22,11 @@ package org.teiid.query.processor.relational; -import java.lang.reflect.Array; import java.sql.SQLException; import java.util.ArrayList; import java.util.Collections; import java.util.Map; -import org.teiid.api.exception.query.FunctionExecutionException; import org.teiid.common.buffer.BlockedException; import org.teiid.common.buffer.BufferManager; import org.teiid.common.buffer.TupleBatch; @@ -37,6 +35,7 @@ import org.teiid.core.types.DataTypeManager; import org.teiid.core.types.TransformationException; import org.teiid.query.QueryPlugin; +import org.teiid.query.function.FunctionMethods; import org.teiid.query.processor.ProcessorDataManager; import org.teiid.query.sql.lang.ArrayTable; import org.teiid.query.sql.lang.TableFunctionReference.ProjectedColumn; @@ -92,27 +91,15 @@ Object array = getEvaluator(Collections.emptyMap()).evaluate(table.getArrayValue(), null); - if (!array.getClass().isArray()) { - if (array instanceof java.sql.Array) { - try { - array = ((java.sql.Array)array).getArray(); - } catch (SQLException e) { - throw new TeiidProcessingException(QueryPlugin.Event.TEIID30188, e); - } - } else { - throw new FunctionExecutionException(QueryPlugin.Event.TEIID30189, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30189, array.getClass())); - } - } - for (int output : projectionIndexes) { ProjectedColumn col = table.getColumns().get(output); try { - Object val = Array.get(array, output); + Object val = FunctionMethods.array_get(array, output + 1); tuple.add(DataTypeManager.transformValue(val, table.getColumns().get(output).getSymbol().getType())); } catch (TransformationException e) { throw new TeiidProcessingException(QueryPlugin.Event.TEIID30190, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30190, col.getName())); - } catch (ArrayIndexOutOfBoundsException e) { - throw new FunctionExecutionException(QueryPlugin.Event.TEIID30191, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30191, output + 1)); + } catch (SQLException e) { + throw new TeiidProcessingException(QueryPlugin.Event.TEIID30188, e); } } addBatchRow(tuple); Modified: trunk/engine/src/main/java/org/teiid/query/processor/relational/TextTableNode.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/processor/relational/TextTableNode.java 2012-05-31 20:36:33 UTC (rev 4154) +++ trunk/engine/src/main/java/org/teiid/query/processor/relational/TextTableNode.java 2012-06-01 17:30:30 UTC (rev 4155) @@ -450,7 +450,7 @@ } if (wasQualified && !qualified) { if (!Character.isWhitespace(chr)) { - throw new TeiidProcessingException(QueryPlugin.Event.TEIID30185, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30185, textLine, systemId)); + throw new TeiidProcessingException(QueryPlugin.Event.TEIID30183, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30183, textLine, systemId)); } //else just ignore } else { Modified: trunk/engine/src/main/java/org/teiid/query/resolver/command/ExecResolver.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/resolver/command/ExecResolver.java 2012-05-31 20:36:33 UTC (rev 4154) +++ trunk/engine/src/main/java/org/teiid/query/resolver/command/ExecResolver.java 2012-06-01 17:30:30 UTC (rev 4155) @@ -205,7 +205,7 @@ throw new QueryResolverException(QueryPlugin.Event.TEIID30141, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30141, namedExpressions.keySet(), expected)); } if (!postionalExpressions.isEmpty()) { - throw new QueryResolverException(QueryPlugin.Event.TEIID30142, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30142, inputParams, origInputs, storedProcedureCommand.getGroup().toString())); + throw new QueryResolverException(QueryPlugin.Event.TEIID30140, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30140, inputParams, origInputs, storedProcedureCommand.getGroup().toString())); } // Create temporary metadata that defines a group based on either the stored proc @@ -294,7 +294,7 @@ QueryNode plan = storedProcedureInfo.getQueryPlan(); if (plan.getQuery() == null) { - throw new QueryResolverException(QueryPlugin.Event.TEIID30146, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30146)); + throw new QueryResolverException(QueryPlugin.Event.TEIID30146, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30146, group)); } return plan.getQuery(); Modified: trunk/engine/src/main/java/org/teiid/query/resolver/util/ResolverUtil.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/resolver/util/ResolverUtil.java 2012-05-31 20:36:33 UTC (rev 4154) +++ trunk/engine/src/main/java/org/teiid/query/resolver/util/ResolverUtil.java 2012-06-01 17:30:30 UTC (rev 4155) @@ -711,9 +711,9 @@ // Check that type of the expression is same as the type of the // single projected symbol of the subquery - Class exprType = expression.getType(); + Class<?> exprType = expression.getType(); if(exprType == null) { - throw new QueryResolverException(QueryPlugin.Event.TEIID30092, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30092, expression)); + throw new QueryResolverException(QueryPlugin.Event.TEIID30075, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30075, expression)); } String exprTypeName = DataTypeManager.getDataTypeName(exprType); Modified: trunk/engine/src/main/java/org/teiid/query/resolver/util/ResolverVisitor.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/resolver/util/ResolverVisitor.java 2012-05-31 20:36:33 UTC (rev 4154) +++ trunk/engine/src/main/java/org/teiid/query/resolver/util/ResolverVisitor.java 2012-06-01 17:30:30 UTC (rev 4155) @@ -767,7 +767,7 @@ while(valIter.hasNext()) { Expression value = (Expression) valIter.next(); if(value.getType() == null) { - throw new QueryResolverException(QueryPlugin.Event.TEIID30076, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30076, value)); + throw new QueryResolverException(QueryPlugin.Event.TEIID30075, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30075, value)); } else if(! value.getType().equals(setType)) { throw new QueryResolverException(QueryPlugin.Event.TEIID30077, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30077, scrit)); } @@ -777,7 +777,7 @@ scrit.setExpression(ResolverUtil.convertExpression(scrit.getExpression(), exprTypeName, setTypeName, metadata)); } else { - throw new QueryResolverException(QueryPlugin.Event.TEIID30078, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30078, scrit)); + throw new QueryResolverException(QueryPlugin.Event.TEIID30077, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30077, scrit)); } } Modified: trunk/engine/src/main/java/org/teiid/query/util/CommandContext.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/util/CommandContext.java 2012-05-31 20:36:33 UTC (rev 4154) +++ trunk/engine/src/main/java/org/teiid/query/util/CommandContext.java 2012-06-01 17:30:30 UTC (rev 4155) @@ -424,11 +424,11 @@ public Object getFromContext(Expression expression) throws TeiidComponentException { if (variableContext == null || !(expression instanceof ElementSymbol)) { - throw new TeiidComponentException(QueryPlugin.Event.TEIID30348, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30348,expression, "No value was available")); //$NON-NLS-1$ + throw new TeiidComponentException(QueryPlugin.Event.TEIID30328, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30328, expression, QueryPlugin.Util.getString("Evaluator.no_value"))); //$NON-NLS-1$ } Object value = variableContext.getValue((ElementSymbol)expression); if (value == null && !variableContext.containsVariable((ElementSymbol)expression)) { - throw new TeiidComponentException(QueryPlugin.Event.TEIID30349, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30349,expression, "No value was available"));//$NON-NLS-1$ + throw new TeiidComponentException(QueryPlugin.Event.TEIID30328, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30328, expression, QueryPlugin.Util.getString("Evaluator.no_value"))); //$NON-NLS-1$ } return value; } Modified: trunk/engine/src/main/javacc/org/teiid/query/parser/SQLParser.jj =================================================================== --- trunk/engine/src/main/javacc/org/teiid/query/parser/SQLParser.jj 2012-05-31 20:36:33 UTC (rev 4154) +++ trunk/engine/src/main/javacc/org/teiid/query/parser/SQLParser.jj 2012-06-01 17:30:30 UTC (rev 4155) @@ -2805,7 +2805,7 @@ escStr=stringVal() { if (escStr.length() != 1) { - throw new ParseException(QueryPlugin.Util.getString("SQLParser.Invalid_char", type, escStr)); //$NON-NLS-1$ + throw new ParseException(QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30398, type, escStr)); //$NON-NLS-1$ } return Character.valueOf(escStr.charAt(0)); } @@ -3577,7 +3577,7 @@ if (expression instanceof Constant) { Object value = ((Constant)expression).getValue(); if (value instanceof String && ((String)value).length() != 1) { - throw new ParseException(QueryPlugin.Util.getString("SQLParser.Invalid_char", "TRIM CHAR", value)); //$NON-NLS-1$ + throw new ParseException(QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30398, "TRIM CHAR", value)); //$NON-NLS-1$ } } args.add(expression); Modified: trunk/engine/src/main/resources/org/teiid/query/i18n.properties =================================================================== --- trunk/engine/src/main/resources/org/teiid/query/i18n.properties 2012-05-31 20:36:33 UTC (rev 4154) +++ trunk/engine/src/main/resources/org/teiid/query/i18n.properties 2012-06-01 17:30:30 UTC (rev 4155) @@ -39,9 +39,6 @@ ERR.015.001.0044=Function metadata source is of invalid type: {0} TEIID30011=The function "{0}" will not be added because a function with the same name and signature already exists. TEIID30389=Unexpected exception while loading "{1}.{2}" for UDF "{0}" -FunctionTree.not_void=UDF "{0}" method "{1}" must not return void. -FunctionTree.not_public=UDF "{0}" method "{1}" must be public. -FunctionTree.not_static=UDF "{0}" method "{1}" must be static. TEIID30387=Could not load UDF "{0}", since its invocation class "{1}" could not be found. TEIID30388=UDF "{0}" could not loaded, since no method on class "{1}" with name "{2}" has a matching type signature. TEIID30424=Unable to represent average value from {0} / {1} @@ -51,7 +48,6 @@ TEIID30428=Type is unknown: {0} TEIID30430={0} exceeds maximum length of {1} TEIID30432={0} has invalid first character: {1} -TEIID30433={0} has invalid character: {1} TEIID30434={0} cannot end with a ''.'' TEIID30399=<start> value of {0} is invalid, which should never be less than zero or bigger than the length of original string {1} TEIID30400=<length> value of {0} is invalid, which should never less be than zero. @@ -66,8 +62,7 @@ # parser (005) -TEIID30380=Parser cannot parse an empty sql statement. -QueryParser.parsingError=Parsing error: {0} +TEIID31100=Parsing error: {0} QueryParser.nullSqlCrit=Parser cannot parse a null sql criteria. QueryParser.lexicalError=Lexical error: {0} QueryParser.nullSqlExpr=Parser cannot parse a null sql expression. @@ -76,7 +71,6 @@ # processor (006) TEIID30311=Unknown criteria type: {0} TEIID30312=Unable to evaluate {0} expression of {1} -TEIID30325=Unknown compare criteria operator: {0} TEIID30448=Failed to create regular expression from match pattern: {0}. {1} TEIID30323=Unable to evaluate expression of {0} TEIID30329=Unknown expression type: {0} @@ -87,19 +81,15 @@ # resolver (008) TEIID30112=Only one XML document may be specified in the FROM clause of a query. -TEIID30142=Incorrect number of parameters specified on the stored procedure {2} - expected {0} but got {1} TEIID30061={1} is not allowed on the view {0}: a procedure must be defined to handle the {1}. TEIID30127=INSERT statement must have the same number of elements and values specified. This statement has {0} elements and {1} values. TEIID30065=Error parsing query plan transformation for {0} -ERR.015.008.0013=Error parsing query plan transformation for {0} TEIID30136=Unable to resolve element: {0} TEIID30137=Element is ambiguous and must be qualified: {0} ERR.015.008.0022=Failed parsing reference binding: {0} ERR.015.008.0025=Binding reference cannot be a function: {0} TEIID30083=Expression ''{0}'' has a parameter with non-determinable type information. The use of an explicit convert may be necessary. TEIID30074=This criteria must have string or CLOB expressions on each side: {0} -TEIID30092=Type cannot be null for expression: {0} -TEIID30078=This criteria must have values only of the same type as the left expression: {0} TEIID30093=There must be exactly one projected symbol of the subquery: {0} TEIID30094=The left expression must have a type convertible to the type of the subquery projected symbol: {0} TEIID30067=Type was null for {0} in function {1} @@ -129,7 +119,6 @@ TEIID30134=Expressions cannot be selected by XML Queries TEIID30129=Aliased subquery contexts are not allowed: {0} TEIID30075=Type cannot be null for expression: {0} -TEIID30076=Type cannot be null for expression: {0} TEIID30077=This criteria must have values only of the same type as the left expression: {0} # sql (010) @@ -266,7 +255,6 @@ SQLParser.Invalid_id=Invalid metadata ID format: [{0}] SQLParser.Invalid_alias=Invalid alias format: [{0}] SQLParser.Invalid_short_name=Invalid simple identifier format: [{0}] -SQLParser.Invalid_char={0} value must be a single character: [{1}]. SQLParser.expected_non_reserved=Expected non-reserved word {0}, but was {1}. SQLParser.invalid_window=Cannot window a non-aggregate expression {0}. SQLParser.virtual_proc_def=Virtual procedure {0} must define the procedure after an ''AS'' keyword. @@ -656,8 +644,8 @@ SystemSource.decode_result=byte representation Blob SystemSource.session_id_desc=Returns the session id of the currently logged in user SystemSource.session_id_result=Returns the session id of the currently logged in user -TempMetadataAdapter.Element_____{0}_____not_found._1=Element ''{0}'' not found. -TempMetadataAdapter.Group_____{0}_____not_found._1=Group ''{0}'' not found. +TEIID30350=Element ''{0}'' not found. +TEIID30351=Group ''{0}'' not found. TEIID30341=Function {0} is marked in the function metadata as a function that must be evaluated at the source. TEIID30328=Unable to evaluate {0}: {1} XMLSerialize.resolvingError=XMLSerialize is valid only for XML expressions: {0} @@ -744,7 +732,6 @@ MappingLoader.unknown_node_type=Unknown Node Type "{0}" being loaded by the XML mapping document. MappingLoader.invalid_criteria_node=Invalid criteria node found; A criteria node must have criteria specified or it must be a default node. NoCriteria=Failed to add the node, because Criteria nodes must have "criteria" value set on them, or they need to be the default node. -TEIID30462=Root node assigned to a document can be null. TEIID30457=Found recursive node {0} without recursive root node. TEIID30152=Failed to evaluate XQuery expression; Please check the query and correct errors in syntax or usage. TEIID30154=Could not compile XQuery; Please check the query for syntax or usage errors. @@ -815,7 +802,6 @@ TEIID30176=Could not convert value for column {0} in the row ending on text line {1} in {2}. TEIID30181=HEADER entry missing for column name {0} in {1}. TEIID30182=Text parse error: Unclosed qualifier at end of text in {0}. -TEIID30185=Text parse error: Non-whitespace character found between the qualifier and the delimiter in text line {0} in {1}. TEIID30184=Text parse error: Unknown escape sequence \\{0} in text line {1} in {2}. TEIID30177=Text parse error: Fixed width line width {0} is smaller than the expected {1} on text line {2} in {3}. TEIID30178=Text parse error: Delimited line is longer than the expected max of {2} on text line {0} in {1}. @@ -877,7 +863,6 @@ TEIID30035=Wrong type of data found or no data found; expecting streamable object from the buffer manager. TEIID30027=An error occurred during streaming of Lob Chunks to Client. -TEIID30540=Client thread already involved in a transaction. Transaction nesting is not supported. The current transaction must be completed first. TransactionServer.no_transaction=No transaction found for client {0}. TEIID30525=Concurrent enlistment in global transaction {0} is not supported. TEIID30521=Expected an existing global transaction {0} but there was none for client {1} @@ -890,10 +875,7 @@ TransformationMetadata.does_not_exist._1=does not exist. TEIID30363=Error trying to read virtual document {0}, with body \n{1} TransformationMetadata.Unknown_support_constant___12=Unknown support constant: -TEIID30359=QueryPlan could not be found for physical group {0} -TEIID30360=InsertPlan could not be found for physical group {0} -TEIID30361=InsertPlan could not be found for physical group {0} -TEIID30362=DeletePlan could not be found for physical group {0} +TEIID30359={1} plan could not be found for physical group {0} TEIID30364=Error trying to read schemas for the document/table : {0} TransformationMetadata.Invalid_type=Invalid type: {0}. TransformationMetadata.does_not_exist._1=does not exist. @@ -901,9 +883,6 @@ TEIID30363=Error trying to read virtual document {0}, with body \n{1} TransformationMetadata.Unknown_support_constant___12=Unknown support constant: TEIID30359=QueryPlan could not be found for physical group -TEIID30360=InsertPlan could not be found for physical group -TEIID30361=InsertPlan could not be found for physical group -TEIID30362=DeletePlan could not be found for physical group TEIID30364=Error trying to read schemas for the document/table : TransformationMetadata.Invalid_type=Invalid type: {0}. TEIID30497=No connector with jndi-name {0} found for Model {1} with source name {2} @@ -914,7 +893,6 @@ not_found_cache=Failed to restore results, since batch entries were missing. The entry will be re-populated. TEIID30025=Failed to restore results. The entry will be re-populated. failed_to_cache=Failed to store the result set contents to disk. -TEIID30480=Failed to unwrap the source connection. TEIID30481=Failed to find the Connection Factory with JNDI name {0}. Please check the name or deploy the Connection Factory with specified name. TEIID31097=Connection Factory (no data source found) provided is null; Can not proceed with metadata load. @@ -967,18 +945,14 @@ TEIID30118=Cannot create temporary table "{0}". An object with the same name already exists. TEIID30121=Variable "{0}" is read only and cannot be assigned a value. TEIID30140= Incorrect number of parameters specified on the stored procedure {2} - expected {0} but got {1} -TEIID30146= {1} is not allowed on the view {0}: a procedure must be defined to handle the {1}. +TEIID30146= No procedure plan exists for {0}. TEIID30183=Text parse error: Non-whitespace character found between the qualifier and the delimiter in text line {0} in {1}. -TEIID30189=Expected a java.sql.Array, or java array type, but got: {0} -TEIID30191=Array index out of range: {0} TEIID30227=Table {0} is locked by pending transaction update. -TEIID30240=Could not determine INSERT target for a partitioned UNION view {0} with values {1}. +TEIID30240=Conflicting INSERT target for a partitioned UNION view {0} with values {1}. TEIID30253=Source UPDATE or DELETE command "{0}" contains non-pushdown constructs and no compensating action can be taken as the table lacks a unique key or the source does not support equality predicates. TEIID30275=Join region with unsatisfied access patterns cannot be satisfied by the join criteria, Access patterns: {0} TEIID30314=Unknown compare criteria operator: {0} -TEIID30346=Unable to evaluate {0}: {1} -TEIID30348=Unable to evaluate {0}: {1} -TEIID30349=Unable to evaluate {0}: {1} +Evaluator.no_value=No value was available TEIID30375=The specified insert variables {0} against an inherently updatable view does not map to a key preserving group. TEIID30377=Parser cannot parse an empty sql statement. TEIID30390=UDF "{0}" method "{1}" must not return void. @@ -993,17 +967,13 @@ TEIID30416=Expected a java.sql.Array, or java array type, but got: {0} TEIID30431={0} has invalid character: {1} TEIID30449=Invalid escape sequence "{0}" with escape character "{1}" -TEIID30451=Unable to evaluate {0}: {1} TEIID30452=Wrong type of child node is being added. -TEIID30461=Root node assigned to a document can be null. TEIID30477=Failed to unwrap the source connection. TEIID30563=The request {0} has been cancelled.======= TEIID30564=Invalid locale {0} for collation, using default collation TEIID30565=Using collator for locale {0} TEIID30499=No sources were given for the model {0} -TEIID30523=Client thread already involved in a transaction. Transaction nesting is not supported. The current transaction must be completed first. TEIID30519=Unknown START flags -TransactionServer.existing_transaction=Client thread already involved in a transaction. Transaction nesting is not supported. The current transaction must be completed first. TEIID30517=Client thread already involved in a transaction. Transaction nesting is not supported. The current transaction must be completed first. TEIID30580=Invalid schema from translator metadata expected {0}, but the returned MetadataStore contained no such schema or more than 1 schema. Modified: trunk/engine/src/test/java/org/teiid/cdk/CommandBuilder.java =================================================================== --- trunk/engine/src/test/java/org/teiid/cdk/CommandBuilder.java 2012-05-31 20:36:33 UTC (rev 4154) +++ trunk/engine/src/test/java/org/teiid/cdk/CommandBuilder.java 2012-06-01 17:30:30 UTC (rev 4155) @@ -38,6 +38,7 @@ import org.teiid.query.sql.lang.Command; import org.teiid.query.sql.lang.Query; import org.teiid.query.sql.lang.Select; +import org.teiid.query.sql.symbol.Expression; import org.teiid.query.sql.symbol.MultipleElementSymbol; @@ -86,10 +87,10 @@ if (command instanceof Query) { Query query = (Query) command; Select select = query.getSelect(); - List originalSymbols = select.getSymbols(); - List expandedSymbols = new ArrayList(); - for (Iterator i = originalSymbols.iterator(); i.hasNext(); ) { - Object next = i.next(); + List<Expression> originalSymbols = select.getSymbols(); + List<Expression> expandedSymbols = new ArrayList<Expression>(); + for (Iterator<Expression> i = originalSymbols.iterator(); i.hasNext(); ) { + Expression next = i.next(); if (next instanceof MultipleElementSymbol) { MultipleElementSymbol allSymbol = (MultipleElementSymbol) next; expandedSymbols.addAll(allSymbol.getElementSymbols()); Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestTransactionServer.java =================================================================== --- trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestTransactionServer.java 2012-05-31 20:36:33 UTC (rev 4154) +++ trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestTransactionServer.java 2012-06-01 17:30:30 UTC (rev 4155) @@ -76,7 +76,7 @@ server.start(THREAD1, XID1, XAResource.TMNOFLAGS, 100, false); fail("exception expected"); //$NON-NLS-1$ } catch (XATransactionException ex) { - assertEquals("TEIID30523 Client thread already involved in a transaction. Transaction nesting is not supported. The current transaction must be completed first.", //$NON-NLS-1$ + assertEquals("TEIID30517 Client thread already involved in a transaction. Transaction nesting is not supported. The current transaction must be completed first.", //$NON-NLS-1$ ex.getMessage()); } } @@ -91,7 +91,7 @@ server.begin(THREAD1); fail("exception expected"); //$NON-NLS-1$ } catch (XATransactionException ex) { - assertEquals("TEIID30526 javax.transaction.InvalidTransactionException: Client thread already involved in a transaction. Transaction nesting is not supported. The current transaction must be completed first.", //$NON-NLS-1$ + assertEquals("TEIID30517 Client thread already involved in a transaction. Transaction nesting is not supported. The current transaction must be completed first.", //$NON-NLS-1$ ex.getMessage()); } } @@ -120,7 +120,7 @@ server.start(THREAD1, XID2, XAResource.TMNOFLAGS, 100,false); fail("exception expected"); //$NON-NLS-1$ } catch (XATransactionException ex) { - assertEquals("TEIID30523 Client thread already involved in a transaction. Transaction nesting is not supported. The current transaction must be completed first.", //$NON-NLS-1$ + assertEquals("TEIID30517 Client thread already involved in a transaction. Transaction nesting is not supported. The current transaction must be completed first.", //$NON-NLS-1$ ex.getMessage()); } } @@ -135,7 +135,7 @@ server.begin(THREAD1); fail("exception expected"); //$NON-NLS-1$ } catch (XATransactionException ex) { - assertEquals("TEIID30526 javax.transaction.InvalidTransactionException: Client thread already involved in a transaction. Transaction nesting is not supported. The current transaction must be completed first.", //$NON-NLS-1$ + assertEquals("TEIID30517 Client thread already involved in a transaction. Transaction nesting is not supported. The current transaction must be completed first.", //$NON-NLS-1$ ex.getMessage()); } } Modified: trunk/engine/src/test/java/org/teiid/query/parser/TestParser.java =================================================================== --- trunk/engine/src/test/java/org/teiid/query/parser/TestParser.java 2012-05-31 20:36:33 UTC (rev 4154) +++ trunk/engine/src/test/java/org/teiid/query/parser/TestParser.java 2012-06-01 17:30:30 UTC (rev 4155) @@ -49,7 +49,7 @@ import org.teiid.query.sql.symbol.*; import org.teiid.query.sql.util.SymbolMap; -@SuppressWarnings("nls") +@SuppressWarnings({"nls", "unchecked"}) public class TestParser { static void helpTest(String sql, String expectedString, Command expectedCommand) { @@ -2664,7 +2664,7 @@ } @Test public void testLikeWithEscapeException(){ - helpException("SELECT a from db.g where b like '#String' escape '#1'", "Parsing error: LIKE/SIMILAR TO ESCAPE value must be a single character: [#1]."); //$NON-NLS-1$ //$NON-NLS-2$ + helpException("SELECT a from db.g where b like '#String' escape '#1'", "TEIID31100 Parsing error: TEIID30398 LIKE/SIMILAR TO ESCAPE value must be a single character: [#1]."); //$NON-NLS-1$ //$NON-NLS-2$ } /** SELECT "date"."time" from db.g */ @@ -3238,7 +3238,7 @@ //using clause should use short names @Test public void testDynamicCommandStatement3(){ - helpException("create virtual procedure begin execute string z as a1 string, a2 integer into #g using variables.x=variables.y; end", "Parsing error: Invalid simple identifier format: [variables.x]"); //$NON-NLS-1$ //$NON-NLS-2$ + helpException("create virtual procedure begin execute string z as a1 string, a2 integer into #g using variables.x=variables.y; end", "TEIID31100 Parsing error: Invalid simple identifier format: [variables.x]"); //$NON-NLS-1$ //$NON-NLS-2$ } //into clause requires as clause @@ -4740,7 +4740,7 @@ try { QueryParser.getQueryParser().parseCommand("SELECT FROM"); //$NON-NLS-1$ } catch(QueryParserException e) { - assertTrue(e.getMessage().startsWith("Parsing error: Encountered \"FROM\" at line 1, column 8.")); //$NON-NLS-1$ + assertTrue(e.getMessage().startsWith("TEIID31100 Parsing error: Encountered \"FROM\" at line 1, column 8.")); //$NON-NLS-1$ } } @@ -4789,7 +4789,7 @@ } @Test public void testCreateTempTable7() { - helpException("Create local TEMPORARY table tempTable (c1.x boolean, c2 byte)" ,"Parsing error: Invalid simple identifier format: [c1.x]"); //$NON-NLS-1$ //$NON-NLS-2$ + helpException("Create local TEMPORARY table tempTable (c1.x boolean, c2 byte)" ,"TEIID31100 Parsing error: Invalid simple identifier format: [c1.x]"); //$NON-NLS-1$ //$NON-NLS-2$ } @Test public void testCreateTempTableWithPrimaryKey() { @@ -4835,7 +4835,7 @@ @Test public void testBadAlias() { String sql = "select a as a.x from foo"; //$NON-NLS-1$ - helpException(sql, "Parsing error: Invalid alias format: [a.x]"); //$NON-NLS-1$ + helpException(sql, "TEIID31100 Parsing error: Invalid alias format: [a.x]"); //$NON-NLS-1$ } @Test public void testNameSpacedFunctionName() { @@ -5064,7 +5064,7 @@ } @Test public void testTextTableColumns() throws Exception { - helpException("SELECT * from texttable(foo x string)", "Parsing error: Expected non-reserved word [COLUMNS], but was x."); + helpException("SELECT * from texttable(foo x string)", "TEIID31100 Parsing error: Expected non-reserved word [COLUMNS], but was x."); } @Test public void testXMLTable() throws Exception { Modified: trunk/engine/src/test/java/org/teiid/query/processor/eval/TestExpressionEvaluator.java =================================================================== --- trunk/engine/src/test/java/org/teiid/query/processor/eval/TestExpressionEvaluator.java 2012-05-31 20:36:33 UTC (rev 4154) +++ trunk/engine/src/test/java/org/teiid/query/processor/eval/TestExpressionEvaluator.java 2012-06-01 17:30:30 UTC (rev 4155) @@ -184,7 +184,7 @@ fail("Exception expected"); //$NON-NLS-1$ } catch (TeiidComponentException e){ //this should be a componentexception, since it is unexpected - assertEquals(e.getMessage(), "TEIID30346 Unable to evaluate e2: No value was available"); //$NON-NLS-1$ + assertEquals("TEIID30328 Unable to evaluate e2: No value was available", e.getMessage()); //$NON-NLS-1$ } } Modified: trunk/engine/src/test/java/org/teiid/query/resolver/TestResolver.java =================================================================== --- trunk/engine/src/test/java/org/teiid/query/resolver/TestResolver.java 2012-05-31 20:36:33 UTC (rev 4154) +++ trunk/engine/src/test/java/org/teiid/query/resolver/TestResolver.java 2012-06-01 17:30:30 UTC (rev 4155) @@ -2136,7 +2136,7 @@ } @Test public void testParameterError() throws Exception { - helpResolveException("EXEC pm1.sp2(1, 2)", metadata, "TEIID30142 Incorrect number of parameters specified on the stored procedure pm1.sp2 - expected 1 but got 2"); //$NON-NLS-1$ //$NON-NLS-2$ + helpResolveException("EXEC pm1.sp2(1, 2)", metadata, "TEIID30140 Incorrect number of parameters specified on the stored procedure pm1.sp2 - expected 1 but got 2"); //$NON-NLS-1$ //$NON-NLS-2$ } @Test public void testUnionOfAliasedLiteralsGetsModified() { @@ -2640,7 +2640,7 @@ @Test public void testCallableStatementTooManyParameters() throws Exception { String sql = "{call pm4.spTest9(?, ?)}"; //$NON-NLS-1$ - TestResolver.helpResolveException(sql, RealMetadataFactory.exampleBQTCached(), "TEIID30142 Incorrect number of parameters specified on the stored procedure pm4.spTest9 - expected 1 but got 2"); //$NON-NLS-1$ + TestResolver.helpResolveException(sql, RealMetadataFactory.exampleBQTCached(), "TEIID30140 Incorrect number of parameters specified on the stored procedure pm4.spTest9 - expected 1 but got 2"); //$NON-NLS-1$ } @Test public void testUpdateSetClauseReferenceType() { Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/IntegrationPlugin.java =================================================================== --- trunk/jboss-integration/src/main/java/org/teiid/jboss/IntegrationPlugin.java 2012-05-31 20:36:33 UTC (rev 4154) +++ trunk/jboss-integration/src/main/java/org/teiid/jboss/IntegrationPlugin.java 2012-06-01 17:30:30 UTC (rev 4155) @@ -96,7 +96,6 @@ TEIID50065, TEIID50066, TEIID50067, - TEIID50068, TEIID50069, TEIID50070, TEIID50071, Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBDeployer.java =================================================================== --- trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBDeployer.java 2012-05-31 20:36:33 UTC (rev 4154) +++ trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBDeployer.java 2012-06-01 17:30:30 UTC (rev 4155) @@ -313,7 +313,7 @@ } else { // if the schema type is a module based - current = getModuleBasedMetadataRepository(model.getName(), repoType); + current = getModuleBasedMetadataRepository(repoType); } if (current != null) { @@ -331,7 +331,7 @@ return first; } - private MetadataRepository getModuleBasedMetadataRepository(final String modelName, final String moduleName) throws DeploymentUnitProcessingException { + private MetadataRepository getModuleBasedMetadataRepository(final String moduleName) throws DeploymentUnitProcessingException { final Module module; ClassLoader moduleLoader = this.getClass().getClassLoader(); ModuleLoader ml = Module.getCallerModuleLoader(); @@ -340,7 +340,7 @@ module = ml.loadModule(ModuleIdentifier.create(moduleName)); moduleLoader = module.getClassLoader(); } catch (ModuleLoadException e) { - throw new DeploymentUnitProcessingException(IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50068, moduleName, modelName)); + throw new DeploymentUnitProcessingException(IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50057, moduleName)); } } Modified: trunk/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties =================================================================== --- trunk/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties 2012-05-31 20:36:33 UTC (rev 4154) +++ trunk/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties 2012-06-01 17:30:30 UTC (rev 4155) @@ -45,7 +45,6 @@ admin_executing=CLI admin {0} is executing command {1} TEIID50008=Error loading the Translator {0}. Execution Factory class is not valid class or not defined. TEIID50057=Failed to load module "{0}" -TEIID50068=Failed to load module "{0}" translator.add=Add Translator translator.remove=Remove Translator TEIID50011=Security enabled for transport "{1}" with security-domain set to {0} Modified: trunk/runtime/src/main/java/org/teiid/deployers/SystemVDBDeployer.java =================================================================== --- trunk/runtime/src/main/java/org/teiid/deployers/SystemVDBDeployer.java 2012-05-31 20:36:33 UTC (rev 4154) +++ trunk/runtime/src/main/java/org/teiid/deployers/SystemVDBDeployer.java 2012-06-01 17:30:30 UTC (rev 4155) @@ -70,7 +70,7 @@ } catch (URISyntaxException e) { throw new TeiidRuntimeException(RuntimePlugin.Event.TEIID40022, e, RuntimePlugin.Util.gs(RuntimePlugin.Event.TEIID40022)); } catch (IOException e) { - throw new TeiidRuntimeException(RuntimePlugin.Event.TEIID40023, e, RuntimePlugin.Util.gs(RuntimePlugin.Event.TEIID40023)); + throw new TeiidRuntimeException(RuntimePlugin.Event.TEIID40022, e, RuntimePlugin.Util.gs(RuntimePlugin.Event.TEIID40022)); } } Modified: trunk/runtime/src/main/java/org/teiid/deployers/TranslatorUtil.java =================================================================== --- trunk/runtime/src/main/java/org/teiid/deployers/TranslatorUtil.java 2012-05-31 20:36:33 UTC (rev 4154) +++ trunk/runtime/src/main/java/org/teiid/deployers/TranslatorUtil.java 2012-06-01 17:30:30 UTC (rev 4155) @@ -223,7 +223,7 @@ } } } else if (method.getParameterTypes().length != 0) { - throw new TeiidRuntimeException(RuntimePlugin.Event.TEIID40030, RuntimePlugin.Util.gs(RuntimePlugin.Event.TEIID40030, method)); + throw new TeiidRuntimeException(RuntimePlugin.Event.TEIID40029, RuntimePlugin.Util.gs(RuntimePlugin.Event.TEIID40029, method)); } else { getter = method; try { Modified: trunk/runtime/src/main/java/org/teiid/deployers/VDBRepository.java =================================================================== --- trunk/runtime/src/main/java/org/teiid/deployers/VDBRepository.java 2012-05-31 20:36:33 UTC (rev 4154) +++ trunk/runtime/src/main/java/org/teiid/deployers/VDBRepository.java 2012-06-01 17:30:30 UTC (rev 4155) @@ -80,7 +80,7 @@ // get the system VDB metadata store if (this.systemStore == null) { - throw new VirtualDatabaseException(RuntimePlugin.Event.TEIID40036, RuntimePlugin.Util.gs(RuntimePlugin.Event.TEIID40036)); + throw new VirtualDatabaseException(RuntimePlugin.Event.TEIID40022, RuntimePlugin.Util.gs(RuntimePlugin.Event.TEIID40022)); } if (this.odbcEnabled && odbcStore == null) { @@ -298,7 +298,7 @@ else { metdataAwareVDB.setStatus(VDB.Status.INVALID); } - LogManager.logInfo(LogConstants.CTX_RUNTIME, (VDB.Status.ACTIVE == metdataAwareVDB.getStatus())?RuntimePlugin.Util.gs(RuntimePlugin.Event.TEIID40003,name, version):RuntimePlugin.Util.gs(RuntimePlugin.Event.TEIID40006,name, version)); + LogManager.logInfo(LogConstants.CTX_RUNTIME, RuntimePlugin.Util.gs(RuntimePlugin.Event.TEIID40003,name, version, metdataAwareVDB.getStatus())); notifyFinished(name, version, v); } } Modified: trunk/runtime/src/main/java/org/teiid/deployers/VDBStatusChecker.java =================================================================== --- trunk/runtime/src/main/java/org/teiid/deployers/VDBStatusChecker.java 2012-05-31 20:36:33 UTC (rev 4154) +++ trunk/runtime/src/main/java/org/teiid/deployers/VDBStatusChecker.java 2012-06-01 17:30:30 UTC (rev 4155) @@ -181,7 +181,7 @@ } else { vdb.setStatus(VDB.Status.LOADING); } - LogManager.logInfo(LogConstants.CTX_RUNTIME, RuntimePlugin.Util.gs(RuntimePlugin.Event.TEIID40003,vdb.getName(), vdb.getVersion())); + LogManager.logInfo(LogConstants.CTX_RUNTIME, RuntimePlugin.Util.gs(RuntimePlugin.Event.TEIID40003,vdb.getName(), vdb.getVersion(), vdb.getStatus())); } } } @@ -205,7 +205,7 @@ } model.addError(ModelMetaData.ValidationError.Severity.ERROR.name(), msg); LogManager.logInfo(LogConstants.CTX_RUNTIME, msg); - LogManager.logInfo(LogConstants.CTX_RUNTIME, RuntimePlugin.Util.gs(RuntimePlugin.Event.TEIID40006,vdb.getName(), vdb.getVersion())); + LogManager.logInfo(LogConstants.CTX_RUNTIME, RuntimePlugin.Util.gs(RuntimePlugin.Event.TEIID40003,vdb.getName(), vdb.getVersion(), vdb.getStatus())); } } } Modified: trunk/runtime/src/main/java/org/teiid/runtime/RuntimePlugin.java =================================================================== --- trunk/runtime/src/main/java/org/teiid/runtime/RuntimePlugin.java 2012-05-31 20:36:33 UTC (rev 4154) +++ trunk/runtime/src/main/java/org/teiid/runtime/RuntimePlugin.java 2012-06-01 17:30:30 UTC (rev 4155) @@ -34,9 +34,8 @@ public static enum Event implements BundleUtil.Event{ TEIID40001, // undefined translator properties TEIID40002, // failed to load ODBC metadata - TEIID40003, // VDB Active + TEIID40003, // VDB status TEIID40005, // datasource or translator not found - TEIID40006, // VDB inactive TEIID40007, // keep alive failed TEIID40008, // expired session TEIID40009, // terminate session @@ -51,24 +50,18 @@ TEIID40020, TEIID40021, TEIID40022, - TEIID40023, TEIID40024, TEIID40025, TEIID40026, TEIID40027, TEIID40028, TEIID40029, - TEIID40030, TEIID40031, TEIID40032, TEIID40033, TEIID40034, TEIID40035, - TEIID40036, - TEIID40037, - TEIID40038, TEIID40039, - TEIID40040, TEIID40041, TEIID40042, TEIID40043, @@ -84,15 +77,11 @@ TEIID40055, TEIID40056, TEIID40057, - TEIID40058, TEIID40059, - TEIID40060, - TEIID40061, TEIID40062, TEIID40063, TEIID40064, TEIID40065, - TEIID40066, TEIID40067, TEIID40068, TEIID40069, Modified: trunk/runtime/src/main/java/org/teiid/services/BufferServiceImpl.java =================================================================== --- trunk/runtime/src/main/java/org/teiid/services/BufferServiceImpl.java 2012-05-31 20:36:33 UTC (rev 4154) +++ trunk/runtime/src/main/java/org/teiid/services/BufferServiceImpl.java 2012-06-01 17:30:30 UTC (rev 4155) @@ -131,7 +131,7 @@ } catch(TeiidComponentException e) { throw new TeiidRuntimeException(RuntimePlugin.Event.TEIID40039, e, RuntimePlugin.Util.gs(RuntimePlugin.Event.TEIID40039)); } catch(IOException e) { - throw new TeiidRuntimeException(RuntimePlugin.Event.TEIID40040, e, RuntimePlugin.Util.gs(RuntimePlugin.Event.TEIID40040)); + throw new TeiidRuntimeException(RuntimePlugin.Event.TEIID40039, e, RuntimePlugin.Util.gs(RuntimePlugin.Event.TEIID40039)); } } Modified: trunk/runtime/src/main/java/org/teiid/transport/LogonImpl.java =================================================================== --- trunk/runtime/src/main/java/org/teiid/transport/LogonImpl.java 2012-05-31 20:36:33 UTC (rev 4154) +++ trunk/runtime/src/main/java/org/teiid/transport/LogonImpl.java 2012-06-01 17:30:30 UTC (rev 4155) @@ -77,7 +77,7 @@ } if (!AuthenticationType.CLEARTEXT.equals(service.getAuthenticationType())) { - throw new LogonException(RuntimePlugin.Event.TEIID40055, RuntimePlugin.Util.gs(RuntimePlugin.Event.TEIID40055)); + throw new LogonException(RuntimePlugin.Event.TEIID40055, RuntimePlugin.Util.gs(RuntimePlugin.Event.TEIID40055, "JAAS")); //$NON-NLS-1$ } return logon(connProps, null); } @@ -154,7 +154,7 @@ public LogonResult neogitiateGssLogin(Properties connProps, byte[] serviceTicket, boolean createSession) throws LogonException { if (!AuthenticationType.GSS.equals(service.getAuthenticationType())) { - throw new LogonException(RuntimePlugin.Event.TEIID40058, RuntimePlugin.Util.gs(RuntimePlugin.Event.TEIID40058)); + throw new LogonException(RuntimePlugin.Event.TEIID40055, RuntimePlugin.Util.gs(RuntimePlugin.Event.TEIID40055, "Kerberos")); //$NON-NLS-1$ } String user = connProps.getProperty(TeiidURL.CONNECTION.USER_NAME); @@ -172,7 +172,7 @@ Subject subject = ctx.getSubject(); GSSResult result = Subject.doAs(subject, new GssAction(serviceTicket)); if (result == null) { - throw new LogonException(RuntimePlugin.Event.TEIID40060, RuntimePlugin.Util.gs(RuntimePlugin.Event.TEIID40060)); + throw new LogonException(RuntimePlugin.Event.TEIID40014, RuntimePlugin.Util.gs(RuntimePlugin.Event.TEIID40014)); } if (result.context.isEstablished()) { @@ -199,7 +199,7 @@ LogonResult loginInResult = logon(connProps, result.serviceTicket); return loginInResult; } catch (LoginException e) { - throw new LogonException(RuntimePlugin.Event.TEIID40061, e, RuntimePlugin.Util.gs(RuntimePlugin.Event.TEIID40061)); + throw new LogonException(RuntimePlugin.Event.TEIID40014, e, RuntimePlugin.Util.gs(RuntimePlugin.Event.TEIID40014)); } finally { if (associated) { service.getSecurityHelper().associateSecurityContext(previous); Modified: trunk/runtime/src/main/java/org/teiid/transport/SocketConfiguration.java =================================================================== --- trunk/runtime/src/main/java/org/teiid/transport/SocketConfiguration.java 2012-05-31 20:36:33 UTC (rev 4154) +++ trunk/runtime/src/main/java/org/teiid/transport/SocketConfiguration.java 2012-06-01 17:30:30 UTC (rev 4155) @@ -113,7 +113,7 @@ } return addr; } catch (UnknownHostException e) { - throw new TeiidRuntimeException(RuntimePlugin.Event.TEIID40066, RuntimePlugin.Util.gs(RuntimePlugin.Event.TEIID40066)); + throw new TeiidRuntimeException(RuntimePlugin.Event.TEIID40065, RuntimePlugin.Util.gs(RuntimePlugin.Event.TEIID40065)); } } Modified: trunk/runtime/src/main/resources/org/teiid/runtime/i18n.properties =================================================================== --- trunk/runtime/src/main/resources/org/teiid/runtime/i18n.properties 2012-05-31 20:36:33 UTC (rev 4154) +++ trunk/runtime/src/main/resources/org/teiid/runtime/i18n.properties 2012-06-01 17:30:30 UTC (rev 4155) @@ -20,7 +20,6 @@ # 02110-1301 USA. # -TEIID40040=Failed initializing buffer manager. TEIID40039=Failed initializing buffer manager. TEIID40046=VDB \"{0}\" version \"{1}\" does not exist. TEIID40047=VDB \"{0}\" version \"{1}\" is not in the "active" status. @@ -41,18 +40,13 @@ TEIID40052=Invalid session key used during handshake SSLAwareChannelHandler.channel_closed=Channel closed TEIID40065=Failed to resolve the bind address -TEIID40066=Failed to resolve the bind address -TEIID40003=VDB {0}.{1} is set to "active" -TEIID40006=VDB {0}.{1} is set to "inactive" -TEIID40036=System.vdb needs to be loaded before any other VDBs. +TEIID40003=VDB {0}.{1} is set to {2} TEIID40013=Replication failed for {0} TEIID40075=User Defined Function (UDF) model "{0}" not found in the VDB TEIID40035=VDB with given name and version already exists! {0}.{1} TEIID40021=System.vdb not found in classpath -TEIID40037=VDB {0}.{1} not found deployed. -TEIID40038=VDB {0}.{1} not found deployed. TEIID40005=For {0}.{1} VDB, Translator "{2}" not found. TEIID40012=For {0}.{1} VDB, Data Source "{2}" not found. TEIID40076=For {0}.{1} VDB, Data Source "{2}" replaced with "{3}" @@ -73,10 +67,7 @@ TEIID40016=Could not initialize ODBC SSL. non-SSL connections will still be allowed. TEIID40015=Unexpected error occurred -TEIID40055=Wrong logon method is being used. Server is not set up for JAAS based authentication. Correct your client's 'AuthenticationType' property. -TEIID40058=Wrong logon method is being used. Server is not set up for Kerberos based authentication. Correct your client's 'AuthenticationType' property. -TEIID40060=Kerberos context login failed -TEIID40061=Kerberos context login failed +TEIID40055=Wrong logon method is being used. Server is not set up for {1} based authentication. Correct your client's 'AuthenticationType' property. TEIID40059=No security domain configured for Kerberos authentication. Can not authenticate. TEIID40054=GSS authentication is in use, however authenticated user not found in the context to proceed. auth_type=Authentication Type set to {0} for security-domains {1} @@ -84,10 +75,8 @@ TEIID40018=Exception terminitating session TEIID40020=Error occurred TEIID40034=The description field = {0} does not end with \"}\"" -TEIID40023=System.vdb needs to be loaded before any other VDBs. -TEIID40022=System.vdb needs to be loaded before any other VDBs. +TEIID40022=System.vdb failed to load. TEIID40029=TranslatorProperty annotation should be placed on valid getter or setter method, {0} is not valid. -TEIID40030=TranslatorProperty annotation should be placed on valid getter or setter method, {0} is not valid. TEIID40031=TranslatorProperty annotation should not both be advanced and required TEIID40032=Translator {2} not found in repository for VDB {0}.{1} TEIID40041=Invalid null Session