[teiid-commits] teiid SVN: r2552 - in branches/7.1.x: client/src/main/java/org/teiid/client and 28 other directories.

Author: rareddy Date: 2010-09-08 16:07:17 -0400 (Wed, 08 Sep 2010) New Revision: 2552 Removed: branches/7.1.x/client/src/main/java/org/teiid/net/NetPlugin.java branches/7.1.x/client/src/main/resources/org/teiid/net/i18n.properties branches/7.1.x/engine/src/main/java/org/teiid/dqp/DQPPlugin.java branches/7.1.x/engine/src/main/java/org/teiid/query/execution/QueryExecPlugin.java branches/7.1.x/engine/src/main/resources/org/teiid/dqp/i18n.properties branches/7.1.x/engine/src/main/resources/org/teiid/query/execution/i18n.properties Modified: branches/7.1.x/client/src/main/java/org/teiid/adminapi/AdminFactory.java branches/7.1.x/client/src/main/java/org/teiid/client/BatchSerializer.java branches/7.1.x/client/src/main/java/org/teiid/client/RequestMessage.java branches/7.1.x/client/src/main/java/org/teiid/client/lob/StreamingLobChunckProducer.java branches/7.1.x/client/src/main/java/org/teiid/net/TeiidURL.java branches/7.1.x/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java branches/7.1.x/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.java branches/7.1.x/client/src/main/java/org/teiid/net/socket/SocketUtil.java branches/7.1.x/client/src/main/resources/org/teiid/jdbc/i18n.properties branches/7.1.x/engine/src/main/java/org/teiid/common/buffer/LobManager.java branches/7.1.x/engine/src/main/java/org/teiid/common/buffer/TupleBuffer.java branches/7.1.x/engine/src/main/java/org/teiid/common/buffer/impl/BufferManagerImpl.java branches/7.1.x/engine/src/main/java/org/teiid/common/buffer/impl/FileStorageManager.java branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorManager.java branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorWorkItem.java branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/datamgr/ProcedureBatchHandler.java branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/AuthorizationValidationVisitor.java branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/CachedFinder.java branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/CachedResults.java branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/LobWorkItem.java branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/Request.java branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/RequestWorkItem.java branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/TransactionServerImpl.java branches/7.1.x/engine/src/main/java/org/teiid/query/metadata/TransformationMetadata.java branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/BatchedUpdatePlanner.java branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/ProcedurePlanner.java branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/PlanToProcessConverter.java branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/CriteriaCapabilityValidatorVisitor.java branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/FrameUtil.java branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleAccessPatternValidation.java branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePlanJoins.java branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePlanProcedures.java branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePushSelectCriteria.java branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleValidateWhereAll.java branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/xml/CriteriaPlanner.java branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/xml/QueryUtil.java branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/xml/XMLNodeMappingVisitor.java branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/xml/XMLPlanner.java branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/xml/XMLQueryPlanner.java branches/7.1.x/engine/src/main/java/org/teiid/query/processor/QueryProcessor.java branches/7.1.x/engine/src/main/java/org/teiid/query/processor/proc/ExecDynamicSqlInstruction.java branches/7.1.x/engine/src/main/java/org/teiid/query/processor/proc/ProcedurePlan.java branches/7.1.x/engine/src/main/java/org/teiid/query/processor/relational/AccessNode.java branches/7.1.x/engine/src/main/java/org/teiid/query/processor/relational/BatchedUpdateNode.java branches/7.1.x/engine/src/main/java/org/teiid/query/processor/relational/ProjectNode.java branches/7.1.x/engine/src/main/java/org/teiid/query/processor/relational/TextTableNode.java branches/7.1.x/engine/src/main/java/org/teiid/query/processor/relational/XMLTableNode.java branches/7.1.x/engine/src/main/java/org/teiid/query/processor/xml/AbortProcessingInstruction.java branches/7.1.x/engine/src/main/java/org/teiid/query/processor/xml/AddNodeInstruction.java branches/7.1.x/engine/src/main/java/org/teiid/query/processor/xml/MoveDocInstruction.java branches/7.1.x/engine/src/main/java/org/teiid/query/processor/xml/NodeDescriptor.java branches/7.1.x/engine/src/main/java/org/teiid/query/processor/xml/RecurseProgramCondition.java branches/7.1.x/engine/src/main/java/org/teiid/query/processor/xml/RelationalPlanExecutor.java branches/7.1.x/engine/src/main/java/org/teiid/query/processor/xml/XMLContext.java branches/7.1.x/engine/src/main/java/org/teiid/query/processor/xml/XMLPlan.java branches/7.1.x/engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java branches/7.1.x/engine/src/main/java/org/teiid/query/tempdata/TempTableDataManager.java branches/7.1.x/engine/src/main/java/org/teiid/query/tempdata/TempTableStore.java branches/7.1.x/engine/src/main/java/org/teiid/query/util/CommandContext.java branches/7.1.x/engine/src/main/resources/org/teiid/query/i18n.properties branches/7.1.x/runtime/src/main/java/org/teiid/transport/LocalServerConnection.java branches/7.1.x/runtime/src/main/java/org/teiid/transport/SSLAwareChannelHandler.java branches/7.1.x/runtime/src/main/java/org/teiid/transport/SocketClientInstance.java branches/7.1.x/runtime/src/main/resources/org/teiid/runtime/i18n.properties Log: TEIID-1027: Consolidating the property files in engine and client. Modified: branches/7.1.x/client/src/main/java/org/teiid/adminapi/AdminFactory.java =================================================================== --- branches/7.1.x/client/src/main/java/org/teiid/adminapi/AdminFactory.java 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/client/src/main/java/org/teiid/adminapi/AdminFactory.java 2010-09-08 20:07:17 UTC (rev 2552) @@ -32,9 +32,9 @@ import org.teiid.client.util.ExceptionUtil; import org.teiid.core.TeiidRuntimeException; import org.teiid.core.util.PropertiesUtils; +import org.teiid.jdbc.JDBCPlugin; import org.teiid.net.CommunicationException; import org.teiid.net.ConnectionException; -import org.teiid.net.NetPlugin; import org.teiid.net.ServerConnection; import org.teiid.net.ServerConnectionFactory; import org.teiid.net.TeiidURL; @@ -64,7 +64,7 @@ private synchronized Admin getTarget() throws AdminComponentException { if (closed) { - throw new AdminComponentException(NetPlugin.Util.getString("admin_conn_closed")); //$NON-NLS-1$ + throw new AdminComponentException(JDBCPlugin.Util.getString("admin_conn_closed")); //$NON-NLS-1$ } return target; } @@ -186,7 +186,7 @@ String applicationName) throws AdminException { if (userName == null || userName.trim().length() == 0) { - throw new IllegalArgumentException(NetPlugin.Util.getString("invalid_parameter")); //$NON-NLS-1$ + throw new IllegalArgumentException(JDBCPlugin.Util.getString("invalid_parameter")); //$NON-NLS-1$ } final Properties p = new Properties(); Modified: branches/7.1.x/client/src/main/java/org/teiid/client/BatchSerializer.java =================================================================== --- branches/7.1.x/client/src/main/java/org/teiid/client/BatchSerializer.java 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/client/src/main/java/org/teiid/client/BatchSerializer.java 2010-09-08 20:07:17 UTC (rev 2552) @@ -35,7 +35,7 @@ import java.util.Map; import org.teiid.core.types.DataTypeManager; -import org.teiid.net.NetPlugin; +import org.teiid.jdbc.JDBCPlugin; @@ -380,7 +380,7 @@ break objectSearch; } } - throw new IOException(NetPlugin.Util.getString("BatchSerializer.datatype_mismatch", new Object[] {types[i], new Integer(i), objectClass})); //$NON-NLS-1$ + throw new IOException(JDBCPlugin.Util.getString("BatchSerializer.datatype_mismatch", new Object[] {types[i], new Integer(i), objectClass})); //$NON-NLS-1$ } } } Modified: branches/7.1.x/client/src/main/java/org/teiid/client/RequestMessage.java =================================================================== --- branches/7.1.x/client/src/main/java/org/teiid/client/RequestMessage.java 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/client/src/main/java/org/teiid/client/RequestMessage.java 2010-09-08 20:07:17 UTC (rev 2552) @@ -33,7 +33,7 @@ import org.teiid.core.TeiidProcessingException; import org.teiid.core.util.ExternalizeUtil; -import org.teiid.net.NetPlugin; +import org.teiid.jdbc.JDBCPlugin; /** @@ -221,7 +221,7 @@ if (!(txnAutoWrapMode.equals(TXN_WRAP_OFF) || txnAutoWrapMode.equals(TXN_WRAP_ON) || txnAutoWrapMode.equals(TXN_WRAP_DETECT))) { - throw new TeiidProcessingException(NetPlugin.Util.getString("RequestMessage.invalid_txnAutoWrap", txnAutoWrapMode)); //$NON-NLS-1$ + throw new TeiidProcessingException(JDBCPlugin.Util.getString("RequestMessage.invalid_txnAutoWrap", txnAutoWrapMode)); //$NON-NLS-1$ } } this.txnAutoWrapMode = txnAutoWrapMode; Modified: branches/7.1.x/client/src/main/java/org/teiid/client/lob/StreamingLobChunckProducer.java =================================================================== --- branches/7.1.x/client/src/main/java/org/teiid/client/lob/StreamingLobChunckProducer.java 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/client/src/main/java/org/teiid/client/lob/StreamingLobChunckProducer.java 2010-09-08 20:07:17 UTC (rev 2552) @@ -29,7 +29,7 @@ import org.teiid.client.DQP; import org.teiid.core.TeiidException; import org.teiid.core.types.Streamable; -import org.teiid.net.NetPlugin; +import org.teiid.jdbc.JDBCPlugin; public class StreamingLobChunckProducer implements LobChunkProducer { @@ -71,7 +71,7 @@ Future<LobChunk> result = dqp.requestNextLobChunk(streamRequestId, requestId, streamable.getReferenceStreamId()); return result.get(); } catch (Exception e) { - IOException ex = new IOException(NetPlugin.Util.getString("StreamImpl.Unable_to_read_data_from_stream", e.getMessage())); //$NON-NLS-1$ + IOException ex = new IOException(JDBCPlugin.Util.getString("StreamImpl.Unable_to_read_data_from_stream", e.getMessage())); //$NON-NLS-1$ ex.initCause(e); throw ex; } Deleted: branches/7.1.x/client/src/main/java/org/teiid/net/NetPlugin.java =================================================================== --- branches/7.1.x/client/src/main/java/org/teiid/net/NetPlugin.java 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/client/src/main/java/org/teiid/net/NetPlugin.java 2010-09-08 20:07:17 UTC (rev 2552) @@ -1,35 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package org.teiid.net; - -import java.util.ResourceBundle; - -import org.teiid.core.BundleUtil; - -public class NetPlugin { - - public static final String PLUGIN_ID = NetPlugin.class.getPackage().getName(); - - public static final BundleUtil Util = new BundleUtil(PLUGIN_ID, - PLUGIN_ID + ".i18n", ResourceBundle.getBundle(PLUGIN_ID + ".i18n")); //$NON-NLS-1$ //$NON-NLS-2$ -} Modified: branches/7.1.x/client/src/main/java/org/teiid/net/TeiidURL.java =================================================================== --- branches/7.1.x/client/src/main/java/org/teiid/net/TeiidURL.java 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/client/src/main/java/org/teiid/net/TeiidURL.java 2010-09-08 20:07:17 UTC (rev 2552) @@ -29,7 +29,9 @@ import java.util.NoSuchElementException; import java.util.StringTokenizer; +import org.teiid.jdbc.JDBCPlugin; + /** * Class defines the URL in the Teiid. * @@ -92,7 +94,7 @@ public static final String FORMAT_SERVER = "mm[s]://server1:port1[,server2:port2]"; //$NON-NLS-1$ - public static final String INVALID_FORMAT_SERVER = NetPlugin.Util.getString("MMURL.INVALID_FORMAT", new Object[] {FORMAT_SERVER}); //$NON-NLS-1$ + public static final String INVALID_FORMAT_SERVER = JDBCPlugin.Util.getString("MMURL.INVALID_FORMAT", new Object[] {FORMAT_SERVER}); //$NON-NLS-1$ Modified: branches/7.1.x/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java =================================================================== --- branches/7.1.x/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java 2010-09-08 20:07:17 UTC (rev 2552) @@ -49,10 +49,10 @@ import org.teiid.client.util.ResultsFuture; import org.teiid.core.TeiidComponentException; import org.teiid.core.TeiidException; +import org.teiid.jdbc.JDBCPlugin; import org.teiid.net.CommunicationException; import org.teiid.net.ConnectionException; import org.teiid.net.HostInfo; -import org.teiid.net.NetPlugin; import org.teiid.net.ServerConnection; import org.teiid.net.TeiidURL; @@ -103,7 +103,7 @@ public synchronized SocketServerInstance selectServerInstance() throws CommunicationException, ConnectionException { if (closed) { - throw new CommunicationException(NetPlugin.Util.getString("SocketServerConnection.closed")); //$NON-NLS-1$ + throw new CommunicationException(JDBCPlugin.Util.getString("SocketServerConnection.closed")); //$NON-NLS-1$ } if (this.serverInstance != null && (!failOver || this.serverInstance.isOpen())) { return this.serverInstance; @@ -145,7 +145,7 @@ if (e.getCause() instanceof CommunicationException) { throw (CommunicationException)e.getCause(); } - throw new CommunicationException(e, NetPlugin.Util.getString("PlatformServerConnectionFactory.Unable_to_find_a_component_used_in_logging_on_to")); //$NON-NLS-1$ + throw new CommunicationException(e, JDBCPlugin.Util.getString("PlatformServerConnectionFactory.Unable_to_find_a_component_used_in_logging_on_to")); //$NON-NLS-1$ } } return this.serverInstance; @@ -157,13 +157,13 @@ this.serverDiscovery.markInstanceAsBad(hostInfo); if (knownHosts == 1) { //just a single host, use the exception if (ex instanceof UnknownHostException) { - throw new SingleInstanceCommunicationException(ex, NetPlugin.Util.getString("SocketServerInstance.Connection_Error.Unknown_Host", hostInfo.getHostName())); //$NON-NLS-1$ + throw new SingleInstanceCommunicationException(ex, JDBCPlugin.Util.getString("SocketServerInstance.Connection_Error.Unknown_Host", hostInfo.getHostName())); //$NON-NLS-1$ } - throw new SingleInstanceCommunicationException(ex,NetPlugin.Util.getString("SocketServerInstance.Connection_Error.Connect_Failed", hostInfo.getHostName(), String.valueOf(hostInfo.getPortNumber()), ex.getMessage())); //$NON-NLS-1$ + throw new SingleInstanceCommunicationException(ex,JDBCPlugin.Util.getString("SocketServerInstance.Connection_Error.Connect_Failed", hostInfo.getHostName(), String.valueOf(hostInfo.getPortNumber()), ex.getMessage())); //$NON-NLS-1$ } log.log(Level.FINE, "Unable to connect to host", ex); //$NON-NLS-1$ } - throw new CommunicationException(NetPlugin.Util.getString("SocketServerInstancePool.No_valid_host_available", hostCopy.toString())); //$NON-NLS-1$ + throw new CommunicationException(JDBCPlugin.Util.getString("SocketServerInstancePool.No_valid_host_available", hostCopy.toString())); //$NON-NLS-1$ } private ILogon connect(HostInfo hostInfo) throws CommunicationException, Modified: branches/7.1.x/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.java =================================================================== --- branches/7.1.x/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.java 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.java 2010-09-08 20:07:17 UTC (rev 2552) @@ -52,9 +52,9 @@ import org.teiid.core.crypto.Cryptor; import org.teiid.core.crypto.DhKeyGenerator; import org.teiid.core.crypto.NullCryptor; +import org.teiid.jdbc.JDBCPlugin; import org.teiid.net.CommunicationException; import org.teiid.net.HostInfo; -import org.teiid.net.NetPlugin; /** @@ -112,7 +112,7 @@ Object obj = this.socketChannel.read(); if (!(obj instanceof Handshake)) { - throw new CommunicationException(NetPlugin.Util.getString("SocketServerInstanceImpl.handshake_error")); //$NON-NLS-1$ + throw new CommunicationException(JDBCPlugin.Util.getString("SocketServerInstanceImpl.handshake_error")); //$NON-NLS-1$ } handshake = (Handshake)obj; break; Modified: branches/7.1.x/client/src/main/java/org/teiid/net/socket/SocketUtil.java =================================================================== --- branches/7.1.x/client/src/main/java/org/teiid/net/socket/SocketUtil.java 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/client/src/main/java/org/teiid/net/socket/SocketUtil.java 2010-09-08 20:07:17 UTC (rev 2552) @@ -43,7 +43,7 @@ import javax.net.ssl.TrustManagerFactory; import org.teiid.core.util.Assertion; -import org.teiid.net.NetPlugin; +import org.teiid.jdbc.JDBCPlugin; @@ -208,7 +208,7 @@ try { stream = new FileInputStream(name); } catch (FileNotFoundException e) { - IOException exception = new IOException(NetPlugin.Util.getString("SocketHelper.keystore_not_found", name)); //$NON-NLS-1$ + IOException exception = new IOException(JDBCPlugin.Util.getString("SocketHelper.keystore_not_found", name)); //$NON-NLS-1$ exception.initCause(e); throw exception; } Modified: branches/7.1.x/client/src/main/resources/org/teiid/jdbc/i18n.properties =================================================================== --- branches/7.1.x/client/src/main/resources/org/teiid/jdbc/i18n.properties 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/client/src/main/resources/org/teiid/jdbc/i18n.properties 2010-09-08 20:07:17 UTC (rev 2552) @@ -91,7 +91,7 @@ MMDataSource.Alternate_Servers_format=The format for the alternateServers property is <server2>[:<port2>][,<server3>[:<port3>],...]. MMDataSource.alternateServer_is_invalid=The alternateServers property contains the following {0} error(s): {1} StreamImpl.Unable_to_read_data_from_stream=Unable to read data from the stream: {0} -LocalTransportHandler.Transport_shutdown=Tranport has been shutdown. + MMStatement.Invalid_During_Transaction=Call to method {0} not valid during a transaction. StoredProcedureResultsImpl.ResultSet_cursor_is_after_the_last_row._1=ResultSet cursor is after the last row. StoredProcedureResultsImpl.Invalid_parameter_index__{0}_2=Invalid parameter index: {0} @@ -128,3 +128,24 @@ StatementImpl.show_update_count=SHOW does not return an update count StatementImpl.set_result_set=SET does not return a result set. + +StreamImpl.Unable_to_read_data_from_stream=Unable to read data from the stream: {0} +RequestMessage.invalid_txnAutoWrap=''{0}'' is an invalid transaction autowrap mode. +LocalTransportHandler.Transport_shutdown=Tranport has been shutdown. +PlatformServerConnectionFactory.Unable_to_find_a_component_used_in_logging_on_to=Unable to find a component used authenticate on to Teiid + +admin_conn_closed = The Admin connection has been closed. +invalid_parameter = The user parameter may not be null or empty. + +SocketServerInstance.Connection_Error.Unknown_Host = Error establishing socket. Unknown host: {0} +SocketServerInstance.Connection_Error.Connect_Failed = Error establishing socket to host and port: {0}:{1}. Reason: {2} +SocketServerInstancePool.No_valid_host_available=No valid host available. Attempted connections to: {0} +SocketServerInstanceImpl.handshake_error=Handshake error + + +SocketServerConnection.closed=Server connection is closed +SocketHelper.keystore_not_found=Key store ''{0}'' was not found. + +MMURL.INVALID_FORMAT=The required url format is {0} + +BatchSerializer.datatype_mismatch=The modeled datatype {0} for column {1} doesn''t match the runtime type "{2}". Please ensure that the column''s modeled datatype matches the expected data. Deleted: branches/7.1.x/client/src/main/resources/org/teiid/net/i18n.properties =================================================================== --- branches/7.1.x/client/src/main/resources/org/teiid/net/i18n.properties 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/client/src/main/resources/org/teiid/net/i18n.properties 2010-09-08 20:07:17 UTC (rev 2552) @@ -1,44 +0,0 @@ -# -# JBoss, Home of Professional Open Source. -# See the COPYRIGHT.txt file distributed with this work for information -# regarding copyright ownership. Some portions may be licensed -# to Red Hat, Inc. under one or more contributor license agreements. -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301 USA. -# - -StreamImpl.Unable_to_read_data_from_stream=Unable to read data from the stream: {0} -RequestMessage.invalid_txnAutoWrap=''{0}'' is an invalid transaction autowrap mode. -LocalTransportHandler.Transport_shutdown=Tranport has been shutdown. -PlatformServerConnectionFactory.Unable_to_find_a_component_used_in_logging_on_to=Unable to find a component used authenticate on to Teiid - -admin_conn_closed = The Admin connection has been closed. -invalid_parameter = The user parameter may not be null or empty. - -SocketServerInstance.Connection_Error.Unknown_Host = Error establishing socket. Unknown host: {0} -SocketServerInstance.Connection_Error.Connect_Failed = Error establishing socket to host and port: {0}:{1}. Reason: {2} -SocketServerInstancePool.No_valid_host_available=No valid host available. Attempted connections to: {0} -SocketServerInstanceImpl.handshake_error=Handshake error -SocketClientInstance.invalid_sessionkey=Invalid session key used during handshake - -SSLAwareChannelHandler.channel_closed=Channel closed -SocketServerConnection.closed=Server connection is closed -SocketHelper.keystore_not_found=Key store ''{0}'' was not found. - -MMURL.INVALID_FORMAT=The required url format is {0} - -BatchSerializer.datatype_mismatch=The modeled datatype {0} for column {1} doesn''t match the runtime type "{2}". Please ensure that the column''s modeled datatype matches the expected data. - Modified: branches/7.1.x/engine/src/main/java/org/teiid/common/buffer/LobManager.java =================================================================== --- branches/7.1.x/engine/src/main/java/org/teiid/common/buffer/LobManager.java 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/engine/src/main/java/org/teiid/common/buffer/LobManager.java 2010-09-08 20:07:17 UTC (rev 2552) @@ -30,7 +30,7 @@ import org.teiid.core.TeiidComponentException; import org.teiid.core.types.DataTypeManager; import org.teiid.core.types.Streamable; -import org.teiid.dqp.DQPPlugin; +import org.teiid.query.QueryPlugin; import org.teiid.query.sql.symbol.Expression; /** @@ -64,7 +64,7 @@ lob = this.lobReferences.get(id); } if (lob == null) { - throw new TeiidComponentException(DQPPlugin.Util.getString("ProcessWorker.wrongdata")); //$NON-NLS-1$ + throw new TeiidComponentException(QueryPlugin.Util.getString("ProcessWorker.wrongdata")); //$NON-NLS-1$ } return lob; } Modified: branches/7.1.x/engine/src/main/java/org/teiid/common/buffer/TupleBuffer.java =================================================================== --- branches/7.1.x/engine/src/main/java/org/teiid/common/buffer/TupleBuffer.java 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/engine/src/main/java/org/teiid/common/buffer/TupleBuffer.java 2010-09-08 20:07:17 UTC (rev 2552) @@ -32,10 +32,10 @@ import org.teiid.core.types.DataTypeManager; import org.teiid.core.types.Streamable; import org.teiid.core.util.Assertion; -import org.teiid.dqp.DQPPlugin; import org.teiid.logging.LogConstants; import org.teiid.logging.LogManager; import org.teiid.logging.MessageLevel; +import org.teiid.query.QueryPlugin; import org.teiid.query.sql.symbol.Expression; @@ -259,7 +259,7 @@ public Streamable<?> getLobReference(String id) throws TeiidComponentException { if (lobManager == null) { - throw new TeiidComponentException(DQPPlugin.Util.getString("ProcessWorker.wrongdata")); //$NON-NLS-1$ + throw new TeiidComponentException(QueryPlugin.Util.getString("ProcessWorker.wrongdata")); //$NON-NLS-1$ } return lobManager.getLobReference(id); } Modified: branches/7.1.x/engine/src/main/java/org/teiid/common/buffer/impl/BufferManagerImpl.java =================================================================== --- branches/7.1.x/engine/src/main/java/org/teiid/common/buffer/impl/BufferManagerImpl.java 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/engine/src/main/java/org/teiid/common/buffer/impl/BufferManagerImpl.java 2010-09-08 20:07:17 UTC (rev 2552) @@ -63,7 +63,7 @@ import org.teiid.core.util.Assertion; import org.teiid.logging.LogConstants; import org.teiid.logging.LogManager; -import org.teiid.query.execution.QueryExecPlugin; +import org.teiid.query.QueryPlugin; import org.teiid.query.processor.relational.ListNestedSortComparator; @@ -291,9 +291,9 @@ } return batch; } catch(IOException e) { - throw new TeiidComponentException(e, QueryExecPlugin.Util.getString("FileStoreageManager.error_reading", batchManager.id)); //$NON-NLS-1$ + throw new TeiidComponentException(e, QueryPlugin.Util.getString("FileStoreageManager.error_reading", batchManager.id)); //$NON-NLS-1$ } catch (ClassNotFoundException e) { - throw new TeiidComponentException(e, QueryExecPlugin.Util.getString("FileStoreageManager.error_reading", batchManager.id)); //$NON-NLS-1$ + throw new TeiidComponentException(e, QueryPlugin.Util.getString("FileStoreageManager.error_reading", batchManager.id)); //$NON-NLS-1$ } finally { this.batchManager.compactionLock.readLock().unlock(); } Modified: branches/7.1.x/engine/src/main/java/org/teiid/common/buffer/impl/FileStorageManager.java =================================================================== --- branches/7.1.x/engine/src/main/java/org/teiid/common/buffer/impl/FileStorageManager.java 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/engine/src/main/java/org/teiid/common/buffer/impl/FileStorageManager.java 2010-09-08 20:07:17 UTC (rev 2552) @@ -38,7 +38,7 @@ import org.teiid.core.util.Assertion; import org.teiid.logging.LogManager; import org.teiid.logging.MessageLevel; -import org.teiid.query.execution.QueryExecPlugin; +import org.teiid.query.QueryPlugin; /** @@ -116,7 +116,7 @@ fileAccess.seek(fileOffset - entry.getKey()); return fileAccess.read(b, offSet, length); } catch (IOException e) { - throw new TeiidComponentException(e, QueryExecPlugin.Util.getString("FileStoreageManager.error_reading", fileInfo.file.getAbsoluteFile())); //$NON-NLS-1$ + throw new TeiidComponentException(e, QueryPlugin.Util.getString("FileStoreageManager.error_reading", fileInfo.file.getAbsoluteFile())); //$NON-NLS-1$ } finally { fileInfo.close(); } @@ -130,7 +130,7 @@ long used = usedBufferSpace.addAndGet(length); if (used > maxBufferSpace) { usedBufferSpace.addAndGet(-length); - throw new TeiidComponentException(QueryExecPlugin.Util.getString("FileStoreageManager.space_exhausted", maxBufferSpace)); //$NON-NLS-1$ + throw new TeiidComponentException(QueryPlugin.Util.getString("FileStoreageManager.space_exhausted", maxBufferSpace)); //$NON-NLS-1$ } Map.Entry<Long, FileInfo> entry = this.storageFiles.lastEntry(); boolean createNew = false; @@ -159,7 +159,7 @@ fileAccess.seek(pointer); fileAccess.write(bytes, offset, length); } catch(IOException e) { - throw new TeiidComponentException(e, QueryExecPlugin.Util.getString("FileStoreageManager.error_reading", fileInfo.file.getAbsoluteFile())); //$NON-NLS-1$ + throw new TeiidComponentException(e, QueryPlugin.Util.getString("FileStoreageManager.error_reading", fileInfo.file.getAbsoluteFile())); //$NON-NLS-1$ } finally { fileInfo.close(); } @@ -202,17 +202,17 @@ */ public void initialize() throws TeiidComponentException { if(this.directory == null) { - throw new TeiidComponentException(QueryExecPlugin.Util.getString("FileStoreageManager.no_directory")); //$NON-NLS-1$ + throw new TeiidComponentException(QueryPlugin.Util.getString("FileStoreageManager.no_directory")); //$NON-NLS-1$ } dirFile = new File(this.directory); if(dirFile.exists()) { if(! dirFile.isDirectory()) { - throw new TeiidComponentException(QueryExecPlugin.Util.getString("FileStoreageManager.not_a_directory", dirFile.getAbsoluteFile())); //$NON-NLS-1$ + throw new TeiidComponentException(QueryPlugin.Util.getString("FileStoreageManager.not_a_directory", dirFile.getAbsoluteFile())); //$NON-NLS-1$ } } else if(! dirFile.mkdirs()) { - throw new TeiidComponentException(QueryExecPlugin.Util.getString("FileStoreageManager.error_creating", dirFile.getAbsoluteFile())); //$NON-NLS-1$ + throw new TeiidComponentException(QueryPlugin.Util.getString("FileStoreageManager.error_creating", dirFile.getAbsoluteFile())); //$NON-NLS-1$ } } @@ -240,7 +240,7 @@ } return storageFile; } catch(IOException e) { - throw new TeiidComponentException(e, QueryExecPlugin.Util.getString("FileStoreageManager.error_creating", name + "_" + fileNumber)); //$NON-NLS-1$ //$NON-NLS-2$ + throw new TeiidComponentException(e, QueryPlugin.Util.getString("FileStoreageManager.error_creating", name + "_" + fileNumber)); //$NON-NLS-1$ //$NON-NLS-2$ } } Deleted: branches/7.1.x/engine/src/main/java/org/teiid/dqp/DQPPlugin.java =================================================================== --- branches/7.1.x/engine/src/main/java/org/teiid/dqp/DQPPlugin.java 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/engine/src/main/java/org/teiid/dqp/DQPPlugin.java 2010-09-08 20:07:17 UTC (rev 2552) @@ -1,39 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package org.teiid.dqp; - -import java.util.ResourceBundle; - -import org.teiid.core.BundleUtil; - - -/** - * DQPPlugin - */ -public class DQPPlugin { - - public static final String PLUGIN_ID = DQPPlugin.class.getPackage().getName(); - public static final BundleUtil Util = new BundleUtil(PLUGIN_ID, - PLUGIN_ID + ".i18n", ResourceBundle.getBundle(PLUGIN_ID + ".i18n")); //$NON-NLS-1$ //$NON-NLS-2$ - -} Modified: branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorManager.java =================================================================== --- branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorManager.java 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorManager.java 2010-09-08 20:07:17 UTC (rev 2552) @@ -37,7 +37,6 @@ import org.teiid.core.TeiidComponentException; import org.teiid.core.util.Assertion; -import org.teiid.dqp.DQPPlugin; import org.teiid.dqp.message.AtomicRequestID; import org.teiid.dqp.message.AtomicRequestMessage; import org.teiid.logging.CommandLogMessage; @@ -48,6 +47,7 @@ import org.teiid.metadata.Datatype; import org.teiid.metadata.MetadataFactory; import org.teiid.metadata.MetadataStore; +import org.teiid.query.QueryPlugin; import org.teiid.query.optimizer.capabilities.BasicSourceCapabilities; import org.teiid.query.optimizer.capabilities.SourceCapabilities; import org.teiid.query.optimizer.capabilities.SourceCapabilities.Scope; @@ -90,12 +90,12 @@ if (ef.isSourceRequired()) { Object conn = getConnectionFactory(); if (conn == null) { - sb.append(DQPPlugin.Util.getString("datasource_not_found", this.connectionName)); //$NON-NLS-1$ + sb.append(QueryPlugin.Util.getString("datasource_not_found", this.connectionName)); //$NON-NLS-1$ } } } else { - sb.append(DQPPlugin.Util.getString("translator_not_found", this.translatorName)); //$NON-NLS-1$ + sb.append(QueryPlugin.Util.getString("translator_not_found", this.translatorName)); //$NON-NLS-1$ } return sb.toString(); } @@ -110,7 +110,7 @@ try { unwrapped = ((WrappedConnection)connection).unwrap(); } catch (ResourceException e) { - throw new TranslatorException(DQPPlugin.Util.getString("failed_to_unwrap_connection")); //$NON-NLS-1$ + throw new TranslatorException(QueryPlugin.Util.getString("failed_to_unwrap_connection")); //$NON-NLS-1$ } } @@ -168,7 +168,7 @@ * @throws TranslatorException */ public void start() { - LogManager.logDetail(LogConstants.CTX_CONNECTOR, DQPPlugin.Util.getString("ConnectorManagerImpl.Initializing_connector", translatorName)); //$NON-NLS-1$ + LogManager.logDetail(LogConstants.CTX_CONNECTOR, QueryPlugin.Util.getString("ConnectorManagerImpl.Initializing_connector", translatorName)); //$NON-NLS-1$ } /** @@ -257,7 +257,7 @@ private void checkStatus() throws TeiidComponentException { if (stopped) { - throw new TeiidComponentException(DQPPlugin.Util.getString("ConnectorManager.not_in_valid_state", this.translatorName)); //$NON-NLS-1$ + throw new TeiidComponentException(QueryPlugin.Util.getString("ConnectorManager.not_in_valid_state", this.translatorName)); //$NON-NLS-1$ } } Modified: branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorWorkItem.java =================================================================== --- branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorWorkItem.java 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorWorkItem.java 2010-09-08 20:07:17 UTC (rev 2552) @@ -34,7 +34,6 @@ import org.teiid.common.buffer.TupleBuffer; import org.teiid.core.TeiidProcessingException; import org.teiid.core.util.Assertion; -import org.teiid.dqp.DQPPlugin; import org.teiid.dqp.message.AtomicRequestID; import org.teiid.dqp.message.AtomicRequestMessage; import org.teiid.dqp.message.AtomicResultsMessage; @@ -44,6 +43,7 @@ import org.teiid.logging.LogManager; import org.teiid.logging.CommandLogMessage.Event; import org.teiid.metadata.RuntimeMetadata; +import org.teiid.query.QueryPlugin; import org.teiid.query.metadata.QueryMetadataInterface; import org.teiid.query.metadata.TempMetadataAdapter; import org.teiid.query.metadata.TempMetadataStore; @@ -120,10 +120,10 @@ if(execution != null) { execution.cancel(); } - LogManager.logDetail(LogConstants.CTX_CONNECTOR, DQPPlugin.Util.getString("DQPCore.The_atomic_request_has_been_cancelled", this.id)); //$NON-NLS-1$ + LogManager.logDetail(LogConstants.CTX_CONNECTOR, QueryPlugin.Util.getString("DQPCore.The_atomic_request_has_been_cancelled", this.id)); //$NON-NLS-1$ } } catch (TranslatorException e) { - LogManager.logWarning(LogConstants.CTX_CONNECTOR, e, DQPPlugin.Util.getString("Cancel_request_failed", this.id)); //$NON-NLS-1$ + LogManager.logWarning(LogConstants.CTX_CONNECTOR, e, QueryPlugin.Util.getString("Cancel_request_failed", this.id)); //$NON-NLS-1$ } } @@ -170,7 +170,7 @@ } manager.logSRCCommand(this.requestMsg, this.securityContext, Event.ERROR, null); - String msg = DQPPlugin.Util.getString("ConnectorWorker.process_failed", this.id); //$NON-NLS-1$ + String msg = QueryPlugin.Util.getString("ConnectorWorker.process_failed", this.id); //$NON-NLS-1$ if (isCancelled.get()) { LogManager.logDetail(LogConstants.CTX_CONNECTOR, msg); } else if (t instanceof TranslatorException || t instanceof TeiidProcessingException) { @@ -202,7 +202,7 @@ try { unwrapped = ((WrappedConnection)connection).unwrap(); } catch (ResourceException e) { - throw new TranslatorException(DQPPlugin.Util.getString("failed_to_unwrap_connection")); //$NON-NLS-1$ + throw new TranslatorException(QueryPlugin.Util.getString("failed_to_unwrap_connection")); //$NON-NLS-1$ } } @@ -300,7 +300,7 @@ this.lastBatch = true; break; } else if (this.rowCount > this.requestMsg.getMaxResultRows() && this.requestMsg.isExceptionOnMaxRows()) { - String msg = DQPPlugin.Util.getString("ConnectorWorker.MaxResultRowsExceed", this.requestMsg.getMaxResultRows()); //$NON-NLS-1$ + String msg = QueryPlugin.Util.getString("ConnectorWorker.MaxResultRowsExceed", this.requestMsg.getMaxResultRows()); //$NON-NLS-1$ throw new TranslatorException(msg); } } @@ -326,7 +326,7 @@ if ( !lastBatch && currentRowCount == 0 ) { // Defect 13366 - Should send all batches, even if they're zero size. // Log warning if received a zero-size non-last batch from the connector. - LogManager.logWarning(LogConstants.CTX_CONNECTOR, DQPPlugin.Util.getString("ConnectorWorker.zero_size_non_last_batch", requestMsg.getConnectorName())); //$NON-NLS-1$ + LogManager.logWarning(LogConstants.CTX_CONNECTOR, QueryPlugin.Util.getString("ConnectorWorker.zero_size_non_last_batch", requestMsg.getConnectorName())); //$NON-NLS-1$ } AtomicResultsMessage response = createResultsMessage(rows.toArray(new List[currentRowCount]), requestMsg.getCommand().getProjectedSymbols()); Modified: branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/datamgr/ProcedureBatchHandler.java =================================================================== --- branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/datamgr/ProcedureBatchHandler.java 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/datamgr/ProcedureBatchHandler.java 2010-09-08 20:07:17 UTC (rev 2552) @@ -30,12 +30,12 @@ import java.util.Collections; import java.util.List; -import org.teiid.dqp.DQPPlugin; import org.teiid.language.Argument; import org.teiid.language.Call; import org.teiid.language.Argument.Direction; +import org.teiid.query.QueryPlugin; +import org.teiid.translator.ProcedureExecution; import org.teiid.translator.TranslatorException; -import org.teiid.translator.ProcedureExecution; class ProcedureBatchHandler { @@ -67,7 +67,7 @@ List padRow(List row) throws TranslatorException { if (row.size() != resultSetCols) { - throw new TranslatorException(DQPPlugin.Util.getString("ConnectorWorker.ConnectorWorker_result_set_unexpected_columns", new Object[] {proc, new Integer(resultSetCols), new Integer(row.size())})); //$NON-NLS-1$ + throw new TranslatorException(QueryPlugin.Util.getString("ConnectorWorker.ConnectorWorker_result_set_unexpected_columns", new Object[] {proc, new Integer(resultSetCols), new Integer(row.size())})); //$NON-NLS-1$ } if (paramCols == 0) { return row; Modified: branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/AuthorizationValidationVisitor.java =================================================================== --- branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/AuthorizationValidationVisitor.java 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/AuthorizationValidationVisitor.java 2010-09-08 20:07:17 UTC (rev 2552) @@ -25,7 +25,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; -import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; @@ -39,12 +38,12 @@ import org.teiid.api.exception.query.QueryMetadataException; import org.teiid.core.TeiidComponentException; import org.teiid.core.TeiidProcessingException; -import org.teiid.dqp.DQPPlugin; import org.teiid.dqp.internal.process.multisource.MultiSourceElement; import org.teiid.logging.AuditMessage; import org.teiid.logging.LogConstants; import org.teiid.logging.LogManager; import org.teiid.logging.MessageLevel; +import org.teiid.query.QueryPlugin; import org.teiid.query.function.FunctionLibrary; import org.teiid.query.metadata.TempMetadataID; import org.teiid.query.resolver.util.ResolverUtil; @@ -262,7 +261,7 @@ // is not authorized in the exception message handleValidationError( - DQPPlugin.Util.getString("ERR.018.005.0095", new Object[]{DQPWorkContext.getWorkContext().getSessionId(), getActionLabel(actionCode)}), //$NON-NLS-1$ + QueryPlugin.Util.getString("ERR.018.005.0095", new Object[]{DQPWorkContext.getWorkContext().getSessionId(), getActionLabel(actionCode)}), //$NON-NLS-1$ inaccessibleSymbols); } } Modified: branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/CachedFinder.java =================================================================== --- branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/CachedFinder.java 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/CachedFinder.java 2010-09-08 20:07:17 UTC (rev 2552) @@ -30,9 +30,9 @@ import org.teiid.core.CoreConstants; import org.teiid.core.TeiidComponentException; import org.teiid.core.TeiidRuntimeException; -import org.teiid.dqp.DQPPlugin; import org.teiid.dqp.internal.datamgr.ConnectorManager; import org.teiid.dqp.internal.datamgr.ConnectorManagerRepository; +import org.teiid.query.QueryPlugin; import org.teiid.query.optimizer.capabilities.BasicSourceCapabilities; import org.teiid.query.optimizer.capabilities.CapabilitiesFinder; import org.teiid.query.optimizer.capabilities.SourceCapabilities; @@ -75,7 +75,7 @@ try { ConnectorManager mgr = this.connectorRepo.getConnectorManager(sourceName); if (mgr == null) { - throw new TranslatorException(DQPPlugin.Util.getString("CachedFinder.no_connector_found", sourceName, modelName, sourceName)); //$NON-NLS-1$ + throw new TranslatorException(QueryPlugin.Util.getString("CachedFinder.no_connector_found", sourceName, modelName, sourceName)); //$NON-NLS-1$ } caps = mgr.getCapabilities(); break; Modified: branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/CachedResults.java =================================================================== --- branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/CachedResults.java 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/CachedResults.java 2010-09-08 20:07:17 UTC (rev 2552) @@ -37,9 +37,9 @@ import org.teiid.core.TeiidComponentException; import org.teiid.core.types.DataTypeManager; import org.teiid.core.util.Assertion; -import org.teiid.dqp.DQPPlugin; import org.teiid.logging.LogConstants; import org.teiid.logging.LogManager; +import org.teiid.query.QueryPlugin; import org.teiid.query.analysis.AnalysisRecord; import org.teiid.query.metadata.QueryMetadataInterface; import org.teiid.query.parser.ParseInfo; @@ -143,7 +143,7 @@ } return true; } catch (TeiidComponentException e) { - LogManager.logDetail(LogConstants.CTX_DQP, DQPPlugin.Util.getString("not_found_cache")); //$NON-NLS-1$ + LogManager.logDetail(LogConstants.CTX_DQP, QueryPlugin.Util.getString("not_found_cache")); //$NON-NLS-1$ } return false; } Modified: branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java =================================================================== --- branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java 2010-09-08 20:07:17 UTC (rev 2552) @@ -61,7 +61,6 @@ import org.teiid.core.TeiidComponentException; import org.teiid.core.TeiidProcessingException; import org.teiid.core.types.Streamable; -import org.teiid.dqp.DQPPlugin; import org.teiid.dqp.internal.process.ThreadReuseExecutor.PrioritizedRunnable; import org.teiid.dqp.message.AtomicRequestMessage; import org.teiid.dqp.message.RequestID; @@ -74,6 +73,7 @@ import org.teiid.logging.LogManager; import org.teiid.logging.MessageLevel; import org.teiid.logging.CommandLogMessage.Event; +import org.teiid.query.QueryPlugin; import org.teiid.query.processor.ProcessorDataManager; import org.teiid.query.tempdata.TempTableDataManager; import org.teiid.query.tempdata.TempTableStore; @@ -461,7 +461,7 @@ RequestWorkItem getRequestWorkItem(RequestID reqID) throws TeiidProcessingException { RequestWorkItem result = this.requests.get(reqID); if (result == null) { - throw new TeiidProcessingException(DQPPlugin.Util.getString("DQPCore.The_request_has_been_closed.", reqID));//$NON-NLS-1$ + throw new TeiidProcessingException(QueryPlugin.Util.getString("DQPCore.The_request_has_been_closed.", reqID));//$NON-NLS-1$ } return result; } @@ -514,7 +514,7 @@ if (markCancelled) { logMMCommand(workItem, Event.CANCEL, null); } else { - LogManager.logDetail(LogConstants.CTX_DQP, DQPPlugin.Util.getString("DQPCore.failed_to_cancel")); //$NON-NLS-1$ + LogManager.logDetail(LogConstants.CTX_DQP, QueryPlugin.Util.getString("DQPCore.failed_to_cancel")); //$NON-NLS-1$ } return markCancelled; } @@ -544,7 +544,7 @@ } private void clearPlanCache(){ - LogManager.logInfo(LogConstants.CTX_DQP, DQPPlugin.Util.getString("DQPCore.Clearing_prepared_plan_cache")); //$NON-NLS-1$ + LogManager.logInfo(LogConstants.CTX_DQP, QueryPlugin.Util.getString("DQPCore.Clearing_prepared_plan_cache")); //$NON-NLS-1$ this.prepPlanCache.clearAll(); } Modified: branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java =================================================================== --- branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java 2010-09-08 20:07:17 UTC (rev 2552) @@ -50,7 +50,6 @@ import org.teiid.core.types.SQLXMLImpl; import org.teiid.core.types.XMLType; import org.teiid.core.util.Assertion; -import org.teiid.dqp.DQPPlugin; import org.teiid.dqp.internal.datamgr.ConnectorManager; import org.teiid.dqp.internal.datamgr.ConnectorManagerRepository; import org.teiid.dqp.internal.datamgr.ConnectorWork; @@ -66,6 +65,7 @@ import org.teiid.metadata.ProcedureParameter; import org.teiid.metadata.Schema; import org.teiid.metadata.Table; +import org.teiid.query.QueryPlugin; import org.teiid.query.metadata.CompositeMetadataStore; import org.teiid.query.metadata.TempMetadataID; import org.teiid.query.metadata.TransformationMetadata; @@ -372,7 +372,7 @@ List<String> bindings = model.getSourceNames(); if (bindings == null || bindings.size() != 1) { // this should not happen, but it did occur when setting up the SystemAdmin models - throw new TeiidComponentException(DQPPlugin.Util.getString("DataTierManager.could_not_obtain_connector_binding", new Object[]{modelName, workItem.getDqpWorkContext().getVdbName(), workItem.getDqpWorkContext().getVdbVersion() })); //$NON-NLS-1$ + throw new TeiidComponentException(QueryPlugin.Util.getString("DataTierManager.could_not_obtain_connector_binding", new Object[]{modelName, workItem.getDqpWorkContext().getVdbName(), workItem.getDqpWorkContext().getVdbVersion() })); //$NON-NLS-1$ } connectorBindingId = bindings.get(0); Assertion.isNotNull(connectorBindingId, "could not obtain connector id"); //$NON-NLS-1$ Modified: branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/LobWorkItem.java =================================================================== --- branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/LobWorkItem.java 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/LobWorkItem.java 2010-09-08 20:07:17 UTC (rev 2552) @@ -37,8 +37,8 @@ import org.teiid.core.types.XMLType; import org.teiid.core.util.Assertion; import org.teiid.core.util.ReaderInputStream; -import org.teiid.dqp.DQPPlugin; import org.teiid.logging.LogManager; +import org.teiid.query.QueryPlugin; public class LobWorkItem implements Work { @@ -75,7 +75,7 @@ chunk = stream.getNextChunk(); shouldClose = chunk.isLast(); } catch (TeiidComponentException e) { - LogManager.logWarning(org.teiid.logging.LogConstants.CTX_DQP, e, DQPPlugin.Util.getString("ProcessWorker.LobError")); //$NON-NLS-1$ + LogManager.logWarning(org.teiid.logging.LogConstants.CTX_DQP, e, QueryPlugin.Util.getString("ProcessWorker.LobError")); //$NON-NLS-1$ ex = e; } catch (IOException e) { ex = e; @@ -102,7 +102,7 @@ stream.close(); } } catch (IOException e) { - LogManager.logWarning(org.teiid.logging.LogConstants.CTX_DQP, e, DQPPlugin.Util.getString("ProcessWorker.LobError")); //$NON-NLS-1$ + LogManager.logWarning(org.teiid.logging.LogConstants.CTX_DQP, e, QueryPlugin.Util.getString("ProcessWorker.LobError")); //$NON-NLS-1$ } parent.removeLobStream(streamRequestId); } Modified: branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/Request.java =================================================================== --- branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/Request.java 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/Request.java 2010-09-08 20:07:17 UTC (rev 2552) @@ -45,7 +45,6 @@ import org.teiid.core.id.IntegerIDFactory; import org.teiid.core.types.DataTypeManager; import org.teiid.core.util.Assertion; -import org.teiid.dqp.DQPPlugin; import org.teiid.dqp.internal.datamgr.ConnectorManagerRepository; import org.teiid.dqp.internal.process.multisource.MultiSourceCapabilitiesFinder; import org.teiid.dqp.internal.process.multisource.MultiSourceMetadataWrapper; @@ -57,6 +56,7 @@ import org.teiid.logging.LogConstants; import org.teiid.logging.LogManager; import org.teiid.logging.MessageLevel; +import org.teiid.query.QueryPlugin; import org.teiid.query.analysis.AnalysisRecord; import org.teiid.query.eval.SecurityFunctionEvaluator; import org.teiid.query.metadata.QueryMetadataInterface; @@ -185,7 +185,7 @@ globalTables = vdbMetadata.getAttachment(TempTableStore.class); if (metadata == null) { - throw new TeiidComponentException(DQPPlugin.Util.getString("DQPCore.Unable_to_load_metadata_for_VDB_name__{0},_version__{1}", this.vdbName, this.vdbVersion)); //$NON-NLS-1$ + throw new TeiidComponentException(QueryPlugin.Util.getString("DQPCore.Unable_to_load_metadata_for_VDB_name__{0},_version__{1}", this.vdbName, this.vdbVersion)); //$NON-NLS-1$ } this.metadata = new TempMetadataAdapter(metadata, new TempMetadataStore()); @@ -215,7 +215,7 @@ } if ((this.requestMsg.getResultsMode() == ResultsMode.UPDATECOUNT && !returnsUpdateCount) || (this.requestMsg.getResultsMode() == ResultsMode.RESULTSET && !returnsResultSet)) { - throw new QueryValidatorException(DQPPlugin.Util.getString(this.requestMsg.getResultsMode()==ResultsMode.RESULTSET?"Request.no_result_set":"Request.result_set")); //$NON-NLS-1$ //$NON-NLS-2$ + throw new QueryValidatorException(QueryPlugin.Util.getString(this.requestMsg.getResultsMode()==ResultsMode.RESULTSET?"Request.no_result_set":"Request.result_set")); //$NON-NLS-1$ //$NON-NLS-2$ } // Create command context, used in rewriting, planning, and processing @@ -274,7 +274,7 @@ static void referenceCheck(List<Reference> references) throws QueryValidatorException { if (references != null && !references.isEmpty()) { - throw new QueryValidatorException(DQPPlugin.Util.getString("Request.Invalid_character_in_query")); //$NON-NLS-1$ + throw new QueryValidatorException(QueryPlugin.Util.getString("Request.Invalid_character_in_query")); //$NON-NLS-1$ } } @@ -431,9 +431,9 @@ LogManager.logDetail(LogConstants.CTX_QUERY_PLANNER, analysisRecord.getAnnotations()); } } - LogManager.logDetail(LogConstants.CTX_DQP, new Object[] { DQPPlugin.Util.getString("BasicInterceptor.ProcessTree_for__4"), requestId, processPlan }); //$NON-NLS-1$ + LogManager.logDetail(LogConstants.CTX_DQP, new Object[] { QueryPlugin.Util.getString("BasicInterceptor.ProcessTree_for__4"), requestId, processPlan }); //$NON-NLS-1$ } catch (QueryMetadataException e) { - throw new QueryPlannerException(e, DQPPlugin.Util.getString("DQPCore.Unknown_query_metadata_exception_while_registering_query__{0}.", requestId)); //$NON-NLS-1$ + throw new QueryPlannerException(e, QueryPlugin.Util.getString("DQPCore.Unknown_query_metadata_exception_while_registering_query__{0}.", requestId)); //$NON-NLS-1$ } } Modified: branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/RequestWorkItem.java =================================================================== --- branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/RequestWorkItem.java 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/RequestWorkItem.java 2010-09-08 20:07:17 UTC (rev 2552) @@ -45,7 +45,6 @@ import org.teiid.core.TeiidException; import org.teiid.core.TeiidProcessingException; import org.teiid.core.types.DataTypeManager; -import org.teiid.dqp.DQPPlugin; import org.teiid.dqp.internal.process.SessionAwareCache.CacheID; import org.teiid.dqp.internal.process.ThreadReuseExecutor.PrioritizedRunnable; import org.teiid.dqp.message.AtomicRequestID; @@ -57,8 +56,8 @@ import org.teiid.logging.LogManager; import org.teiid.logging.MessageLevel; import org.teiid.logging.CommandLogMessage.Event; +import org.teiid.query.QueryPlugin; import org.teiid.query.analysis.AnalysisRecord; -import org.teiid.query.execution.QueryExecPlugin; import org.teiid.query.function.metadata.FunctionMethod; import org.teiid.query.parser.ParseInfo; import org.teiid.query.processor.BatchCollector; @@ -173,7 +172,7 @@ state = ProcessingState.PROCESSING; processNew(); if (isCanceled) { - this.processingException = new TeiidProcessingException(QueryExecPlugin.Util.getString("QueryProcessor.request_cancelled", this.requestID)); //$NON-NLS-1$ + this.processingException = new TeiidProcessingException(QueryPlugin.Util.getString("QueryProcessor.request_cancelled", this.requestID)); //$NON-NLS-1$ state = ProcessingState.CLOSE; } } @@ -205,9 +204,9 @@ cause = cause.getCause(); } StackTraceElement elem = cause.getStackTrace()[0]; - LogManager.logWarning(LogConstants.CTX_DQP, DQPPlugin.Util.getString("ProcessWorker.processing_error", e.getMessage(), requestID, e.getClass().getName(), elem)); //$NON-NLS-1$ + LogManager.logWarning(LogConstants.CTX_DQP, QueryPlugin.Util.getString("ProcessWorker.processing_error", e.getMessage(), requestID, e.getClass().getName(), elem)); //$NON-NLS-1$ }else { - LogManager.logError(LogConstants.CTX_DQP, e, DQPPlugin.Util.getString("ProcessWorker.error", requestID)); //$NON-NLS-1$ + LogManager.logError(LogConstants.CTX_DQP, e, QueryPlugin.Util.getString("ProcessWorker.error", requestID)); //$NON-NLS-1$ } } @@ -314,7 +313,7 @@ try { this.transactionService.rollback(transactionContext); } catch (XATransactionException e1) { - LogManager.logWarning(LogConstants.CTX_DQP, e1, DQPPlugin.Util.getString("ProcessWorker.failed_rollback")); //$NON-NLS-1$ + LogManager.logWarning(LogConstants.CTX_DQP, e1, QueryPlugin.Util.getString("ProcessWorker.failed_rollback")); //$NON-NLS-1$ } } else { suspend(); @@ -376,7 +375,7 @@ cr.setAnalysisRecord(analysisRecord); cr.setResults(resultsBuffer); if (determinismLevel > FunctionMethod.SESSION_DETERMINISTIC) { - LogManager.logInfo(LogConstants.CTX_DQP, DQPPlugin.Util.getString("RequestWorkItem.cache_nondeterministic", originalCommand)); //$NON-NLS-1$ + LogManager.logInfo(LogConstants.CTX_DQP, QueryPlugin.Util.getString("RequestWorkItem.cache_nondeterministic", originalCommand)); //$NON-NLS-1$ } dqpCore.getRsCache().put(cid, determinismLevel, cr, originalCommand.getCacheHint() != null?originalCommand.getCacheHint().getTtl():null); } Modified: branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/TransactionServerImpl.java =================================================================== --- branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/TransactionServerImpl.java 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/TransactionServerImpl.java 2010-09-08 20:07:17 UTC (rev 2552) @@ -53,11 +53,11 @@ import org.teiid.client.xa.XATransactionException; import org.teiid.client.xa.XidImpl; import org.teiid.core.util.Assertion; -import org.teiid.dqp.DQPPlugin; import org.teiid.dqp.internal.process.DQPCore.FutureWork; import org.teiid.dqp.service.TransactionContext; import org.teiid.dqp.service.TransactionService; import org.teiid.dqp.service.TransactionContext.Scope; +import org.teiid.query.QueryPlugin; public class TransactionServerImpl implements TransactionService { @@ -136,7 +136,7 @@ public int prepare(final String threadId, XidImpl xid, boolean singleTM) throws XATransactionException { TransactionContext tc = checkXAState(threadId, xid, true, false); if (!tc.getSuspendedBy().isEmpty()) { - throw new XATransactionException(XAException.XAER_PROTO, DQPPlugin.Util.getString("TransactionServer.suspended_exist", xid)); //$NON-NLS-1$ + throw new XATransactionException(XAException.XAER_PROTO, QueryPlugin.Util.getString("TransactionServer.suspended_exist", xid)); //$NON-NLS-1$ } // In the container this pass though @@ -232,7 +232,7 @@ checkXAState(threadId, xid, false, false); tc = transactions.getOrCreateTransactionContext(threadId); if (tc.getTransactionType() != TransactionContext.Scope.NONE) { - throw new XATransactionException(XAException.XAER_PROTO, DQPPlugin.Util.getString("TransactionServer.existing_transaction")); //$NON-NLS-1$ + throw new XATransactionException(XAException.XAER_PROTO, QueryPlugin.Util.getString("TransactionServer.existing_transaction")); //$NON-NLS-1$ } tc.setTransactionTimeout(timeout); tc.setXid(xid); @@ -268,16 +268,16 @@ tc = checkXAState(threadId, xid, true, false); TransactionContext threadContext = transactions.getOrCreateTransactionContext(threadId); if (threadContext.getTransactionType() != TransactionContext.Scope.NONE) { - throw new XATransactionException(XAException.XAER_PROTO, DQPPlugin.Util.getString("TransactionServer.existing_transaction")); //$NON-NLS-1$ + throw new XATransactionException(XAException.XAER_PROTO, QueryPlugin.Util.getString("TransactionServer.existing_transaction")); //$NON-NLS-1$ } if (flags == XAResource.TMRESUME && !tc.getSuspendedBy().remove(threadId)) { - throw new XATransactionException(XAException.XAER_PROTO, DQPPlugin.Util.getString("TransactionServer.resume_failed", new Object[] {xid, threadId})); //$NON-NLS-1$ + throw new XATransactionException(XAException.XAER_PROTO, QueryPlugin.Util.getString("TransactionServer.resume_failed", new Object[] {xid, threadId})); //$NON-NLS-1$ } break; } default: - throw new XATransactionException(XAException.XAER_INVAL, DQPPlugin.Util.getString("TransactionServer.unknown_flags")); //$NON-NLS-1$ + throw new XATransactionException(XAException.XAER_INVAL, QueryPlugin.Util.getString("TransactionServer.unknown_flags")); //$NON-NLS-1$ } tc.setThreadId(threadId); @@ -304,7 +304,7 @@ break; } default: - throw new XATransactionException(XAException.XAER_INVAL, DQPPlugin.Util.getString("TransactionServer.unknown_flags")); //$NON-NLS-1$ + throw new XATransactionException(XAException.XAER_INVAL, QueryPlugin.Util.getString("TransactionServer.unknown_flags")); //$NON-NLS-1$ } } finally { tc.setThreadId(null); @@ -316,15 +316,15 @@ TransactionContext tc = transactions.getTransactionContext(xid); if (transactionExpected && tc == null) { - throw new XATransactionException(XAException.XAER_NOTA, DQPPlugin.Util.getString("TransactionServer.no_global_transaction", xid)); //$NON-NLS-1$ + throw new XATransactionException(XAException.XAER_NOTA, QueryPlugin.Util.getString("TransactionServer.no_global_transaction", xid)); //$NON-NLS-1$ } else if (!transactionExpected) { if (tc != null) { - throw new XATransactionException(XAException.XAER_DUPID, DQPPlugin.Util.getString("TransactionServer.existing_global_transaction", new Object[] {xid})); //$NON-NLS-1$ + throw new XATransactionException(XAException.XAER_DUPID, QueryPlugin.Util.getString("TransactionServer.existing_global_transaction", new Object[] {xid})); //$NON-NLS-1$ } if (!threadBound) { tc = transactions.getOrCreateTransactionContext(threadId); if (tc.getTransactionType() != TransactionContext.Scope.NONE) { - throw new XATransactionException(XAException.XAER_PROTO, DQPPlugin.Util.getString("TransactionServer.existing_transaction", new Object[] {xid, threadId})); //$NON-NLS-1$ + throw new XATransactionException(XAException.XAER_PROTO, QueryPlugin.Util.getString("TransactionServer.existing_transaction", new Object[] {xid, threadId})); //$NON-NLS-1$ } } return null; @@ -332,10 +332,10 @@ if (threadBound) { if (!threadId.equals(tc.getThreadId())) { - throw new XATransactionException(XAException.XAER_PROTO, DQPPlugin.Util.getString("TransactionServer.wrong_transaction", xid)); //$NON-NLS-1$ + throw new XATransactionException(XAException.XAER_PROTO, QueryPlugin.Util.getString("TransactionServer.wrong_transaction", xid)); //$NON-NLS-1$ } } else if (tc.getThreadId() != null) { - throw new XATransactionException(XAException.XAER_PROTO, DQPPlugin.Util.getString("TransactionServer.concurrent_transaction", xid)); //$NON-NLS-1$ + throw new XATransactionException(XAException.XAER_PROTO, QueryPlugin.Util.getString("TransactionServer.concurrent_transaction", xid)); //$NON-NLS-1$ } return tc; @@ -349,14 +349,14 @@ try { if (tc.getTransactionType() != TransactionContext.Scope.NONE) { if (tc.getTransactionType() != TransactionContext.Scope.LOCAL) { - throw new InvalidTransactionException(DQPPlugin.Util.getString("TransactionServer.existing_transaction")); //$NON-NLS-1$ + throw new InvalidTransactionException(QueryPlugin.Util.getString("TransactionServer.existing_transaction")); //$NON-NLS-1$ } if (!transactionExpected) { - throw new InvalidTransactionException(DQPPlugin.Util.getString("TransactionServer.existing_transaction")); //$NON-NLS-1$ + throw new InvalidTransactionException(QueryPlugin.Util.getString("TransactionServer.existing_transaction")); //$NON-NLS-1$ } transactionManager.resume(tc.getTransaction()); } else if (transactionExpected) { - throw new InvalidTransactionException(DQPPlugin.Util.getString("TransactionServer.no_transaction", threadId)); //$NON-NLS-1$ + throw new InvalidTransactionException(QueryPlugin.Util.getString("TransactionServer.no_transaction", threadId)); //$NON-NLS-1$ } } catch (InvalidTransactionException e) { throw new XATransactionException(e); @@ -464,7 +464,7 @@ */ public TransactionContext begin(TransactionContext context) throws XATransactionException{ if (context.getTransactionType() != TransactionContext.Scope.NONE) { - throw new XATransactionException(DQPPlugin.Util.getString("TransactionServer.existing_transaction")); //$NON-NLS-1$ + throw new XATransactionException(QueryPlugin.Util.getString("TransactionServer.existing_transaction")); //$NON-NLS-1$ } beginDirect(context); context.setTransactionType(TransactionContext.Scope.REQUEST); Deleted: branches/7.1.x/engine/src/main/java/org/teiid/query/execution/QueryExecPlugin.java =================================================================== --- branches/7.1.x/engine/src/main/java/org/teiid/query/execution/QueryExecPlugin.java 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/engine/src/main/java/org/teiid/query/execution/QueryExecPlugin.java 2010-09-08 20:07:17 UTC (rev 2552) @@ -1,46 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package org.teiid.query.execution; - -import java.util.ResourceBundle; - -import org.teiid.core.BundleUtil; - -/** - * QueryPlugin - * <p>Used here in <code>query</code> to have access to the new - * logging framework for <code>LogManager</code>.</p> - */ -public class QueryExecPlugin { // extends Plugin { - - /** - * The plug-in identifier of this plugin - */ - public static final String PLUGIN_ID = QueryExecPlugin.class.getPackage().getName(); - - /** - * Provides access to the plugin's log and to it's resources. - */ - public static final BundleUtil Util = new BundleUtil(PLUGIN_ID, - PLUGIN_ID + ".i18n", ResourceBundle.getBundle(PLUGIN_ID + ".i18n")); //$NON-NLS-1$ //$NON-NLS-2$ -} Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/metadata/TransformationMetadata.java =================================================================== --- branches/7.1.x/engine/src/main/java/org/teiid/query/metadata/TransformationMetadata.java 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/engine/src/main/java/org/teiid/query/metadata/TransformationMetadata.java 2010-09-08 20:07:17 UTC (rev 2552) @@ -49,7 +49,6 @@ import org.teiid.core.util.LRUCache; import org.teiid.core.util.ObjectConverterUtil; import org.teiid.core.util.StringUtil; -import org.teiid.dqp.DQPPlugin; import org.teiid.metadata.AbstractMetadataRecord; import org.teiid.metadata.Column; import org.teiid.metadata.ColumnSet; @@ -126,7 +125,7 @@ public static final String DELIMITER_STRING = String.valueOf(DELIMITER_CHAR); // error message cached to avoid i18n lookup each time - public static String NOT_EXISTS_MESSAGE = StringUtil.Constants.SPACE+DQPPlugin.Util.getString("TransformationMetadata.does_not_exist._1"); //$NON-NLS-1$ + public static String NOT_EXISTS_MESSAGE = StringUtil.Constants.SPACE+QueryPlugin.Util.getString("TransformationMetadata.does_not_exist._1"); //$NON-NLS-1$ private static Properties EMPTY_PROPS = new Properties(); @@ -457,7 +456,7 @@ Table tableRecord = (Table) groupID; if (!tableRecord.isVirtual()) { - throw new QueryMetadataException(DQPPlugin.Util.getString("TransformationMetadata.QueryPlan_could_not_be_found_for_physical_group__6")+tableRecord.getFullName()); //$NON-NLS-1$ + throw new QueryMetadataException(QueryPlugin.Util.getString("TransformationMetadata.QueryPlan_could_not_be_found_for_physical_group__6")+tableRecord.getFullName()); //$NON-NLS-1$ } String transQuery = tableRecord.getSelectTransformation(); QueryNode queryNode = new QueryNode(tableRecord.getFullName(), transQuery); @@ -477,7 +476,7 @@ ArgCheck.isInstanceOf(Table.class, groupID); Table tableRecordImpl = (Table)groupID; if (!tableRecordImpl.isVirtual()) { - throw new QueryMetadataException(DQPPlugin.Util.getString("TransformationMetadata.InsertPlan_could_not_be_found_for_physical_group__8")+tableRecordImpl.getFullName()); //$NON-NLS-1$ + throw new QueryMetadataException(QueryPlugin.Util.getString("TransformationMetadata.InsertPlan_could_not_be_found_for_physical_group__8")+tableRecordImpl.getFullName()); //$NON-NLS-1$ } return ((Table)groupID).getInsertPlan(); } @@ -486,7 +485,7 @@ ArgCheck.isInstanceOf(Table.class, groupID); Table tableRecordImpl = (Table)groupID; if (!tableRecordImpl.isVirtual()) { - throw new QueryMetadataException(DQPPlugin.Util.getString("TransformationMetadata.InsertPlan_could_not_be_found_for_physical_group__10")+tableRecordImpl.getFullName()); //$NON-NLS-1$ + throw new QueryMetadataException(QueryPlugin.Util.getString("TransformationMetadata.InsertPlan_could_not_be_found_for_physical_group__10")+tableRecordImpl.getFullName()); //$NON-NLS-1$ } return ((Table)groupID).getUpdatePlan(); } @@ -495,7 +494,7 @@ ArgCheck.isInstanceOf(Table.class, groupID); Table tableRecordImpl = (Table)groupID; if (!tableRecordImpl.isVirtual()) { - throw new QueryMetadataException(DQPPlugin.Util.getString("TransformationMetadata.DeletePlan_could_not_be_found_for_physical_group__12")+tableRecordImpl.getFullName()); //$NON-NLS-1$ + throw new QueryMetadataException(QueryPlugin.Util.getString("TransformationMetadata.DeletePlan_could_not_be_found_for_physical_group__12")+tableRecordImpl.getFullName()); //$NON-NLS-1$ } return ((Table)groupID).getDeletePlan(); } @@ -506,7 +505,7 @@ switch(modelConstant) { default: - throw new UnsupportedOperationException(DQPPlugin.Util.getString("TransformationMetadata.Unknown_support_constant___12") + modelConstant); //$NON-NLS-1$ + throw new UnsupportedOperationException(QueryPlugin.Util.getString("TransformationMetadata.Unknown_support_constant___12") + modelConstant); //$NON-NLS-1$ } } @@ -519,7 +518,7 @@ case SupportConstants.Group.UPDATE: return tableRecord.supportsUpdate(); default: - throw new UnsupportedOperationException(DQPPlugin.Util.getString("TransformationMetadata.Unknown_support_constant___12") + groupConstant); //$NON-NLS-1$ + throw new UnsupportedOperationException(QueryPlugin.Util.getString("TransformationMetadata.Unknown_support_constant___12") + groupConstant); //$NON-NLS-1$ } } @@ -554,7 +553,7 @@ case SupportConstants.Element.SIGNED: return columnRecord.isSigned(); default: - throw new UnsupportedOperationException(DQPPlugin.Util.getString("TransformationMetadata.Unknown_support_constant___12") + elementConstant); //$NON-NLS-1$ + throw new UnsupportedOperationException(QueryPlugin.Util.getString("TransformationMetadata.Unknown_support_constant___12") + elementConstant); //$NON-NLS-1$ } } else if(elementID instanceof ProcedureParameter) { ProcedureParameter columnRecord = (ProcedureParameter) elementID; @@ -583,7 +582,7 @@ case SupportConstants.Element.SIGNED: return true; default: - throw new UnsupportedOperationException(DQPPlugin.Util.getString("TransformationMetadata.Unknown_support_constant___12") + elementConstant); //$NON-NLS-1$ + throw new UnsupportedOperationException(QueryPlugin.Util.getString("TransformationMetadata.Unknown_support_constant___12") + elementConstant); //$NON-NLS-1$ } } else { @@ -592,7 +591,7 @@ } private IllegalArgumentException createInvalidRecordTypeException(Object elementID) { - return new IllegalArgumentException(DQPPlugin.Util.getString("TransformationMetadata.Invalid_type", elementID.getClass().getName())); //$NON-NLS-1$ + return new IllegalArgumentException(QueryPlugin.Util.getString("TransformationMetadata.Invalid_type", elementID.getClass().getName())); //$NON-NLS-1$ } public int getMaxSetSize(final Object modelID) throws TeiidComponentException, QueryMetadataException { @@ -717,7 +716,7 @@ mappingDoc = reader.loadDocument(inputStream); mappingDoc.setName(groupName); } catch (Exception e){ - throw new TeiidComponentException(e, DQPPlugin.Util.getString("TransformationMetadata.Error_trying_to_read_virtual_document_{0},_with_body__n{1}_1", groupName, mappingDoc)); //$NON-NLS-1$ + throw new TeiidComponentException(e, QueryPlugin.Util.getString("TransformationMetadata.Error_trying_to_read_virtual_document_{0},_with_body__n{1}_1", groupName, mappingDoc)); //$NON-NLS-1$ } finally { try { inputStream.close(); @@ -792,7 +791,7 @@ } if (schema == null) { - throw new QueryMetadataException(DQPPlugin.Util.getString("TransformationMetadata.Error_trying_to_read_schemas_for_the_document/table____1")+groupName); //$NON-NLS-1$ + throw new QueryMetadataException(QueryPlugin.Util.getString("TransformationMetadata.Error_trying_to_read_schemas_for_the_document/table____1")+groupName); //$NON-NLS-1$ } schemas.add(schema); } Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/BatchedUpdatePlanner.java =================================================================== --- branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/BatchedUpdatePlanner.java 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/BatchedUpdatePlanner.java 2010-09-08 20:07:17 UTC (rev 2552) @@ -31,8 +31,8 @@ import org.teiid.core.TeiidRuntimeException; import org.teiid.core.id.IDGenerator; import org.teiid.core.id.IntegerID; +import org.teiid.query.QueryPlugin; import org.teiid.query.analysis.AnalysisRecord; -import org.teiid.query.execution.QueryExecPlugin; import org.teiid.query.metadata.QueryMetadataInterface; import org.teiid.query.optimizer.capabilities.CapabilitiesFinder; import org.teiid.query.optimizer.capabilities.SourceCapabilities; @@ -195,7 +195,7 @@ } else if (type == Command.TYPE_DELETE) { return ((Delete)command).getGroup(); } - throw new TeiidRuntimeException(QueryExecPlugin.Util.getString("BatchedUpdatePlanner.unrecognized_command", command)); //$NON-NLS-1$ + throw new TeiidRuntimeException(QueryPlugin.Util.getString("BatchedUpdatePlanner.unrecognized_command", command)); //$NON-NLS-1$ } /** Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/ProcedurePlanner.java =================================================================== --- branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/ProcedurePlanner.java 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/ProcedurePlanner.java 2010-09-08 20:07:17 UTC (rev 2552) @@ -27,8 +27,8 @@ import org.teiid.core.TeiidComponentException; import org.teiid.core.id.IDGenerator; import org.teiid.core.util.Assertion; +import org.teiid.query.QueryPlugin; import org.teiid.query.analysis.AnalysisRecord; -import org.teiid.query.execution.QueryExecPlugin; import org.teiid.query.metadata.QueryMetadataInterface; import org.teiid.query.optimizer.capabilities.CapabilitiesFinder; import org.teiid.query.processor.ProcessorPlan; @@ -288,7 +288,7 @@ break; } default: - throw new QueryPlannerException(QueryExecPlugin.Util.getString("ProcedurePlanner.bad_stmt", stmtType)); //$NON-NLS-1$ + throw new QueryPlannerException(QueryPlugin.Util.getString("ProcedurePlanner.bad_stmt", stmtType)); //$NON-NLS-1$ } return instruction; } Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/PlanToProcessConverter.java =================================================================== --- branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/PlanToProcessConverter.java 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/PlanToProcessConverter.java 2010-09-08 20:07:17 UTC (rev 2552) @@ -36,8 +36,8 @@ import org.teiid.core.id.IntegerID; import org.teiid.core.id.IntegerIDFactory; import org.teiid.core.util.Assertion; +import org.teiid.query.QueryPlugin; import org.teiid.query.analysis.AnalysisRecord; -import org.teiid.query.execution.QueryExecPlugin; import org.teiid.query.metadata.QueryMetadataInterface; import org.teiid.query.metadata.TempMetadataID; import org.teiid.query.optimizer.capabilities.CapabilitiesFinder; @@ -446,7 +446,7 @@ break; default: - throw new QueryPlannerException(QueryExecPlugin.Util.getString("ERR.015.004.0007", NodeConstants.getNodeTypeString(node.getType()))); //$NON-NLS-1$ + throw new QueryPlannerException(QueryPlugin.Util.getString("ERR.015.004.0007", NodeConstants.getNodeTypeString(node.getType()))); //$NON-NLS-1$ } if(processNode != null) { @@ -537,7 +537,7 @@ String cbName = metadata.getFullName(modelID); return cbName; } catch(QueryMetadataException e) { - throw new QueryPlannerException(e, QueryExecPlugin.Util.getString("ERR.015.004.0009")); //$NON-NLS-1$ + throw new QueryPlannerException(e, QueryPlugin.Util.getString("ERR.015.004.0009")); //$NON-NLS-1$ } } Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java =================================================================== --- branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java 2010-09-08 20:07:17 UTC (rev 2552) @@ -46,7 +46,6 @@ import org.teiid.language.SQLConstants; import org.teiid.query.QueryPlugin; import org.teiid.query.analysis.AnalysisRecord; -import org.teiid.query.execution.QueryExecPlugin; import org.teiid.query.mapping.relational.QueryNode; import org.teiid.query.metadata.QueryMetadataInterface; import org.teiid.query.metadata.TempMetadataAdapter; @@ -260,7 +259,7 @@ } if(! appliedHint) { - String msg = QueryExecPlugin.Util.getString("ERR.015.004.0010", groupName); //$NON-NLS-1$ + String msg = QueryPlugin.Util.getString("ERR.015.004.0010", groupName); //$NON-NLS-1$ if (this.analysisRecord.recordAnnotations()) { this.analysisRecord.addAnnotation(new Annotation(Annotation.HINTS, msg, "ignoring hint", Priority.MEDIUM)); //$NON-NLS-1$ } Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/CriteriaCapabilityValidatorVisitor.java =================================================================== --- branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/CriteriaCapabilityValidatorVisitor.java 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/CriteriaCapabilityValidatorVisitor.java 2010-09-08 20:07:17 UTC (rev 2552) @@ -27,7 +27,7 @@ import org.teiid.api.exception.query.QueryMetadataException; import org.teiid.core.TeiidComponentException; -import org.teiid.query.execution.QueryExecPlugin; +import org.teiid.query.QueryPlugin; import org.teiid.query.function.metadata.FunctionMethod; import org.teiid.query.metadata.QueryMetadataInterface; import org.teiid.query.metadata.SupportConstants; @@ -482,7 +482,7 @@ return null; } } catch(QueryMetadataException e) { - throw new TeiidComponentException(e, QueryExecPlugin.Util.getString("RulePushSelectCriteria.Error_getting_modelID")); //$NON-NLS-1$ + throw new TeiidComponentException(e, QueryPlugin.Util.getString("RulePushSelectCriteria.Error_getting_modelID")); //$NON-NLS-1$ } } if (critNodeModelID == null) { Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/FrameUtil.java =================================================================== --- branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/FrameUtil.java 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/FrameUtil.java 2010-09-08 20:07:17 UTC (rev 2552) @@ -40,7 +40,7 @@ import org.teiid.core.TeiidRuntimeException; import org.teiid.core.types.DataTypeManager; import org.teiid.core.util.Assertion; -import org.teiid.query.execution.QueryExecPlugin; +import org.teiid.query.QueryPlugin; import org.teiid.query.metadata.QueryMetadataInterface; import org.teiid.query.optimizer.relational.plantree.NodeConstants; import org.teiid.query.optimizer.relational.plantree.NodeEditor; @@ -299,7 +299,7 @@ try { return QueryRewriter.rewriteCriteria(criteria, null, null, metadata); } catch(TeiidProcessingException e) { - throw new QueryPlannerException(e, QueryExecPlugin.Util.getString("ERR.015.004.0023", criteria)); //$NON-NLS-1$ + throw new QueryPlannerException(e, QueryPlugin.Util.getString("ERR.015.004.0023", criteria)); //$NON-NLS-1$ } catch (TeiidComponentException e) { throw new TeiidRuntimeException(e); } Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleAccessPatternValidation.java =================================================================== --- branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleAccessPatternValidation.java 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleAccessPatternValidation.java 2010-09-08 20:07:17 UTC (rev 2552) @@ -27,8 +27,8 @@ import java.util.List; import org.teiid.api.exception.query.QueryPlannerException; +import org.teiid.query.QueryPlugin; import org.teiid.query.analysis.AnalysisRecord; -import org.teiid.query.execution.QueryExecPlugin; import org.teiid.query.metadata.QueryMetadataInterface; import org.teiid.query.optimizer.capabilities.CapabilitiesFinder; import org.teiid.query.optimizer.relational.OptimizerRule; @@ -115,7 +115,7 @@ } Object groups = node.getGroups(); - throw new QueryPlannerException(QueryExecPlugin.Util.getString("ERR.015.004.0012", new Object[] {groups, accessPatterns})); //$NON-NLS-1$ + throw new QueryPlannerException(QueryPlugin.Util.getString("ERR.015.004.0012", new Object[] {groups, accessPatterns})); //$NON-NLS-1$ } public String toString() { Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePlanJoins.java =================================================================== --- branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePlanJoins.java 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePlanJoins.java 2010-09-08 20:07:17 UTC (rev 2552) @@ -36,8 +36,8 @@ import org.teiid.api.exception.query.QueryMetadataException; import org.teiid.api.exception.query.QueryPlannerException; import org.teiid.core.TeiidComponentException; +import org.teiid.query.QueryPlugin; import org.teiid.query.analysis.AnalysisRecord; -import org.teiid.query.execution.QueryExecPlugin; import org.teiid.query.metadata.QueryMetadataInterface; import org.teiid.query.optimizer.capabilities.CapabilitiesFinder; import org.teiid.query.optimizer.relational.OptimizerRule; @@ -141,7 +141,7 @@ //quick check for satisfiability if (!joinRegion.isSatisfiable()) { - throw new QueryPlannerException(QueryExecPlugin.Util.getString("RulePlanJoins.cantSatisfy", joinRegion.getUnsatisfiedAccessPatterns())); //$NON-NLS-1$ + throw new QueryPlannerException(QueryPlugin.Util.getString("RulePlanJoins.cantSatisfy", joinRegion.getUnsatisfiedAccessPatterns())); //$NON-NLS-1$ } planForDependencies(joinRegion); @@ -378,7 +378,7 @@ private void planForDependencies(JoinRegion joinRegion) throws QueryPlannerException { if (joinRegion.getJoinSourceNodes().isEmpty()) { - throw new QueryPlannerException(QueryExecPlugin.Util.getString("RulePlanJoins.cantSatisfy", joinRegion.getUnsatisfiedAccessPatterns())); //$NON-NLS-1$ + throw new QueryPlannerException(QueryPlugin.Util.getString("RulePlanJoins.cantSatisfy", joinRegion.getUnsatisfiedAccessPatterns())); //$NON-NLS-1$ } HashSet<GroupSymbol> currentGroups = new HashSet<GroupSymbol>(); @@ -437,7 +437,7 @@ } if (!dependentNodes.isEmpty()) { - throw new QueryPlannerException(QueryExecPlugin.Util.getString("RulePlanJoins.cantSatisfy", joinRegion.getUnsatisfiedAccessPatterns())); //$NON-NLS-1$ + throw new QueryPlannerException(QueryPlugin.Util.getString("RulePlanJoins.cantSatisfy", joinRegion.getUnsatisfiedAccessPatterns())); //$NON-NLS-1$ } } Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePlanProcedures.java =================================================================== --- branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePlanProcedures.java 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePlanProcedures.java 2010-09-08 20:07:17 UTC (rev 2552) @@ -32,8 +32,8 @@ import org.teiid.api.exception.query.QueryMetadataException; import org.teiid.api.exception.query.QueryPlannerException; import org.teiid.core.TeiidComponentException; +import org.teiid.query.QueryPlugin; import org.teiid.query.analysis.AnalysisRecord; -import org.teiid.query.execution.QueryExecPlugin; import org.teiid.query.metadata.QueryMetadataInterface; import org.teiid.query.optimizer.capabilities.CapabilitiesFinder; import org.teiid.query.optimizer.relational.OptimizerRule; @@ -118,7 +118,7 @@ defaults.add(defaultValue); if (defaultValue == null && !coveredParams.contains(symbol)) { - throw new QueryPlannerException(QueryExecPlugin.Util.getString("RulePlanProcedures.no_values", symbol)); //$NON-NLS-1$ + throw new QueryPlannerException(QueryPlugin.Util.getString("RulePlanProcedures.no_values", symbol)); //$NON-NLS-1$ } } Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePushSelectCriteria.java =================================================================== --- branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePushSelectCriteria.java 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePushSelectCriteria.java 2010-09-08 20:07:17 UTC (rev 2552) @@ -34,8 +34,8 @@ import org.teiid.api.exception.query.QueryPlannerException; import org.teiid.core.TeiidComponentException; import org.teiid.core.util.Assertion; +import org.teiid.query.QueryPlugin; import org.teiid.query.analysis.AnalysisRecord; -import org.teiid.query.execution.QueryExecPlugin; import org.teiid.query.metadata.QueryMetadataInterface; import org.teiid.query.optimizer.capabilities.CapabilitiesFinder; import org.teiid.query.optimizer.relational.OptimizerRule; @@ -297,7 +297,7 @@ return currentNode.getFirstChild(); } } catch(QueryMetadataException e) { - throw new QueryPlannerException(e, QueryExecPlugin.Util.getString("ERR.015.004.0020", currentNode.getGroups())); //$NON-NLS-1$ + throw new QueryPlannerException(e, QueryPlugin.Util.getString("ERR.015.004.0020", currentNode.getGroups())); //$NON-NLS-1$ } } else if(currentNode.getType() == NodeConstants.Types.JOIN) { //pushing below a join is not necessary under an access node Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleValidateWhereAll.java =================================================================== --- branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleValidateWhereAll.java 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleValidateWhereAll.java 2010-09-08 20:07:17 UTC (rev 2552) @@ -25,8 +25,8 @@ import org.teiid.api.exception.query.QueryMetadataException; import org.teiid.api.exception.query.QueryPlannerException; import org.teiid.core.TeiidComponentException; +import org.teiid.query.QueryPlugin; import org.teiid.query.analysis.AnalysisRecord; -import org.teiid.query.execution.QueryExecPlugin; import org.teiid.query.metadata.QueryMetadataInterface; import org.teiid.query.optimizer.capabilities.CapabilitiesFinder; import org.teiid.query.optimizer.relational.OptimizerRule; @@ -71,7 +71,7 @@ if(CapabilitiesUtil.requiresCriteria(modelID, metadata, capFinder) && hasNoCriteria((Command) node.getProperty(NodeConstants.Info.ATOMIC_REQUEST))) { String modelName = metadata.getFullName(modelID); - throw new QueryPlannerException(QueryExecPlugin.Util.getString("ERR.015.004.0024", modelName)); //$NON-NLS-1$ + throw new QueryPlannerException(QueryPlugin.Util.getString("ERR.015.004.0024", modelName)); //$NON-NLS-1$ } } Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/xml/CriteriaPlanner.java =================================================================== --- branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/xml/CriteriaPlanner.java 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/xml/CriteriaPlanner.java 2010-09-08 20:07:17 UTC (rev 2552) @@ -30,7 +30,7 @@ import org.teiid.api.exception.query.QueryMetadataException; import org.teiid.api.exception.query.QueryPlannerException; import org.teiid.core.TeiidComponentException; -import org.teiid.query.execution.QueryExecPlugin; +import org.teiid.query.QueryPlugin; import org.teiid.query.function.FunctionLibrary; import org.teiid.query.mapping.xml.MappingDocument; import org.teiid.query.mapping.xml.MappingNode; @@ -88,7 +88,7 @@ if (context == null) { context = otherContext; } else if (context != otherContext){ - throw new QueryPlannerException("ERR.015.004.0068", QueryExecPlugin.Util.getString("ERR.015.004.0068", criteria)); //$NON-NLS-1$ //$NON-NLS-2$ + throw new QueryPlannerException("ERR.015.004.0068", QueryPlugin.Util.getString("ERR.015.004.0068", criteria)); //$NON-NLS-1$ //$NON-NLS-2$ } } @@ -136,7 +136,7 @@ MappingNode elementRsNode = node.getSourceNode(); if (elementRsNode == null) { - throw new QueryPlannerException(QueryExecPlugin.Util.getString("CriteriaPlanner.invalid_element", elementSymbol)); //$NON-NLS-1$ + throw new QueryPlannerException(QueryPlugin.Util.getString("CriteriaPlanner.invalid_element", elementSymbol)); //$NON-NLS-1$ } String elementRsFullName = elementRsNode.getFullyQualifiedName().toUpperCase(); @@ -153,7 +153,7 @@ continue; } - throw new QueryPlannerException(QueryExecPlugin.Util.getString("CriteriaPlanner.invalid_context", elementSymbol, context.getFullyQualifiedName())); //$NON-NLS-1$ + throw new QueryPlannerException(QueryPlugin.Util.getString("CriteriaPlanner.invalid_context", elementSymbol, context.getFullyQualifiedName())); //$NON-NLS-1$ } return resultSets; } @@ -185,7 +185,7 @@ if (criteriaResultSets.size() != 1) { //TODO: this assumption could be relaxed if we allow context to be from a document perspective, rather than from a result set - throw new QueryPlannerException(QueryExecPlugin.Util.getString("CriteriaPlanner.no_context", criteria)); //$NON-NLS-1$ + throw new QueryPlannerException(QueryPlugin.Util.getString("CriteriaPlanner.no_context", criteria)); //$NON-NLS-1$ } return (MappingSourceNode)criteriaResultSets.iterator().next(); } @@ -258,7 +258,7 @@ MappingNode node = MappingNode.findNode(planEnv.mappingDoc, fullyQualifiedNodeName.toUpperCase()); MappingSourceNode sourceNode = node.getSourceNode(); if (sourceNode == null) { - String msg = QueryExecPlugin.Util.getString("XMLPlanner.The_rowlimit_parameter_{0}_is_not_in_the_scope_of_any_mapping_class", fullyQualifiedNodeName); //$NON-NLS-1$ + String msg = QueryPlugin.Util.getString("XMLPlanner.The_rowlimit_parameter_{0}_is_not_in_the_scope_of_any_mapping_class", fullyQualifiedNodeName); //$NON-NLS-1$ throw new QueryPlannerException(msg); } @@ -267,7 +267,7 @@ // Check for conflicting row limits on the same mapping class int existingLimit = criteriaRsInfo.getUserRowLimit(); if (existingLimit > 0 && existingLimit != rowLimit) { - String msg = QueryExecPlugin.Util.getString("XMLPlanner.Criteria_{0}_contains_conflicting_row_limits", wholeCrit); //$NON-NLS-1$ + String msg = QueryPlugin.Util.getString("XMLPlanner.Criteria_{0}_contains_conflicting_row_limits", wholeCrit); //$NON-NLS-1$ throw new QueryPlannerException(msg); } @@ -300,13 +300,13 @@ //assumes that all non-xml group elements are temp elements boolean hasTempElement = !metadata.isXMLGroup(group.getMetadataID()); if(!first && hasTempElement && resultSet == null) { - throw new QueryPlannerException("ERR.015.004.0035", QueryExecPlugin.Util.getString("ERR.015.004.0035", conjunct)); //$NON-NLS-1$ //$NON-NLS-2$ + throw new QueryPlannerException("ERR.015.004.0035", QueryPlugin.Util.getString("ERR.015.004.0035", conjunct)); //$NON-NLS-1$ //$NON-NLS-2$ } if (hasTempElement) { String currentResultSet = metadata.getFullName(element.getGroupSymbol().getMetadataID()); if (resultSet != null && !resultSet.equalsIgnoreCase(currentResultSet)) { - throw new QueryPlannerException(QueryExecPlugin.Util.getString("CriteriaPlanner.multiple_staging", conjunct)); //$NON-NLS-1$ + throw new QueryPlannerException(QueryPlugin.Util.getString("CriteriaPlanner.multiple_staging", conjunct)); //$NON-NLS-1$ } resultSet = currentResultSet; } @@ -316,7 +316,7 @@ if (resultSet != null) { Collection functions = ContextReplacerVisitor.replaceContextFunctions(conjunct); if (!functions.isEmpty()) { - throw new QueryPlannerException(QueryExecPlugin.Util.getString("CriteriaPlanner.staging_context")); //$NON-NLS-1$ + throw new QueryPlannerException(QueryPlugin.Util.getString("CriteriaPlanner.staging_context")); //$NON-NLS-1$ } //should also throw an exception if it contains a row limit function @@ -335,7 +335,7 @@ MappingNode contextNode = MappingNode.findNode(planEnv.mappingDoc, targetContext.getCanonicalName()); if (contextNode == null){ - throw new QueryPlannerException("ERR.015.004.0037", QueryExecPlugin.Util.getString("ERR.015.004.0037", targetContext)); //$NON-NLS-1$ //$NON-NLS-2$ + throw new QueryPlannerException("ERR.015.004.0037", QueryPlugin.Util.getString("ERR.015.004.0037", targetContext)); //$NON-NLS-1$ //$NON-NLS-2$ } return contextNode; } Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/xml/QueryUtil.java =================================================================== --- branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/xml/QueryUtil.java 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/xml/QueryUtil.java 2010-09-08 20:07:17 UTC (rev 2552) @@ -36,8 +36,8 @@ import org.teiid.api.exception.query.QueryResolverException; import org.teiid.core.TeiidComponentException; import org.teiid.core.TeiidProcessingException; +import org.teiid.query.QueryPlugin; import org.teiid.query.analysis.AnalysisRecord; -import org.teiid.query.execution.QueryExecPlugin; import org.teiid.query.mapping.relational.QueryNode; import org.teiid.query.metadata.QueryMetadataInterface; import org.teiid.query.metadata.TempMetadataAdapter; @@ -83,7 +83,7 @@ try { query = QueryParser.getQueryParser().parseCommand(queryNode.getQuery()); } catch (QueryParserException e) { - throw new QueryPlannerException(e, QueryExecPlugin.Util.getString("ERR.015.004.0054", new Object[]{queryNode.getGroupName(), queryNode.getQuery()})); //$NON-NLS-1$ + throw new QueryPlannerException(e, QueryPlugin.Util.getString("ERR.015.004.0054", new Object[]{queryNode.getGroupName(), queryNode.getQuery()})); //$NON-NLS-1$ } } return query; @@ -143,7 +143,7 @@ ResolverUtil.resolveGroup(gs, metadata); queryNode = metadata.getVirtualPlan(gs.getMetadataID()); } catch (QueryResolverException e) { - throw new QueryPlannerException(e, "ERR.015.004.0029", QueryExecPlugin.Util.getString("ERR.015.004.0029", groupName)); //$NON-NLS-1$ //$NON-NLS-2$ + throw new QueryPlannerException(e, "ERR.015.004.0029", QueryPlugin.Util.getString("ERR.015.004.0029", groupName)); //$NON-NLS-1$ //$NON-NLS-2$ } return queryNode; } Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/xml/XMLNodeMappingVisitor.java =================================================================== --- branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/xml/XMLNodeMappingVisitor.java 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/xml/XMLNodeMappingVisitor.java 2010-09-08 20:07:17 UTC (rev 2552) @@ -27,7 +27,7 @@ import org.teiid.api.exception.query.QueryPlannerException; import org.teiid.core.TeiidComponentException; import org.teiid.core.TeiidRuntimeException; -import org.teiid.query.execution.QueryExecPlugin; +import org.teiid.query.QueryPlugin; import org.teiid.query.mapping.xml.MappingDocument; import org.teiid.query.mapping.xml.MappingNode; import org.teiid.query.metadata.QueryMetadataInterface; @@ -123,7 +123,7 @@ Collection unmappedSymbols = mappingVisitor.getUnmappedSymbols(); if (unmappedSymbols != null && unmappedSymbols.size() > 0){ - throw new QueryPlannerException("ERR.015.004.0046", QueryExecPlugin.Util.getString("ERR.015.004.0046", new Object[] {unmappedSymbols, object})); //$NON-NLS-1$ //$NON-NLS-2$ + throw new QueryPlannerException("ERR.015.004.0046", QueryPlugin.Util.getString("ERR.015.004.0046", new Object[] {unmappedSymbols, object})); //$NON-NLS-1$ //$NON-NLS-2$ } return copy; Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/xml/XMLPlanner.java =================================================================== --- branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/xml/XMLPlanner.java 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/xml/XMLPlanner.java 2010-09-08 20:07:17 UTC (rev 2552) @@ -33,8 +33,8 @@ import org.teiid.core.id.IDGenerator; import org.teiid.logging.LogConstants; import org.teiid.logging.LogManager; +import org.teiid.query.QueryPlugin; import org.teiid.query.analysis.AnalysisRecord; -import org.teiid.query.execution.QueryExecPlugin; import org.teiid.query.mapping.xml.MappingDocument; import org.teiid.query.mapping.xml.MappingNode; import org.teiid.query.mapping.xml.MappingNodeLogger; @@ -290,7 +290,7 @@ // in the orderby. static nodes do not qualify for ordering. if (elementNode.getNameInSource() == null){ Object[] params = new Object[] {elementNode, orderBy}; - String msg = QueryExecPlugin.Util.getString("XMLPlanner.The_XML_document_element_{0}_is_not_mapped_to_data_and_cannot_be_used_in_the_ORDER_BY_clause__{1}_1", params); //$NON-NLS-1$ + String msg = QueryPlugin.Util.getString("XMLPlanner.The_XML_document_element_{0}_is_not_mapped_to_data_and_cannot_be_used_in_the_ORDER_BY_clause__{1}_1", params); //$NON-NLS-1$ throw new QueryPlannerException(msg); } Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/xml/XMLQueryPlanner.java =================================================================== --- branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/xml/XMLQueryPlanner.java 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/xml/XMLQueryPlanner.java 2010-09-08 20:07:17 UTC (rev 2552) @@ -37,7 +37,7 @@ import org.teiid.api.exception.query.QueryResolverException; import org.teiid.core.TeiidComponentException; import org.teiid.core.TeiidRuntimeException; -import org.teiid.query.execution.QueryExecPlugin; +import org.teiid.query.QueryPlugin; import org.teiid.query.mapping.relational.QueryNode; import org.teiid.query.mapping.xml.MappingBaseNode; import org.teiid.query.mapping.xml.MappingDocument; @@ -335,7 +335,7 @@ } if (!singleParentage) { - throw new QueryPlannerException(QueryExecPlugin.Util.getString("XMLQueryPlanner.cannot_plan", rsInfo.getCriteria())); //$NON-NLS-1$ + throw new QueryPlannerException(QueryPlugin.Util.getString("XMLQueryPlanner.cannot_plan", rsInfo.getCriteria())); //$NON-NLS-1$ } QueryUtil.handleBindings(command, planNode, planEnv); Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/processor/QueryProcessor.java =================================================================== --- branches/7.1.x/engine/src/main/java/org/teiid/query/processor/QueryProcessor.java 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/engine/src/main/java/org/teiid/query/processor/QueryProcessor.java 2010-09-08 20:07:17 UTC (rev 2552) @@ -38,7 +38,7 @@ import org.teiid.logging.LogConstants; import org.teiid.logging.LogManager; import org.teiid.logging.MessageLevel; -import org.teiid.query.execution.QueryExecPlugin; +import org.teiid.query.QueryPlugin; import org.teiid.query.processor.BatchCollector.BatchProducer; import org.teiid.query.util.CommandContext; @@ -142,7 +142,7 @@ while(currentTime < context.getTimeSliceEnd() || context.isNonBlocking()) { if (requestCanceled) { - throw new TeiidProcessingException(QueryExecPlugin.Util.getString("QueryProcessor.request_cancelled", getProcessID())); //$NON-NLS-1$ + throw new TeiidProcessingException(QueryPlugin.Util.getString("QueryProcessor.request_cancelled", getProcessID())); //$NON-NLS-1$ } if (currentTime > context.getTimeoutEnd()) { throw new TeiidProcessingException("Query timed out"); //$NON-NLS-1$ Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/processor/proc/ExecDynamicSqlInstruction.java =================================================================== --- branches/7.1.x/engine/src/main/java/org/teiid/query/processor/proc/ExecDynamicSqlInstruction.java 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/engine/src/main/java/org/teiid/query/processor/proc/ExecDynamicSqlInstruction.java 2010-09-08 20:07:17 UTC (rev 2552) @@ -22,7 +22,7 @@ package org.teiid.query.processor.proc; -import static org.teiid.query.analysis.AnalysisRecord.*; +import static org.teiid.query.analysis.AnalysisRecord.PROP_SQL; import java.util.Collections; import java.util.HashMap; @@ -41,8 +41,8 @@ import org.teiid.dqp.internal.process.Request; import org.teiid.language.SQLConstants.Reserved; import org.teiid.logging.LogManager; +import org.teiid.query.QueryPlugin; import org.teiid.query.analysis.AnalysisRecord; -import org.teiid.query.execution.QueryExecPlugin; import org.teiid.query.metadata.QueryMetadataInterface; import org.teiid.query.metadata.TempMetadataStore; import org.teiid.query.optimizer.QueryOptimizer; @@ -129,7 +129,7 @@ Object value = procEnv.evaluateExpression(dynamicCommand.getSql()); if (value == null) { - throw new QueryProcessingException(QueryExecPlugin.Util + throw new QueryProcessingException(QueryPlugin.Util .getString("ExecDynamicSqlInstruction.0")); //$NON-NLS-1$ } @@ -214,7 +214,7 @@ procEnv.push(dynamicProgram); } catch (TeiidProcessingException e) { Object[] params = {dynamicCommand, dynamicCommand.getSql(), e.getMessage()}; - throw new QueryProcessingException(e, QueryExecPlugin.Util.getString("ExecDynamicSqlInstruction.couldnt_execute", params)); //$NON-NLS-1$ + throw new QueryProcessingException(e, QueryPlugin.Util.getString("ExecDynamicSqlInstruction.couldnt_execute", params)); //$NON-NLS-1$ } } @@ -274,7 +274,7 @@ if (dynamicExpectedColumns != null && !dynamicExpectedColumns.isEmpty()) { if (dynamicExpectedColumns.size() != sourceProjectedSymbolList.size()) { - throw new QueryProcessingException(QueryExecPlugin.Util + throw new QueryProcessingException(QueryPlugin.Util .getString("ExecDynamicSqlInstruction.4")); //$NON-NLS-1$ } // If there is only one project symbol, we won't validate the name. @@ -305,7 +305,7 @@ Object[] params = new Object[] { sourceTypeName, dynamicSymbol.getShortCanonicalName(), dynamicTypeName }; - throw new QueryProcessingException(QueryExecPlugin.Util + throw new QueryProcessingException(QueryPlugin.Util .getString("ExecDynamicSqlInstruction.6", params)); //$NON-NLS-1$ } } Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/processor/proc/ProcedurePlan.java =================================================================== --- branches/7.1.x/engine/src/main/java/org/teiid/query/processor/proc/ProcedurePlan.java 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/engine/src/main/java/org/teiid/query/processor/proc/ProcedurePlan.java 2010-09-08 20:07:17 UTC (rev 2552) @@ -22,7 +22,7 @@ package org.teiid.query.processor.proc; -import static org.teiid.query.analysis.AnalysisRecord.*; +import static org.teiid.query.analysis.AnalysisRecord.PROP_OUTPUT_COLS; import java.util.ArrayList; import java.util.Collections; @@ -46,8 +46,8 @@ import org.teiid.core.TeiidComponentException; import org.teiid.core.TeiidProcessingException; import org.teiid.logging.LogManager; +import org.teiid.query.QueryPlugin; import org.teiid.query.analysis.AnalysisRecord; -import org.teiid.query.execution.QueryExecPlugin; import org.teiid.query.metadata.QueryMetadataInterface; import org.teiid.query.metadata.SupportConstants; import org.teiid.query.processor.BatchIterator; @@ -189,7 +189,7 @@ //check constraint if (value == null && !metadata.elementSupports(param.getMetadataID(), SupportConstants.Element.NULL)) { - throw new QueryValidatorException(QueryExecPlugin.Util.getString("ProcedurePlan.nonNullableParam", expr)); //$NON-NLS-1$ + throw new QueryValidatorException(QueryPlugin.Util.getString("ProcedurePlan.nonNullableParam", expr)); //$NON-NLS-1$ } setParameterValue(param, context, value); } @@ -531,7 +531,7 @@ private CursorState getCursorState(String rsKey) throws TeiidComponentException { CursorState state = this.cursorStates.get(rsKey); if (state == null) { - throw new TeiidComponentException(QueryExecPlugin.Util.getString("ERR.015.006.0037", rsKey)); //$NON-NLS-1$ + throw new TeiidComponentException(QueryPlugin.Util.getString("ERR.015.006.0037", rsKey)); //$NON-NLS-1$ } return state; } Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/processor/relational/AccessNode.java =================================================================== --- branches/7.1.x/engine/src/main/java/org/teiid/query/processor/relational/AccessNode.java 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/engine/src/main/java/org/teiid/query/processor/relational/AccessNode.java 2010-09-08 20:07:17 UTC (rev 2552) @@ -22,7 +22,8 @@ package org.teiid.query.processor.relational; -import static org.teiid.query.analysis.AnalysisRecord.*; +import static org.teiid.query.analysis.AnalysisRecord.PROP_MODEL_NAME; +import static org.teiid.query.analysis.AnalysisRecord.PROP_SQL; import java.util.ArrayList; import java.util.Collections; @@ -36,8 +37,8 @@ import org.teiid.common.buffer.TupleSource; import org.teiid.core.TeiidComponentException; import org.teiid.core.TeiidProcessingException; +import org.teiid.query.QueryPlugin; import org.teiid.query.eval.Evaluator; -import org.teiid.query.execution.QueryExecPlugin; import org.teiid.query.metadata.QueryMetadataInterface; import org.teiid.query.rewriter.QueryRewriter; import org.teiid.query.sql.lang.Command; @@ -138,7 +139,7 @@ // Defect 16059 - Rewrite the command once the references have been replaced with values. QueryRewriter.evaluateAndRewrite(atomicCommand, eval, context, metadata); } catch (QueryValidatorException e) { - throw new TeiidProcessingException(e, QueryExecPlugin.Util.getString("AccessNode.rewrite_failed", atomicCommand)); //$NON-NLS-1$ + throw new TeiidProcessingException(e, QueryPlugin.Util.getString("AccessNode.rewrite_failed", atomicCommand)); //$NON-NLS-1$ } return RelationalNodeUtil.shouldExecute(atomicCommand, true); Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/processor/relational/BatchedUpdateNode.java =================================================================== --- branches/7.1.x/engine/src/main/java/org/teiid/query/processor/relational/BatchedUpdateNode.java 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/engine/src/main/java/org/teiid/query/processor/relational/BatchedUpdateNode.java 2010-09-08 20:07:17 UTC (rev 2552) @@ -34,8 +34,8 @@ import org.teiid.common.buffer.TupleSource; import org.teiid.core.TeiidComponentException; import org.teiid.core.TeiidProcessingException; +import org.teiid.query.QueryPlugin; import org.teiid.query.eval.Evaluator; -import org.teiid.query.execution.QueryExecPlugin; import org.teiid.query.sql.lang.BatchedUpdateCommand; import org.teiid.query.sql.lang.Command; import org.teiid.query.sql.util.VariableContext; @@ -136,7 +136,7 @@ addBatchRow(Arrays.asList(new Object[] {tuple.get(0)})); } else { // Should never happen since the number of expected results is known - throw new TeiidComponentException(QueryExecPlugin.Util.getString("BatchedUpdateNode.unexpected_end_of_batch", commandCount, numExpectedCounts)); //$NON-NLS-1$ + throw new TeiidComponentException(QueryPlugin.Util.getString("BatchedUpdateNode.unexpected_end_of_batch", commandCount, numExpectedCounts)); //$NON-NLS-1$ } } } Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/processor/relational/ProjectNode.java =================================================================== --- branches/7.1.x/engine/src/main/java/org/teiid/query/processor/relational/ProjectNode.java 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/engine/src/main/java/org/teiid/query/processor/relational/ProjectNode.java 2010-09-08 20:07:17 UTC (rev 2552) @@ -22,7 +22,7 @@ package org.teiid.query.processor.relational; -import static org.teiid.query.analysis.AnalysisRecord.*; +import static org.teiid.query.analysis.AnalysisRecord.PROP_SELECT_COLS; import java.util.ArrayList; import java.util.Arrays; @@ -38,8 +38,8 @@ import org.teiid.core.TeiidComponentException; import org.teiid.core.TeiidProcessingException; import org.teiid.core.util.Assertion; +import org.teiid.query.QueryPlugin; import org.teiid.query.analysis.AnalysisRecord; -import org.teiid.query.execution.QueryExecPlugin; import org.teiid.query.processor.ProcessorDataManager; import org.teiid.query.sql.symbol.AggregateSymbol; import org.teiid.query.sql.symbol.AliasSymbol; @@ -217,7 +217,7 @@ Expression expression = ((ExpressionSymbol)symbol).getExpression(); tuple.add(getEvaluator(this.elementMap).evaluate(expression, values)); } else { - Assertion.failed(QueryExecPlugin.Util.getString("ERR.015.006.0034", symbol.getClass().getName())); //$NON-NLS-1$ + Assertion.failed(QueryPlugin.Util.getString("ERR.015.006.0034", symbol.getClass().getName())); //$NON-NLS-1$ } } Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/processor/relational/TextTableNode.java =================================================================== --- branches/7.1.x/engine/src/main/java/org/teiid/query/processor/relational/TextTableNode.java 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/engine/src/main/java/org/teiid/query/processor/relational/TextTableNode.java 2010-09-08 20:07:17 UTC (rev 2552) @@ -42,7 +42,7 @@ import org.teiid.core.types.ClobType; import org.teiid.core.types.DataTypeManager; import org.teiid.core.types.TransformationException; -import org.teiid.query.execution.QueryExecPlugin; +import org.teiid.query.QueryPlugin; import org.teiid.query.processor.ProcessorDataManager; import org.teiid.query.sql.lang.TextTable; import org.teiid.query.sql.lang.TextTable.TextColumn; @@ -179,13 +179,13 @@ index = nameIndexes.get(col.getName()); } if (index >= vals.size()) { - throw new TeiidProcessingException(QueryExecPlugin.Util.getString("TextTableNode.no_value", col.getName(), textLine, systemId)); //$NON-NLS-1$ + throw new TeiidProcessingException(QueryPlugin.Util.getString("TextTableNode.no_value", col.getName(), textLine, systemId)); //$NON-NLS-1$ } val = vals.get(index); try { tuple.add(DataTypeManager.transformValue(val, table.getColumns().get(output).getSymbol().getType())); } catch (TransformationException e) { - throw new TeiidProcessingException(e, QueryExecPlugin.Util.getString("TextTableNode.conversion_error", col.getName(), textLine, systemId)); //$NON-NLS-1$ + throw new TeiidProcessingException(e, QueryPlugin.Util.getString("TextTableNode.conversion_error", col.getName(), textLine, systemId)); //$NON-NLS-1$ } } addBatchRow(tuple); @@ -267,7 +267,7 @@ for (TextColumn col : table.getColumns()) { Integer index = nameIndexes.get(col.getName().toUpperCase()); if (index == null) { - throw new TeiidProcessingException(QueryExecPlugin.Util.getString("TextTableNode.header_missing", col.getName(), systemId)); //$NON-NLS-1$ + throw new TeiidProcessingException(QueryPlugin.Util.getString("TextTableNode.header_missing", col.getName(), systemId)); //$NON-NLS-1$ } nameIndexes.put(col.getName(), index); } @@ -301,7 +301,7 @@ } line = readLine(); if (line == null) { - throw new TeiidProcessingException(QueryExecPlugin.Util.getString("TextTableNode.unclosed", systemId)); //$NON-NLS-1$ + throw new TeiidProcessingException(QueryPlugin.Util.getString("TextTableNode.unclosed", systemId)); //$NON-NLS-1$ } } char[] chars = line.toCharArray(); @@ -331,7 +331,7 @@ builder.append(chr); } else { if (builder.toString().trim().length() != 0) { - throw new TeiidProcessingException(QueryExecPlugin.Util.getString("TextTableNode.character_not_allowed", textLine, systemId)); //$NON-NLS-1$ + throw new TeiidProcessingException(QueryPlugin.Util.getString("TextTableNode.character_not_allowed", textLine, systemId)); //$NON-NLS-1$ } qualified = true; builder = new StringBuilder(); //start the entry over @@ -342,11 +342,11 @@ } else { if (escaped) { //don't understand other escape sequences yet - throw new TeiidProcessingException(QueryExecPlugin.Util.getString("TextTableNode.unknown_escape", chr, textLine, systemId)); //$NON-NLS-1$ + throw new TeiidProcessingException(QueryPlugin.Util.getString("TextTableNode.unknown_escape", chr, textLine, systemId)); //$NON-NLS-1$ } if (wasQualified && !qualified) { if (!Character.isWhitespace(chr)) { - throw new TeiidProcessingException(QueryExecPlugin.Util.getString("TextTableNode.character_not_allowed", textLine, systemId)); //$NON-NLS-1$ + throw new TeiidProcessingException(QueryPlugin.Util.getString("TextTableNode.character_not_allowed", textLine, systemId)); //$NON-NLS-1$ } //else just ignore } else { @@ -371,7 +371,7 @@ private List<String> parseFixedWidth(String line) throws TeiidProcessingException { if (line.length() < lineWidth) { - throw new TeiidProcessingException(QueryExecPlugin.Util.getString("TextTableNode.invalid_width", line.length(), lineWidth, textLine, systemId)); //$NON-NLS-1$ + throw new TeiidProcessingException(QueryPlugin.Util.getString("TextTableNode.invalid_width", line.length(), lineWidth, textLine, systemId)); //$NON-NLS-1$ } ArrayList<String> result = new ArrayList<String>(); int beginIndex = 0; Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/processor/relational/XMLTableNode.java =================================================================== --- branches/7.1.x/engine/src/main/java/org/teiid/query/processor/relational/XMLTableNode.java 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/engine/src/main/java/org/teiid/query/processor/relational/XMLTableNode.java 2010-09-08 20:07:17 UTC (rev 2552) @@ -46,7 +46,7 @@ import org.teiid.core.TeiidProcessingException; import org.teiid.core.types.DataTypeManager; import org.teiid.core.types.XMLType; -import org.teiid.query.execution.QueryExecPlugin; +import org.teiid.query.QueryPlugin; import org.teiid.query.function.FunctionDescriptor; import org.teiid.query.sql.lang.XMLTable; import org.teiid.query.sql.lang.XMLTable.XMLColumn; @@ -132,7 +132,7 @@ try { item = result.next(); } catch (XPathException e) { - throw new TeiidProcessingException(e, QueryExecPlugin.Util.getString("XMLTableNode.error", e.getMessage())); //$NON-NLS-1$ + throw new TeiidProcessingException(e, QueryPlugin.Util.getString("XMLTableNode.error", e.getMessage())); //$NON-NLS-1$ } rowCount++; if (item == null) { @@ -164,7 +164,7 @@ continue; } if (pathIter.next() != null) { - throw new TeiidProcessingException(QueryExecPlugin.Util.getString("XMLTableName.multi_value", proColumn.getName())); //$NON-NLS-1$ + throw new TeiidProcessingException(QueryPlugin.Util.getString("XMLTableName.multi_value", proColumn.getName())); //$NON-NLS-1$ } Object value = Value.convertToJava(colItem); if (value instanceof Item) { @@ -184,7 +184,7 @@ value = FunctionDescriptor.importValue(value, proColumn.getSymbol().getType()); tuple.add(value); } catch (XPathException e) { - throw new TeiidProcessingException(e, QueryExecPlugin.Util.getString("XMLTableNode.path_error", proColumn.getName())); //$NON-NLS-1$ + throw new TeiidProcessingException(e, QueryPlugin.Util.getString("XMLTableNode.path_error", proColumn.getName())); //$NON-NLS-1$ } } } Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/processor/xml/AbortProcessingInstruction.java =================================================================== --- branches/7.1.x/engine/src/main/java/org/teiid/query/processor/xml/AbortProcessingInstruction.java 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/engine/src/main/java/org/teiid/query/processor/xml/AbortProcessingInstruction.java 2010-09-08 20:07:17 UTC (rev 2552) @@ -27,7 +27,7 @@ import org.teiid.core.TeiidComponentException; import org.teiid.core.TeiidProcessingException; import org.teiid.logging.LogManager; -import org.teiid.query.execution.QueryExecPlugin; +import org.teiid.query.QueryPlugin; /** @@ -42,7 +42,7 @@ * Default message included in the RuntimeException thrown from * {@link #process} */ - public static final String DEFAULT_MESSAGE = QueryExecPlugin.Util.getString("ERR.015.006.0054"); //$NON-NLS-1$ + public static final String DEFAULT_MESSAGE = QueryPlugin.Util.getString("ERR.015.006.0054"); //$NON-NLS-1$ /** * Constructor for AbortProcessingInstruction. Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/processor/xml/AddNodeInstruction.java =================================================================== --- branches/7.1.x/engine/src/main/java/org/teiid/query/processor/xml/AddNodeInstruction.java 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/engine/src/main/java/org/teiid/query/processor/xml/AddNodeInstruction.java 2010-09-08 20:07:17 UTC (rev 2552) @@ -22,7 +22,12 @@ package org.teiid.query.processor.xml; -import static org.teiid.query.analysis.AnalysisRecord.*; +import static org.teiid.query.analysis.AnalysisRecord.PROP_DATA_COL; +import static org.teiid.query.analysis.AnalysisRecord.PROP_DEFAULT; +import static org.teiid.query.analysis.AnalysisRecord.PROP_NAMESPACE; +import static org.teiid.query.analysis.AnalysisRecord.PROP_NAMESPACE_DECL; +import static org.teiid.query.analysis.AnalysisRecord.PROP_OPTIONAL; +import static org.teiid.query.analysis.AnalysisRecord.PROP_TAG; import java.util.ArrayList; import java.util.Enumeration; @@ -34,7 +39,7 @@ import org.teiid.core.TeiidComponentException; import org.teiid.core.TeiidProcessingException; import org.teiid.logging.LogManager; -import org.teiid.query.execution.QueryExecPlugin; +import org.teiid.query.QueryPlugin; import org.teiid.query.sql.symbol.ElementSymbol; @@ -139,9 +144,9 @@ } if (!success){ - String elem = (isElement ? QueryExecPlugin.Util.getString("AddNodeInstruction.element__1" ) : QueryExecPlugin.Util.getString("AddNodeInstruction.attribute__2")); //$NON-NLS-1$ //$NON-NLS-2$ + String elem = (isElement ? QueryPlugin.Util.getString("AddNodeInstruction.element__1" ) : QueryPlugin.Util.getString("AddNodeInstruction.attribute__2")); //$NON-NLS-1$ //$NON-NLS-2$ Object[] params = new Object[]{elem, this.descriptor.getQName(), this.descriptor.getNamespaceURI(), this.descriptor.getNamespaceURIs()}; - String msg = QueryExecPlugin.Util.getString("AddNodeInstruction.Unable_to_add_xml_{0}_{1},_namespace_{2},_namespace_declarations_{3}_3", params); //$NON-NLS-1$ + String msg = QueryPlugin.Util.getString("AddNodeInstruction.Unable_to_add_xml_{0}_{1},_namespace_{2},_namespace_declarations_{3}_3", params); //$NON-NLS-1$ throw new TeiidComponentException(msg); } Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/processor/xml/MoveDocInstruction.java =================================================================== --- branches/7.1.x/engine/src/main/java/org/teiid/query/processor/xml/MoveDocInstruction.java 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/engine/src/main/java/org/teiid/query/processor/xml/MoveDocInstruction.java 2010-09-08 20:07:17 UTC (rev 2552) @@ -28,7 +28,7 @@ import org.teiid.core.TeiidProcessingException; import org.teiid.core.util.Assertion; import org.teiid.logging.LogManager; -import org.teiid.query.execution.QueryExecPlugin; +import org.teiid.query.QueryPlugin; import org.xml.sax.SAXException; @@ -70,7 +70,7 @@ doc.moveToLastChild(); break; default: - Assertion.failed(QueryExecPlugin.Util.getString("ERR.015.006.0051", direction)); //$NON-NLS-1$ + Assertion.failed(QueryPlugin.Util.getString("ERR.015.006.0051", direction)); //$NON-NLS-1$ break; } Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/processor/xml/NodeDescriptor.java =================================================================== --- branches/7.1.x/engine/src/main/java/org/teiid/query/processor/xml/NodeDescriptor.java 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/engine/src/main/java/org/teiid/query/processor/xml/NodeDescriptor.java 2010-09-08 20:07:17 UTC (rev 2552) @@ -25,7 +25,7 @@ import java.util.Properties; import org.teiid.core.TeiidComponentException; -import org.teiid.query.execution.QueryExecPlugin; +import org.teiid.query.QueryPlugin; import org.teiid.query.mapping.xml.MappingAttribute; import org.teiid.query.mapping.xml.MappingElement; import org.teiid.query.mapping.xml.MappingNode; @@ -287,7 +287,7 @@ } else if(namespacePrefix.equals(MappingNodeConstants.INSTANCES_NAMESPACE_PREFIX)) { uri = MappingNodeConstants.INSTANCES_NAMESPACE; }else { - String msg = QueryExecPlugin.Util.getString("XMLPlanner.no_uri", new Object[] {namespacePrefix, name}); //$NON-NLS-1$ + String msg = QueryPlugin.Util.getString("XMLPlanner.no_uri", new Object[] {namespacePrefix, name}); //$NON-NLS-1$ throw new TeiidComponentException(msg); } } Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/processor/xml/RecurseProgramCondition.java =================================================================== --- branches/7.1.x/engine/src/main/java/org/teiid/query/processor/xml/RecurseProgramCondition.java 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/engine/src/main/java/org/teiid/query/processor/xml/RecurseProgramCondition.java 2010-09-08 20:07:17 UTC (rev 2552) @@ -27,7 +27,7 @@ import org.teiid.core.TeiidComponentException; import org.teiid.core.TeiidProcessingException; -import org.teiid.query.execution.QueryExecPlugin; +import org.teiid.query.QueryPlugin; import org.teiid.query.sql.lang.Criteria; @@ -92,7 +92,7 @@ //handle the case of exception on recursion limit reached if (terminate && this.exceptionOnRecursionLimit){ - throw new TeiidComponentException("ERR.015.006.0039", QueryExecPlugin.Util.getString("ERR.015.006.0039")); //$NON-NLS-1$ //$NON-NLS-2$ + throw new TeiidComponentException("ERR.015.006.0039", QueryPlugin.Util.getString("ERR.015.006.0039")); //$NON-NLS-1$ //$NON-NLS-2$ } } Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/processor/xml/RelationalPlanExecutor.java =================================================================== --- branches/7.1.x/engine/src/main/java/org/teiid/query/processor/xml/RelationalPlanExecutor.java 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/engine/src/main/java/org/teiid/query/processor/xml/RelationalPlanExecutor.java 2010-09-08 20:07:17 UTC (rev 2552) @@ -31,7 +31,7 @@ import org.teiid.core.TeiidComponentException; import org.teiid.core.TeiidProcessingException; import org.teiid.logging.LogManager; -import org.teiid.query.execution.QueryExecPlugin; +import org.teiid.query.QueryPlugin; import org.teiid.query.mapping.xml.ResultSetInfo; import org.teiid.query.processor.BatchIterator; import org.teiid.query.processor.ProcessorDataManager; @@ -123,7 +123,7 @@ // check if we walked over the row limit if (this.currentRow != null && this.resultInfo.getUserRowLimit() > 0 && this.currentRowNumber > this.resultInfo.getUserRowLimit()) { if (this.resultInfo.exceptionOnRowlimit()) { - throw new TeiidProcessingException(QueryExecPlugin.Util.getString("row_limit_passed", new Object[] { new Integer(this.resultInfo.getUserRowLimit()), this.resultInfo.getResultSetName()})); //$NON-NLS-1$ + throw new TeiidProcessingException(QueryPlugin.Util.getString("row_limit_passed", new Object[] { new Integer(this.resultInfo.getUserRowLimit()), this.resultInfo.getResultSetName()})); //$NON-NLS-1$ } // well, we did not throw a exception, that means we need to limit it to current row this.currentRow = null; Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/processor/xml/XMLContext.java =================================================================== --- branches/7.1.x/engine/src/main/java/org/teiid/query/processor/xml/XMLContext.java 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/engine/src/main/java/org/teiid/query/processor/xml/XMLContext.java 2010-09-08 20:07:17 UTC (rev 2552) @@ -28,7 +28,7 @@ import org.teiid.core.TeiidComponentException; import org.teiid.core.TeiidProcessingException; -import org.teiid.query.execution.QueryExecPlugin; +import org.teiid.query.QueryPlugin; import org.teiid.query.sql.symbol.ElementSymbol; import org.teiid.query.sql.util.VariableContext; @@ -83,7 +83,7 @@ if (this.parentContext != null) { return this.parentContext.getCurrentRow(aliasResultName); } - throw new TeiidComponentException(QueryExecPlugin.Util.getString("results_not_found", aliasResultName)); //$NON-NLS-1$ + throw new TeiidComponentException(QueryPlugin.Util.getString("results_not_found", aliasResultName)); //$NON-NLS-1$ } return executor.currentRow(); } @@ -100,7 +100,7 @@ if (this.parentContext != null) { return this.parentContext.getNextRow(aliasResultName); } - throw new TeiidComponentException(QueryExecPlugin.Util.getString("results_not_found", aliasResultName)); //$NON-NLS-1$ + throw new TeiidComponentException(QueryPlugin.Util.getString("results_not_found", aliasResultName)); //$NON-NLS-1$ } return executor.nextRow(); } @@ -138,7 +138,7 @@ if (this.parentContext != null) { return this.parentContext.getOutputElements(resultName); } - throw new TeiidComponentException(QueryExecPlugin.Util.getString("results_not_found", resultName)); //$NON-NLS-1$ + throw new TeiidComponentException(QueryPlugin.Util.getString("results_not_found", resultName)); //$NON-NLS-1$ } return executor.getOutputElements(); } Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/processor/xml/XMLPlan.java =================================================================== --- branches/7.1.x/engine/src/main/java/org/teiid/query/processor/xml/XMLPlan.java 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/engine/src/main/java/org/teiid/query/processor/xml/XMLPlan.java 2010-09-08 20:07:17 UTC (rev 2552) @@ -22,7 +22,7 @@ package org.teiid.query.processor.xml; -import static org.teiid.query.analysis.AnalysisRecord.*; +import static org.teiid.query.analysis.AnalysisRecord.PROP_OUTPUT_COLS; import java.io.IOException; import java.io.InputStream; @@ -53,8 +53,8 @@ import org.teiid.core.types.XMLType; import org.teiid.logging.LogConstants; import org.teiid.logging.LogManager; +import org.teiid.query.QueryPlugin; import org.teiid.query.analysis.AnalysisRecord; -import org.teiid.query.execution.QueryExecPlugin; import org.teiid.query.processor.ProcessorDataManager; import org.teiid.query.processor.ProcessorPlan; import org.teiid.query.sql.symbol.ElementSymbol; @@ -225,7 +225,7 @@ if (xmlSchemas == null || xmlSchemas.isEmpty()){ // if there is no schema no need to validate // return a warning saying there is no schema - TeiidException noSchema = new TeiidComponentException("ERR.015.006.0042", QueryExecPlugin.Util.getString("ERR.015.006.0042")); //$NON-NLS-1$ //$NON-NLS-2$ + TeiidException noSchema = new TeiidComponentException("ERR.015.006.0042", QueryPlugin.Util.getString("ERR.015.006.0042")); //$NON-NLS-1$ //$NON-NLS-2$ addWarning(noSchema); return; } @@ -388,7 +388,7 @@ } catch (Exception e){ e.printStackTrace(); LogManager.logWarning(LogConstants.CTX_XML_PLAN, e, - QueryExecPlugin.Util.getString("ERR.015.006.0001")); //$NON-NLS-1$ + QueryPlugin.Util.getString("ERR.015.006.0001")); //$NON-NLS-1$ } return "XMLPlan"; //$NON-NLS-1$ } @@ -439,13 +439,13 @@ } public void error(SAXParseException ex){ - addException(new TeiidComponentException("ERR.015.006.0049", QueryExecPlugin.Util.getString("ERR.015.006.0048", ex.getMessage()))); //$NON-NLS-1$ //$NON-NLS-2$ + addException(new TeiidComponentException("ERR.015.006.0049", QueryPlugin.Util.getString("ERR.015.006.0048", ex.getMessage()))); //$NON-NLS-1$ //$NON-NLS-2$ } public void fatalError(SAXParseException ex){ - addException(new TeiidComponentException("ERR.015.006.0048", QueryExecPlugin.Util.getString("ERR.015.006.0048", ex.getMessage()))); //$NON-NLS-1$ //$NON-NLS-2$ + addException(new TeiidComponentException("ERR.015.006.0048", QueryPlugin.Util.getString("ERR.015.006.0048", ex.getMessage()))); //$NON-NLS-1$ //$NON-NLS-2$ } public void warning(SAXParseException ex){ - addException(new TeiidComponentException("ERR.015.006.0049", QueryExecPlugin.Util.getString("ERR.015.006.0048", ex.getMessage()))); //$NON-NLS-1$ //$NON-NLS-2$ + addException(new TeiidComponentException("ERR.015.006.0049", QueryPlugin.Util.getString("ERR.015.006.0048", ex.getMessage()))); //$NON-NLS-1$ //$NON-NLS-2$ } } Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java =================================================================== --- branches/7.1.x/engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java 2010-09-08 20:07:17 UTC (rev 2552) @@ -55,8 +55,8 @@ import org.teiid.core.util.Assertion; import org.teiid.core.util.TimestampWithTimezone; import org.teiid.language.SQLConstants.NonReserved; +import org.teiid.query.QueryPlugin; import org.teiid.query.eval.Evaluator; -import org.teiid.query.execution.QueryExecPlugin; import org.teiid.query.function.FunctionDescriptor; import org.teiid.query.function.FunctionLibrary; import org.teiid.query.function.FunctionMethods; @@ -394,7 +394,7 @@ whileStatement.setCondition(crit); if(crit.equals(TRUE_CRITERIA)) { - throw new QueryValidatorException(QueryExecPlugin.Util.getString("QueryRewriter.infinite_while")); //$NON-NLS-1$ + throw new QueryValidatorException(QueryPlugin.Util.getString("QueryRewriter.infinite_while")); //$NON-NLS-1$ } else if(crit.equals(FALSE_CRITERIA) || crit.equals(UNKNOWN_CRITERIA)) { return null; } @@ -589,7 +589,7 @@ try { ResolverVisitor.resolveLanguageObject(translatedCriteria, metadata); } catch(TeiidException ex) { - throw new QueryValidatorException(ex, "ERR.015.009.0002", QueryExecPlugin.Util.getString("ERR.015.009.0002", translatedCriteria)); //$NON-NLS-1$ //$NON-NLS-2$ + throw new QueryValidatorException(ex, "ERR.015.009.0002", QueryPlugin.Util.getString("ERR.015.009.0002", translatedCriteria)); //$NON-NLS-1$ //$NON-NLS-2$ } return translatedCriteria; @@ -1167,7 +1167,7 @@ return FALSE_CRITERIA; } catch(ExpressionEvaluationException e) { - throw new QueryValidatorException(e, "ERR.015.009.0001", QueryExecPlugin.Util.getString("ERR.015.009.0001", crit)); //$NON-NLS-1$ //$NON-NLS-2$ + throw new QueryValidatorException(e, "ERR.015.009.0001", QueryPlugin.Util.getString("ERR.015.009.0001", crit)); //$NON-NLS-1$ //$NON-NLS-2$ } } @@ -1382,7 +1382,7 @@ Object result = descriptor.invokeFunction(new Object[] { const2.getValue(), const1.getValue() } ); combinedConst = new Constant(result, descriptor.getReturnType()); } catch(FunctionExecutionException e) { - throw new QueryValidatorException(e, "ERR.015.009.0003", QueryExecPlugin.Util.getString("ERR.015.009.0003", e.getMessage())); //$NON-NLS-1$ //$NON-NLS-2$ + throw new QueryValidatorException(e, "ERR.015.009.0003", QueryPlugin.Util.getString("ERR.015.009.0003", e.getMessage())); //$NON-NLS-1$ //$NON-NLS-2$ } } else { Function conversion = new Function(descriptor.getName(), new Expression[] { rightExpr, const1 }); @@ -2495,7 +2495,7 @@ if (result == null) { result = changingValue; } else if (!result.equals(changingValue)) { - throw new QueryValidatorException(QueryExecPlugin.Util.getString("VariableSubstitutionVisitor.Input_vars_should_have_same_changing_state", expr)); //$NON-NLS-1$ + throw new QueryValidatorException(QueryPlugin.Util.getString("VariableSubstitutionVisitor.Input_vars_should_have_same_changing_state", expr)); //$NON-NLS-1$ } } } Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/tempdata/TempTableDataManager.java =================================================================== --- branches/7.1.x/engine/src/main/java/org/teiid/query/tempdata/TempTableDataManager.java 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/engine/src/main/java/org/teiid/query/tempdata/TempTableDataManager.java 2010-09-08 20:07:17 UTC (rev 2552) @@ -51,9 +51,9 @@ import org.teiid.language.SQLConstants.Reserved; import org.teiid.logging.LogConstants; import org.teiid.logging.LogManager; +import org.teiid.query.QueryPlugin; import org.teiid.query.analysis.AnalysisRecord; import org.teiid.query.eval.Evaluator; -import org.teiid.query.execution.QueryExecPlugin; import org.teiid.query.mapping.relational.QueryNode; import org.teiid.query.metadata.QueryMetadataInterface; import org.teiid.query.metadata.TempMetadataID; @@ -188,7 +188,7 @@ Create create = (Create)command; String tempTableName = create.getTable().getCanonicalName(); if (contextStore.hasTempTable(tempTableName)) { - throw new QueryProcessingException(QueryExecPlugin.Util.getString("TempTableStore.table_exist_error", tempTableName));//$NON-NLS-1$ + throw new QueryProcessingException(QueryPlugin.Util.getString("TempTableStore.table_exist_error", tempTableName));//$NON-NLS-1$ } contextStore.addTempTable(tempTableName, create, bufferManager, true); return CollectionTupleSource.createUpdateCountTupleSource(0); @@ -275,11 +275,11 @@ Object pk = metadata.getPrimaryKey(groupID); String matViewName = metadata.getFullName(groupID); if (pk == null) { - throw new QueryProcessingException(QueryExecPlugin.Util.getString("TempTableDataManager.row_refresh_pk", matViewName)); //$NON-NLS-1$ + throw new QueryProcessingException(QueryPlugin.Util.getString("TempTableDataManager.row_refresh_pk", matViewName)); //$NON-NLS-1$ } List<?> ids = metadata.getElementIDsInKey(pk); if (ids.size() > 1) { - throw new QueryProcessingException(QueryExecPlugin.Util.getString("TempTableDataManager.row_refresh_composite", matViewName)); //$NON-NLS-1$ + throw new QueryProcessingException(QueryPlugin.Util.getString("TempTableDataManager.row_refresh_composite", matViewName)); //$NON-NLS-1$ } String matTableName = RelationalPlanner.MAT_PREFIX+matViewName.toUpperCase(); MatTableInfo info = globalStore.getMatTableInfo(matTableName); @@ -288,10 +288,10 @@ } TempTable tempTable = globalStore.getOrCreateTempTable(matTableName, new Query(), bufferManager, false); if (!tempTable.isUpdatable()) { - throw new QueryProcessingException(QueryExecPlugin.Util.getString("TempTableDataManager.row_refresh_updatable", matViewName)); //$NON-NLS-1$ + throw new QueryProcessingException(QueryPlugin.Util.getString("TempTableDataManager.row_refresh_updatable", matViewName)); //$NON-NLS-1$ } Constant key = (Constant)proc.getParameter(2).getExpression(); - LogManager.logInfo(LogConstants.CTX_MATVIEWS, QueryExecPlugin.Util.getString("TempTableDataManager.row_refresh", matViewName, key)); //$NON-NLS-1$ + LogManager.logInfo(LogConstants.CTX_MATVIEWS, QueryPlugin.Util.getString("TempTableDataManager.row_refresh", matViewName, key)); //$NON-NLS-1$ String queryString = Reserved.SELECT + " * " + Reserved.FROM + ' ' + matViewName + ' ' + Reserved.WHERE + ' ' + //$NON-NLS-1$ metadata.getFullName(ids.iterator().next()) + " = ?" + ' ' + Reserved.OPTION + ' ' + Reserved.NOCACHE; //$NON-NLS-1$ QueryProcessor qp = context.getQueryProcessorFactory().createQueryProcessor(queryString, matViewName.toUpperCase(), context, key.getValue()); @@ -317,7 +317,7 @@ try { Object groupID = metadata.getGroupID(name); if (!metadata.hasMaterialization(groupID) || metadata.getMaterialization(groupID) != null) { - throw new QueryProcessingException(QueryExecPlugin.Util.getString("TempTableDataManager.not_implicit_matview", name)); //$NON-NLS-1$ + throw new QueryProcessingException(QueryPlugin.Util.getString("TempTableDataManager.not_implicit_matview", name)); //$NON-NLS-1$ } return groupID; } catch (QueryMetadataException e) { @@ -381,7 +381,7 @@ GroupSymbol group, final String tableName, TempTableStore globalStore, MatTableInfo info) throws TeiidComponentException, TeiidProcessingException { - LogManager.logInfo(LogConstants.CTX_MATVIEWS, QueryExecPlugin.Util.getString("TempTableDataManager.loading", tableName)); //$NON-NLS-1$ + LogManager.logInfo(LogConstants.CTX_MATVIEWS, QueryPlugin.Util.getString("TempTableDataManager.loading", tableName)); //$NON-NLS-1$ QueryMetadataInterface metadata = context.getMetadata(); Create create = new Create(); create.setTable(group); @@ -428,10 +428,10 @@ } table.setUpdatable(updatable); } catch (TeiidComponentException e) { - LogManager.logError(LogConstants.CTX_MATVIEWS, e, QueryExecPlugin.Util.getString("TempTableDataManager.failed_load", tableName)); //$NON-NLS-1$ + LogManager.logError(LogConstants.CTX_MATVIEWS, e, QueryPlugin.Util.getString("TempTableDataManager.failed_load", tableName)); //$NON-NLS-1$ throw e; } catch (TeiidProcessingException e) { - LogManager.logError(LogConstants.CTX_MATVIEWS, e, QueryExecPlugin.Util.getString("TempTableDataManager.failed_load", tableName)); //$NON-NLS-1$ + LogManager.logError(LogConstants.CTX_MATVIEWS, e, QueryPlugin.Util.getString("TempTableDataManager.failed_load", tableName)); //$NON-NLS-1$ throw e; } finally { if (rowCount == -1) { @@ -439,7 +439,7 @@ } else { globalStore.swapTempTable(tableName, table); info.setState(MatState.LOADED, true); - LogManager.logInfo(LogConstants.CTX_MATVIEWS, QueryExecPlugin.Util.getString("TempTableDataManager.loaded", tableName, rowCount)); //$NON-NLS-1$ + LogManager.logInfo(LogConstants.CTX_MATVIEWS, QueryPlugin.Util.getString("TempTableDataManager.loaded", tableName, rowCount)); //$NON-NLS-1$ } } return rowCount; Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/tempdata/TempTableStore.java =================================================================== --- branches/7.1.x/engine/src/main/java/org/teiid/query/tempdata/TempTableStore.java 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/engine/src/main/java/org/teiid/query/tempdata/TempTableStore.java 2010-09-08 20:07:17 UTC (rev 2552) @@ -32,7 +32,7 @@ import org.teiid.api.exception.query.QueryProcessingException; import org.teiid.common.buffer.BufferManager; import org.teiid.core.TeiidComponentException; -import org.teiid.query.execution.QueryExecPlugin; +import org.teiid.query.QueryPlugin; import org.teiid.query.metadata.TempMetadataID; import org.teiid.query.metadata.TempMetadataStore; import org.teiid.query.resolver.command.TempTableResolver; @@ -210,7 +210,7 @@ } } if (columns == null) { - throw new QueryProcessingException(QueryExecPlugin.Util.getString("TempTableStore.table_doesnt_exist_error", tempTableID)); //$NON-NLS-1$ + throw new QueryProcessingException(QueryPlugin.Util.getString("TempTableStore.table_doesnt_exist_error", tempTableID)); //$NON-NLS-1$ } Create create = new Create(); create.setTable(new GroupSymbol(tempTableID)); Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/util/CommandContext.java =================================================================== --- branches/7.1.x/engine/src/main/java/org/teiid/query/util/CommandContext.java 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/engine/src/main/java/org/teiid/query/util/CommandContext.java 2010-09-08 20:07:17 UTC (rev 2552) @@ -38,7 +38,6 @@ import org.teiid.dqp.internal.process.SessionAwareCache.CacheID; import org.teiid.query.QueryPlugin; import org.teiid.query.eval.SecurityFunctionEvaluator; -import org.teiid.query.execution.QueryExecPlugin; import org.teiid.query.function.metadata.FunctionMethod; import org.teiid.query.metadata.QueryMetadataInterface; import org.teiid.query.optimizer.relational.PlanToProcessConverter; @@ -325,7 +324,7 @@ if (recursionStack == null) { recursionStack = new LinkedList<String>(); } else if (recursionStack.contains(value)) { - throw new QueryProcessingException(QueryExecPlugin.Util.getString("ExecDynamicSqlInstruction.3", value)); //$NON-NLS-1$ + throw new QueryProcessingException(QueryPlugin.Util.getString("ExecDynamicSqlInstruction.3", value)); //$NON-NLS-1$ } recursionStack.push(value); Deleted: branches/7.1.x/engine/src/main/resources/org/teiid/dqp/i18n.properties =================================================================== --- branches/7.1.x/engine/src/main/resources/org/teiid/dqp/i18n.properties 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/engine/src/main/resources/org/teiid/dqp/i18n.properties 2010-09-08 20:07:17 UTC (rev 2552) @@ -1,118 +0,0 @@ -# -# JBoss, Home of Professional Open Source. -# See the COPYRIGHT.txt file distributed with this work for information -# regarding copyright ownership. Some portions may be licensed -# to Red Hat, Inc. under one or more contributor license agreements. -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301 USA. -# - -BasicInterceptor.ProcessTree_for__4=ProcessTree for - - -ConnectorManager.not_in_valid_state=Connector is not in OPEN state - -ConnectorManagerImpl.Initializing_connector=Initializing connector {0} -Cancel_request_failed=AtomicRequest {0} failed to cancel. - -ConnectorWorker.MaxResultRowsExceed=The number of result rows has exceeded the maximum result rows "{0}" -ConnectorWorker.zero_size_non_last_batch=Connector returned a 0 row non-last batch: {0}. -ConnectorWorker.process_failed=Connector worker process failed for atomic-request={0} -ConnectorWorker.ConnectorWorker_result_set_unexpected_columns=Could not process stored procedure results for {0}. Expected {1} result set columns, but was {2}. Please update your models to allow for stored procedure results batching. - - -DataTierManager.could_not_obtain_connector_binding=Could not obtain connection factory for model {0} in VDB name= {1}, version {2} - - -DQPCore.Unable_to_load_metadata_for_VDB_name__{0},_version__{1}=Unable to load metadata for VDB name= {0}, version= {1} -DQPCore.Unknown_query_metadata_exception_while_registering_query__{0}.=Unknown query metadata exception while registering query: {0}. -DQPCore.Clearing_prepared_plan_cache=Clearing prepared plan cache -DQPCore.The_request_has_been_closed.=The request {0} has been closed. -DQPCore.The_atomic_request_has_been_cancelled=The atomic request {0} has been canceled. -DQPCore.failed_to_cancel=Failed to Cancel request, as request already finished processing - - - - -ProcessWorker.failed_rollback=Failed to properly rollback autowrap transaction properly -ProcessWorker.error=Unexpected exception for request {0} -ProcessWorker.processing_error=Processing exception ''{0}'' for request {1}. Exception type {2} thrown from {3}. Enable more detailed logging to see the entire stacktrace. - - -# ========================================== -# Error Messages for the dqp Package -# ========================================== -# - -# application (000) - -# interceptor (001) - -# internal (002) - -# from server package of last release -# #datatier (018.003) - -# #query (018.005) -ERR.018.005.0095 = User <{0}> is not entitled to action <{1}> for 1 or more of the groups/elements/procedures. - -# services (003) - -Request.Invalid_character_in_query=Bind variables (represented as "?") were found but are allowed only in prepared or callable statements. - -ProcessWorker.wrongdata=Wrong type of data found or no data found; expecting streamable object from the buffer manager. -ProcessWorker.LobError=An error occurred during streaming of Lob Chunks to Client. - -TransactionServer.existing_transaction=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}. -TransactionServer.concurrent_transaction=Concurrent enlistment in global transaction {0} is not supported. -TransactionServer.no_global_transaction=Expected an existing global transaction {0} but there was none for client {1} -TransactionServer.unknown_flags=Unknown flags -TransactionServer.no_global_transaction=No global transaction found for {0}. -TransactionServer.wrong_transaction=Client is not currently enlisted in transaction {0}. -TransactionServer.resume_failed=Cannot resume, transaction {0} was not suspended by client {1}. -TransactionServer.existing_global_transaction=Global transaction {0} already exists. -TransactionServer.suspended_exist=Suspended work still exists on transaction {0}. - - - -TransformationMetadata.does_not_exist._1=does not exist. -TransformationMetadata.Error_trying_to_read_virtual_document_{0},_with_body__n{1}_1=Error trying to read virtual document {0}, with body \n{1} -TransformationMetadata.Unknown_support_constant___12=Unknown support constant: -TransformationMetadata.QueryPlan_could_not_be_found_for_physical_group__6=QueryPlan could not be found for physical group -TransformationMetadata.InsertPlan_could_not_be_found_for_physical_group__8=InsertPlan could not be found for physical group -TransformationMetadata.InsertPlan_could_not_be_found_for_physical_group__10=InsertPlan could not be found for physical group -TransformationMetadata.DeletePlan_could_not_be_found_for_physical_group__12=DeletePlan could not be found for physical group -TransformationMetadata.Error_trying_to_read_schemas_for_the_document/table____1=Error trying to read schemas for the document/table : -TransformationMetadata.Invalid_type=Invalid type: {0}. -TransformationMetadata.does_not_exist._1=does not exist. -TransformationMetadata.0={0} ambiguous, more than one entity matching the same name -TransformationMetadata.Error_trying_to_read_virtual_document_{0},_with_body__n{1}_1=Error trying to read virtual document {0}, with body \n{1} -TransformationMetadata.Unknown_support_constant___12=Unknown support constant: -TransformationMetadata.QueryPlan_could_not_be_found_for_physical_group__6=QueryPlan could not be found for physical group -TransformationMetadata.InsertPlan_could_not_be_found_for_physical_group__8=InsertPlan could not be found for physical group -TransformationMetadata.InsertPlan_could_not_be_found_for_physical_group__10=InsertPlan could not be found for physical group -TransformationMetadata.DeletePlan_could_not_be_found_for_physical_group__12=DeletePlan could not be found for physical group -TransformationMetadata.Error_trying_to_read_schemas_for_the_document/table____1=Error trying to read schemas for the document/table : -TransformationMetadata.Invalid_type=Invalid type: {0}. - -CachedFinder.no_connector_found=No connector with jndi-name {0} found for Model {1} with source name {2} -translator_not_found=Translator {0} not accessible. -datasource_not_found=Data Source {0} not accessible. - -RequestWorkItem.cache_nondeterministic=Caching command '{0}'' at a session level, but less deterministic functions were evaluated. -not_found_cache=Results not found in cache -failed_to_unwrap_connection=Failed to unwrap the source connection. Deleted: branches/7.1.x/engine/src/main/resources/org/teiid/query/execution/i18n.properties =================================================================== --- branches/7.1.x/engine/src/main/resources/org/teiid/query/execution/i18n.properties 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/engine/src/main/resources/org/teiid/query/execution/i18n.properties 2010-09-08 20:07:17 UTC (rev 2552) @@ -1,120 +0,0 @@ -# -# JBoss, Home of Professional Open Source. -# See the COPYRIGHT.txt file distributed with this work for information -# regarding copyright ownership. Some portions may be licensed -# to Red Hat, Inc. under one or more contributor license agreements. -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301 USA. -# - -# Error messages for query (015) project to address internationalization -# Format: -# - -# optimizer (004) -ERR.015.004.0007= Can''t convert plan node of type {0} -ERR.015.004.0009= Error finding connectorBindingID for command -ERR.015.004.0010= Unknown group specified in OPTION MAKEDEP/MAKENOTDEP: {0} -ERR.015.004.0012= Group has an access pattern which has not been met: group(s) {0}; access pattern(s) {1} -ERR.015.004.0020= Error getting model for {0} -ERR.015.004.0023= Error rewriting criteria: {0} -ERR.015.004.0024= Unable to create a query plan that sends a criteria to \"{0}\". This connection factory requires criteria set to true indicating that a query against this model requires criteria. -ERR.015.004.0029= Could not resolve group symbol {0} -ERR.015.004.0035= The criteria {0} has elements from the root staging table and the document nodes which is not allowed. -ERR.015.004.0037= No mapping node found named, ''{0}', in use of ''context'' -ERR.015.004.0046= The XML document element(s) {0} are not mapped to data and cannot be used in the criteria \"{1}\". -ERR.015.004.0054= Could not parse query transformation for {0}: {1} -ERR.015.004.0068= Context functions within the same conjunct refer to different contexts: {0} - -# processor (006) -ERR.015.006.0001= XMLPlan toString couldn''t print entire Program. -ERR.015.006.0034= Unexpected symbol type while updating tuple: {0} -ERR.015.006.0037= Tuple source does not exist: {0} -ERR.015.006.0039= Instructed to abort processing when recursion limit reached. -ERR.015.006.0042= No xml schema to validate document against -ERR.015.006.0048= Fatal Error: {0} -ERR.015.006.0049= Error: {0} -ERR.015.006.0051= Invalid direction for MoveDocInstruction: {0} -ERR.015.006.0054= Instructed to abort processing as default of choice. - -# rewriter (009) -ERR.015.009.0001= Error evaluating criteria: {0} -ERR.015.009.0002= Error translating criteria on the user''s command, the criteria translated to {0} is not valid -ERR.015.009.0003= Error simplifying mathematical expression: {0} -QueryRewriter.infinite_while=Infinite loop detected, procedure will not be executed. - -BatchedUpdatePlanner.unrecognized_command=The batch contained an unrecognized command: {0} -ProcedurePlanner.bad_stmt=Error while planning update procedure, unknown statement type encountered: {0} -RulePushSelectCriteria.Error_getting_modelID=Error getting modelID -XMLPlanner.no_uri=Cannot find namespace URI for namespace {0} of element {1} - -XMLPlanner.The_XML_document_element_{0}_is_not_mapped_to_data_and_cannot_be_used_in_the_ORDER_BY_clause__{1}_1=The XML document element {0} is not mapped to data and cannot be used in the ORDER BY clause: {1} -XMLPlanner.The_rowlimit_parameter_{0}_is_not_in_the_scope_of_any_mapping_class=The ''rowlimit'' or ''rowlimitexception'' function parameter ''{0}'' is not an XML node within the scope of any mapping class. -XMLPlanner.Criteria_{0}_contains_conflicting_row_limits=The criteria ''{0}'' contains conflicting row limits for an XML mapping class. -AccessNode.rewrite_failed=Failed to rewrite the command: {0} -BatchedUpdateNode.unexpected_end_of_batch=Unexpectedly reached the end of the batched update counts at {0}, expected {1}. -row_limit_passed=The row limit {0} has been exceeded for XML mapping class {1}. -AddNodeInstruction.element__1=element -AddNodeInstruction.Unable_to_add_xml_{0}_{1},_namespace_{2},_namespace_declarations_{3}_3=Unable to add xml {0} {1}, namespace {2}, namespace declarations {3} -QueryProcessor.request_cancelled=The request {0} has been cancelled. -VariableSubstitutionVisitor.Input_vars_should_have_same_changing_state=INPUT variables used in the expression should all have same CHANGING state: {0} - -ExecDynamicSqlInstruction.0=Evaluated dynamic SQL expression value was null. -ExecDynamicSqlInstruction.3=There is a recursive invocation of group ''{0}''. Please correct the SQL. -ExecDynamicSqlInstruction.4=The dynamic sql string contains an incorrect number of elements. -ExecDynamicSqlInstruction.6=The datatype ''{0}'' for element ''{1}'' in the dynamic SQL cannot be implicitly converted to ''{2}''. -ExecDynamicSqlInstruction.couldnt_execute=Couldn''t execute the dynamic SQL command "{0}" with the SQL statement "{1}" due to: {2} - -RulePlanJoins.cantSatisfy=Join region with unsatisfied access patterns cannot be satisfied by the join criteria, Access patterns: {0} -TempTableStore.table_exist_error=Temporary table "{0}" already exists. -TempTableStore.table_doesnt_exist_error=Temporary table "{0}" does not exist. - -XMLQueryPlanner.cannot_plan=Cannot create a query for MappingClass with user criteria {0} -CriteriaPlanner.staging_context=Staging table criteria cannot contian context functions -CriteriaPlanner.multiple_staging=Staging table criteria {0} was not specified against a single staging table -CriteriaPlanner.invalid_context=Element {0} is not in the scope of the context {1} -CriteriaPlanner.invalid_element=Element {0} is not a valid data node -results_not_found=Results for the mapping class {0} are not found; -RulePlanProcedures.no_values=No valid criteria specified for procedure parameter {0} -ProcedurePlan.nonNullableParam=The procedure parameter is not nullable, but is set to null: {0} - -FileStoreageManager.error_creating=Error creating {0} -FileStoreageManager.error_reading=Error reading {0} -FileStoreageManager.no_directory=No directory specified for the file storage manager. -FileStoreageManager.not_a_directory={0} is not a valid storage manager directory. -FileStoreageManager.space_exhausted=Max buffer space of {0} bytes has been exceed. The current operation will be aborted. - -TextTableNode.no_value=No value found for column \"{0}\" in the row ending on text line {1} in {2}. -TextTableNode.conversion_error=Could not convert value for column \"{0}\" in the row ending on text line {1} in {2}. -TextTableNode.header_missing=HEADER entry missing for column name \"{0}\" in {1}. -TextTableNode.unclosed=Text parse error: Unclosed qualifier at end of text in {0}. -TextTableNode.character_not_allowed=Text parse error: Non-whitespace character found between the qualifier and the delimiter in text line {0} in {1}. -TextTableNode.unknown_escape=Text parse error: Unknown escape sequence \\{0} in text line {1} in {2}. -TextTableNode.invalid_width=Text parse error: Fixed width line width {0} is smaller than the expected {1} on text line {2} in {3}. - -XMLTableNode.error=Error evaluating XQuery row context for XMLTable: {0} -XMLTableNode.path_error=Error evaluating XMLTable column path expression for column: {0} -XMLTableName.multi_value=Unexpected multi-valued result was returned for XMLTable column "{0}". Path expressions for non-XML type columns should return at most a single result. - -TempTableDataManager.failed_load=Failed to load materialized view table {0}. -TempTableDataManager.loaded=Loaded materialized view table {0} with row count {1}. -TempTableDataManager.loading=Loading materialized view table {0} -TempTableDataManager.not_implicit_matview={0} does not target an internal materialized view. -TempTableDataManager.row_refresh_pk=Materialized view {0} cannot have a row refreshed since there is no primary key. -TempTableDataManager.row_refresh_composite=Materialized view {0} cannot have a row refreshed because it uses a composite key. -TempTableDataManager.row_refresh_updatable=Materialized view {0} cannot have a row refreshed because it's cache hint did not specify \"updatable\". -TempTableDataManager.row_refresh=Refreshing row {1} for materialized view {0}. -CriteriaPlanner.no_context=No root node found. Modified: branches/7.1.x/engine/src/main/resources/org/teiid/query/i18n.properties =================================================================== --- branches/7.1.x/engine/src/main/resources/org/teiid/query/i18n.properties 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/engine/src/main/resources/org/teiid/query/i18n.properties 2010-09-08 20:07:17 UTC (rev 2552) @@ -217,35 +217,38 @@ ERR.015.012.0067 = No scalar subqueries are allowed in the SELECT with no FROM clause. ERR.015.012.0069 = INTO clause can not be used in XML query. -# Log messages for query (015) project to address internationalization -# Format: -# - -# function (001) - -# mapping (002) - -# metadata (003) - # optimizer (004) +ERR.015.004.0007= Can''t convert plan node of type {0} +ERR.015.004.0009= Error finding connectorBindingID for command +ERR.015.004.0010= Unknown group specified in OPTION MAKEDEP/MAKENOTDEP: {0} +ERR.015.004.0012= Group has an access pattern which has not been met: group(s) {0}; access pattern(s) {1} +ERR.015.004.0020= Error getting model for {0} +ERR.015.004.0023= Error rewriting criteria: {0} +ERR.015.004.0024= Unable to create a query plan that sends a criteria to \"{0}\". This connection factory requires criteria set to true indicating that a query against this model requires criteria. +ERR.015.004.0029= Could not resolve group symbol {0} +ERR.015.004.0035= The criteria {0} has elements from the root staging table and the document nodes which is not allowed. +ERR.015.004.0037= No mapping node found named, ''{0}', in use of ''context'' +ERR.015.004.0046= The XML document element(s) {0} are not mapped to data and cannot be used in the criteria \"{1}\". +ERR.015.004.0054= Could not parse query transformation for {0}: {1} +ERR.015.004.0068= Context functions within the same conjunct refer to different contexts: {0} -# parser (005) - # processor (006) +ERR.015.006.0001= XMLPlan toString couldn''t print entire Program. +ERR.015.006.0034= Unexpected symbol type while updating tuple: {0} +ERR.015.006.0037= Tuple source does not exist: {0} +ERR.015.006.0039= Instructed to abort processing when recursion limit reached. +ERR.015.006.0042= No xml schema to validate document against +ERR.015.006.0048= Fatal Error: {0} +ERR.015.006.0049= Error: {0} +ERR.015.006.0051= Invalid direction for MoveDocInstruction: {0} +ERR.015.006.0054= Instructed to abort processing as default of choice. -# report (007) - -# resolver (008) - # rewriter (009) +ERR.015.009.0001= Error evaluating criteria: {0} +ERR.015.009.0002= Error translating criteria on the user''s command, the criteria translated to {0} is not valid +ERR.015.009.0003= Error simplifying mathematical expression: {0} -# sql (010) -# util (011) - -# validator (012) - - SQLParser.Unknown_join_type=Unknown join type: {0} SQLParser.Aggregate_only_top_level=Aggregate expressions are allowed only as top level functions in the SELECT and HAVING clauses. SQLParser.Unknown_agg_func=Unknown aggregate function: {0} @@ -713,3 +716,147 @@ ValidationVisitor.group_in_both_dep=Table specified in both dependent and independent queries '{0}' XMLQuery.resolvingError=Failed to resolve the query '{0}' SQLParser.non_position_constant=Invalid order by at {0} + + +QueryRewriter.infinite_while=Infinite loop detected, procedure will not be executed. + +BatchedUpdatePlanner.unrecognized_command=The batch contained an unrecognized command: {0} +ProcedurePlanner.bad_stmt=Error while planning update procedure, unknown statement type encountered: {0} +RulePushSelectCriteria.Error_getting_modelID=Error getting modelID +XMLPlanner.no_uri=Cannot find namespace URI for namespace {0} of element {1} + +XMLPlanner.The_XML_document_element_{0}_is_not_mapped_to_data_and_cannot_be_used_in_the_ORDER_BY_clause__{1}_1=The XML document element {0} is not mapped to data and cannot be used in the ORDER BY clause: {1} +XMLPlanner.The_rowlimit_parameter_{0}_is_not_in_the_scope_of_any_mapping_class=The ''rowlimit'' or ''rowlimitexception'' function parameter ''{0}'' is not an XML node within the scope of any mapping class. +XMLPlanner.Criteria_{0}_contains_conflicting_row_limits=The criteria ''{0}'' contains conflicting row limits for an XML mapping class. +AccessNode.rewrite_failed=Failed to rewrite the command: {0} +BatchedUpdateNode.unexpected_end_of_batch=Unexpectedly reached the end of the batched update counts at {0}, expected {1}. +row_limit_passed=The row limit {0} has been exceeded for XML mapping class {1}. +AddNodeInstruction.element__1=element +AddNodeInstruction.Unable_to_add_xml_{0}_{1},_namespace_{2},_namespace_declarations_{3}_3=Unable to add xml {0} {1}, namespace {2}, namespace declarations {3} +QueryProcessor.request_cancelled=The request {0} has been cancelled. +VariableSubstitutionVisitor.Input_vars_should_have_same_changing_state=INPUT variables used in the expression should all have same CHANGING state: {0} + +ExecDynamicSqlInstruction.0=Evaluated dynamic SQL expression value was null. +ExecDynamicSqlInstruction.3=There is a recursive invocation of group ''{0}''. Please correct the SQL. +ExecDynamicSqlInstruction.4=The dynamic sql string contains an incorrect number of elements. +ExecDynamicSqlInstruction.6=The datatype ''{0}'' for element ''{1}'' in the dynamic SQL cannot be implicitly converted to ''{2}''. +ExecDynamicSqlInstruction.couldnt_execute=Couldn''t execute the dynamic SQL command "{0}" with the SQL statement "{1}" due to: {2} + +RulePlanJoins.cantSatisfy=Join region with unsatisfied access patterns cannot be satisfied by the join criteria, Access patterns: {0} +TempTableStore.table_exist_error=Temporary table "{0}" already exists. +TempTableStore.table_doesnt_exist_error=Temporary table "{0}" does not exist. + +XMLQueryPlanner.cannot_plan=Cannot create a query for MappingClass with user criteria {0} +CriteriaPlanner.staging_context=Staging table criteria cannot contian context functions +CriteriaPlanner.multiple_staging=Staging table criteria {0} was not specified against a single staging table +CriteriaPlanner.invalid_context=Element {0} is not in the scope of the context {1} +CriteriaPlanner.invalid_element=Element {0} is not a valid data node +results_not_found=Results for the mapping class {0} are not found; +RulePlanProcedures.no_values=No valid criteria specified for procedure parameter {0} +ProcedurePlan.nonNullableParam=The procedure parameter is not nullable, but is set to null: {0} + +FileStoreageManager.error_creating=Error creating {0} +FileStoreageManager.error_reading=Error reading {0} +FileStoreageManager.no_directory=No directory specified for the file storage manager. +FileStoreageManager.not_a_directory={0} is not a valid storage manager directory. +FileStoreageManager.space_exhausted=Max buffer space of {0} bytes has been exceed. The current operation will be aborted. + +TextTableNode.no_value=No value found for column \"{0}\" in the row ending on text line {1} in {2}. +TextTableNode.conversion_error=Could not convert value for column \"{0}\" in the row ending on text line {1} in {2}. +TextTableNode.header_missing=HEADER entry missing for column name \"{0}\" in {1}. +TextTableNode.unclosed=Text parse error: Unclosed qualifier at end of text in {0}. +TextTableNode.character_not_allowed=Text parse error: Non-whitespace character found between the qualifier and the delimiter in text line {0} in {1}. +TextTableNode.unknown_escape=Text parse error: Unknown escape sequence \\{0} in text line {1} in {2}. +TextTableNode.invalid_width=Text parse error: Fixed width line width {0} is smaller than the expected {1} on text line {2} in {3}. + +XMLTableNode.error=Error evaluating XQuery row context for XMLTable: {0} +XMLTableNode.path_error=Error evaluating XMLTable column path expression for column: {0} +XMLTableName.multi_value=Unexpected multi-valued result was returned for XMLTable column "{0}". Path expressions for non-XML type columns should return at most a single result. + +TempTableDataManager.failed_load=Failed to load materialized view table {0}. +TempTableDataManager.loaded=Loaded materialized view table {0} with row count {1}. +TempTableDataManager.loading=Loading materialized view table {0} +TempTableDataManager.not_implicit_matview={0} does not target an internal materialized view. +TempTableDataManager.row_refresh_pk=Materialized view {0} cannot have a row refreshed since there is no primary key. +TempTableDataManager.row_refresh_composite=Materialized view {0} cannot have a row refreshed because it uses a composite key. +TempTableDataManager.row_refresh_updatable=Materialized view {0} cannot have a row refreshed because it's cache hint did not specify \"updatable\". +TempTableDataManager.row_refresh=Refreshing row {1} for materialized view {0}. +CriteriaPlanner.no_context=No root node found. + +BasicInterceptor.ProcessTree_for__4=ProcessTree for + + +ConnectorManager.not_in_valid_state=Connector is not in OPEN state + +ConnectorManagerImpl.Initializing_connector=Initializing connector {0} +Cancel_request_failed=AtomicRequest {0} failed to cancel. + +ConnectorWorker.MaxResultRowsExceed=The number of result rows has exceeded the maximum result rows "{0}" +ConnectorWorker.zero_size_non_last_batch=Connector returned a 0 row non-last batch: {0}. +ConnectorWorker.process_failed=Connector worker process failed for atomic-request={0} +ConnectorWorker.ConnectorWorker_result_set_unexpected_columns=Could not process stored procedure results for {0}. Expected {1} result set columns, but was {2}. Please update your models to allow for stored procedure results batching. + + +DataTierManager.could_not_obtain_connector_binding=Could not obtain connection factory for model {0} in VDB name= {1}, version {2} + + +DQPCore.Unable_to_load_metadata_for_VDB_name__{0},_version__{1}=Unable to load metadata for VDB name= {0}, version= {1} +DQPCore.Unknown_query_metadata_exception_while_registering_query__{0}.=Unknown query metadata exception while registering query: {0}. +DQPCore.Clearing_prepared_plan_cache=Clearing prepared plan cache +DQPCore.The_request_has_been_closed.=The request {0} has been closed. +DQPCore.The_atomic_request_has_been_cancelled=The atomic request {0} has been canceled. +DQPCore.failed_to_cancel=Failed to Cancel request, as request already finished processing + +ProcessWorker.failed_rollback=Failed to properly rollback autowrap transaction properly +ProcessWorker.error=Unexpected exception for request {0} +ProcessWorker.processing_error=Processing exception ''{0}'' for request {1}. Exception type {2} thrown from {3}. Enable more detailed logging to see the entire stacktrace. + + +# #query (018.005) +ERR.018.005.0095 = User <{0}> is not entitled to action <{1}> for 1 or more of the groups/elements/procedures. + +# services (003) + +Request.Invalid_character_in_query=Bind variables (represented as "?") were found but are allowed only in prepared or callable statements. + +ProcessWorker.wrongdata=Wrong type of data found or no data found; expecting streamable object from the buffer manager. +ProcessWorker.LobError=An error occurred during streaming of Lob Chunks to Client. + +TransactionServer.existing_transaction=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}. +TransactionServer.concurrent_transaction=Concurrent enlistment in global transaction {0} is not supported. +TransactionServer.no_global_transaction=Expected an existing global transaction {0} but there was none for client {1} +TransactionServer.unknown_flags=Unknown flags +TransactionServer.no_global_transaction=No global transaction found for {0}. +TransactionServer.wrong_transaction=Client is not currently enlisted in transaction {0}. +TransactionServer.resume_failed=Cannot resume, transaction {0} was not suspended by client {1}. +TransactionServer.existing_global_transaction=Global transaction {0} already exists. +TransactionServer.suspended_exist=Suspended work still exists on transaction {0}. + +TransformationMetadata.does_not_exist._1=does not exist. +TransformationMetadata.Error_trying_to_read_virtual_document_{0},_with_body__n{1}_1=Error trying to read virtual document {0}, with body \n{1} +TransformationMetadata.Unknown_support_constant___12=Unknown support constant: +TransformationMetadata.QueryPlan_could_not_be_found_for_physical_group__6=QueryPlan could not be found for physical group +TransformationMetadata.InsertPlan_could_not_be_found_for_physical_group__8=InsertPlan could not be found for physical group +TransformationMetadata.InsertPlan_could_not_be_found_for_physical_group__10=InsertPlan could not be found for physical group +TransformationMetadata.DeletePlan_could_not_be_found_for_physical_group__12=DeletePlan could not be found for physical group +TransformationMetadata.Error_trying_to_read_schemas_for_the_document/table____1=Error trying to read schemas for the document/table : +TransformationMetadata.Invalid_type=Invalid type: {0}. +TransformationMetadata.does_not_exist._1=does not exist. +TransformationMetadata.0={0} ambiguous, more than one entity matching the same name +TransformationMetadata.Error_trying_to_read_virtual_document_{0},_with_body__n{1}_1=Error trying to read virtual document {0}, with body \n{1} +TransformationMetadata.Unknown_support_constant___12=Unknown support constant: +TransformationMetadata.QueryPlan_could_not_be_found_for_physical_group__6=QueryPlan could not be found for physical group +TransformationMetadata.InsertPlan_could_not_be_found_for_physical_group__8=InsertPlan could not be found for physical group +TransformationMetadata.InsertPlan_could_not_be_found_for_physical_group__10=InsertPlan could not be found for physical group +TransformationMetadata.DeletePlan_could_not_be_found_for_physical_group__12=DeletePlan could not be found for physical group +TransformationMetadata.Error_trying_to_read_schemas_for_the_document/table____1=Error trying to read schemas for the document/table : +TransformationMetadata.Invalid_type=Invalid type: {0}. + +CachedFinder.no_connector_found=No connector with jndi-name {0} found for Model {1} with source name {2} +translator_not_found=Translator {0} not accessible. +datasource_not_found=Data Source {0} not accessible. + +RequestWorkItem.cache_nondeterministic=Caching command '{0}'' at a session level, but less deterministic functions were evaluated. +not_found_cache=Results not found in cache +failed_to_unwrap_connection=Failed to unwrap the source connection. \ No newline at end of file Modified: branches/7.1.x/runtime/src/main/java/org/teiid/transport/LocalServerConnection.java =================================================================== --- branches/7.1.x/runtime/src/main/java/org/teiid/transport/LocalServerConnection.java 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/runtime/src/main/java/org/teiid/transport/LocalServerConnection.java 2010-09-08 20:07:17 UTC (rev 2552) @@ -43,9 +43,9 @@ import org.teiid.dqp.internal.process.DQPWorkContext; import org.teiid.net.CommunicationException; import org.teiid.net.ConnectionException; -import org.teiid.net.NetPlugin; import org.teiid.net.ServerConnection; import org.teiid.net.TeiidURL; +import org.teiid.runtime.RuntimePlugin; public class LocalServerConnection implements ServerConnection { @@ -95,7 +95,7 @@ public Object invoke(Object arg0, final Method arg1, final Object[] arg2) throws Throwable { if (shutdown) { - throw ExceptionUtil.convertException(arg1, new TeiidComponentException(NetPlugin.Util.getString("LocalTransportHandler.Transport_shutdown"))); //$NON-NLS-1$ + throw ExceptionUtil.convertException(arg1, new TeiidComponentException(RuntimePlugin.Util.getString("LocalTransportHandler.Transport_shutdown"))); //$NON-NLS-1$ } try { if (passthrough && !arg1.getDeclaringClass().equals(ILogon.class)) { Modified: branches/7.1.x/runtime/src/main/java/org/teiid/transport/SSLAwareChannelHandler.java =================================================================== --- branches/7.1.x/runtime/src/main/java/org/teiid/transport/SSLAwareChannelHandler.java 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/runtime/src/main/java/org/teiid/transport/SSLAwareChannelHandler.java 2010-09-08 20:07:17 UTC (rev 2552) @@ -54,8 +54,8 @@ import org.teiid.common.buffer.StorageManager; import org.teiid.logging.LogConstants; import org.teiid.logging.LogManager; -import org.teiid.net.NetPlugin; import org.teiid.net.socket.ObjectChannel; +import org.teiid.runtime.RuntimePlugin; /** @@ -216,7 +216,7 @@ ChannelStateEvent e) throws Exception { ChannelListener listener = this.listeners.remove(e.getChannel()); if (listener != null) { - LogManager.logDetail(LogConstants.CTX_TRANSPORT, NetPlugin.Util.getString("SSLAwareChannelHandler.channel_closed")); //$NON-NLS-1$ + LogManager.logDetail(LogConstants.CTX_TRANSPORT, RuntimePlugin.Util.getString("SSLAwareChannelHandler.channel_closed")); //$NON-NLS-1$ listener.disconnected(); } } Modified: branches/7.1.x/runtime/src/main/java/org/teiid/transport/SocketClientInstance.java =================================================================== --- branches/7.1.x/runtime/src/main/java/org/teiid/transport/SocketClientInstance.java 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/runtime/src/main/java/org/teiid/transport/SocketClientInstance.java 2010-09-08 20:07:17 UTC (rev 2552) @@ -37,10 +37,10 @@ import org.teiid.logging.LogManager; import org.teiid.logging.MessageLevel; import org.teiid.net.CommunicationException; -import org.teiid.net.NetPlugin; import org.teiid.net.socket.Handshake; import org.teiid.net.socket.Message; import org.teiid.net.socket.ObjectChannel; +import org.teiid.runtime.RuntimePlugin; /** @@ -130,7 +130,7 @@ //ensure the key information if (returnedPublicKey == null) { - throw new CommunicationException(NetPlugin.Util.getString("SocketClientInstance.invalid_sessionkey")); //$NON-NLS-1$ + throw new CommunicationException(RuntimePlugin.Util.getString("SocketClientInstance.invalid_sessionkey")); //$NON-NLS-1$ } try { Modified: branches/7.1.x/runtime/src/main/resources/org/teiid/runtime/i18n.properties =================================================================== --- branches/7.1.x/runtime/src/main/resources/org/teiid/runtime/i18n.properties 2010-09-08 19:43:37 UTC (rev 2551) +++ branches/7.1.x/runtime/src/main/resources/org/teiid/runtime/i18n.properties 2010-09-08 20:07:17 UTC (rev 2552) @@ -43,6 +43,9 @@ ServerWorkItem.Component_Not_Found=Component not found: {0} SocketTransport.1=Bound to address {0} listening on port {1} +LocalTransportHandler.Transport_shutdown=Tranport has been shutdown. +SocketClientInstance.invalid_sessionkey=Invalid session key used during handshake +SSLAwareChannelHandler.channel_closed=Channel closed invlaid_vdb_file=Invalid VDB file deployment failed {0} redeploying_vdb=Re-deploying VDB {0}