Author: rareddy Date: 2012-05-02 11:00:34 -0400 (Wed, 02 May 2012) New Revision: 4048 Modified: branches/8.0.x/admin/src/main/java/org/teiid/adminapi/AdminFactory.java branches/8.0.x/admin/src/main/java/org/teiid/adminapi/AdminPlugin.java branches/8.0.x/api/src/main/java/org/teiid/connector/DataPlugin.java branches/8.0.x/api/src/main/java/org/teiid/translator/ExecutionFactory.java branches/8.0.x/client/src/main/java/org/teiid/gss/MakeGSS.java branches/8.0.x/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java branches/8.0.x/common-core/src/main/java/org/teiid/core/CorePlugin.java branches/8.0.x/common-core/src/main/java/org/teiid/core/types/basic/BlobToBinaryTransform.java branches/8.0.x/common-core/src/main/java/org/teiid/core/types/basic/ClobToStringTransform.java branches/8.0.x/common-core/src/main/java/org/teiid/core/types/basic/ObjectToAnyTransform.java branches/8.0.x/common-core/src/main/java/org/teiid/core/types/basic/SQLXMLToStringTransform.java branches/8.0.x/common-core/src/main/resources/org/teiid/core/i18n.properties branches/8.0.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCPlugin.java branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/impl/BufferFrontedFileStoreCache.java branches/8.0.x/engine/src/main/java/org/teiid/dqp/internal/process/TransactionServerImpl.java branches/8.0.x/engine/src/main/java/org/teiid/query/QueryPlugin.java branches/8.0.x/engine/src/main/java/org/teiid/query/eval/Evaluator.java branches/8.0.x/engine/src/main/java/org/teiid/query/function/FunctionDescriptor.java branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/FrameUtil.java branches/8.0.x/engine/src/main/java/org/teiid/query/processor/DdlPlan.java branches/8.0.x/engine/src/main/java/org/teiid/query/xquery/saxon/XQueryEvaluator.java branches/8.0.x/engine/src/main/resources/org/teiid/query/i18n.properties branches/8.0.x/jboss-integration/src/main/java/org/teiid/jboss/IntegrationPlugin.java branches/8.0.x/jboss-integration/src/main/java/org/teiid/jboss/TeiidOperationHandler.java branches/8.0.x/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java branches/8.0.x/runtime/src/main/java/org/teiid/runtime/RuntimePlugin.java branches/8.0.x/runtime/src/main/resources/org/teiid/runtime/i18n.properties Log: TEIID-1889: fixing the missing keys when same message used by two events Modified: branches/8.0.x/admin/src/main/java/org/teiid/adminapi/AdminFactory.java =================================================================== --- branches/8.0.x/admin/src/main/java/org/teiid/adminapi/AdminFactory.java 2012-05-01 19:12:27 UTC (rev 4047) +++ branches/8.0.x/admin/src/main/java/org/teiid/adminapi/AdminFactory.java 2012-05-02 15:00:34 UTC (rev 4048) @@ -619,7 +619,7 @@ } catch (OperationFormatException e) { throw new AdminProcessingException(AdminPlugin.Event.TEIID70011, e, e.getMessage()); } catch (IOException e) { - throw new AdminProcessingException(AdminPlugin.Event.TEIID70012, e, e.getMessage()); + throw new AdminProcessingException(AdminPlugin.Event.TEIID70011, e, e.getMessage()); } } Modified: branches/8.0.x/admin/src/main/java/org/teiid/adminapi/AdminPlugin.java =================================================================== --- branches/8.0.x/admin/src/main/java/org/teiid/adminapi/AdminPlugin.java 2012-05-01 19:12:27 UTC (rev 4047) +++ branches/8.0.x/admin/src/main/java/org/teiid/adminapi/AdminPlugin.java 2012-05-02 15:00:34 UTC (rev 4048) @@ -32,8 +32,6 @@ public static enum Event implements BundleUtil.Event { TEIID70000, - TEIID70001, - TEIID70002, TEIID70003, TEIID70004, TEIID70005, @@ -43,14 +41,11 @@ TEIID70009, TEIID70010, TEIID70011, - TEIID70012, TEIID70013, TEIID70014, TEIID70015, TEIID70016, TEIID70017, - TEIID70018, - TEIID70019, TEIID70020, TEIID70021, TEIID70022, Modified: branches/8.0.x/api/src/main/java/org/teiid/connector/DataPlugin.java =================================================================== --- branches/8.0.x/api/src/main/java/org/teiid/connector/DataPlugin.java 2012-05-01 19:12:27 UTC (rev 4047) +++ branches/8.0.x/api/src/main/java/org/teiid/connector/DataPlugin.java 2012-05-02 15:00:34 UTC (rev 4048) @@ -40,8 +40,6 @@ TEIID60003, TEIID60004, TEIID60005, - TEIID60006, - TEIID60007, TEIID60008, TEIID60009, TEIID60010, Modified: branches/8.0.x/api/src/main/java/org/teiid/translator/ExecutionFactory.java =================================================================== --- branches/8.0.x/api/src/main/java/org/teiid/translator/ExecutionFactory.java 2012-05-01 19:12:27 UTC (rev 4047) +++ branches/8.0.x/api/src/main/java/org/teiid/translator/ExecutionFactory.java 2012-05-02 15:00:34 UTC (rev 4048) @@ -819,9 +819,9 @@ } catch (TeiidException e) { throw new TranslatorException(DataPlugin.Event.TEIID60005, e); } catch (IllegalAccessException e) { - throw new TranslatorException(DataPlugin.Event.TEIID60006, e); + throw new TranslatorException(DataPlugin.Event.TEIID60005, e); } catch(InstantiationException e) { - throw new TranslatorException(DataPlugin.Event.TEIID60007, e); + throw new TranslatorException(DataPlugin.Event.TEIID60005, e); } } Modified: branches/8.0.x/client/src/main/java/org/teiid/gss/MakeGSS.java =================================================================== --- branches/8.0.x/client/src/main/java/org/teiid/gss/MakeGSS.java 2012-05-01 19:12:27 UTC (rev 4047) +++ branches/8.0.x/client/src/main/java/org/teiid/gss/MakeGSS.java 2012-05-02 15:00:34 UTC (rev 4048) @@ -100,7 +100,7 @@ } if (errors.length() > 0) { - throw new LogonException(JDBCPlugin.Event.TEIID20004, errors.toString()); + throw new LogonException(JDBCPlugin.Event.TEIID20005, errors.toString()); } String user = props.getProperty(TeiidURL.CONNECTION.USER_NAME); Modified: branches/8.0.x/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java =================================================================== --- branches/8.0.x/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java 2012-05-01 19:12:27 UTC (rev 4047) +++ branches/8.0.x/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java 2012-05-02 15:00:34 UTC (rev 4048) @@ -42,14 +42,12 @@ TEIID20001, TEIID20002, TEIID20003, - TEIID20004, TEIID20005, TEIID20006, TEIID20007, TEIID20008, TEIID20009, TEIID20010, - TEIID20011, TEIID20012, TEIID20013, TEIID20014, Modified: branches/8.0.x/common-core/src/main/java/org/teiid/core/CorePlugin.java =================================================================== --- branches/8.0.x/common-core/src/main/java/org/teiid/core/CorePlugin.java 2012-05-01 19:12:27 UTC (rev 4047) +++ branches/8.0.x/common-core/src/main/java/org/teiid/core/CorePlugin.java 2012-05-02 15:00:34 UTC (rev 4048) @@ -96,7 +96,6 @@ TEIID10052, TEIID10053, TEIID10054, - TEIID10055, TEIID10056, TEIID10057, TEIID10058, @@ -106,9 +105,7 @@ TEIID10062, TEIID10063, TEIID10064, - TEIID10065, TEIID10066, - TEIID10067, TEIID10068, TEIID10069, TEIID10070, @@ -116,11 +113,9 @@ TEIID10072, TEIID10073, TEIID10074, - TEIID10075, TEIID10076, TEIID10077, TEIID10078, - TEIID10079, TEIID10080, TEIID10081, } Modified: branches/8.0.x/common-core/src/main/java/org/teiid/core/types/basic/BlobToBinaryTransform.java =================================================================== --- branches/8.0.x/common-core/src/main/java/org/teiid/core/types/basic/BlobToBinaryTransform.java 2012-05-01 19:12:27 UTC (rev 4047) +++ branches/8.0.x/common-core/src/main/java/org/teiid/core/types/basic/BlobToBinaryTransform.java 2012-05-02 15:00:34 UTC (rev 4048) @@ -51,7 +51,7 @@ byte[] bytes = ObjectConverterUtil.convertToByteArray(source.getBinaryStream(), DataTypeManager.MAX_LOB_MEMORY_BYTES, true); return new BinaryType(bytes); } catch (SQLException e) { - throw new TransformationException(CorePlugin.Event.TEIID10079, e, CorePlugin.Util.gs(CorePlugin.Event.TEIID10079, new Object[] {getSourceType().getName(), getTargetType().getName()})); + throw new TransformationException(CorePlugin.Event.TEIID10080, e, CorePlugin.Util.gs(CorePlugin.Event.TEIID10080, new Object[] {getSourceType().getName(), getTargetType().getName()})); } catch(IOException e) { throw new TransformationException(CorePlugin.Event.TEIID10080, e, CorePlugin.Util.gs(CorePlugin.Event.TEIID10080, new Object[] {getSourceType().getName(), getTargetType().getName()})); } Modified: branches/8.0.x/common-core/src/main/java/org/teiid/core/types/basic/ClobToStringTransform.java =================================================================== --- branches/8.0.x/common-core/src/main/java/org/teiid/core/types/basic/ClobToStringTransform.java 2012-05-01 19:12:27 UTC (rev 4047) +++ branches/8.0.x/common-core/src/main/java/org/teiid/core/types/basic/ClobToStringTransform.java 2012-05-02 15:00:34 UTC (rev 4048) @@ -63,7 +63,7 @@ } catch (SQLException e) { throw new TransformationException(CorePlugin.Event.TEIID10064, e, CorePlugin.Util.gs(CorePlugin.Event.TEIID10064, new Object[] {getSourceType().getName(), getTargetType().getName()})); } catch(IOException e) { - throw new TransformationException(CorePlugin.Event.TEIID10065, e, CorePlugin.Util.gs(CorePlugin.Event.TEIID10065, new Object[] {getSourceType().getName(), getTargetType().getName()})); + throw new TransformationException(CorePlugin.Event.TEIID10064, e, CorePlugin.Util.gs(CorePlugin.Event.TEIID10064, new Object[] {getSourceType().getName(), getTargetType().getName()})); } finally { if (reader != null) { try { Modified: branches/8.0.x/common-core/src/main/java/org/teiid/core/types/basic/ObjectToAnyTransform.java =================================================================== --- branches/8.0.x/common-core/src/main/java/org/teiid/core/types/basic/ObjectToAnyTransform.java 2012-05-01 19:12:27 UTC (rev 4047) +++ branches/8.0.x/common-core/src/main/java/org/teiid/core/types/basic/ObjectToAnyTransform.java 2012-05-02 15:00:34 UTC (rev 4048) @@ -56,7 +56,7 @@ if (transform == null || transform instanceof ObjectToAnyTransform) { Object[] params = new Object[] { getSourceType(), targetClass, value}; - throw new TransformationException(CorePlugin.Event.TEIID10075, CorePlugin.Util.gs(CorePlugin.Event.TEIID10075, params)); + throw new TransformationException(CorePlugin.Event.TEIID10076, CorePlugin.Util.gs(CorePlugin.Event.TEIID10076, params)); } try { Modified: branches/8.0.x/common-core/src/main/java/org/teiid/core/types/basic/SQLXMLToStringTransform.java =================================================================== --- branches/8.0.x/common-core/src/main/java/org/teiid/core/types/basic/SQLXMLToStringTransform.java 2012-05-01 19:12:27 UTC (rev 4047) +++ branches/8.0.x/common-core/src/main/java/org/teiid/core/types/basic/SQLXMLToStringTransform.java 2012-05-02 15:00:34 UTC (rev 4048) @@ -58,7 +58,7 @@ } catch (SQLException e) { throw new TransformationException(CorePlugin.Event.TEIID10066, e, CorePlugin.Util.gs(CorePlugin.Event.TEIID10066, new Object[] {getSourceType().getName(), getTargetType().getName()})); } catch (IOException e) { - throw new TransformationException(CorePlugin.Event.TEIID10067, e, CorePlugin.Util.gs(CorePlugin.Event.TEIID10067, new Object[] {getSourceType().getName(), getTargetType().getName()})); + throw new TransformationException(CorePlugin.Event.TEIID10066, e, CorePlugin.Util.gs(CorePlugin.Event.TEIID10066, new Object[] {getSourceType().getName(), getTargetType().getName()})); } finally { try { if (reader != null) { Modified: branches/8.0.x/common-core/src/main/resources/org/teiid/core/i18n.properties =================================================================== --- branches/8.0.x/common-core/src/main/resources/org/teiid/core/i18n.properties 2012-05-01 19:12:27 UTC (rev 4047) +++ branches/8.0.x/common-core/src/main/resources/org/teiid/core/i18n.properties 2012-05-02 15:00:34 UTC (rev 4048) @@ -109,6 +109,8 @@ TEIID10071=Invalid short format in String: {0} TEIID10059=Failed to transform String to Timestamp. Expected format = yyyy-mm-dd hh:mm:ss.fffffffff for {0} TEIID10068=Failed to transform String to Time. Expected format = hh:mm:ss for {0} +TEIID10064=Failed to transform Clob to String. source={0}, target={1} +TEIID10066=Failed to transform XML to String. source={0}, target={1} #CM_UTIL_ERR TEIID10006=Decryption failed: {0} {1} Modified: branches/8.0.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCPlugin.java =================================================================== --- branches/8.0.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCPlugin.java 2012-05-01 19:12:27 UTC (rev 4047) +++ branches/8.0.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCPlugin.java 2012-05-02 15:00:34 UTC (rev 4048) @@ -38,7 +38,6 @@ public static enum Event implements BundleUtil.Event{ - TEIID11001, // connection details TEIID11002, // connection creation failed TEIID11003, // invalid hint TEIID11004, Modified: branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/impl/BufferFrontedFileStoreCache.java =================================================================== --- branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/impl/BufferFrontedFileStoreCache.java 2012-05-01 19:12:27 UTC (rev 4047) +++ branches/8.0.x/engine/src/main/java/org/teiid/common/buffer/impl/BufferFrontedFileStoreCache.java 2012-05-02 15:00:34 UTC (rev 4048) @@ -727,7 +727,7 @@ CacheEntry ce = new CacheEntry(new CacheKey(oid, 1, 1), sizeEstimate, serializer.deserialize(dis), ref, true); return ce; } catch(IOException e) { - throw new TeiidComponentException(QueryPlugin.Event.TEIID30047, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30047, oid)); + throw new TeiidComponentException(QueryPlugin.Event.TEIID30048, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30048, oid)); } catch (ClassNotFoundException e) { throw new TeiidComponentException(QueryPlugin.Event.TEIID30048, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30048, oid)); } catch (InterruptedException e) { Modified: branches/8.0.x/engine/src/main/java/org/teiid/dqp/internal/process/TransactionServerImpl.java =================================================================== --- branches/8.0.x/engine/src/main/java/org/teiid/dqp/internal/process/TransactionServerImpl.java 2012-05-01 19:12:27 UTC (rev 4047) +++ branches/8.0.x/engine/src/main/java/org/teiid/dqp/internal/process/TransactionServerImpl.java 2012-05-02 15:00:34 UTC (rev 4048) @@ -232,7 +232,7 @@ checkXAState(threadId, xid, false, false); tc = transactions.getOrCreateTransactionContext(threadId); if (tc.getTransactionType() != TransactionContext.Scope.NONE) { - throw new XATransactionException(QueryPlugin.Event.TEIID30511, XAException.XAER_PROTO, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30511)); + throw new XATransactionException(QueryPlugin.Event.TEIID30517, XAException.XAER_PROTO, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30517)); } tc.setTransactionTimeout(timeout); tc.setXid(xid); @@ -258,13 +258,13 @@ } catch (NotSupportedException e) { throw new XATransactionException(QueryPlugin.Event.TEIID30512, XAException.XAER_INVAL, e); } catch (WorkException e) { - throw new XATransactionException(QueryPlugin.Event.TEIID30513, XAException.XAER_INVAL, e); + throw new XATransactionException(QueryPlugin.Event.TEIID30512, XAException.XAER_INVAL, e); } catch (InterruptedException e) { - throw new XATransactionException(QueryPlugin.Event.TEIID30514, XAException.XAER_INVAL, e); + throw new XATransactionException(QueryPlugin.Event.TEIID30512, XAException.XAER_INVAL, e); } catch (ExecutionException e) { - throw new XATransactionException(QueryPlugin.Event.TEIID30515, XAException.XAER_INVAL, e); + throw new XATransactionException(QueryPlugin.Event.TEIID30512, XAException.XAER_INVAL, e); } catch (SystemException e) { - throw new XATransactionException(QueryPlugin.Event.TEIID30516, XAException.XAER_INVAL, e); + throw new XATransactionException(QueryPlugin.Event.TEIID30512, XAException.XAER_INVAL, e); } break; } @@ -380,7 +380,7 @@ } catch (javax.transaction.NotSupportedException err) { throw new XATransactionException(QueryPlugin.Event.TEIID30528, err); } catch (SystemException err) { - throw new XATransactionException(QueryPlugin.Event.TEIID30529, err); + throw new XATransactionException(QueryPlugin.Event.TEIID30528, err); } } @@ -391,13 +391,13 @@ } catch (SecurityException e) { throw new XATransactionException(QueryPlugin.Event.TEIID30530, e); } catch (RollbackException e) { - throw new XATransactionException(QueryPlugin.Event.TEIID30531, e); + throw new XATransactionException(QueryPlugin.Event.TEIID30530, e); } catch (HeuristicMixedException e) { - throw new XATransactionException(QueryPlugin.Event.TEIID30532, e); + throw new XATransactionException(QueryPlugin.Event.TEIID30530, e); } catch (HeuristicRollbackException e) { - throw new XATransactionException(QueryPlugin.Event.TEIID30533, e); + throw new XATransactionException(QueryPlugin.Event.TEIID30530, e); } catch (SystemException e) { - throw new XATransactionException(QueryPlugin.Event.TEIID30534, e); + throw new XATransactionException(QueryPlugin.Event.TEIID30530, e); } finally { transactions.removeTransactionContext(context); } @@ -410,7 +410,7 @@ } catch (SecurityException e) { throw new XATransactionException(QueryPlugin.Event.TEIID30535, e); } catch (SystemException e) { - throw new XATransactionException(QueryPlugin.Event.TEIID30536, e); + throw new XATransactionException(QueryPlugin.Event.TEIID30535, e); } finally { transactions.removeTransactionContext(tc); } @@ -430,7 +430,7 @@ } catch (InvalidTransactionException e) { throw new XATransactionException(QueryPlugin.Event.TEIID30538, e); } catch (SystemException e) { - throw new XATransactionException(QueryPlugin.Event.TEIID30539, e); + throw new XATransactionException(QueryPlugin.Event.TEIID30538, e); } } Modified: branches/8.0.x/engine/src/main/java/org/teiid/query/QueryPlugin.java =================================================================== --- branches/8.0.x/engine/src/main/java/org/teiid/query/QueryPlugin.java 2012-05-01 19:12:27 UTC (rev 4047) +++ branches/8.0.x/engine/src/main/java/org/teiid/query/QueryPlugin.java 2012-05-02 15:00:34 UTC (rev 4048) @@ -50,10 +50,8 @@ TEIID30004, // zero size batch TEIID30005, // rollback failed TEIID30006, // invalid max active plans - TEIID30007, // general process worker error TEIID30008, // request not deterministic TEIID30009, // max threads exceeded - TEIID30010, // duplicate function TEIID30011, // dependent criteria over max TEIID30012, // mat row refresh TEIID30013, // mat table loading @@ -90,7 +88,6 @@ TEIID30044, TEIID30045, TEIID30046, - TEIID30047, TEIID30048, TEIID30049, TEIID30050, @@ -192,15 +189,12 @@ TEIID30146, TEIID30147, TEIID30148, - TEIID30149, - TEIID30150, TEIID30151, TEIID30152, TEIID30153, TEIID30154, TEIID30155, TEIID30156, - TEIID30157, TEIID30158, TEIID30159, TEIID30160, @@ -303,9 +297,6 @@ TEIID30257, TEIID30258, TEIID30259, - TEIID30260, - TEIID30261, - TEIID30262, TEIID30263, TEIID30264, TEIID30265, @@ -355,17 +346,11 @@ TEIID30309, TEIID30310, TEIID30311, - TEIID30312, - TEIID30313, TEIID30314, TEIID30315, TEIID30316, - TEIID30317, - TEIID30318, TEIID30319, TEIID30320, - TEIID30321, - TEIID30322, TEIID30323, TEIID30324, TEIID30325, @@ -375,7 +360,6 @@ TEIID30329, TEIID30330, TEIID30331, - TEIID30332, TEIID30333, TEIID30334, TEIID30335, @@ -426,7 +410,6 @@ TEIID30380, TEIID30381, TEIID30382, - TEIID30383, TEIID30384, TEIID30385, TEIID30386, @@ -457,7 +440,6 @@ TEIID30411, TEIID30412, TEIID30413, - TEIID30414, TEIID30415, TEIID30416, TEIID30417, @@ -551,12 +533,7 @@ TEIID30508, TEIID30509, TEIID30510, - TEIID30511, TEIID30512, - TEIID30513, - TEIID30514, - TEIID30515, - TEIID30516, TEIID30517, TEIID30518, TEIID30519, @@ -569,17 +546,10 @@ TEIID30526, TEIID30527, TEIID30528, - TEIID30529, TEIID30530, - TEIID30531, - TEIID30532, - TEIID30533, - TEIID30534, TEIID30535, - TEIID30536, TEIID30537, TEIID30538, - TEIID30539, TEIID30540, TEIID30541, TEIID30542, @@ -587,7 +557,6 @@ TEIID30544, TEIID30545, TEIID30546, - TEIID30547, TEIID30548, TEIID30549, TEIID30550, @@ -606,13 +575,13 @@ TEIID30563, TEIID30564, TEIID30565, - TEIID30574, TEIID30580, TEIID30581, TEIID30590, TEIID30591, - TEIID30600, TEIID30601, TEIID30602, //User defined aggregate errors - + TEIID30600, + TEIID30601, + TEIID30602, //User defined aggregate errors TEIID31069, TEIID31070, TEIID31071, Modified: branches/8.0.x/engine/src/main/java/org/teiid/query/eval/Evaluator.java =================================================================== --- branches/8.0.x/engine/src/main/java/org/teiid/query/eval/Evaluator.java 2012-05-01 19:12:27 UTC (rev 4047) +++ branches/8.0.x/engine/src/main/java/org/teiid/query/eval/Evaluator.java 2012-05-02 15:00:34 UTC (rev 4048) @@ -271,7 +271,7 @@ try { leftValue = evaluate(criteria.getLeftExpression(), tuple); } catch(ExpressionEvaluationException e) { - throw new ExpressionEvaluationException(QueryPlugin.Event.TEIID30312, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30312, "left", criteria)); //$NON-NLS-1$ + throw new ExpressionEvaluationException(QueryPlugin.Event.TEIID30314, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30314, "left", criteria)); //$NON-NLS-1$ } // Shortcut if null @@ -284,7 +284,7 @@ try { rightValue = evaluate(criteria.getRightExpression(), tuple); } catch(ExpressionEvaluationException e) { - throw new ExpressionEvaluationException(QueryPlugin.Event.TEIID30313, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30313, "right", criteria)); //$NON-NLS-1$ + throw new ExpressionEvaluationException(QueryPlugin.Event.TEIID30314, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30314, "right", criteria)); //$NON-NLS-1$ } // Shortcut if null @@ -330,7 +330,7 @@ try { rightValue = (String) evaluate(criteria.getRightExpression(), tuple); } catch(ExpressionEvaluationException e) { - throw new ExpressionEvaluationException(QueryPlugin.Event.TEIID30317, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30317, "right", criteria)); //$NON-NLS-1$ + throw new ExpressionEvaluationException(QueryPlugin.Event.TEIID30315, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30315, "right", criteria)); //$NON-NLS-1$ } // Shortcut if null @@ -373,7 +373,7 @@ try { leftValue = evaluate(criteria.getExpression(), tuple); } catch(ExpressionEvaluationException e) { - throw new ExpressionEvaluationException(QueryPlugin.Event.TEIID30318, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30318, criteria)); + throw new ExpressionEvaluationException(QueryPlugin.Event.TEIID30323, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30323, criteria)); } // Shortcut if null @@ -429,7 +429,7 @@ try { value = evaluate((Expression) possibleValue, tuple); } catch(ExpressionEvaluationException e) { - throw new ExpressionEvaluationException(QueryPlugin.Event.TEIID30321, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30321, possibleValue)); + throw new ExpressionEvaluationException(QueryPlugin.Event.TEIID30323, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30323, possibleValue)); } } else { value = possibleValue; @@ -459,7 +459,7 @@ try { value = evaluate(criteria.getExpression(), tuple); } catch(ExpressionEvaluationException e) { - throw new ExpressionEvaluationException(QueryPlugin.Event.TEIID30322, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30322, criteria)); + throw new ExpressionEvaluationException(QueryPlugin.Event.TEIID30323, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30323, criteria)); } return (value == null ^ criteria.isNegated()); @@ -765,7 +765,7 @@ } return xmlQuery.getXQueryExpression().createXMLType(result.iter, this.context.getBufferManager(), emptyOnEmpty); } catch (TeiidProcessingException e) { - throw new FunctionExecutionException(QueryPlugin.Event.TEIID30332, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30332, e.getMessage())); + throw new FunctionExecutionException(QueryPlugin.Event.TEIID30333, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30333, e.getMessage())); } catch (XPathException e) { throw new FunctionExecutionException(QueryPlugin.Event.TEIID30333, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30333, e.getMessage())); } finally { Modified: branches/8.0.x/engine/src/main/java/org/teiid/query/function/FunctionDescriptor.java =================================================================== --- branches/8.0.x/engine/src/main/java/org/teiid/query/function/FunctionDescriptor.java 2012-05-01 19:12:27 UTC (rev 4047) +++ branches/8.0.x/engine/src/main/java/org/teiid/query/function/FunctionDescriptor.java 2012-05-02 15:00:34 UTC (rev 4048) @@ -242,7 +242,7 @@ } return importValue(result, getReturnType()); } catch(ArithmeticException e) { - throw new FunctionExecutionException(QueryPlugin.Event.TEIID30383, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30383, getName())); + throw new FunctionExecutionException(QueryPlugin.Event.TEIID30384, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30384, getName())); } catch(InvocationTargetException e) { throw new FunctionExecutionException(QueryPlugin.Event.TEIID30384, e.getTargetException(), QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30384, getName())); } catch(IllegalAccessException e) { Modified: branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/FrameUtil.java =================================================================== --- branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/FrameUtil.java 2012-05-01 19:12:27 UTC (rev 4047) +++ branches/8.0.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/FrameUtil.java 2012-05-02 15:00:34 UTC (rev 4048) @@ -298,9 +298,9 @@ } } } catch(TeiidProcessingException e) { - throw new QueryPlannerException(QueryPlugin.Event.TEIID30260, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30260, ses)); + throw new QueryPlannerException(QueryPlugin.Event.TEIID30263, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30263, ses)); } catch (TeiidComponentException e) { - throw new QueryPlannerException(QueryPlugin.Event.TEIID30261, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30261, ses)); + throw new QueryPlannerException(QueryPlugin.Event.TEIID30263, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30263, ses)); } } @@ -337,7 +337,7 @@ try { return QueryRewriter.rewriteCriteria(criteria, null, metadata); } catch(TeiidProcessingException e) { - throw new QueryPlannerException(QueryPlugin.Event.TEIID30262, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30262, criteria)); + throw new QueryPlannerException(QueryPlugin.Event.TEIID30263, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30263, criteria)); } catch (TeiidComponentException e) { throw new QueryPlannerException(QueryPlugin.Event.TEIID30263, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30263, criteria)); } Modified: branches/8.0.x/engine/src/main/java/org/teiid/query/processor/DdlPlan.java =================================================================== --- branches/8.0.x/engine/src/main/java/org/teiid/query/processor/DdlPlan.java 2012-05-01 19:12:27 UTC (rev 4047) +++ branches/8.0.x/engine/src/main/java/org/teiid/query/processor/DdlPlan.java 2012-05-02 15:00:34 UTC (rev 4048) @@ -102,7 +102,7 @@ throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30156, new TeiidProcessingException(QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30156, t.getName(), obj.getEvent()))); } } else if (getPlanForEvent(t, event) == null) { - throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30157, new TeiidProcessingException(QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30157, t.getName(), obj.getEvent()))); + throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30158, new TeiidProcessingException(QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30158, t.getName(), obj.getEvent()))); } sql = obj.getDefinition().toString(); } else if (getPlanForEvent(t, event) == null) { Modified: branches/8.0.x/engine/src/main/java/org/teiid/query/xquery/saxon/XQueryEvaluator.java =================================================================== --- branches/8.0.x/engine/src/main/java/org/teiid/query/xquery/saxon/XQueryEvaluator.java 2012-05-01 19:12:27 UTC (rev 4047) +++ branches/8.0.x/engine/src/main/java/org/teiid/query/xquery/saxon/XQueryEvaluator.java 2012-05-02 15:00:34 UTC (rev 4048) @@ -127,9 +127,9 @@ if (e.getCause() instanceof TeiidRuntimeException) { RelationalNode.unwrapException((TeiidRuntimeException)e.getCause()); } - throw new TeiidProcessingException(QueryPlugin.Event.TEIID30149, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30149)); + throw new TeiidProcessingException(QueryPlugin.Event.TEIID30151, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30151)); } catch (IOException e) { - throw new TeiidProcessingException(QueryPlugin.Event.TEIID30150, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30150)); + throw new TeiidProcessingException(QueryPlugin.Event.TEIID30151, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30151)); } finally { if (!isNonBlocking) { commandContext.setNonBlocking(false); Modified: branches/8.0.x/engine/src/main/resources/org/teiid/query/i18n.properties =================================================================== --- branches/8.0.x/engine/src/main/resources/org/teiid/query/i18n.properties 2012-05-01 19:12:27 UTC (rev 4047) +++ branches/8.0.x/engine/src/main/resources/org/teiid/query/i18n.properties 2012-05-02 15:00:34 UTC (rev 4048) @@ -78,12 +78,12 @@ # processor (006) TEIID30311=Unknown criteria type: {0} -ERR.015.006.0011=Unable to evaluate {0} expression of {1} +TEIID30315=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} -ERR.015.006.0033=Unable to evaluate {0}: {1} +TEIID30340=Unable to evaluate {0}: {1} TEIID30342=Unable to evaluate LOOKUP function. TEIID30326=Unknown subquery comparison predicate quantifier: {0} TEIID30345=The command of this scalar subquery returned more than one value: {0} @@ -849,7 +849,7 @@ TEIID30482=Connector is not in OPEN state ConnectorManagerImpl.Initializing_connector=Initializing connector {0} -Cancel_request_failed=AtomicRequest {0} failed to cancel. +TEIID30024=AtomicRequest {0} failed to cancel. ConnectorWorker.MaxResultRowsExceed=The number of result rows has exceeded the maximum result rows "{0}" TEIID30004=Connector returned a 0 row non-last batch: {0}. Modified: branches/8.0.x/jboss-integration/src/main/java/org/teiid/jboss/IntegrationPlugin.java =================================================================== --- branches/8.0.x/jboss-integration/src/main/java/org/teiid/jboss/IntegrationPlugin.java 2012-05-01 19:12:27 UTC (rev 4047) +++ branches/8.0.x/jboss-integration/src/main/java/org/teiid/jboss/IntegrationPlugin.java 2012-05-02 15:00:34 UTC (rev 4048) @@ -53,8 +53,6 @@ TEIID50011, TEIID50012, // socket enabled TEIID50013, // Wrong socket protocol - TEIID50014, // socket disabled - TEIID50015, // admin max sessions TEIID50016, // invalid vdb file TEIID50017, // vdb.xml parse exception TEIID50018, // failed VDB dependency processing @@ -66,11 +64,8 @@ TEIID50024, // failed metadata load TEIID50025, // VDB deployed TEIID50026, // VDB undeployed - TEIID50027, // metadata in-process of loading - TEIID50028, // failed metadata loading TEIID50029, // dynamic metadata loaded TEIID50030, - TEIID50031, // failed to load cached index files TEIID50032, // duplicate VDB TEIID50033, // duplicate source name in vdb TEIID50034, // Source name mismatch @@ -91,15 +86,10 @@ TEIID50049, TEIID50050, TEIID50051, - TEIID50052, - TEIID50053, TEIID50054, TEIID50055, TEIID50056, TEIID50057, - TEIID50058, - TEIID50059, - TEIID50060, TEIID50061, TEIID50062, TEIID50063, Modified: branches/8.0.x/jboss-integration/src/main/java/org/teiid/jboss/TeiidOperationHandler.java =================================================================== --- branches/8.0.x/jboss-integration/src/main/java/org/teiid/jboss/TeiidOperationHandler.java 2012-05-01 19:12:27 UTC (rev 4047) +++ branches/8.0.x/jboss-integration/src/main/java/org/teiid/jboss/TeiidOperationHandler.java 2012-05-02 15:00:34 UTC (rev 4048) @@ -1133,7 +1133,7 @@ DataPolicyMetadata policy = vdb.getDataPolicy(policyName); if (policy == null) { - throw new AdminProcessingException(IntegrationPlugin.Event.TEIID50052, IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50052, policyName, vdb.getName(), vdb.getVersion())); + throw new AdminProcessingException(IntegrationPlugin.Event.TEIID50051, IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50051, policyName, vdb.getName(), vdb.getVersion())); } policy.setAnyAuthenticated(true); @@ -1173,7 +1173,7 @@ DataPolicyMetadata policy = vdb.getDataPolicy(policyName); if (policy == null) { - throw new AdminProcessingException(IntegrationPlugin.Event.TEIID50053, IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50053, policyName, vdb.getName(), vdb.getVersion())); + throw new AdminProcessingException(IntegrationPlugin.Event.TEIID50051, IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50051, policyName, vdb.getName(), vdb.getVersion())); } policy.setAnyAuthenticated(false); Modified: branches/8.0.x/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java =================================================================== --- branches/8.0.x/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java 2012-05-01 19:12:27 UTC (rev 4047) +++ branches/8.0.x/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java 2012-05-02 15:00:34 UTC (rev 4048) @@ -432,7 +432,7 @@ DataPolicyMetadata policy = vdb.getDataPolicy(policyName); if (policy == null) { - throw new AdminProcessingException(IntegrationPlugin.Event.TEIID50058, IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50058, policyName, this.vdb.getName(), this.vdb.getVersion())); + throw new AdminProcessingException(IntegrationPlugin.Event.TEIID50061, IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50061, policyName, this.vdb.getName(), this.vdb.getVersion())); } policy.addMappedRoleName(mappedRole); @@ -443,7 +443,7 @@ DataPolicyMetadata policy = vdb.getDataPolicy(policyName); if (policy == null) { - throw new AdminProcessingException(IntegrationPlugin.Event.TEIID50059, IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50059, policyName, this.vdb.getName(), this.vdb.getVersion())); + throw new AdminProcessingException(IntegrationPlugin.Event.TEIID50061, IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50061, policyName, this.vdb.getName(), this.vdb.getVersion())); } policy.removeMappedRoleName(mappedRole); @@ -454,7 +454,7 @@ DataPolicyMetadata policy = vdb.getDataPolicy(policyName); if (policy == null) { - throw new AdminProcessingException(IntegrationPlugin.Event.TEIID50060, IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50060, policyName, this.vdb.getName(), this.vdb.getVersion())); + throw new AdminProcessingException(IntegrationPlugin.Event.TEIID50061, IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50061, policyName, this.vdb.getName(), this.vdb.getVersion())); } policy.setAnyAuthenticated(true); Modified: branches/8.0.x/runtime/src/main/java/org/teiid/runtime/RuntimePlugin.java =================================================================== --- branches/8.0.x/runtime/src/main/java/org/teiid/runtime/RuntimePlugin.java 2012-05-01 19:12:27 UTC (rev 4047) +++ branches/8.0.x/runtime/src/main/java/org/teiid/runtime/RuntimePlugin.java 2012-05-02 15:00:34 UTC (rev 4048) @@ -35,13 +35,11 @@ TEIID40001, // undefined translator properties TEIID40002, // failed to load ODBC metadata TEIID40003, // VDB Active - TEIID40004, // VDB validity errors TEIID40005, // datasource or translator not found TEIID40006, // VDB inactive TEIID40007, // keep alive failed TEIID40008, // expired session TEIID40009, // terminate session - TEIID40010, // odbc error TEIID40011, // processing error TEIID40012, // data source not found TEIID40013, // replication failed Modified: branches/8.0.x/runtime/src/main/resources/org/teiid/runtime/i18n.properties =================================================================== --- branches/8.0.x/runtime/src/main/resources/org/teiid/runtime/i18n.properties 2012-05-01 19:12:27 UTC (rev 4047) +++ branches/8.0.x/runtime/src/main/resources/org/teiid/runtime/i18n.properties 2012-05-02 15:00:34 UTC (rev 4048) @@ -46,6 +46,7 @@ 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. +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}