Author: rareddy Date: 2012-06-13 09:57:08 -0400 (Wed, 13 Jun 2012) New Revision: 4177 Modified: trunk/admin/src/main/java/org/teiid/adminapi/AdminException.java trunk/admin/src/main/java/org/teiid/adminapi/AdminFactory.java trunk/admin/src/main/java/org/teiid/adminapi/AdminPlugin.java trunk/client/src/main/java/org/teiid/client/security/LogonException.java trunk/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFactory.java trunk/common-core/src/main/java/org/teiid/core/types/TransformationException.java trunk/engine/src/main/java/org/teiid/api/exception/query/ExpressionEvaluationException.java trunk/engine/src/main/java/org/teiid/api/exception/query/FunctionExecutionException.java trunk/engine/src/main/java/org/teiid/api/exception/query/QueryPlannerException.java trunk/engine/src/main/java/org/teiid/api/exception/query/QueryProcessingException.java trunk/engine/src/main/java/org/teiid/api/exception/query/QueryResolverException.java trunk/engine/src/main/java/org/teiid/api/exception/query/QueryValidatorException.java trunk/engine/src/main/java/org/teiid/dqp/internal/process/DataTierTupleSource.java trunk/engine/src/main/java/org/teiid/dqp/internal/process/multisource/MultiSourcePlanToProcessConverter.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/FunctionDescriptor.java trunk/engine/src/main/java/org/teiid/query/function/source/SecuritySystemFunctions.java trunk/engine/src/main/java/org/teiid/query/metadata/DDLMetadataRepository.java trunk/engine/src/main/java/org/teiid/query/optimizer/QueryOptimizer.java trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java trunk/engine/src/main/java/org/teiid/query/optimizer/xml/QueryUtil.java trunk/engine/src/main/java/org/teiid/query/processor/relational/TupleSourceValueIterator.java trunk/engine/src/main/java/org/teiid/query/resolver/ProcedureContainerResolver.java trunk/engine/src/main/java/org/teiid/query/resolver/QueryResolver.java trunk/engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java trunk/runtime/src/main/java/org/teiid/runtime/RuntimePlugin.java trunk/runtime/src/main/java/org/teiid/transport/LocalServerConnection.java trunk/runtime/src/main/java/org/teiid/transport/LogonImpl.java Log: TEIID-2022: Removing the duplicate eventid from the exceptions. Carry the original exception's eventid. Modified: trunk/admin/src/main/java/org/teiid/adminapi/AdminException.java =================================================================== --- trunk/admin/src/main/java/org/teiid/adminapi/AdminException.java 2012-06-12 17:03:58 UTC (rev 4176) +++ trunk/admin/src/main/java/org/teiid/adminapi/AdminException.java 2012-06-13 13:57:08 UTC (rev 4177) @@ -66,7 +66,7 @@ } AdminException(Throwable cause) { - this(cause.getMessage(), cause); + super(cause); } /** Modified: trunk/admin/src/main/java/org/teiid/adminapi/AdminFactory.java =================================================================== --- trunk/admin/src/main/java/org/teiid/adminapi/AdminFactory.java 2012-06-12 17:03:58 UTC (rev 4176) +++ trunk/admin/src/main/java/org/teiid/adminapi/AdminFactory.java 2012-06-13 13:57:08 UTC (rev 4177) @@ -339,7 +339,7 @@ driverList.addAll(drivers); } } catch (Exception e) { - throw new AdminProcessingException(e.getMessage(), e); + throw new AdminProcessingException(AdminPlugin.Event.TEIID70052, e); } } else { @@ -442,7 +442,7 @@ throw new AdminProcessingException(AdminPlugin.Event.TEIID70006, Util.getFailureDescription(outcome)); } } catch (IOException e) { - throw new AdminProcessingException(AdminPlugin.Event.TEIID70007, e, e.getMessage()); + throw new AdminProcessingException(AdminPlugin.Event.TEIID70007, e); } } @@ -512,7 +512,7 @@ return false; } } catch (IOException e) { - throw new AdminProcessingException(AdminPlugin.Event.TEIID70009, e, e.getMessage()); + throw new AdminProcessingException(AdminPlugin.Event.TEIID70009, e); } return true; } @@ -523,7 +523,7 @@ try { request = buildUndeployRequest(deployedName); } catch (OperationFormatException e) { - throw new AdminProcessingException(AdminPlugin.Event.TEIID70010, e, e.getMessage()); + throw new AdminProcessingException(AdminPlugin.Event.TEIID70010, e); } execute(request); } @@ -614,9 +614,9 @@ } return composite; } catch (OperationFormatException e) { - throw new AdminProcessingException(AdminPlugin.Event.TEIID70011, e, e.getMessage()); + throw new AdminProcessingException(AdminPlugin.Event.TEIID70011, e); } catch (IOException e) { - throw new AdminProcessingException(AdminPlugin.Event.TEIID70011, e, e.getMessage()); + throw new AdminProcessingException(AdminPlugin.Event.TEIID70011, e); } } @@ -629,7 +629,7 @@ return getDomainAwareList(outcome, VDBMetadataMapper.CacheStatisticsMetadataMapper.INSTANCE); } } catch (Exception e) { - throw new AdminProcessingException(AdminPlugin.Event.TEIID70013, e, e.getMessage()); + throw new AdminProcessingException(AdminPlugin.Event.TEIID70013, e); } return null; } @@ -647,7 +647,7 @@ return Util.getList(outcome); } } catch (Exception e) { - throw new AdminProcessingException(AdminPlugin.Event.TEIID70014, e, e.getMessage()); + throw new AdminProcessingException(AdminPlugin.Event.TEIID70014, e); } return Collections.emptyList(); } @@ -660,7 +660,7 @@ return Util.getList(outcome); } } catch (IOException e) { - throw new AdminProcessingException(AdminPlugin.Event.TEIID70015, e, e.getMessage()); + throw new AdminProcessingException(AdminPlugin.Event.TEIID70015, e); } return Collections.emptyList(); @@ -772,7 +772,7 @@ return getDomainAwareList(outcome, VDBMetadataMapper.WorkerPoolStatisticsMetadataMapper.INSTANCE); } } catch (Exception e) { - throw new AdminProcessingException(AdminPlugin.Event.TEIID70020, e, e.getMessage()); + throw new AdminProcessingException(AdminPlugin.Event.TEIID70020, e); } } return null; @@ -791,7 +791,7 @@ throw new AdminProcessingException(AdminPlugin.Event.TEIID70021, Util.getFailureDescription(outcome)); } } catch (Exception e) { - throw new AdminProcessingException(AdminPlugin.Event.TEIID70022, e, e.getMessage()); + throw new AdminProcessingException(AdminPlugin.Event.TEIID70022, e); } } @@ -805,7 +805,7 @@ return getDomainAwareList(outcome, RequestMetadataMapper.INSTANCE); } } catch (Exception e) { - throw new AdminProcessingException(AdminPlugin.Event.TEIID70023, e, e.getMessage()); + throw new AdminProcessingException(AdminPlugin.Event.TEIID70023, e); } } return Collections.emptyList(); @@ -821,7 +821,7 @@ return getDomainAwareList(outcome, RequestMetadataMapper.INSTANCE); } } catch (Exception e) { - throw new AdminProcessingException(AdminPlugin.Event.TEIID70024, e, e.getMessage()); + throw new AdminProcessingException(AdminPlugin.Event.TEIID70024, e); } } return Collections.emptyList(); @@ -837,7 +837,7 @@ return getDomainAwareList(outcome, SessionMetadataMapper.INSTANCE); } } catch (Exception e) { - throw new AdminProcessingException(AdminPlugin.Event.TEIID70025, e, e.getMessage()); + throw new AdminProcessingException(AdminPlugin.Event.TEIID70025, e); } } return Collections.emptyList(); @@ -868,7 +868,7 @@ } result = outcome.get("result"); } catch (IOException e) { - throw new AdminProcessingException(AdminPlugin.Event.TEIID70027, e, e.getMessage()); + throw new AdminProcessingException(AdminPlugin.Event.TEIID70027, e); } } else { @@ -999,7 +999,7 @@ return getDomainAwareList(outcome, TransactionMetadataMapper.INSTANCE); } } catch (Exception e) { - throw new AdminProcessingException(AdminPlugin.Event.TEIID70028, e, e.getMessage()); + throw new AdminProcessingException(AdminPlugin.Event.TEIID70028, e); } } return Collections.emptyList(); @@ -1017,7 +1017,7 @@ throw new AdminProcessingException(AdminPlugin.Event.TEIID70029, Util.getFailureDescription(outcome)); } } catch (Exception e) { - throw new AdminProcessingException(AdminPlugin.Event.TEIID70030, e, e.getMessage()); + throw new AdminProcessingException(AdminPlugin.Event.TEIID70030, e); } } @@ -1033,7 +1033,7 @@ throw new AdminProcessingException(AdminPlugin.Event.TEIID70031, Util.getFailureDescription(outcome)); } } catch (Exception e) { - throw new AdminProcessingException(AdminPlugin.Event.TEIID70032, e, e.getMessage()); + throw new AdminProcessingException(AdminPlugin.Event.TEIID70032, e); } } @@ -1061,7 +1061,7 @@ } } catch (Exception e) { - throw new AdminProcessingException(AdminPlugin.Event.TEIID70033, e, e.getMessage()); + throw new AdminProcessingException(AdminPlugin.Event.TEIID70033, e); } return null; } @@ -1075,7 +1075,7 @@ return getDomainAwareList(outcome, VDBMetadataMapper.VDBTranslatorMetaDataMapper.INSTANCE); } } catch (Exception e) { - throw new AdminProcessingException(AdminPlugin.Event.TEIID70034, e, e.getMessage()); + throw new AdminProcessingException(AdminPlugin.Event.TEIID70034, e); } return Collections.emptyList(); @@ -1177,7 +1177,7 @@ } } } catch (Exception e) { - throw new AdminProcessingException(AdminPlugin.Event.TEIID70035, e, e.getMessage()); + throw new AdminProcessingException(AdminPlugin.Event.TEIID70035, e); } return null; } @@ -1191,7 +1191,7 @@ return getDomainAwareList(outcome, VDBMetadataMapper.INSTANCE); } } catch (Exception e) { - throw new AdminProcessingException(AdminPlugin.Event.TEIID70036, e, e.getMessage()); + throw new AdminProcessingException(AdminPlugin.Event.TEIID70036, e); } return Collections.emptyList(); @@ -1210,7 +1210,7 @@ throw new AdminProcessingException(AdminPlugin.Event.TEIID70039, Util.getFailureDescription(outcome)); } } catch (Exception e) { - throw new AdminProcessingException(AdminPlugin.Event.TEIID70040, e, e.getMessage()); + throw new AdminProcessingException(AdminPlugin.Event.TEIID70040, e); } } @@ -1227,7 +1227,7 @@ throw new AdminProcessingException(AdminPlugin.Event.TEIID70041, Util.getFailureDescription(outcome)); } } catch (Exception e) { - throw new AdminProcessingException(AdminPlugin.Event.TEIID70042, e, e.getMessage()); + throw new AdminProcessingException(AdminPlugin.Event.TEIID70042, e); } } @@ -1250,7 +1250,7 @@ throw new AdminProcessingException(AdminPlugin.Event.TEIID70043, Util.getFailureDescription(outcome)); } } catch (Exception e) { - throw new AdminProcessingException(AdminPlugin.Event.TEIID70044, e, e.getMessage()); + throw new AdminProcessingException(AdminPlugin.Event.TEIID70044, e); } } @@ -1266,7 +1266,7 @@ throw new AdminProcessingException(AdminPlugin.Event.TEIID70045, Util.getFailureDescription(outcome)); } } catch (Exception e) { - throw new AdminProcessingException(AdminPlugin.Event.TEIID70046, e, e.getMessage()); + throw new AdminProcessingException(AdminPlugin.Event.TEIID70046, e); } } @@ -1286,7 +1286,7 @@ throw new AdminProcessingException(AdminPlugin.Event.TEIID70047, Util.getFailureDescription(outcome)); } } catch (Exception e) { - throw new AdminProcessingException(AdminPlugin.Event.TEIID70048, e, e.getMessage()); + throw new AdminProcessingException(AdminPlugin.Event.TEIID70048, e); } } @@ -1299,7 +1299,7 @@ throw new AdminProcessingException(AdminPlugin.Event.TEIID70049, Util.getFailureDescription(outcome)); } } catch (Exception e) { - throw new AdminProcessingException(AdminPlugin.Event.TEIID70050, e, e.getMessage()); + throw new AdminProcessingException(AdminPlugin.Event.TEIID70050, e); } } } Modified: trunk/admin/src/main/java/org/teiid/adminapi/AdminPlugin.java =================================================================== --- trunk/admin/src/main/java/org/teiid/adminapi/AdminPlugin.java 2012-06-12 17:03:58 UTC (rev 4176) +++ trunk/admin/src/main/java/org/teiid/adminapi/AdminPlugin.java 2012-06-13 13:57:08 UTC (rev 4177) @@ -77,5 +77,6 @@ TEIID70049, TEIID70050, TEIID70051, + TEIID70052 } } Modified: trunk/client/src/main/java/org/teiid/client/security/LogonException.java =================================================================== --- trunk/client/src/main/java/org/teiid/client/security/LogonException.java 2012-06-12 17:03:58 UTC (rev 4176) +++ trunk/client/src/main/java/org/teiid/client/security/LogonException.java 2012-06-13 13:57:08 UTC (rev 4177) @@ -58,5 +58,8 @@ super(event, t, message ); } + public LogonException(Throwable t) { + super(t); + } } Modified: trunk/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java =================================================================== --- trunk/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java 2012-06-12 17:03:58 UTC (rev 4176) +++ trunk/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java 2012-06-13 13:57:08 UTC (rev 4177) @@ -50,18 +50,12 @@ TEIID20012, TEIID20013, TEIID20014, - TEIID20015, TEIID20016, - TEIID20017, TEIID20018, TEIID20019, TEIID20020, TEIID20021, - TEIID20022, TEIID20023, - TEIID20024, - TEIID20025, - TEIID20026, TEIID20027, TEIID20028 } Modified: trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java =================================================================== --- trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java 2012-06-12 17:03:58 UTC (rev 4176) +++ trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java 2012-06-13 13:57:08 UTC (rev 4177) @@ -139,7 +139,7 @@ } catch (LogonException e) { // Propagate the original message as it contains the message we want // to give to the user - throw new ConnectionException(JDBCPlugin.Event.TEIID20017, e, e.getMessage()); + throw new ConnectionException(e); } catch (TeiidComponentException e) { if (e.getCause() instanceof CommunicationException) { throw (CommunicationException)e.getCause(); @@ -233,7 +233,7 @@ try { return selectServerInstance(false); } catch (ConnectionException e) { - throw new CommunicationException(JDBCPlugin.Event.TEIID20022, e, e.getMessage()); + throw new CommunicationException(e); } } @@ -333,7 +333,7 @@ try { return selectServerInstance(false).getHostInfo().equals(((SocketServerConnection)otherService).selectServerInstance(false).getHostInfo()); } catch (ConnectionException e) { - throw new CommunicationException(JDBCPlugin.Event.TEIID20024, e, e.getMessage()); + throw new CommunicationException(e); } } @@ -359,9 +359,9 @@ try { this.logon(logonInstance, true); } catch (LogonException e) { - throw new ConnectionException(JDBCPlugin.Event.TEIID20025, e, e.getMessage()); + throw new ConnectionException(e); } catch (TeiidComponentException e) { - throw new CommunicationException(JDBCPlugin.Event.TEIID20026, e, e.getMessage()); + throw new CommunicationException(e); } } } Modified: trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFactory.java =================================================================== --- trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFactory.java 2012-06-12 17:03:58 UTC (rev 4176) +++ trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFactory.java 2012-06-13 13:57:08 UTC (rev 4177) @@ -303,7 +303,7 @@ try { discovery = (ServerDiscovery)ReflectionHelper.create(discoveryStrategyName, null, this.getClass().getClassLoader()); } catch (TeiidException e) { - throw new ConnectionException(JDBCPlugin.Event.TEIID20015, e, e.getMessage()); + throw new ConnectionException(e); } } Modified: trunk/common-core/src/main/java/org/teiid/core/types/TransformationException.java =================================================================== --- trunk/common-core/src/main/java/org/teiid/core/types/TransformationException.java 2012-06-12 17:03:58 UTC (rev 4176) +++ trunk/common-core/src/main/java/org/teiid/core/types/TransformationException.java 2012-06-13 13:57:08 UTC (rev 4177) @@ -48,7 +48,10 @@ super(message); } - + public TransformationException(Exception e) { + super(e); + } + /** * Construct an instance from a message and an exception to chain to this one. * Modified: trunk/engine/src/main/java/org/teiid/api/exception/query/ExpressionEvaluationException.java =================================================================== --- trunk/engine/src/main/java/org/teiid/api/exception/query/ExpressionEvaluationException.java 2012-06-12 17:03:58 UTC (rev 4176) +++ trunk/engine/src/main/java/org/teiid/api/exception/query/ExpressionEvaluationException.java 2012-06-13 13:57:08 UTC (rev 4177) @@ -48,6 +48,10 @@ super( message ); } + public ExpressionEvaluationException(Throwable e) { + super(e); + } + /** * Construct an instance from a message and an exception to chain to this one. * Modified: trunk/engine/src/main/java/org/teiid/api/exception/query/FunctionExecutionException.java =================================================================== --- trunk/engine/src/main/java/org/teiid/api/exception/query/FunctionExecutionException.java 2012-06-12 17:03:58 UTC (rev 4176) +++ trunk/engine/src/main/java/org/teiid/api/exception/query/FunctionExecutionException.java 2012-06-13 13:57:08 UTC (rev 4177) @@ -47,6 +47,10 @@ super( message ); } + public FunctionExecutionException(Throwable e) { + super(e); + } + /** * Construct an instance from a message and an exception to chain to this one. * Modified: trunk/engine/src/main/java/org/teiid/api/exception/query/QueryPlannerException.java =================================================================== --- trunk/engine/src/main/java/org/teiid/api/exception/query/QueryPlannerException.java 2012-06-12 17:03:58 UTC (rev 4176) +++ trunk/engine/src/main/java/org/teiid/api/exception/query/QueryPlannerException.java 2012-06-13 13:57:08 UTC (rev 4177) @@ -49,6 +49,10 @@ super( message ); } + public QueryPlannerException(Throwable e) { + super(e); + } + /** * Construct an instance from a message and an exception to chain to this one. * Modified: trunk/engine/src/main/java/org/teiid/api/exception/query/QueryProcessingException.java =================================================================== --- trunk/engine/src/main/java/org/teiid/api/exception/query/QueryProcessingException.java 2012-06-12 17:03:58 UTC (rev 4176) +++ trunk/engine/src/main/java/org/teiid/api/exception/query/QueryProcessingException.java 2012-06-13 13:57:08 UTC (rev 4177) @@ -48,6 +48,10 @@ public QueryProcessingException( String message ) { super( message ); } + + public QueryProcessingException(Throwable e) { + super(e); + } /** * Construct an instance from a message and an exception to chain to this one. Modified: trunk/engine/src/main/java/org/teiid/api/exception/query/QueryResolverException.java =================================================================== --- trunk/engine/src/main/java/org/teiid/api/exception/query/QueryResolverException.java 2012-06-12 17:03:58 UTC (rev 4176) +++ trunk/engine/src/main/java/org/teiid/api/exception/query/QueryResolverException.java 2012-06-13 13:57:08 UTC (rev 4177) @@ -51,6 +51,10 @@ super( message ); } + public QueryResolverException(Throwable e) { + super(e); + } + /** * Construct an instance from a message and an exception to chain to this one. * Modified: trunk/engine/src/main/java/org/teiid/api/exception/query/QueryValidatorException.java =================================================================== --- trunk/engine/src/main/java/org/teiid/api/exception/query/QueryValidatorException.java 2012-06-12 17:03:58 UTC (rev 4176) +++ trunk/engine/src/main/java/org/teiid/api/exception/query/QueryValidatorException.java 2012-06-13 13:57:08 UTC (rev 4177) @@ -48,6 +48,10 @@ super( message ); } + public QueryValidatorException(Throwable e) { + super(e); + } + /** * Construct an instance from a message and an exception to chain to this one. * Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/DataTierTupleSource.java =================================================================== --- trunk/engine/src/main/java/org/teiid/dqp/internal/process/DataTierTupleSource.java 2012-06-12 17:03:58 UTC (rev 4176) +++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/DataTierTupleSource.java 2012-06-13 13:57:08 UTC (rev 4177) @@ -212,9 +212,9 @@ try { sqlxml = XMLSystemFunctions.saveToBufferManager(dtm.getBufferManager(), sxt); } catch (TeiidComponentException e) { - throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30501, e); + throw new TeiidRuntimeException(e); } catch (TeiidProcessingException e) { - throw new TeiidRuntimeException(QueryPlugin.Event.TEIID30502, e); + throw new TeiidRuntimeException(e); } return new XMLType(sqlxml); } Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/multisource/MultiSourcePlanToProcessConverter.java =================================================================== --- trunk/engine/src/main/java/org/teiid/dqp/internal/process/multisource/MultiSourcePlanToProcessConverter.java 2012-06-12 17:03:58 UTC (rev 4176) +++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/multisource/MultiSourcePlanToProcessConverter.java 2012-06-13 13:57:08 UTC (rev 4177) @@ -109,7 +109,7 @@ try { return multiSourceModify((AccessNode)node); } catch (TeiidProcessingException e) { - throw new QueryPlannerException(QueryPlugin.Event.TEIID30560, e, e.getMessage()); + throw new QueryPlannerException(e); } } else if (node instanceof ProjectIntoNode) { ProjectIntoNode pin = (ProjectIntoNode)node; Modified: trunk/engine/src/main/java/org/teiid/query/QueryPlugin.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/QueryPlugin.java 2012-06-12 17:03:58 UTC (rev 4176) +++ trunk/engine/src/main/java/org/teiid/query/QueryPlugin.java 2012-06-13 13:57:08 UTC (rev 4177) @@ -102,7 +102,6 @@ TEIID30059, TEIID30060, TEIID30061, - TEIID30062, TEIID30063, TEIID30064, TEIID30065, @@ -201,7 +200,6 @@ TEIID30182, TEIID30183, TEIID30184, - TEIID30186, TEIID30187, TEIID30188, TEIID30190, @@ -256,13 +254,11 @@ TEIID30243, TEIID30244, TEIID30245, - TEIID30246, TEIID30247, TEIID30248, TEIID30249, TEIID30250, TEIID30251, - TEIID30252, TEIID30253, TEIID30254, TEIID30257, @@ -283,7 +279,6 @@ TEIID30275, TEIID30278, TEIID30281, - TEIID30282, TEIID30283, TEIID30284, TEIID30285, @@ -308,27 +303,19 @@ TEIID30312, TEIID30314, TEIID30316, - TEIID30319, - TEIID30320, TEIID30323, TEIID30324, TEIID30326, - TEIID30327, TEIID30328, TEIID30329, - TEIID30330, TEIID30331, TEIID30333, TEIID30334, TEIID30335, TEIID30336, - TEIID30337, TEIID30338, - TEIID30339, TEIID30341, TEIID30342, - TEIID30343, - TEIID30344, TEIID30345, TEIID30347, TEIID30350, @@ -346,12 +333,9 @@ TEIID30365, TEIID30366, TEIID30367, - TEIID30369, - TEIID30370, TEIID30371, TEIID30372, TEIID30373, - TEIID30374, TEIID30375, TEIID30376, TEIID30377, @@ -399,8 +383,6 @@ TEIID30431, TEIID30432, TEIID30434, - TEIID30435, - TEIID30436, TEIID30437, TEIID30438, TEIID30439, @@ -453,8 +435,6 @@ TEIID30498, TEIID30499, TEIID30500, - TEIID30501, - TEIID30502, TEIID30503, TEIID30504, TEIID30505, @@ -497,7 +477,6 @@ TEIID30557, TEIID30558, TEIID30559, - TEIID30560, TEIID30561, TEIID30562, TEIID30563, Modified: trunk/engine/src/main/java/org/teiid/query/eval/Evaluator.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/eval/Evaluator.java 2012-06-12 17:03:58 UTC (rev 4176) +++ trunk/engine/src/main/java/org/teiid/query/eval/Evaluator.java 2012-06-13 13:57:08 UTC (rev 4177) @@ -404,7 +404,7 @@ try { values = vis.getCachedSet(ref.getValueExpression()); } catch (TeiidProcessingException e) { - throw new ExpressionEvaluationException(QueryPlugin.Event.TEIID30319, e, e.getMessage()); + throw new ExpressionEvaluationException(e); } if (values != null) { return values.contains(leftValue); @@ -417,7 +417,7 @@ try { valueIter = evaluateSubquery((SubquerySetCriteria)criteria, tuple); } catch (TeiidProcessingException e) { - throw new ExpressionEvaluationException(QueryPlugin.Event.TEIID30320, e, e.getMessage()); + throw new ExpressionEvaluationException(e); } } else { throw new AssertionError("unknown set criteria type"); //$NON-NLS-1$ @@ -495,7 +495,7 @@ try { valueIter = evaluateSubquery(criteria, tuple); } catch (TeiidProcessingException e) { - throw new ExpressionEvaluationException(QueryPlugin.Event.TEIID30324, e, e.getMessage()); + throw new ExpressionEvaluationException(e); } while(valueIter.hasNext()) { Object value = valueIter.next(); @@ -565,7 +565,7 @@ try { valueIter = evaluateSubquery(criteria, tuple); } catch (TeiidProcessingException e) { - throw new ExpressionEvaluationException(QueryPlugin.Event.TEIID30327, e, e.getMessage()); + throw new ExpressionEvaluationException(e); } if(valueIter.hasNext()) { return !criteria.isNegated(); @@ -670,7 +670,7 @@ } } } catch (TransformationException e) { - throw new ExpressionEvaluationException(QueryPlugin.Event.TEIID30330, e, e.getMessage()); + throw new ExpressionEvaluationException(e); } catch (SQLException e) { throw new ExpressionEvaluationException(QueryPlugin.Event.TEIID30331, e, e.getMessage()); } @@ -820,7 +820,7 @@ } }, function.getDelimiter(), function.getQuote()); } catch (TransformationException e) { - throw new ExpressionEvaluationException(QueryPlugin.Event.TEIID30337, e, e.getMessage()); + throw new ExpressionEvaluationException(e); } } @@ -833,7 +833,7 @@ try { return XMLSystemFunctions.xmlForest(context, namespaces(function.getNamespaces()), nameValuePairs); } catch (TeiidProcessingException e) { - throw new FunctionExecutionException(QueryPlugin.Event.TEIID30338, e, e.getMessage()); + throw new FunctionExecutionException(e); } } @@ -852,7 +852,7 @@ } return XMLSystemFunctions.xmlElement(context, function.getName(), namespaces(function.getNamespaces()), attributes, values); } catch (TeiidProcessingException e) { - throw new FunctionExecutionException(QueryPlugin.Event.TEIID30339, e, e.getMessage()); + throw new FunctionExecutionException(e); } } @@ -979,7 +979,7 @@ try { return dataMgr.lookupCodeValue(context, codeTableName, returnElementName, keyElementName, values[3]); } catch (TeiidProcessingException e) { - throw new ExpressionEvaluationException(QueryPlugin.Event.TEIID30343, e, e.getMessage()); + throw new ExpressionEvaluationException(e); } } @@ -995,7 +995,7 @@ try { valueIter = evaluateSubquery(scalarSubquery, tuple); } catch (TeiidProcessingException e) { - throw new ExpressionEvaluationException(QueryPlugin.Event.TEIID30344, e, e.getMessage()); + throw new ExpressionEvaluationException(e); } if(valueIter.hasNext()) { result = valueIter.next(); Modified: trunk/engine/src/main/java/org/teiid/query/function/FunctionDescriptor.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/function/FunctionDescriptor.java 2012-06-12 17:03:58 UTC (rev 4176) +++ trunk/engine/src/main/java/org/teiid/query/function/FunctionDescriptor.java 2012-06-13 13:57:08 UTC (rev 4177) @@ -248,7 +248,7 @@ } catch(IllegalAccessException e) { throw new FunctionExecutionException(QueryPlugin.Event.TEIID30385, e, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30385, method.toString())); } catch (TransformationException e) { - throw new FunctionExecutionException(QueryPlugin.Event.TEIID30386, e, e.getMessage()); + throw new FunctionExecutionException(e); } } Modified: trunk/engine/src/main/java/org/teiid/query/function/source/SecuritySystemFunctions.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/function/source/SecuritySystemFunctions.java 2012-06-12 17:03:58 UTC (rev 4176) +++ trunk/engine/src/main/java/org/teiid/query/function/source/SecuritySystemFunctions.java 2012-06-13 13:57:08 UTC (rev 4177) @@ -41,8 +41,8 @@ try { return eval.hasRole(SecurityFunctionEvaluator.DATA_ROLE, roleName); - } catch (TeiidComponentException err) { - throw new FunctionExecutionException(QueryPlugin.Event.TEIID30435, err, err.getMessage()); + } catch (TeiidComponentException e) { + throw new FunctionExecutionException(e); } } @@ -56,8 +56,8 @@ try { return eval.hasRole(roleType, roleName); - } catch (TeiidComponentException err) { - throw new FunctionExecutionException(QueryPlugin.Event.TEIID30436, err, err.getMessage()); + } catch (TeiidComponentException e) { + throw new FunctionExecutionException(e); } } Modified: trunk/engine/src/main/java/org/teiid/query/metadata/DDLMetadataRepository.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/metadata/DDLMetadataRepository.java 2012-06-12 17:03:58 UTC (rev 4176) +++ trunk/engine/src/main/java/org/teiid/query/metadata/DDLMetadataRepository.java 2012-06-13 13:57:08 UTC (rev 4177) @@ -22,6 +22,7 @@ package org.teiid.query.metadata; import org.teiid.metadata.MetadataFactory; +import org.teiid.query.QueryPlugin; import org.teiid.query.parser.ParseException; import org.teiid.query.parser.QueryParser; import org.teiid.translator.ExecutionFactory; @@ -35,7 +36,7 @@ try { QueryParser.getQueryParser().parseDDL(factory, factory.getRawMetadata()); } catch (ParseException e) { - throw new TranslatorException(e.getMessage()); + throw new TranslatorException(QueryPlugin.Event.TEIID30386, e); } super.loadMetadata(factory, executionFactory, connectionFactory); } Modified: trunk/engine/src/main/java/org/teiid/query/optimizer/QueryOptimizer.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/optimizer/QueryOptimizer.java 2012-06-12 17:03:58 UTC (rev 4176) +++ trunk/engine/src/main/java/org/teiid/query/optimizer/QueryOptimizer.java 2012-06-13 13:57:08 UTC (rev 4177) @@ -211,7 +211,7 @@ try { command = QueryRewriter.rewrite(command, metadata, context); } catch (TeiidProcessingException e) { - throw new QueryPlannerException(QueryPlugin.Event.TEIID30246, e, e.getMessage()); + throw new QueryPlannerException(e); } result = PROCEDURE_PLANNER.optimize(command, idGenerator, metadata, capFinder, analysisRecord, context); return result; Modified: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java 2012-06-12 17:03:58 UTC (rev 4176) +++ trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java 2012-06-13 13:57:08 UTC (rev 4177) @@ -179,7 +179,7 @@ try { plan = generatePlan(command, true); } catch (TeiidProcessingException e) { - throw new QueryPlannerException(QueryPlugin.Event.TEIID30252, e, e.getMessage()); + throw new QueryPlannerException(e); } if(debug) { Modified: trunk/engine/src/main/java/org/teiid/query/optimizer/xml/QueryUtil.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/optimizer/xml/QueryUtil.java 2012-06-12 17:03:58 UTC (rev 4176) +++ trunk/engine/src/main/java/org/teiid/query/optimizer/xml/QueryUtil.java 2012-06-13 13:57:08 UTC (rev 4177) @@ -106,7 +106,7 @@ try { return QueryRewriter.rewrite(query, metadata, context); } catch(TeiidProcessingException e) { - throw new QueryPlannerException(QueryPlugin.Event.TEIID30282, e, e.getMessage()); + throw new QueryPlannerException(e); } } Modified: trunk/engine/src/main/java/org/teiid/query/processor/relational/TupleSourceValueIterator.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/processor/relational/TupleSourceValueIterator.java 2012-06-12 17:03:58 UTC (rev 4176) +++ trunk/engine/src/main/java/org/teiid/query/processor/relational/TupleSourceValueIterator.java 2012-06-13 13:57:08 UTC (rev 4177) @@ -53,8 +53,8 @@ public boolean hasNext() throws TeiidComponentException{ try { return tupleSourceIterator.hasNext(); - } catch (TeiidProcessingException err) { - throw new TeiidComponentException(QueryPlugin.Event.TEIID30186, err, err.getMessage()); + } catch (TeiidProcessingException e) { + throw new TeiidComponentException(e); } } @@ -65,8 +65,8 @@ public Object next() throws TeiidComponentException{ try { return tupleSourceIterator.nextTuple().get(columnIndex); - } catch (TeiidProcessingException err) { - throw new TeiidComponentException(QueryPlugin.Event.TEIID30187, err, err.getMessage()); + } catch (TeiidProcessingException e) { + throw new TeiidComponentException(e); } } Modified: trunk/engine/src/main/java/org/teiid/query/resolver/ProcedureContainerResolver.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/resolver/ProcedureContainerResolver.java 2012-06-12 17:03:58 UTC (rev 4176) +++ trunk/engine/src/main/java/org/teiid/query/resolver/ProcedureContainerResolver.java 2012-06-13 13:57:08 UTC (rev 4177) @@ -187,7 +187,7 @@ try { return QueryResolver.resolveView(group, metadata.getVirtualPlan(group.getMetadataID()), SQLConstants.Reserved.SELECT, metadata).getUpdateInfo(); } catch (QueryValidatorException e) { - throw new QueryResolverException(QueryPlugin.Event.TEIID30062, e, e.getMessage()); + throw new QueryResolverException(e); } } Modified: trunk/engine/src/main/java/org/teiid/query/resolver/QueryResolver.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/resolver/QueryResolver.java 2012-06-12 17:03:58 UTC (rev 4176) +++ trunk/engine/src/main/java/org/teiid/query/resolver/QueryResolver.java 2012-06-13 13:57:08 UTC (rev 4177) @@ -276,7 +276,7 @@ // Resolve this command resolver.resolveCommand(currentCommand, resolverMetadata, resolveNullLiterals); } catch(QueryMetadataException e) { - throw new QueryResolverException(QueryPlugin.Event.TEIID30064, e, e.getMessage()); + throw new QueryResolverException(e); } // Flag that this command has been resolved. Modified: trunk/engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java 2012-06-12 17:03:58 UTC (rev 4176) +++ trunk/engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java 2012-06-13 13:57:08 UTC (rev 4177) @@ -623,10 +623,10 @@ query.setInto(null); insert.setQueryExpression(query); return rewriteInsert(correctDatatypes(insert)); - } catch (QueryMetadataException err) { - throw new QueryValidatorException(QueryPlugin.Event.TEIID30369, err, err.getMessage()); - } catch (TeiidComponentException err) { - throw new QueryValidatorException(QueryPlugin.Event.TEIID30370, err, err.getMessage()); + } catch (QueryMetadataException e) { + throw new QueryValidatorException(e); + } catch (TeiidComponentException e) { + throw new QueryValidatorException(e); } } @@ -1915,7 +1915,7 @@ try { return new Constant(FunctionMethods.convert(((Constant)value).getValue(), DataTypeManager.getDataTypeName(type)), es.getType()); } catch (FunctionExecutionException e) { - throw new QueryValidatorException(QueryPlugin.Event.TEIID30374, e, e.getMessage()); + throw new QueryValidatorException(e); } } return new Reference(es); Modified: trunk/runtime/src/main/java/org/teiid/runtime/RuntimePlugin.java =================================================================== --- trunk/runtime/src/main/java/org/teiid/runtime/RuntimePlugin.java 2012-06-12 17:03:58 UTC (rev 4176) +++ trunk/runtime/src/main/java/org/teiid/runtime/RuntimePlugin.java 2012-06-13 13:57:08 UTC (rev 4177) @@ -75,15 +75,12 @@ TEIID40053, TEIID40054, TEIID40055, - TEIID40056, - TEIID40057, TEIID40059, TEIID40062, TEIID40063, TEIID40064, TEIID40065, TEIID40067, - TEIID40068, TEIID40069, TEIID40070, TEIID40071, Modified: trunk/runtime/src/main/java/org/teiid/transport/LocalServerConnection.java =================================================================== --- trunk/runtime/src/main/java/org/teiid/transport/LocalServerConnection.java 2012-06-12 17:03:58 UTC (rev 4176) +++ trunk/runtime/src/main/java/org/teiid/transport/LocalServerConnection.java 2012-06-13 13:57:08 UTC (rev 4177) @@ -94,7 +94,7 @@ } catch (LogonException e) { // Propagate the original message as it contains the message we want // to give to the user - throw new ConnectionException(RuntimePlugin.Event.TEIID40068, e, e.getMessage()); + throw new ConnectionException(e); } catch (TeiidComponentException e) { if (e.getCause() instanceof CommunicationException) { throw (CommunicationException)e.getCause(); Modified: trunk/runtime/src/main/java/org/teiid/transport/LogonImpl.java =================================================================== --- trunk/runtime/src/main/java/org/teiid/transport/LogonImpl.java 2012-06-12 17:03:58 UTC (rev 4176) +++ trunk/runtime/src/main/java/org/teiid/transport/LogonImpl.java 2012-06-13 13:57:08 UTC (rev 4177) @@ -113,9 +113,9 @@ } return result; } catch (LoginException e) { - throw new LogonException(RuntimePlugin.Event.TEIID40056, e.getMessage()); + throw new LogonException(e); } catch (SessionServiceException e) { - throw new LogonException(RuntimePlugin.Event.TEIID40057, e, e.getMessage()); + throw new LogonException(e); } }