teiid SVN: r509 - in trunk: client/src/main/java/com/metamatrix/common/comm/platform/socket/client and 4 other directories.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2009-02-26 14:44:06 -0500 (Thu, 26 Feb 2009)
New Revision: 509
Added:
trunk/client/src/main/resources/teiid-client-settings.properties
Removed:
trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/PrintStreamSocketLog.java
trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/SocketLog.java
Modified:
trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/SocketUtil.java
trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/client/SocketServerConnection.java
trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/client/SocketServerConnectionFactory.java
trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/client/SocketServerInstanceImpl.java
trunk/client/src/test/java/com/metamatrix/common/comm/platform/socket/client/TestSocketServerConnection.java
trunk/client/src/test/java/com/metamatrix/common/comm/platform/socket/client/TestSocketServerInstanceImpl.java
trunk/server/src/main/java/com/metamatrix/common/comm/platform/socket/server/SocketClientInstance.java
trunk/server/src/main/java/com/metamatrix/common/comm/platform/socket/server/SocketListener.java
trunk/server/src/test/java/com/metamatrix/common/comm/platform/socket/server/TestSocketRemoting.java
Log:
TEIID-385 removing socket log also added default teiid-client-settings.properties
Deleted: trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/PrintStreamSocketLog.java
===================================================================
--- trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/PrintStreamSocketLog.java 2009-02-26 18:10:59 UTC (rev 508)
+++ trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/PrintStreamSocketLog.java 2009-02-26 19:44:06 UTC (rev 509)
@@ -1,242 +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 com.metamatrix.common.comm.platform.socket;
-
-import java.io.PrintStream;
-
-/**
- * Writes log messages to a PrintStream.
- */
-public class PrintStreamSocketLog implements SocketLog{
- private PrintStream stream;
- private String staticContext;
-
- private int logLevel = SocketLog.NONE;
-
- public PrintStreamSocketLog(PrintStream stream, String staticContext, int logLevel) {
- this.stream = stream;
- this.staticContext = staticContext;
- this.logLevel = logLevel;
- }
-
-
-
-
- /**
- * @see com.metamatrix.common.comm.platform.socket.SocketLog#logCritical(java.lang.String, java.lang.String)
- * @since 4.3
- */
- public void logCritical(String context,
- String message) {
- if (isLogged(context, SocketLog.CRITICAL)) {
- log(SocketLog.CRITICAL, context, message);
- }
- }
-
-
-
-
- /**
- * @see com.metamatrix.common.comm.platform.socket.SocketLog#logCritical(java.lang.String, java.lang.Throwable, java.lang.String)
- * @since 4.3
- */
- public void logCritical(String context,
- Throwable throwable,
- String message) {
- if (isLogged(context, SocketLog.CRITICAL)) {
- log(SocketLog.CRITICAL, context, throwable, message);
- }
- }
-
- /**
- * @see com.metamatrix.common.comm.platform.socket.SocketLog#logError(java.lang.String, java.lang.String)
- * @since 4.3
- */
- public void logError(String context,
- String message) {
- if (isLogged(context, SocketLog.ERROR)) {
- log(SocketLog.ERROR, context, message);
- }
- }
-
- /**
- * @see com.metamatrix.common.comm.platform.socket.SocketLog#logError(java.lang.String, java.lang.Throwable, java.lang.String)
- * @since 4.3
- */
- public void logError(String context,
- Throwable throwable,
- String message) {
- if (isLogged(context, SocketLog.ERROR)) {
- log(SocketLog.ERROR, context, throwable, message);
- }
- }
-
- /**
- * @see com.metamatrix.common.comm.platform.socket.SocketLog#logWarning(java.lang.String, java.lang.String)
- * @since 4.3
- */
- public void logWarning(String context,
- String message) {
- if (isLogged(context, SocketLog.WARNING)) {
- log(SocketLog.WARNING, context, message);
- }
- }
-
- /**
- * @see com.metamatrix.common.comm.platform.socket.SocketLog#logWarning(java.lang.String, java.lang.Throwable, java.lang.String)
- * @since 4.3
- */
- public void logWarning(String context,
- Throwable throwable,
- String message) {
- if (isLogged(context, SocketLog.WARNING)) {
- log(SocketLog.WARNING, context, throwable, message);
- }
- }
-
- /**
- * @see com.metamatrix.common.comm.platform.socket.SocketLog#logInfo(java.lang.String, java.lang.String)
- * @since 4.3
- */
- public void logInfo(String context,
- String message) {
- if (isLogged(context, SocketLog.INFO)) {
- log(SocketLog.INFO, context, message);
- }
- }
- /**
- * @see com.metamatrix.common.comm.platform.socket.SocketLog#logInfo(java.lang.String, java.lang.String)
- * @since 4.3
- */
- public void logInfo(String context,
- Throwable throwable,
- String message) {
- if (isLogged(context, SocketLog.INFO)) {
- log(SocketLog.INFO, context, throwable, message);
- }
- }
- /**
- * @see com.metamatrix.common.comm.platform.socket.SocketLog#logDetail(java.lang.String, java.lang.String)
- * @since 4.3
- */
- public void logDetail(String context,
- String message) {
- if (isLogged(context, SocketLog.DETAIL)) {
- log(SocketLog.DETAIL, context, message);
- }
- }
- /**
- * @see com.metamatrix.common.comm.platform.socket.SocketLog#logDetail(java.lang.String, java.lang.String)
- * @since 4.3
- */
- public void logDetail(String context,
- Throwable throwable,
- String message) {
- if (isLogged(context, SocketLog.DETAIL)) {
- log(SocketLog.DETAIL, context, throwable, message);
- }
- }
-
- /**
- * @see com.metamatrix.common.comm.platform.socket.SocketLog#logTrace(java.lang.String, java.lang.String)
- * @since 4.3
- */
- public void logTrace(String context,
- String message) {
- if (isLogged(context, SocketLog.TRACE)) {
- log(SocketLog.TRACE, context, message);
- }
- }
- /**
- * @see com.metamatrix.common.comm.platform.socket.SocketLog#logTrace(java.lang.String, java.lang.String)
- * @since 4.3
- */
- public void logTrace(String context,
- Throwable throwable,
- String message) {
- if (isLogged(context, SocketLog.TRACE)) {
- log(SocketLog.TRACE, context, throwable, message);
- }
- }
-
-
- private void log(int level, String context, String message) {
- stream.print(getLogLevelString(level));
- stream.print("\t["); //$NON-NLS-1$
- stream.print(staticContext);
- stream.print("]\t"); //$NON-NLS-1$
- stream.print(context);
- stream.print("\t"); //$NON-NLS-1$
- stream.println(message);
- }
-
- private void log(int level, String context, Throwable t, String message) {
- log(level, context, message);
- t.printStackTrace(stream);
- }
-
-
-
- public boolean isLogged(String context, int level) {
- return this.logLevel >= level;
- }
-
-
- private static String getLogLevelString(int level) {
- switch(level) {
- case SocketLog.CRITICAL:
- return "CRITICAL"; //$NON-NLS-1$
- case SocketLog.ERROR:
- return "ERROR"; //$NON-NLS-1$
- case SocketLog.WARNING:
- return "WARNING"; //$NON-NLS-1$
- case SocketLog.INFO:
- return "INFO"; //$NON-NLS-1$
- case SocketLog.DETAIL:
- return "DETAIL"; //$NON-NLS-1$
- case SocketLog.TRACE:
- return "TRACE"; //$NON-NLS-1$
-
- default:
- return "NONE"; //$NON-NLS-1$
- }
- }
-
- public static int getLogLevelInt(String level) {
- if (level.equalsIgnoreCase("CRITICAL")) { //$NON-NLS-1$
- return SocketLog.CRITICAL;
- } else if (level.equalsIgnoreCase("ERROR")) { //$NON-NLS-1$
- return SocketLog.ERROR;
- } else if (level.equalsIgnoreCase("WARNING")) { //$NON-NLS-1$
- return SocketLog.WARNING;
- } else if (level.equalsIgnoreCase("INFO")) { //$NON-NLS-1$
- return SocketLog.INFO;
- } else if (level.equalsIgnoreCase("DETAIL")) { //$NON-NLS-1$
- return SocketLog.DETAIL;
- } else if (level.equalsIgnoreCase("TRACE")) { //$NON-NLS-1$
- return SocketLog.TRACE;
- } else {
- return SocketLog.NONE;
- }
- }
-}
Deleted: trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/SocketLog.java
===================================================================
--- trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/SocketLog.java 2009-02-26 18:10:59 UTC (rev 508)
+++ trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/SocketLog.java 2009-02-26 19:44:06 UTC (rev 509)
@@ -1,93 +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 com.metamatrix.common.comm.platform.socket;
-
-/**
- * Logger used by the socket communication framework.
- */
-public interface SocketLog {
-
-
- //Message levels copied from com.metamatrix.common.log.MessageLevel
-
- /**
- * Message level value that specifies that no messages are to be recorded.
- */
- public static final int NONE = 0;
-
- /**
- * Message level value that specifies that critical messages are to be recorded.
- */
- public static final int CRITICAL = 1;
-
- /**
- * Message level value that specifies that error messages and critical
- * messages are to be recorded.
- */
- public static final int ERROR = 2;
-
- /**
- * Message level value that specifies that warning, error and critical
- * messages are to be recorded.
- */
- public static final int WARNING = 3;
-
- /**
- * Message level value that specifies that information, warning, error and critical
- * messages are to be recorded.
- */
- public static final int INFO = 4;
-
- /**
- * Message level value that specifies that detailed, information, warning, error and critical
- * messages are to be recorded.
- */
- public static final int DETAIL = 5;
-
- /**
- * Message level value that specifies that all messages are to be recorded.
- */
- public static final int TRACE = 6;
-
-
-
- void logCritical(String context, String message);
- void logCritical(String context, Throwable throwable, String message);
-
- void logError(String context, String message);
- void logError(String context, Throwable throwable, String message);
-
- void logWarning(String context, String message);
- void logWarning(String context, Throwable throwable, String message);
-
- void logInfo(String context, String message);
- void logInfo(String context, Throwable throwable, String message);
-
- void logDetail(String context, String message);
- void logDetail(String context, Throwable throwable, String message);
-
- void logTrace(String context, String message);
- void logTrace(String context, Throwable throwable, String message);
-
- boolean isLogged(String context, int logLevel);
-}
Modified: trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/SocketUtil.java
===================================================================
--- trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/SocketUtil.java 2009-02-26 18:10:59 UTC (rev 508)
+++ trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/SocketUtil.java 2009-02-26 19:44:06 UTC (rev 509)
@@ -49,46 +49,6 @@
* This class provides some utility methods to create ssl sockets using the
* keystores and trust stores. these are the properties required for the making the
* ssl connection
- * <p>
- * The search for the key stores is follows the path
- * MM defined properties ---> javax defined properties
- * <p/>
- * <ul>
- * <b>2-way SSL (MetaMatrix based)</b>
- * <li>-Dcom.metamatrix.ssl.keyStore (required)
- * <li>-Dcom.metamatrix.ssl.keyStorePassword (required)
- * <li>-Dcom.metamatrix.ssl.trustStore (required)
- * <li>-Dcom.metamatrix.ssl.trustStorePassword (required)
- * <li>-Dcom.metamatrix.ssl.protocol (optional;default=SSLv3)
- * <li>-Dcom.metamatrix.ssl.algorithm (optional;default=SunX509)
- * <li>-Dcom.metamatrix.ssl.keyStoreType (optional;default=JKS)
- * </ul>
- * <p/>
- * <ul>
- * <b>2-way SSL (javax based; can used where there are no conflicts in JVM)</b>
- * <li>-Djavax.net.ssl.keyStore (required)
- * <li>-Djavax.net.ssl.keyStorePassword (required)
- * <li>-Djavax.net.ssl.trustStore (required)
- * <li>-Djavax.net.ssl.trustStorePassword (required)
- * <li>-Djavax.net.ssl.keyStoreType (optional)
- * </ul>
- * <p/>
- * <ul>
- * <b>1-way SSL (metamatrix Based)</b>
- * <li>-Dcom.metamatrix.ssl.trustStore (required)
- * <li>-Dcom.metamatrix.ssl.trustStorePassword (required)
- * <li>-Dcom.metamatrix.ssl.protocol (optional;default=SSLv3)
- * <li>-Dcom.metamatrix.ssl.algorithm (optional;default=SunX509)
- * <li>-Dcom.metamatrix.ssl.keyStoreType (optional;default=JKS)
- * </ul>
- * <p/>
- * <ul>
- * <b>1-way SSL (javax based; can used where there are no conflicts in JVM)</b>
- * <li>-Djavax.net.ssl.trustStore (required)
- * <li>-Djavax.net.ssl.trustStorePassword (required)
- * <li>-Djavax.net.ssl.keyStoreType (optional)
- * </ul>
- *
*/
public class SocketUtil {
@@ -100,7 +60,6 @@
static final String KEYSTORE_PASSWORD = "com.metamatrix.ssl.keyStorePassword"; //$NON-NLS-1$
static final String KEYSTORE_FILENAME = "com.metamatrix.ssl.keyStore"; //$NON-NLS-1$
- static final String DEFAULT_ALGORITHM = "SunX509"; //$NON-NLS-1$
static final String DEFAULT_KEYSTORE_PROTOCOL = "SSLv3"; //$NON-NLS-1$
static final String DEFAULT_KEYSTORE_TYPE = "JKS"; //$NON-NLS-1$
@@ -138,7 +97,7 @@
// -Dcom.metamatrix.ssl.protocol (default SSLv3)
String keystoreProtocol = props.getProperty(PROTOCOL, DEFAULT_KEYSTORE_PROTOCOL);
// -Dcom.metamatrix.ssl.algorithm (default SunX509)
- String keystoreAlgorithm = props.getProperty(KEYSTORE_ALGORITHM, DEFAULT_ALGORITHM);
+ String keystoreAlgorithm = props.getProperty(KEYSTORE_ALGORITHM);
// -Dcom.metamatrix.ssl.trustStore (if null; keystore filename used)
String truststore = props.getProperty(TRUSTSTORE_FILENAME, keystore);
// -Dcom.metamatrix.ssl.trustStorePassword (if null; keystore password used)
@@ -206,6 +165,9 @@
String protocol) throws IOException {
try {
+ if (algorithm == null) {
+ algorithm = KeyManagerFactory.getDefaultAlgorithm();
+ }
// Configure the Keystore Manager
KeyManager[] keyManagers = null;
if (keystore != null) {
Modified: trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/client/SocketServerConnection.java
===================================================================
--- trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/client/SocketServerConnection.java 2009-02-26 18:10:59 UTC (rev 508)
+++ trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/client/SocketServerConnection.java 2009-02-26 19:44:06 UTC (rev 509)
@@ -40,6 +40,8 @@
import java.util.TimerTask;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import com.metamatrix.admin.api.exception.security.InvalidSessionException;
import com.metamatrix.api.exception.MetaMatrixComponentException;
@@ -52,7 +54,6 @@
import com.metamatrix.common.comm.exception.ConnectionException;
import com.metamatrix.common.comm.exception.SingleInstanceCommunicationException;
import com.metamatrix.common.comm.platform.CommPlatformPlugin;
-import com.metamatrix.common.comm.platform.socket.SocketLog;
import com.metamatrix.dqp.client.ClientSideDQP;
import com.metamatrix.platform.security.api.ILogon;
import com.metamatrix.platform.security.api.LogonResult;
@@ -68,7 +69,7 @@
private Map<HostInfo, SocketServerInstance> existingConnections = new HashMap<HostInfo, SocketServerInstance>();
private SocketServerInstanceFactory connectionFactory;
private ServerDiscovery serverDiscovery;
- private SocketLog log;
+ private static Logger log = Logger.getLogger("org.teiid.client.sockets");
private boolean secure;
private Properties connProps;
@@ -82,13 +83,12 @@
public SocketServerConnection(
SocketServerInstanceFactory connectionFactory, boolean secure,
ServerDiscovery serverDiscovery, Properties connProps,
- Timer pingTimer, SocketLog log) throws CommunicationException, ConnectionException {
+ Timer pingTimer) throws CommunicationException, ConnectionException {
this.connectionFactory = connectionFactory;
this.serverDiscovery = serverDiscovery;
this.connProps = connProps;
this.secure = secure;
this.logon = this.getService(ILogon.class);
- this.log = log;
authenticate();
@@ -157,7 +157,7 @@
}
throw new SingleInstanceCommunicationException(ex,CommPlatformPlugin.Util.getString("SocketServerInstance.Connection_Error.Connect_Failed", hostInfo.getHostName(), String.valueOf(hostInfo.getPortNumber()), ex.getMessage())); //$NON-NLS-1$
}
- log.logDetail("SocketServerConnection.selectServerInstance", ex, "Unable to connect to host"); //$NON-NLS-1$ //$NON-NLS-2$
+ log.log(Level.FINE, "Unable to connect to host", ex); //$NON-NLS-1$
}
throw new CommunicationException(CommPlatformPlugin.Util.getString("SocketServerInstancePool.No_valid_host_available", hostCopy.toString())); //$NON-NLS-1$
}
Modified: trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/client/SocketServerConnectionFactory.java
===================================================================
--- trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/client/SocketServerConnectionFactory.java 2009-02-26 18:10:59 UTC (rev 508)
+++ trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/client/SocketServerConnectionFactory.java 2009-02-26 19:44:06 UTC (rev 509)
@@ -38,8 +38,6 @@
import com.metamatrix.common.comm.exception.CommunicationException;
import com.metamatrix.common.comm.exception.ConnectionException;
import com.metamatrix.common.comm.platform.socket.Handshake;
-import com.metamatrix.common.comm.platform.socket.PrintStreamSocketLog;
-import com.metamatrix.common.comm.platform.socket.SocketLog;
import com.metamatrix.common.comm.platform.socket.SocketUtil;
import com.metamatrix.common.comm.platform.socket.SocketUtil.SSLEngineFactory;
import com.metamatrix.common.util.NetUtils;
@@ -74,7 +72,6 @@
private static SocketServerConnectionFactory INSTANCE;
- private SocketLog log;
private ObjectChannelFactory channelFactory;
private Timer pingTimer;
private Properties props;
@@ -84,7 +81,7 @@
if (INSTANCE == null) {
INSTANCE = new SocketServerConnectionFactory();
Properties props = System.getProperties();
- InputStream is = SocketServerConnectionFactory.class.getResourceAsStream("/federate-settings.properties"); //$NON-NLS-1$
+ InputStream is = SocketServerConnectionFactory.class.getResourceAsStream("/teiid-client-settings.properties"); //$NON-NLS-1$
if (is != null) {
props = new Properties(props);
try {
@@ -109,7 +106,6 @@
public void init(Properties props, boolean usePing) {
this.props = props;
- this.log = getLog(SocketServerConnectionFactory.class.getSimpleName());
this.pingTimer = new Timer("SocketPing", true); //$NON-NLS-1$
this.channelFactory = new NioObjectChannelFactory(
getConserveBandwidth(), getInputBufferSize(),
@@ -133,7 +129,7 @@
sslEngine = this.sslEngineFactory.getSSLEngine();
}
}
- SocketServerInstanceImpl ssii = new SocketServerInstanceImpl(info, sslEngine, this.log, getSynchronousTTL());
+ SocketServerInstanceImpl ssii = new SocketServerInstanceImpl(info, sslEngine, getSynchronousTTL());
ssii.connect(this.channelFactory, Handshake.HANDSHAKE_TIMEOUT);
return ssii;
}
@@ -163,7 +159,7 @@
discovery.init(url, connectionProperties);
- return new SocketServerConnection(this, url.isUsingSSL(), discovery, connectionProperties, pingTimer, this.log);
+ return new SocketServerConnection(this, url.isUsingSSL(), discovery, connectionProperties, pingTimer);
}
/*
@@ -196,21 +192,6 @@
return PropertiesUtils.getIntProperty(props, SOCKET_MAX_THREADS, DEFAULT_MAX_THREADS);
}
- public SocketLog getLog(String contextName) {
- SocketLog result = new PrintStreamSocketLog(System.out, contextName, getLogLevel());
- return result;
- }
-
- /**
- * Get the logLevel that SocketLog will use.
- * @return
- * @since 4.3
- */
- public int getLogLevel() {
- String logLevelString = props.getProperty(SOCKET_LOG_LEVEL, DEFAULT_SOCKET_LOG_LEVEL);
- return PrintStreamSocketLog.getLogLevelInt(logLevelString);
- }
-
public int getInputBufferSize() {
return PropertiesUtils.getIntProperty(props, SOCKET_INPUT_BUFFER_SIZE, DEFAULT_SOCKET_INPUT_BUFFER_SIZE);
}
Modified: trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/client/SocketServerInstanceImpl.java
===================================================================
--- trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/client/SocketServerInstanceImpl.java 2009-02-26 18:10:59 UTC (rev 508)
+++ trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/client/SocketServerInstanceImpl.java 2009-02-26 19:44:06 UTC (rev 509)
@@ -38,6 +38,8 @@
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import javax.net.ssl.SSLEngine;
@@ -52,7 +54,6 @@
import com.metamatrix.common.comm.platform.CommPlatformPlugin;
import com.metamatrix.common.comm.platform.socket.Handshake;
import com.metamatrix.common.comm.platform.socket.ObjectChannel;
-import com.metamatrix.common.comm.platform.socket.SocketLog;
import com.metamatrix.common.comm.platform.socket.ObjectChannel.ChannelListener;
import com.metamatrix.common.comm.platform.socket.ObjectChannel.ChannelListenerFactory;
import com.metamatrix.common.util.crypto.CryptoException;
@@ -75,7 +76,7 @@
private HostInfo hostInfo;
private SSLEngine engine;
private ObjectChannel socketChannel;
- private SocketLog log;
+ private Logger log = Logger.getLogger("org.teiid.client.sockets");
private long synchTimeout;
private Cryptor cryptor;
@@ -89,9 +90,8 @@
}
- public SocketServerInstanceImpl(final HostInfo host, SSLEngine engine, SocketLog log, long synchTimeout) {
+ public SocketServerInstanceImpl(final HostInfo host, SSLEngine engine, long synchTimeout) {
this.hostInfo = host;
- this.log = log;
this.engine = engine;
this.synchTimeout = synchTimeout;
}
@@ -213,14 +213,14 @@
public void exceptionOccurred(Throwable e) {
if (e instanceof CommunicationException) {
if (e.getCause() instanceof InvalidClassException) {
- log.logError("SocketServerInstance.read", e, "Unknown class or incorrect class version:"); //$NON-NLS-1$ //$NON-NLS-2$
+ log.log(Level.SEVERE, "Unknown class or incorrect class version:", e); //$NON-NLS-1$ //$NON-NLS-2$
} else {
- log.logDetail("SocketServerInstance.read", e, "Unable to read: socket was already closed."); //$NON-NLS-1$ //$NON-NLS-2$
+ log.log(Level.FINE, "Unable to read: socket was already closed.", e); //$NON-NLS-1$ //$NON-NLS-2$
}
} else if (e instanceof EOFException) {
- log.logDetail("SocketServerInstance.read", e, "Unable to read: socket was already closed."); //$NON-NLS-1$ //$NON-NLS-2$
+ log.log(Level.FINE, "Unable to read: socket was already closed.", e); //$NON-NLS-1$ //$NON-NLS-2$
} else {
- log.logDetail("SocketServerInstance.read", e, "Unable to read: unexpected exception"); //$NON-NLS-1$ //$NON-NLS-2$
+ log.log(Level.WARNING, "Unable to read: unexpected exception", e); //$NON-NLS-1$ //$NON-NLS-2$
}
synchronized (this) {
@@ -242,32 +242,24 @@
}
public void receivedMessage(Object packet) {
- log.logDetail("SocketServerInstance.read", "reading"); //$NON-NLS-1$ //$NON-NLS-2$
- if (log.isLogged("SocketServerInstance.read", SocketLog.DETAIL)) { //$NON-NLS-1$
- log.logDetail("SocketServerInstance.read", "read:" + packet); //$NON-NLS-1$ //$NON-NLS-2$
- }
+ log.log(Level.FINE, "reading packet"); //$NON-NLS-1$ //$NON-NLS-2$
if (packet instanceof Message) {
Message messagePacket = (Message)packet;
processAsynchronousPacket(messagePacket);
} else if (packet instanceof Handshake) {
receivedHahdshake((Handshake)packet);
} else {
- if (log.isLogged("SocketServerInstance.read", SocketLog.DETAIL)) { //$NON-NLS-1$
- log.logDetail("SocketServerInstance.read", "packet ignored:" + packet); //$NON-NLS-1$ //$NON-NLS-2$
- }
+ log.log(Level.FINE, "packet ignored:" + packet); //$NON-NLS-1$ //$NON-NLS-2$
}
}
private void processAsynchronousPacket(Message message) {
Serializable messageKey = message.getMessageKey();
- if (log.isLogged("SocketServerInstance.read", SocketLog.DETAIL)) { //$NON-NLS-1$
- log.logDetail("SocketServerInstance.read", "read asynch message:" + message); //$NON-NLS-1$ //$NON-NLS-2$
- }
+ log.log(Level.FINE, "read asynch message:" + messageKey); //$NON-NLS-1$ //$NON-NLS-2$
MessageListener listener = asynchronousListeners.remove(messageKey);
if (listener != null) {
listener.deliverMessage(message, messageKey);
}
- log.logDetail("SocketServerInstanceImpl.deliverMessage", "message delivered"); //$NON-NLS-1$ //$NON-NLS-2$
}
public void shutdown() {
Added: trunk/client/src/main/resources/teiid-client-settings.properties
===================================================================
--- trunk/client/src/main/resources/teiid-client-settings.properties (rev 0)
+++ trunk/client/src/main/resources/teiid-client-settings.properties 2009-02-26 19:44:06 UTC (rev 509)
@@ -0,0 +1,105 @@
+########################################
+# Settings file for Teiid clients
+########################################
+
+########################################
+# SSL Settings
+########################################
+
+#
+# Set the key store type. Defaults to JKS
+#
+
+com.metamatrix.ssl.keyStoreType=JKS
+
+#
+# Set the key store algorithm, defaults to
+# the system property "ssl.TrustManagerFactory.algorithm"
+#
+
+#com.metamatrix.ssl.algorithm=
+
+#
+# Set to the classpath or filesystem location of the
+# key store.
+#
+# This property is required only if performing 2-way
+# authentication that requires a specific private
+# key.
+#
+
+#com.metamatrix.ssl.keyStore=
+
+#
+# Set the key store password (not required)
+#
+
+#com.metamatrix.ssl.keyStorePassword=
+
+#
+# Set to the classpath or filesystem location of the
+# trust store.
+#
+# This property is required if performing 1-way
+# authentication that requires trust not provided
+# by the system defaults.
+#
+# Set to NONE for anonymous authentication using
+# the TLS_DH_anon_WITH_AES_128_CBC_SHA cipher suite
+#
+
+#com.metamatrix.ssl.trustStore=
+
+#
+# Set the trust store password (not required)
+#
+
+#com.metamatrix.ssl.trustStorePassword=
+
+#
+# Set the cipher protocol, defaults to SSLv3
+#
+
+com.metamatrix.ssl.protocol=SSLv3
+
+
+########################################
+# Misc Socket Configuration
+########################################
+
+#
+# Set the max number of NIO worker threads
+#
+metamatrix.sockets.max.threads=15
+
+#
+# Set the max time to live for an NIO worker thread
+#
+
+metamatrix.sockets.ttl=120000
+
+#
+# Set the max time to live for non-execution synchrnous
+# calls.
+#
+
+metamatrix.synchronous.sockets.ttl=120000
+
+#
+# Set the input buffer size
+#
+
+metamatrix.sockets.inputBufferSize=102400
+
+#
+# Set the output buffer size
+#
+
+metamatrix.sockets.outputBufferSize=102400
+
+#
+# Set to true to enable Nagle's algorithm to conserve bandwidth
+# by minimizing the number of segments that are sent.
+#
+
+metamatrix.sockets.conserveBandwidth=false
Property changes on: trunk/client/src/main/resources/teiid-client-settings.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/client/src/test/java/com/metamatrix/common/comm/platform/socket/client/TestSocketServerConnection.java
===================================================================
--- trunk/client/src/test/java/com/metamatrix/common/comm/platform/socket/client/TestSocketServerConnection.java 2009-02-26 18:10:59 UTC (rev 508)
+++ trunk/client/src/test/java/com/metamatrix/common/comm/platform/socket/client/TestSocketServerConnection.java 2009-02-26 19:44:06 UTC (rev 509)
@@ -40,7 +40,6 @@
import com.metamatrix.common.comm.exception.CommunicationException;
import com.metamatrix.common.comm.exception.ConnectionException;
import com.metamatrix.common.comm.exception.SingleInstanceCommunicationException;
-import com.metamatrix.common.comm.platform.socket.SocketLog;
import com.metamatrix.common.util.crypto.NullCryptor;
import com.metamatrix.dqp.client.ClientSideDQP;
import com.metamatrix.dqp.client.ResultsFuture;
@@ -130,7 +129,7 @@
};
ServerDiscovery discovery = new UrlServerDiscovery(new MMURL("mm://host1:1,host2:2"));
try {
- new SocketServerConnection(instanceFactory, false, discovery, p, null, Mockito.mock(SocketLog.class));
+ new SocketServerConnection(instanceFactory, false, discovery, p, null);
fail("exception expected");
} catch (CommunicationException e) {
assertEquals("No valid host available. Attempted connections to: [host1:1, host2:2]", e.getMessage());
@@ -184,7 +183,7 @@
return instance;
}
};
- SocketServerConnection connection = new SocketServerConnection(instanceFactory, false, discovery, p, null, Mockito.mock(SocketLog.class));
+ SocketServerConnection connection = new SocketServerConnection(instanceFactory, false, discovery, p, null);
return connection;
}
Modified: trunk/client/src/test/java/com/metamatrix/common/comm/platform/socket/client/TestSocketServerInstanceImpl.java
===================================================================
--- trunk/client/src/test/java/com/metamatrix/common/comm/platform/socket/client/TestSocketServerInstanceImpl.java 2009-02-26 18:10:59 UTC (rev 508)
+++ trunk/client/src/test/java/com/metamatrix/common/comm/platform/socket/client/TestSocketServerInstanceImpl.java 2009-02-26 19:44:06 UTC (rev 509)
@@ -39,7 +39,6 @@
import com.metamatrix.common.comm.exception.CommunicationException;
import com.metamatrix.common.comm.platform.socket.Handshake;
import com.metamatrix.common.comm.platform.socket.ObjectChannel;
-import com.metamatrix.common.comm.platform.socket.SocketLog;
import com.metamatrix.common.comm.platform.socket.ObjectChannel.ChannelListener;
import com.metamatrix.common.comm.platform.socket.ObjectChannel.ChannelListenerFactory;
import com.metamatrix.dqp.client.ResultsFuture;
@@ -81,7 +80,7 @@
private SocketServerInstanceImpl createInstance(ObjectChannelFactory channelFactory)
throws CommunicationException, IOException {
- SocketServerInstanceImpl ssii = new SocketServerInstanceImpl(new HostInfo("foo", 1), null, Mockito.mock(SocketLog.class), 1); //$NON-NLS-1$
+ SocketServerInstanceImpl ssii = new SocketServerInstanceImpl(new HostInfo("foo", 1), null, 1); //$NON-NLS-1$
ssii.connect(channelFactory, 1);
return ssii;
}
Modified: trunk/server/src/main/java/com/metamatrix/common/comm/platform/socket/server/SocketClientInstance.java
===================================================================
--- trunk/server/src/main/java/com/metamatrix/common/comm/platform/socket/server/SocketClientInstance.java 2009-02-26 18:10:59 UTC (rev 508)
+++ trunk/server/src/main/java/com/metamatrix/common/comm/platform/socket/server/SocketClientInstance.java 2009-02-26 19:44:06 UTC (rev 509)
@@ -30,7 +30,6 @@
import com.metamatrix.common.comm.platform.CommPlatformPlugin;
import com.metamatrix.common.comm.platform.socket.Handshake;
import com.metamatrix.common.comm.platform.socket.ObjectChannel;
-import com.metamatrix.common.comm.platform.socket.SocketLog;
import com.metamatrix.common.comm.platform.socket.SocketVMController;
import com.metamatrix.common.comm.platform.socket.ObjectChannel.ChannelListener;
import com.metamatrix.common.log.LogManager;
@@ -135,7 +134,7 @@
}
private void processMessagePacket(Message packet) {
- if (LogManager.isMessageToBeRecorded(SocketVMController.SOCKET_CONTEXT, SocketLog.DETAIL)) {
+ if (LogManager.isMessageToBeRecorded(SocketVMController.SOCKET_CONTEXT, MessageLevel.DETAIL)) {
LogManager.logDetail(SocketVMController.SOCKET_CONTEXT, "processing message:" + packet); //$NON-NLS-1$
}
workerPool.execute(new ServerWorkItem(this, packet.getMessageKey(), packet, this.server, this.sessionService));
Modified: trunk/server/src/main/java/com/metamatrix/common/comm/platform/socket/server/SocketListener.java
===================================================================
--- trunk/server/src/main/java/com/metamatrix/common/comm/platform/socket/server/SocketListener.java 2009-02-26 18:10:59 UTC (rev 508)
+++ trunk/server/src/main/java/com/metamatrix/common/comm/platform/socket/server/SocketListener.java 2009-02-26 19:44:06 UTC (rev 509)
@@ -37,13 +37,13 @@
import com.metamatrix.common.comm.ClientServiceRegistry;
import com.metamatrix.common.comm.platform.socket.ObjectChannel;
import com.metamatrix.common.comm.platform.socket.SSLAwareChannelHandler;
-import com.metamatrix.common.comm.platform.socket.SocketLog;
import com.metamatrix.common.comm.platform.socket.SocketVMController;
import com.metamatrix.common.comm.platform.socket.ObjectChannel.ChannelListener;
import com.metamatrix.common.comm.platform.socket.ObjectChannel.ChannelListenerFactory;
import com.metamatrix.common.log.LogManager;
import com.metamatrix.common.queue.WorkerPool;
import com.metamatrix.common.queue.WorkerPoolFactory;
+import com.metamatrix.core.log.MessageLevel;
import com.metamatrix.core.util.MetaMatrixProductVersion;
import com.metamatrix.platform.security.api.service.SessionServiceInterface;
import com.metamatrix.platform.vm.controller.SocketListenerStats;
@@ -80,7 +80,7 @@
this.server = server;
this.workerPool = workerPool;
- if (LogManager.isMessageToBeRecorded(SocketVMController.SOCKET_CONTEXT, SocketLog.DETAIL)) {
+ if (LogManager.isMessageToBeRecorded(SocketVMController.SOCKET_CONTEXT, MessageLevel.DETAIL)) {
LogManager.logDetail(SocketVMController.SOCKET_CONTEXT, "server = " + this.server + "binding to port:" + port); //$NON-NLS-1$ //$NON-NLS-2$
}
Modified: trunk/server/src/test/java/com/metamatrix/common/comm/platform/socket/server/TestSocketRemoting.java
===================================================================
--- trunk/server/src/test/java/com/metamatrix/common/comm/platform/socket/server/TestSocketRemoting.java 2009-02-26 18:10:59 UTC (rev 508)
+++ trunk/server/src/test/java/com/metamatrix/common/comm/platform/socket/server/TestSocketRemoting.java 2009-02-26 19:44:06 UTC (rev 509)
@@ -31,7 +31,6 @@
import junit.framework.TestCase;
-import org.mockito.Mockito;
import com.metamatrix.admin.api.exception.security.InvalidSessionException;
import com.metamatrix.api.exception.MetaMatrixComponentException;
@@ -44,7 +43,6 @@
import com.metamatrix.common.comm.api.MessageListener;
import com.metamatrix.common.comm.exception.CommunicationException;
import com.metamatrix.common.comm.exception.ConnectionException;
-import com.metamatrix.common.comm.platform.socket.SocketLog;
import com.metamatrix.common.comm.platform.socket.client.SocketServerConnection;
import com.metamatrix.common.comm.platform.socket.client.SocketServerInstance;
import com.metamatrix.common.comm.platform.socket.client.SocketServerInstanceFactory;
@@ -215,7 +213,7 @@
return serverInstance;
}
- }, false, new UrlServerDiscovery(new MMURL("foo", 1, false)), new Properties(), null, Mockito.mock(SocketLog.class)); //$NON-NLS-1$
+ }, false, new UrlServerDiscovery(new MMURL("foo", 1, false)), new Properties(), null); //$NON-NLS-1$
return connection;
}
15 years, 10 months
- 1
- 0
teiid SVN: r508 - trunk/common-internal/src/main/java/com/metamatrix/common/config.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2009-02-26 13:10:59 -0500 (Thu, 26 Feb 2009)
New Revision: 508
Modified:
trunk/common-internal/src/main/java/com/metamatrix/common/config/CurrentConfiguration.java
Log:
TEIID-309: adding host properties to Host object, so that they can be viewed by the client applications such as Admin API.
Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/CurrentConfiguration.java
===================================================================
--- trunk/common-internal/src/main/java/com/metamatrix/common/config/CurrentConfiguration.java 2009-02-26 18:10:22 UTC (rev 507)
+++ trunk/common-internal/src/main/java/com/metamatrix/common/config/CurrentConfiguration.java 2009-02-26 18:10:59 UTC (rev 508)
@@ -28,7 +28,6 @@
import java.util.Properties;
import com.metamatrix.common.CommonPlugin;
-import com.metamatrix.common.config.api.ComponentTypeID;
import com.metamatrix.common.config.api.Configuration;
import com.metamatrix.common.config.api.ConfigurationID;
import com.metamatrix.common.config.api.ConfigurationModelContainer;
@@ -219,9 +218,9 @@
BasicHost host = new BasicHost(new ConfigurationID(name), new HostID(name), Host.HOST_COMPONENT_TYPE_ID);
Properties props = new Properties();
- props.setProperty(com.metamatrix.admin.api.objects.Host.INSTALL_DIR, getBootStrapProperties().getProperty(com.metamatrix.admin.api.objects.Host.INSTALL_DIR, "")); //$NON-NLS-1$
- props.setProperty(com.metamatrix.admin.api.objects.Host.HOST_DIRECTORY, getBootStrapProperties().getProperty(com.metamatrix.admin.api.objects.Host.HOST_DIRECTORY, "")); //$NON-NLS-1$
- props.setProperty(com.metamatrix.admin.api.objects.Host.LOG_DIRECTORY, getBootStrapProperties().getProperty(com.metamatrix.admin.api.objects.Host.LOG_DIRECTORY, "")); //$NON-NLS-1$
+ props.setProperty(com.metamatrix.admin.api.objects.Host.INSTALL_DIR, getBootStrapProperties().getProperty(com.metamatrix.admin.api.objects.Host.INSTALL_DIR, System.getProperty("user.dir"))); //$NON-NLS-1$
+ props.setProperty(com.metamatrix.admin.api.objects.Host.HOST_DIRECTORY, getBootStrapProperties().getProperty(com.metamatrix.admin.api.objects.Host.HOST_DIRECTORY, System.getProperty("user.dir"))); //$NON-NLS-1$
+ props.setProperty(com.metamatrix.admin.api.objects.Host.LOG_DIRECTORY, getBootStrapProperties().getProperty(com.metamatrix.admin.api.objects.Host.LOG_DIRECTORY, System.getProperty("user.dir"))); //$NON-NLS-1$
props.setProperty(com.metamatrix.admin.api.objects.Host.HOST_BIND_ADDRESS, getBootStrapProperties().getProperty(com.metamatrix.admin.api.objects.Host.HOST_BIND_ADDRESS, "")); //$NON-NLS-1$
props.setProperty(com.metamatrix.admin.api.objects.Host.HOST_PHYSICAL_ADDRESS, getBootStrapProperties().getProperty(com.metamatrix.admin.api.objects.Host.HOST_PHYSICAL_ADDRESS, "")); //$NON-NLS-1$
15 years, 10 months
- 1
- 0
teiid SVN: r507 - in trunk: server/src/main/java/com/metamatrix/admin/server and 1 other directories.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2009-02-26 13:10:22 -0500 (Thu, 26 Feb 2009)
New Revision: 507
Modified:
trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/DeployedHostPanel.java
trunk/server/src/main/java/com/metamatrix/admin/server/ServerMonitoringAdminImpl.java
trunk/server/src/main/java/com/metamatrix/platform/registry/HostControllerRegistryBinding.java
Log:
TEIID-309: adding host properties to Host object, so that they can be viewed by the client applications such as Admin API.
Modified: trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/DeployedHostPanel.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/DeployedHostPanel.java 2009-02-26 15:31:30 UTC (rev 506)
+++ trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/DeployedHostPanel.java 2009-02-26 18:10:22 UTC (rev 507)
@@ -44,11 +44,13 @@
import javax.swing.event.DocumentListener;
import javax.swing.table.TableColumn;
+import com.metamatrix.admin.api.server.ServerAdmin;
import com.metamatrix.common.config.api.ConfigurationID;
import com.metamatrix.common.config.api.Host;
import com.metamatrix.common.config.api.HostID;
import com.metamatrix.common.config.api.VMComponentDefn;
import com.metamatrix.common.config.api.VMComponentDefnType;
+import com.metamatrix.common.config.model.BasicHost;
import com.metamatrix.common.log.LogManager;
import com.metamatrix.common.object.PropertiedObject;
import com.metamatrix.common.object.PropertiedObjectEditor;
@@ -497,18 +499,19 @@
try {
if (theDomainObject == null) {
// this shouldn't happen since new hosts are created elsewhere
- host = getConfigurationManager().createHost(getString(
- "dhp.newhost")); //$NON-NLS-1$
+ host = getConfigurationManager().createHost(getString("dhp.newhost")); //$NON-NLS-1$
}
else {
if (theDomainObject instanceof Host) {
host = (Host)theDomainObject;
+ ServerAdmin admin = getConnectionInfo().getServerAdmin();
+ Collection<com.metamatrix.admin.api.objects.Host> adminHosts = admin.getHosts(host.getFullName());
+ for (com.metamatrix.admin.api.objects.Host adminHost:adminHosts) {
+ ((BasicHost)host).setProperties(adminHost.getProperties());
+ }
}
else {
- throw new IllegalArgumentException(
- getString("msg.invalidclass", //$NON-NLS-1$
- new Object[] {"Host", //$NON-NLS-1$
- theDomainObject.getClass()}));
+ throw new IllegalArgumentException(getString("msg.invalidclass", new Object[] {"Host", theDomainObject.getClass()})); //$NON-NLS-1$ //$NON-NLS-2$
}
}
Modified: trunk/server/src/main/java/com/metamatrix/admin/server/ServerMonitoringAdminImpl.java
===================================================================
--- trunk/server/src/main/java/com/metamatrix/admin/server/ServerMonitoringAdminImpl.java 2009-02-26 15:31:30 UTC (rev 506)
+++ trunk/server/src/main/java/com/metamatrix/admin/server/ServerMonitoringAdminImpl.java 2009-02-26 18:10:22 UTC (rev 507)
@@ -540,8 +540,12 @@
host.setEnabled(hostObject.isEnabled());
Properties properties = hostObject.getProperties();
-
- host.setProperties(properties);
+ if (host.getProperties() != null) {
+ host.getProperties().putAll(properties);
+ }
+ else {
+ host.setProperties(properties);
+ }
host.setDeployed(true);
results.add(host);
Modified: trunk/server/src/main/java/com/metamatrix/platform/registry/HostControllerRegistryBinding.java
===================================================================
--- trunk/server/src/main/java/com/metamatrix/platform/registry/HostControllerRegistryBinding.java 2009-02-26 15:31:30 UTC (rev 506)
+++ trunk/server/src/main/java/com/metamatrix/platform/registry/HostControllerRegistryBinding.java 2009-02-26 18:10:22 UTC (rev 507)
@@ -59,6 +59,8 @@
}
public Properties getProperties() {
- return new Properties(this.hostProperties);
+ Properties p = new Properties();
+ p.putAll(this.hostProperties);
+ return p;
}
}
15 years, 10 months
- 1
- 0
teiid SVN: r506 - trunk/documentation/reference/src/main/docbook/en-US/content.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2009-02-26 10:31:30 -0500 (Thu, 26 Feb 2009)
New Revision: 506
Modified:
trunk/documentation/reference/src/main/docbook/en-US/content/scalar_functions.xml
Log:
TEIID-382 adding missing functions
Modified: trunk/documentation/reference/src/main/docbook/en-US/content/scalar_functions.xml
===================================================================
--- trunk/documentation/reference/src/main/docbook/en-US/content/scalar_functions.xml 2009-02-26 03:19:01 UTC (rev 505)
+++ trunk/documentation/reference/src/main/docbook/en-US/content/scalar_functions.xml 2009-02-26 15:31:30 UTC (rev 506)
@@ -448,6 +448,50 @@
<para>x in {double}, return type is double</para>
</entry>
</row>
+ <row>
+ <entry>
+ <para>BITAND(x, y)</para>
+ </entry>
+ <entry>
+ <para>Bitwise AND of x and y</para>
+ </entry>
+ <entry>
+ <para>x, y in {integer}, return type is integer</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>BITOR(x, y)</para>
+ </entry>
+ <entry>
+ <para>Bitwise OR of x and y</para>
+ </entry>
+ <entry>
+ <para>x, y in {integer}, return type is integer</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>BITXOR(x, y)</para>
+ </entry>
+ <entry>
+ <para>Bitwise XOR of x and y</para>
+ </entry>
+ <entry>
+ <para>x, y in {integer}, return type is integer</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>BITNOT(x)</para>
+ </entry>
+ <entry>
+ <para>Bitwise NOT of x</para>
+ </entry>
+ <entry>
+ <para>x in {integer}, return type is integer</para>
+ </entry>
+ </row>
</tbody>
</tgroup>
</informaltable>
@@ -1168,6 +1212,17 @@
</row>
<row>
<entry>
+ <para>QUARTER(x)</para>
+ </entry>
+ <entry>
+ <para>Return quarter</para>
+ </entry>
+ <entry>
+ <para>x in {date, timestamp}, returns integer</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
<para>PARSEDATE(x, y)</para>
</entry>
<entry>
15 years, 10 months
- 1
- 0
teiid SVN: r505 - in trunk: server/src/test/java/com/metamatrix/platform/config/spi/xml and 1 other directory.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2009-02-25 22:19:01 -0500 (Wed, 25 Feb 2009)
New Revision: 505
Modified:
trunk/common-internal/src/main/java/com/metamatrix/common/config/CurrentConfiguration.java
trunk/server/src/test/java/com/metamatrix/platform/config/spi/xml/TestCurrentConfiguration.java
Log:
TEIID-309: adding host properties to Host object, so that they can be viewed by the client applications such as Admin API.
Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/CurrentConfiguration.java
===================================================================
--- trunk/common-internal/src/main/java/com/metamatrix/common/config/CurrentConfiguration.java 2009-02-26 01:02:42 UTC (rev 504)
+++ trunk/common-internal/src/main/java/com/metamatrix/common/config/CurrentConfiguration.java 2009-02-26 03:19:01 UTC (rev 505)
@@ -216,14 +216,14 @@
*/
public Host getDefaultHost() throws ConfigurationException {
String name = getBootStrapProperties().getProperty(CONFIGURATION_NAME);
- BasicHost host = new BasicHost(new ConfigurationID(name), new HostID(name), new ComponentTypeID(name));
+ BasicHost host = new BasicHost(new ConfigurationID(name), new HostID(name), Host.HOST_COMPONENT_TYPE_ID);
Properties props = new Properties();
- props.setProperty(com.metamatrix.admin.api.objects.Host.INSTALL_DIR, getBootStrapProperties().getProperty(com.metamatrix.admin.api.objects.Host.INSTALL_DIR));
- props.setProperty(com.metamatrix.admin.api.objects.Host.HOST_DIRECTORY, getBootStrapProperties().getProperty(com.metamatrix.admin.api.objects.Host.HOST_DIRECTORY));
- props.setProperty(com.metamatrix.admin.api.objects.Host.LOG_DIRECTORY, getBootStrapProperties().getProperty(com.metamatrix.admin.api.objects.Host.LOG_DIRECTORY));
- props.setProperty(com.metamatrix.admin.api.objects.Host.HOST_BIND_ADDRESS, getBootStrapProperties().getProperty(com.metamatrix.admin.api.objects.Host.HOST_BIND_ADDRESS));
- props.setProperty(com.metamatrix.admin.api.objects.Host.HOST_PHYSICAL_ADDRESS, getBootStrapProperties().getProperty(com.metamatrix.admin.api.objects.Host.HOST_PHYSICAL_ADDRESS));
+ props.setProperty(com.metamatrix.admin.api.objects.Host.INSTALL_DIR, getBootStrapProperties().getProperty(com.metamatrix.admin.api.objects.Host.INSTALL_DIR, "")); //$NON-NLS-1$
+ props.setProperty(com.metamatrix.admin.api.objects.Host.HOST_DIRECTORY, getBootStrapProperties().getProperty(com.metamatrix.admin.api.objects.Host.HOST_DIRECTORY, "")); //$NON-NLS-1$
+ props.setProperty(com.metamatrix.admin.api.objects.Host.LOG_DIRECTORY, getBootStrapProperties().getProperty(com.metamatrix.admin.api.objects.Host.LOG_DIRECTORY, "")); //$NON-NLS-1$
+ props.setProperty(com.metamatrix.admin.api.objects.Host.HOST_BIND_ADDRESS, getBootStrapProperties().getProperty(com.metamatrix.admin.api.objects.Host.HOST_BIND_ADDRESS, "")); //$NON-NLS-1$
+ props.setProperty(com.metamatrix.admin.api.objects.Host.HOST_PHYSICAL_ADDRESS, getBootStrapProperties().getProperty(com.metamatrix.admin.api.objects.Host.HOST_PHYSICAL_ADDRESS, "")); //$NON-NLS-1$
host.setProperties(props);
return host;
Modified: trunk/server/src/test/java/com/metamatrix/platform/config/spi/xml/TestCurrentConfiguration.java
===================================================================
--- trunk/server/src/test/java/com/metamatrix/platform/config/spi/xml/TestCurrentConfiguration.java 2009-02-26 01:02:42 UTC (rev 504)
+++ trunk/server/src/test/java/com/metamatrix/platform/config/spi/xml/TestCurrentConfiguration.java 2009-02-26 03:19:01 UTC (rev 505)
@@ -113,8 +113,8 @@
printMsg("Starting testCurrentHost"); //$NON-NLS-1$
try {
+ System.setProperty(CurrentConfiguration.CONFIGURATION_NAME, "DummyHost"); //$NON-NLS-1$ //$NON-NLS-2$
System.setProperty("metamatrix.vmname", "MetaMatrixProcess"); //$NON-NLS-1$ //$NON-NLS-2$
- VMNaming.setup("DummyHost", null, null); //$NON-NLS-1$
init(CONFIG_FILE);
15 years, 10 months
- 1
- 0
teiid SVN: r504 - in trunk: common-internal/src/main/java/com/metamatrix/common/config and 8 other directories.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2009-02-25 20:02:42 -0500 (Wed, 25 Feb 2009)
New Revision: 504
Modified:
trunk/client/src/main/java/com/metamatrix/admin/api/objects/Host.java
trunk/common-internal/src/main/java/com/metamatrix/common/config/CurrentConfiguration.java
trunk/common-internal/src/main/java/com/metamatrix/common/config/api/HostType.java
trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/runtime/HostData.java
trunk/server/src/main/java/com/metamatrix/admin/server/ServerMonitoringAdminImpl.java
trunk/server/src/main/java/com/metamatrix/platform/admin/api/runtime/SystemStateBuilder.java
trunk/server/src/main/java/com/metamatrix/platform/registry/HostControllerRegistryBinding.java
trunk/server/src/main/java/com/metamatrix/server/HostController.java
trunk/server/src/test/java/com/metamatrix/admin/server/FakeRuntimeStateAdminAPIHelper.java
trunk/server/src/test/java/com/metamatrix/admin/server/TestServerConfigAdminImpl.java
trunk/server/src/test/java/com/metamatrix/platform/registry/FakeRegistryUtil.java
trunk/server/src/test/java/com/metamatrix/platform/registry/TestClusteredRegistryState.java
Log:
TEIID-309: adding host properties to Host object, so that they can be viewed by the client applications such as Admin API.
Modified: trunk/client/src/main/java/com/metamatrix/admin/api/objects/Host.java
===================================================================
--- trunk/client/src/main/java/com/metamatrix/admin/api/objects/Host.java 2009-02-25 21:59:42 UTC (rev 503)
+++ trunk/client/src/main/java/com/metamatrix/admin/api/objects/Host.java 2009-02-26 01:02:42 UTC (rev 504)
@@ -28,7 +28,7 @@
* Represents a host in the MetaMatrix system.
*
* <p>The identifier pattern for a host is <code>"hostName"</code>.
- * A hostName is concidered to be unique across the system.</p>
+ * A hostName is considered to be unique across the system.</p>
* @since 4.3
*/
public interface Host extends AdminObject {
@@ -44,11 +44,6 @@
public static final String LOG_DIRECTORY = "metamatrix.log.dir"; //$NON-NLS-1$
/**
- * Data Directory Property
- */
- public static final String DATA_DIRECTORY = "metamatrix.data.dir"; //$NON-NLS-1$
-
- /**
* Host Directory Property
*/
public static final String HOST_DIRECTORY = "metamatrix.host.dir"; //$NON-NLS-1$
Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/CurrentConfiguration.java
===================================================================
--- trunk/common-internal/src/main/java/com/metamatrix/common/config/CurrentConfiguration.java 2009-02-25 21:59:42 UTC (rev 503)
+++ trunk/common-internal/src/main/java/com/metamatrix/common/config/CurrentConfiguration.java 2009-02-26 01:02:42 UTC (rev 504)
@@ -217,7 +217,15 @@
public Host getDefaultHost() throws ConfigurationException {
String name = getBootStrapProperties().getProperty(CONFIGURATION_NAME);
BasicHost host = new BasicHost(new ConfigurationID(name), new HostID(name), new ComponentTypeID(name));
- host.setProperties(getBootStrapProperties());
+
+ Properties props = new Properties();
+ props.setProperty(com.metamatrix.admin.api.objects.Host.INSTALL_DIR, getBootStrapProperties().getProperty(com.metamatrix.admin.api.objects.Host.INSTALL_DIR));
+ props.setProperty(com.metamatrix.admin.api.objects.Host.HOST_DIRECTORY, getBootStrapProperties().getProperty(com.metamatrix.admin.api.objects.Host.HOST_DIRECTORY));
+ props.setProperty(com.metamatrix.admin.api.objects.Host.LOG_DIRECTORY, getBootStrapProperties().getProperty(com.metamatrix.admin.api.objects.Host.LOG_DIRECTORY));
+ props.setProperty(com.metamatrix.admin.api.objects.Host.HOST_BIND_ADDRESS, getBootStrapProperties().getProperty(com.metamatrix.admin.api.objects.Host.HOST_BIND_ADDRESS));
+ props.setProperty(com.metamatrix.admin.api.objects.Host.HOST_PHYSICAL_ADDRESS, getBootStrapProperties().getProperty(com.metamatrix.admin.api.objects.Host.HOST_PHYSICAL_ADDRESS));
+
+ host.setProperties(props);
return host;
}
Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/api/HostType.java
===================================================================
--- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/HostType.java 2009-02-25 21:59:42 UTC (rev 503)
+++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/HostType.java 2009-02-26 01:02:42 UTC (rev 504)
@@ -34,8 +34,6 @@
public static final String LOG_DIRECTORY = com.metamatrix.admin.api.objects.Host.LOG_DIRECTORY;
- public static final String DATA_DIRECTORY = com.metamatrix.admin.api.objects.Host.DATA_DIRECTORY;
-
public static final String HOST_DIRECTORY = com.metamatrix.admin.api.objects.Host.HOST_DIRECTORY;
public static final String HOST_ENABLED = com.metamatrix.admin.api.objects.Host.HOST_ENABLED;
Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/runtime/HostData.java
===================================================================
--- trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/runtime/HostData.java 2009-02-25 21:59:42 UTC (rev 503)
+++ trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/runtime/HostData.java 2009-02-26 01:02:42 UTC (rev 504)
@@ -23,6 +23,7 @@
package com.metamatrix.platform.admin.api.runtime;
import java.util.Collection;
+import java.util.Properties;
/**
* This class contains information about a host that is running or deployed for this system
@@ -31,6 +32,7 @@
// Collection of ProcessData objects
private Collection processes;
+ private Properties properties;
/**
@@ -38,9 +40,10 @@
*
* @param hostName Name of host
*/
- public HostData(String hostName, Collection processes, boolean deployed, boolean registered) {
+ public HostData(String hostName, Collection processes, boolean deployed, boolean registered, Properties props) {
super(hostName, deployed, registered);
this.processes = processes;
+ this.properties = props;
computeHashCode();
}
@@ -56,5 +59,9 @@
public Collection getProcesses() {
return processes;
}
+
+ public Properties getProperties() {
+ return this.properties;
+ }
}
Modified: trunk/server/src/main/java/com/metamatrix/admin/server/ServerMonitoringAdminImpl.java
===================================================================
--- trunk/server/src/main/java/com/metamatrix/admin/server/ServerMonitoringAdminImpl.java 2009-02-25 21:59:42 UTC (rev 503)
+++ trunk/server/src/main/java/com/metamatrix/admin/server/ServerMonitoringAdminImpl.java 2009-02-26 01:02:42 UTC (rev 504)
@@ -503,13 +503,13 @@
host.setRunning(hostData.isRegistered());
host.setRegistered(hostData.isRegistered());
host.setDeployed(false);
+ host.setProperties(hostData.getProperties());
runtimeMap.put(hostName.toUpperCase(), host);
results.add(host);
}
}
-
//get config data from ConfigurationServiceProxy
Collection hosts = getConfigurationServiceProxy().getHosts();
Modified: trunk/server/src/main/java/com/metamatrix/platform/admin/api/runtime/SystemStateBuilder.java
===================================================================
--- trunk/server/src/main/java/com/metamatrix/platform/admin/api/runtime/SystemStateBuilder.java 2009-02-25 21:59:42 UTC (rev 503)
+++ trunk/server/src/main/java/com/metamatrix/platform/admin/api/runtime/SystemStateBuilder.java 2009-02-26 01:02:42 UTC (rev 504)
@@ -29,6 +29,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Properties;
import com.metamatrix.common.config.CurrentConfiguration;
import com.metamatrix.common.config.api.ComponentDefnID;
@@ -82,7 +83,7 @@
// Create a new HostData object for each running host.
for (HostControllerRegistryBinding host:allHosts) {
- hosts.add(createHostData(host.getHostName()));
+ hosts.add(createHostData(host));
hostIDs.add(new HostID(host.getHostName()));
}
@@ -103,8 +104,10 @@
/**
* Create a HostData object from the hostBinding.
*/
- private HostData createHostData(String hostName) throws Exception {
+ private HostData createHostData(HostControllerRegistryBinding host) throws Exception {
+ String hostName = host.getHostName();
+
List vmBindings = this.registry.getVMs(hostName);
List processes = new ArrayList();
Collection deployedVMs = null;
@@ -134,8 +137,7 @@
boolean deployed = config.getHostIDs().contains(hostID);
boolean running = this.hostManagement.ping(hostName);
- return new HostData(hostName, processes, deployed, running);
-
+ return new HostData(hostName, processes, deployed, running, host.getProperties());
}
/**
@@ -160,7 +162,7 @@
}
boolean running = this.hostManagement.ping(hostID.getFullName());
- return new HostData(hostID.getFullName(), processes, true, running);
+ return new HostData(hostID.getFullName(), processes, true, running, new Properties());
}
Modified: trunk/server/src/main/java/com/metamatrix/platform/registry/HostControllerRegistryBinding.java
===================================================================
--- trunk/server/src/main/java/com/metamatrix/platform/registry/HostControllerRegistryBinding.java 2009-02-25 21:59:42 UTC (rev 503)
+++ trunk/server/src/main/java/com/metamatrix/platform/registry/HostControllerRegistryBinding.java 2009-02-26 01:02:42 UTC (rev 504)
@@ -1,10 +1,11 @@
package com.metamatrix.platform.registry;
import java.io.Serializable;
+import java.util.Properties;
import com.metamatrix.common.messaging.MessageBus;
+import com.metamatrix.server.HostManagement;
import com.metamatrix.server.ResourceFinder;
-import com.metamatrix.server.HostManagement;
public class HostControllerRegistryBinding implements Serializable {
@@ -16,10 +17,13 @@
private String hostName;
+ private Properties hostProperties;
- public HostControllerRegistryBinding(String hostName, HostManagement controller, MessageBus bus) {
+
+ public HostControllerRegistryBinding(String hostName, Properties properties, HostManagement controller, MessageBus bus) {
this.messageBus = bus;
this.hostName = hostName;
+ this.hostProperties = properties;
setHostController(controller);
}
@@ -53,4 +57,8 @@
this.hostController = (HostManagement)bus.getRPCProxy(this.hostControllerStub);
return this.hostController;
}
+
+ public Properties getProperties() {
+ return new Properties(this.hostProperties);
+ }
}
Modified: trunk/server/src/main/java/com/metamatrix/server/HostController.java
===================================================================
--- trunk/server/src/main/java/com/metamatrix/server/HostController.java 2009-02-25 21:59:42 UTC (rev 503)
+++ trunk/server/src/main/java/com/metamatrix/server/HostController.java 2009-02-26 01:02:42 UTC (rev 504)
@@ -94,7 +94,7 @@
Runtime.getRuntime().addShutdownHook(new ShutdownThread());
- this.monitor.hostAdded(new HostControllerRegistryBinding(this.host.getFullName(), this, this.messageBus));
+ this.monitor.hostAdded(new HostControllerRegistryBinding(this.host.getFullName(), this.host.getProperties(), this, this.messageBus));
if (startProcesses ) {
try {
Modified: trunk/server/src/test/java/com/metamatrix/admin/server/FakeRuntimeStateAdminAPIHelper.java
===================================================================
--- trunk/server/src/test/java/com/metamatrix/admin/server/FakeRuntimeStateAdminAPIHelper.java 2009-02-25 21:59:42 UTC (rev 503)
+++ trunk/server/src/test/java/com/metamatrix/admin/server/FakeRuntimeStateAdminAPIHelper.java 2009-02-26 01:02:42 UTC (rev 504)
@@ -27,6 +27,7 @@
import java.util.Date;
import java.util.HashSet;
import java.util.List;
+import java.util.Properties;
import java.util.Set;
import com.metamatrix.admin.api.objects.AdminObject;
@@ -240,14 +241,14 @@
VMControllerID vmControllerID1 = new VMControllerID(2, "2.2.2.2"); //$NON-NLS-1$
ProcessData process2 = new ProcessData(vmControllerID1, null, "2.2.2.2", new ArrayList(), "process2", "31000", true, true); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
processes2.add(process2);
- HostData host2 = new HostData("2.2.2.2", processes2, true, true); //$NON-NLS-1$
+ HostData host2 = new HostData("2.2.2.2", processes2, true, true, new Properties()); //$NON-NLS-1$
hosts.add(host2);
List processes3 = new ArrayList();
VMControllerID vmControllerID3 = new VMControllerID(3, "3.3.3.3"); //$NON-NLS-1$
ProcessData process3 = new ProcessData(vmControllerID3, null, "3.3.3.3", new ArrayList(), "process3", "31001", true, true); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
processes3.add(process3);
- HostData host3 = new HostData("3.3.3.3", processes3, true, true); //$NON-NLS-1$
+ HostData host3 = new HostData("3.3.3.3", processes3, true, true, new Properties()); //$NON-NLS-1$
hosts.add(host3);
Modified: trunk/server/src/test/java/com/metamatrix/admin/server/TestServerConfigAdminImpl.java
===================================================================
--- trunk/server/src/test/java/com/metamatrix/admin/server/TestServerConfigAdminImpl.java 2009-02-25 21:59:42 UTC (rev 503)
+++ trunk/server/src/test/java/com/metamatrix/admin/server/TestServerConfigAdminImpl.java 2009-02-26 01:02:42 UTC (rev 504)
@@ -152,7 +152,7 @@
String hostIdentifier = BOGUS_HOST;
Properties hostProperties = new Properties();
hostProperties.setProperty(Host.INSTALL_DIR, "D:\\MetaMatrix\\s43401\\"); //$NON-NLS-1$
- hostProperties.setProperty(Host.DATA_DIRECTORY, "D:\\MetaMatrix\\s43401\\data"); //$NON-NLS-1$
+ hostProperties.setProperty(Host.HOST_DIRECTORY, "D:\\MetaMatrix\\s43401\\host"); //$NON-NLS-1$
hostProperties.setProperty(Host.LOG_DIRECTORY, "D:\\MetaMatrix\\s43401\\log"); //$NON-NLS-1$
hostProperties.setProperty(Host.HOST_ENABLED, "true"); //$NON-NLS-1$
admin.addHost(hostIdentifier, hostProperties);
@@ -162,7 +162,7 @@
String hostIdentifier = BOGUS_HOST_IP;
Properties hostProperties = new Properties();
hostProperties.setProperty(Host.INSTALL_DIR, "D:\\MetaMatrix\\s43401\\"); //$NON-NLS-1$
- hostProperties.setProperty(Host.DATA_DIRECTORY, "D:\\MetaMatrix\\s43401\\data"); //$NON-NLS-1$
+ hostProperties.setProperty(Host.HOST_DIRECTORY, "D:\\MetaMatrix\\s43401\\host"); //$NON-NLS-1$
hostProperties.setProperty(Host.LOG_DIRECTORY, "D:\\MetaMatrix\\s43401\\log"); //$NON-NLS-1$
hostProperties.setProperty(Host.HOST_ENABLED, "true"); //$NON-NLS-1$
admin.addHost(hostIdentifier, hostProperties);
@@ -172,7 +172,7 @@
String hostIdentifier = BOGUS_HOST_FULLY_QUALIFIED;
Properties hostProperties = new Properties();
hostProperties.setProperty(Host.INSTALL_DIR, "D:\\MetaMatrix\\s43401\\"); //$NON-NLS-1$
- hostProperties.setProperty(Host.DATA_DIRECTORY, "D:\\MetaMatrix\\s43401\\data"); //$NON-NLS-1$
+ hostProperties.setProperty(Host.HOST_DIRECTORY, "D:\\MetaMatrix\\s43401\\host"); //$NON-NLS-1$
hostProperties.setProperty(Host.LOG_DIRECTORY, "D:\\MetaMatrix\\s43401\\log"); //$NON-NLS-1$
hostProperties.setProperty(Host.HOST_ENABLED, "true"); //$NON-NLS-1$
admin.addHost(hostIdentifier, hostProperties);
Modified: trunk/server/src/test/java/com/metamatrix/platform/registry/FakeRegistryUtil.java
===================================================================
--- trunk/server/src/test/java/com/metamatrix/platform/registry/FakeRegistryUtil.java 2009-02-25 21:59:42 UTC (rev 503)
+++ trunk/server/src/test/java/com/metamatrix/platform/registry/FakeRegistryUtil.java 2009-02-26 01:02:42 UTC (rev 504)
@@ -24,6 +24,7 @@
import java.net.InetAddress;
import java.util.Date;
+import java.util.Properties;
import org.jboss.cache.notifications.annotation.CacheListener;
import org.mockito.Mockito;
@@ -134,7 +135,7 @@
}
static HostControllerRegistryBinding buildHostRegistryBinding(String name) {
- return new HostControllerRegistryBinding(name, null, new NoOpMessageBus());
+ return new HostControllerRegistryBinding(name, new Properties(), null, new NoOpMessageBus());
}
}
Modified: trunk/server/src/test/java/com/metamatrix/platform/registry/TestClusteredRegistryState.java
===================================================================
--- trunk/server/src/test/java/com/metamatrix/platform/registry/TestClusteredRegistryState.java 2009-02-25 21:59:42 UTC (rev 503)
+++ trunk/server/src/test/java/com/metamatrix/platform/registry/TestClusteredRegistryState.java 2009-02-26 01:02:42 UTC (rev 504)
@@ -24,6 +24,7 @@
import java.util.Date;
import java.util.List;
+import java.util.Properties;
import junit.framework.TestCase;
@@ -308,6 +309,6 @@
}
static HostControllerRegistryBinding buildHostRegistryBinding(String name) {
- return new HostControllerRegistryBinding(name, null, new NoOpMessageBus());
+ return new HostControllerRegistryBinding(name, new Properties(), null, new NoOpMessageBus());
}
}
15 years, 10 months
- 1
- 0
teiid SVN: r503 - in trunk/engine/src: main/java/com/metamatrix/query/validator and 1 other directories.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2009-02-25 16:59:42 -0500 (Wed, 25 Feb 2009)
New Revision: 503
Removed:
trunk/engine/src/main/java/com/metamatrix/query/validator/ValidateCriteriaVisitor.java
trunk/engine/src/test/java/com/metamatrix/query/validator/TestCriteriaValidator.java
Modified:
trunk/engine/src/main/java/com/metamatrix/dqp/internal/process/Request.java
trunk/engine/src/main/java/com/metamatrix/query/validator/ValidationVisitor.java
trunk/engine/src/main/java/com/metamatrix/query/validator/Validator.java
trunk/engine/src/test/java/com/metamatrix/query/validator/TestValidator.java
Log:
TEIID-384 removing ValidateCriteriaVisitor. Allowing the validator to enforce type based restrictions.
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/process/Request.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/internal/process/Request.java 2009-02-25 20:18:40 UTC (rev 502)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/process/Request.java 2009-02-25 21:59:42 UTC (rev 503)
@@ -101,7 +101,6 @@
import com.metamatrix.query.util.ContextProperties;
import com.metamatrix.query.util.TypeRetrievalUtil;
import com.metamatrix.query.validator.AbstractValidationVisitor;
-import com.metamatrix.query.validator.ValidateCriteriaVisitor;
import com.metamatrix.query.validator.ValidationVisitor;
import com.metamatrix.query.validator.Validator;
import com.metamatrix.query.validator.ValidatorFailure;
@@ -357,10 +356,6 @@
AbstractValidationVisitor visitor = new ValidationVisitor();
validateWithVisitor(visitor, metadata, command, false);
- // Create criteria validation visitor
- visitor = new ValidateCriteriaVisitor();
- validateWithVisitor(visitor, metadata, command, true);
-
if (validateVisibility) {
// Create model visibility validation visitor
visitor = new ModelVisibilityValidationVisitor(this.vdbService, this.vdbName, this.vdbVersion);
Deleted: trunk/engine/src/main/java/com/metamatrix/query/validator/ValidateCriteriaVisitor.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/query/validator/ValidateCriteriaVisitor.java 2009-02-25 20:18:40 UTC (rev 502)
+++ trunk/engine/src/main/java/com/metamatrix/query/validator/ValidateCriteriaVisitor.java 2009-02-25 21:59:42 UTC (rev 503)
@@ -1,196 +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 com.metamatrix.query.validator;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import com.metamatrix.api.exception.MetaMatrixComponentException;
-import com.metamatrix.api.exception.query.QueryMetadataException;
-import com.metamatrix.query.QueryPlugin;
-import com.metamatrix.query.metadata.SupportConstants;
-import com.metamatrix.query.sql.lang.AbstractCompareCriteria;
-import com.metamatrix.query.sql.lang.BetweenCriteria;
-import com.metamatrix.query.sql.lang.CompareCriteria;
-import com.metamatrix.query.sql.lang.Criteria;
-import com.metamatrix.query.sql.lang.DependentSetCriteria;
-import com.metamatrix.query.sql.lang.IsNullCriteria;
-import com.metamatrix.query.sql.lang.MatchCriteria;
-import com.metamatrix.query.sql.lang.Query;
-import com.metamatrix.query.sql.lang.SetCriteria;
-import com.metamatrix.query.sql.lang.SubqueryCompareCriteria;
-import com.metamatrix.query.sql.lang.SubquerySetCriteria;
-import com.metamatrix.query.sql.symbol.ElementSymbol;
-import com.metamatrix.query.sql.symbol.Expression;
-import com.metamatrix.query.sql.symbol.GroupSymbol;
-import com.metamatrix.query.sql.visitor.ElementCollectorVisitor;
-import com.metamatrix.query.util.ErrorMessageKeys;
-
-/**
- * Validates that the elements of various criteria are allowed (by metadata)
- * to be used in the criteria in the way that they are being used.
- */
-public class ValidateCriteriaVisitor extends AbstractValidationVisitor {
-
- // State during validation
- private boolean isXML = false; // only used for Query commands
-
- public ValidateCriteriaVisitor() {
- super();
- }
-
- public void reset() {
- super.reset();
- this.isXML = false;
- }
-
- // ############### Visitor methods for language objects ##################
-
- public void visit(Query obj) {
- if(isXMLCommand(obj)) {
- this.isXML = true;
- }
- }
-
- public void visit(BetweenCriteria obj) {
- checkUncomparableType(obj.getExpression());
- validateCompareElements(obj);
- }
-
- public void visit(CompareCriteria obj) {
- validateCompareCriteria(obj);
- }
-
- private void validateCompareCriteria(AbstractCompareCriteria obj) {
- checkUncomparableTypes(obj.getLeftExpression(), obj.getRightExpression());
- validateCompareElements(obj);
- }
-
- public void visit(IsNullCriteria obj) {
- validateCompareElements(obj);
- }
-
- public void visit(MatchCriteria obj) {
- validateLikeElements(obj);
- }
-
- public void visit(SetCriteria obj) {
- checkUncomparableType(obj.getExpression());
- validateCompareElements(obj);
- }
-
- public void visit(SubquerySetCriteria obj) {
- checkUncomparableType(obj.getExpression());
- validateCompareElements(obj);
- }
-
- public void visit(DependentSetCriteria obj) {
- checkUncomparableType(obj.getExpression());
- validateCompareElements(obj);
- }
-
- public void visit(SubqueryCompareCriteria obj) {
- validateCompareCriteria(obj);
- }
-
- protected void validateCompareElements(Criteria obj) {
- if(isXML) {
- return;
- }
-
- Collection elements = ElementCollectorVisitor.getElements(obj, true);
- Collection badCompareVars = validateElementsSupport(filterPhysicalElements(elements), SupportConstants.Element.SEARCHABLE_COMPARE );
-
- if(badCompareVars != null) {
- handleValidationError(QueryPlugin.Util.getString("ValidateCriteriaVistitor.element_not_comparable", badCompareVars), badCompareVars); //$NON-NLS-1$
- }
- }
-
- private void checkUncomparableType(Expression expression) {
- if(ValidationVisitor.isNonComparable(expression)) {
- handleValidationError(QueryPlugin.Util.getString(ErrorMessageKeys.VALIDATOR_0027, expression), expression);
- }
- }
-
- private void checkUncomparableTypes(Expression leftExpr, Expression rightExpr) {
- List uncomparableExpr = null;
- if(ValidationVisitor.isNonComparable(leftExpr)) {
- uncomparableExpr = new ArrayList();
- uncomparableExpr.add(leftExpr);
- }
- if(ValidationVisitor.isNonComparable(rightExpr)) {
- if(uncomparableExpr == null) {
- uncomparableExpr = new ArrayList();
- }
- uncomparableExpr.add(rightExpr);
- }
-
- if(uncomparableExpr != null) {
- handleValidationError(QueryPlugin.Util.getString(ErrorMessageKeys.VALIDATOR_0027, uncomparableExpr), uncomparableExpr);
- }
- }
-
- protected void validateLikeElements(MatchCriteria obj) {
- if(isXML) {
- return;
- }
-
- Collection badLikeVars = validateElementsSupport(
- filterPhysicalElements(ElementCollectorVisitor.getElements(obj.getLeftExpression(), true)),
- SupportConstants.Element.SEARCHABLE_LIKE );
-
- if(badLikeVars != null) {
- handleValidationError(QueryPlugin.Util.getString(ErrorMessageKeys.VALIDATOR_0028, badLikeVars), badLikeVars);
- }
- }
-
- /**
- * Filter out physical elements as criteria restrictions on physical elements
- * are stating the capabilities of the source, not access restrictions.
- * @param elements Collection of ElementSymbol
- * @return Collection of ElementSymbol with physical elements filtered out
- */
- private Collection filterPhysicalElements(Collection allElements) {
- List filtered = new ArrayList();
-
- try {
- Iterator iter = allElements.iterator();
- while(iter.hasNext()) {
- ElementSymbol elem = (ElementSymbol) iter.next();
- GroupSymbol group = elem.getGroupSymbol();
- if(getMetadata().isVirtualGroup(group.getMetadataID())) {
- filtered.add(elem);
- }
- }
- } catch(QueryMetadataException e) {
- handleException(e);
- } catch(MetaMatrixComponentException e) {
- handleException(e);
- }
-
- return filtered;
- }
-
-}
Modified: trunk/engine/src/main/java/com/metamatrix/query/validator/ValidationVisitor.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/query/validator/ValidationVisitor.java 2009-02-25 20:18:40 UTC (rev 502)
+++ trunk/engine/src/main/java/com/metamatrix/query/validator/ValidationVisitor.java 2009-02-25 21:59:42 UTC (rev 503)
@@ -231,6 +231,9 @@
}
public void visit(SubquerySetCriteria obj) {
+ if (isNonComparable(obj.getExpression())) {
+ handleValidationError(QueryPlugin.Util.getString(ErrorMessageKeys.VALIDATOR_0027),obj);
+ }
this.validateRowLimitFunctionNotInInvalidCriteria(obj);
Collection projSymbols = obj.getCommand().getProjectedSymbols();
@@ -957,6 +960,9 @@
* @since 4.3
*/
public void visit(BetweenCriteria obj) {
+ if (isNonComparable(obj.getExpression())) {
+ handleValidationError(QueryPlugin.Util.getString(ErrorMessageKeys.VALIDATOR_0027),obj);
+ }
this.validateRowLimitFunctionNotInInvalidCriteria(obj);
}
@@ -989,6 +995,9 @@
* @since 4.3
*/
public void visit(SetCriteria obj) {
+ if (isNonComparable(obj.getExpression())) {
+ handleValidationError(QueryPlugin.Util.getString(ErrorMessageKeys.VALIDATOR_0027),obj);
+ }
this.validateRowLimitFunctionNotInInvalidCriteria(obj);
}
@@ -997,6 +1006,9 @@
* @since 4.3
*/
public void visit(SubqueryCompareCriteria obj) {
+ if (isNonComparable(obj.getLeftExpression())) {
+ handleValidationError(QueryPlugin.Util.getString(ErrorMessageKeys.VALIDATOR_0027),obj);
+ }
this.validateRowLimitFunctionNotInInvalidCriteria(obj);
}
@@ -1043,5 +1055,12 @@
handleValidationError(QueryPlugin.Util.getString("ValidationVisitor.drop_of_nontemptable", drop.getTable()), drop); //$NON-NLS-1$
}
}
+
+ @Override
+ public void visit(CompareCriteria obj) {
+ if (isNonComparable(obj.getLeftExpression())) {
+ handleValidationError(QueryPlugin.Util.getString(ErrorMessageKeys.VALIDATOR_0027),obj);
+ }
+ }
}
Modified: trunk/engine/src/main/java/com/metamatrix/query/validator/Validator.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/query/validator/Validator.java 2009-02-25 20:18:40 UTC (rev 502)
+++ trunk/engine/src/main/java/com/metamatrix/query/validator/Validator.java 2009-02-25 21:59:42 UTC (rev 503)
@@ -44,10 +44,6 @@
throws MetaMatrixComponentException {
ValidatorReport report1 = Validator.validate(object, metadata, new ValidationVisitor(), false);
- if (validateCriteria) {
- ValidatorReport report2 = Validator.validate(object, metadata, new ValidateCriteriaVisitor(), true);
- report1.addItems(report2.getItems());
- }
return report1;
}
Deleted: trunk/engine/src/test/java/com/metamatrix/query/validator/TestCriteriaValidator.java
===================================================================
--- trunk/engine/src/test/java/com/metamatrix/query/validator/TestCriteriaValidator.java 2009-02-25 20:18:40 UTC (rev 502)
+++ trunk/engine/src/test/java/com/metamatrix/query/validator/TestCriteriaValidator.java 2009-02-25 21:59:42 UTC (rev 503)
@@ -1,48 +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 com.metamatrix.query.validator;
-
-import junit.framework.TestCase;
-
-public class TestCriteriaValidator extends TestCase {
-
- public TestCriteriaValidator(String name) {
- super(name);
- }
-
- public void testClobEquals() {
- TestValidator.helpValidate("SELECT * FROM test.group where e4 = '1'", new String[] {"e4", "'1'"}, TestValidator.exampleMetadata2()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- }
-
- /**
- * Should not fail since the update changing set is not really criteria
- */
- public void testUpdateWithClob() {
- TestValidator.helpValidate("update test.group set e4 = ?", new String[] {}, TestValidator.exampleMetadata2()); //$NON-NLS-1$
- }
-
- public void testBlobLessThan() {
- TestValidator.helpValidate("SELECT * FROM test.group where e3 < ?", new String[] {"e3", "?"}, TestValidator.exampleMetadata2()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- }
-
-}
Modified: trunk/engine/src/test/java/com/metamatrix/query/validator/TestValidator.java
===================================================================
--- trunk/engine/src/test/java/com/metamatrix/query/validator/TestValidator.java 2009-02-25 20:18:40 UTC (rev 502)
+++ trunk/engine/src/test/java/com/metamatrix/query/validator/TestValidator.java 2009-02-25 21:59:42 UTC (rev 503)
@@ -54,16 +54,8 @@
import com.metamatrix.query.resolver.QueryResolver;
import com.metamatrix.query.sql.LanguageObject;
import com.metamatrix.query.sql.lang.Command;
-import com.metamatrix.query.sql.lang.CompareCriteria;
-import com.metamatrix.query.sql.lang.From;
-import com.metamatrix.query.sql.lang.Query;
import com.metamatrix.query.sql.lang.SPParameter;
-import com.metamatrix.query.sql.lang.Select;
-import com.metamatrix.query.sql.symbol.Constant;
import com.metamatrix.query.sql.symbol.ElementSymbol;
-import com.metamatrix.query.sql.symbol.Expression;
-import com.metamatrix.query.sql.symbol.ExpressionSymbol;
-import com.metamatrix.query.sql.symbol.Function;
import com.metamatrix.query.sql.symbol.GroupSymbol;
import com.metamatrix.query.sql.visitor.SQLStringVisitor;
import com.metamatrix.query.unittest.FakeMetadataFacade;
@@ -362,14 +354,12 @@
try {
ValidatorReport report = Validator.validate(command, metadata);
//System.out.println("\nReport = \n" + report);
- ValidatorReport report2 = Validator.validate(command, metadata, new ValidateCriteriaVisitor(), true);
ValidatorReport report3 = Validator.validate(command, metadata, new ValueValidationVisitor(), true);
// Get invalid objects from report
Collection actualObjs = new ArrayList();
report.collectInvalidObjects(actualObjs);
- report2.collectInvalidObjects(actualObjs);
report3.collectInvalidObjects(actualObjs);
// Compare expected and actual objects
@@ -382,7 +372,7 @@
}
if(expectedStrings.size() == 0 && actualStrings.size() > 0) {
- fail("Expected no failures but got some: " + report.getFailureMessage() + ", " + report2.getFailureMessage() + ", " + report3.getFailureMessage()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ fail("Expected no failures but got some: " + report.getFailureMessage() + ", " + report3.getFailureMessage()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
} else if(actualStrings.size() == 0 && expectedStrings.size() > 0) {
fail("Expected some failures but got none for sql = " + command); //$NON-NLS-1$
} else {
@@ -454,47 +444,31 @@
}
public void testValidateCompare1() {
- helpValidate("SELECT e2 FROM vTest.vMap WHERE e2 = 'a'", new String[] {"e2"}, exampleMetadata()); //$NON-NLS-1$ //$NON-NLS-2$
+ helpValidate("SELECT e2 FROM vTest.vMap WHERE e2 = 'a'", new String[] {}, exampleMetadata()); //$NON-NLS-1$ //$NON-NLS-2$
}
- public void testValidateCompare2() {
- helpValidate("SELECT e2 FROM vTest.vMap WHERE e2 IS NULL", new String[] {"e2"}, exampleMetadata()); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- public void testValidateCompare3() {
- helpValidate("SELECT e2 FROM vTest.vMap WHERE e2 IN ('a')", new String[] {"e2"}, exampleMetadata()); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
public void testValidateCompare4() {
- helpValidate("SELECT e3 FROM vTest.vMap WHERE e3 LIKE 'a'", new String[] {"e3"}, exampleMetadata()); //$NON-NLS-1$ //$NON-NLS-2$
+ helpValidate("SELECT e3 FROM vTest.vMap WHERE e3 LIKE 'a'", new String[] {}, exampleMetadata()); //$NON-NLS-1$ //$NON-NLS-2$
}
- public void testValidateCompare5() {
- helpValidate("SELECT e2 FROM vTest.vMap WHERE e2 BETWEEN 1000 AND 2000", new String[] {"e2"}, exampleMetadata()); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
public void testValidateCompare6() {
helpValidate("SELECT e0 FROM vTest.vMap WHERE e0 BETWEEN 1000 AND 2000", new String[] {}, exampleMetadata()); //$NON-NLS-1$
}
- public void testValidateCompareInHaving1() {
- helpValidate("SELECT e2 FROM vTest.vMap GROUP BY e2 HAVING e2 = 'a'", new String[] {"e2"}, exampleMetadata()); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
public void testValidateCompareInHaving2() {
- helpValidate("SELECT e2 FROM vTest.vMap GROUP BY e2 HAVING e2 IS NULL", new String[] {"e2"}, exampleMetadata()); //$NON-NLS-1$ //$NON-NLS-2$
+ helpValidate("SELECT e2 FROM vTest.vMap GROUP BY e2 HAVING e2 IS NULL", new String[] {}, exampleMetadata()); //$NON-NLS-1$ //$NON-NLS-2$
}
public void testValidateCompareInHaving3() {
- helpValidate("SELECT e2 FROM vTest.vMap GROUP BY e2 HAVING e2 IN ('a')", new String[] {"e2"}, exampleMetadata()); //$NON-NLS-1$ //$NON-NLS-2$
+ helpValidate("SELECT e2 FROM vTest.vMap GROUP BY e2 HAVING e2 IN ('a')", new String[] {}, exampleMetadata()); //$NON-NLS-1$ //$NON-NLS-2$
}
public void testValidateCompareInHaving4() {
- helpValidate("SELECT e3 FROM vTest.vMap GROUP BY e3 HAVING e3 LIKE 'a'", new String[] {"e3"}, exampleMetadata()); //$NON-NLS-1$ //$NON-NLS-2$
+ helpValidate("SELECT e3 FROM vTest.vMap GROUP BY e3 HAVING e3 LIKE 'a'", new String[] {}, exampleMetadata()); //$NON-NLS-1$ //$NON-NLS-2$
}
public void testValidateCompareInHaving5() {
- helpValidate("SELECT e2 FROM vTest.vMap GROUP BY e2 HAVING e2 BETWEEN 1000 AND 2000", new String[] {"e2"}, exampleMetadata()); //$NON-NLS-1$ //$NON-NLS-2$
+ helpValidate("SELECT e2 FROM vTest.vMap GROUP BY e2 HAVING e2 BETWEEN 1000 AND 2000", new String[] {}, exampleMetadata()); //$NON-NLS-1$ //$NON-NLS-2$
}
public void testInvalidAggregate1() {
@@ -1048,11 +1022,11 @@
}
public void testValidateSubquery1() {
- helpValidate("SELECT e2 FROM (SELECT e2 FROM vTest.vMap WHERE e2 = 'a') AS x", new String[] {"e2"}, exampleMetadata()); //$NON-NLS-1$ //$NON-NLS-2$
+ helpValidate("SELECT e2 FROM (SELECT e2 FROM vTest.vMap WHERE e2 = 'a') AS x", new String[] {}, exampleMetadata()); //$NON-NLS-1$ //$NON-NLS-2$
}
public void testValidateSubquery2() {
- helpValidate("SELECT e2 FROM (SELECT e3 FROM vTest.vMap) AS x, vTest.vMap WHERE e2 = 'a'", new String[] {"e2"}, exampleMetadata()); //$NON-NLS-1$ //$NON-NLS-2$
+ helpValidate("SELECT e2 FROM (SELECT e3 FROM vTest.vMap) AS x, vTest.vMap WHERE e2 = 'a'", new String[] {}, exampleMetadata()); //$NON-NLS-1$ //$NON-NLS-2$
}
public void testValidateSubquery3() {
@@ -1064,11 +1038,11 @@
}
public void testValidateExistsSubquery() {
- helpValidate("SELECT e2 FROM test.group2 WHERE EXISTS (SELECT e2 FROM vTest.vMap WHERE e2 = 'a')", new String[] {"e2"}, exampleMetadata()); //$NON-NLS-1$ //$NON-NLS-2$
+ helpValidate("SELECT e2 FROM test.group2 WHERE EXISTS (SELECT e2 FROM vTest.vMap WHERE e2 = 'a')", new String[] {}, exampleMetadata()); //$NON-NLS-1$ //$NON-NLS-2$
}
public void testValidateScalarSubquery() {
- helpValidate("SELECT e2, (SELECT e1 FROM vTest.vMap WHERE e2 = '3') FROM test.group2", new String[] {"e1", "e2"}, exampleMetadata()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ helpValidate("SELECT e2, (SELECT e1 FROM vTest.vMap WHERE e2 = '3') FROM test.group2", new String[] {"e1"}, exampleMetadata()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
public void testValidateAnyCompareSubquery() {
@@ -1662,71 +1636,8 @@
public void testValidateObjectInComparison() throws Exception {
String sql = "SELECT IntKey FROM BQT1.SmallA WHERE ObjectValue = 5"; //$NON-NLS-1$
- FakeMetadataFacade metadata = FakeMetadataFactory.exampleBQTCached();
- String[] expectedStringArray = new String[] { "ObjectValue", "'xyz'"}; //$NON-NLS-1$ //$NON-NLS-2$
-
- // Parse and modify to add object literal - this is a hack to set up this test
- // which would really be done using a prepared statement in the server (with setObject()).
- Query command = (Query) QueryParser.getQueryParser().parseCommand(sql);
- CompareCriteria crit = (CompareCriteria) command.getCriteria();
- crit.setRightExpression(new Constant("xyz", Object.class)); //$NON-NLS-1$
-
- // Resolve
- QueryResolver.resolveCommand(command, metadata);
-
- // Validate
- ValidatorReport report = Validator.validate(command, metadata, new ValidateCriteriaVisitor(), true);
- Collection actualObjs = new ArrayList();
- report.collectInvalidObjects(actualObjs);
-
- // Compare expected and actual objects
- Set expectedStrings = new HashSet(Arrays.asList(expectedStringArray));
- Set actualStrings = new HashSet();
- Iterator objIter = actualObjs.iterator();
- while(objIter.hasNext()) {
- LanguageObject obj = (LanguageObject) objIter.next();
- actualStrings.add(SQLStringVisitor.getSQLString(obj));
- }
-
- if(expectedStrings.size() == 0 && actualStrings.size() > 0) {
- fail("Expected no failures but got some: " + report.getFailureMessage()); //$NON-NLS-1$
- } else if(actualStrings.size() == 0 && expectedStrings.size() > 0) {
- fail("Expected some failures but got none for sql = " + command); //$NON-NLS-1$
- } else {
- assertEquals("Expected and actual sets of strings are not the same: ", expectedStrings, actualStrings); //$NON-NLS-1$
- }
}
- public void testValidateObjectInFunction() throws Exception {
- FakeMetadataFacade metadata = FakeMetadataFactory.exampleBQTCached();
-
- Query query = new Query();
- Select select = new Select();
- select.addSymbol(new ExpressionSymbol("e1", new Constant("x"))); //$NON-NLS-1$//$NON-NLS-2$
- query.setSelect(select);
-
- GroupSymbol group = new GroupSymbol("BQT1.SmallA"); //$NON-NLS-1$
- group.setMetadataID(metadata.getGroupID(group.getName()));
- From from = new From();
- from.addGroup(group);
- query.setFrom(from);
-
- CompareCriteria crit = new CompareCriteria();
- ElementSymbol elem = new ElementSymbol("BQT1.SmallA.ObjectValue"); //$NON-NLS-1$
- elem.setMetadataID(metadata.getElementID(elem.getName()));
- elem.setType(Object.class);
- elem.setGroupSymbol(group);
- Function f = new Function("fake", new Expression[] { elem }); //$NON-NLS-1$
- f.setType(Integer.class);
- crit.setLeftExpression(f);
- crit.setRightExpression(new Constant(new Integer(5)));
- query.setCriteria(crit);
-
- // Validate
- ValidatorReport report = Validator.validate(query, metadata, new ValidateCriteriaVisitor(), true);
- assertEquals(0, report.getItems().size());
- }
-
public void testValidateAssignmentWithFunctionOnParameter_InServer() throws Exception{
String sql = "EXEC pm1.vsp36(5)"; //$NON-NLS-1$
QueryMetadataInterface metadata = FakeMetadataFactory.example1Cached();
@@ -1829,7 +1740,7 @@
QueryMetadataInterface metadata = FakeMetadataFactory.exampleBQTCached();
// Validate
- helpValidate(sql, new String[] {"BQT1.SmallA.ObjectValue", "BQT2.SmallB.ObjectValue"}, metadata); //$NON-NLS-1$ //$NON-NLS-2$
+ helpValidate(sql, new String[] {"BQT1.SmallA.ObjectValue = BQT2.SmallB.ObjectValue"}, metadata); //$NON-NLS-1$ //$NON-NLS-2$
}
public void testDefect16772() throws Exception{
@@ -2091,5 +2002,36 @@
Command command = helpResolve(procedure, metadata);
helpRunValidator(command, new String[] {"variables"}, metadata); //$NON-NLS-1$
}
+
+ public void testClobEquals() {
+ TestValidator.helpValidate("SELECT * FROM test.group where e4 = '1'", new String[] {"e4 = '1'"}, TestValidator.exampleMetadata2()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ }
+
+ /**
+ * Should not fail since the update changing set is not really criteria
+ */
+ public void testUpdateWithClob() {
+ TestValidator.helpValidate("update test.group set e4 = ?", new String[] {}, TestValidator.exampleMetadata2()); //$NON-NLS-1$
+ }
+ public void testBlobLessThan() {
+ TestValidator.helpValidate("SELECT * FROM test.group where e3 < ?", new String[] {"e3 < ?"}, TestValidator.exampleMetadata2()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ }
+
+ public void testValidateCompare2() {
+ helpValidate("SELECT e2 FROM test.group WHERE e4 IS NULL", new String[] {}, exampleMetadata2()); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+ public void testValidateCompare3() {
+ helpValidate("SELECT e2 FROM test.group WHERE e4 IN ('a')", new String[] {"e4 IN ('a')"}, exampleMetadata2()); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+ public void testValidateCompare5() {
+ helpValidate("SELECT e2 FROM test.group WHERE e4 BETWEEN '1' AND '2'", new String[] {"e4 BETWEEN '1' AND '2'"}, exampleMetadata2()); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+ public void testValidateCompareInHaving1() {
+ helpValidate("SELECT e1 FROM test.group GROUP BY e1 HAVING convert(e1, clob) = 'a'", new String[] {"convert(e1, clob) = 'a'"}, exampleMetadata2()); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
}
15 years, 10 months
- 1
- 0
teiid SVN: r502 - in trunk: connector-api/src/main/java/com/metamatrix/connector and 134 other directories.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2009-02-25 15:18:40 -0500 (Wed, 25 Feb 2009)
New Revision: 502
Added:
trunk/connector-api/src/main/java/org/
trunk/connector-api/src/main/java/org/teiid/
trunk/connector-api/src/main/java/org/teiid/connector/
trunk/connector-api/src/main/java/org/teiid/connector/DataPlugin.java
trunk/connector-api/src/main/java/org/teiid/connector/api/
trunk/connector-api/src/main/java/org/teiid/connector/basic/
trunk/connector-api/src/main/java/org/teiid/connector/internal/
trunk/connector-api/src/main/java/org/teiid/connector/language/
trunk/connector-api/src/main/java/org/teiid/connector/metadata/
trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/
trunk/connector-api/src/main/java/org/teiid/connector/visitor/
trunk/connector-api/src/main/java/org/teiid/connector/visitor/framework/
trunk/connector-api/src/main/java/org/teiid/connector/visitor/framework/HierarchyVisitor.java
trunk/connector-api/src/main/java/org/teiid/connector/visitor/util/
trunk/connector-api/src/main/java/org/teiid/connector/visitor/util/SQLStringVisitor.java
trunk/connector-api/src/main/java/org/teiid/connector/xa/
trunk/connector-api/src/main/java/org/teiid/connector/xa/api/
trunk/connector-api/src/main/resources/org/
trunk/connector-api/src/main/resources/org/teiid/
trunk/connector-api/src/main/resources/org/teiid/connector/
trunk/connector-api/src/test/java/org/
trunk/connector-api/src/test/java/org/teiid/
trunk/connector-api/src/test/java/org/teiid/connector/
trunk/connector-api/src/test/java/org/teiid/connector/basic/
Removed:
trunk/connector-api/src/main/java/com/metamatrix/connector/DataPlugin.java
trunk/connector-api/src/main/java/com/metamatrix/connector/api/
trunk/connector-api/src/main/java/com/metamatrix/connector/basic/
trunk/connector-api/src/main/java/com/metamatrix/connector/internal/
trunk/connector-api/src/main/java/com/metamatrix/connector/language/
trunk/connector-api/src/main/java/com/metamatrix/connector/metadata/runtime/
trunk/connector-api/src/main/java/com/metamatrix/connector/visitor/framework/
trunk/connector-api/src/main/java/com/metamatrix/connector/visitor/util/
trunk/connector-api/src/main/java/com/metamatrix/connector/xa/api/
trunk/connector-api/src/main/java/org/teiid/connector/visitor/framework/HierarchyVisitor.java
trunk/connector-api/src/main/java/org/teiid/connector/visitor/util/SQLStringVisitor.java
trunk/connector-api/src/main/resources/com/
trunk/connector-api/src/main/resources/org/metamatrix/
trunk/connector-api/src/main/resources/org/teiid/data/
trunk/connector-api/src/test/java/com/
trunk/connector-api/src/test/java/org/metamatrix/
trunk/connector-api/src/test/java/org/teiid/data/pool/
trunk/connector-api/src/test/java/org/teiid/data/transform/
Modified:
trunk/connector-api/src/main/java/org/teiid/connector/api/Connection.java
trunk/connector-api/src/main/java/org/teiid/connector/api/Connector.java
trunk/connector-api/src/main/java/org/teiid/connector/api/ConnectorAnnotations.java
trunk/connector-api/src/main/java/org/teiid/connector/api/ConnectorCapabilities.java
trunk/connector-api/src/main/java/org/teiid/connector/api/ConnectorEnvironment.java
trunk/connector-api/src/main/java/org/teiid/connector/api/ConnectorException.java
trunk/connector-api/src/main/java/org/teiid/connector/api/ConnectorIdentity.java
trunk/connector-api/src/main/java/org/teiid/connector/api/ConnectorLogger.java
trunk/connector-api/src/main/java/org/teiid/connector/api/CredentialMap.java
trunk/connector-api/src/main/java/org/teiid/connector/api/DataNotAvailableException.java
trunk/connector-api/src/main/java/org/teiid/connector/api/Execution.java
trunk/connector-api/src/main/java/org/teiid/connector/api/ExecutionContext.java
trunk/connector-api/src/main/java/org/teiid/connector/api/MappedUserIdentity.java
trunk/connector-api/src/main/java/org/teiid/connector/api/ProcedureExecution.java
trunk/connector-api/src/main/java/org/teiid/connector/api/ResultSetExecution.java
trunk/connector-api/src/main/java/org/teiid/connector/api/SingleIdentity.java
trunk/connector-api/src/main/java/org/teiid/connector/api/SourceSystemFunctions.java
trunk/connector-api/src/main/java/org/teiid/connector/api/TypeFacility.java
trunk/connector-api/src/main/java/org/teiid/connector/api/UpdateExecution.java
trunk/connector-api/src/main/java/org/teiid/connector/api/ValueTranslator.java
trunk/connector-api/src/main/java/org/teiid/connector/basic/BasicConnection.java
trunk/connector-api/src/main/java/org/teiid/connector/basic/BasicConnector.java
trunk/connector-api/src/main/java/org/teiid/connector/basic/BasicConnectorCapabilities.java
trunk/connector-api/src/main/java/org/teiid/connector/basic/BasicExecution.java
trunk/connector-api/src/main/java/org/teiid/connector/basic/BasicValueTranslator.java
trunk/connector-api/src/main/java/org/teiid/connector/internal/ConnectorPropertyNames.java
trunk/connector-api/src/main/java/org/teiid/connector/language/IAggregate.java
trunk/connector-api/src/main/java/org/teiid/connector/language/IBaseInCriteria.java
trunk/connector-api/src/main/java/org/teiid/connector/language/IBatchedUpdates.java
trunk/connector-api/src/main/java/org/teiid/connector/language/IBulkInsert.java
trunk/connector-api/src/main/java/org/teiid/connector/language/ICommand.java
trunk/connector-api/src/main/java/org/teiid/connector/language/ICompareCriteria.java
trunk/connector-api/src/main/java/org/teiid/connector/language/ICompoundCriteria.java
trunk/connector-api/src/main/java/org/teiid/connector/language/ICriteria.java
trunk/connector-api/src/main/java/org/teiid/connector/language/IDelete.java
trunk/connector-api/src/main/java/org/teiid/connector/language/IElement.java
trunk/connector-api/src/main/java/org/teiid/connector/language/IExistsCriteria.java
trunk/connector-api/src/main/java/org/teiid/connector/language/IExpression.java
trunk/connector-api/src/main/java/org/teiid/connector/language/IFrom.java
trunk/connector-api/src/main/java/org/teiid/connector/language/IFromItem.java
trunk/connector-api/src/main/java/org/teiid/connector/language/IFunction.java
trunk/connector-api/src/main/java/org/teiid/connector/language/IGroup.java
trunk/connector-api/src/main/java/org/teiid/connector/language/IGroupBy.java
trunk/connector-api/src/main/java/org/teiid/connector/language/IInCriteria.java
trunk/connector-api/src/main/java/org/teiid/connector/language/IInlineView.java
trunk/connector-api/src/main/java/org/teiid/connector/language/IInsert.java
trunk/connector-api/src/main/java/org/teiid/connector/language/IIsNullCriteria.java
trunk/connector-api/src/main/java/org/teiid/connector/language/IJoin.java
trunk/connector-api/src/main/java/org/teiid/connector/language/ILanguageFactory.java
trunk/connector-api/src/main/java/org/teiid/connector/language/ILanguageObject.java
trunk/connector-api/src/main/java/org/teiid/connector/language/ILikeCriteria.java
trunk/connector-api/src/main/java/org/teiid/connector/language/ILimit.java
trunk/connector-api/src/main/java/org/teiid/connector/language/ILiteral.java
trunk/connector-api/src/main/java/org/teiid/connector/language/ILogicalCriteria.java
trunk/connector-api/src/main/java/org/teiid/connector/language/IMetadataReference.java
trunk/connector-api/src/main/java/org/teiid/connector/language/INotCriteria.java
trunk/connector-api/src/main/java/org/teiid/connector/language/IOrderBy.java
trunk/connector-api/src/main/java/org/teiid/connector/language/IOrderByItem.java
trunk/connector-api/src/main/java/org/teiid/connector/language/IParameter.java
trunk/connector-api/src/main/java/org/teiid/connector/language/IPredicateCriteria.java
trunk/connector-api/src/main/java/org/teiid/connector/language/IProcedure.java
trunk/connector-api/src/main/java/org/teiid/connector/language/IQuery.java
trunk/connector-api/src/main/java/org/teiid/connector/language/IQueryCommand.java
trunk/connector-api/src/main/java/org/teiid/connector/language/IScalarSubquery.java
trunk/connector-api/src/main/java/org/teiid/connector/language/ISearchedCaseExpression.java
trunk/connector-api/src/main/java/org/teiid/connector/language/ISelect.java
trunk/connector-api/src/main/java/org/teiid/connector/language/ISelectSymbol.java
trunk/connector-api/src/main/java/org/teiid/connector/language/ISetClause.java
trunk/connector-api/src/main/java/org/teiid/connector/language/ISetClauseList.java
trunk/connector-api/src/main/java/org/teiid/connector/language/ISetQuery.java
trunk/connector-api/src/main/java/org/teiid/connector/language/ISubqueryCompareCriteria.java
trunk/connector-api/src/main/java/org/teiid/connector/language/ISubqueryContainer.java
trunk/connector-api/src/main/java/org/teiid/connector/language/ISubqueryInCriteria.java
trunk/connector-api/src/main/java/org/teiid/connector/language/IUpdate.java
trunk/connector-api/src/main/java/org/teiid/connector/language/LanguageUtil.java
trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/Element.java
trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/Group.java
trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/MetadataObject.java
trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/Parameter.java
trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/Procedure.java
trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/RuntimeMetadata.java
trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/TypeModel.java
trunk/connector-api/src/main/java/org/teiid/connector/visitor/framework/AbstractLanguageVisitor.java
trunk/connector-api/src/main/java/org/teiid/connector/visitor/framework/DelegatingHierarchyVisitor.java
trunk/connector-api/src/main/java/org/teiid/connector/visitor/framework/LanguageObjectVisitor.java
trunk/connector-api/src/main/java/org/teiid/connector/visitor/util/CollectorVisitor.java
trunk/connector-api/src/main/java/org/teiid/connector/visitor/util/SQLReservedWords.java
trunk/connector-api/src/main/java/org/teiid/connector/xa/api/TransactionContext.java
trunk/connector-api/src/main/java/org/teiid/connector/xa/api/XAConnection.java
trunk/connector-api/src/main/java/org/teiid/connector/xa/api/XAConnector.java
trunk/connector-api/src/test/java/org/teiid/connector/TestCredentialMap.java
trunk/connector-api/src/test/java/org/teiid/connector/basic/TestBasicValueTranslator.java
trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata/IndexConnector.java
trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata/MetadataProcedureExecution.java
trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata/adapter/ObjectConnection.java
trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata/adapter/ObjectConnector.java
trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata/adapter/ObjectConnectorCapabilities.java
trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata/adapter/ObjectSynchExecution.java
trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata/internal/MetadataSearchCriteriaBuilder.java
trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata/internal/ObjectProcedure.java
trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata/internal/ObjectProcedureProcessor.java
trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata/internal/ObjectQuery.java
trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata/TestIndexConnector.java
trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata/adapter/FakeObjectConnector.java
trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata/adapter/TestObjectConnector.java
trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata/internal/TestConnectorHost.java
trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata/internal/TestMetadataSearchCriteriaBuilder.java
trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata/internal/TestObjectProcedure.java
trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata/internal/TestObjectQuery.java
trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata/internal/TestObjectQueryProcessor.java
trunk/connector-sdk/src/main/java/com/metamatrix/cdk/CommandBuilder.java
trunk/connector-sdk/src/main/java/com/metamatrix/cdk/ConnectorShellCommandTarget.java
trunk/connector-sdk/src/main/java/com/metamatrix/cdk/IConnectorHost.java
trunk/connector-sdk/src/main/java/com/metamatrix/cdk/api/ConnectorHost.java
trunk/connector-sdk/src/main/java/com/metamatrix/cdk/api/EnvironmentUtility.java
trunk/connector-sdk/src/main/java/com/metamatrix/cdk/api/SysLogger.java
trunk/connector-sdk/src/main/java/com/metamatrix/cdk/api/TranslationUtility.java
trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/JDBCBaseExecution.java
trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/JDBCCapabilities.java
trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/JDBCConnector.java
trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/JDBCExecutionException.java
trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/JDBCExecutionHelper.java
trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/JDBCProcedureExecution.java
trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/JDBCQueryExecution.java
trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/JDBCSourceConnection.java
trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/JDBCUpdateExecution.java
trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/SimpleCapabilities.java
trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/access/AccessSQLTranslator.java
trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/db2/DB2Capabilities.java
trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/db2/DB2ConvertModifier.java
trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/db2/DB2SQLTranslator.java
trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/derby/DerbyCapabilities.java
trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/derby/DerbyConvertModifier.java
trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/derby/DerbySQLTranslator.java
trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/informix/InformixSQLTranslator.java
trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/mm/MMCapabilities.java
trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/mysql/MySQLConvertModifier.java
trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/mysql/MySQLTranslator.java
trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/oracle/ConcatFunctionModifier.java
trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/oracle/DayWeekQuarterFunctionModifier.java
trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/oracle/ExtractFunctionModifier.java
trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/oracle/LeftOrRightFunctionModifier.java
trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/oracle/LocateFunctionModifier.java
trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/oracle/Log10FunctionModifier.java
trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/oracle/MonthOrDayNameFunctionModifier.java
trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/oracle/OracleCapabilities.java
trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/oracle/OracleConvertModifier.java
trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/oracle/OracleSQLTranslator.java
trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/postgresql/DatePartFunctionModifier.java
trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/postgresql/ModifiedDatePartFunctionModifier.java
trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/postgresql/PostgreSQLCapabilities.java
trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/postgresql/PostgreSQLConvertModifier.java
trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/postgresql/PostgreSQLTranslator.java
trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/sqlserver/SqlServerCapabilities.java
trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/sqlserver/SqlServerSQLTranslator.java
trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/sybase/ModFunctionModifier.java
trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/sybase/SybaseCapabilities.java
trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/sybase/SybaseConvertModifier.java
trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/sybase/SybaseSQLTranslator.java
trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/translator/AliasModifier.java
trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/translator/BasicFunctionModifier.java
trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/translator/BindValueVisitor.java
trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/translator/DropFunctionModifier.java
trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/translator/EscapeSyntaxModifier.java
trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/translator/FunctionModifier.java
trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/translator/ReplacementVisitor.java
trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/translator/SQLConversionVisitor.java
trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/translator/SubstringFunctionModifier.java
trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/translator/TranslatedCommand.java
trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/translator/Translator.java
trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/xa/JDBCSourceXAConnection.java
trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/MetadataFactory.java
trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/TestJDBCConnector.java
trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/TestJDBCSourceConnection.java
trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/access/TestAccessSQLTranslator.java
trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/db2/TestDB2ConvertModifier.java
trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/db2/TestDB2SqlTranslator.java
trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/derby/TestDerbyConvertModifier.java
trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/extension/impl/TestDropFunctionModifier.java
trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/extension/impl/TestEscapeSyntaxModifier.java
trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/mysql/TestMySQLTranslator.java
trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/oracle/TestDayWeekQuarterFunctionModifier.java
trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/oracle/TestExtractFunctionModifier.java
trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/oracle/TestLeftOrRightFunctionModifier.java
trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/oracle/TestLocateFunctionModifier.java
trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/oracle/TestLog10FunctionModifier.java
trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/oracle/TestMonthOrDayNameFunctionModifier.java
trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/oracle/TestOracleConvertModifier.java
trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/oracle/TestOracleTranslator.java
trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/oracle/TestSubstringFunctionModifier.java
trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/postgresql/TestPostgreSQLTranslator.java
trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/sqlserver/TestSqlServerConversionVisitor.java
trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/sybase/TestSybaseConvertModifier.java
trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/sybase/TestSybaseSQLConversionVisitor.java
trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/util/TestFunctionReplacementVisitor.java
trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/ldap/IQueryToLdapSearchParser.java
trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/ldap/LDAPConnection.java
trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/ldap/LDAPConnector.java
trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/ldap/LDAPConnectorCapabilities.java
trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/ldap/LDAPSearchDetails.java
trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/ldap/LDAPSyncQueryExecution.java
trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/ldap/LDAPUpdateExecution.java
trunk/connectors/connector-ldap/src/test/java/com/metamatrix/connector/ldap/TestIQueryToLdapSearchParser.java
trunk/connectors/connector-loopback/src/main/java/com/metamatrix/connector/loopback/LoopbackCapabilities.java
trunk/connectors/connector-loopback/src/main/java/com/metamatrix/connector/loopback/LoopbackConnection.java
trunk/connectors/connector-loopback/src/main/java/com/metamatrix/connector/loopback/LoopbackConnector.java
trunk/connectors/connector-loopback/src/main/java/com/metamatrix/connector/loopback/LoopbackExecution.java
trunk/connectors/connector-loopback/src/test/java/com/metamatrix/connector/loopback/TestLoopbackExecution.java
trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/Connector.java
trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/ConnectorState.java
trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/SalesforceCapabilities.java
trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/Util.java
trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/connection/SalesforceConnection.java
trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/connection/impl/ConnectionImpl.java
trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/execution/DeleteExecutionImpl.java
trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/execution/InsertExecutionImpl.java
trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/execution/QueryExecutionImpl.java
trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/execution/UpdateExecutionImpl.java
trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/execution/UpdateExecutionParent.java
trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/execution/visitors/CriteriaVisitor.java
trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/execution/visitors/DeleteVisitor.java
trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/execution/visitors/ICriteriaVisitor.java
trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/execution/visitors/IQueryProvidingVisitor.java
trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/execution/visitors/InsertVisitor.java
trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/execution/visitors/SelectVisitor.java
trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/execution/visitors/UpdateVisitor.java
trunk/connectors/connector-salesforce/src/test/java/com/metamatrix/connector/salesforce/TestConnector.java
trunk/connectors/connector-salesforce/src/test/java/com/metamatrix/connector/salesforce/test/util/ObjectFactory.java
trunk/connectors/connector-text/src/main/java/com/metamatrix/connector/text/StringToDateTranslator.java
trunk/connectors/connector-text/src/main/java/com/metamatrix/connector/text/TextCapabilities.java
trunk/connectors/connector-text/src/main/java/com/metamatrix/connector/text/TextConnection.java
trunk/connectors/connector-text/src/main/java/com/metamatrix/connector/text/TextConnector.java
trunk/connectors/connector-text/src/main/java/com/metamatrix/connector/text/TextSynchExecution.java
trunk/connectors/connector-text/src/test/java/com/metamatrix/connector/text/TestMultiFileTextSynchExecution.java
trunk/connectors/connector-text/src/test/java/com/metamatrix/connector/text/TestRowHeaderTextSynchExecution.java
trunk/connectors/connector-text/src/test/java/com/metamatrix/connector/text/TestTextConnection.java
trunk/connectors/connector-text/src/test/java/com/metamatrix/connector/text/TestTextConnector.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/AbstractCachingConnector.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/AsynchronousDocumentProducer.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/BaseXMLConnectorState.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/CachingConnector.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/DocumentProducer.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/IQueryPreprocessor.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/NamedDocumentExecutor.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/SAXFilterProvider.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/SecureConnectorState.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/TrustedPayloadHandler.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/XMLConnection.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/XMLConnectorState.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/XMLExecution.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/BaseBatchProducer.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/BaseResultsProducer.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/CriteriaDesc.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/DocumentBuilder.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/FileBackedValueReference.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/FileLifeManager.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/IDGeneratingXmlFilter.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/LargeOrSmallString.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/LargeTextExtractingXmlFilter.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/LargeTextValueReference.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/LoggingConnector.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/LoggingInputStreamFilter.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/NoExtendedFilters.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/NoQueryPreprocessing.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/OutputXPathDesc.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/ParameterDescriptor.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/PluggableInputStreamFilterImpl.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/QueryAnalyzer.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/RequestResponseDocumentProducer.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/Response.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/SecureConnectorStateImpl.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/StatefulConnector.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/TrustedPayloadBridge.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/ValueConvertor.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/XMLCapabilities.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/XMLConnectionImpl.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/XMLConnector.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/XMLConnectorStateImpl.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/XMLExecutionImpl.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/XMLExtractor.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/cache/DocumentCache.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/cache/ExecutionRecord.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/cache/IDocumentCache.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/cache/RequestPartRecord.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/cache/RequestRecord.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/file/FileConnectorState.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/file/FileExecutor.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/http/DefaultTrustDeserializer.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/http/HTTPConnectorState.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/http/HTTPExecutor.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/http/HTTPRequestor.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/http/HTTPTrustDeserializer.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/jms/JMSConnection.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/jms/JMSExecution.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/jms/JMSRequestExecutor.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/jms/JMSSOAPConnectorState.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/jms/JMSXMLConnectorState.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/soap/FilteringHTTPSender.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/soap/SOAPConnectorState.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/soap/SOAPConnectorStateImpl.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/soap/SOAPDocBuilder.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/soap/SOAPExecutor.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/XMLConnectionFacory.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/XMLSourceCapabilities.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/XMLSourceConnection.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/XMLSourceConnector.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/XMLSourceExecution.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/XMLSourcePlugin.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/file/FileConnection.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/file/FileExecution.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/soap/SecurityToken.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/soap/ServiceOperation.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/soap/SoapConnection.java
trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/soap/SoapExecution.java
trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/MockQueryPreprocessor.java
trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/MockXMLExecution.java
trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/ProxyObjectFactory.java
trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestCriteriaDesc.java
trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestExecutionInfo.java
trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestFileLifeManager.java
trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestLargeTextExtractingXmlFilter.java
trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestLoggingInputStreamFilter.java
trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestOutputXPathDesc.java
trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestParameterDescriptor.java
trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestQueryAnalyzer.java
trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestStringBackedValueReference.java
trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestXMLCapabilities.java
trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestXMLConnection.java
trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestXMLConnector.java
trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestXMLConnectorState.java
trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestXMLExecution.java
trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestXMLExtractor.java
trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/cache/TestCache.java
trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/cache/TestRequestRecord.java
trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/file/TestFileConnectorState.java
trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/file/TestFileExecutor.java
trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/http/TestHTTPConnectorState.java
trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/jms/TestJMSConnectorState.java
trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/jms/TestJMSSOAPConnectorState.java
trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xmlsource/file/TestFileConnection.java
trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xmlsource/file/TestFileExecution.java
trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xmlsource/soap/TestSoapConnection.java
trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xmlsource/soap/TestSoapExecution.java
trunk/connectors/sandbox/connector-exec/src/main/java/com/metamatrix/connector/exec/ExecAntExecution.java
trunk/connectors/sandbox/connector-exec/src/main/java/com/metamatrix/connector/exec/ExecCapabilities.java
trunk/connectors/sandbox/connector-exec/src/main/java/com/metamatrix/connector/exec/ExecConnection.java
trunk/connectors/sandbox/connector-exec/src/main/java/com/metamatrix/connector/exec/ExecConnector.java
trunk/connectors/sandbox/connector-exec/src/main/java/com/metamatrix/connector/exec/ExecVisitor.java
trunk/connectors/sandbox/connector-exec/src/test/java/com/metamatrix/connector/exec/FakeExecConnector.java
trunk/connectors/sandbox/connector-exec/src/test/java/com/metamatrix/connector/exec/TestsExec.java
trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/ObjectConnection.java
trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/ObjectConnector.java
trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/ObjectConnectorCapabilities.java
trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/ObjectProcedureExecution.java
trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/SourceConnectionFactory.java
trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/extension/IObjectCommand.java
trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/extension/IObjectSource.java
trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/extension/ISourceTranslator.java
trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/extension/command/ObjectCommand.java
trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/extension/command/ProcedureCommand.java
trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/extension/source/BaseObjectSource.java
trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/extension/source/BaseSourceConnectionFactory.java
trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/extension/source/BasicSourceTranslator.java
trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/extension/value/BasicValueRetriever.java
trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/extension/value/JavaUtilDateValueTranslator.java
trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/util/ObjectConnectorUtil.java
trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/util/ObjectExecutionHelper.java
trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/metamatrix/connector/jdbc/oracle/spatial/FilterFunctionModifier.java
trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/metamatrix/connector/jdbc/oracle/spatial/NearestNeighborFunctionModifier.java
trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/metamatrix/connector/jdbc/oracle/spatial/NnDistanceFunctionModifier.java
trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/metamatrix/connector/jdbc/oracle/spatial/OracleSpatialConnector.java
trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/metamatrix/connector/jdbc/oracle/spatial/OracleSpatialFunctionModifier.java
trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/metamatrix/connector/jdbc/oracle/spatial/OracleSpatialSQLTranslator.java
trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/metamatrix/connector/jdbc/oracle/spatial/RelateFunctionModifier.java
trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/metamatrix/connector/jdbc/oracle/spatial/WithinDistanceFunctionModifier.java
trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metamatrix/connector/yahoo/TickerCollectorVisitor.java
trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metamatrix/connector/yahoo/YahooCapabilities.java
trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metamatrix/connector/yahoo/YahooConnection.java
trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metamatrix/connector/yahoo/YahooConnector.java
trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metamatrix/connector/yahoo/YahooExecution.java
trunk/connectors/sandbox/connector-yahoo/src/test/java/com/metamatrix/connector/yahoo/TestYahooTranslation.java
trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/DefaultIndexConnectorBinding.java
trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedDataService.java
trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedTrackingService.java
trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/CapabilitiesConverter.java
trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/ConnectorEnvironmentImpl.java
trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/ConnectorManager.java
trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/ConnectorWorkItem.java
trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/ConnectorWrapper.java
trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/DefaultConnectorLogger.java
trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/ExecutionContextImpl.java
trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/ProcedureBatchHandler.java
trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/SynchConnectorWorkItem.java
trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/TypeFacilityImpl.java
trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/AggregateImpl.java
trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/BaseLanguageObject.java
trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/BatchedUpdatesImpl.java
trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/BulkInsertImpl.java
trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/CompareCriteriaImpl.java
trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/CompoundCriteriaImpl.java
trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/DeleteImpl.java
trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/ElementImpl.java
trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/ExistsCriteriaImpl.java
trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/FromImpl.java
trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/FunctionImpl.java
trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/GroupByImpl.java
trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/GroupImpl.java
trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/InCriteriaImpl.java
trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/InlineViewImpl.java
trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/InsertImpl.java
trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/IsNullCriteriaImpl.java
trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/JoinImpl.java
trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/LanguageBridgeFactory.java
trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/LanguageFactoryImpl.java
trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/LikeCriteriaImpl.java
trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/LimitImpl.java
trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/LiteralImpl.java
trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/NotCriteriaImpl.java
trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/OrderByImpl.java
trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/OrderByItemImpl.java
trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/ParameterImpl.java
trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/ProcedureImpl.java
trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/QueryCommandImpl.java
trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/QueryImpl.java
trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/ScalarSubqueryImpl.java
trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/SearchedCaseExpressionImpl.java
trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/SelectImpl.java
trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/SelectSymbolImpl.java
trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/SetClauseImpl.java
trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/SetClauseListImpl.java
trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/SetQueryImpl.java
trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/SubqueryCompareCriteriaImpl.java
trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/SubqueryInCriteriaImpl.java
trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/UpdateImpl.java
trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata/ElementImpl.java
trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata/GroupImpl.java
trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata/MetadataObjectImpl.java
trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata/ParameterImpl.java
trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata/ProcedureImpl.java
trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata/RuntimeMetadataImpl.java
trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata/TypeModelImpl.java
trunk/engine/src/main/java/com/metamatrix/dqp/internal/pooling/connector/ConnectionPool.java
trunk/engine/src/main/java/com/metamatrix/dqp/internal/pooling/connector/ConnectionPoolException.java
trunk/engine/src/main/java/com/metamatrix/dqp/internal/pooling/connector/ConnectionWrapper.java
trunk/engine/src/main/java/com/metamatrix/dqp/internal/pooling/connector/PooledConnector.java
trunk/engine/src/main/java/com/metamatrix/dqp/internal/process/Request.java
trunk/engine/src/main/java/com/metamatrix/dqp/internal/process/RequestWorkItem.java
trunk/engine/src/main/java/com/metamatrix/dqp/internal/transaction/TransactionContextImpl.java
trunk/engine/src/main/java/com/metamatrix/dqp/internal/transaction/TransactionProvider.java
trunk/engine/src/main/java/com/metamatrix/dqp/internal/transaction/TransactionServerImpl.java
trunk/engine/src/main/java/com/metamatrix/dqp/message/AtomicRequestMessage.java
trunk/engine/src/main/java/com/metamatrix/dqp/message/AtomicResultsMessage.java
trunk/engine/src/main/java/com/metamatrix/dqp/service/CustomizableTrackingMessage.java
trunk/engine/src/main/java/com/metamatrix/dqp/service/CustomizableTrackingService.java
trunk/engine/src/main/java/com/metamatrix/dqp/service/TrackingService.java
trunk/engine/src/main/java/com/metamatrix/dqp/spi/CommandLoggerSPI.java
trunk/engine/src/main/java/com/metamatrix/dqp/spi/basic/FileCommandLogger.java
trunk/engine/src/main/java/com/metamatrix/dqp/transaction/TransactionServer.java
trunk/engine/src/main/java/com/metamatrix/query/function/source/SystemSource.java
trunk/engine/src/main/java/com/metamatrix/query/rewriter/QueryRewriter.java
trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/impl/FakeConnector.java
trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/impl/FakeProcedureExecution.java
trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/impl/TestConnectorManagerImpl.java
trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/impl/TestConnectorWorkItem.java
trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestAggregateImpl.java
trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestBatchedUpdatesImpl.java
trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestBulkInsertImpl.java
trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestCompareCriteriaImpl.java
trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestCompoundCriteriaImpl.java
trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestElementImpl.java
trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestFromImpl.java
trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestFunctionImpl.java
trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestGroupByImpl.java
trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestInCriteriaImpl.java
trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestInsertImpl.java
trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestJoinImpl.java
trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestLikeCriteriaImpl.java
trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestOrderByImpl.java
trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestParameterImpl.java
trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestProcedureImpl.java
trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestScalarSubqueryImpl.java
trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestSelectImpl.java
trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestSelectSymbolImpl.java
trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestSetQueryImpl.java
trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestSubqueryCompareCriteriaImpl.java
trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/connector/FakeSourceConnectionFactory.java
trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/connector/FakeUserIdentityConnectionFactory.java
trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/connector/TestConnectionPool.java
trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/connector/TestConnectionWrapper.java
trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/connector/TestPerUserPool.java
trunk/engine/src/test/java/com/metamatrix/dqp/service/TestCustomizableTrackingService.java
trunk/engine/src/test/java/com/metamatrix/query/optimizer/TestJoinOptimization.java
trunk/engine/src/test/java/com/metamatrix/query/optimizer/TestOptimizer.java
trunk/engine/src/test/java/com/metamatrix/query/unittest/QueryMetadataInterfaceBuilder.java
trunk/server/src/main/java/com/metamatrix/common/comm/platform/socket/server/LogonImpl.java
trunk/server/src/main/java/com/metamatrix/server/connector/service/ConnectorService.java
trunk/server/src/main/java/com/metamatrix/server/connector/service/ConnectorServiceInterface.java
trunk/server/src/main/java/com/metamatrix/server/dqp/service/PlatformDataService.java
trunk/server/src/main/java/com/metamatrix/server/dqp/service/tracker/DatabaseCommandLogger.java
trunk/test-integration/src/test/java/com/metamatrix/cdk/api/TestTranslationUtility.java
trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/extension/TestSQLConversionVisitor.java
trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/oracle/TestOracleSQLConversionVisitor.java
trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/util/TestJDBCExecutionHelper.java
trunk/test-integration/src/test/java/com/metamatrix/data/language/TestLanguageUtil.java
trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runtime/MockConnector.java
trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runtime/TestElement.java
trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runtime/TestGroup.java
trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runtime/TestMetadataInConnector.java
trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runtime/TestMetadataObject.java
trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runtime/TestParams.java
trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runtime/TestProcedure.java
trunk/test-integration/src/test/java/com/metamatrix/data/visitor/util/TestCollectorVisitor.java
trunk/test-integration/src/test/java/com/metamatrix/data/visitor/util/TestSQLStringVisitor.java
trunk/txn-jbossts/src/test/java/com/metamatrix/xa/arjuna/FakeXAConnection.java
trunk/txn-jbossts/src/test/java/com/metamatrix/xa/arjuna/TestArjunaRecovery.java
Log:
TEIID-164 changing new connector api to be org.teiid
Deleted: trunk/connector-api/src/main/java/com/metamatrix/connector/DataPlugin.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/DataPlugin.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connector-api/src/main/java/com/metamatrix/connector/DataPlugin.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -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.
- */
-
-package com.metamatrix.connector;
-
-import java.util.ResourceBundle;
-import com.metamatrix.core.BundleUtil;
-
-/**
- * CommonPlugin
- * <p>Used here in <code>data</code> to have access to the new
- * logging framework for <code>LogManager</code>.</p>
- */
-public class DataPlugin { // extends Plugin {
-
- /**
- * The plug-in identifier of this plugin
- * (value <code>"com.metamatrix.data"</code>).
- */
- public static final String PLUGIN_ID = "com.metamatrix.data" ; //$NON-NLS-1$
-
- public static final BundleUtil Util = new BundleUtil(PLUGIN_ID,
- PLUGIN_ID + ".i18n", ResourceBundle.getBundle(PLUGIN_ID + ".i18n")); //$NON-NLS-1$ //$NON-NLS-2$
-
-}
Copied: trunk/connector-api/src/main/java/org/teiid/connector/DataPlugin.java (from rev 498, trunk/connector-api/src/main/java/com/metamatrix/connector/DataPlugin.java)
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/connector/DataPlugin.java (rev 0)
+++ trunk/connector-api/src/main/java/org/teiid/connector/DataPlugin.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -0,0 +1,35 @@
+/*
+ * 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.connector;
+
+import java.util.ResourceBundle;
+import com.metamatrix.core.BundleUtil;
+
+public class DataPlugin { // extends Plugin {
+
+ public static final String PLUGIN_ID = "org.teiid.connector" ; //$NON-NLS-1$
+
+ public static final BundleUtil Util = new BundleUtil(PLUGIN_ID,
+ PLUGIN_ID + ".i18n", ResourceBundle.getBundle(PLUGIN_ID + ".i18n")); //$NON-NLS-1$ //$NON-NLS-2$
+
+}
Copied: trunk/connector-api/src/main/java/org/teiid/connector/api (from rev 498, trunk/connector-api/src/main/java/com/metamatrix/connector/api)
Modified: trunk/connector-api/src/main/java/org/teiid/connector/api/Connection.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/api/Connection.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/api/Connection.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,10 +20,10 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.api;
+package org.teiid.connector.api;
-import com.metamatrix.connector.language.ICommand;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
+import org.teiid.connector.language.ICommand;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
/**
* <p>Represents a connection to this connector. A connection will be obtained
Modified: trunk/connector-api/src/main/java/org/teiid/connector/api/Connector.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/api/Connector.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/api/Connector.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.api;
+package org.teiid.connector.api;
/**
Modified: trunk/connector-api/src/main/java/org/teiid/connector/api/ConnectorAnnotations.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/api/ConnectorAnnotations.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/api/ConnectorAnnotations.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,15 +20,16 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.api;
+package org.teiid.connector.api;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import com.metamatrix.connector.internal.ConnectorPropertyNames;
+import org.teiid.connector.internal.ConnectorPropertyNames;
+
public class ConnectorAnnotations {
/**
Modified: trunk/connector-api/src/main/java/org/teiid/connector/api/ConnectorCapabilities.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/api/ConnectorCapabilities.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/api/ConnectorCapabilities.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,13 +20,14 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.api;
+package org.teiid.connector.api;
import java.util.List;
-import com.metamatrix.connector.language.IBatchedUpdates;
-import com.metamatrix.connector.language.IBulkInsert;
+import org.teiid.connector.language.IBatchedUpdates;
+import org.teiid.connector.language.IBulkInsert;
+
/**
* Allows a connector to specify the capabilities that a connector
* supports.
Modified: trunk/connector-api/src/main/java/org/teiid/connector/api/ConnectorEnvironment.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/api/ConnectorEnvironment.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/api/ConnectorEnvironment.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,13 +20,14 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.api;
+package org.teiid.connector.api;
import java.util.Properties;
import java.util.concurrent.Executor;
-import com.metamatrix.connector.language.ILanguageFactory;
+import org.teiid.connector.language.ILanguageFactory;
+
/**
* The environment provided to a connector by the Connector Manager. The
* environment provides access to external resources the Connector writer may
Modified: trunk/connector-api/src/main/java/org/teiid/connector/api/ConnectorException.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/api/ConnectorException.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/api/ConnectorException.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.api;
+package org.teiid.connector.api;
import com.metamatrix.core.MetaMatrixCoreException;
Modified: trunk/connector-api/src/main/java/org/teiid/connector/api/ConnectorIdentity.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/api/ConnectorIdentity.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/api/ConnectorIdentity.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.api;
+package org.teiid.connector.api;
/**
Modified: trunk/connector-api/src/main/java/org/teiid/connector/api/ConnectorLogger.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/api/ConnectorLogger.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/api/ConnectorLogger.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.api;
+package org.teiid.connector.api;
/**
* Provide access to write messages to the MetaMatrix logs.
Modified: trunk/connector-api/src/main/java/org/teiid/connector/api/CredentialMap.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/api/CredentialMap.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/api/CredentialMap.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.api;
+package org.teiid.connector.api;
import java.io.Serializable;
import java.util.HashMap;
@@ -29,7 +29,8 @@
import java.util.Map;
import java.util.Set;
-import com.metamatrix.connector.DataPlugin;
+import org.teiid.connector.DataPlugin;
+
import com.metamatrix.core.util.StringUtil;
/**
Modified: trunk/connector-api/src/main/java/org/teiid/connector/api/DataNotAvailableException.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/api/DataNotAvailableException.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/api/DataNotAvailableException.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA.
*/
-package com.metamatrix.connector.api;
+package org.teiid.connector.api;
/**
* Used by asynch connectors to indicate data is not available
Modified: trunk/connector-api/src/main/java/org/teiid/connector/api/Execution.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/api/Execution.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/api/Execution.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.api;
+package org.teiid.connector.api;
/**
* An execution represents the state and lifecycle for a particular
Modified: trunk/connector-api/src/main/java/org/teiid/connector/api/ExecutionContext.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/api/ExecutionContext.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/api/ExecutionContext.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.api;
+package org.teiid.connector.api;
import java.io.Serializable;
Modified: trunk/connector-api/src/main/java/org/teiid/connector/api/MappedUserIdentity.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/api/MappedUserIdentity.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/api/MappedUserIdentity.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.api;
+package org.teiid.connector.api;
/**
Modified: trunk/connector-api/src/main/java/org/teiid/connector/api/ProcedureExecution.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/api/ProcedureExecution.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/api/ProcedureExecution.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,9 +20,9 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.api;
+package org.teiid.connector.api;
-import com.metamatrix.connector.language.IParameter;
+import org.teiid.connector.language.IParameter;
/**
* The procedure execution represents the case where a connector can
Modified: trunk/connector-api/src/main/java/org/teiid/connector/api/ResultSetExecution.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/api/ResultSetExecution.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/api/ResultSetExecution.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.api;
+package org.teiid.connector.api;
import java.util.List;
Modified: trunk/connector-api/src/main/java/org/teiid/connector/api/SingleIdentity.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/api/SingleIdentity.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/api/SingleIdentity.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.api;
+package org.teiid.connector.api;
/**
Modified: trunk/connector-api/src/main/java/org/teiid/connector/api/SourceSystemFunctions.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/api/SourceSystemFunctions.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/api/SourceSystemFunctions.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.api;
+package org.teiid.connector.api;
/**
* Constants for all the possible standard system push down functions.
Modified: trunk/connector-api/src/main/java/org/teiid/connector/api/TypeFacility.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/api/TypeFacility.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/api/TypeFacility.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.api;
+package org.teiid.connector.api;
import java.util.Calendar;
import java.util.TimeZone;
Modified: trunk/connector-api/src/main/java/org/teiid/connector/api/UpdateExecution.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/api/UpdateExecution.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/api/UpdateExecution.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.api;
+package org.teiid.connector.api;
/**
Modified: trunk/connector-api/src/main/java/org/teiid/connector/api/ValueTranslator.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/api/ValueTranslator.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/api/ValueTranslator.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -22,7 +22,7 @@
/*
*/
-package com.metamatrix.connector.api;
+package org.teiid.connector.api;
/**
Copied: trunk/connector-api/src/main/java/org/teiid/connector/basic (from rev 498, trunk/connector-api/src/main/java/com/metamatrix/connector/basic)
Modified: trunk/connector-api/src/main/java/org/teiid/connector/basic/BasicConnection.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/basic/BasicConnection.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/basic/BasicConnection.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,21 +20,21 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.basic;
+package org.teiid.connector.basic;
-import com.metamatrix.connector.api.Connection;
-import com.metamatrix.connector.api.ConnectorCapabilities;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ConnectorIdentity;
-import com.metamatrix.connector.api.Execution;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.api.ProcedureExecution;
-import com.metamatrix.connector.api.ResultSetExecution;
-import com.metamatrix.connector.api.UpdateExecution;
-import com.metamatrix.connector.language.ICommand;
-import com.metamatrix.connector.language.IProcedure;
-import com.metamatrix.connector.language.IQueryCommand;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
+import org.teiid.connector.api.Connection;
+import org.teiid.connector.api.ConnectorCapabilities;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorIdentity;
+import org.teiid.connector.api.Execution;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.api.ProcedureExecution;
+import org.teiid.connector.api.ResultSetExecution;
+import org.teiid.connector.api.UpdateExecution;
+import org.teiid.connector.language.ICommand;
+import org.teiid.connector.language.IProcedure;
+import org.teiid.connector.language.IQueryCommand;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
/**
* Provides a default implementation of a {@link PoolAwareConnection} for a Connector
Modified: trunk/connector-api/src/main/java/org/teiid/connector/basic/BasicConnector.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/basic/BasicConnector.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/basic/BasicConnector.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -1,13 +1,13 @@
-package com.metamatrix.connector.basic;
+package org.teiid.connector.basic;
-import com.metamatrix.connector.DataPlugin;
-import com.metamatrix.connector.api.Connector;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ConnectorIdentity;
-import com.metamatrix.connector.api.CredentialMap;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.api.SingleIdentity;
-import com.metamatrix.connector.api.MappedUserIdentity;
+import org.teiid.connector.DataPlugin;
+import org.teiid.connector.api.Connector;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorIdentity;
+import org.teiid.connector.api.CredentialMap;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.api.MappedUserIdentity;
+import org.teiid.connector.api.SingleIdentity;
public abstract class BasicConnector implements Connector {
Modified: trunk/connector-api/src/main/java/org/teiid/connector/basic/BasicConnectorCapabilities.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/basic/BasicConnectorCapabilities.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/basic/BasicConnectorCapabilities.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,12 +20,13 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.basic;
+package org.teiid.connector.basic;
import java.util.List;
-import com.metamatrix.connector.api.ConnectorCapabilities;
+import org.teiid.connector.api.ConnectorCapabilities;
+
/**
* This class is a base implementation of the ConnectorCapabilities interface.
* It is implemented to return false for all capabilities. Subclass this base
@@ -50,7 +51,7 @@
}
/**
- * @see com.metamatrix.connector.api.ConnectorCapabilities#supportsSelectLiterals()
+ * @see org.teiid.connector.api.ConnectorCapabilities#supportsSelectLiterals()
* @since 4.2
*/
public boolean supportsSelectLiterals() {
@@ -340,7 +341,7 @@
/**
* Return null to indicate no functions are supported.
* @return null
- * @see com.metamatrix.connector.api.ConnectorCapabilities#getSupportedFunctions()
+ * @see org.teiid.connector.api.ConnectorCapabilities#getSupportedFunctions()
*/
public List getSupportedFunctions() {
return null;
@@ -351,7 +352,7 @@
}
/**
- * @see com.metamatrix.connector.api.ConnectorCapabilities#supportsUnions()
+ * @see org.teiid.connector.api.ConnectorCapabilities#supportsUnions()
* @since 4.2
*/
public boolean supportsUnions() {
@@ -359,7 +360,7 @@
}
/**
- * @see com.metamatrix.connector.api.ConnectorCapabilities#getMaxInCriteriaSize()
+ * @see org.teiid.connector.api.ConnectorCapabilities#getMaxInCriteriaSize()
* @since 4.2
*/
public int getMaxInCriteriaSize() {
@@ -367,7 +368,7 @@
}
/**
- * @see com.metamatrix.connector.api.ConnectorCapabilities#supportsFunctionsInGroupBy()
+ * @see org.teiid.connector.api.ConnectorCapabilities#supportsFunctionsInGroupBy()
* @since 5.0
*/
public boolean supportsFunctionsInGroupBy() {
@@ -383,28 +384,28 @@
}
/**
- * @see com.metamatrix.connector.api.ConnectorCapabilities#getMaxFromGroups()
+ * @see org.teiid.connector.api.ConnectorCapabilities#getMaxFromGroups()
*/
public int getMaxFromGroups() {
return -1; //-1 indicates no max
}
/**
- * @see com.metamatrix.connector.api.ConnectorCapabilities#supportsExcept()
+ * @see org.teiid.connector.api.ConnectorCapabilities#supportsExcept()
*/
public boolean supportsExcept() {
return false;
}
/**
- * @see com.metamatrix.connector.api.ConnectorCapabilities#supportsIntersect()
+ * @see org.teiid.connector.api.ConnectorCapabilities#supportsIntersect()
*/
public boolean supportsIntersect() {
return false;
}
/**
- * @see com.metamatrix.connector.api.ConnectorCapabilities#supportsSetQueryOrderBy()
+ * @see org.teiid.connector.api.ConnectorCapabilities#supportsSetQueryOrderBy()
*/
public boolean supportsSetQueryOrderBy() {
return false;
Modified: trunk/connector-api/src/main/java/org/teiid/connector/basic/BasicExecution.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/basic/BasicExecution.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/basic/BasicExecution.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,9 +20,9 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.basic;
+package org.teiid.connector.basic;
-import com.metamatrix.connector.api.Execution;
+import org.teiid.connector.api.Execution;
public abstract class BasicExecution implements Execution {
Modified: trunk/connector-api/src/main/java/org/teiid/connector/basic/BasicValueTranslator.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/basic/BasicValueTranslator.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/basic/BasicValueTranslator.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -22,13 +22,13 @@
/*
*/
-package com.metamatrix.connector.basic;
+package org.teiid.connector.basic;
-import com.metamatrix.connector.DataPlugin;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.api.TypeFacility;
-import com.metamatrix.connector.api.ValueTranslator;
+import org.teiid.connector.DataPlugin;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.api.TypeFacility;
+import org.teiid.connector.api.ValueTranslator;
/**
* BasicValueTranslator can translate between types using the standard {@link TypeFacility}
Copied: trunk/connector-api/src/main/java/org/teiid/connector/internal (from rev 498, trunk/connector-api/src/main/java/com/metamatrix/connector/internal)
Modified: trunk/connector-api/src/main/java/org/teiid/connector/internal/ConnectorPropertyNames.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/internal/ConnectorPropertyNames.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/internal/ConnectorPropertyNames.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.internal;
+package org.teiid.connector.internal;
public class ConnectorPropertyNames {
Copied: trunk/connector-api/src/main/java/org/teiid/connector/language (from rev 498, trunk/connector-api/src/main/java/com/metamatrix/connector/language)
Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IAggregate.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IAggregate.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/language/IAggregate.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.language;
+package org.teiid.connector.language;
/**
* Represents an expression in the SELECT clause. Anything
Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IBaseInCriteria.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IBaseInCriteria.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/language/IBaseInCriteria.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.language;
+package org.teiid.connector.language;
/**
*/
Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IBatchedUpdates.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IBatchedUpdates.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/language/IBatchedUpdates.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.language;
+package org.teiid.connector.language;
import java.util.List;
Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IBulkInsert.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IBulkInsert.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/language/IBulkInsert.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.language;
+package org.teiid.connector.language;
import java.util.List;
Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/ICommand.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/language/ICommand.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/language/ICommand.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.language;
+package org.teiid.connector.language;
/**
* Represents a command in the language objects. A command is an instruction of
Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/ICompareCriteria.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/language/ICompareCriteria.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/language/ICompareCriteria.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.language;
+package org.teiid.connector.language;
/**
* Represents a comparison between two expressions connected with
Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/ICompoundCriteria.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/language/ICompoundCriteria.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/language/ICompoundCriteria.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.language;
+package org.teiid.connector.language;
import java.util.List;
Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/ICriteria.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/language/ICriteria.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/language/ICriteria.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.language;
+package org.teiid.connector.language;
/**
* Represents a criteria in the language objects.
Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IDelete.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IDelete.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/language/IDelete.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.language;
+package org.teiid.connector.language;
/**
* Represents a DELETE command in the language objects.
Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IElement.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IElement.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/language/IElement.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,9 +20,9 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.language;
+package org.teiid.connector.language;
-import com.metamatrix.connector.metadata.runtime.Element;
+import org.teiid.connector.metadata.runtime.Element;
/**
* Represents an element in the language. An example of an element
Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IExistsCriteria.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IExistsCriteria.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/language/IExistsCriteria.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.language;
+package org.teiid.connector.language;
/**
* Represents an EXISTS criteria that checks whether any results would be
Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IExpression.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IExpression.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/language/IExpression.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.language;
+package org.teiid.connector.language;
/**
* Represents an expression in the language. Subinterfaces define specific
Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IFrom.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IFrom.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/language/IFrom.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.language;
+package org.teiid.connector.language;
import java.util.List;
Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IFromItem.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IFromItem.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/language/IFromItem.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.language;
+package org.teiid.connector.language;
/**
* Represents an item in the FROM clause - typically this is either a
Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IFunction.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IFunction.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/language/IFunction.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.language;
+package org.teiid.connector.language;
import java.util.List;
Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IGroup.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IGroup.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/language/IGroup.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,9 +20,9 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.language;
+package org.teiid.connector.language;
-import com.metamatrix.connector.metadata.runtime.Group;
+import org.teiid.connector.metadata.runtime.Group;
/**
* Represents a group in the language objects. An example of a group would
Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IGroupBy.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IGroupBy.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/language/IGroupBy.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.language;
+package org.teiid.connector.language;
import java.util.List;
Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IInCriteria.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IInCriteria.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/language/IInCriteria.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.language;
+package org.teiid.connector.language;
import java.util.List;
Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IInlineView.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IInlineView.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/language/IInlineView.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.language;
+package org.teiid.connector.language;
/**
* An inline view represents a subquery in the FROM clause that defines a
Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IInsert.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IInsert.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/language/IInsert.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.language;
+package org.teiid.connector.language;
import java.util.List;
Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IIsNullCriteria.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IIsNullCriteria.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/language/IIsNullCriteria.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.language;
+package org.teiid.connector.language;
/**
* Represents an IS NULL criteria.
Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IJoin.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IJoin.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/language/IJoin.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.language;
+package org.teiid.connector.language;
import java.util.List;
Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/ILanguageFactory.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/language/ILanguageFactory.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/language/ILanguageFactory.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,17 +20,18 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.language;
+package org.teiid.connector.language;
import java.util.List;
-import com.metamatrix.connector.language.ICompoundCriteria.Operator;
-import com.metamatrix.connector.language.IParameter.Direction;
-import com.metamatrix.connector.metadata.runtime.Element;
-import com.metamatrix.connector.metadata.runtime.Group;
-import com.metamatrix.connector.metadata.runtime.Parameter;
-import com.metamatrix.connector.metadata.runtime.Procedure;
+import org.teiid.connector.language.ICompoundCriteria.Operator;
+import org.teiid.connector.language.IParameter.Direction;
+import org.teiid.connector.metadata.runtime.Element;
+import org.teiid.connector.metadata.runtime.Group;
+import org.teiid.connector.metadata.runtime.Parameter;
+import org.teiid.connector.metadata.runtime.Procedure;
+
/**
* Factory for the construction of language objects that implement the language interfaces.
* This factory is provided by the connector environment and can be used in modifying the language
Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/ILanguageObject.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/language/ILanguageObject.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/language/ILanguageObject.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,9 +20,9 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.language;
+package org.teiid.connector.language;
-import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor;
+import org.teiid.connector.visitor.framework.LanguageObjectVisitor;
/**
* Root interface for all language object interfaces.
Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/ILikeCriteria.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/language/ILikeCriteria.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/language/ILikeCriteria.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.language;
+package org.teiid.connector.language;
/**
* Represents a LIKE criteria in the language.
Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/ILimit.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/language/ILimit.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/language/ILimit.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.language;
+package org.teiid.connector.language;
/**
Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/ILiteral.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/language/ILiteral.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/language/ILiteral.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.language;
+package org.teiid.connector.language;
/**
* Represents a literal value that is used in
Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/ILogicalCriteria.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/language/ILogicalCriteria.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/language/ILogicalCriteria.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.language;
+package org.teiid.connector.language;
/**
* Represents a logical criteria, which typically is used to bind
Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IMetadataReference.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IMetadataReference.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/language/IMetadataReference.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,9 +20,9 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.language;
+package org.teiid.connector.language;
-import com.metamatrix.connector.metadata.runtime.MetadataObject;
+import org.teiid.connector.metadata.runtime.MetadataObject;
/**
* This interface is used to mark language objects as having a
Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/INotCriteria.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/language/INotCriteria.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/language/INotCriteria.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.language;
+package org.teiid.connector.language;
/**
* Represents a NOT criteria, which is wrapped around another criteria.
Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IOrderBy.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IOrderBy.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/language/IOrderBy.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.language;
+package org.teiid.connector.language;
import java.util.List;
Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IOrderByItem.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IOrderByItem.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/language/IOrderByItem.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.language;
+package org.teiid.connector.language;
/**
* Represents a single item in the ORDER BY clause.
Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IParameter.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IParameter.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/language/IParameter.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,9 +20,9 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.language;
+package org.teiid.connector.language;
-import com.metamatrix.connector.metadata.runtime.Parameter;
+import org.teiid.connector.metadata.runtime.Parameter;
/**
* Represents an execution parameter.
Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IPredicateCriteria.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IPredicateCriteria.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/language/IPredicateCriteria.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.language;
+package org.teiid.connector.language;
/**
* Represents a criteria that can occur at the leaf of a tree of
Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IProcedure.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IProcedure.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/language/IProcedure.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,12 +20,13 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.language;
+package org.teiid.connector.language;
import java.util.List;
-import com.metamatrix.connector.metadata.runtime.Procedure;
+import org.teiid.connector.metadata.runtime.Procedure;
+
/**
* Represents a procedural execution (such as a stored procedure).
*/
Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IQuery.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IQuery.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/language/IQuery.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.language;
+package org.teiid.connector.language;
/**
* Represents a SELECT query in the language objects.
Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IQueryCommand.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IQueryCommand.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/language/IQueryCommand.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.language;
+package org.teiid.connector.language;
public interface IQueryCommand extends ICommand {
Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IScalarSubquery.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IScalarSubquery.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/language/IScalarSubquery.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.language;
+package org.teiid.connector.language;
/**
* Represents a scalar subquery. That is, a query that is evaluated as a scalar
Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/ISearchedCaseExpression.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/language/ISearchedCaseExpression.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/language/ISearchedCaseExpression.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.language;
+package org.teiid.connector.language;
/**
* Represents a non-searched CASE expression:
Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/ISelect.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/language/ISelect.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/language/ISelect.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.language;
+package org.teiid.connector.language;
import java.util.List;
Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/ISelectSymbol.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/language/ISelectSymbol.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/language/ISelectSymbol.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.language;
+package org.teiid.connector.language;
/**
* Represents an item in the SELECT clause. Typically the SELECT clause
Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/ISetClause.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/language/ISetClause.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/language/ISetClause.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.language;
+package org.teiid.connector.language;
public interface ISetClause extends ILanguageObject {
Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/ISetClauseList.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/language/ISetClauseList.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/language/ISetClauseList.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.language;
+package org.teiid.connector.language;
import java.util.List;
Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/ISetQuery.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/language/ISetQuery.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/language/ISetQuery.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.language;
+package org.teiid.connector.language;
public interface ISetQuery extends
IQueryCommand {
Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/ISubqueryCompareCriteria.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/language/ISubqueryCompareCriteria.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/language/ISubqueryCompareCriteria.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.language;
+package org.teiid.connector.language;
/**
* Represents a quantified comparison criteria. This criteria has an expression on the left,
Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/ISubqueryContainer.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/language/ISubqueryContainer.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/language/ISubqueryContainer.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.language;
+package org.teiid.connector.language;
/**
* This is a marker interface for language interfaces that contain a subquery.
Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/ISubqueryInCriteria.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/language/ISubqueryInCriteria.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/language/ISubqueryInCriteria.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.language;
+package org.teiid.connector.language;
/**
* Represents an IN criteria that uses a subquery on the right side rather than a
Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IUpdate.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IUpdate.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/language/IUpdate.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.language;
+package org.teiid.connector.language;
/**
Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/LanguageUtil.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/language/LanguageUtil.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/language/LanguageUtil.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,12 +20,13 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.language;
+package org.teiid.connector.language;
import java.util.*;
-import com.metamatrix.connector.language.ICompoundCriteria.Operator;
+import org.teiid.connector.language.ICompoundCriteria.Operator;
+
/**
* Helpful utility methods to work with language interfaces.
*/
Copied: trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime (from rev 498, trunk/connector-api/src/main/java/com/metamatrix/connector/metadata/runtime)
Modified: trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/Element.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/metadata/runtime/Element.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/Element.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -24,9 +24,9 @@
* Date: Aug 18, 2003
* Time: 11:58:05 AM
*/
-package com.metamatrix.connector.metadata.runtime;
+package org.teiid.connector.metadata.runtime;
-import com.metamatrix.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorException;
/**
* Represents an element, such as a column, in runtime metadata.
Modified: trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/Group.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/metadata/runtime/Group.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/Group.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,12 +20,13 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.metadata.runtime;
+package org.teiid.connector.metadata.runtime;
import java.util.List;
-import com.metamatrix.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorException;
+
/**
* Represents a group, such as a table, in the runtime metadata.
*/
Modified: trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/MetadataObject.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/metadata/runtime/MetadataObject.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/MetadataObject.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,12 +20,13 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.metadata.runtime;
+package org.teiid.connector.metadata.runtime;
import java.util.Properties;
-import com.metamatrix.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorException;
+
/**
* Represents a runtime metadata object.
*/
Modified: trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/Parameter.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/metadata/runtime/Parameter.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/Parameter.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,12 +20,13 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.metadata.runtime;
+package org.teiid.connector.metadata.runtime;
import java.util.List;
-import com.metamatrix.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorException;
+
/**
* Represents a procedure parameter in the runtime metadata.
*/
Modified: trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/Procedure.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/metadata/runtime/Procedure.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/Procedure.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.metadata.runtime;
+package org.teiid.connector.metadata.runtime;
import java.util.List;
Modified: trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/RuntimeMetadata.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/metadata/runtime/RuntimeMetadata.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/RuntimeMetadata.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,9 +20,9 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.metadata.runtime;
+package org.teiid.connector.metadata.runtime;
-import com.metamatrix.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorException;
/**
* Helper methods that can be used to access runtime metadata.
Modified: trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/TypeModel.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/metadata/runtime/TypeModel.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/TypeModel.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,9 +20,9 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.metadata.runtime;
+package org.teiid.connector.metadata.runtime;
-import com.metamatrix.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorException;
/**
Copied: trunk/connector-api/src/main/java/org/teiid/connector/visitor/framework (from rev 498, trunk/connector-api/src/main/java/com/metamatrix/connector/visitor/framework)
Modified: trunk/connector-api/src/main/java/org/teiid/connector/visitor/framework/AbstractLanguageVisitor.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/visitor/framework/AbstractLanguageVisitor.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/visitor/framework/AbstractLanguageVisitor.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,48 +20,49 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.visitor.framework;
+package org.teiid.connector.visitor.framework;
import java.util.Collection;
-import com.metamatrix.connector.language.IAggregate;
-import com.metamatrix.connector.language.IBatchedUpdates;
-import com.metamatrix.connector.language.IBulkInsert;
-import com.metamatrix.connector.language.ICompareCriteria;
-import com.metamatrix.connector.language.ICompoundCriteria;
-import com.metamatrix.connector.language.IDelete;
-import com.metamatrix.connector.language.IElement;
-import com.metamatrix.connector.language.IExistsCriteria;
-import com.metamatrix.connector.language.IFrom;
-import com.metamatrix.connector.language.IFunction;
-import com.metamatrix.connector.language.IGroup;
-import com.metamatrix.connector.language.IGroupBy;
-import com.metamatrix.connector.language.IInCriteria;
-import com.metamatrix.connector.language.IInlineView;
-import com.metamatrix.connector.language.IInsert;
-import com.metamatrix.connector.language.IIsNullCriteria;
-import com.metamatrix.connector.language.IJoin;
-import com.metamatrix.connector.language.ILanguageObject;
-import com.metamatrix.connector.language.ILikeCriteria;
-import com.metamatrix.connector.language.ILimit;
-import com.metamatrix.connector.language.ILiteral;
-import com.metamatrix.connector.language.INotCriteria;
-import com.metamatrix.connector.language.IOrderBy;
-import com.metamatrix.connector.language.IOrderByItem;
-import com.metamatrix.connector.language.IParameter;
-import com.metamatrix.connector.language.IProcedure;
-import com.metamatrix.connector.language.IQuery;
-import com.metamatrix.connector.language.IScalarSubquery;
-import com.metamatrix.connector.language.ISearchedCaseExpression;
-import com.metamatrix.connector.language.ISelect;
-import com.metamatrix.connector.language.ISelectSymbol;
-import com.metamatrix.connector.language.ISetClause;
-import com.metamatrix.connector.language.ISetClauseList;
-import com.metamatrix.connector.language.ISetQuery;
-import com.metamatrix.connector.language.ISubqueryCompareCriteria;
-import com.metamatrix.connector.language.ISubqueryInCriteria;
-import com.metamatrix.connector.language.IUpdate;
+import org.teiid.connector.language.IAggregate;
+import org.teiid.connector.language.IBatchedUpdates;
+import org.teiid.connector.language.IBulkInsert;
+import org.teiid.connector.language.ICompareCriteria;
+import org.teiid.connector.language.ICompoundCriteria;
+import org.teiid.connector.language.IDelete;
+import org.teiid.connector.language.IElement;
+import org.teiid.connector.language.IExistsCriteria;
+import org.teiid.connector.language.IFrom;
+import org.teiid.connector.language.IFunction;
+import org.teiid.connector.language.IGroup;
+import org.teiid.connector.language.IGroupBy;
+import org.teiid.connector.language.IInCriteria;
+import org.teiid.connector.language.IInlineView;
+import org.teiid.connector.language.IInsert;
+import org.teiid.connector.language.IIsNullCriteria;
+import org.teiid.connector.language.IJoin;
+import org.teiid.connector.language.ILanguageObject;
+import org.teiid.connector.language.ILikeCriteria;
+import org.teiid.connector.language.ILimit;
+import org.teiid.connector.language.ILiteral;
+import org.teiid.connector.language.INotCriteria;
+import org.teiid.connector.language.IOrderBy;
+import org.teiid.connector.language.IOrderByItem;
+import org.teiid.connector.language.IParameter;
+import org.teiid.connector.language.IProcedure;
+import org.teiid.connector.language.IQuery;
+import org.teiid.connector.language.IScalarSubquery;
+import org.teiid.connector.language.ISearchedCaseExpression;
+import org.teiid.connector.language.ISelect;
+import org.teiid.connector.language.ISelectSymbol;
+import org.teiid.connector.language.ISetClause;
+import org.teiid.connector.language.ISetClauseList;
+import org.teiid.connector.language.ISetQuery;
+import org.teiid.connector.language.ISubqueryCompareCriteria;
+import org.teiid.connector.language.ISubqueryInCriteria;
+import org.teiid.connector.language.IUpdate;
+
/**
* Visitor that visits an instance of ILanguageObject and performs an operation
* on that instance. The visit() methods of this Visitor can be selectively
Modified: trunk/connector-api/src/main/java/org/teiid/connector/visitor/framework/DelegatingHierarchyVisitor.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/visitor/framework/DelegatingHierarchyVisitor.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/visitor/framework/DelegatingHierarchyVisitor.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,45 +20,45 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.visitor.framework;
+package org.teiid.connector.visitor.framework;
-import com.metamatrix.connector.DataPlugin;
-import com.metamatrix.connector.language.IAggregate;
-import com.metamatrix.connector.language.IBatchedUpdates;
-import com.metamatrix.connector.language.ICompareCriteria;
-import com.metamatrix.connector.language.ICompoundCriteria;
-import com.metamatrix.connector.language.IDelete;
-import com.metamatrix.connector.language.IElement;
-import com.metamatrix.connector.language.IExistsCriteria;
-import com.metamatrix.connector.language.IFrom;
-import com.metamatrix.connector.language.IFunction;
-import com.metamatrix.connector.language.IGroup;
-import com.metamatrix.connector.language.IGroupBy;
-import com.metamatrix.connector.language.IInCriteria;
-import com.metamatrix.connector.language.IInlineView;
-import com.metamatrix.connector.language.IInsert;
-import com.metamatrix.connector.language.IIsNullCriteria;
-import com.metamatrix.connector.language.IJoin;
-import com.metamatrix.connector.language.ILanguageObject;
-import com.metamatrix.connector.language.ILikeCriteria;
-import com.metamatrix.connector.language.ILimit;
-import com.metamatrix.connector.language.ILiteral;
-import com.metamatrix.connector.language.INotCriteria;
-import com.metamatrix.connector.language.IOrderBy;
-import com.metamatrix.connector.language.IOrderByItem;
-import com.metamatrix.connector.language.IParameter;
-import com.metamatrix.connector.language.IProcedure;
-import com.metamatrix.connector.language.IQuery;
-import com.metamatrix.connector.language.IScalarSubquery;
-import com.metamatrix.connector.language.ISearchedCaseExpression;
-import com.metamatrix.connector.language.ISelect;
-import com.metamatrix.connector.language.ISelectSymbol;
-import com.metamatrix.connector.language.ISetClause;
-import com.metamatrix.connector.language.ISetClauseList;
-import com.metamatrix.connector.language.ISetQuery;
-import com.metamatrix.connector.language.ISubqueryCompareCriteria;
-import com.metamatrix.connector.language.ISubqueryInCriteria;
-import com.metamatrix.connector.language.IUpdate;
+import org.teiid.connector.DataPlugin;
+import org.teiid.connector.language.IAggregate;
+import org.teiid.connector.language.IBatchedUpdates;
+import org.teiid.connector.language.ICompareCriteria;
+import org.teiid.connector.language.ICompoundCriteria;
+import org.teiid.connector.language.IDelete;
+import org.teiid.connector.language.IElement;
+import org.teiid.connector.language.IExistsCriteria;
+import org.teiid.connector.language.IFrom;
+import org.teiid.connector.language.IFunction;
+import org.teiid.connector.language.IGroup;
+import org.teiid.connector.language.IGroupBy;
+import org.teiid.connector.language.IInCriteria;
+import org.teiid.connector.language.IInlineView;
+import org.teiid.connector.language.IInsert;
+import org.teiid.connector.language.IIsNullCriteria;
+import org.teiid.connector.language.IJoin;
+import org.teiid.connector.language.ILanguageObject;
+import org.teiid.connector.language.ILikeCriteria;
+import org.teiid.connector.language.ILimit;
+import org.teiid.connector.language.ILiteral;
+import org.teiid.connector.language.INotCriteria;
+import org.teiid.connector.language.IOrderBy;
+import org.teiid.connector.language.IOrderByItem;
+import org.teiid.connector.language.IParameter;
+import org.teiid.connector.language.IProcedure;
+import org.teiid.connector.language.IQuery;
+import org.teiid.connector.language.IScalarSubquery;
+import org.teiid.connector.language.ISearchedCaseExpression;
+import org.teiid.connector.language.ISelect;
+import org.teiid.connector.language.ISelectSymbol;
+import org.teiid.connector.language.ISetClause;
+import org.teiid.connector.language.ISetClauseList;
+import org.teiid.connector.language.ISetQuery;
+import org.teiid.connector.language.ISubqueryCompareCriteria;
+import org.teiid.connector.language.ISubqueryInCriteria;
+import org.teiid.connector.language.IUpdate;
/**
* Delegates pre- and post-processing for each node in the hierarchy to
Deleted: trunk/connector-api/src/main/java/org/teiid/connector/visitor/framework/HierarchyVisitor.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/visitor/framework/HierarchyVisitor.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/visitor/framework/HierarchyVisitor.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -1,242 +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 com.metamatrix.connector.visitor.framework;
-
-import com.metamatrix.connector.language.IAggregate;
-import com.metamatrix.connector.language.IBatchedUpdates;
-import com.metamatrix.connector.language.ICompareCriteria;
-import com.metamatrix.connector.language.ICompoundCriteria;
-import com.metamatrix.connector.language.IDelete;
-import com.metamatrix.connector.language.IElement;
-import com.metamatrix.connector.language.IExistsCriteria;
-import com.metamatrix.connector.language.IFrom;
-import com.metamatrix.connector.language.IFunction;
-import com.metamatrix.connector.language.IGroup;
-import com.metamatrix.connector.language.IGroupBy;
-import com.metamatrix.connector.language.IInCriteria;
-import com.metamatrix.connector.language.IInlineView;
-import com.metamatrix.connector.language.IInsert;
-import com.metamatrix.connector.language.IIsNullCriteria;
-import com.metamatrix.connector.language.IJoin;
-import com.metamatrix.connector.language.ILikeCriteria;
-import com.metamatrix.connector.language.ILiteral;
-import com.metamatrix.connector.language.INotCriteria;
-import com.metamatrix.connector.language.IOrderBy;
-import com.metamatrix.connector.language.IOrderByItem;
-import com.metamatrix.connector.language.IParameter;
-import com.metamatrix.connector.language.IProcedure;
-import com.metamatrix.connector.language.IQuery;
-import com.metamatrix.connector.language.IScalarSubquery;
-import com.metamatrix.connector.language.ISearchedCaseExpression;
-import com.metamatrix.connector.language.ISelect;
-import com.metamatrix.connector.language.ISelectSymbol;
-import com.metamatrix.connector.language.ISetClause;
-import com.metamatrix.connector.language.ISetClauseList;
-import com.metamatrix.connector.language.ISetQuery;
-import com.metamatrix.connector.language.ISubqueryCompareCriteria;
-import com.metamatrix.connector.language.ISubqueryInCriteria;
-import com.metamatrix.connector.language.IUpdate;
-
-/**
- * Visits each node in a hierarchy of ILanguageObjects. The default
- * implementation of each visit() method is simply to visit the children of a
- * given ILanguageObject, if any exist, with this HierarchyVisitor (without
- * performing any actions on the node). A subclass can selectively override
- * visit() methods to delegate the actions performed on a node to another
- * visitor by calling that Visitor's visit() method. This implementation makes
- * no guarantees about the order in which the children of an ILanguageObject are
- * visited.
- * @see DelegatingHierarchyVisitor
- */
-public abstract class HierarchyVisitor extends AbstractLanguageVisitor {
-
- public HierarchyVisitor() {
- }
-
- public void visit(IAggregate obj) {
- visitNode(obj.getExpression());
- }
-
- public void visit(IBatchedUpdates obj) {
- visitNodes(obj.getUpdateCommands());
- }
-
- public void visit(ICompareCriteria obj) {
- visitNode(obj.getLeftExpression());
- visitNode(obj.getRightExpression());
- }
-
- public void visit(ICompoundCriteria obj) {
- visitNodes(obj.getCriteria());
- }
-
- public void visit(IDelete obj) {
- visitNode(obj.getGroup());
- visitNode(obj.getCriteria());
- }
-
- public void visit(IElement obj) {
- }
-
- public void visit(IProcedure obj) {
- visitNodes(obj.getParameters());
- }
-
- public void visit(IExistsCriteria obj) {
- visitNode(obj.getQuery());
- }
-
- public void visit(IFrom obj) {
- visitNodes(obj.getItems());
- }
-
- public void visit(IFunction obj) {
- visitNodes(obj.getParameters());
- }
-
- public void visit(IGroup obj) {
- }
-
-// public void visit(IGroup obj) {
-// }
-
- public void visit(IGroupBy obj) {
- visitNodes(obj.getElements());
- }
-
- public void visit(IInCriteria obj) {
- visitNode(obj.getLeftExpression());
- visitNodes(obj.getRightExpressions());
- }
-
- public void visit(IInsert obj) {
- visitNode(obj.getGroup());
- visitNodes(obj.getElements());
- visitNodes(obj.getValues());
- }
-
- public void visit(IIsNullCriteria obj) {
- visitNode(obj.getExpression());
- }
-
- public void visit(IJoin obj) {
- visitNode(obj.getLeftItem());
- visitNode(obj.getRightItem());
- if(obj.getCriteria() != null) {
- visitNodes(obj.getCriteria());
- }
- }
-
- public void visit(ILikeCriteria obj) {
- visitNode(obj.getLeftExpression());
- visitNode(obj.getRightExpression());
- }
-
- public void visit(ILiteral obj) {
- }
-
- public void visit(INotCriteria obj) {
- visitNode(obj.getCriteria());
- }
-
- public void visit(IOrderBy obj) {
- visitNodes(obj.getItems());
- }
-
- public void visit(IOrderByItem obj) {
- }
-
- public void visit(IParameter obj) {
- }
-
- public void visit(IQuery obj) {
- visitNode(obj.getSelect());
- visitNode(obj.getFrom());
- visitNode(obj.getWhere());
- visitNode(obj.getGroupBy());
- visitNode(obj.getHaving());
- visitNode(obj.getOrderBy());
- visitNode(obj.getLimit());
- }
-
- public void visit(IScalarSubquery obj) {
- visitNode(obj.getQuery());
- }
-
- public void visit(ISearchedCaseExpression obj) {
- int whenCount = obj.getWhenCount();
- for (int i = 0; i < whenCount; i++) {
- visitNode(obj.getWhenCriteria(i));
- visitNode(obj.getThenExpression(i));
- }
- visitNode(obj.getElseExpression());
- }
-
- public void visit(ISelect obj) {
- visitNodes(obj.getSelectSymbols());
- }
-
- public void visit(ISelectSymbol obj) {
- visitNode(obj.getExpression());
- }
-
- public void visit(ISubqueryCompareCriteria obj) {
- visitNode(obj.getLeftExpression());
- visitNode(obj.getQuery());
- }
-
- public void visit(ISubqueryInCriteria obj) {
- visitNode(obj.getLeftExpression());
- visitNode(obj.getQuery());
- }
-
- public void visit(ISetQuery obj) {
- visitNode(obj.getLeftQuery());
- visitNode(obj.getRightQuery());
- visitNode(obj.getOrderBy());
- visitNode(obj.getLimit());
- }
-
- public void visit(IUpdate obj) {
- visitNode(obj.getGroup());
- visitNode(obj.getChanges());
- visitNode(obj.getCriteria());
- }
-
- @Override
- public void visit(IInlineView obj) {
- visitNode(obj.getQuery());
- }
-
- @Override
- public void visit(ISetClauseList obj) {
- visitNodes(obj.getClauses());
- }
-
- @Override
- public void visit(ISetClause obj) {
- visitNode(obj.getSymbol());
- visitNode(obj.getValue());
- }
-
-}
Copied: trunk/connector-api/src/main/java/org/teiid/connector/visitor/framework/HierarchyVisitor.java (from rev 499, trunk/connector-api/src/main/java/com/metamatrix/connector/visitor/framework/HierarchyVisitor.java)
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/connector/visitor/framework/HierarchyVisitor.java (rev 0)
+++ trunk/connector-api/src/main/java/org/teiid/connector/visitor/framework/HierarchyVisitor.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -0,0 +1,238 @@
+/*
+ * 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.connector.visitor.framework;
+
+import org.teiid.connector.language.IAggregate;
+import org.teiid.connector.language.IBatchedUpdates;
+import org.teiid.connector.language.ICompareCriteria;
+import org.teiid.connector.language.ICompoundCriteria;
+import org.teiid.connector.language.IDelete;
+import org.teiid.connector.language.IExistsCriteria;
+import org.teiid.connector.language.IFrom;
+import org.teiid.connector.language.IFunction;
+import org.teiid.connector.language.IGroupBy;
+import org.teiid.connector.language.IInCriteria;
+import org.teiid.connector.language.IInlineView;
+import org.teiid.connector.language.IInsert;
+import org.teiid.connector.language.IIsNullCriteria;
+import org.teiid.connector.language.IJoin;
+import org.teiid.connector.language.ILikeCriteria;
+import org.teiid.connector.language.INotCriteria;
+import org.teiid.connector.language.IOrderBy;
+import org.teiid.connector.language.IProcedure;
+import org.teiid.connector.language.IQuery;
+import org.teiid.connector.language.IScalarSubquery;
+import org.teiid.connector.language.ISearchedCaseExpression;
+import org.teiid.connector.language.ISelect;
+import org.teiid.connector.language.ISelectSymbol;
+import org.teiid.connector.language.ISetClause;
+import org.teiid.connector.language.ISetClauseList;
+import org.teiid.connector.language.ISetQuery;
+import org.teiid.connector.language.ISubqueryCompareCriteria;
+import org.teiid.connector.language.ISubqueryInCriteria;
+import org.teiid.connector.language.IUpdate;
+
+/**
+ * Visits each node in a hierarchy of ILanguageObjects. The default
+ * implementation of each visit() method is simply to visit the children of a
+ * given ILanguageObject, if any exist, with this HierarchyVisitor (without
+ * performing any actions on the node). A subclass can selectively override
+ * visit() methods to delegate the actions performed on a node to another
+ * visitor by calling that Visitor's visit() method. This implementation makes
+ * no guarantees about the order in which the children of an ILanguageObject are
+ * visited.
+ * @see DelegatingHierarchyVisitor
+ */
+public abstract class HierarchyVisitor extends AbstractLanguageVisitor {
+
+ private boolean visitSubcommands;
+
+ public HierarchyVisitor() {
+ this(true);
+ }
+
+ public HierarchyVisitor(boolean visitSubcommands) {
+ this.visitSubcommands = visitSubcommands;
+ }
+
+ public void visit(IAggregate obj) {
+ visitNode(obj.getExpression());
+ }
+
+ public void visit(IBatchedUpdates obj) {
+ visitNodes(obj.getUpdateCommands());
+ }
+
+ public void visit(ICompareCriteria obj) {
+ visitNode(obj.getLeftExpression());
+ visitNode(obj.getRightExpression());
+ }
+
+ public void visit(ICompoundCriteria obj) {
+ visitNodes(obj.getCriteria());
+ }
+
+ public void visit(IDelete obj) {
+ visitNode(obj.getGroup());
+ visitNode(obj.getCriteria());
+ }
+
+ public void visit(IProcedure obj) {
+ visitNodes(obj.getParameters());
+ }
+
+ public void visit(IExistsCriteria obj) {
+ if (visitSubcommands) {
+ visitNode(obj.getQuery());
+ }
+ }
+
+ public void visit(IFrom obj) {
+ visitNodes(obj.getItems());
+ }
+
+ public void visit(IFunction obj) {
+ visitNodes(obj.getParameters());
+ }
+
+ public void visit(IGroupBy obj) {
+ visitNodes(obj.getElements());
+ }
+
+ public void visit(IInCriteria obj) {
+ visitNode(obj.getLeftExpression());
+ visitNodes(obj.getRightExpressions());
+ }
+
+ public void visit(IInsert obj) {
+ visitNode(obj.getGroup());
+ visitNodes(obj.getElements());
+ visitNodes(obj.getValues());
+ }
+
+ public void visit(IIsNullCriteria obj) {
+ visitNode(obj.getExpression());
+ }
+
+ public void visit(IJoin obj) {
+ visitNode(obj.getLeftItem());
+ visitNode(obj.getRightItem());
+ if(obj.getCriteria() != null) {
+ visitNodes(obj.getCriteria());
+ }
+ }
+
+ public void visit(ILikeCriteria obj) {
+ visitNode(obj.getLeftExpression());
+ visitNode(obj.getRightExpression());
+ }
+
+ public void visit(INotCriteria obj) {
+ visitNode(obj.getCriteria());
+ }
+
+ public void visit(IOrderBy obj) {
+ visitNodes(obj.getItems());
+ }
+
+ public void visit(IQuery obj) {
+ visitNode(obj.getSelect());
+ visitNode(obj.getFrom());
+ visitNode(obj.getWhere());
+ visitNode(obj.getGroupBy());
+ visitNode(obj.getHaving());
+ visitNode(obj.getOrderBy());
+ visitNode(obj.getLimit());
+ }
+
+ public void visit(IScalarSubquery obj) {
+ if (visitSubcommands) {
+ visitNode(obj.getQuery());
+ }
+ }
+
+ public void visit(ISearchedCaseExpression obj) {
+ int whenCount = obj.getWhenCount();
+ for (int i = 0; i < whenCount; i++) {
+ visitNode(obj.getWhenCriteria(i));
+ visitNode(obj.getThenExpression(i));
+ }
+ visitNode(obj.getElseExpression());
+ }
+
+ public void visit(ISelect obj) {
+ visitNodes(obj.getSelectSymbols());
+ }
+
+ public void visit(ISelectSymbol obj) {
+ visitNode(obj.getExpression());
+ }
+
+ public void visit(ISubqueryCompareCriteria obj) {
+ visitNode(obj.getLeftExpression());
+ if (visitSubcommands) {
+ visitNode(obj.getQuery());
+ }
+ }
+
+ public void visit(ISubqueryInCriteria obj) {
+ visitNode(obj.getLeftExpression());
+ if (visitSubcommands) {
+ visitNode(obj.getQuery());
+ }
+ }
+
+ public void visit(ISetQuery obj) {
+ if (visitSubcommands) {
+ visitNode(obj.getLeftQuery());
+ visitNode(obj.getRightQuery());
+ }
+ visitNode(obj.getOrderBy());
+ visitNode(obj.getLimit());
+ }
+
+ public void visit(IUpdate obj) {
+ visitNode(obj.getGroup());
+ visitNode(obj.getChanges());
+ visitNode(obj.getCriteria());
+ }
+
+ @Override
+ public void visit(IInlineView obj) {
+ if (visitSubcommands) {
+ visitNode(obj.getQuery());
+ }
+ }
+
+ @Override
+ public void visit(ISetClauseList obj) {
+ visitNodes(obj.getClauses());
+ }
+
+ @Override
+ public void visit(ISetClause obj) {
+ visitNode(obj.getSymbol());
+ visitNode(obj.getValue());
+ }
+
+}
Modified: trunk/connector-api/src/main/java/org/teiid/connector/visitor/framework/LanguageObjectVisitor.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/visitor/framework/LanguageObjectVisitor.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/visitor/framework/LanguageObjectVisitor.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,9 +20,9 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.visitor.framework;
+package org.teiid.connector.visitor.framework;
-import com.metamatrix.connector.language.*;
+import org.teiid.connector.language.*;
/**
*/
Copied: trunk/connector-api/src/main/java/org/teiid/connector/visitor/util (from rev 498, trunk/connector-api/src/main/java/com/metamatrix/connector/visitor/util)
Modified: trunk/connector-api/src/main/java/org/teiid/connector/visitor/util/CollectorVisitor.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/visitor/util/CollectorVisitor.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/visitor/util/CollectorVisitor.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,14 +20,15 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.visitor.util;
+package org.teiid.connector.visitor.util;
import java.util.*;
-import com.metamatrix.connector.language.*;
-import com.metamatrix.connector.visitor.framework.DelegatingHierarchyVisitor;
-import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor;
+import org.teiid.connector.language.*;
+import org.teiid.connector.visitor.framework.DelegatingHierarchyVisitor;
+import org.teiid.connector.visitor.framework.LanguageObjectVisitor;
+
/**
* This visitor can be used to collect all objects of a certain type in a language
* tree. Each visit method does an instanceof method to check whether the object
Modified: trunk/connector-api/src/main/java/org/teiid/connector/visitor/util/SQLReservedWords.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/visitor/util/SQLReservedWords.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/visitor/util/SQLReservedWords.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.visitor.util;
+package org.teiid.connector.visitor.util;
public interface SQLReservedWords {
Deleted: trunk/connector-api/src/main/java/org/teiid/connector/visitor/util/SQLStringVisitor.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/visitor/util/SQLStringVisitor.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/visitor/util/SQLStringVisitor.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -1,1044 +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 com.metamatrix.connector.visitor.util;
-
-import java.util.Iterator;
-import java.util.List;
-
-import com.metamatrix.common.types.DataTypeManager;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.language.IAggregate;
-import com.metamatrix.connector.language.IBulkInsert;
-import com.metamatrix.connector.language.ICommand;
-import com.metamatrix.connector.language.ICompareCriteria;
-import com.metamatrix.connector.language.ICompoundCriteria;
-import com.metamatrix.connector.language.ICriteria;
-import com.metamatrix.connector.language.IDelete;
-import com.metamatrix.connector.language.IElement;
-import com.metamatrix.connector.language.IExistsCriteria;
-import com.metamatrix.connector.language.IExpression;
-import com.metamatrix.connector.language.IFrom;
-import com.metamatrix.connector.language.IFromItem;
-import com.metamatrix.connector.language.IFunction;
-import com.metamatrix.connector.language.IGroup;
-import com.metamatrix.connector.language.IGroupBy;
-import com.metamatrix.connector.language.IInCriteria;
-import com.metamatrix.connector.language.IInlineView;
-import com.metamatrix.connector.language.IInsert;
-import com.metamatrix.connector.language.IIsNullCriteria;
-import com.metamatrix.connector.language.IJoin;
-import com.metamatrix.connector.language.ILanguageObject;
-import com.metamatrix.connector.language.ILikeCriteria;
-import com.metamatrix.connector.language.ILimit;
-import com.metamatrix.connector.language.ILiteral;
-import com.metamatrix.connector.language.INotCriteria;
-import com.metamatrix.connector.language.IOrderBy;
-import com.metamatrix.connector.language.IOrderByItem;
-import com.metamatrix.connector.language.IParameter;
-import com.metamatrix.connector.language.IPredicateCriteria;
-import com.metamatrix.connector.language.IProcedure;
-import com.metamatrix.connector.language.IQuery;
-import com.metamatrix.connector.language.IQueryCommand;
-import com.metamatrix.connector.language.IScalarSubquery;
-import com.metamatrix.connector.language.ISearchedCaseExpression;
-import com.metamatrix.connector.language.ISelect;
-import com.metamatrix.connector.language.ISelectSymbol;
-import com.metamatrix.connector.language.ISetClause;
-import com.metamatrix.connector.language.ISetClauseList;
-import com.metamatrix.connector.language.ISetQuery;
-import com.metamatrix.connector.language.ISubqueryCompareCriteria;
-import com.metamatrix.connector.language.ISubqueryInCriteria;
-import com.metamatrix.connector.language.IUpdate;
-import com.metamatrix.connector.language.IParameter.Direction;
-import com.metamatrix.connector.metadata.runtime.MetadataObject;
-import com.metamatrix.connector.visitor.framework.AbstractLanguageVisitor;
-import com.metamatrix.core.util.StringUtil;
-
-/**
- * Creates a SQL string for a LanguageObject subtree. Instances of this class
- * are not reusable, and are not thread-safe.
- */
-public class SQLStringVisitor extends AbstractLanguageVisitor implements SQLReservedWords {
-
- private static final String ESCAPED_QUOTE = "''"; //$NON-NLS-1$
-
- protected static final String UNDEFINED = "<undefined>"; //$NON-NLS-1$
- protected static final String UNDEFINED_PARAM = "?"; //$NON-NLS-1$
-
- protected StringBuffer buffer = new StringBuffer();
-
- /**
- * Gets the name of a group or element from the RuntimeMetadata
- * @param id the id of the group or element
- * @return the name of that element or group as defined in the source
- */
- protected String getName(MetadataObject object) {
- try {
- String nameInSource = object.getNameInSource();
- if(nameInSource != null && nameInSource.length() > 0) {
- return nameInSource;
- }
- return object.getName();
- } catch(ConnectorException e) {
- return object.getName();
- }
- }
-
- /**
- * Appends the string form of the ILanguageObject to the current buffer.
- * @param obj the language object instance
- */
- public void append(ILanguageObject obj) {
- if (obj == null) {
- buffer.append(UNDEFINED);
- } else {
- visitNode(obj);
- }
- }
-
- /**
- * Simple utility to append a list of language objects to the current buffer
- * by creating a comma-separated list.
- * @param items a list of ILanguageObjects
- */
- protected void append(List<? extends ILanguageObject> items) {
- if (items != null && items.size() != 0) {
- append((ILanguageObject)items.get(0));
- for (int i = 1; i < items.size(); i++) {
- buffer.append(COMMA)
- .append(SPACE);
- append((ILanguageObject)items.get(i));
- }
- }
- }
-
- /**
- * Simple utility to append an array of language objects to the current buffer
- * by creating a comma-separated list.
- * @param items an array of ILanguageObjects
- */
- protected void append(ILanguageObject[] items) {
- if (items != null && items.length != 0) {
- append(items[0]);
- for (int i = 1; i < items.length; i++) {
- buffer.append(COMMA)
- .append(SPACE);
- append(items[i]);
- }
- }
- }
-
- /**
- * Creates a SQL-safe string. Simply replaces all occurrences of ' with ''
- * @param str the input string
- * @return a SQL-safe string
- */
- protected String escapeString(String str) {
- return StringUtil.replaceAll(str, QUOTE, ESCAPED_QUOTE);
- }
-
- public String toString() {
- return buffer.toString();
- }
-
- /**
- * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.metamatrix.connector.language.IAggregate)
- */
- public void visit(IAggregate obj) {
- buffer.append(obj.getName())
- .append(LPAREN);
-
- if ( obj.isDistinct()) {
- buffer.append(DISTINCT)
- .append(SPACE);
- }
-
- if (obj.getExpression() == null) {
- buffer.append(ALL_COLS);
- } else {
- append(obj.getExpression());
- }
- buffer.append(RPAREN);
- }
-
- /**
- * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.metamatrix.connector.language.ICompareCriteria)
- */
- public void visit(ICompareCriteria obj) {
- append(obj.getLeftExpression());
- buffer.append(SPACE);
-
- switch(obj.getOperator()) {
- case EQ: buffer.append(EQ); break;
- case GE: buffer.append(GE); break;
- case GT: buffer.append(GT); break;
- case LE: buffer.append(LE); break;
- case LT: buffer.append(LT); break;
- case NE: buffer.append(NE); break;
- default: buffer.append(UNDEFINED);
- }
- buffer.append(SPACE);
- append(obj.getRightExpression());
- }
-
- /**
- * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.metamatrix.connector.language.ICompoundCriteria)
- */
- public void visit(ICompoundCriteria obj) {
- String opString = null;
- switch(obj.getOperator()) {
- case AND: opString = AND; break;
- case OR: opString = OR; break;
- default: opString = UNDEFINED;
- }
-
- List criteria = obj.getCriteria();
- if (criteria == null || criteria.size() == 0) {
- buffer.append(UNDEFINED);
- } else if(criteria.size() == 1) {
- // Special case - should really never happen, but we are tolerant
- append((ILanguageObject)criteria.get(0));
- } else {
- buffer.append(LPAREN);
- append((ILanguageObject)criteria.get(0));
- buffer.append(RPAREN);
- for (int i = 1; i < criteria.size(); i++) {
- buffer.append(SPACE)
- .append(opString)
- .append(SPACE)
- .append(LPAREN);
- append((ILanguageObject)criteria.get(i));
- buffer.append(RPAREN);
- }
-
- }
- }
-
- /**
- * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.metamatrix.connector.language.IDelete)
- */
- public void visit(IDelete obj) {
- buffer.append(DELETE)
- .append(SPACE);
- buffer.append(getSourceComment(obj));
- buffer.append(FROM)
- .append(SPACE);
- append(obj.getGroup());
- if (obj.getCriteria() != null) {
- buffer.append(SPACE)
- .append(WHERE)
- .append(SPACE);
- append(obj.getCriteria());
- }
- }
-
- /**
- * Take the specified derived group and element short names and determine a
- * replacement element name to use instead. Most commonly, this is used to strip
- * the group name if the group is a pseudo-group (DUAL) or the element is a pseudo-group
- * (ROWNUM). It may also be used to strip special information out of the name in source
- * value in some specialized cases.
- *
- * By default, this method returns null, indicating that the normal group and element
- * name logic should be used (group + "." + element). Subclasses should override and
- * implement this method if desired.
- *
- * @param group Group name, may be null
- * @param element Element name, never null
- * @return Replacement element name to be used as is (no modification will occur)
- * @since 5.0
- */
- protected String replaceElementName(String group, String element) {
- return null;
- }
-
- /**
- * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.metamatrix.connector.language.IElement)
- */
- public void visit(IElement obj) {
- buffer.append(getElementName(obj, true));
- }
-
- private String getElementName(IElement obj, boolean qualify) {
- String groupName = null;
- IGroup group = obj.getGroup();
- if (group != null && qualify) {
- if(group.getDefinition() != null) {
- groupName = group.getContext();
- } else {
- MetadataObject groupID = group.getMetadataObject();
- if(groupID != null) {
- groupName = getName(groupID);
- } else {
- groupName = group.getContext();
- }
- }
- }
-
- String elemShortName = null;
- MetadataObject elementID = obj.getMetadataObject();
- if(elementID != null) {
- elemShortName = getName(elementID);
- } else {
- String elementName = obj.getName();
- elemShortName = getShortName(elementName);
- }
-
- // Check whether a subclass wants to replace the element name to use in special circumstances
- String replacementElement = replaceElementName(groupName, elemShortName);
- if(replacementElement != null) {
- // If so, use it as is
- return replacementElement;
- }
- StringBuffer elementName = new StringBuffer(elemShortName.length());
- // If not, do normal logic: [group + "."] + element
- if(groupName != null) {
- elementName.append(groupName);
- elementName.append(DOT);
- }
- elementName.append(elemShortName);
- return elementName.toString();
- }
-
- /**
- * @param elementName
- * @return
- * @since 4.3
- */
- public static String getShortName(String elementName) {
- int lastDot = elementName.lastIndexOf("."); //$NON-NLS-1$
- if(lastDot >= 0) {
- elementName = elementName.substring(lastDot+1);
- }
- return elementName;
- }
-
- /**
- * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.metamatrix.data.language.IExecute)
- */
- public void visit(IProcedure obj) {
- buffer.append(EXEC)
- .append(SPACE);
-
- if(obj.getMetadataObject() != null) {
- buffer.append(getName(obj.getMetadataObject()));
- } else {
- buffer.append(obj.getProcedureName());
- }
-
- buffer.append(LPAREN);
- final List params = obj.getParameters();
- if (params != null && params.size() != 0) {
- IParameter param = null;
- for (int i = 0; i < params.size(); i++) {
- param = (IParameter)params.get(i);
- if (param.getDirection() == Direction.IN || param.getDirection() == Direction.INOUT) {
- if (i != 0) {
- buffer.append(COMMA)
- .append(SPACE);
- }
- if (param.getValue() != null) {
- buffer.append(param.getValue().toString());
- } else {
- buffer.append(UNDEFINED_PARAM);
- }
- }
- }
- }
- buffer.append(RPAREN);
- }
-
- /*
- * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.metamatrix.data.language.IExistsCriteria)
- */
- public void visit(IExistsCriteria obj) {
- buffer.append(EXISTS)
- .append(SPACE)
- .append(LPAREN);
- append(obj.getQuery());
- buffer.append(RPAREN);
- }
-
- /**
- * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.metamatrix.connector.language.IFrom)
- */
- public void visit(IFrom obj) {
- buffer.append(FROM)
- .append(SPACE);
- append(obj.getItems());
- }
-
- /**
- * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.metamatrix.connector.language.IFunction)
- */
- public void visit(IFunction obj) {
-
- String name = obj.getName();
- List<IExpression> args = obj.getParameters();
- if(name.equalsIgnoreCase(CONVERT) || name.equalsIgnoreCase(CAST)) {
-
- Object typeValue = ((ILiteral)args.get(1)).getValue();
-
- buffer.append(name);
- buffer.append(LPAREN);
-
- append(args.get(0));
-
- if(name.equalsIgnoreCase(CONVERT)) {
- buffer.append(COMMA);
- buffer.append(SPACE);
- } else {
- buffer.append(SPACE);
- buffer.append(AS);
- buffer.append(SPACE);
- }
- buffer.append(typeValue);
- buffer.append(RPAREN);
- } else if(name.equals("%") || name.equals("+") || name.equals("-") || name.equals("*") || name.equals("/") || name.equals("||")) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
- buffer.append(LPAREN);
-
- if(args != null) {
- for(int i=0; i<args.size(); i++) {
- append(args.get(i));
- if(i < (args.size()-1)) {
- buffer.append(SPACE);
- buffer.append(name);
- buffer.append(SPACE);
- }
- }
- }
- buffer.append(RPAREN);
-
- } else if(name.equalsIgnoreCase(TIMESTAMPADD) || name.equalsIgnoreCase(TIMESTAMPDIFF)) {
- buffer.append(name);
- buffer.append(LPAREN);
-
- if(args != null && args.size() > 0) {
- buffer.append(((ILiteral)args.get(0)).getValue());
-
- for(int i=1; i<args.size(); i++) {
- buffer.append(COMMA);
- buffer.append(SPACE);
- append(args.get(i));
- }
- }
- buffer.append(RPAREN);
-
- } else {
-
- buffer.append(obj.getName())
- .append(LPAREN);
- append(obj.getParameters());
- buffer.append(RPAREN);
- }
- }
-
- /**
- * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.metamatrix.connector.language.IGroup)
- */
- public void visit(IGroup obj) {
- MetadataObject groupID = obj.getMetadataObject();
- if(groupID != null) {
- buffer.append(getName(groupID));
- } else {
- if(obj.getDefinition() == null) {
- buffer.append(obj.getContext());
- } else {
- buffer.append(obj.getDefinition());
- }
- }
-
- if (obj.getDefinition() != null) {
- buffer.append(SPACE);
- if (useAsInGroupAlias()){
- buffer.append(AS)
- .append(SPACE);
- }
- buffer.append(obj.getContext());
- }
- }
-
- /**
- * Indicates whether group alias should be of the form
- * "...FROM groupA AS X" or "...FROM groupA X". Certain
- * data sources (such as Oracle) may not support the first
- * form.
- * @return boolean
- */
- protected boolean useAsInGroupAlias(){
- return true;
- }
-
- /**
- * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.metamatrix.connector.language.IGroupBy)
- */
- public void visit(IGroupBy obj) {
- buffer.append(GROUP)
- .append(SPACE)
- .append(BY)
- .append(SPACE);
- append(obj.getElements());
- }
-
- /**
- * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.metamatrix.connector.language.IInCriteria)
- */
- public void visit(IInCriteria obj) {
- append(obj.getLeftExpression());
- if (obj.isNegated()) {
- buffer.append(SPACE)
- .append(NOT);
- }
- buffer.append(SPACE)
- .append(IN)
- .append(SPACE)
- .append(LPAREN);
- append(obj.getRightExpressions());
- buffer.append(RPAREN);
- }
-
- public void visit(IInlineView obj) {
- buffer.append(LPAREN);
- if (obj.getOutput() != null) {
- buffer.append(obj.getOutput());
- } else {
- append(obj.getQuery());
- }
- buffer.append(RPAREN);
- buffer.append(SPACE);
- if(useAsInGroupAlias()) {
- buffer.append(AS);
- buffer.append(SPACE);
- }
- buffer.append(obj.getContext());
- }
-
- /**
- * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.metamatrix.connector.language.IInsert)
- */
- public void visit(IInsert obj) {
- formatBasicInsert(obj);
- buffer.append(SPACE)
- .append(VALUES)
- .append(SPACE)
- .append(LPAREN);
- append(obj.getValues());
- buffer.append(RPAREN);
- }
-
- /**
- * @param obj
- */
- private void formatBasicInsert(IInsert obj) {
- buffer.append(INSERT)
- .append(SPACE);
- buffer.append(getSourceComment(obj));
- buffer.append(INTO)
- .append(SPACE);
- append(obj.getGroup());
- if (obj.getElements() != null && obj.getElements().size() != 0) {
- buffer.append(SPACE)
- .append(LPAREN);
-
- int elementCount= obj.getElements().size();
- for(int i=0; i<elementCount; i++) {
- buffer.append(getElementName(obj.getElements().get(i), false));
- if (i<elementCount-1) {
- buffer.append(COMMA);
- buffer.append(SPACE);
- }
- }
-
- buffer.append(RPAREN);
- }
- }
-
- public void visit(IBulkInsert obj) {
- formatBasicInsert(obj);
- buffer.append(SPACE)
- .append(VALUES)
- .append(SPACE)
- .append(LPAREN);
- int elementCount= obj.getElements().size();
- for(int i=0; i<elementCount; i++) {
- buffer.append(UNDEFINED_PARAM);
- if (i<elementCount-1) {
- buffer.append(COMMA);
- }
- }
- buffer.append(RPAREN);
- }
- /**
- * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.metamatrix.connector.language.IIsNullCriteria)
- */
- public void visit(IIsNullCriteria obj) {
- append(obj.getExpression());
- buffer.append(SPACE)
- .append(IS)
- .append(SPACE);
- if (obj.isNegated()) {
- buffer.append(NOT)
- .append(SPACE);
- }
- buffer.append(NULL);
- }
-
- /**
- * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.metamatrix.connector.language.IJoin)
- */
- public void visit(IJoin obj) {
- IFromItem leftItem = obj.getLeftItem();
- if(leftItem instanceof IJoin) {
- buffer.append(LPAREN);
- append(leftItem);
- buffer.append(RPAREN);
- } else {
- append(leftItem);
- }
- buffer.append(SPACE);
-
- switch(obj.getJoinType()) {
- case CROSS_JOIN:
- buffer.append(CROSS);
- break;
- case FULL_OUTER_JOIN:
- buffer.append(FULL)
- .append(SPACE)
- .append(OUTER);
- break;
- case INNER_JOIN:
- buffer.append(INNER);
- break;
- case LEFT_OUTER_JOIN:
- buffer.append(LEFT)
- .append(SPACE)
- .append(OUTER);
- break;
- case RIGHT_OUTER_JOIN:
- buffer.append(RIGHT)
- .append(SPACE)
- .append(OUTER);
- break;
- default: buffer.append(UNDEFINED);
- }
- buffer.append(SPACE)
- .append(JOIN)
- .append(SPACE);
-
- IFromItem rightItem = obj.getRightItem();
- if(rightItem instanceof IJoin) {
- buffer.append(LPAREN);
- append(rightItem);
- buffer.append(RPAREN);
- } else {
- append(rightItem);
- }
-
- final List criteria = obj.getCriteria();
- if (criteria != null && criteria.size() != 0) {
- buffer.append(SPACE)
- .append(ON)
- .append(SPACE);
-
- Iterator critIter = criteria.iterator();
- while(critIter.hasNext()) {
- ICriteria crit = (ICriteria) critIter.next();
- if(crit instanceof IPredicateCriteria) {
- append(crit);
- } else {
- buffer.append(LPAREN);
- append(crit);
- buffer.append(RPAREN);
- }
-
- if(critIter.hasNext()) {
- buffer.append(SPACE)
- .append(AND)
- .append(SPACE);
- }
- }
- }
- }
-
- /**
- * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.metamatrix.connector.language.ILikeCriteria)
- */
- public void visit(ILikeCriteria obj) {
- append(obj.getLeftExpression());
- if (obj.isNegated()) {
- buffer.append(SPACE)
- .append(NOT);
- }
- buffer.append(SPACE)
- .append(LIKE)
- .append(SPACE);
- append(obj.getRightExpression());
- if (obj.getEscapeCharacter() != null) {
- buffer.append(SPACE)
- .append(ESCAPE)
- .append(SPACE)
- .append(QUOTE)
- .append(obj.getEscapeCharacter().toString())
- .append(QUOTE);
- }
-
- }
-
- public void visit(ILimit obj) {
- buffer.append(LIMIT)
- .append(SPACE);
- if (obj.getRowOffset() > 0) {
- buffer.append(obj.getRowOffset())
- .append(COMMA)
- .append(SPACE);
- }
- buffer.append(obj.getRowLimit());
- }
-
- /**
- * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.metamatrix.connector.language.ILiteral)
- */
- public void visit(ILiteral obj) {
- if (obj.getValue() == null) {
- buffer.append(NULL);
- } else {
- Class type = obj.getType();
- String val = obj.getValue().toString();
- if(Number.class.isAssignableFrom(type)) {
- buffer.append(val);
- } else if(type.equals(DataTypeManager.DefaultDataClasses.BOOLEAN)) {
- buffer.append("{b'") //$NON-NLS-1$
- .append(val)
- .append("'}"); //$NON-NLS-1$
- } else if(type.equals(DataTypeManager.DefaultDataClasses.TIMESTAMP)) {
- buffer.append("{ts'") //$NON-NLS-1$
- .append(val)
- .append("'}"); //$NON-NLS-1$
- } else if(type.equals(DataTypeManager.DefaultDataClasses.TIME)) {
- buffer.append("{t'") //$NON-NLS-1$
- .append(val)
- .append("'}"); //$NON-NLS-1$
- } else if(type.equals(DataTypeManager.DefaultDataClasses.DATE)) {
- buffer.append("{d'") //$NON-NLS-1$
- .append(val)
- .append("'}"); //$NON-NLS-1$
- } else {
- buffer.append(QUOTE)
- .append(escapeString(val))
- .append(QUOTE);
- }
- }
- }
-
- /**
- * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.metamatrix.connector.language.INotCriteria)
- */
- public void visit(INotCriteria obj) {
- buffer.append(NOT)
- .append(SPACE)
- .append(LPAREN);
- append(obj.getCriteria());
- buffer.append(RPAREN);
- }
-
- /**
- * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.metamatrix.connector.language.IOrderBy)
- */
- public void visit(IOrderBy obj) {
- buffer.append(ORDER)
- .append(SPACE)
- .append(BY)
- .append(SPACE);
- append(obj.getItems());
- }
-
- /**
- * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.metamatrix.connector.language.IOrderByItem)
- */
- public void visit(IOrderByItem obj) {
- if(obj.getName() != null) {
- String name = getShortName(obj.getName());
- buffer.append(name);
- } else if (obj.getElement() != null) {
- visit(obj.getElement());
- } else {
- buffer.append(UNDEFINED);
- }
- if (obj.getDirection() == IOrderByItem.DESC) {
- buffer.append(SPACE)
- .append(DESC);
- } // Don't print default "ASC"
- }
-
- /**
- * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.metamatrix.connector.language.IParameter)
- */
- public void visit(IParameter obj) {
- if (obj.getValue() == null) {
- buffer.append(UNDEFINED_PARAM);
- } else if (obj.getValue() == null) {
- buffer.append(NULL);
- } else {
- buffer.append(obj.getValue().toString());
- }
- }
-
- /**
- * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.metamatrix.connector.language.IQuery)
- */
- public void visit(IQuery obj) {
- visitSelect(obj.getSelect(), obj);
- if (obj.getFrom() != null) {
- buffer.append(SPACE);
- append(obj.getFrom());
- }
- if (obj.getWhere() != null) {
- buffer.append(SPACE)
- .append(WHERE)
- .append(SPACE);
- append(obj.getWhere());
- }
- if (obj.getGroupBy() != null) {
- buffer.append(SPACE);
- append(obj.getGroupBy());
- }
- if (obj.getHaving() != null) {
- buffer.append(SPACE)
- .append(HAVING)
- .append(SPACE);
- append(obj.getHaving());
- }
- if (obj.getOrderBy() != null) {
- buffer.append(SPACE);
- append(obj.getOrderBy());
- }
- if (obj.getLimit() != null) {
- buffer.append(SPACE);
- append(obj.getLimit());
- }
- }
-
- /**
- * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.metamatrix.connector.language.ISearchedCaseExpression)
- */
- public void visit(ISearchedCaseExpression obj) {
- buffer.append(CASE);
- final int whenCount = obj.getWhenCount();
- for (int i = 0; i < whenCount; i++) {
- buffer.append(SPACE)
- .append(WHEN)
- .append(SPACE);
- append(obj.getWhenCriteria(i));
- buffer.append(SPACE)
- .append(THEN)
- .append(SPACE);
- append(obj.getThenExpression(i));
- }
- if (obj.getElseExpression() != null) {
- buffer.append(SPACE)
- .append(ELSE)
- .append(SPACE);
- append(obj.getElseExpression());
- }
- buffer.append(SPACE)
- .append(END);
- }
-
- /**
- * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.metamatrix.connector.language.ISelect)
- */
- public void visit(ISelect obj) {
- visitSelect(obj, null);
- }
-
- private void visitSelect(ISelect obj, ICommand command) {
- buffer.append(SELECT).append(SPACE);
- buffer.append(getSourceComment(command));
- if (obj.isDistinct()) {
- buffer.append(DISTINCT).append(SPACE);
- }
- append(obj.getSelectSymbols());
- }
-
-
- protected String getSourceComment(ICommand command) {
- return ""; //$NON-NLS-1$
- }
-
- /*
- * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.metamatrix.data.language.IScalarSubquery)
- */
- public void visit(IScalarSubquery obj) {
- buffer.append(LPAREN);
- append(obj.getQuery());
- buffer.append(RPAREN);
- }
-
- /**
- * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.metamatrix.connector.language.ISelectSymbol)
- */
- public void visit(ISelectSymbol obj) {
- append(obj.getExpression());
- if (obj.hasAlias()) {
- buffer.append(SPACE)
- .append(AS)
- .append(SPACE)
- .append(obj.getOutputName());
- }
- }
-
- /*
- * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.metamatrix.data.language.ISubqueryCompareCriteria)
- */
- public void visit(ISubqueryCompareCriteria obj) {
- append(obj.getLeftExpression());
- buffer.append(SPACE);
-
- switch(obj.getOperator()) {
- case EQ: buffer.append(EQ); break;
- case GE: buffer.append(GE); break;
- case GT: buffer.append(GT); break;
- case LE: buffer.append(LE); break;
- case LT: buffer.append(LT); break;
- case NE: buffer.append(NE); break;
- default: buffer.append(UNDEFINED);
- }
- buffer.append(SPACE);
- switch(obj.getQuantifier()) {
- case ALL: buffer.append(ALL); break;
- case SOME: buffer.append(SOME); break;
- default: buffer.append(UNDEFINED);
- }
- buffer.append(SPACE);
- buffer.append(LPAREN);
- append(obj.getQuery());
- buffer.append(RPAREN);
- }
-
- /*
- * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.metamatrix.data.language.ISubqueryInCriteria)
- */
- public void visit(ISubqueryInCriteria obj) {
- append(obj.getLeftExpression());
- if (obj.isNegated()) {
- buffer.append(SPACE)
- .append(NOT);
- }
- buffer.append(SPACE)
- .append(IN)
- .append(SPACE)
- .append(LPAREN);
- append(obj.getQuery());
- buffer.append(RPAREN);
- }
-
- /**
- * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.metamatrix.connector.language.IUpdate)
- */
- public void visit(IUpdate obj) {
- buffer.append(UPDATE)
- .append(SPACE);
- buffer.append(getSourceComment(obj));
- append(obj.getGroup());
- buffer.append(SPACE)
- .append(SET)
- .append(SPACE);
- append(obj.getChanges());
- if (obj.getCriteria() != null) {
- buffer.append(SPACE)
- .append(WHERE)
- .append(SPACE);
- append(obj.getCriteria());
- }
- }
-
- public void visit(ISetClauseList obj) {
- append(obj.getClauses());
- }
-
- public void visit(ISetClause clause) {
- buffer.append(getElementName(clause.getSymbol(), false));
- buffer.append(SPACE).append(EQ).append(SPACE);
- append(clause.getValue());
- }
-
- public void visit(ISetQuery obj) {
- appendSetQuery(obj.getLeftQuery());
-
- buffer.append(SPACE);
-
- appendSetOperation(obj.getOperation());
-
- if(obj.isAll()) {
- buffer.append(SPACE);
- buffer.append(ALL);
- }
- buffer.append(SPACE);
-
- appendSetQuery(obj.getRightQuery());
-
- IOrderBy orderBy = obj.getOrderBy();
- if(orderBy != null) {
- buffer.append(SPACE);
- append(orderBy);
- }
-
- ILimit limit = obj.getLimit();
- if(limit != null) {
- buffer.append(SPACE);
- append(limit);
- }
- }
-
- protected void appendSetOperation(ISetQuery.Operation operation) {
- buffer.append(operation);
- }
-
- protected boolean useParensForSetQueries() {
- return false;
- }
-
- protected void appendSetQuery(IQueryCommand obj) {
- if(obj instanceof ISetQuery || useParensForSetQueries()) {
- buffer.append(LPAREN);
- append(obj);
- buffer.append(RPAREN);
- } else {
- append(obj);
- }
- }
-
- /**
- * Gets the SQL string representation for a given ILanguageObject.
- * @param obj the root of the ILanguageObject hierarchy that needs to be
- * converted. This can be any subtree, and does not need to be a top-level
- * command
- * @return the SQL representation of that ILanguageObject hierarchy
- */
- public static String getSQLString(ILanguageObject obj) {
- SQLStringVisitor visitor = new SQLStringVisitor();
- visitor.append(obj);
- return visitor.toString();
- }
-
-}
Copied: trunk/connector-api/src/main/java/org/teiid/connector/visitor/util/SQLStringVisitor.java (from rev 499, trunk/connector-api/src/main/java/com/metamatrix/connector/visitor/util/SQLStringVisitor.java)
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/connector/visitor/util/SQLStringVisitor.java (rev 0)
+++ trunk/connector-api/src/main/java/org/teiid/connector/visitor/util/SQLStringVisitor.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -0,0 +1,1044 @@
+/*
+ * 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.connector.visitor.util;
+
+import java.util.Iterator;
+import java.util.List;
+
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.language.IAggregate;
+import org.teiid.connector.language.IBulkInsert;
+import org.teiid.connector.language.ICommand;
+import org.teiid.connector.language.ICompareCriteria;
+import org.teiid.connector.language.ICompoundCriteria;
+import org.teiid.connector.language.ICriteria;
+import org.teiid.connector.language.IDelete;
+import org.teiid.connector.language.IElement;
+import org.teiid.connector.language.IExistsCriteria;
+import org.teiid.connector.language.IExpression;
+import org.teiid.connector.language.IFrom;
+import org.teiid.connector.language.IFromItem;
+import org.teiid.connector.language.IFunction;
+import org.teiid.connector.language.IGroup;
+import org.teiid.connector.language.IGroupBy;
+import org.teiid.connector.language.IInCriteria;
+import org.teiid.connector.language.IInlineView;
+import org.teiid.connector.language.IInsert;
+import org.teiid.connector.language.IIsNullCriteria;
+import org.teiid.connector.language.IJoin;
+import org.teiid.connector.language.ILanguageObject;
+import org.teiid.connector.language.ILikeCriteria;
+import org.teiid.connector.language.ILimit;
+import org.teiid.connector.language.ILiteral;
+import org.teiid.connector.language.INotCriteria;
+import org.teiid.connector.language.IOrderBy;
+import org.teiid.connector.language.IOrderByItem;
+import org.teiid.connector.language.IParameter;
+import org.teiid.connector.language.IPredicateCriteria;
+import org.teiid.connector.language.IProcedure;
+import org.teiid.connector.language.IQuery;
+import org.teiid.connector.language.IQueryCommand;
+import org.teiid.connector.language.IScalarSubquery;
+import org.teiid.connector.language.ISearchedCaseExpression;
+import org.teiid.connector.language.ISelect;
+import org.teiid.connector.language.ISelectSymbol;
+import org.teiid.connector.language.ISetClause;
+import org.teiid.connector.language.ISetClauseList;
+import org.teiid.connector.language.ISetQuery;
+import org.teiid.connector.language.ISubqueryCompareCriteria;
+import org.teiid.connector.language.ISubqueryInCriteria;
+import org.teiid.connector.language.IUpdate;
+import org.teiid.connector.language.IParameter.Direction;
+import org.teiid.connector.metadata.runtime.MetadataObject;
+import org.teiid.connector.visitor.framework.AbstractLanguageVisitor;
+
+import com.metamatrix.common.types.DataTypeManager;
+import com.metamatrix.core.util.StringUtil;
+
+/**
+ * Creates a SQL string for a LanguageObject subtree. Instances of this class
+ * are not reusable, and are not thread-safe.
+ */
+public class SQLStringVisitor extends AbstractLanguageVisitor implements SQLReservedWords {
+
+ private static final String ESCAPED_QUOTE = "''"; //$NON-NLS-1$
+
+ protected static final String UNDEFINED = "<undefined>"; //$NON-NLS-1$
+ protected static final String UNDEFINED_PARAM = "?"; //$NON-NLS-1$
+
+ protected StringBuffer buffer = new StringBuffer();
+
+ /**
+ * Gets the name of a group or element from the RuntimeMetadata
+ * @param id the id of the group or element
+ * @return the name of that element or group as defined in the source
+ */
+ protected String getName(MetadataObject object) {
+ try {
+ String nameInSource = object.getNameInSource();
+ if(nameInSource != null && nameInSource.length() > 0) {
+ return nameInSource;
+ }
+ return object.getName();
+ } catch(ConnectorException e) {
+ return object.getName();
+ }
+ }
+
+ /**
+ * Appends the string form of the ILanguageObject to the current buffer.
+ * @param obj the language object instance
+ */
+ public void append(ILanguageObject obj) {
+ if (obj == null) {
+ buffer.append(UNDEFINED);
+ } else {
+ visitNode(obj);
+ }
+ }
+
+ /**
+ * Simple utility to append a list of language objects to the current buffer
+ * by creating a comma-separated list.
+ * @param items a list of ILanguageObjects
+ */
+ protected void append(List<? extends ILanguageObject> items) {
+ if (items != null && items.size() != 0) {
+ append((ILanguageObject)items.get(0));
+ for (int i = 1; i < items.size(); i++) {
+ buffer.append(COMMA)
+ .append(SPACE);
+ append((ILanguageObject)items.get(i));
+ }
+ }
+ }
+
+ /**
+ * Simple utility to append an array of language objects to the current buffer
+ * by creating a comma-separated list.
+ * @param items an array of ILanguageObjects
+ */
+ protected void append(ILanguageObject[] items) {
+ if (items != null && items.length != 0) {
+ append(items[0]);
+ for (int i = 1; i < items.length; i++) {
+ buffer.append(COMMA)
+ .append(SPACE);
+ append(items[i]);
+ }
+ }
+ }
+
+ /**
+ * Creates a SQL-safe string. Simply replaces all occurrences of ' with ''
+ * @param str the input string
+ * @return a SQL-safe string
+ */
+ protected String escapeString(String str) {
+ return StringUtil.replaceAll(str, QUOTE, ESCAPED_QUOTE);
+ }
+
+ public String toString() {
+ return buffer.toString();
+ }
+
+ /**
+ * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(org.teiid.connector.language.IAggregate)
+ */
+ public void visit(IAggregate obj) {
+ buffer.append(obj.getName())
+ .append(LPAREN);
+
+ if ( obj.isDistinct()) {
+ buffer.append(DISTINCT)
+ .append(SPACE);
+ }
+
+ if (obj.getExpression() == null) {
+ buffer.append(ALL_COLS);
+ } else {
+ append(obj.getExpression());
+ }
+ buffer.append(RPAREN);
+ }
+
+ /**
+ * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(org.teiid.connector.language.ICompareCriteria)
+ */
+ public void visit(ICompareCriteria obj) {
+ append(obj.getLeftExpression());
+ buffer.append(SPACE);
+
+ switch(obj.getOperator()) {
+ case EQ: buffer.append(EQ); break;
+ case GE: buffer.append(GE); break;
+ case GT: buffer.append(GT); break;
+ case LE: buffer.append(LE); break;
+ case LT: buffer.append(LT); break;
+ case NE: buffer.append(NE); break;
+ default: buffer.append(UNDEFINED);
+ }
+ buffer.append(SPACE);
+ append(obj.getRightExpression());
+ }
+
+ /**
+ * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(org.teiid.connector.language.ICompoundCriteria)
+ */
+ public void visit(ICompoundCriteria obj) {
+ String opString = null;
+ switch(obj.getOperator()) {
+ case AND: opString = AND; break;
+ case OR: opString = OR; break;
+ default: opString = UNDEFINED;
+ }
+
+ List criteria = obj.getCriteria();
+ if (criteria == null || criteria.size() == 0) {
+ buffer.append(UNDEFINED);
+ } else if(criteria.size() == 1) {
+ // Special case - should really never happen, but we are tolerant
+ append((ILanguageObject)criteria.get(0));
+ } else {
+ buffer.append(LPAREN);
+ append((ILanguageObject)criteria.get(0));
+ buffer.append(RPAREN);
+ for (int i = 1; i < criteria.size(); i++) {
+ buffer.append(SPACE)
+ .append(opString)
+ .append(SPACE)
+ .append(LPAREN);
+ append((ILanguageObject)criteria.get(i));
+ buffer.append(RPAREN);
+ }
+
+ }
+ }
+
+ /**
+ * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(org.teiid.connector.language.IDelete)
+ */
+ public void visit(IDelete obj) {
+ buffer.append(DELETE)
+ .append(SPACE);
+ buffer.append(getSourceComment(obj));
+ buffer.append(FROM)
+ .append(SPACE);
+ append(obj.getGroup());
+ if (obj.getCriteria() != null) {
+ buffer.append(SPACE)
+ .append(WHERE)
+ .append(SPACE);
+ append(obj.getCriteria());
+ }
+ }
+
+ /**
+ * Take the specified derived group and element short names and determine a
+ * replacement element name to use instead. Most commonly, this is used to strip
+ * the group name if the group is a pseudo-group (DUAL) or the element is a pseudo-group
+ * (ROWNUM). It may also be used to strip special information out of the name in source
+ * value in some specialized cases.
+ *
+ * By default, this method returns null, indicating that the normal group and element
+ * name logic should be used (group + "." + element). Subclasses should override and
+ * implement this method if desired.
+ *
+ * @param group Group name, may be null
+ * @param element Element name, never null
+ * @return Replacement element name to be used as is (no modification will occur)
+ * @since 5.0
+ */
+ protected String replaceElementName(String group, String element) {
+ return null;
+ }
+
+ /**
+ * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(org.teiid.connector.language.IElement)
+ */
+ public void visit(IElement obj) {
+ buffer.append(getElementName(obj, true));
+ }
+
+ private String getElementName(IElement obj, boolean qualify) {
+ String groupName = null;
+ IGroup group = obj.getGroup();
+ if (group != null && qualify) {
+ if(group.getDefinition() != null) {
+ groupName = group.getContext();
+ } else {
+ MetadataObject groupID = group.getMetadataObject();
+ if(groupID != null) {
+ groupName = getName(groupID);
+ } else {
+ groupName = group.getContext();
+ }
+ }
+ }
+
+ String elemShortName = null;
+ MetadataObject elementID = obj.getMetadataObject();
+ if(elementID != null) {
+ elemShortName = getName(elementID);
+ } else {
+ String elementName = obj.getName();
+ elemShortName = getShortName(elementName);
+ }
+
+ // Check whether a subclass wants to replace the element name to use in special circumstances
+ String replacementElement = replaceElementName(groupName, elemShortName);
+ if(replacementElement != null) {
+ // If so, use it as is
+ return replacementElement;
+ }
+ StringBuffer elementName = new StringBuffer(elemShortName.length());
+ // If not, do normal logic: [group + "."] + element
+ if(groupName != null) {
+ elementName.append(groupName);
+ elementName.append(DOT);
+ }
+ elementName.append(elemShortName);
+ return elementName.toString();
+ }
+
+ /**
+ * @param elementName
+ * @return
+ * @since 4.3
+ */
+ public static String getShortName(String elementName) {
+ int lastDot = elementName.lastIndexOf("."); //$NON-NLS-1$
+ if(lastDot >= 0) {
+ elementName = elementName.substring(lastDot+1);
+ }
+ return elementName;
+ }
+
+ /**
+ * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.metamatrix.data.language.IExecute)
+ */
+ public void visit(IProcedure obj) {
+ buffer.append(EXEC)
+ .append(SPACE);
+
+ if(obj.getMetadataObject() != null) {
+ buffer.append(getName(obj.getMetadataObject()));
+ } else {
+ buffer.append(obj.getProcedureName());
+ }
+
+ buffer.append(LPAREN);
+ final List params = obj.getParameters();
+ if (params != null && params.size() != 0) {
+ IParameter param = null;
+ for (int i = 0; i < params.size(); i++) {
+ param = (IParameter)params.get(i);
+ if (param.getDirection() == Direction.IN || param.getDirection() == Direction.INOUT) {
+ if (i != 0) {
+ buffer.append(COMMA)
+ .append(SPACE);
+ }
+ if (param.getValue() != null) {
+ buffer.append(param.getValue().toString());
+ } else {
+ buffer.append(UNDEFINED_PARAM);
+ }
+ }
+ }
+ }
+ buffer.append(RPAREN);
+ }
+
+ /*
+ * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.metamatrix.data.language.IExistsCriteria)
+ */
+ public void visit(IExistsCriteria obj) {
+ buffer.append(EXISTS)
+ .append(SPACE)
+ .append(LPAREN);
+ append(obj.getQuery());
+ buffer.append(RPAREN);
+ }
+
+ /**
+ * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(org.teiid.connector.language.IFrom)
+ */
+ public void visit(IFrom obj) {
+ buffer.append(FROM)
+ .append(SPACE);
+ append(obj.getItems());
+ }
+
+ /**
+ * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(org.teiid.connector.language.IFunction)
+ */
+ public void visit(IFunction obj) {
+
+ String name = obj.getName();
+ List<IExpression> args = obj.getParameters();
+ if(name.equalsIgnoreCase(CONVERT) || name.equalsIgnoreCase(CAST)) {
+
+ Object typeValue = ((ILiteral)args.get(1)).getValue();
+
+ buffer.append(name);
+ buffer.append(LPAREN);
+
+ append(args.get(0));
+
+ if(name.equalsIgnoreCase(CONVERT)) {
+ buffer.append(COMMA);
+ buffer.append(SPACE);
+ } else {
+ buffer.append(SPACE);
+ buffer.append(AS);
+ buffer.append(SPACE);
+ }
+ buffer.append(typeValue);
+ buffer.append(RPAREN);
+ } else if(name.equals("%") || name.equals("+") || name.equals("-") || name.equals("*") || name.equals("/") || name.equals("||")) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+ buffer.append(LPAREN);
+
+ if(args != null) {
+ for(int i=0; i<args.size(); i++) {
+ append(args.get(i));
+ if(i < (args.size()-1)) {
+ buffer.append(SPACE);
+ buffer.append(name);
+ buffer.append(SPACE);
+ }
+ }
+ }
+ buffer.append(RPAREN);
+
+ } else if(name.equalsIgnoreCase(TIMESTAMPADD) || name.equalsIgnoreCase(TIMESTAMPDIFF)) {
+ buffer.append(name);
+ buffer.append(LPAREN);
+
+ if(args != null && args.size() > 0) {
+ buffer.append(((ILiteral)args.get(0)).getValue());
+
+ for(int i=1; i<args.size(); i++) {
+ buffer.append(COMMA);
+ buffer.append(SPACE);
+ append(args.get(i));
+ }
+ }
+ buffer.append(RPAREN);
+
+ } else {
+
+ buffer.append(obj.getName())
+ .append(LPAREN);
+ append(obj.getParameters());
+ buffer.append(RPAREN);
+ }
+ }
+
+ /**
+ * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(org.teiid.connector.language.IGroup)
+ */
+ public void visit(IGroup obj) {
+ MetadataObject groupID = obj.getMetadataObject();
+ if(groupID != null) {
+ buffer.append(getName(groupID));
+ } else {
+ if(obj.getDefinition() == null) {
+ buffer.append(obj.getContext());
+ } else {
+ buffer.append(obj.getDefinition());
+ }
+ }
+
+ if (obj.getDefinition() != null) {
+ buffer.append(SPACE);
+ if (useAsInGroupAlias()){
+ buffer.append(AS)
+ .append(SPACE);
+ }
+ buffer.append(obj.getContext());
+ }
+ }
+
+ /**
+ * Indicates whether group alias should be of the form
+ * "...FROM groupA AS X" or "...FROM groupA X". Certain
+ * data sources (such as Oracle) may not support the first
+ * form.
+ * @return boolean
+ */
+ protected boolean useAsInGroupAlias(){
+ return true;
+ }
+
+ /**
+ * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(org.teiid.connector.language.IGroupBy)
+ */
+ public void visit(IGroupBy obj) {
+ buffer.append(GROUP)
+ .append(SPACE)
+ .append(BY)
+ .append(SPACE);
+ append(obj.getElements());
+ }
+
+ /**
+ * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(org.teiid.connector.language.IInCriteria)
+ */
+ public void visit(IInCriteria obj) {
+ append(obj.getLeftExpression());
+ if (obj.isNegated()) {
+ buffer.append(SPACE)
+ .append(NOT);
+ }
+ buffer.append(SPACE)
+ .append(IN)
+ .append(SPACE)
+ .append(LPAREN);
+ append(obj.getRightExpressions());
+ buffer.append(RPAREN);
+ }
+
+ public void visit(IInlineView obj) {
+ buffer.append(LPAREN);
+ if (obj.getOutput() != null) {
+ buffer.append(obj.getOutput());
+ } else {
+ append(obj.getQuery());
+ }
+ buffer.append(RPAREN);
+ buffer.append(SPACE);
+ if(useAsInGroupAlias()) {
+ buffer.append(AS);
+ buffer.append(SPACE);
+ }
+ buffer.append(obj.getContext());
+ }
+
+ /**
+ * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(org.teiid.connector.language.IInsert)
+ */
+ public void visit(IInsert obj) {
+ formatBasicInsert(obj);
+ buffer.append(SPACE)
+ .append(VALUES)
+ .append(SPACE)
+ .append(LPAREN);
+ append(obj.getValues());
+ buffer.append(RPAREN);
+ }
+
+ /**
+ * @param obj
+ */
+ private void formatBasicInsert(IInsert obj) {
+ buffer.append(INSERT)
+ .append(SPACE);
+ buffer.append(getSourceComment(obj));
+ buffer.append(INTO)
+ .append(SPACE);
+ append(obj.getGroup());
+ if (obj.getElements() != null && obj.getElements().size() != 0) {
+ buffer.append(SPACE)
+ .append(LPAREN);
+
+ int elementCount= obj.getElements().size();
+ for(int i=0; i<elementCount; i++) {
+ buffer.append(getElementName(obj.getElements().get(i), false));
+ if (i<elementCount-1) {
+ buffer.append(COMMA);
+ buffer.append(SPACE);
+ }
+ }
+
+ buffer.append(RPAREN);
+ }
+ }
+
+ public void visit(IBulkInsert obj) {
+ formatBasicInsert(obj);
+ buffer.append(SPACE)
+ .append(VALUES)
+ .append(SPACE)
+ .append(LPAREN);
+ int elementCount= obj.getElements().size();
+ for(int i=0; i<elementCount; i++) {
+ buffer.append(UNDEFINED_PARAM);
+ if (i<elementCount-1) {
+ buffer.append(COMMA);
+ }
+ }
+ buffer.append(RPAREN);
+ }
+ /**
+ * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(org.teiid.connector.language.IIsNullCriteria)
+ */
+ public void visit(IIsNullCriteria obj) {
+ append(obj.getExpression());
+ buffer.append(SPACE)
+ .append(IS)
+ .append(SPACE);
+ if (obj.isNegated()) {
+ buffer.append(NOT)
+ .append(SPACE);
+ }
+ buffer.append(NULL);
+ }
+
+ /**
+ * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(org.teiid.connector.language.IJoin)
+ */
+ public void visit(IJoin obj) {
+ IFromItem leftItem = obj.getLeftItem();
+ if(leftItem instanceof IJoin) {
+ buffer.append(LPAREN);
+ append(leftItem);
+ buffer.append(RPAREN);
+ } else {
+ append(leftItem);
+ }
+ buffer.append(SPACE);
+
+ switch(obj.getJoinType()) {
+ case CROSS_JOIN:
+ buffer.append(CROSS);
+ break;
+ case FULL_OUTER_JOIN:
+ buffer.append(FULL)
+ .append(SPACE)
+ .append(OUTER);
+ break;
+ case INNER_JOIN:
+ buffer.append(INNER);
+ break;
+ case LEFT_OUTER_JOIN:
+ buffer.append(LEFT)
+ .append(SPACE)
+ .append(OUTER);
+ break;
+ case RIGHT_OUTER_JOIN:
+ buffer.append(RIGHT)
+ .append(SPACE)
+ .append(OUTER);
+ break;
+ default: buffer.append(UNDEFINED);
+ }
+ buffer.append(SPACE)
+ .append(JOIN)
+ .append(SPACE);
+
+ IFromItem rightItem = obj.getRightItem();
+ if(rightItem instanceof IJoin) {
+ buffer.append(LPAREN);
+ append(rightItem);
+ buffer.append(RPAREN);
+ } else {
+ append(rightItem);
+ }
+
+ final List criteria = obj.getCriteria();
+ if (criteria != null && criteria.size() != 0) {
+ buffer.append(SPACE)
+ .append(ON)
+ .append(SPACE);
+
+ Iterator critIter = criteria.iterator();
+ while(critIter.hasNext()) {
+ ICriteria crit = (ICriteria) critIter.next();
+ if(crit instanceof IPredicateCriteria) {
+ append(crit);
+ } else {
+ buffer.append(LPAREN);
+ append(crit);
+ buffer.append(RPAREN);
+ }
+
+ if(critIter.hasNext()) {
+ buffer.append(SPACE)
+ .append(AND)
+ .append(SPACE);
+ }
+ }
+ }
+ }
+
+ /**
+ * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(org.teiid.connector.language.ILikeCriteria)
+ */
+ public void visit(ILikeCriteria obj) {
+ append(obj.getLeftExpression());
+ if (obj.isNegated()) {
+ buffer.append(SPACE)
+ .append(NOT);
+ }
+ buffer.append(SPACE)
+ .append(LIKE)
+ .append(SPACE);
+ append(obj.getRightExpression());
+ if (obj.getEscapeCharacter() != null) {
+ buffer.append(SPACE)
+ .append(ESCAPE)
+ .append(SPACE)
+ .append(QUOTE)
+ .append(obj.getEscapeCharacter().toString())
+ .append(QUOTE);
+ }
+
+ }
+
+ public void visit(ILimit obj) {
+ buffer.append(LIMIT)
+ .append(SPACE);
+ if (obj.getRowOffset() > 0) {
+ buffer.append(obj.getRowOffset())
+ .append(COMMA)
+ .append(SPACE);
+ }
+ buffer.append(obj.getRowLimit());
+ }
+
+ /**
+ * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(org.teiid.connector.language.ILiteral)
+ */
+ public void visit(ILiteral obj) {
+ if (obj.getValue() == null) {
+ buffer.append(NULL);
+ } else {
+ Class type = obj.getType();
+ String val = obj.getValue().toString();
+ if(Number.class.isAssignableFrom(type)) {
+ buffer.append(val);
+ } else if(type.equals(DataTypeManager.DefaultDataClasses.BOOLEAN)) {
+ buffer.append("{b'") //$NON-NLS-1$
+ .append(val)
+ .append("'}"); //$NON-NLS-1$
+ } else if(type.equals(DataTypeManager.DefaultDataClasses.TIMESTAMP)) {
+ buffer.append("{ts'") //$NON-NLS-1$
+ .append(val)
+ .append("'}"); //$NON-NLS-1$
+ } else if(type.equals(DataTypeManager.DefaultDataClasses.TIME)) {
+ buffer.append("{t'") //$NON-NLS-1$
+ .append(val)
+ .append("'}"); //$NON-NLS-1$
+ } else if(type.equals(DataTypeManager.DefaultDataClasses.DATE)) {
+ buffer.append("{d'") //$NON-NLS-1$
+ .append(val)
+ .append("'}"); //$NON-NLS-1$
+ } else {
+ buffer.append(QUOTE)
+ .append(escapeString(val))
+ .append(QUOTE);
+ }
+ }
+ }
+
+ /**
+ * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(org.teiid.connector.language.INotCriteria)
+ */
+ public void visit(INotCriteria obj) {
+ buffer.append(NOT)
+ .append(SPACE)
+ .append(LPAREN);
+ append(obj.getCriteria());
+ buffer.append(RPAREN);
+ }
+
+ /**
+ * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(org.teiid.connector.language.IOrderBy)
+ */
+ public void visit(IOrderBy obj) {
+ buffer.append(ORDER)
+ .append(SPACE)
+ .append(BY)
+ .append(SPACE);
+ append(obj.getItems());
+ }
+
+ /**
+ * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(org.teiid.connector.language.IOrderByItem)
+ */
+ public void visit(IOrderByItem obj) {
+ if(obj.getName() != null) {
+ String name = getShortName(obj.getName());
+ buffer.append(name);
+ } else if (obj.getElement() != null) {
+ append(obj.getElement());
+ } else {
+ buffer.append(UNDEFINED);
+ }
+ if (obj.getDirection() == IOrderByItem.DESC) {
+ buffer.append(SPACE)
+ .append(DESC);
+ } // Don't print default "ASC"
+ }
+
+ /**
+ * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(org.teiid.connector.language.IParameter)
+ */
+ public void visit(IParameter obj) {
+ if (obj.getValue() == null) {
+ buffer.append(UNDEFINED_PARAM);
+ } else if (obj.getValue() == null) {
+ buffer.append(NULL);
+ } else {
+ buffer.append(obj.getValue().toString());
+ }
+ }
+
+ /**
+ * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(org.teiid.connector.language.IQuery)
+ */
+ public void visit(IQuery obj) {
+ visitSelect(obj.getSelect(), obj);
+ if (obj.getFrom() != null) {
+ buffer.append(SPACE);
+ append(obj.getFrom());
+ }
+ if (obj.getWhere() != null) {
+ buffer.append(SPACE)
+ .append(WHERE)
+ .append(SPACE);
+ append(obj.getWhere());
+ }
+ if (obj.getGroupBy() != null) {
+ buffer.append(SPACE);
+ append(obj.getGroupBy());
+ }
+ if (obj.getHaving() != null) {
+ buffer.append(SPACE)
+ .append(HAVING)
+ .append(SPACE);
+ append(obj.getHaving());
+ }
+ if (obj.getOrderBy() != null) {
+ buffer.append(SPACE);
+ append(obj.getOrderBy());
+ }
+ if (obj.getLimit() != null) {
+ buffer.append(SPACE);
+ append(obj.getLimit());
+ }
+ }
+
+ /**
+ * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(org.teiid.connector.language.ISearchedCaseExpression)
+ */
+ public void visit(ISearchedCaseExpression obj) {
+ buffer.append(CASE);
+ final int whenCount = obj.getWhenCount();
+ for (int i = 0; i < whenCount; i++) {
+ buffer.append(SPACE)
+ .append(WHEN)
+ .append(SPACE);
+ append(obj.getWhenCriteria(i));
+ buffer.append(SPACE)
+ .append(THEN)
+ .append(SPACE);
+ append(obj.getThenExpression(i));
+ }
+ if (obj.getElseExpression() != null) {
+ buffer.append(SPACE)
+ .append(ELSE)
+ .append(SPACE);
+ append(obj.getElseExpression());
+ }
+ buffer.append(SPACE)
+ .append(END);
+ }
+
+ /**
+ * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(org.teiid.connector.language.ISelect)
+ */
+ public void visit(ISelect obj) {
+ visitSelect(obj, null);
+ }
+
+ private void visitSelect(ISelect obj, ICommand command) {
+ buffer.append(SELECT).append(SPACE);
+ buffer.append(getSourceComment(command));
+ if (obj.isDistinct()) {
+ buffer.append(DISTINCT).append(SPACE);
+ }
+ append(obj.getSelectSymbols());
+ }
+
+ protected String getSourceComment(ICommand command) {
+ return ""; //$NON-NLS-1$
+ }
+
+ /*
+ * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.metamatrix.data.language.IScalarSubquery)
+ */
+ public void visit(IScalarSubquery obj) {
+ buffer.append(LPAREN);
+ append(obj.getQuery());
+ buffer.append(RPAREN);
+ }
+
+ /**
+ * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(org.teiid.connector.language.ISelectSymbol)
+ */
+ public void visit(ISelectSymbol obj) {
+ append(obj.getExpression());
+ if (obj.hasAlias()) {
+ buffer.append(SPACE)
+ .append(AS)
+ .append(SPACE)
+ .append(obj.getOutputName());
+ }
+ }
+
+ /*
+ * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.metamatrix.data.language.ISubqueryCompareCriteria)
+ */
+ public void visit(ISubqueryCompareCriteria obj) {
+ append(obj.getLeftExpression());
+ buffer.append(SPACE);
+
+ switch(obj.getOperator()) {
+ case EQ: buffer.append(EQ); break;
+ case GE: buffer.append(GE); break;
+ case GT: buffer.append(GT); break;
+ case LE: buffer.append(LE); break;
+ case LT: buffer.append(LT); break;
+ case NE: buffer.append(NE); break;
+ default: buffer.append(UNDEFINED);
+ }
+ buffer.append(SPACE);
+ switch(obj.getQuantifier()) {
+ case ALL: buffer.append(ALL); break;
+ case SOME: buffer.append(SOME); break;
+ default: buffer.append(UNDEFINED);
+ }
+ buffer.append(SPACE);
+ buffer.append(LPAREN);
+ append(obj.getQuery());
+ buffer.append(RPAREN);
+ }
+
+ /*
+ * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.metamatrix.data.language.ISubqueryInCriteria)
+ */
+ public void visit(ISubqueryInCriteria obj) {
+ append(obj.getLeftExpression());
+ if (obj.isNegated()) {
+ buffer.append(SPACE)
+ .append(NOT);
+ }
+ buffer.append(SPACE)
+ .append(IN)
+ .append(SPACE)
+ .append(LPAREN);
+ append(obj.getQuery());
+ buffer.append(RPAREN);
+ }
+
+ /**
+ * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(org.teiid.connector.language.IUpdate)
+ */
+ public void visit(IUpdate obj) {
+ buffer.append(UPDATE)
+ .append(SPACE);
+ buffer.append(getSourceComment(obj));
+ append(obj.getGroup());
+ buffer.append(SPACE)
+ .append(SET)
+ .append(SPACE);
+ append(obj.getChanges());
+ if (obj.getCriteria() != null) {
+ buffer.append(SPACE)
+ .append(WHERE)
+ .append(SPACE);
+ append(obj.getCriteria());
+ }
+ }
+
+ public void visit(ISetClauseList obj) {
+ append(obj.getClauses());
+ }
+
+ public void visit(ISetClause clause) {
+ buffer.append(getElementName(clause.getSymbol(), false));
+ buffer.append(SPACE).append(EQ).append(SPACE);
+ append(clause.getValue());
+ }
+
+ public void visit(ISetQuery obj) {
+ appendSetQuery(obj.getLeftQuery());
+
+ buffer.append(SPACE);
+
+ appendSetOperation(obj.getOperation());
+
+ if(obj.isAll()) {
+ buffer.append(SPACE);
+ buffer.append(ALL);
+ }
+ buffer.append(SPACE);
+
+ appendSetQuery(obj.getRightQuery());
+
+ IOrderBy orderBy = obj.getOrderBy();
+ if(orderBy != null) {
+ buffer.append(SPACE);
+ append(orderBy);
+ }
+
+ ILimit limit = obj.getLimit();
+ if(limit != null) {
+ buffer.append(SPACE);
+ append(limit);
+ }
+ }
+
+ protected void appendSetOperation(ISetQuery.Operation operation) {
+ buffer.append(operation);
+ }
+
+ protected boolean useParensForSetQueries() {
+ return false;
+ }
+
+ protected void appendSetQuery(IQueryCommand obj) {
+ if(obj instanceof ISetQuery || useParensForSetQueries()) {
+ buffer.append(LPAREN);
+ append(obj);
+ buffer.append(RPAREN);
+ } else {
+ append(obj);
+ }
+ }
+
+ /**
+ * Gets the SQL string representation for a given ILanguageObject.
+ * @param obj the root of the ILanguageObject hierarchy that needs to be
+ * converted. This can be any subtree, and does not need to be a top-level
+ * command
+ * @return the SQL representation of that ILanguageObject hierarchy
+ */
+ public static String getSQLString(ILanguageObject obj) {
+ SQLStringVisitor visitor = new SQLStringVisitor();
+ visitor.append(obj);
+ return visitor.toString();
+ }
+
+}
Copied: trunk/connector-api/src/main/java/org/teiid/connector/xa/api (from rev 498, trunk/connector-api/src/main/java/com/metamatrix/connector/xa/api)
Modified: trunk/connector-api/src/main/java/org/teiid/connector/xa/api/TransactionContext.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/xa/api/TransactionContext.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/xa/api/TransactionContext.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,7 +20,7 @@
* 02110-1301 USA.
*/
-package com.metamatrix.connector.xa.api;
+package org.teiid.connector.xa.api;
import javax.transaction.Transaction;
Modified: trunk/connector-api/src/main/java/org/teiid/connector/xa/api/XAConnection.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/xa/api/XAConnection.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/xa/api/XAConnection.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -22,13 +22,14 @@
/*
*/
-package com.metamatrix.connector.xa.api;
+package org.teiid.connector.xa.api;
import javax.transaction.xa.XAResource;
-import com.metamatrix.connector.api.Connection;
-import com.metamatrix.connector.api.ConnectorException;
+import org.teiid.connector.api.Connection;
+import org.teiid.connector.api.ConnectorException;
+
public interface XAConnection extends Connection{
/**
* Get XAResource for this connection
Modified: trunk/connector-api/src/main/java/org/teiid/connector/xa/api/XAConnector.java
===================================================================
--- trunk/connector-api/src/main/java/com/metamatrix/connector/xa/api/XAConnector.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/main/java/org/teiid/connector/xa/api/XAConnector.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -22,9 +22,9 @@
/*
*/
-package com.metamatrix.connector.xa.api;
+package org.teiid.connector.xa.api;
-import com.metamatrix.connector.api.*;
+import org.teiid.connector.api.*;
public interface XAConnector extends Connector{
Copied: trunk/connector-api/src/main/resources/org (from rev 498, trunk/connector-api/src/main/resources/com)
Property changes on: trunk/connector-api/src/main/resources/org
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: trunk/connector-api/src/main/resources/org/teiid (from rev 498, trunk/connector-api/src/main/resources/com/metamatrix)
Property changes on: trunk/connector-api/src/main/resources/org/teiid
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: trunk/connector-api/src/main/resources/org/teiid/connector (from rev 498, trunk/connector-api/src/main/resources/com/metamatrix/data)
Property changes on: trunk/connector-api/src/main/resources/org/teiid/connector
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: trunk/connector-api/src/test/java/org (from rev 498, trunk/connector-api/src/test/java/com)
Property changes on: trunk/connector-api/src/test/java/org
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: trunk/connector-api/src/test/java/org/teiid (from rev 498, trunk/connector-api/src/test/java/com/metamatrix)
Property changes on: trunk/connector-api/src/test/java/org/teiid
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: trunk/connector-api/src/test/java/org/teiid/connector (from rev 498, trunk/connector-api/src/test/java/com/metamatrix/data/pool)
Property changes on: trunk/connector-api/src/test/java/org/teiid/connector
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: trunk/connector-api/src/test/java/org/teiid/connector/TestCredentialMap.java
===================================================================
--- trunk/connector-api/src/test/java/com/metamatrix/data/pool/TestCredentialMap.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/test/java/org/teiid/connector/TestCredentialMap.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,13 +20,14 @@
* 02110-1301 USA.
*/
-package com.metamatrix.data.pool;
+package org.teiid.connector;
import java.util.HashMap;
import java.util.Map;
-import com.metamatrix.connector.api.CredentialMap;
+import org.teiid.connector.api.CredentialMap;
+
import junit.framework.TestCase;
/**
Copied: trunk/connector-api/src/test/java/org/teiid/connector/basic (from rev 498, trunk/connector-api/src/test/java/com/metamatrix/data/transform)
Property changes on: trunk/connector-api/src/test/java/org/teiid/connector/basic
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: trunk/connector-api/src/test/java/org/teiid/connector/basic/TestBasicValueTranslator.java
===================================================================
--- trunk/connector-api/src/test/java/com/metamatrix/data/transform/TestBasicValueTranslator.java 2009-02-25 18:12:40 UTC (rev 498)
+++ trunk/connector-api/src/test/java/org/teiid/connector/basic/TestBasicValueTranslator.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -20,16 +20,16 @@
* 02110-1301 USA.
*/
-package com.metamatrix.data.transform;
+package org.teiid.connector.basic;
import junit.framework.TestCase;
import org.mockito.Mockito;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.api.TypeFacility;
+import org.teiid.connector.basic.BasicValueTranslator;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.api.TypeFacility;
-import com.metamatrix.connector.basic.BasicValueTranslator;
/**
Modified: trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata/IndexConnector.java
===================================================================
--- trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata/IndexConnector.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata/IndexConnector.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -22,10 +22,11 @@
package com.metamatrix.connector.metadata;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.api.ConnectorAnnotations.ConnectionPooling;
+
import com.metamatrix.api.exception.MetaMatrixComponentException;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.api.ConnectorAnnotations.ConnectionPooling;
import com.metamatrix.connector.metadata.adapter.ObjectConnector;
import com.metamatrix.connector.metadata.internal.IObjectSource;
import com.metamatrix.dqp.internal.datamgr.impl.ConnectorEnvironmentImpl;
@@ -40,7 +41,7 @@
public class IndexConnector extends ObjectConnector {
/**
- * @see com.metamatrix.connector.metadata.adapter.ObjectConnector#getObjectSource(com.metamatrix.connector.api.ConnectorEnvironment, com.metamatrix.connector.api.ExecutionContext)
+ * @see com.metamatrix.connector.metadata.adapter.ObjectConnector#getObjectSource(org.teiid.connector.api.ConnectorEnvironment, org.teiid.connector.api.ExecutionContext)
*/
protected IObjectSource getMetadataObjectSource(final ExecutionContext context) throws ConnectorException {
ConnectorEnvironmentImpl internalEnvironment = (ConnectorEnvironmentImpl) this.getEnvironment();
Modified: trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata/MetadataProcedureExecution.java
===================================================================
--- trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata/MetadataProcedureExecution.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata/MetadataProcedureExecution.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -25,17 +25,18 @@
import java.util.Iterator;
import java.util.List;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.DataNotAvailableException;
-import com.metamatrix.connector.api.ProcedureExecution;
-import com.metamatrix.connector.basic.BasicExecution;
-import com.metamatrix.connector.language.IParameter;
-import com.metamatrix.connector.language.IProcedure;
-import com.metamatrix.connector.language.IParameter.Direction;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.DataNotAvailableException;
+import org.teiid.connector.api.ProcedureExecution;
+import org.teiid.connector.basic.BasicExecution;
+import org.teiid.connector.language.IParameter;
+import org.teiid.connector.language.IProcedure;
+import org.teiid.connector.language.IParameter.Direction;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
+
import com.metamatrix.connector.metadata.internal.IObjectSource;
import com.metamatrix.connector.metadata.internal.ObjectProcedure;
import com.metamatrix.connector.metadata.internal.ObjectProcedureProcessor;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
/**
@@ -86,7 +87,7 @@
}
/**
- * @see com.metamatrix.connector.api.ProcedureExecution#getOutputValue(com.metamatrix.connector.language.IParameter)
+ * @see org.teiid.connector.api.ProcedureExecution#getOutputValue(org.teiid.connector.language.IParameter)
* @since 4.2
*/
public Object getOutputValue(final IParameter parameter) throws ConnectorException {
@@ -98,7 +99,7 @@
}
/**
- * @see com.metamatrix.connector.api.Execution#cancel()
+ * @see org.teiid.connector.api.Execution#cancel()
* @since 4.2
*/
public void cancel() throws ConnectorException {
@@ -106,7 +107,7 @@
}
/**
- * @see com.metamatrix.connector.api.Execution#close()
+ * @see org.teiid.connector.api.Execution#close()
* @since 4.2
*/
public void close() throws ConnectorException {
Modified: trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata/adapter/ObjectConnection.java
===================================================================
--- trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata/adapter/ObjectConnection.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata/adapter/ObjectConnection.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -22,18 +22,19 @@
package com.metamatrix.connector.metadata.adapter;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.api.ProcedureExecution;
-import com.metamatrix.connector.api.ResultSetExecution;
-import com.metamatrix.connector.basic.BasicConnection;
-import com.metamatrix.connector.language.IProcedure;
-import com.metamatrix.connector.language.IQuery;
-import com.metamatrix.connector.language.IQueryCommand;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.api.ProcedureExecution;
+import org.teiid.connector.api.ResultSetExecution;
+import org.teiid.connector.basic.BasicConnection;
+import org.teiid.connector.language.IProcedure;
+import org.teiid.connector.language.IQuery;
+import org.teiid.connector.language.IQueryCommand;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
+
import com.metamatrix.connector.metadata.MetadataProcedureExecution;
import com.metamatrix.connector.metadata.internal.IObjectSource;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
/**
* Adapter to make object processing code comply with the standard connector API.
Modified: trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata/adapter/ObjectConnector.java
===================================================================
--- trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata/adapter/ObjectConnector.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata/adapter/ObjectConnector.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -22,12 +22,13 @@
package com.metamatrix.connector.metadata.adapter;
-import com.metamatrix.connector.api.Connection;
-import com.metamatrix.connector.api.ConnectorCapabilities;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.basic.BasicConnector;
+import org.teiid.connector.api.Connection;
+import org.teiid.connector.api.ConnectorCapabilities;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.basic.BasicConnector;
+
import com.metamatrix.connector.metadata.internal.IObjectSource;
/**
Modified: trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata/adapter/ObjectConnectorCapabilities.java
===================================================================
--- trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata/adapter/ObjectConnectorCapabilities.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata/adapter/ObjectConnectorCapabilities.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -25,9 +25,10 @@
import java.util.ArrayList;
import java.util.List;
-import com.metamatrix.connector.api.ConnectorCapabilities;
-import com.metamatrix.connector.basic.BasicConnectorCapabilities;
+import org.teiid.connector.api.ConnectorCapabilities;
+import org.teiid.connector.basic.BasicConnectorCapabilities;
+
/**
* Describes the capabilities of the object connector, which are few.
*/
@@ -64,7 +65,7 @@
}
/**
- * @see com.metamatrix.connector.basic.BasicConnectorCapabilities#supportsLikeCriteria()
+ * @see org.teiid.connector.basic.BasicConnectorCapabilities#supportsLikeCriteria()
* @since 4.3
*/
public boolean supportsLikeCriteria() {
@@ -79,7 +80,7 @@
}
/**
- * @see com.metamatrix.connector.basic.BasicConnectorCapabilities#supportsScalarFunctions()
+ * @see org.teiid.connector.basic.BasicConnectorCapabilities#supportsScalarFunctions()
* @since 4.3
*/
public boolean supportsScalarFunctions() {
@@ -87,7 +88,7 @@
}
/**
- * @see com.metamatrix.connector.basic.BasicConnectorCapabilities#getSupportedFunctions()
+ * @see org.teiid.connector.basic.BasicConnectorCapabilities#getSupportedFunctions()
* @since 4.3
*/
public List getSupportedFunctions() {
@@ -104,7 +105,7 @@
}
/**
- * @see com.metamatrix.connector.basic.BasicConnectorCapabilities#supportsLikeCriteriaEscapeCharacter()
+ * @see org.teiid.connector.basic.BasicConnectorCapabilities#supportsLikeCriteriaEscapeCharacter()
* @since 5.0
*/
public boolean supportsLikeCriteriaEscapeCharacter() {
Modified: trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata/adapter/ObjectSynchExecution.java
===================================================================
--- trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata/adapter/ObjectSynchExecution.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata/adapter/ObjectSynchExecution.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -25,17 +25,18 @@
import java.util.Iterator;
import java.util.List;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.DataNotAvailableException;
-import com.metamatrix.connector.api.ResultSetExecution;
-import com.metamatrix.connector.basic.BasicExecution;
-import com.metamatrix.connector.language.IQuery;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.DataNotAvailableException;
+import org.teiid.connector.api.ResultSetExecution;
+import org.teiid.connector.basic.BasicExecution;
+import org.teiid.connector.language.IQuery;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
+
import com.metamatrix.connector.metadata.MetadataConnectorPlugin;
import com.metamatrix.connector.metadata.internal.IObjectQuery;
import com.metamatrix.connector.metadata.internal.MetadataException;
import com.metamatrix.connector.metadata.internal.ObjectQuery;
import com.metamatrix.connector.metadata.internal.ObjectQueryProcessor;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
/**
* Adapter to expose the object processing logic via the standard connector API.
Modified: trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata/internal/MetadataSearchCriteriaBuilder.java
===================================================================
--- trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata/internal/MetadataSearchCriteriaBuilder.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata/internal/MetadataSearchCriteriaBuilder.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -28,18 +28,19 @@
import java.util.Iterator;
import java.util.Map;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.language.ICompareCriteria;
+import org.teiid.connector.language.ICompoundCriteria;
+import org.teiid.connector.language.ICriteria;
+import org.teiid.connector.language.IExpression;
+import org.teiid.connector.language.IInCriteria;
+import org.teiid.connector.language.IIsNullCriteria;
+import org.teiid.connector.language.ILikeCriteria;
+import org.teiid.connector.language.IParameter;
+import org.teiid.connector.language.IQuery;
+import org.teiid.connector.language.ICompareCriteria.Operator;
+
import com.metamatrix.api.exception.query.CriteriaEvaluationException;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.language.ICompareCriteria;
-import com.metamatrix.connector.language.ICompoundCriteria;
-import com.metamatrix.connector.language.ICriteria;
-import com.metamatrix.connector.language.IExpression;
-import com.metamatrix.connector.language.IInCriteria;
-import com.metamatrix.connector.language.IIsNullCriteria;
-import com.metamatrix.connector.language.ILikeCriteria;
-import com.metamatrix.connector.language.IParameter;
-import com.metamatrix.connector.language.IQuery;
-import com.metamatrix.connector.language.ICompareCriteria.Operator;
import com.metamatrix.connector.metadata.MetadataConnectorConstants;
import com.metamatrix.connector.metadata.MetadataConnectorPlugin;
import com.metamatrix.connector.metadata.index.MetadataInCriteria;
@@ -284,7 +285,7 @@
* @since 4.3
*/
private void buildMetadataCompoundCriteria(ICompoundCriteria compoundCriteria) throws ConnectorException {
- if (compoundCriteria.getOperator() == com.metamatrix.connector.language.ICompoundCriteria.Operator.AND) {
+ if (compoundCriteria.getOperator() == org.teiid.connector.language.ICompoundCriteria.Operator.AND) {
for(final Iterator critIter = compoundCriteria.getCriteria().iterator(); critIter.hasNext();) {
buildMetadataSearchCriteria((ICriteria)critIter.next());
}
Modified: trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata/internal/ObjectProcedure.java
===================================================================
--- trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata/internal/ObjectProcedure.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata/internal/ObjectProcedure.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -29,18 +29,19 @@
import java.util.List;
import java.util.Map;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.language.ICommand;
-import com.metamatrix.connector.language.IMetadataReference;
-import com.metamatrix.connector.language.IParameter;
-import com.metamatrix.connector.language.IProcedure;
-import com.metamatrix.connector.language.IParameter.Direction;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.language.ICommand;
+import org.teiid.connector.language.IMetadataReference;
+import org.teiid.connector.language.IParameter;
+import org.teiid.connector.language.IProcedure;
+import org.teiid.connector.language.IParameter.Direction;
+import org.teiid.connector.metadata.runtime.Element;
+import org.teiid.connector.metadata.runtime.MetadataObject;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
+
import com.metamatrix.connector.metadata.MetadataConnectorConstants;
import com.metamatrix.connector.metadata.MetadataConnectorPlugin;
import com.metamatrix.connector.metadata.index.MetadataLiteralCriteria;
-import com.metamatrix.connector.metadata.runtime.Element;
-import com.metamatrix.connector.metadata.runtime.MetadataObject;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
import com.metamatrix.core.MetaMatrixRuntimeException;
import com.metamatrix.core.util.ArgCheck;
import com.metamatrix.core.util.StringUtil;
Modified: trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata/internal/ObjectProcedureProcessor.java
===================================================================
--- trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata/internal/ObjectProcedureProcessor.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata/internal/ObjectProcedureProcessor.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -31,12 +31,13 @@
import java.util.List;
import java.util.Map;
+import org.teiid.connector.api.ConnectorException;
+
import com.metamatrix.common.types.BlobType;
import com.metamatrix.common.types.ClobImpl;
import com.metamatrix.common.types.ClobType;
import com.metamatrix.common.types.DataTypeManager;
import com.metamatrix.common.vdb.api.VDBFile;
-import com.metamatrix.connector.api.ConnectorException;
import com.metamatrix.connector.metadata.MetadataConnectorConstants;
import com.metamatrix.connector.metadata.ResultsIterator;
import com.metamatrix.core.util.ArgCheck;
Modified: trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata/internal/ObjectQuery.java
===================================================================
--- trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata/internal/ObjectQuery.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata/internal/ObjectQuery.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -27,20 +27,21 @@
import java.util.List;
import java.util.Map;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.language.ICommand;
-import com.metamatrix.connector.language.IElement;
-import com.metamatrix.connector.language.IExpression;
-import com.metamatrix.connector.language.IFunction;
-import com.metamatrix.connector.language.IGroup;
-import com.metamatrix.connector.language.ILiteral;
-import com.metamatrix.connector.language.IMetadataReference;
-import com.metamatrix.connector.language.IQuery;
-import com.metamatrix.connector.language.ISelectSymbol;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.language.ICommand;
+import org.teiid.connector.language.IElement;
+import org.teiid.connector.language.IExpression;
+import org.teiid.connector.language.IFunction;
+import org.teiid.connector.language.IGroup;
+import org.teiid.connector.language.ILiteral;
+import org.teiid.connector.language.IMetadataReference;
+import org.teiid.connector.language.IQuery;
+import org.teiid.connector.language.ISelectSymbol;
+import org.teiid.connector.metadata.runtime.Element;
+import org.teiid.connector.metadata.runtime.MetadataObject;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
+
import com.metamatrix.connector.metadata.MetadataConnectorPlugin;
-import com.metamatrix.connector.metadata.runtime.Element;
-import com.metamatrix.connector.metadata.runtime.MetadataObject;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
import com.metamatrix.core.MetaMatrixRuntimeException;
import com.metamatrix.core.util.ArgCheck;
import com.metamatrix.core.util.Assertion;
Modified: trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata/TestIndexConnector.java
===================================================================
--- trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata/TestIndexConnector.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata/TestIndexConnector.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -28,24 +28,25 @@
import java.util.Map;
import java.util.Properties;
+import org.teiid.connector.api.Connection;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.DataNotAvailableException;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.api.ResultSetExecution;
+import org.teiid.connector.language.IQuery;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
+
import junit.framework.TestCase;
import com.metamatrix.cdk.CommandBuilder;
import com.metamatrix.cdk.api.EnvironmentUtility;
import com.metamatrix.common.application.ApplicationEnvironment;
import com.metamatrix.common.application.ApplicationService;
-import com.metamatrix.connector.api.Connection;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.DataNotAvailableException;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.api.ResultSetExecution;
-import com.metamatrix.connector.language.IQuery;
import com.metamatrix.connector.metadata.adapter.ObjectConnector;
import com.metamatrix.connector.metadata.internal.IObjectSource;
import com.metamatrix.connector.metadata.internal.TestConnectorHost;
import com.metamatrix.connector.metadata.internal.TestObjectQueryProcessor;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
import com.metamatrix.core.MetaMatrixRuntimeException;
import com.metamatrix.dqp.internal.datamgr.impl.ConnectorEnvironmentImpl;
import com.metamatrix.dqp.internal.datamgr.impl.ExecutionContextImpl;
Modified: trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata/adapter/FakeObjectConnector.java
===================================================================
--- trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata/adapter/FakeObjectConnector.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata/adapter/FakeObjectConnector.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -26,8 +26,9 @@
import java.util.List;
import java.util.Map;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ExecutionContext;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ExecutionContext;
+
import com.metamatrix.connector.metadata.internal.IObjectSource;
public class FakeObjectConnector extends ObjectConnector {
@@ -43,7 +44,7 @@
/**
- * @see com.metamatrix.connector.metadata.adapter.ObjectConnector#getMetadataObjectSource(com.metamatrix.connector.api.ExecutionContext)
+ * @see com.metamatrix.connector.metadata.adapter.ObjectConnector#getMetadataObjectSource(org.teiid.connector.api.ExecutionContext)
* @since 4.3
*/
protected IObjectSource getMetadataObjectSource(ExecutionContext context) throws ConnectorException {
Modified: trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata/adapter/TestObjectConnector.java
===================================================================
--- trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata/adapter/TestObjectConnector.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata/adapter/TestObjectConnector.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -27,17 +27,18 @@
import java.util.List;
import java.util.Properties;
+import org.teiid.connector.api.Connection;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.api.ResultSetExecution;
+import org.teiid.connector.language.IQuery;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
+
import junit.framework.TestCase;
import com.metamatrix.cdk.CommandBuilder;
import com.metamatrix.cdk.api.EnvironmentUtility;
-import com.metamatrix.connector.api.Connection;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.api.ResultSetExecution;
-import com.metamatrix.connector.language.IQuery;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
import com.metamatrix.core.MetaMatrixRuntimeException;
import com.metamatrix.dqp.internal.datamgr.impl.ConnectorEnvironmentImpl;
import com.metamatrix.query.metadata.QueryMetadataInterface;
Modified: trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata/internal/TestConnectorHost.java
===================================================================
--- trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata/internal/TestConnectorHost.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata/internal/TestConnectorHost.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -27,12 +27,13 @@
import java.util.List;
import java.util.Properties;
+import org.teiid.connector.api.ConnectorException;
+
import junit.framework.TestCase;
import com.metamatrix.cdk.IConnectorHost;
import com.metamatrix.cdk.api.ConnectorHost;
import com.metamatrix.cdk.api.TranslationUtility;
-import com.metamatrix.connector.api.ConnectorException;
import com.metamatrix.connector.metadata.IndexConnector;
import com.metamatrix.dqp.service.DQPServiceNames;
import com.metamatrix.metadata.runtime.FakeMetadataService;
Modified: trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata/internal/TestMetadataSearchCriteriaBuilder.java
===================================================================
--- trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata/internal/TestMetadataSearchCriteriaBuilder.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata/internal/TestMetadataSearchCriteriaBuilder.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -27,13 +27,14 @@
import java.util.List;
import java.util.Map;
+import org.teiid.connector.language.ICommand;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
+
import junit.framework.TestCase;
import com.metamatrix.cdk.CommandBuilder;
-import com.metamatrix.connector.language.ICommand;
import com.metamatrix.connector.metadata.index.MetadataInCriteria;
import com.metamatrix.connector.metadata.index.MetadataLiteralCriteria;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
import com.metamatrix.dqp.internal.datamgr.language.LanguageBridgeFactory;
import com.metamatrix.query.parser.QueryParser;
import com.metamatrix.query.resolver.QueryResolver;
Modified: trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata/internal/TestObjectProcedure.java
===================================================================
--- trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata/internal/TestObjectProcedure.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata/internal/TestObjectProcedure.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -23,10 +23,12 @@
package com.metamatrix.connector.metadata.internal;
import java.util.Map;
+
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
+
import junit.framework.TestCase;
import com.metamatrix.cdk.CommandBuilder;
import com.metamatrix.connector.metadata.index.MetadataLiteralCriteria;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
import com.metamatrix.core.MetaMatrixRuntimeException;
import com.metamatrix.query.unittest.QueryMetadataInterfaceBuilder;
Modified: trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata/internal/TestObjectQuery.java
===================================================================
--- trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata/internal/TestObjectQuery.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata/internal/TestObjectQuery.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -22,11 +22,12 @@
package com.metamatrix.connector.metadata.internal;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
+
import junit.framework.TestCase;
import com.metamatrix.cdk.CommandBuilder;
import com.metamatrix.connector.metadata.index.MetadataLiteralCriteria;
import com.metamatrix.connector.metadata.index.MetadataSearchCriteria;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
import com.metamatrix.core.MetaMatrixRuntimeException;
import com.metamatrix.query.unittest.QueryMetadataInterfaceBuilder;
Modified: trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata/internal/TestObjectQueryProcessor.java
===================================================================
--- trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata/internal/TestObjectQueryProcessor.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata/internal/TestObjectQueryProcessor.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -29,11 +29,12 @@
import java.util.Iterator;
import java.util.List;
+import org.teiid.connector.language.ICommand;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
+
import junit.framework.TestCase;
import com.metamatrix.cdk.CommandBuilder;
-import com.metamatrix.connector.language.ICommand;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
import com.metamatrix.core.util.StringUtil;
import com.metamatrix.core.util.UnitTestUtil;
import com.metamatrix.dqp.internal.datamgr.metadata.RuntimeMetadataImpl;
Modified: trunk/connector-sdk/src/main/java/com/metamatrix/cdk/CommandBuilder.java
===================================================================
--- trunk/connector-sdk/src/main/java/com/metamatrix/cdk/CommandBuilder.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connector-sdk/src/main/java/com/metamatrix/cdk/CommandBuilder.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -26,12 +26,13 @@
import java.util.Iterator;
import java.util.List;
+import org.teiid.connector.language.ICommand;
+import org.teiid.connector.language.ILanguageFactory;
+
import com.metamatrix.api.exception.MetaMatrixComponentException;
import com.metamatrix.api.exception.query.QueryParserException;
import com.metamatrix.api.exception.query.QueryResolverException;
import com.metamatrix.api.exception.query.QueryValidatorException;
-import com.metamatrix.connector.language.ICommand;
-import com.metamatrix.connector.language.ILanguageFactory;
import com.metamatrix.core.MetaMatrixRuntimeException;
import com.metamatrix.dqp.internal.datamgr.language.LanguageBridgeFactory;
import com.metamatrix.dqp.internal.datamgr.language.LanguageFactoryImpl;
Modified: trunk/connector-sdk/src/main/java/com/metamatrix/cdk/ConnectorShellCommandTarget.java
===================================================================
--- trunk/connector-sdk/src/main/java/com/metamatrix/cdk/ConnectorShellCommandTarget.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connector-sdk/src/main/java/com/metamatrix/cdk/ConnectorShellCommandTarget.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -41,6 +41,12 @@
import java.util.StringTokenizer;
import java.util.TreeSet;
+import org.teiid.connector.api.Connector;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.language.ICommand;
+import org.teiid.connector.language.IProcedure;
+import org.teiid.connector.language.IQuery;
+
import com.metamatrix.cdk.api.ConnectorHost;
import com.metamatrix.cdk.file.ConfigReaderWriter;
import com.metamatrix.cdk.file.XMLConfigReaderWriter;
@@ -53,11 +59,6 @@
import com.metamatrix.common.config.model.BasicExtensionModule;
import com.metamatrix.common.config.xml.XMLConfigurationImportExportUtility;
import com.metamatrix.common.util.ByteArrayHelper;
-import com.metamatrix.connector.api.Connector;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.language.ICommand;
-import com.metamatrix.connector.language.IProcedure;
-import com.metamatrix.connector.language.IQuery;
import com.metamatrix.core.MetaMatrixRuntimeException;
import com.metamatrix.core.commandshell.ConnectorResultUtility;
import com.metamatrix.core.factory.ComponentLoader;
Modified: trunk/connector-sdk/src/main/java/com/metamatrix/cdk/IConnectorHost.java
===================================================================
--- trunk/connector-sdk/src/main/java/com/metamatrix/cdk/IConnectorHost.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connector-sdk/src/main/java/com/metamatrix/cdk/IConnectorHost.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -26,9 +26,10 @@
import java.util.List;
import java.util.Properties;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.language.ICommand;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.language.ICommand;
+
/**
*/
public interface IConnectorHost {
Modified: trunk/connector-sdk/src/main/java/com/metamatrix/cdk/api/ConnectorHost.java
===================================================================
--- trunk/connector-sdk/src/main/java/com/metamatrix/cdk/api/ConnectorHost.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connector-sdk/src/main/java/com/metamatrix/cdk/api/ConnectorHost.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -28,21 +28,22 @@
import java.util.List;
import java.util.Properties;
+import org.teiid.connector.api.Connection;
+import org.teiid.connector.api.Connector;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.DataNotAvailableException;
+import org.teiid.connector.api.Execution;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.api.ResultSetExecution;
+import org.teiid.connector.api.UpdateExecution;
+import org.teiid.connector.language.ICommand;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
+
import com.metamatrix.cdk.IConnectorHost;
import com.metamatrix.common.application.ApplicationEnvironment;
import com.metamatrix.common.application.ApplicationService;
import com.metamatrix.common.util.PropertiesUtils;
-import com.metamatrix.connector.api.Connection;
-import com.metamatrix.connector.api.Connector;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.DataNotAvailableException;
-import com.metamatrix.connector.api.Execution;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.api.ResultSetExecution;
-import com.metamatrix.connector.api.UpdateExecution;
-import com.metamatrix.connector.language.ICommand;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
import com.metamatrix.dqp.internal.datamgr.impl.ConnectorEnvironmentImpl;
import com.metamatrix.dqp.internal.datamgr.impl.ExecutionContextImpl;
import com.metamatrix.dqp.internal.datamgr.language.BatchedUpdatesImpl;
Modified: trunk/connector-sdk/src/main/java/com/metamatrix/cdk/api/EnvironmentUtility.java
===================================================================
--- trunk/connector-sdk/src/main/java/com/metamatrix/cdk/api/EnvironmentUtility.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connector-sdk/src/main/java/com/metamatrix/cdk/api/EnvironmentUtility.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -25,10 +25,11 @@
import java.io.Serializable;
import java.util.Properties;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorLogger;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.internal.ConnectorPropertyNames;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorLogger;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.internal.ConnectorPropertyNames;
+
import com.metamatrix.dqp.internal.datamgr.impl.ConnectorEnvironmentImpl;
import com.metamatrix.dqp.internal.datamgr.impl.ExecutionContextImpl;
Modified: trunk/connector-sdk/src/main/java/com/metamatrix/cdk/api/SysLogger.java
===================================================================
--- trunk/connector-sdk/src/main/java/com/metamatrix/cdk/api/SysLogger.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connector-sdk/src/main/java/com/metamatrix/cdk/api/SysLogger.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -24,8 +24,9 @@
import java.util.Date;
-import com.metamatrix.connector.api.ConnectorLogger;
+import org.teiid.connector.api.ConnectorLogger;
+
/**
* ConnectorLogger that prints output to System.out.
*/
Modified: trunk/connector-sdk/src/main/java/com/metamatrix/cdk/api/TranslationUtility.java
===================================================================
--- trunk/connector-sdk/src/main/java/com/metamatrix/cdk/api/TranslationUtility.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connector-sdk/src/main/java/com/metamatrix/cdk/api/TranslationUtility.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -25,9 +25,10 @@
import java.io.IOException;
import java.net.URL;
+import org.teiid.connector.language.ICommand;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
+
import com.metamatrix.cdk.CommandBuilder;
-import com.metamatrix.connector.language.ICommand;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
import com.metamatrix.dqp.internal.datamgr.metadata.RuntimeMetadataImpl;
import com.metamatrix.metadata.runtime.VDBMetadataFactory;
import com.metamatrix.query.metadata.QueryMetadataInterface;
Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/JDBCBaseExecution.java
===================================================================
--- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/JDBCBaseExecution.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/JDBCBaseExecution.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -31,16 +31,16 @@
import java.util.Arrays;
import java.util.Properties;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorIdentity;
+import org.teiid.connector.api.ConnectorLogger;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.basic.BasicExecution;
import org.teiid.connector.jdbc.translator.TranslatedCommand;
import org.teiid.connector.jdbc.translator.Translator;
+import org.teiid.connector.language.ICommand;
import com.metamatrix.common.util.PropertiesUtils;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ConnectorIdentity;
-import com.metamatrix.connector.api.ConnectorLogger;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.basic.BasicExecution;
-import com.metamatrix.connector.language.ICommand;
/**
*/
Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/JDBCCapabilities.java
===================================================================
--- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/JDBCCapabilities.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/JDBCCapabilities.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -25,8 +25,9 @@
import java.util.Arrays;
import java.util.List;
-import com.metamatrix.connector.basic.BasicConnectorCapabilities;
+import org.teiid.connector.basic.BasicConnectorCapabilities;
+
/**
*/
public class JDBCCapabilities extends BasicConnectorCapabilities {
@@ -48,7 +49,7 @@
}
/**
- * @see com.metamatrix.connector.basic.BasicConnectorCapabilities#getMaxInCriteriaSize()
+ * @see org.teiid.connector.basic.BasicConnectorCapabilities#getMaxInCriteriaSize()
* @since 4.2
*/
public int getMaxInCriteriaSize() {
@@ -347,7 +348,7 @@
}
/**
- * @see com.metamatrix.connector.api.ConnectorCapabilities#supportsInlineViews()
+ * @see org.teiid.connector.api.ConnectorCapabilities#supportsInlineViews()
*/
public boolean supportsInlineViews() {
return false;
@@ -358,21 +359,21 @@
}
/**
- * @see com.metamatrix.connector.api.ConnectorCapabilities#supportsQuantifiedCompareCriteriaSome()
+ * @see org.teiid.connector.api.ConnectorCapabilities#supportsQuantifiedCompareCriteriaSome()
*/
public boolean supportsQuantifiedCompareCriteriaSome() {
return true;
}
/**
- * @see com.metamatrix.connector.api.ConnectorCapabilities#supportsUnionOrderBy()
+ * @see org.teiid.connector.api.ConnectorCapabilities#supportsUnionOrderBy()
*/
public boolean supportsUnionOrderBy() {
return true;
}
/**
- * @see com.metamatrix.connector.basic.BasicConnectorCapabilities#supportsSetQueryOrderBy()
+ * @see org.teiid.connector.basic.BasicConnectorCapabilities#supportsSetQueryOrderBy()
*/
@Override
public boolean supportsSetQueryOrderBy() {
@@ -380,7 +381,7 @@
}
/**
- * @see com.metamatrix.connector.api.ConnectorCapabilities#supportsUnions()
+ * @see org.teiid.connector.api.ConnectorCapabilities#supportsUnions()
*/
public boolean supportsUnions() {
return true;
Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/JDBCConnector.java
===================================================================
--- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/JDBCConnector.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/JDBCConnector.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -34,25 +34,25 @@
import javax.sql.DataSource;
import javax.sql.XADataSource;
+import org.teiid.connector.api.Connection;
+import org.teiid.connector.api.ConnectorCapabilities;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorLogger;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.api.MappedUserIdentity;
+import org.teiid.connector.api.SingleIdentity;
+import org.teiid.connector.api.ConnectorAnnotations.ConnectionPooling;
+import org.teiid.connector.basic.BasicConnector;
+import org.teiid.connector.internal.ConnectorPropertyNames;
import org.teiid.connector.jdbc.translator.Translator;
import org.teiid.connector.jdbc.xa.JDBCSourceXAConnection;
import org.teiid.connector.jdbc.xa.XAJDBCPropertyNames;
+import org.teiid.connector.xa.api.TransactionContext;
+import org.teiid.connector.xa.api.XAConnection;
+import org.teiid.connector.xa.api.XAConnector;
import com.metamatrix.common.util.PropertiesUtils;
-import com.metamatrix.connector.api.Connection;
-import com.metamatrix.connector.api.ConnectorCapabilities;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ConnectorLogger;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.api.SingleIdentity;
-import com.metamatrix.connector.api.MappedUserIdentity;
-import com.metamatrix.connector.api.ConnectorAnnotations.ConnectionPooling;
-import com.metamatrix.connector.basic.BasicConnector;
-import com.metamatrix.connector.internal.ConnectorPropertyNames;
-import com.metamatrix.connector.xa.api.TransactionContext;
-import com.metamatrix.connector.xa.api.XAConnection;
-import com.metamatrix.connector.xa.api.XAConnector;
import com.metamatrix.core.MetaMatrixCoreException;
import com.metamatrix.core.util.ReflectionHelper;
Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/JDBCExecutionException.java
===================================================================
--- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/JDBCExecutionException.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/JDBCExecutionException.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -25,9 +25,9 @@
import java.sql.SQLException;
import java.util.Arrays;
+import org.teiid.connector.api.ConnectorException;
import org.teiid.connector.jdbc.translator.TranslatedCommand;
-import com.metamatrix.connector.api.ConnectorException;
public class JDBCExecutionException extends ConnectorException {
Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/JDBCExecutionHelper.java
===================================================================
--- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/JDBCExecutionHelper.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/JDBCExecutionHelper.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -27,12 +27,13 @@
import java.util.Iterator;
import java.util.List;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.api.TypeFacility;
-import com.metamatrix.connector.api.ValueTranslator;
-import com.metamatrix.connector.basic.BasicValueTranslator;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.api.TypeFacility;
+import org.teiid.connector.api.ValueTranslator;
+import org.teiid.connector.basic.BasicValueTranslator;
+
/**
*/
public class JDBCExecutionHelper {
Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/JDBCProcedureExecution.java
===================================================================
--- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/JDBCProcedureExecution.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/JDBCProcedureExecution.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -32,21 +32,21 @@
import java.util.Map;
import java.util.Properties;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorLogger;
+import org.teiid.connector.api.DataNotAvailableException;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.api.ProcedureExecution;
import org.teiid.connector.jdbc.translator.TranslatedCommand;
import org.teiid.connector.jdbc.translator.Translator;
+import org.teiid.connector.language.ICommand;
+import org.teiid.connector.language.IParameter;
+import org.teiid.connector.language.IProcedure;
+import org.teiid.connector.language.IParameter.Direction;
+import org.teiid.connector.metadata.runtime.Element;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ConnectorLogger;
-import com.metamatrix.connector.api.DataNotAvailableException;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.api.ProcedureExecution;
-import com.metamatrix.connector.language.ICommand;
-import com.metamatrix.connector.language.IParameter;
-import com.metamatrix.connector.language.IProcedure;
-import com.metamatrix.connector.language.IParameter.Direction;
-import com.metamatrix.connector.metadata.runtime.Element;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
/**
*/
Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/JDBCQueryExecution.java
===================================================================
--- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/JDBCQueryExecution.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/JDBCQueryExecution.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -35,19 +35,19 @@
import java.util.List;
import java.util.Properties;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorLogger;
+import org.teiid.connector.api.DataNotAvailableException;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.api.ResultSetExecution;
+import org.teiid.connector.api.TypeFacility;
+import org.teiid.connector.api.ValueTranslator;
import org.teiid.connector.jdbc.translator.TranslatedCommand;
import org.teiid.connector.jdbc.translator.Translator;
+import org.teiid.connector.language.ICommand;
+import org.teiid.connector.language.IQueryCommand;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ConnectorLogger;
-import com.metamatrix.connector.api.DataNotAvailableException;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.api.ResultSetExecution;
-import com.metamatrix.connector.api.TypeFacility;
-import com.metamatrix.connector.api.ValueTranslator;
-import com.metamatrix.connector.language.ICommand;
-import com.metamatrix.connector.language.IQueryCommand;
/**
*
Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/JDBCSourceConnection.java
===================================================================
--- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/JDBCSourceConnection.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/JDBCSourceConnection.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -28,24 +28,24 @@
import java.sql.SQLException;
import java.sql.Statement;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorLogger;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.api.ProcedureExecution;
+import org.teiid.connector.api.ResultSetExecution;
+import org.teiid.connector.api.UpdateExecution;
import org.teiid.connector.jdbc.translator.Translator;
+import org.teiid.connector.language.ICommand;
+import org.teiid.connector.language.IProcedure;
+import org.teiid.connector.language.IQueryCommand;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ConnectorLogger;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.api.ProcedureExecution;
-import com.metamatrix.connector.api.ResultSetExecution;
-import com.metamatrix.connector.api.UpdateExecution;
-import com.metamatrix.connector.language.ICommand;
-import com.metamatrix.connector.language.IProcedure;
-import com.metamatrix.connector.language.IQueryCommand;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
/**
*
*/
-public class JDBCSourceConnection extends com.metamatrix.connector.basic.BasicConnection {
+public class JDBCSourceConnection extends org.teiid.connector.basic.BasicConnection {
protected java.sql.Connection physicalConnection;
protected ConnectorEnvironment environment;
private ConnectorLogger logger;
Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/JDBCUpdateExecution.java
===================================================================
--- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/JDBCUpdateExecution.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/JDBCUpdateExecution.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -29,17 +29,17 @@
import java.util.List;
import java.util.Properties;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorLogger;
+import org.teiid.connector.api.DataNotAvailableException;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.api.UpdateExecution;
import org.teiid.connector.jdbc.translator.TranslatedCommand;
import org.teiid.connector.jdbc.translator.Translator;
+import org.teiid.connector.language.IBatchedUpdates;
+import org.teiid.connector.language.IBulkInsert;
+import org.teiid.connector.language.ICommand;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ConnectorLogger;
-import com.metamatrix.connector.api.DataNotAvailableException;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.api.UpdateExecution;
-import com.metamatrix.connector.language.IBatchedUpdates;
-import com.metamatrix.connector.language.IBulkInsert;
-import com.metamatrix.connector.language.ICommand;
/**
*/
@@ -84,7 +84,7 @@
}
/**
- * @see com.metamatrix.data.api.BatchedUpdatesExecution#execute(com.metamatrix.connector.language.ICommand[])
+ * @see com.metamatrix.data.api.BatchedUpdatesExecution#execute(org.teiid.connector.language.ICommand[])
* @since 4.2
*/
public int[] execute(IBatchedUpdates batchedCommand) throws ConnectorException {
Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/SimpleCapabilities.java
===================================================================
--- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/SimpleCapabilities.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/SimpleCapabilities.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -24,8 +24,9 @@
import java.util.List;
-import com.metamatrix.connector.api.ConnectorCapabilities;
+import org.teiid.connector.api.ConnectorCapabilities;
+
/**
* This is a "simple" capabilities class that allows criteria but no
* complicated joins, subqueries, etc to be passed to the connector.
@@ -152,7 +153,7 @@
}
/**
- * @see com.metamatrix.connector.api.ConnectorCapabilities#supportsSelectLiterals()
+ * @see org.teiid.connector.api.ConnectorCapabilities#supportsSelectLiterals()
* @since 4.2
*/
public boolean supportsSelectLiterals() {
@@ -338,7 +339,7 @@
/**
* Return null to indicate no functions are supported.
* @return null
- * @see com.metamatrix.connector.api.ConnectorCapabilities#getSupportedFunctions()
+ * @see org.teiid.connector.api.ConnectorCapabilities#getSupportedFunctions()
*/
public List getSupportedFunctions() {
return null;
@@ -353,7 +354,7 @@
}
/**
- * @see com.metamatrix.connector.api.ConnectorCapabilities#supportsUnionOrderBy()
+ * @see org.teiid.connector.api.ConnectorCapabilities#supportsUnionOrderBy()
* @since 4.2
*/
public boolean supportsUnionOrderBy() {
@@ -361,7 +362,7 @@
}
/**
- * @see com.metamatrix.connector.api.ConnectorCapabilities#supportsUnions()
+ * @see org.teiid.connector.api.ConnectorCapabilities#supportsUnions()
* @since 4.2
*/
public boolean supportsUnions() {
Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/access/AccessSQLTranslator.java
===================================================================
--- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/access/AccessSQLTranslator.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/access/AccessSQLTranslator.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -27,13 +27,13 @@
import java.util.ArrayList;
import java.util.List;
+import org.teiid.connector.api.ExecutionContext;
import org.teiid.connector.jdbc.translator.Translator;
+import org.teiid.connector.language.ICommand;
+import org.teiid.connector.language.ILimit;
+import org.teiid.connector.language.IOrderBy;
+import org.teiid.connector.language.IQueryCommand;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.language.ICommand;
-import com.metamatrix.connector.language.ILimit;
-import com.metamatrix.connector.language.IOrderBy;
-import com.metamatrix.connector.language.IQueryCommand;
public class AccessSQLTranslator extends Translator {
Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/db2/DB2Capabilities.java
===================================================================
--- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/db2/DB2Capabilities.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/db2/DB2Capabilities.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -118,7 +118,7 @@
}
/**
- * @see com.metamatrix.connector.api.ConnectorCapabilities#supportsFunctionsInGroupBy()
+ * @see org.teiid.connector.api.ConnectorCapabilities#supportsFunctionsInGroupBy()
* @since 5.0
*/
public boolean supportsFunctionsInGroupBy() {
@@ -130,7 +130,7 @@
}
/**
- * @see com.metamatrix.connector.basic.BasicConnectorCapabilities#supportsExcept()
+ * @see org.teiid.connector.basic.BasicConnectorCapabilities#supportsExcept()
*/
@Override
public boolean supportsExcept() {
@@ -138,7 +138,7 @@
}
/**
- * @see com.metamatrix.connector.basic.BasicConnectorCapabilities#supportsIntersect()
+ * @see org.teiid.connector.basic.BasicConnectorCapabilities#supportsIntersect()
*/
@Override
public boolean supportsIntersect() {
Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/db2/DB2ConvertModifier.java
===================================================================
--- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/db2/DB2ConvertModifier.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/db2/DB2ConvertModifier.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -26,13 +26,13 @@
import java.util.Arrays;
import java.util.List;
+import org.teiid.connector.api.TypeFacility;
import org.teiid.connector.jdbc.translator.BasicFunctionModifier;
import org.teiid.connector.jdbc.translator.DropFunctionModifier;
import org.teiid.connector.jdbc.translator.FunctionModifier;
+import org.teiid.connector.language.*;
+import org.teiid.connector.language.ICompareCriteria.Operator;
-import com.metamatrix.connector.api.TypeFacility;
-import com.metamatrix.connector.language.*;
-import com.metamatrix.connector.language.ICompareCriteria.Operator;
/**
*/
Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/db2/DB2SQLTranslator.java
===================================================================
--- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/db2/DB2SQLTranslator.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/db2/DB2SQLTranslator.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -25,22 +25,22 @@
import java.util.Arrays;
import java.util.List;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.api.SourceSystemFunctions;
+import org.teiid.connector.api.TypeFacility;
import org.teiid.connector.jdbc.translator.AliasModifier;
import org.teiid.connector.jdbc.translator.Translator;
+import org.teiid.connector.language.ICommand;
+import org.teiid.connector.language.IJoin;
+import org.teiid.connector.language.ILimit;
+import org.teiid.connector.language.ILiteral;
+import org.teiid.connector.language.IQuery;
+import org.teiid.connector.language.ICompareCriteria.Operator;
+import org.teiid.connector.language.IJoin.JoinType;
+import org.teiid.connector.visitor.framework.HierarchyVisitor;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.api.SourceSystemFunctions;
-import com.metamatrix.connector.api.TypeFacility;
-import com.metamatrix.connector.language.ICommand;
-import com.metamatrix.connector.language.IJoin;
-import com.metamatrix.connector.language.ILimit;
-import com.metamatrix.connector.language.ILiteral;
-import com.metamatrix.connector.language.IQuery;
-import com.metamatrix.connector.language.ICompareCriteria.Operator;
-import com.metamatrix.connector.language.IJoin.JoinType;
-import com.metamatrix.connector.visitor.framework.HierarchyVisitor;
/**
*/
Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/derby/DerbyCapabilities.java
===================================================================
--- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/derby/DerbyCapabilities.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/derby/DerbyCapabilities.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -127,7 +127,7 @@
/**
* Derby supports only SearchedCaseExpression, not CaseExpression.
- * @see com.metamatrix.connector.api.ConnectorCapabilities#supportsCaseExpressions()
+ * @see org.teiid.connector.api.ConnectorCapabilities#supportsCaseExpressions()
* @since 5.0
*/
public boolean supportsCaseExpressions() {
@@ -136,7 +136,7 @@
/**
* Derby supports only left and right outer joins.
- * @see com.metamatrix.connector.api.ConnectorCapabilities#supportsFullOuterJoins()
+ * @see org.teiid.connector.api.ConnectorCapabilities#supportsFullOuterJoins()
* @since 5.0
*/
public boolean supportsFullOuterJoins() {
@@ -145,7 +145,7 @@
/**
* Inline views (subqueries in the FROM clause) are supported.
- * @see com.metamatrix.connector.api.ConnectorCapabilities#supportsInlineViews()
+ * @see org.teiid.connector.api.ConnectorCapabilities#supportsInlineViews()
* @since 4.3
*/
public boolean supportsInlineViews() {
@@ -154,7 +154,7 @@
/**
* UNION is supported, but not UNIONs with a final ORDER BY.
- * @see com.metamatrix.connector.api.ConnectorCapabilities#supportsUnionOrderBy()
+ * @see org.teiid.connector.api.ConnectorCapabilities#supportsUnionOrderBy()
* @since 5.0
*/
public boolean supportsUnionOrderBy() {
@@ -167,7 +167,7 @@
}
/**
- * @see com.metamatrix.connector.basic.BasicConnectorCapabilities#supportsExcept()
+ * @see org.teiid.connector.basic.BasicConnectorCapabilities#supportsExcept()
*/
@Override
public boolean supportsExcept() {
@@ -175,7 +175,7 @@
}
/**
- * @see com.metamatrix.connector.basic.BasicConnectorCapabilities#supportsIntersect()
+ * @see org.teiid.connector.basic.BasicConnectorCapabilities#supportsIntersect()
*/
@Override
public boolean supportsIntersect() {
Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/derby/DerbyConvertModifier.java
===================================================================
--- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/derby/DerbyConvertModifier.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/derby/DerbyConvertModifier.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -26,13 +26,13 @@
import java.util.Arrays;
import java.util.List;
+import org.teiid.connector.api.TypeFacility;
import org.teiid.connector.jdbc.translator.BasicFunctionModifier;
import org.teiid.connector.jdbc.translator.DropFunctionModifier;
import org.teiid.connector.jdbc.translator.FunctionModifier;
+import org.teiid.connector.language.*;
+import org.teiid.connector.language.ICompareCriteria.Operator;
-import com.metamatrix.connector.api.TypeFacility;
-import com.metamatrix.connector.language.*;
-import com.metamatrix.connector.language.ICompareCriteria.Operator;
/**
*/
Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/derby/DerbySQLTranslator.java
===================================================================
--- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/derby/DerbySQLTranslator.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/derby/DerbySQLTranslator.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -22,13 +22,13 @@
package org.teiid.connector.jdbc.derby;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.SourceSystemFunctions;
import org.teiid.connector.jdbc.translator.AliasModifier;
import org.teiid.connector.jdbc.translator.EscapeSyntaxModifier;
import org.teiid.connector.jdbc.translator.Translator;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.SourceSystemFunctions;
/**
Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/informix/InformixSQLTranslator.java
===================================================================
--- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/informix/InformixSQLTranslator.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/informix/InformixSQLTranslator.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -24,12 +24,12 @@
*/
package org.teiid.connector.jdbc.informix;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.SourceSystemFunctions;
import org.teiid.connector.jdbc.translator.DropFunctionModifier;
import org.teiid.connector.jdbc.translator.Translator;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.SourceSystemFunctions;
/**
*/
Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/mm/MMCapabilities.java
===================================================================
--- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/mm/MMCapabilities.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/mm/MMCapabilities.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -36,7 +36,7 @@
public class MMCapabilities extends JDBCCapabilities {
/**
- * @see com.metamatrix.connector.api.ConnectorCapabilities#getSupportedFunctions()
+ * @see org.teiid.connector.api.ConnectorCapabilities#getSupportedFunctions()
* @since 4.3
*/
public List getSupportedFunctions() {
@@ -144,7 +144,7 @@
}
/**
- * @see com.metamatrix.connector.api.ConnectorCapabilities#supportsFunctionsInGroupBy()
+ * @see org.teiid.connector.api.ConnectorCapabilities#supportsFunctionsInGroupBy()
* @since 5.0
*/
public boolean supportsFunctionsInGroupBy() {
Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/mysql/MySQLConvertModifier.java
===================================================================
--- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/mysql/MySQLConvertModifier.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/mysql/MySQLConvertModifier.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -27,13 +27,13 @@
import org.teiid.connector.jdbc.translator.BasicFunctionModifier;
import org.teiid.connector.jdbc.translator.DropFunctionModifier;
+import org.teiid.connector.language.ICompareCriteria;
+import org.teiid.connector.language.IExpression;
+import org.teiid.connector.language.IFunction;
+import org.teiid.connector.language.ILanguageFactory;
+import org.teiid.connector.language.ILiteral;
+import org.teiid.connector.language.ICompareCriteria.Operator;
-import com.metamatrix.connector.language.ICompareCriteria;
-import com.metamatrix.connector.language.IExpression;
-import com.metamatrix.connector.language.IFunction;
-import com.metamatrix.connector.language.ILanguageFactory;
-import com.metamatrix.connector.language.ILiteral;
-import com.metamatrix.connector.language.ICompareCriteria.Operator;
/**
Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/mysql/MySQLTranslator.java
===================================================================
--- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/mysql/MySQLTranslator.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/mysql/MySQLTranslator.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -29,11 +29,11 @@
import java.sql.Time;
import java.sql.Timestamp;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.SourceSystemFunctions;
import org.teiid.connector.jdbc.translator.Translator;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.SourceSystemFunctions;
/**
Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/oracle/ConcatFunctionModifier.java
===================================================================
--- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/oracle/ConcatFunctionModifier.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/oracle/ConcatFunctionModifier.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -26,16 +26,16 @@
import java.util.Arrays;
import java.util.List;
+import org.teiid.connector.api.SourceSystemFunctions;
+import org.teiid.connector.api.TypeFacility;
import org.teiid.connector.jdbc.translator.BasicFunctionModifier;
+import org.teiid.connector.language.ICriteria;
+import org.teiid.connector.language.IExpression;
+import org.teiid.connector.language.IFunction;
+import org.teiid.connector.language.ILanguageFactory;
+import org.teiid.connector.language.ILiteral;
+import org.teiid.connector.language.ICompoundCriteria.Operator;
-import com.metamatrix.connector.api.SourceSystemFunctions;
-import com.metamatrix.connector.api.TypeFacility;
-import com.metamatrix.connector.language.ICriteria;
-import com.metamatrix.connector.language.IExpression;
-import com.metamatrix.connector.language.IFunction;
-import com.metamatrix.connector.language.ILanguageFactory;
-import com.metamatrix.connector.language.ILiteral;
-import com.metamatrix.connector.language.ICompoundCriteria.Operator;
/**
@@ -56,7 +56,7 @@
}
/**
- * @see org.teiid.connector.jdbc.translator.BasicFunctionModifier#modify(com.metamatrix.connector.language.IFunction)
+ * @see org.teiid.connector.jdbc.translator.BasicFunctionModifier#modify(org.teiid.connector.language.IFunction)
*/
public IExpression modify(IFunction function) {
List when = new ArrayList();
Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/oracle/DayWeekQuarterFunctionModifier.java
===================================================================
--- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/oracle/DayWeekQuarterFunctionModifier.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/oracle/DayWeekQuarterFunctionModifier.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -27,8 +27,8 @@
import org.teiid.connector.jdbc.translator.BasicFunctionModifier;
import org.teiid.connector.jdbc.translator.FunctionModifier;
+import org.teiid.connector.language.*;
-import com.metamatrix.connector.language.*;
/**
* This a method for multiple use. It can be used for:
Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/oracle/ExtractFunctionModifier.java
===================================================================
--- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/oracle/ExtractFunctionModifier.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/oracle/ExtractFunctionModifier.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -27,9 +27,9 @@
import org.teiid.connector.jdbc.translator.BasicFunctionModifier;
import org.teiid.connector.jdbc.translator.FunctionModifier;
+import org.teiid.connector.language.IExpression;
+import org.teiid.connector.language.IFunction;
-import com.metamatrix.connector.language.IExpression;
-import com.metamatrix.connector.language.IFunction;
/**
* Convert the YEAR/MONTH/DAY etc. function into an equivalent Oracle function.
Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/oracle/LeftOrRightFunctionModifier.java
===================================================================
--- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/oracle/LeftOrRightFunctionModifier.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/oracle/LeftOrRightFunctionModifier.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -25,11 +25,11 @@
import java.util.Arrays;
import java.util.List;
+import org.teiid.connector.api.TypeFacility;
import org.teiid.connector.jdbc.translator.BasicFunctionModifier;
import org.teiid.connector.jdbc.translator.FunctionModifier;
+import org.teiid.connector.language.*;
-import com.metamatrix.connector.api.TypeFacility;
-import com.metamatrix.connector.language.*;
/**
* Convert left(string, count) --> substr(string, 1, count)
Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/oracle/LocateFunctionModifier.java
===================================================================
--- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/oracle/LocateFunctionModifier.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/oracle/LocateFunctionModifier.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -27,11 +27,11 @@
import org.teiid.connector.jdbc.translator.BasicFunctionModifier;
import org.teiid.connector.jdbc.translator.FunctionModifier;
+import org.teiid.connector.language.IExpression;
+import org.teiid.connector.language.IFunction;
+import org.teiid.connector.language.ILanguageFactory;
+import org.teiid.connector.language.ILiteral;
-import com.metamatrix.connector.language.IExpression;
-import com.metamatrix.connector.language.IFunction;
-import com.metamatrix.connector.language.ILanguageFactory;
-import com.metamatrix.connector.language.ILiteral;
/**
* Modify the locate function to use the Oracle instr function.
Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/oracle/Log10FunctionModifier.java
===================================================================
--- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/oracle/Log10FunctionModifier.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/oracle/Log10FunctionModifier.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -26,8 +26,8 @@
import org.teiid.connector.jdbc.translator.BasicFunctionModifier;
import org.teiid.connector.jdbc.translator.FunctionModifier;
+import org.teiid.connector.language.*;
-import com.metamatrix.connector.language.*;
public class Log10FunctionModifier extends BasicFunctionModifier implements FunctionModifier {
Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/oracle/MonthOrDayNameFunctionModifier.java
===================================================================
--- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/oracle/MonthOrDayNameFunctionModifier.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/oracle/MonthOrDayNameFunctionModifier.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -27,10 +27,10 @@
import org.teiid.connector.jdbc.translator.BasicFunctionModifier;
import org.teiid.connector.jdbc.translator.FunctionModifier;
+import org.teiid.connector.language.IExpression;
+import org.teiid.connector.language.IFunction;
+import org.teiid.connector.language.ILanguageFactory;
-import com.metamatrix.connector.language.IExpression;
-import com.metamatrix.connector.language.IFunction;
-import com.metamatrix.connector.language.ILanguageFactory;
/**
* Convert the MONTHNAME etc. function into an equivalent Oracle function.
Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/oracle/OracleCapabilities.java
===================================================================
--- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/oracle/OracleCapabilities.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/oracle/OracleCapabilities.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -120,7 +120,7 @@
}
/**
- * @see com.metamatrix.connector.api.ConnectorCapabilities#supportsFunctionsInGroupBy()
+ * @see org.teiid.connector.api.ConnectorCapabilities#supportsFunctionsInGroupBy()
* @since 5.0
*/
public boolean supportsFunctionsInGroupBy() {
@@ -135,7 +135,7 @@
}
/**
- * @see com.metamatrix.connector.basic.BasicConnectorCapabilities#supportsExcept()
+ * @see org.teiid.connector.basic.BasicConnectorCapabilities#supportsExcept()
*/
@Override
public boolean supportsExcept() {
@@ -143,7 +143,7 @@
}
/**
- * @see com.metamatrix.connector.basic.BasicConnectorCapabilities#supportsIntersect()
+ * @see org.teiid.connector.basic.BasicConnectorCapabilities#supportsIntersect()
*/
@Override
public boolean supportsIntersect() {
Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/oracle/OracleConvertModifier.java
===================================================================
--- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/oracle/OracleConvertModifier.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/oracle/OracleConvertModifier.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -25,15 +25,15 @@
import java.util.Arrays;
import java.util.List;
+import org.teiid.connector.api.ConnectorLogger;
import org.teiid.connector.jdbc.translator.BasicFunctionModifier;
import org.teiid.connector.jdbc.translator.DropFunctionModifier;
import org.teiid.connector.jdbc.translator.FunctionModifier;
+import org.teiid.connector.language.IExpression;
+import org.teiid.connector.language.IFunction;
+import org.teiid.connector.language.ILanguageFactory;
+import org.teiid.connector.language.ILiteral;
-import com.metamatrix.connector.api.ConnectorLogger;
-import com.metamatrix.connector.language.IExpression;
-import com.metamatrix.connector.language.IFunction;
-import com.metamatrix.connector.language.ILanguageFactory;
-import com.metamatrix.connector.language.ILiteral;
/**
*/
Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/oracle/OracleSQLTranslator.java
===================================================================
--- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/oracle/OracleSQLTranslator.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/oracle/OracleSQLTranslator.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -33,23 +33,23 @@
import java.util.ArrayList;
import java.util.List;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.api.SourceSystemFunctions;
import org.teiid.connector.jdbc.JDBCPlugin;
import org.teiid.connector.jdbc.translator.AliasModifier;
import org.teiid.connector.jdbc.translator.Translator;
+import org.teiid.connector.language.ICommand;
+import org.teiid.connector.language.IElement;
+import org.teiid.connector.language.IGroup;
+import org.teiid.connector.language.IInsert;
+import org.teiid.connector.language.ILimit;
+import org.teiid.connector.language.IQueryCommand;
+import org.teiid.connector.language.ISetQuery.Operation;
+import org.teiid.connector.metadata.runtime.Element;
+import org.teiid.connector.visitor.util.SQLReservedWords;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.api.SourceSystemFunctions;
-import com.metamatrix.connector.language.ICommand;
-import com.metamatrix.connector.language.IElement;
-import com.metamatrix.connector.language.IGroup;
-import com.metamatrix.connector.language.IInsert;
-import com.metamatrix.connector.language.ILimit;
-import com.metamatrix.connector.language.IQueryCommand;
-import com.metamatrix.connector.language.ISetQuery.Operation;
-import com.metamatrix.connector.metadata.runtime.Element;
-import com.metamatrix.connector.visitor.util.SQLReservedWords;
/**
*/
@@ -209,7 +209,7 @@
/**
* Don't fully qualify elements if table = DUAL or element = ROWNUM or special stuff is packed into name in source value.
*
- * @see com.metamatrix.connector.visitor.util.SQLStringVisitor#skipGroupInElement(java.lang.String, java.lang.String)
+ * @see org.teiid.connector.visitor.util.SQLStringVisitor#skipGroupInElement(java.lang.String, java.lang.String)
* @since 5.0
*/
@Override
Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/postgresql/DatePartFunctionModifier.java
===================================================================
--- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/postgresql/DatePartFunctionModifier.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/postgresql/DatePartFunctionModifier.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -25,10 +25,10 @@
import java.util.Arrays;
import org.teiid.connector.jdbc.translator.BasicFunctionModifier;
+import org.teiid.connector.language.IExpression;
+import org.teiid.connector.language.IFunction;
+import org.teiid.connector.language.ILanguageFactory;
-import com.metamatrix.connector.language.IExpression;
-import com.metamatrix.connector.language.IFunction;
-import com.metamatrix.connector.language.ILanguageFactory;
/**
Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/postgresql/ModifiedDatePartFunctionModifier.java
===================================================================
--- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/postgresql/ModifiedDatePartFunctionModifier.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/postgresql/ModifiedDatePartFunctionModifier.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -24,11 +24,12 @@
import java.util.Arrays;
-import com.metamatrix.connector.language.IExpression;
-import com.metamatrix.connector.language.IFunction;
-import com.metamatrix.connector.language.ILanguageFactory;
+import org.teiid.connector.language.IExpression;
+import org.teiid.connector.language.IFunction;
+import org.teiid.connector.language.ILanguageFactory;
+
/**
* @since 4.3
*/
Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/postgresql/PostgreSQLCapabilities.java
===================================================================
--- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/postgresql/PostgreSQLCapabilities.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/postgresql/PostgreSQLCapabilities.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -260,7 +260,7 @@
}
/**
- * @see com.metamatrix.connector.basic.BasicConnectorCapabilities#supportsExcept()
+ * @see org.teiid.connector.basic.BasicConnectorCapabilities#supportsExcept()
*/
@Override
public boolean supportsExcept() {
@@ -268,7 +268,7 @@
}
/**
- * @see com.metamatrix.connector.basic.BasicConnectorCapabilities#supportsIntersect()
+ * @see org.teiid.connector.basic.BasicConnectorCapabilities#supportsIntersect()
*/
@Override
public boolean supportsIntersect() {
Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/postgresql/PostgreSQLConvertModifier.java
===================================================================
--- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/postgresql/PostgreSQLConvertModifier.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/postgresql/PostgreSQLConvertModifier.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -30,12 +30,12 @@
import org.teiid.connector.jdbc.translator.BasicFunctionModifier;
import org.teiid.connector.jdbc.translator.DropFunctionModifier;
import org.teiid.connector.jdbc.translator.FunctionModifier;
+import org.teiid.connector.language.IExpression;
+import org.teiid.connector.language.IFunction;
+import org.teiid.connector.language.ILanguageFactory;
+import org.teiid.connector.language.ILiteral;
+import org.teiid.connector.language.ICompareCriteria.Operator;
-import com.metamatrix.connector.language.IExpression;
-import com.metamatrix.connector.language.IFunction;
-import com.metamatrix.connector.language.ILanguageFactory;
-import com.metamatrix.connector.language.ILiteral;
-import com.metamatrix.connector.language.ICompareCriteria.Operator;
/**
*/
Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/postgresql/PostgreSQLTranslator.java
===================================================================
--- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/postgresql/PostgreSQLTranslator.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/postgresql/PostgreSQLTranslator.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -28,23 +28,23 @@
import java.util.Arrays;
import java.util.List;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.api.SourceSystemFunctions;
+import org.teiid.connector.api.TypeFacility;
import org.teiid.connector.jdbc.oracle.LeftOrRightFunctionModifier;
import org.teiid.connector.jdbc.oracle.MonthOrDayNameFunctionModifier;
import org.teiid.connector.jdbc.translator.AliasModifier;
import org.teiid.connector.jdbc.translator.Translator;
+import org.teiid.connector.language.IAggregate;
+import org.teiid.connector.language.ICommand;
+import org.teiid.connector.language.ILimit;
+import org.teiid.connector.language.IOrderBy;
+import org.teiid.connector.language.ISetQuery;
+import org.teiid.connector.visitor.framework.HierarchyVisitor;
+import org.teiid.connector.visitor.util.SQLReservedWords;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.api.SourceSystemFunctions;
-import com.metamatrix.connector.api.TypeFacility;
-import com.metamatrix.connector.language.IAggregate;
-import com.metamatrix.connector.language.ICommand;
-import com.metamatrix.connector.language.ILimit;
-import com.metamatrix.connector.language.IOrderBy;
-import com.metamatrix.connector.language.ISetQuery;
-import com.metamatrix.connector.visitor.framework.HierarchyVisitor;
-import com.metamatrix.connector.visitor.util.SQLReservedWords;
/**
@@ -123,7 +123,7 @@
/**
* Postgres doesn't provide min/max(boolean), so this conversion writes a min(BooleanValue) as
* bool_and(BooleanValue)
- * @see com.metamatrix.connector.visitor.framework.LanguageObjectVisitor#visit(com.metamatrix.connector.language.IAggregate)
+ * @see org.teiid.connector.visitor.framework.LanguageObjectVisitor#visit(org.teiid.connector.language.IAggregate)
* @since 4.3
*/
@Override
Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/sqlserver/SqlServerCapabilities.java
===================================================================
--- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/sqlserver/SqlServerCapabilities.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/sqlserver/SqlServerCapabilities.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -123,7 +123,7 @@
}
/**
- * @see com.metamatrix.connector.api.ConnectorCapabilities#supportsFunctionsInGroupBy()
+ * @see org.teiid.connector.api.ConnectorCapabilities#supportsFunctionsInGroupBy()
* @since 5.0
*/
public boolean supportsFunctionsInGroupBy() {
Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/sqlserver/SqlServerSQLTranslator.java
===================================================================
--- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/sqlserver/SqlServerSQLTranslator.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/sqlserver/SqlServerSQLTranslator.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -24,12 +24,12 @@
*/
package org.teiid.connector.jdbc.sqlserver;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.SourceSystemFunctions;
import org.teiid.connector.jdbc.sybase.SybaseSQLTranslator;
import org.teiid.connector.jdbc.translator.AliasModifier;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.SourceSystemFunctions;
/**
*/
Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/sybase/ModFunctionModifier.java
===================================================================
--- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/sybase/ModFunctionModifier.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/sybase/ModFunctionModifier.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -26,12 +26,12 @@
import java.util.Arrays;
import java.util.List;
+import org.teiid.connector.api.TypeFacility.RUNTIME_TYPES;
import org.teiid.connector.jdbc.translator.AliasModifier;
+import org.teiid.connector.language.IExpression;
+import org.teiid.connector.language.IFunction;
+import org.teiid.connector.language.ILanguageFactory;
-import com.metamatrix.connector.api.TypeFacility.RUNTIME_TYPES;
-import com.metamatrix.connector.language.IExpression;
-import com.metamatrix.connector.language.IFunction;
-import com.metamatrix.connector.language.ILanguageFactory;
public class ModFunctionModifier extends AliasModifier {
Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/sybase/SybaseCapabilities.java
===================================================================
--- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/sybase/SybaseCapabilities.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/sybase/SybaseCapabilities.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -103,7 +103,7 @@
}
/**
- * @see com.metamatrix.connector.api.ConnectorCapabilities#supportsFunctionsInGroupBy()
+ * @see org.teiid.connector.api.ConnectorCapabilities#supportsFunctionsInGroupBy()
* @since 5.0
*/
public boolean supportsFunctionsInGroupBy() {
@@ -111,14 +111,14 @@
}
/**
- * @see com.metamatrix.connector.basic.BasicConnectorCapabilities#getMaxFromGroups()
+ * @see org.teiid.connector.basic.BasicConnectorCapabilities#getMaxFromGroups()
*/
public int getMaxFromGroups() {
return 50;
}
/**
- * @see com.metamatrix.connector.basic.BasicConnectorCapabilities#supportsIntersect()
+ * @see org.teiid.connector.basic.BasicConnectorCapabilities#supportsIntersect()
*/
@Override
public boolean supportsIntersect() {
Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/sybase/SybaseConvertModifier.java
===================================================================
--- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/sybase/SybaseConvertModifier.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/sybase/SybaseConvertModifier.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -29,11 +29,11 @@
import org.teiid.connector.jdbc.translator.BasicFunctionModifier;
import org.teiid.connector.jdbc.translator.DropFunctionModifier;
import org.teiid.connector.jdbc.translator.FunctionModifier;
+import org.teiid.connector.language.IExpression;
+import org.teiid.connector.language.IFunction;
+import org.teiid.connector.language.ILanguageFactory;
+import org.teiid.connector.language.ILiteral;
-import com.metamatrix.connector.language.IExpression;
-import com.metamatrix.connector.language.IFunction;
-import com.metamatrix.connector.language.ILanguageFactory;
-import com.metamatrix.connector.language.ILiteral;
/**
*/
Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/sybase/SybaseSQLTranslator.java
===================================================================
--- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/sybase/SybaseSQLTranslator.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/sybase/SybaseSQLTranslator.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -27,18 +27,18 @@
import java.util.ArrayList;
import java.util.List;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.api.SourceSystemFunctions;
import org.teiid.connector.jdbc.translator.AliasModifier;
import org.teiid.connector.jdbc.translator.SubstringFunctionModifier;
import org.teiid.connector.jdbc.translator.Translator;
+import org.teiid.connector.language.ICommand;
+import org.teiid.connector.language.ILimit;
+import org.teiid.connector.language.IOrderBy;
+import org.teiid.connector.language.IQueryCommand;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.api.SourceSystemFunctions;
-import com.metamatrix.connector.language.ICommand;
-import com.metamatrix.connector.language.ILimit;
-import com.metamatrix.connector.language.IOrderBy;
-import com.metamatrix.connector.language.IQueryCommand;
/**
*/
Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/translator/AliasModifier.java
===================================================================
--- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/translator/AliasModifier.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/translator/AliasModifier.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -24,7 +24,7 @@
*/
package org.teiid.connector.jdbc.translator;
-import com.metamatrix.connector.language.*;
+import org.teiid.connector.language.*;
/**
*/
@@ -41,7 +41,7 @@
}
/**
- * @see org.teiid.connector.jdbc.translator.FunctionModifier#modify(com.metamatrix.connector.language.IFunction)
+ * @see org.teiid.connector.jdbc.translator.FunctionModifier#modify(org.teiid.connector.language.IFunction)
*/
public IExpression modify(IFunction function) {
function.setName(alias);
Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/translator/BasicFunctionModifier.java
===================================================================
--- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/translator/BasicFunctionModifier.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/translator/BasicFunctionModifier.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -28,10 +28,11 @@
import java.util.List;
import java.util.Map;
-import com.metamatrix.connector.api.TypeFacility;
-import com.metamatrix.connector.language.IExpression;
-import com.metamatrix.connector.language.IFunction;
+import org.teiid.connector.api.TypeFacility;
+import org.teiid.connector.language.IExpression;
+import org.teiid.connector.language.IFunction;
+
/**
*/
public abstract class BasicFunctionModifier implements FunctionModifier {
@@ -83,7 +84,7 @@
/**
* Subclass should override this method as needed.
- * @see org.teiid.connector.jdbc.translator.FunctionModifier#modify(com.metamatrix.connector.language.IFunction)
+ * @see org.teiid.connector.jdbc.translator.FunctionModifier#modify(org.teiid.connector.language.IFunction)
*/
public IExpression modify(IFunction function) {
return function;
@@ -91,7 +92,7 @@
/**
* Subclass should override this method as needed.
- * @see org.teiid.connector.jdbc.translator.FunctionModifier#translate(com.metamatrix.connector.language.IFunction)
+ * @see org.teiid.connector.jdbc.translator.FunctionModifier#translate(org.teiid.connector.language.IFunction)
*/
public List translate(IFunction function) {
return null;
Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/translator/BindValueVisitor.java
===================================================================
--- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/translator/BindValueVisitor.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/translator/BindValueVisitor.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -22,20 +22,20 @@
package org.teiid.connector.jdbc.translator;
-import com.metamatrix.connector.language.ICompareCriteria;
-import com.metamatrix.connector.language.IExistsCriteria;
-import com.metamatrix.connector.language.IFunction;
-import com.metamatrix.connector.language.IInCriteria;
-import com.metamatrix.connector.language.IInlineView;
-import com.metamatrix.connector.language.IInsert;
-import com.metamatrix.connector.language.ILanguageObject;
-import com.metamatrix.connector.language.ILikeCriteria;
-import com.metamatrix.connector.language.ILiteral;
-import com.metamatrix.connector.language.IScalarSubquery;
-import com.metamatrix.connector.language.ISearchedCaseExpression;
-import com.metamatrix.connector.language.ISetClause;
-import com.metamatrix.connector.language.ISubqueryCompareCriteria;
-import com.metamatrix.connector.visitor.framework.HierarchyVisitor;
+import org.teiid.connector.language.ICompareCriteria;
+import org.teiid.connector.language.IExistsCriteria;
+import org.teiid.connector.language.IFunction;
+import org.teiid.connector.language.IInCriteria;
+import org.teiid.connector.language.IInlineView;
+import org.teiid.connector.language.IInsert;
+import org.teiid.connector.language.ILanguageObject;
+import org.teiid.connector.language.ILikeCriteria;
+import org.teiid.connector.language.ILiteral;
+import org.teiid.connector.language.IScalarSubquery;
+import org.teiid.connector.language.ISearchedCaseExpression;
+import org.teiid.connector.language.ISetClause;
+import org.teiid.connector.language.ISubqueryCompareCriteria;
+import org.teiid.connector.visitor.framework.HierarchyVisitor;
/**
* This visitor will mark literals in well known locations as bindValues.
Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/translator/DropFunctionModifier.java
===================================================================
--- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/translator/DropFunctionModifier.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/translator/DropFunctionModifier.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -25,8 +25,8 @@
import java.util.List;
import org.teiid.connector.jdbc.JDBCPlugin;
+import org.teiid.connector.language.*;
-import com.metamatrix.connector.language.*;
/**
* This FunctionModifier will cause this function to be dropped by replacing the function
Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/translator/EscapeSyntaxModifier.java
===================================================================
--- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/translator/EscapeSyntaxModifier.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/translator/EscapeSyntaxModifier.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -25,8 +25,9 @@
import java.util.ArrayList;
import java.util.List;
-import com.metamatrix.connector.language.IFunction;
+import org.teiid.connector.language.IFunction;
+
/**
* Wrap a function in standard JDBC escape syntax. In some cases, the
* driver can then convert to the correct database syntax for us.
@@ -39,7 +40,7 @@
}
/**
- * @see org.teiid.connector.jdbc.translator.BasicFunctionModifier#translate(com.metamatrix.connector.language.IFunction)
+ * @see org.teiid.connector.jdbc.translator.BasicFunctionModifier#translate(org.teiid.connector.language.IFunction)
* @since 5.0
*/
public List translate(IFunction function) {
Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/translator/FunctionModifier.java
===================================================================
--- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/translator/FunctionModifier.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/translator/FunctionModifier.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -26,9 +26,10 @@
import java.util.List;
-import com.metamatrix.connector.language.IExpression;
-import com.metamatrix.connector.language.IFunction;
+import org.teiid.connector.language.IExpression;
+import org.teiid.connector.language.IFunction;
+
/**
* Implementations of this interface are used to modify metamatrix functions
* coming in to the connector into alternate datasource-specific language, if
Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/translator/ReplacementVisitor.java
===================================================================
--- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/translator/ReplacementVisitor.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/translator/ReplacementVisitor.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -25,25 +25,26 @@
import java.util.List;
import java.util.Map;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.language.IAggregate;
-import com.metamatrix.connector.language.ICompareCriteria;
-import com.metamatrix.connector.language.IExpression;
-import com.metamatrix.connector.language.IFunction;
-import com.metamatrix.connector.language.IGroupBy;
-import com.metamatrix.connector.language.IInCriteria;
-import com.metamatrix.connector.language.IInlineView;
-import com.metamatrix.connector.language.IInsert;
-import com.metamatrix.connector.language.IIsNullCriteria;
-import com.metamatrix.connector.language.ILikeCriteria;
-import com.metamatrix.connector.language.IQueryCommand;
-import com.metamatrix.connector.language.IScalarSubquery;
-import com.metamatrix.connector.language.ISearchedCaseExpression;
-import com.metamatrix.connector.language.ISelectSymbol;
-import com.metamatrix.connector.language.ISubqueryCompareCriteria;
-import com.metamatrix.connector.language.ISubqueryInCriteria;
-import com.metamatrix.connector.visitor.framework.AbstractLanguageVisitor;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.language.IAggregate;
+import org.teiid.connector.language.ICompareCriteria;
+import org.teiid.connector.language.IExpression;
+import org.teiid.connector.language.IFunction;
+import org.teiid.connector.language.IGroupBy;
+import org.teiid.connector.language.IInCriteria;
+import org.teiid.connector.language.IInlineView;
+import org.teiid.connector.language.IInsert;
+import org.teiid.connector.language.IIsNullCriteria;
+import org.teiid.connector.language.ILikeCriteria;
+import org.teiid.connector.language.IQueryCommand;
+import org.teiid.connector.language.IScalarSubquery;
+import org.teiid.connector.language.ISearchedCaseExpression;
+import org.teiid.connector.language.ISelectSymbol;
+import org.teiid.connector.language.ISubqueryCompareCriteria;
+import org.teiid.connector.language.ISubqueryInCriteria;
+import org.teiid.connector.visitor.framework.AbstractLanguageVisitor;
+
import com.metamatrix.core.MetaMatrixRuntimeException;
/**
@@ -88,7 +89,7 @@
}
/**
- * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.metamatrix.connector.language.IFunction)
+ * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(org.teiid.connector.language.IFunction)
*/
public void visit(IFunction obj) {
List<IExpression> args = obj.getParameters();
@@ -98,7 +99,7 @@
}
/**
- * @see com.metamatrix.connector.visitor.framework.HierarchyVisitor#visit(com.metamatrix.connector.language.IGroupBy)
+ * @see org.teiid.connector.visitor.framework.HierarchyVisitor#visit(org.teiid.connector.language.IGroupBy)
* @since 4.3
*/
public void visit(IGroupBy obj) {
@@ -124,7 +125,7 @@
}
/**
- * @see com.metamatrix.data.visitor.SQLStringVisitor#visit(com.metamatrix.connector.language.IInsert)
+ * @see com.metamatrix.data.visitor.SQLStringVisitor#visit(org.teiid.connector.language.IInsert)
*/
public void visit(IInsert obj) {
List<IExpression> values = obj.getValues();
Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/translator/SQLConversionVisitor.java
===================================================================
--- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/translator/SQLConversionVisitor.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/translator/SQLConversionVisitor.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -35,22 +35,23 @@
import java.util.Map;
import java.util.Set;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.api.TypeFacility;
-import com.metamatrix.connector.language.IBulkInsert;
-import com.metamatrix.connector.language.ICommand;
-import com.metamatrix.connector.language.IElement;
-import com.metamatrix.connector.language.IFunction;
-import com.metamatrix.connector.language.ILanguageObject;
-import com.metamatrix.connector.language.ILimit;
-import com.metamatrix.connector.language.ILiteral;
-import com.metamatrix.connector.language.IParameter;
-import com.metamatrix.connector.language.IProcedure;
-import com.metamatrix.connector.language.IParameter.Direction;
-import com.metamatrix.connector.language.ISetQuery.Operation;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
-import com.metamatrix.connector.visitor.util.SQLStringVisitor;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.api.TypeFacility;
+import org.teiid.connector.language.IBulkInsert;
+import org.teiid.connector.language.ICommand;
+import org.teiid.connector.language.IElement;
+import org.teiid.connector.language.IFunction;
+import org.teiid.connector.language.ILanguageObject;
+import org.teiid.connector.language.ILimit;
+import org.teiid.connector.language.ILiteral;
+import org.teiid.connector.language.IParameter;
+import org.teiid.connector.language.IProcedure;
+import org.teiid.connector.language.IParameter.Direction;
+import org.teiid.connector.language.ISetQuery.Operation;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
+import org.teiid.connector.visitor.util.SQLStringVisitor;
+
/**
* This visitor takes an ICommand and does DBMS-specific conversion on it
* to produce a SQL String. This class is expected to be subclassed.
@@ -185,7 +186,7 @@
}
/**
- * @see com.metamatrix.connector.visitor.util.SQLStringVisitor#visit(com.metamatrix.connector.language.IProcedure)
+ * @see org.teiid.connector.visitor.util.SQLStringVisitor#visit(org.teiid.connector.language.IProcedure)
*/
public void visit(IProcedure obj) {
this.prepared = true;
@@ -197,7 +198,7 @@
}
/**
- * @see com.metamatrix.connector.visitor.util.SQLStringVisitor#visit(com.metamatrix.connector.language.ILiteral)
+ * @see org.teiid.connector.visitor.util.SQLStringVisitor#visit(org.teiid.connector.language.ILiteral)
*/
public void visit(ILiteral obj) {
if (this.prepared && obj.isBindValue()) {
Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/translator/SubstringFunctionModifier.java
===================================================================
--- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/translator/SubstringFunctionModifier.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/translator/SubstringFunctionModifier.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -25,10 +25,11 @@
import java.util.Arrays;
import java.util.List;
-import com.metamatrix.connector.language.IExpression;
-import com.metamatrix.connector.language.IFunction;
-import com.metamatrix.connector.language.ILanguageFactory;
+import org.teiid.connector.language.IExpression;
+import org.teiid.connector.language.IFunction;
+import org.teiid.connector.language.ILanguageFactory;
+
/**
* Common logic for Substring modifiers requiring 3 parameters
*/
Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/translator/TranslatedCommand.java
===================================================================
--- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/translator/TranslatedCommand.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/translator/TranslatedCommand.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -26,14 +26,15 @@
import java.util.List;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.api.TypeFacility;
-import com.metamatrix.connector.language.ICommand;
-import com.metamatrix.connector.language.ILiteral;
-import com.metamatrix.connector.visitor.framework.DelegatingHierarchyVisitor;
-import com.metamatrix.connector.visitor.util.CollectorVisitor;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.api.TypeFacility;
+import org.teiid.connector.language.ICommand;
+import org.teiid.connector.language.ILiteral;
+import org.teiid.connector.visitor.framework.DelegatingHierarchyVisitor;
+import org.teiid.connector.visitor.util.CollectorVisitor;
+
/**
* This is a utility class used to translate an ICommand using a SQLConversionVisitor.
* The SQLConversionVisitor should not be invoked directly; this object will use it to
Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/translator/Translator.java
===================================================================
--- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/translator/Translator.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/translator/Translator.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -41,24 +41,24 @@
import java.util.Map;
import java.util.TimeZone;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.api.TypeFacility;
+import org.teiid.connector.api.ValueTranslator;
+import org.teiid.connector.internal.ConnectorPropertyNames;
import org.teiid.connector.jdbc.JDBCPlugin;
import org.teiid.connector.jdbc.JDBCPropertyNames;
+import org.teiid.connector.language.ICommand;
+import org.teiid.connector.language.IFunction;
+import org.teiid.connector.language.ILanguageFactory;
+import org.teiid.connector.language.ILanguageObject;
+import org.teiid.connector.language.ILimit;
+import org.teiid.connector.language.IParameter;
+import org.teiid.connector.language.ISetQuery;
+import org.teiid.connector.language.IParameter.Direction;
import com.metamatrix.common.util.PropertiesUtils;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.api.TypeFacility;
-import com.metamatrix.connector.api.ValueTranslator;
-import com.metamatrix.connector.internal.ConnectorPropertyNames;
-import com.metamatrix.connector.language.ICommand;
-import com.metamatrix.connector.language.IFunction;
-import com.metamatrix.connector.language.ILanguageFactory;
-import com.metamatrix.connector.language.ILanguageObject;
-import com.metamatrix.connector.language.ILimit;
-import com.metamatrix.connector.language.IParameter;
-import com.metamatrix.connector.language.ISetQuery;
-import com.metamatrix.connector.language.IParameter.Direction;
/**
* Base class for creating source SQL queries and retrieving results.
Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/xa/JDBCSourceXAConnection.java
===================================================================
--- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/xa/JDBCSourceXAConnection.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/xa/JDBCSourceXAConnection.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -31,12 +31,12 @@
import javax.sql.ConnectionEventListener;
import javax.transaction.xa.XAResource;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
import org.teiid.connector.jdbc.JDBCSourceConnection;
import org.teiid.connector.jdbc.translator.Translator;
+import org.teiid.connector.xa.api.XAConnection;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.xa.api.XAConnection;
public class JDBCSourceXAConnection extends JDBCSourceConnection implements XAConnection {
private javax.sql.XAConnection xaConn;
@@ -60,7 +60,7 @@
}
/**
- * @see com.metamatrix.connector.xa.api.XAConnection#getXAResource()
+ * @see org.teiid.connector.xa.api.XAConnection#getXAResource()
*/
public XAResource getXAResource() throws ConnectorException {
return resource;
Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/MetadataFactory.java
===================================================================
--- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/MetadataFactory.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/MetadataFactory.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -22,11 +22,12 @@
package org.teiid.connector.jdbc;
+import org.teiid.connector.language.ICommand;
+
import junit.framework.Assert;
import com.metamatrix.cdk.api.TranslationUtility;
import com.metamatrix.cdk.unittest.FakeTranslationFactory;
-import com.metamatrix.connector.language.ICommand;
public class MetadataFactory {
Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/TestJDBCConnector.java
===================================================================
--- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/TestJDBCConnector.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/TestJDBCConnector.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -26,10 +26,10 @@
import static org.junit.Assert.*;
import org.junit.Test;
+import org.teiid.connector.api.ConnectorCapabilities;
+import org.teiid.connector.api.ConnectorException;
import org.teiid.connector.jdbc.xa.XAJDBCPropertyNames;
-import com.metamatrix.connector.api.ConnectorCapabilities;
-import com.metamatrix.connector.api.ConnectorException;
public class TestJDBCConnector {
Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/TestJDBCSourceConnection.java
===================================================================
--- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/TestJDBCSourceConnection.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/TestJDBCSourceConnection.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -25,6 +25,8 @@
import java.sql.Connection;
import java.util.Properties;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.basic.BasicConnectorCapabilities;
import org.teiid.connector.jdbc.JDBCPropertyNames;
import org.teiid.connector.jdbc.JDBCSourceConnection;
import org.teiid.connector.jdbc.translator.Translator;
@@ -32,8 +34,6 @@
import junit.framework.TestCase;
import com.metamatrix.cdk.api.EnvironmentUtility;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.basic.BasicConnectorCapabilities;
import com.metamatrix.core.util.SimpleMock;
Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/access/TestAccessSQLTranslator.java
===================================================================
--- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/access/TestAccessSQLTranslator.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/access/TestAccessSQLTranslator.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -24,16 +24,16 @@
import java.util.Properties;
+import org.teiid.connector.api.ConnectorException;
import org.teiid.connector.jdbc.access.AccessSQLTranslator;
import org.teiid.connector.jdbc.translator.TranslatedCommand;
import org.teiid.connector.jdbc.translator.Translator;
+import org.teiid.connector.language.ICommand;
import junit.framework.TestCase;
import com.metamatrix.cdk.api.EnvironmentUtility;
import com.metamatrix.cdk.unittest.FakeTranslationFactory;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.language.ICommand;
/**
Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/db2/TestDB2ConvertModifier.java
===================================================================
--- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/db2/TestDB2ConvertModifier.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/db2/TestDB2ConvertModifier.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -28,18 +28,18 @@
import java.util.Arrays;
import java.util.Properties;
+import org.teiid.connector.api.TypeFacility;
import org.teiid.connector.jdbc.db2.DB2ConvertModifier;
import org.teiid.connector.jdbc.db2.DB2SQLTranslator;
import org.teiid.connector.jdbc.translator.SQLConversionVisitor;
+import org.teiid.connector.language.IExpression;
+import org.teiid.connector.language.IFunction;
+import org.teiid.connector.language.ILanguageFactory;
import junit.framework.TestCase;
import com.metamatrix.cdk.CommandBuilder;
import com.metamatrix.cdk.api.EnvironmentUtility;
-import com.metamatrix.connector.api.TypeFacility;
-import com.metamatrix.connector.language.IExpression;
-import com.metamatrix.connector.language.IFunction;
-import com.metamatrix.connector.language.ILanguageFactory;
import com.metamatrix.query.unittest.TimestampUtil;
/**
Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/db2/TestDB2SqlTranslator.java
===================================================================
--- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/db2/TestDB2SqlTranslator.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/db2/TestDB2SqlTranslator.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -28,14 +28,14 @@
import org.junit.BeforeClass;
import org.junit.Test;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ExecutionContext;
import org.teiid.connector.jdbc.translator.TranslatedCommand;
+import org.teiid.connector.language.ICommand;
import com.metamatrix.cdk.api.EnvironmentUtility;
import com.metamatrix.cdk.api.TranslationUtility;
import com.metamatrix.cdk.unittest.FakeTranslationFactory;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.language.ICommand;
import com.metamatrix.core.util.UnitTestUtil;
/**
Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/derby/TestDerbyConvertModifier.java
===================================================================
--- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/derby/TestDerbyConvertModifier.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/derby/TestDerbyConvertModifier.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -28,18 +28,18 @@
import java.util.Arrays;
import java.util.Properties;
+import org.teiid.connector.api.TypeFacility;
import org.teiid.connector.jdbc.derby.DerbyConvertModifier;
import org.teiid.connector.jdbc.derby.DerbySQLTranslator;
import org.teiid.connector.jdbc.translator.SQLConversionVisitor;
+import org.teiid.connector.language.IExpression;
+import org.teiid.connector.language.IFunction;
+import org.teiid.connector.language.ILanguageFactory;
import junit.framework.TestCase;
import com.metamatrix.cdk.CommandBuilder;
import com.metamatrix.cdk.api.EnvironmentUtility;
-import com.metamatrix.connector.api.TypeFacility;
-import com.metamatrix.connector.language.IExpression;
-import com.metamatrix.connector.language.IFunction;
-import com.metamatrix.connector.language.ILanguageFactory;
import com.metamatrix.query.unittest.TimestampUtil;
/**
Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/extension/impl/TestDropFunctionModifier.java
===================================================================
--- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/extension/impl/TestDropFunctionModifier.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/extension/impl/TestDropFunctionModifier.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -25,13 +25,13 @@
import java.util.Arrays;
import org.teiid.connector.jdbc.translator.DropFunctionModifier;
+import org.teiid.connector.language.IExpression;
+import org.teiid.connector.language.IFunction;
+import org.teiid.connector.language.ILiteral;
import junit.framework.TestCase;
import com.metamatrix.cdk.CommandBuilder;
-import com.metamatrix.connector.language.IExpression;
-import com.metamatrix.connector.language.IFunction;
-import com.metamatrix.connector.language.ILiteral;
/**
*/
Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/extension/impl/TestEscapeSyntaxModifier.java
===================================================================
--- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/extension/impl/TestEscapeSyntaxModifier.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/extension/impl/TestEscapeSyntaxModifier.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -27,13 +27,13 @@
import java.util.List;
import org.teiid.connector.jdbc.translator.EscapeSyntaxModifier;
+import org.teiid.connector.language.IFunction;
+import org.teiid.connector.language.ILiteral;
+import org.teiid.connector.visitor.util.SQLReservedWords;
import junit.framework.TestCase;
import com.metamatrix.cdk.CommandBuilder;
-import com.metamatrix.connector.language.IFunction;
-import com.metamatrix.connector.language.ILiteral;
-import com.metamatrix.connector.visitor.util.SQLReservedWords;
import com.metamatrix.query.unittest.TimestampUtil;
/**
Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/mysql/TestMySQLTranslator.java
===================================================================
--- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/mysql/TestMySQLTranslator.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/mysql/TestMySQLTranslator.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -25,15 +25,15 @@
import java.util.Map;
import java.util.Properties;
+import org.teiid.connector.api.ConnectorException;
import org.teiid.connector.jdbc.MetadataFactory;
import org.teiid.connector.jdbc.mysql.MySQLTranslator;
import org.teiid.connector.jdbc.translator.TranslatedCommand;
+import org.teiid.connector.language.ICommand;
import junit.framework.TestCase;
import com.metamatrix.cdk.api.EnvironmentUtility;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.language.ICommand;
/**
*/
Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/oracle/TestDayWeekQuarterFunctionModifier.java
===================================================================
--- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/oracle/TestDayWeekQuarterFunctionModifier.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/oracle/TestDayWeekQuarterFunctionModifier.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -29,15 +29,15 @@
import org.teiid.connector.jdbc.oracle.DayWeekQuarterFunctionModifier;
import org.teiid.connector.jdbc.oracle.OracleSQLTranslator;
import org.teiid.connector.jdbc.translator.SQLConversionVisitor;
+import org.teiid.connector.language.IExpression;
+import org.teiid.connector.language.IFunction;
+import org.teiid.connector.language.ILanguageFactory;
+import org.teiid.connector.language.ILiteral;
import junit.framework.TestCase;
import com.metamatrix.cdk.CommandBuilder;
import com.metamatrix.cdk.api.EnvironmentUtility;
-import com.metamatrix.connector.language.IExpression;
-import com.metamatrix.connector.language.IFunction;
-import com.metamatrix.connector.language.ILanguageFactory;
-import com.metamatrix.connector.language.ILiteral;
import com.metamatrix.query.unittest.TimestampUtil;
/**
Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/oracle/TestExtractFunctionModifier.java
===================================================================
--- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/oracle/TestExtractFunctionModifier.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/oracle/TestExtractFunctionModifier.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -26,21 +26,21 @@
import java.util.Arrays;
import java.util.Properties;
+import org.teiid.connector.api.TypeFacility;
import org.teiid.connector.jdbc.oracle.ExtractFunctionModifier;
import org.teiid.connector.jdbc.oracle.OracleSQLTranslator;
import org.teiid.connector.jdbc.translator.SQLConversionVisitor;
+import org.teiid.connector.language.IElement;
+import org.teiid.connector.language.IExpression;
+import org.teiid.connector.language.IFunction;
+import org.teiid.connector.language.IGroup;
+import org.teiid.connector.language.ILanguageFactory;
+import org.teiid.connector.language.ILiteral;
import junit.framework.TestCase;
import com.metamatrix.cdk.CommandBuilder;
import com.metamatrix.cdk.api.EnvironmentUtility;
-import com.metamatrix.connector.api.TypeFacility;
-import com.metamatrix.connector.language.IElement;
-import com.metamatrix.connector.language.IExpression;
-import com.metamatrix.connector.language.IFunction;
-import com.metamatrix.connector.language.IGroup;
-import com.metamatrix.connector.language.ILanguageFactory;
-import com.metamatrix.connector.language.ILiteral;
import com.metamatrix.query.unittest.TimestampUtil;
/**
Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/oracle/TestLeftOrRightFunctionModifier.java
===================================================================
--- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/oracle/TestLeftOrRightFunctionModifier.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/oracle/TestLeftOrRightFunctionModifier.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -28,15 +28,15 @@
import org.teiid.connector.jdbc.oracle.LeftOrRightFunctionModifier;
import org.teiid.connector.jdbc.oracle.OracleSQLTranslator;
import org.teiid.connector.jdbc.translator.SQLConversionVisitor;
+import org.teiid.connector.language.IExpression;
+import org.teiid.connector.language.IFunction;
+import org.teiid.connector.language.ILanguageFactory;
+import org.teiid.connector.language.ILiteral;
import junit.framework.TestCase;
import com.metamatrix.cdk.CommandBuilder;
import com.metamatrix.cdk.api.EnvironmentUtility;
-import com.metamatrix.connector.language.IExpression;
-import com.metamatrix.connector.language.IFunction;
-import com.metamatrix.connector.language.ILanguageFactory;
-import com.metamatrix.connector.language.ILiteral;
/**
*/
Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/oracle/TestLocateFunctionModifier.java
===================================================================
--- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/oracle/TestLocateFunctionModifier.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/oracle/TestLocateFunctionModifier.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -28,14 +28,14 @@
import org.teiid.connector.jdbc.oracle.LocateFunctionModifier;
import org.teiid.connector.jdbc.oracle.OracleSQLTranslator;
import org.teiid.connector.jdbc.translator.SQLConversionVisitor;
+import org.teiid.connector.language.IExpression;
+import org.teiid.connector.language.IFunction;
+import org.teiid.connector.language.ILanguageFactory;
import junit.framework.TestCase;
import com.metamatrix.cdk.CommandBuilder;
import com.metamatrix.cdk.api.EnvironmentUtility;
-import com.metamatrix.connector.language.IExpression;
-import com.metamatrix.connector.language.IFunction;
-import com.metamatrix.connector.language.ILanguageFactory;
/**
*/
Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/oracle/TestLog10FunctionModifier.java
===================================================================
--- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/oracle/TestLog10FunctionModifier.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/oracle/TestLog10FunctionModifier.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -26,14 +26,14 @@
import java.util.List;
import org.teiid.connector.jdbc.oracle.Log10FunctionModifier;
+import org.teiid.connector.language.IExpression;
+import org.teiid.connector.language.IFunction;
+import org.teiid.connector.language.ILiteral;
+import org.teiid.connector.visitor.util.SQLStringVisitor;
import junit.framework.TestCase;
import com.metamatrix.cdk.CommandBuilder;
-import com.metamatrix.connector.language.IExpression;
-import com.metamatrix.connector.language.IFunction;
-import com.metamatrix.connector.language.ILiteral;
-import com.metamatrix.connector.visitor.util.SQLStringVisitor;
/**
*/
Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/oracle/TestMonthOrDayNameFunctionModifier.java
===================================================================
--- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/oracle/TestMonthOrDayNameFunctionModifier.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/oracle/TestMonthOrDayNameFunctionModifier.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -29,15 +29,15 @@
import org.teiid.connector.jdbc.oracle.MonthOrDayNameFunctionModifier;
import org.teiid.connector.jdbc.oracle.OracleSQLTranslator;
import org.teiid.connector.jdbc.translator.SQLConversionVisitor;
+import org.teiid.connector.language.IExpression;
+import org.teiid.connector.language.IFunction;
+import org.teiid.connector.language.ILanguageFactory;
+import org.teiid.connector.language.ILiteral;
import junit.framework.TestCase;
import com.metamatrix.cdk.CommandBuilder;
import com.metamatrix.cdk.api.EnvironmentUtility;
-import com.metamatrix.connector.language.IExpression;
-import com.metamatrix.connector.language.IFunction;
-import com.metamatrix.connector.language.ILanguageFactory;
-import com.metamatrix.connector.language.ILiteral;
import com.metamatrix.query.unittest.TimestampUtil;
/**
Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/oracle/TestOracleConvertModifier.java
===================================================================
--- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/oracle/TestOracleConvertModifier.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/oracle/TestOracleConvertModifier.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -28,18 +28,18 @@
import java.util.Arrays;
import java.util.Properties;
+import org.teiid.connector.api.TypeFacility;
import org.teiid.connector.jdbc.oracle.OracleConvertModifier;
import org.teiid.connector.jdbc.oracle.OracleSQLTranslator;
import org.teiid.connector.jdbc.translator.SQLConversionVisitor;
+import org.teiid.connector.language.IExpression;
+import org.teiid.connector.language.IFunction;
+import org.teiid.connector.language.ILanguageFactory;
import junit.framework.TestCase;
import com.metamatrix.cdk.CommandBuilder;
import com.metamatrix.cdk.api.EnvironmentUtility;
-import com.metamatrix.connector.api.TypeFacility;
-import com.metamatrix.connector.language.IExpression;
-import com.metamatrix.connector.language.IFunction;
-import com.metamatrix.connector.language.ILanguageFactory;
import com.metamatrix.query.unittest.TimestampUtil;
/**
Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/oracle/TestOracleTranslator.java
===================================================================
--- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/oracle/TestOracleTranslator.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/oracle/TestOracleTranslator.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -24,17 +24,17 @@
import java.util.Properties;
+import org.teiid.connector.api.ConnectorException;
import org.teiid.connector.jdbc.access.AccessSQLTranslator;
import org.teiid.connector.jdbc.oracle.OracleSQLTranslator;
import org.teiid.connector.jdbc.translator.TranslatedCommand;
import org.teiid.connector.jdbc.translator.Translator;
+import org.teiid.connector.language.ICommand;
import junit.framework.TestCase;
import com.metamatrix.cdk.api.EnvironmentUtility;
import com.metamatrix.cdk.unittest.FakeTranslationFactory;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.language.ICommand;
public class TestOracleTranslator extends TestCase {
Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/oracle/TestSubstringFunctionModifier.java
===================================================================
--- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/oracle/TestSubstringFunctionModifier.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/oracle/TestSubstringFunctionModifier.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -25,18 +25,18 @@
import java.util.Arrays;
import java.util.Properties;
+import org.teiid.connector.api.TypeFacility;
import org.teiid.connector.jdbc.oracle.OracleSQLTranslator;
import org.teiid.connector.jdbc.translator.FunctionModifier;
import org.teiid.connector.jdbc.translator.SQLConversionVisitor;
+import org.teiid.connector.language.IExpression;
+import org.teiid.connector.language.IFunction;
+import org.teiid.connector.language.ILanguageFactory;
import junit.framework.TestCase;
import com.metamatrix.cdk.CommandBuilder;
import com.metamatrix.cdk.api.EnvironmentUtility;
-import com.metamatrix.connector.api.TypeFacility;
-import com.metamatrix.connector.language.IExpression;
-import com.metamatrix.connector.language.IFunction;
-import com.metamatrix.connector.language.ILanguageFactory;
/**
*/
Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/postgresql/TestPostgreSQLTranslator.java
===================================================================
--- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/postgresql/TestPostgreSQLTranslator.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/postgresql/TestPostgreSQLTranslator.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -25,15 +25,15 @@
import java.util.Map;
import java.util.Properties;
+import org.teiid.connector.api.ConnectorException;
import org.teiid.connector.jdbc.MetadataFactory;
import org.teiid.connector.jdbc.postgresql.PostgreSQLTranslator;
import org.teiid.connector.jdbc.translator.TranslatedCommand;
+import org.teiid.connector.language.ICommand;
import junit.framework.TestCase;
import com.metamatrix.cdk.api.EnvironmentUtility;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.language.ICommand;
/**
*/
Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/sqlserver/TestSqlServerConversionVisitor.java
===================================================================
--- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/sqlserver/TestSqlServerConversionVisitor.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/sqlserver/TestSqlServerConversionVisitor.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -27,12 +27,12 @@
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.teiid.connector.api.ConnectorException;
import org.teiid.connector.jdbc.MetadataFactory;
import org.teiid.connector.jdbc.translator.TranslatedCommand;
+import org.teiid.connector.language.ICommand;
import com.metamatrix.cdk.api.EnvironmentUtility;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.language.ICommand;
/**
*/
Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/sybase/TestSybaseConvertModifier.java
===================================================================
--- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/sybase/TestSybaseConvertModifier.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/sybase/TestSybaseConvertModifier.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -30,16 +30,16 @@
import org.teiid.connector.jdbc.sybase.SybaseConvertModifier;
import org.teiid.connector.jdbc.sybase.SybaseSQLTranslator;
import org.teiid.connector.jdbc.translator.SQLConversionVisitor;
+import org.teiid.connector.language.IExpression;
+import org.teiid.connector.language.IFunction;
+import org.teiid.connector.language.ILanguageFactory;
+import org.teiid.connector.language.ILiteral;
import junit.framework.TestCase;
import com.metamatrix.cdk.CommandBuilder;
import com.metamatrix.cdk.api.EnvironmentUtility;
import com.metamatrix.common.types.DataTypeManager;
-import com.metamatrix.connector.language.IExpression;
-import com.metamatrix.connector.language.IFunction;
-import com.metamatrix.connector.language.ILanguageFactory;
-import com.metamatrix.connector.language.ILiteral;
import com.metamatrix.query.unittest.TimestampUtil;
/**
Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/sybase/TestSybaseSQLConversionVisitor.java
===================================================================
--- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/sybase/TestSybaseSQLConversionVisitor.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/sybase/TestSybaseSQLConversionVisitor.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -28,12 +28,12 @@
import org.junit.BeforeClass;
import org.junit.Test;
+import org.teiid.connector.api.ConnectorException;
import org.teiid.connector.jdbc.MetadataFactory;
import org.teiid.connector.jdbc.translator.TranslatedCommand;
+import org.teiid.connector.language.ICommand;
import com.metamatrix.cdk.api.EnvironmentUtility;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.language.ICommand;
/**
*/
Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/util/TestFunctionReplacementVisitor.java
===================================================================
--- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/util/TestFunctionReplacementVisitor.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/util/TestFunctionReplacementVisitor.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -30,11 +30,11 @@
import org.teiid.connector.jdbc.translator.FunctionModifier;
import org.teiid.connector.jdbc.translator.ReplacementVisitor;
import org.teiid.connector.jdbc.translator.Translator;
+import org.teiid.connector.language.ICommand;
+import org.teiid.connector.visitor.framework.DelegatingHierarchyVisitor;
import junit.framework.TestCase;
-import com.metamatrix.connector.language.ICommand;
-import com.metamatrix.connector.visitor.framework.DelegatingHierarchyVisitor;
/**
*/
Modified: trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/ldap/IQueryToLdapSearchParser.java
===================================================================
--- trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/ldap/IQueryToLdapSearchParser.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/ldap/IQueryToLdapSearchParser.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -50,33 +50,34 @@
import javax.naming.directory.SearchControls;
import javax.naming.ldap.SortKey;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ConnectorLogger;
-import com.metamatrix.connector.language.IAggregate;
-import com.metamatrix.connector.language.ICompareCriteria;
-import com.metamatrix.connector.language.ICompoundCriteria;
-import com.metamatrix.connector.language.ICriteria;
-import com.metamatrix.connector.language.IElement;
-import com.metamatrix.connector.language.IExistsCriteria;
-import com.metamatrix.connector.language.IExpression;
-import com.metamatrix.connector.language.IFromItem;
-import com.metamatrix.connector.language.IFunction;
-import com.metamatrix.connector.language.IGroup;
-import com.metamatrix.connector.language.IInCriteria;
-import com.metamatrix.connector.language.ILikeCriteria;
-import com.metamatrix.connector.language.ILimit;
-import com.metamatrix.connector.language.ILiteral;
-import com.metamatrix.connector.language.IOrderBy;
-import com.metamatrix.connector.language.IOrderByItem;
-import com.metamatrix.connector.language.IQuery;
-import com.metamatrix.connector.language.IScalarSubquery;
-import com.metamatrix.connector.language.ISearchedCaseExpression;
-import com.metamatrix.connector.language.ISelectSymbol;
-import com.metamatrix.connector.language.ICompareCriteria.Operator;
-import com.metamatrix.connector.metadata.runtime.Element;
-import com.metamatrix.connector.metadata.runtime.Group;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorLogger;
+import org.teiid.connector.language.IAggregate;
+import org.teiid.connector.language.ICompareCriteria;
+import org.teiid.connector.language.ICompoundCriteria;
+import org.teiid.connector.language.ICriteria;
+import org.teiid.connector.language.IElement;
+import org.teiid.connector.language.IExistsCriteria;
+import org.teiid.connector.language.IExpression;
+import org.teiid.connector.language.IFromItem;
+import org.teiid.connector.language.IFunction;
+import org.teiid.connector.language.IGroup;
+import org.teiid.connector.language.IInCriteria;
+import org.teiid.connector.language.ILikeCriteria;
+import org.teiid.connector.language.ILimit;
+import org.teiid.connector.language.ILiteral;
+import org.teiid.connector.language.IOrderBy;
+import org.teiid.connector.language.IOrderByItem;
+import org.teiid.connector.language.IQuery;
+import org.teiid.connector.language.IScalarSubquery;
+import org.teiid.connector.language.ISearchedCaseExpression;
+import org.teiid.connector.language.ISelectSymbol;
+import org.teiid.connector.language.ICompareCriteria.Operator;
+import org.teiid.connector.metadata.runtime.Element;
+import org.teiid.connector.metadata.runtime.Group;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
+
/**
* Utility class which translates a SQL query into an LDAP search.
*/
@@ -533,7 +534,7 @@
return;
}
filterList.add("("); //$NON-NLS-1$
- filterList.add(parseCompoundCriteriaOp(com.metamatrix.connector.language.ICompoundCriteria.Operator.OR));
+ filterList.add(parseCompoundCriteriaOp(org.teiid.connector.language.ICompoundCriteria.Operator.OR));
Iterator rhsItr = rhsList.iterator();
while(rhsItr.hasNext()) {
addCompareCriteriaToList(filterList, Operator.EQ, getExpressionString(lhs),
@@ -643,8 +644,8 @@
}
/**
- * Helper method for getting runtime {@link com.metamatrix.connector.metadata.runtime.Element} from a
- * {@link com.metamatrix.connector.language.ISelectSymbol}.
+ * Helper method for getting runtime {@link org.teiid.connector.metadata.runtime.Element} from a
+ * {@link org.teiid.connector.language.ISelectSymbol}.
* @param symbol Input ISelectSymbol
* @return Element returned metadata runtime Element
*/
Modified: trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/ldap/LDAPConnection.java
===================================================================
--- trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/ldap/LDAPConnection.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/ldap/LDAPConnection.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -29,17 +29,18 @@
import javax.naming.NamingException;
import javax.naming.ldap.InitialLdapContext;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ConnectorLogger;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.api.ResultSetExecution;
-import com.metamatrix.connector.api.UpdateExecution;
-import com.metamatrix.connector.basic.BasicConnection;
-import com.metamatrix.connector.language.ICommand;
-import com.metamatrix.connector.language.IQuery;
-import com.metamatrix.connector.language.IQueryCommand;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorLogger;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.api.ResultSetExecution;
+import org.teiid.connector.api.UpdateExecution;
+import org.teiid.connector.basic.BasicConnection;
+import org.teiid.connector.language.ICommand;
+import org.teiid.connector.language.IQuery;
+import org.teiid.connector.language.IQueryCommand;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
+
/**
* Represents a connection to an LDAP data source.
*/
Modified: trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/ldap/LDAPConnector.java
===================================================================
--- trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/ldap/LDAPConnector.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/ldap/LDAPConnector.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -23,14 +23,15 @@
import java.util.Properties;
-import com.metamatrix.connector.api.Connection;
-import com.metamatrix.connector.api.ConnectorCapabilities;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ConnectorLogger;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.basic.BasicConnector;
+import org.teiid.connector.api.Connection;
+import org.teiid.connector.api.ConnectorCapabilities;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorLogger;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.basic.BasicConnector;
+
/**
* LDAPConnector. This is responsible for initializing
* a connection factory, and obtaining connections to LDAP.
@@ -59,7 +60,7 @@
/**
* (non-Javadoc)
- * @see com.metamatrix.connector.basic.BasicConnector#initialize(com.metamatrix.connector.api.ConnectorEnvironment)
+ * @see org.teiid.connector.basic.BasicConnector#initialize(org.teiid.connector.api.ConnectorEnvironment)
*/
@Override
public void start(ConnectorEnvironment env) throws ConnectorException {
Modified: trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/ldap/LDAPConnectorCapabilities.java
===================================================================
--- trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/ldap/LDAPConnectorCapabilities.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/ldap/LDAPConnectorCapabilities.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -21,7 +21,7 @@
*/
package com.metamatrix.connector.ldap;
-import com.metamatrix.connector.basic.BasicConnectorCapabilities;
+import org.teiid.connector.basic.BasicConnectorCapabilities;
/**
* This class extends the BasicConnectorCapabilities class, and establishes
Modified: trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/ldap/LDAPSearchDetails.java
===================================================================
--- trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/ldap/LDAPSearchDetails.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/ldap/LDAPSearchDetails.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -30,8 +30,9 @@
import javax.naming.directory.SearchControls;
import javax.naming.ldap.SortKey;
-import com.metamatrix.connector.api.ConnectorLogger;
+import org.teiid.connector.api.ConnectorLogger;
+
/**
* Utility class used to maintain the details of a particular LDAP search,
* such as the context, the attributes of interest, the filter, and the
Modified: trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/ldap/LDAPSyncQueryExecution.java
===================================================================
--- trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/ldap/LDAPSyncQueryExecution.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/ldap/LDAPSyncQueryExecution.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -94,15 +94,16 @@
import javax.naming.ldap.SortControl;
import javax.naming.ldap.SortKey;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ConnectorLogger;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.api.ResultSetExecution;
-import com.metamatrix.connector.basic.BasicExecution;
-import com.metamatrix.connector.language.IQuery;
-import com.metamatrix.connector.metadata.runtime.Element;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorLogger;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.api.ResultSetExecution;
+import org.teiid.connector.basic.BasicExecution;
+import org.teiid.connector.language.IQuery;
+import org.teiid.connector.metadata.runtime.Element;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
+
/**
* LDAPSyncQueryExecution is responsible for executing an LDAP search
* corresponding to a read-only "select" query from MetaMatrix.
Modified: trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/ldap/LDAPUpdateExecution.java
===================================================================
--- trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/ldap/LDAPUpdateExecution.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/ldap/LDAPUpdateExecution.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -33,26 +33,27 @@
import javax.naming.ldap.InitialLdapContext;
import javax.naming.ldap.LdapContext;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ConnectorLogger;
-import com.metamatrix.connector.api.DataNotAvailableException;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.api.UpdateExecution;
-import com.metamatrix.connector.basic.BasicExecution;
-import com.metamatrix.connector.language.ICommand;
-import com.metamatrix.connector.language.ICompareCriteria;
-import com.metamatrix.connector.language.ICriteria;
-import com.metamatrix.connector.language.IDelete;
-import com.metamatrix.connector.language.IElement;
-import com.metamatrix.connector.language.IExpression;
-import com.metamatrix.connector.language.IInsert;
-import com.metamatrix.connector.language.ILiteral;
-import com.metamatrix.connector.language.ISetClause;
-import com.metamatrix.connector.language.IUpdate;
-import com.metamatrix.connector.language.ICompareCriteria.Operator;
-import com.metamatrix.connector.metadata.runtime.MetadataObject;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorLogger;
+import org.teiid.connector.api.DataNotAvailableException;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.api.UpdateExecution;
+import org.teiid.connector.basic.BasicExecution;
+import org.teiid.connector.language.ICommand;
+import org.teiid.connector.language.ICompareCriteria;
+import org.teiid.connector.language.ICriteria;
+import org.teiid.connector.language.IDelete;
+import org.teiid.connector.language.IElement;
+import org.teiid.connector.language.IExpression;
+import org.teiid.connector.language.IInsert;
+import org.teiid.connector.language.ILiteral;
+import org.teiid.connector.language.ISetClause;
+import org.teiid.connector.language.IUpdate;
+import org.teiid.connector.language.ICompareCriteria.Operator;
+import org.teiid.connector.metadata.runtime.MetadataObject;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
+
/**
* Please see the user's guide for a full description of capabilties, etc.
*
Modified: trunk/connectors/connector-ldap/src/test/java/com/metamatrix/connector/ldap/TestIQueryToLdapSearchParser.java
===================================================================
--- trunk/connectors/connector-ldap/src/test/java/com/metamatrix/connector/ldap/TestIQueryToLdapSearchParser.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-ldap/src/test/java/com/metamatrix/connector/ldap/TestIQueryToLdapSearchParser.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -30,16 +30,17 @@
import javax.naming.directory.SearchControls;
import javax.naming.ldap.SortKey;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorLogger;
+import org.teiid.connector.language.ICommand;
+import org.teiid.connector.language.IQuery;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
+
import junit.framework.TestCase;
import com.metamatrix.cdk.CommandBuilder;
import com.metamatrix.cdk.api.SysLogger;
import com.metamatrix.common.types.DataTypeManager;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ConnectorLogger;
-import com.metamatrix.connector.language.ICommand;
-import com.metamatrix.connector.language.IQuery;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
import com.metamatrix.dqp.internal.datamgr.metadata.RuntimeMetadataImpl;
import com.metamatrix.query.metadata.QueryMetadataInterface;
import com.metamatrix.query.unittest.FakeMetadataFacade;
Modified: trunk/connectors/connector-loopback/src/main/java/com/metamatrix/connector/loopback/LoopbackCapabilities.java
===================================================================
--- trunk/connectors/connector-loopback/src/main/java/com/metamatrix/connector/loopback/LoopbackCapabilities.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-loopback/src/main/java/com/metamatrix/connector/loopback/LoopbackCapabilities.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -25,8 +25,9 @@
import java.util.Arrays;
import java.util.List;
-import com.metamatrix.connector.basic.BasicConnectorCapabilities;
+import org.teiid.connector.basic.BasicConnectorCapabilities;
+
/**
* Specifies the capabilities of this connector. Since we want this
* connector to be able to emulate most other connectors, these
Modified: trunk/connectors/connector-loopback/src/main/java/com/metamatrix/connector/loopback/LoopbackConnection.java
===================================================================
--- trunk/connectors/connector-loopback/src/main/java/com/metamatrix/connector/loopback/LoopbackConnection.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-loopback/src/main/java/com/metamatrix/connector/loopback/LoopbackConnection.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -22,13 +22,13 @@
package com.metamatrix.connector.loopback;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.Execution;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.basic.BasicConnection;
-import com.metamatrix.connector.language.ICommand;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.Execution;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.basic.BasicConnection;
+import org.teiid.connector.language.ICommand;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
/**
* Serves as a connection for the Loopback connector. Since there is no actual
Modified: trunk/connectors/connector-loopback/src/main/java/com/metamatrix/connector/loopback/LoopbackConnector.java
===================================================================
--- trunk/connectors/connector-loopback/src/main/java/com/metamatrix/connector/loopback/LoopbackConnector.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-loopback/src/main/java/com/metamatrix/connector/loopback/LoopbackConnector.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -22,8 +22,8 @@
package com.metamatrix.connector.loopback;
-import com.metamatrix.connector.api.*;
-import com.metamatrix.connector.basic.BasicConnector;
+import org.teiid.connector.api.*;
+import org.teiid.connector.basic.BasicConnector;
/**
* Starting point for the Loopback connector.
Modified: trunk/connectors/connector-loopback/src/main/java/com/metamatrix/connector/loopback/LoopbackExecution.java
===================================================================
--- trunk/connectors/connector-loopback/src/main/java/com/metamatrix/connector/loopback/LoopbackExecution.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-loopback/src/main/java/com/metamatrix/connector/loopback/LoopbackExecution.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -34,18 +34,19 @@
import java.util.List;
import java.util.Random;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.DataNotAvailableException;
-import com.metamatrix.connector.api.ProcedureExecution;
-import com.metamatrix.connector.api.TypeFacility;
-import com.metamatrix.connector.api.UpdateExecution;
-import com.metamatrix.connector.basic.BasicExecution;
-import com.metamatrix.connector.language.ICommand;
-import com.metamatrix.connector.language.IParameter;
-import com.metamatrix.connector.language.IQueryCommand;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.DataNotAvailableException;
+import org.teiid.connector.api.ProcedureExecution;
+import org.teiid.connector.api.TypeFacility;
+import org.teiid.connector.api.UpdateExecution;
+import org.teiid.connector.basic.BasicExecution;
+import org.teiid.connector.language.ICommand;
+import org.teiid.connector.language.IParameter;
+import org.teiid.connector.language.IQueryCommand;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
+
/**
* Represents the execution of a command.
*/
Modified: trunk/connectors/connector-loopback/src/test/java/com/metamatrix/connector/loopback/TestLoopbackExecution.java
===================================================================
--- trunk/connectors/connector-loopback/src/test/java/com/metamatrix/connector/loopback/TestLoopbackExecution.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-loopback/src/test/java/com/metamatrix/connector/loopback/TestLoopbackExecution.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -27,12 +27,13 @@
import java.util.List;
import java.util.Properties;
+import org.teiid.connector.api.ConnectorException;
+
import junit.framework.TestCase;
import com.metamatrix.cdk.api.ConnectorHost;
import com.metamatrix.cdk.api.TranslationUtility;
import com.metamatrix.cdk.unittest.FakeTranslationFactory;
-import com.metamatrix.connector.api.ConnectorException;
public class TestLoopbackExecution extends TestCase {
Modified: trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/Connector.java
===================================================================
--- trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/Connector.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/Connector.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -26,18 +26,19 @@
import java.net.MalformedURLException;
import java.net.URL;
-import com.metamatrix.connector.api.Connection;
-import com.metamatrix.connector.api.ConnectorCapabilities;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ConnectorLogger;
-import com.metamatrix.connector.api.CredentialMap;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.api.ConnectorAnnotations.ConnectionPooling;
+import org.teiid.connector.api.Connection;
+import org.teiid.connector.api.ConnectorCapabilities;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorLogger;
+import org.teiid.connector.api.CredentialMap;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.api.ConnectorAnnotations.ConnectionPooling;
+
import com.metamatrix.connector.salesforce.connection.SalesforceConnection;
@ConnectionPooling
-public class Connector extends com.metamatrix.connector.basic.BasicConnector {
+public class Connector extends org.teiid.connector.basic.BasicConnector {
private ConnectorLogger logger;
Modified: trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/ConnectorState.java
===================================================================
--- trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/ConnectorState.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/ConnectorState.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -25,9 +25,10 @@
import java.net.URL;
import java.util.Properties;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ConnectorLogger;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorLogger;
+
public class ConnectorState {
public static final String USERNAME = "username";
Modified: trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/SalesforceCapabilities.java
===================================================================
--- trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/SalesforceCapabilities.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/SalesforceCapabilities.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -24,8 +24,9 @@
import java.util.ArrayList;
import java.util.List;
-import com.metamatrix.connector.basic.BasicConnectorCapabilities;
+import org.teiid.connector.basic.BasicConnectorCapabilities;
+
public class SalesforceCapabilities extends BasicConnectorCapabilities {
public int getMaxInCriteriaSize() {
Modified: trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/Util.java
===================================================================
--- trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/Util.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/Util.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -24,8 +24,9 @@
import java.text.DateFormat;
import java.text.SimpleDateFormat;
-import com.metamatrix.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorException;
+
public class Util {
public static boolean convertStringToBoolean(String value) {
Modified: trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/connection/SalesforceConnection.java
===================================================================
--- trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/connection/SalesforceConnection.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/connection/SalesforceConnection.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -24,15 +24,16 @@
import java.net.URL;
import java.util.List;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.api.ResultSetExecution;
-import com.metamatrix.connector.api.UpdateExecution;
-import com.metamatrix.connector.basic.BasicConnection;
-import com.metamatrix.connector.language.ICommand;
-import com.metamatrix.connector.language.IQueryCommand;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.api.ResultSetExecution;
+import org.teiid.connector.api.UpdateExecution;
+import org.teiid.connector.basic.BasicConnection;
+import org.teiid.connector.language.ICommand;
+import org.teiid.connector.language.IQueryCommand;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
+
import com.metamatrix.connector.salesforce.Messages;
import com.metamatrix.connector.salesforce.connection.impl.ConnectionImpl;
import com.metamatrix.connector.salesforce.execution.DataPayload;
Modified: trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/connection/impl/ConnectionImpl.java
===================================================================
--- trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/connection/impl/ConnectionImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/connection/impl/ConnectionImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -36,9 +36,9 @@
import org.apache.axis.handlers.SimpleSessionHandler;
import org.apache.axis.transport.http.CommonsHTTPSender;
import org.apache.axis.transport.http.HTTPTransport;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorLogger;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ConnectorLogger;
import com.metamatrix.connector.salesforce.execution.DataPayload;
import com.sforce.soap.partner.CallOptions;
import com.sforce.soap.partner.DeleteResult;
Modified: trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/execution/DeleteExecutionImpl.java
===================================================================
--- trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/execution/DeleteExecutionImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/execution/DeleteExecutionImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -21,8 +21,9 @@
*/
package com.metamatrix.connector.salesforce.execution;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.language.IDelete;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.language.IDelete;
+
import com.metamatrix.connector.salesforce.execution.visitors.DeleteVisitor;
public class DeleteExecutionImpl {
Modified: trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/execution/InsertExecutionImpl.java
===================================================================
--- trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/execution/InsertExecutionImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/execution/InsertExecutionImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -22,8 +22,9 @@
package com.metamatrix.connector.salesforce.execution;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.language.IInsert;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.language.IInsert;
+
import com.metamatrix.connector.salesforce.execution.visitors.InsertVisitor;
public class InsertExecutionImpl {
Modified: trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/execution/QueryExecutionImpl.java
===================================================================
--- trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/execution/QueryExecutionImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/execution/QueryExecutionImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -30,17 +30,17 @@
import java.util.Map;
import org.apache.axis.message.MessageElement;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorLogger;
+import org.teiid.connector.api.DataNotAvailableException;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.api.ResultSetExecution;
+import org.teiid.connector.basic.BasicExecution;
+import org.teiid.connector.language.IQueryCommand;
+import org.teiid.connector.metadata.runtime.Element;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ConnectorLogger;
-import com.metamatrix.connector.api.DataNotAvailableException;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.api.ResultSetExecution;
-import com.metamatrix.connector.basic.BasicExecution;
-import com.metamatrix.connector.language.IQueryCommand;
-import com.metamatrix.connector.metadata.runtime.Element;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
import com.metamatrix.connector.salesforce.Messages;
import com.metamatrix.connector.salesforce.Util;
import com.metamatrix.connector.salesforce.connection.SalesforceConnection;
Modified: trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/execution/UpdateExecutionImpl.java
===================================================================
--- trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/execution/UpdateExecutionImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/execution/UpdateExecutionImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -27,13 +27,13 @@
import javax.xml.namespace.QName;
import org.apache.axis.message.MessageElement;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.language.IElement;
+import org.teiid.connector.language.ILiteral;
+import org.teiid.connector.language.ISetClause;
+import org.teiid.connector.language.IUpdate;
+import org.teiid.connector.metadata.runtime.Element;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.language.IElement;
-import com.metamatrix.connector.language.ILiteral;
-import com.metamatrix.connector.language.ISetClause;
-import com.metamatrix.connector.language.IUpdate;
-import com.metamatrix.connector.metadata.runtime.Element;
import com.metamatrix.connector.salesforce.Util;
import com.metamatrix.connector.salesforce.execution.visitors.UpdateVisitor;
Modified: trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/execution/UpdateExecutionParent.java
===================================================================
--- trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/execution/UpdateExecutionParent.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/execution/UpdateExecutionParent.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -23,19 +23,20 @@
import java.util.ArrayList;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.DataNotAvailableException;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.api.UpdateExecution;
-import com.metamatrix.connector.basic.BasicExecution;
-import com.metamatrix.connector.language.ICommand;
-import com.metamatrix.connector.language.ICompareCriteria;
-import com.metamatrix.connector.language.ICriteria;
-import com.metamatrix.connector.language.IDelete;
-import com.metamatrix.connector.language.IInsert;
-import com.metamatrix.connector.language.IUpdate;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.DataNotAvailableException;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.api.UpdateExecution;
+import org.teiid.connector.basic.BasicExecution;
+import org.teiid.connector.language.ICommand;
+import org.teiid.connector.language.ICompareCriteria;
+import org.teiid.connector.language.ICriteria;
+import org.teiid.connector.language.IDelete;
+import org.teiid.connector.language.IInsert;
+import org.teiid.connector.language.IUpdate;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
+
import com.metamatrix.connector.salesforce.Util;
import com.metamatrix.connector.salesforce.connection.SalesforceConnection;
import com.metamatrix.connector.salesforce.execution.visitors.IQueryProvidingVisitor;
@@ -78,13 +79,13 @@
@Override
public void execute() throws ConnectorException {
- if(command instanceof com.metamatrix.connector.language.IDelete) {
+ if(command instanceof org.teiid.connector.language.IDelete) {
DeleteExecutionImpl ex = new DeleteExecutionImpl();
result = ex.execute(((IDelete)command), this);
- } else if (command instanceof com.metamatrix.connector.language.IInsert) {
+ } else if (command instanceof org.teiid.connector.language.IInsert) {
InsertExecutionImpl ex = new InsertExecutionImpl();
result = ex.execute(((IInsert)command), this);
- } else if (command instanceof com.metamatrix.connector.language.IUpdate) {
+ } else if (command instanceof org.teiid.connector.language.IUpdate) {
UpdateExecutionImpl ex = new UpdateExecutionImpl();
result = ex.execute(((IUpdate)command), this);
}
Modified: trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/execution/visitors/CriteriaVisitor.java
===================================================================
--- trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/execution/visitors/CriteriaVisitor.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/execution/visitors/CriteriaVisitor.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -28,22 +28,23 @@
import java.util.List;
import java.util.Map;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.language.ICompareCriteria;
-import com.metamatrix.connector.language.IElement;
-import com.metamatrix.connector.language.IExpression;
-import com.metamatrix.connector.language.IFunction;
-import com.metamatrix.connector.language.IGroup;
-import com.metamatrix.connector.language.IInCriteria;
-import com.metamatrix.connector.language.ILikeCriteria;
-import com.metamatrix.connector.language.ILiteral;
-import com.metamatrix.connector.language.ICompareCriteria.Operator;
-import com.metamatrix.connector.metadata.runtime.Element;
-import com.metamatrix.connector.metadata.runtime.Group;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.language.ICompareCriteria;
+import org.teiid.connector.language.IElement;
+import org.teiid.connector.language.IExpression;
+import org.teiid.connector.language.IFunction;
+import org.teiid.connector.language.IGroup;
+import org.teiid.connector.language.IInCriteria;
+import org.teiid.connector.language.ILikeCriteria;
+import org.teiid.connector.language.ILiteral;
+import org.teiid.connector.language.ICompareCriteria.Operator;
+import org.teiid.connector.metadata.runtime.Element;
+import org.teiid.connector.metadata.runtime.Group;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
+import org.teiid.connector.visitor.framework.HierarchyVisitor;
+
import com.metamatrix.connector.salesforce.Messages;
import com.metamatrix.connector.salesforce.Util;
-import com.metamatrix.connector.visitor.framework.HierarchyVisitor;
/**
*
Modified: trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/execution/visitors/DeleteVisitor.java
===================================================================
--- trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/execution/visitors/DeleteVisitor.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/execution/visitors/DeleteVisitor.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -23,10 +23,11 @@
import java.util.Iterator;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.language.IDelete;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.language.IDelete;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
+
public class DeleteVisitor extends CriteriaVisitor implements IQueryProvidingVisitor {
public DeleteVisitor(RuntimeMetadata metadata) {
Modified: trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/execution/visitors/ICriteriaVisitor.java
===================================================================
--- trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/execution/visitors/ICriteriaVisitor.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/execution/visitors/ICriteriaVisitor.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -21,7 +21,7 @@
*/
package com.metamatrix.connector.salesforce.execution.visitors;
-import com.metamatrix.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorException;
public interface ICriteriaVisitor {
Modified: trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/execution/visitors/IQueryProvidingVisitor.java
===================================================================
--- trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/execution/visitors/IQueryProvidingVisitor.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/execution/visitors/IQueryProvidingVisitor.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -21,7 +21,7 @@
*/
package com.metamatrix.connector.salesforce.execution.visitors;
-import com.metamatrix.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorException;
public interface IQueryProvidingVisitor extends ICriteriaVisitor {
Modified: trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/execution/visitors/InsertVisitor.java
===================================================================
--- trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/execution/visitors/InsertVisitor.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/execution/visitors/InsertVisitor.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -27,14 +27,14 @@
import javax.xml.namespace.QName;
import org.apache.axis.message.MessageElement;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.language.IElement;
+import org.teiid.connector.language.IExpression;
+import org.teiid.connector.language.IInsert;
+import org.teiid.connector.language.ILiteral;
+import org.teiid.connector.metadata.runtime.Element;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.language.IElement;
-import com.metamatrix.connector.language.IExpression;
-import com.metamatrix.connector.language.IInsert;
-import com.metamatrix.connector.language.ILiteral;
-import com.metamatrix.connector.metadata.runtime.Element;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
public class InsertVisitor extends CriteriaVisitor {
Modified: trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/execution/visitors/SelectVisitor.java
===================================================================
--- trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/execution/visitors/SelectVisitor.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/execution/visitors/SelectVisitor.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -26,16 +26,17 @@
import java.util.List;
import java.util.Map;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.language.IElement;
-import com.metamatrix.connector.language.IExpression;
-import com.metamatrix.connector.language.IFrom;
-import com.metamatrix.connector.language.IGroup;
-import com.metamatrix.connector.language.IQuery;
-import com.metamatrix.connector.language.ISelect;
-import com.metamatrix.connector.language.ISelectSymbol;
-import com.metamatrix.connector.metadata.runtime.Element;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.language.IElement;
+import org.teiid.connector.language.IExpression;
+import org.teiid.connector.language.IFrom;
+import org.teiid.connector.language.IGroup;
+import org.teiid.connector.language.IQuery;
+import org.teiid.connector.language.ISelect;
+import org.teiid.connector.language.ISelectSymbol;
+import org.teiid.connector.metadata.runtime.Element;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
+
import com.metamatrix.connector.salesforce.Messages;
import com.metamatrix.connector.salesforce.Util;
Modified: trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/execution/visitors/UpdateVisitor.java
===================================================================
--- trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/execution/visitors/UpdateVisitor.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/connector/salesforce/execution/visitors/UpdateVisitor.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -23,10 +23,11 @@
import java.util.Iterator;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.language.IUpdate;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.language.IUpdate;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
+
public class UpdateVisitor extends CriteriaVisitor implements IQueryProvidingVisitor {
public UpdateVisitor(RuntimeMetadata metadata) {
Modified: trunk/connectors/connector-salesforce/src/test/java/com/metamatrix/connector/salesforce/TestConnector.java
===================================================================
--- trunk/connectors/connector-salesforce/src/test/java/com/metamatrix/connector/salesforce/TestConnector.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-salesforce/src/test/java/com/metamatrix/connector/salesforce/TestConnector.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -21,11 +21,12 @@
*/
package com.metamatrix.connector.salesforce;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ExecutionContext;
+
import junit.framework.TestCase;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ExecutionContext;
import com.metamatrix.connector.salesforce.connection.SalesforceConnection;
import com.metamatrix.connector.salesforce.test.util.ObjectFactory;
Modified: trunk/connectors/connector-salesforce/src/test/java/com/metamatrix/connector/salesforce/test/util/ObjectFactory.java
===================================================================
--- trunk/connectors/connector-salesforce/src/test/java/com/metamatrix/connector/salesforce/test/util/ObjectFactory.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-salesforce/src/test/java/com/metamatrix/connector/salesforce/test/util/ObjectFactory.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -25,10 +25,11 @@
import java.util.Map;
import java.util.Properties;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.CredentialMap;
+import org.teiid.connector.api.ExecutionContext;
+
import com.metamatrix.cdk.api.EnvironmentUtility;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.CredentialMap;
-import com.metamatrix.connector.api.ExecutionContext;
import com.metamatrix.connector.salesforce.ConnectorState;
public class ObjectFactory {
Modified: trunk/connectors/connector-text/src/main/java/com/metamatrix/connector/text/StringToDateTranslator.java
===================================================================
--- trunk/connectors/connector-text/src/main/java/com/metamatrix/connector/text/StringToDateTranslator.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-text/src/main/java/com/metamatrix/connector/text/StringToDateTranslator.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -25,8 +25,9 @@
import java.util.*;
import java.text.*;
-import com.metamatrix.connector.api.ConnectorLogger;
+import org.teiid.connector.api.ConnectorLogger;
+
/**
* <p>This is a helper class for TextTranslators that can be used to translate
* any String that is a representation of a date to a java.util.Date object.
Modified: trunk/connectors/connector-text/src/main/java/com/metamatrix/connector/text/TextCapabilities.java
===================================================================
--- trunk/connectors/connector-text/src/main/java/com/metamatrix/connector/text/TextCapabilities.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-text/src/main/java/com/metamatrix/connector/text/TextCapabilities.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -22,7 +22,7 @@
package com.metamatrix.connector.text;
-import com.metamatrix.connector.basic.BasicConnectorCapabilities;
+import org.teiid.connector.basic.BasicConnectorCapabilities;
public class TextCapabilities extends BasicConnectorCapabilities {
Modified: trunk/connectors/connector-text/src/main/java/com/metamatrix/connector/text/TextConnection.java
===================================================================
--- trunk/connectors/connector-text/src/main/java/com/metamatrix/connector/text/TextConnection.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-text/src/main/java/com/metamatrix/connector/text/TextConnection.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -25,15 +25,16 @@
import java.util.HashMap;
import java.util.Map;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.api.ResultSetExecution;
-import com.metamatrix.connector.basic.BasicConnection;
-import com.metamatrix.connector.language.IQuery;
-import com.metamatrix.connector.language.IQueryCommand;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.api.ResultSetExecution;
+import org.teiid.connector.basic.BasicConnection;
+import org.teiid.connector.language.IQuery;
+import org.teiid.connector.language.IQueryCommand;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
+
/**
* Implementation of Connection interface for text connection.
*/
Modified: trunk/connectors/connector-text/src/main/java/com/metamatrix/connector/text/TextConnector.java
===================================================================
--- trunk/connectors/connector-text/src/main/java/com/metamatrix/connector/text/TextConnector.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-text/src/main/java/com/metamatrix/connector/text/TextConnector.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -34,14 +34,15 @@
import java.util.Map;
import java.util.Properties;
-import com.metamatrix.connector.api.Connection;
-import com.metamatrix.connector.api.ConnectorCapabilities;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ConnectorLogger;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.basic.BasicConnector;
+import org.teiid.connector.api.Connection;
+import org.teiid.connector.api.ConnectorCapabilities;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorLogger;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.basic.BasicConnector;
+
/**
* Implementation of text connector.
*/
Modified: trunk/connectors/connector-text/src/main/java/com/metamatrix/connector/text/TextSynchExecution.java
===================================================================
--- trunk/connectors/connector-text/src/main/java/com/metamatrix/connector/text/TextSynchExecution.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-text/src/main/java/com/metamatrix/connector/text/TextSynchExecution.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -37,22 +37,23 @@
import java.util.Map;
import java.util.Properties;
-import com.metamatrix.connector.api.Connection;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ConnectorLogger;
-import com.metamatrix.connector.api.DataNotAvailableException;
-import com.metamatrix.connector.api.ResultSetExecution;
-import com.metamatrix.connector.api.TypeFacility;
-import com.metamatrix.connector.basic.BasicExecution;
-import com.metamatrix.connector.language.ICommand;
-import com.metamatrix.connector.language.IElement;
-import com.metamatrix.connector.language.IFrom;
-import com.metamatrix.connector.language.IGroup;
-import com.metamatrix.connector.language.IQuery;
-import com.metamatrix.connector.language.ISelectSymbol;
-import com.metamatrix.connector.metadata.runtime.Element;
-import com.metamatrix.connector.metadata.runtime.Group;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
+import org.teiid.connector.api.Connection;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorLogger;
+import org.teiid.connector.api.DataNotAvailableException;
+import org.teiid.connector.api.ResultSetExecution;
+import org.teiid.connector.api.TypeFacility;
+import org.teiid.connector.basic.BasicExecution;
+import org.teiid.connector.language.ICommand;
+import org.teiid.connector.language.IElement;
+import org.teiid.connector.language.IFrom;
+import org.teiid.connector.language.IGroup;
+import org.teiid.connector.language.IQuery;
+import org.teiid.connector.language.ISelectSymbol;
+import org.teiid.connector.metadata.runtime.Element;
+import org.teiid.connector.metadata.runtime.Group;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
+
import com.metamatrix.core.util.StringUtil;
/**
@@ -596,8 +597,8 @@
}
/**
- * Helper method for getting runtime {@link com.metamatrix.connector.metadata.runtime.Element} from a
- * {@link com.metamatrix.connector.language.ISelectSymbol}.
+ * Helper method for getting runtime {@link org.teiid.connector.metadata.runtime.Element} from a
+ * {@link org.teiid.connector.language.ISelectSymbol}.
* @param symbol Input ISelectSymbol
* @return Element returned metadata runtime Element
*/
Modified: trunk/connectors/connector-text/src/test/java/com/metamatrix/connector/text/TestMultiFileTextSynchExecution.java
===================================================================
--- trunk/connectors/connector-text/src/test/java/com/metamatrix/connector/text/TestMultiFileTextSynchExecution.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-text/src/test/java/com/metamatrix/connector/text/TestMultiFileTextSynchExecution.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -27,10 +27,11 @@
import java.util.List;
import java.util.Set;
+import org.teiid.connector.api.ConnectorException;
+
import junit.framework.TestCase;
import com.metamatrix.cdk.api.ConnectorHost;
-import com.metamatrix.connector.api.ConnectorException;
import com.metamatrix.core.util.UnitTestUtil;
import com.metamatrix.query.unittest.TimestampUtil;
Modified: trunk/connectors/connector-text/src/test/java/com/metamatrix/connector/text/TestRowHeaderTextSynchExecution.java
===================================================================
--- trunk/connectors/connector-text/src/test/java/com/metamatrix/connector/text/TestRowHeaderTextSynchExecution.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-text/src/test/java/com/metamatrix/connector/text/TestRowHeaderTextSynchExecution.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -22,9 +22,10 @@
package com.metamatrix.connector.text;
+import org.teiid.connector.api.ConnectorException;
+
import junit.framework.TestCase;
-import com.metamatrix.connector.api.ConnectorException;
public class TestRowHeaderTextSynchExecution extends TestCase {
Modified: trunk/connectors/connector-text/src/test/java/com/metamatrix/connector/text/TestTextConnection.java
===================================================================
--- trunk/connectors/connector-text/src/test/java/com/metamatrix/connector/text/TestTextConnection.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-text/src/test/java/com/metamatrix/connector/text/TestTextConnection.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -25,11 +25,12 @@
import java.util.Map;
import java.util.Properties;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+
import junit.framework.TestCase;
import com.metamatrix.cdk.api.EnvironmentUtility;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
import com.metamatrix.core.util.UnitTestUtil;
/**
Modified: trunk/connectors/connector-text/src/test/java/com/metamatrix/connector/text/TestTextConnector.java
===================================================================
--- trunk/connectors/connector-text/src/test/java/com/metamatrix/connector/text/TestTextConnector.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-text/src/test/java/com/metamatrix/connector/text/TestTextConnector.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -24,10 +24,11 @@
import java.util.Properties;
+import org.teiid.connector.api.ConnectorEnvironment;
+
import junit.framework.TestCase;
import com.metamatrix.cdk.api.EnvironmentUtility;
-import com.metamatrix.connector.api.ConnectorEnvironment;
import com.metamatrix.core.util.UnitTestUtil;
/**
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/AbstractCachingConnector.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/AbstractCachingConnector.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/AbstractCachingConnector.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -27,8 +27,9 @@
import java.util.HashMap;
import java.util.Map;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+
import com.metamatrix.connector.xml.base.LoggingConnector;
import com.metamatrix.connector.xml.cache.DocumentCache;
import com.metamatrix.connector.xml.cache.IDocumentCache;
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/AsynchronousDocumentProducer.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/AsynchronousDocumentProducer.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/AsynchronousDocumentProducer.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -24,7 +24,7 @@
package com.metamatrix.connector.xml;
-import com.metamatrix.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorException;
public interface AsynchronousDocumentProducer extends DocumentProducer {
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/BaseXMLConnectorState.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/BaseXMLConnectorState.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/BaseXMLConnectorState.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -25,9 +25,9 @@
package com.metamatrix.connector.xml;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ConnectorLogger;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorLogger;
public interface BaseXMLConnectorState {
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/CachingConnector.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/CachingConnector.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/CachingConnector.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -24,7 +24,8 @@
package com.metamatrix.connector.xml;
-import com.metamatrix.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorException;
+
import com.metamatrix.connector.xml.base.StatefulConnector;
import com.metamatrix.connector.xml.cache.IDocumentCache;
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/DocumentProducer.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/DocumentProducer.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/DocumentProducer.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -25,7 +25,8 @@
import java.io.Serializable;
-import com.metamatrix.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorException;
+
import com.metamatrix.connector.xml.base.Response;
/**
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/IQueryPreprocessor.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/IQueryPreprocessor.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/IQueryPreprocessor.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -24,11 +24,11 @@
package com.metamatrix.connector.xml;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorLogger;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.language.IQuery;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorLogger;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.language.IQuery;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
public interface IQueryPreprocessor {
/**
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/NamedDocumentExecutor.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/NamedDocumentExecutor.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/NamedDocumentExecutor.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -23,7 +23,7 @@
package com.metamatrix.connector.xml;
-import com.metamatrix.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorException;
public interface NamedDocumentExecutor
{
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/SAXFilterProvider.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/SAXFilterProvider.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/SAXFilterProvider.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -24,9 +24,9 @@
package com.metamatrix.connector.xml;
+import org.teiid.connector.api.ConnectorLogger;
import org.xml.sax.helpers.XMLFilterImpl;
-import com.metamatrix.connector.api.ConnectorLogger;
public interface SAXFilterProvider {
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/SecureConnectorState.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/SecureConnectorState.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/SecureConnectorState.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -24,7 +24,7 @@
package com.metamatrix.connector.xml;
-import com.metamatrix.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorException;
public interface SecureConnectorState {
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/TrustedPayloadHandler.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/TrustedPayloadHandler.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/TrustedPayloadHandler.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -25,9 +25,10 @@
package com.metamatrix.connector.xml;
import java.io.Serializable;
+
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorLogger;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorLogger;
public interface TrustedPayloadHandler {
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/XMLConnection.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/XMLConnection.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/XMLConnection.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -24,9 +24,9 @@
package com.metamatrix.connector.xml;
-import com.metamatrix.connector.api.Connection;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
+import org.teiid.connector.api.Connection;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
public interface XMLConnection extends Connection {
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/XMLConnectorState.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/XMLConnectorState.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/XMLConnectorState.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -23,11 +23,11 @@
package com.metamatrix.connector.xml;
-import com.metamatrix.connector.api.Connection;
-import com.metamatrix.connector.api.ConnectorCapabilities;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ExecutionContext;
+import org.teiid.connector.api.Connection;
+import org.teiid.connector.api.ConnectorCapabilities;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ExecutionContext;
public interface XMLConnectorState extends BaseXMLConnectorState {
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/XMLExecution.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/XMLExecution.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/XMLExecution.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -22,8 +22,9 @@
package com.metamatrix.connector.xml;
-import com.metamatrix.connector.api.Execution;
-import com.metamatrix.connector.api.ExecutionContext;
+import org.teiid.connector.api.Execution;
+import org.teiid.connector.api.ExecutionContext;
+
import com.metamatrix.connector.xml.base.ExecutionInfo;
import com.metamatrix.connector.xml.cache.IDocumentCache;
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/BaseBatchProducer.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/BaseBatchProducer.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/BaseBatchProducer.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -25,10 +25,11 @@
import java.util.ArrayList;
import java.util.List;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ExecutionContext;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ExecutionContext;
+
public class BaseBatchProducer {
private List allResultsList;
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/BaseResultsProducer.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/BaseResultsProducer.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/BaseResultsProducer.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -49,9 +49,9 @@
import org.jdom.Text;
import org.jdom.input.SAXBuilder;
import org.jdom.output.XMLOutputter;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorLogger;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ConnectorLogger;
import com.metamatrix.connector.xml.cache.IDocumentCache;
import com.metamatrix.connector.xml.http.Messages;
/**
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/CriteriaDesc.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/CriteriaDesc.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/CriteriaDesc.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -27,19 +27,20 @@
import java.util.List;
import java.util.Properties;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.language.IBaseInCriteria;
-import com.metamatrix.connector.language.ICompareCriteria;
-import com.metamatrix.connector.language.ICriteria;
-import com.metamatrix.connector.language.IElement;
-import com.metamatrix.connector.language.IExpression;
-import com.metamatrix.connector.language.IInCriteria;
-import com.metamatrix.connector.language.ILiteral;
-import com.metamatrix.connector.language.IQuery;
-import com.metamatrix.connector.language.LanguageUtil;
-import com.metamatrix.connector.language.ICompareCriteria.Operator;
-import com.metamatrix.connector.metadata.runtime.Element;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.language.IBaseInCriteria;
+import org.teiid.connector.language.ICompareCriteria;
+import org.teiid.connector.language.ICriteria;
+import org.teiid.connector.language.IElement;
+import org.teiid.connector.language.IExpression;
+import org.teiid.connector.language.IInCriteria;
+import org.teiid.connector.language.ILiteral;
+import org.teiid.connector.language.IQuery;
+import org.teiid.connector.language.LanguageUtil;
+import org.teiid.connector.language.ICompareCriteria.Operator;
+import org.teiid.connector.metadata.runtime.Element;
+
/**
* @author BLotenberg
*
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/DocumentBuilder.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/DocumentBuilder.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/DocumentBuilder.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -35,8 +35,8 @@
import org.jdom.IllegalNameException;
import org.jdom.Namespace;
import org.jdom.output.XMLOutputter;
+import org.teiid.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ConnectorException;
import com.metamatrix.connector.xml.soap.SOAPDocBuilder;
public class DocumentBuilder {
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/FileBackedValueReference.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/FileBackedValueReference.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/FileBackedValueReference.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -26,8 +26,9 @@
import java.io.RandomAccessFile;
import java.lang.Long;
-import com.metamatrix.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorException;
+
public class FileBackedValueReference implements LargeTextValueReference {
private RandomAccessFile file;
private long length;
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/FileLifeManager.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/FileLifeManager.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/FileLifeManager.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -29,8 +29,9 @@
import java.util.Iterator;
import java.util.List;
-import com.metamatrix.connector.api.ConnectorLogger;
+import org.teiid.connector.api.ConnectorLogger;
+
// Deletes a file when garbage collected. This allows a physical file
// to be removed during the garbage collection process. As long as everyone
// that references a file does so through its file deleter object
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/IDGeneratingXmlFilter.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/IDGeneratingXmlFilter.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/IDGeneratingXmlFilter.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -28,12 +28,12 @@
import java.util.List;
import java.util.Map;
+import org.teiid.connector.api.ConnectorLogger;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
import org.xml.sax.helpers.XMLFilterImpl;
-import com.metamatrix.connector.api.ConnectorLogger;
class IDGeneratingXmlFilter extends XMLFilterImpl
{
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/LargeOrSmallString.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/LargeOrSmallString.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/LargeOrSmallString.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -22,7 +22,7 @@
package com.metamatrix.connector.xml.base;
-import com.metamatrix.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorException;
public class LargeOrSmallString
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/LargeTextExtractingXmlFilter.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/LargeTextExtractingXmlFilter.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/LargeTextExtractingXmlFilter.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -32,12 +32,12 @@
import java.util.Iterator;
import java.util.List;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorLogger;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.XMLFilterImpl;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ConnectorLogger;
class LargeTextExtractingXmlFilter extends XMLFilterImpl {
LargeTextExtractingXmlFilter(int maxInMemoryStringSize,
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/LargeTextValueReference.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/LargeTextValueReference.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/LargeTextValueReference.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -22,7 +22,7 @@
package com.metamatrix.connector.xml.base;
-import com.metamatrix.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorException;
public interface LargeTextValueReference {
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/LoggingConnector.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/LoggingConnector.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/LoggingConnector.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -22,10 +22,11 @@
package com.metamatrix.connector.xml.base;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ConnectorLogger;
-import com.metamatrix.connector.basic.BasicConnector;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorLogger;
+import org.teiid.connector.basic.BasicConnector;
+
import com.metamatrix.connector.xml.XMLConnectorState;
/**
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/LoggingInputStreamFilter.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/LoggingInputStreamFilter.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/LoggingInputStreamFilter.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -26,8 +26,9 @@
import java.io.IOException;
import java.io.InputStream;
-import com.metamatrix.connector.api.ConnectorLogger;
+import org.teiid.connector.api.ConnectorLogger;
+
public class LoggingInputStreamFilter extends FilterInputStream {
ConnectorLogger logger;
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/NoExtendedFilters.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/NoExtendedFilters.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/NoExtendedFilters.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -22,9 +22,9 @@
package com.metamatrix.connector.xml.base;
+import org.teiid.connector.api.ConnectorLogger;
import org.xml.sax.helpers.XMLFilterImpl;
-import com.metamatrix.connector.api.ConnectorLogger;
import com.metamatrix.connector.xml.SAXFilterProvider;
public class NoExtendedFilters implements SAXFilterProvider {
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/NoQueryPreprocessing.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/NoQueryPreprocessing.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/NoQueryPreprocessing.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -24,11 +24,12 @@
package com.metamatrix.connector.xml.base;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorLogger;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.language.IQuery;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorLogger;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.language.IQuery;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
+
import com.metamatrix.connector.xml.IQueryPreprocessor;
public class NoQueryPreprocessing implements IQueryPreprocessor {
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/OutputXPathDesc.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/OutputXPathDesc.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/OutputXPathDesc.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -25,11 +25,12 @@
import java.text.MessageFormat;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.language.ILiteral;
-import com.metamatrix.connector.metadata.runtime.Element;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.language.ILiteral;
+import org.teiid.connector.metadata.runtime.Element;
+
/**
* @author BLotenberg
*
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/ParameterDescriptor.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/ParameterDescriptor.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/ParameterDescriptor.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -23,8 +23,8 @@
package com.metamatrix.connector.xml.base;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.metadata.runtime.Element;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.metadata.runtime.Element;
public abstract class ParameterDescriptor {
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/PluggableInputStreamFilterImpl.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/PluggableInputStreamFilterImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/PluggableInputStreamFilterImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -26,8 +26,9 @@
import java.io.IOException;
import java.io.InputStream;
-import com.metamatrix.connector.api.ConnectorLogger;
+import org.teiid.connector.api.ConnectorLogger;
+
public class PluggableInputStreamFilterImpl extends FilterInputStream {
public PluggableInputStreamFilterImpl(InputStream in, ConnectorLogger logger) {
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/QueryAnalyzer.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/QueryAnalyzer.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/QueryAnalyzer.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -27,21 +27,22 @@
import java.util.Iterator;
import java.util.List;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ConnectorLogger;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.language.IElement;
-import com.metamatrix.connector.language.IExpression;
-import com.metamatrix.connector.language.IFrom;
-import com.metamatrix.connector.language.IGroup;
-import com.metamatrix.connector.language.ILiteral;
-import com.metamatrix.connector.language.IQuery;
-import com.metamatrix.connector.language.ISelect;
-import com.metamatrix.connector.language.ISelectSymbol;
-import com.metamatrix.connector.metadata.runtime.Element;
-import com.metamatrix.connector.metadata.runtime.Group;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorLogger;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.language.IElement;
+import org.teiid.connector.language.IExpression;
+import org.teiid.connector.language.IFrom;
+import org.teiid.connector.language.IGroup;
+import org.teiid.connector.language.ILiteral;
+import org.teiid.connector.language.IQuery;
+import org.teiid.connector.language.ISelect;
+import org.teiid.connector.language.ISelectSymbol;
+import org.teiid.connector.metadata.runtime.Element;
+import org.teiid.connector.metadata.runtime.Group;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
+
import com.metamatrix.connector.xml.IQueryPreprocessor;
/**
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/RequestResponseDocumentProducer.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/RequestResponseDocumentProducer.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/RequestResponseDocumentProducer.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -32,8 +32,9 @@
import java.util.Iterator;
import java.util.List;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ConnectorLogger;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorLogger;
+
import com.metamatrix.connector.xml.DocumentProducer;
import com.metamatrix.connector.xml.XMLConnectorState;
import com.metamatrix.connector.xml.XMLExecution;
@@ -151,7 +152,7 @@
try {
Class pluggableFilter = Thread.currentThread().getContextClassLoader().loadClass(getState().getPluggableInputStreamFilterClass());
Constructor ctor = pluggableFilter.getConstructor(
- new Class[] { java.io.InputStream.class, com.metamatrix.connector.api.ConnectorLogger.class});
+ new Class[] { java.io.InputStream.class, org.teiid.connector.api.ConnectorLogger.class});
filter = (InputStream) ctor.newInstance(new Object[] {response, logger});
} catch (Exception cnf) {
throw new ConnectorException(cnf);
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/Response.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/Response.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/Response.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -32,8 +32,8 @@
import java.io.Serializable;
import org.apache.commons.codec.binary.Base64;
+import org.teiid.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ConnectorException;
import com.metamatrix.connector.xml.DocumentProducer;
import com.metamatrix.connector.xml.cache.DocumentCache;
import com.metamatrix.connector.xml.cache.IDocumentCache;
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/SecureConnectorStateImpl.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/SecureConnectorStateImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/SecureConnectorStateImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -25,9 +25,10 @@
package com.metamatrix.connector.xml.base;
import java.util.Properties;
+
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
import com.metamatrix.connector.xml.SecureConnectorState;
import com.metamatrix.connector.xml.TrustedPayloadHandler;
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/StatefulConnector.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/StatefulConnector.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/StatefulConnector.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -24,9 +24,10 @@
package com.metamatrix.connector.xml.base;
-import com.metamatrix.connector.api.Connector;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorLogger;
+import org.teiid.connector.api.Connector;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorLogger;
+
import com.metamatrix.connector.xml.XMLConnectorState;
public interface StatefulConnector extends Connector {
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/TrustedPayloadBridge.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/TrustedPayloadBridge.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/TrustedPayloadBridge.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -26,9 +26,10 @@
import java.io.Serializable;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorLogger;
-import com.metamatrix.connector.api.CredentialMap;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorLogger;
+import org.teiid.connector.api.CredentialMap;
+
import com.metamatrix.connector.xml.TrustedPayloadHandler;
public abstract class TrustedPayloadBridge implements TrustedPayloadHandler {
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/ValueConvertor.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/ValueConvertor.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/ValueConvertor.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -26,12 +26,13 @@
import java.text.MessageFormat;
import java.util.ArrayList;
+
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.api.TypeFacility;
+import org.teiid.connector.metadata.runtime.Element;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.api.TypeFacility;
-import com.metamatrix.connector.metadata.runtime.Element;
public class ValueConvertor {
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/XMLCapabilities.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/XMLCapabilities.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/XMLCapabilities.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -26,9 +26,10 @@
import java.util.Collections;
import java.util.List;
-import com.metamatrix.connector.basic.BasicConnectorCapabilities;
+import org.teiid.connector.basic.BasicConnectorCapabilities;
+
public class XMLCapabilities extends BasicConnectorCapabilities {
public XMLCapabilities() {
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/XMLConnectionImpl.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/XMLConnectionImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/XMLConnectionImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -25,15 +25,16 @@
import java.io.Serializable;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ConnectorLogger;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.api.ResultSetExecution;
-import com.metamatrix.connector.basic.BasicConnection;
-import com.metamatrix.connector.language.IQuery;
-import com.metamatrix.connector.language.IQueryCommand;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorLogger;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.api.ResultSetExecution;
+import org.teiid.connector.basic.BasicConnection;
+import org.teiid.connector.language.IQuery;
+import org.teiid.connector.language.IQueryCommand;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
+
import com.metamatrix.connector.xml.CachingConnector;
import com.metamatrix.connector.xml.SecureConnectorState;
import com.metamatrix.connector.xml.TrustedPayloadHandler;
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/XMLConnector.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/XMLConnector.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/XMLConnector.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -23,13 +23,14 @@
package com.metamatrix.connector.xml.base;
-import com.metamatrix.connector.api.Connection;
-import com.metamatrix.connector.api.ConnectorCapabilities;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ConnectorLogger;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.api.ConnectorAnnotations.ConnectionPooling;
+import org.teiid.connector.api.Connection;
+import org.teiid.connector.api.ConnectorCapabilities;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorLogger;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.api.ConnectorAnnotations.ConnectionPooling;
+
import com.metamatrix.connector.xml.AbstractCachingConnector;
@ConnectionPooling(enabled=false)
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/XMLConnectorStateImpl.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/XMLConnectorStateImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/XMLConnectorStateImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -25,10 +25,11 @@
import java.util.Properties;
-import com.metamatrix.connector.api.ConnectorCapabilities;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ConnectorLogger;
+import org.teiid.connector.api.ConnectorCapabilities;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorLogger;
+
import com.metamatrix.connector.xml.IQueryPreprocessor;
import com.metamatrix.connector.xml.SAXFilterProvider;
import com.metamatrix.connector.xml.XMLConnectorState;
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/XMLExecutionImpl.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/XMLExecutionImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/XMLExecutionImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -28,15 +28,16 @@
import java.util.Iterator;
import java.util.List;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ConnectorLogger;
-import com.metamatrix.connector.api.DataNotAvailableException;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.api.ResultSetExecution;
-import com.metamatrix.connector.basic.BasicExecution;
-import com.metamatrix.connector.language.IQuery;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorLogger;
+import org.teiid.connector.api.DataNotAvailableException;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.api.ResultSetExecution;
+import org.teiid.connector.basic.BasicExecution;
+import org.teiid.connector.language.IQuery;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
+
import com.metamatrix.connector.xml.DocumentProducer;
import com.metamatrix.connector.xml.XMLConnection;
import com.metamatrix.connector.xml.XMLConnectorState;
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/XMLExtractor.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/XMLExtractor.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/base/XMLExtractor.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -34,6 +34,8 @@
import org.jdom.Element;
import org.jdom.JDOMException;
import org.jdom.input.SAXBuilder;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorLogger;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.XMLFilter;
@@ -41,8 +43,6 @@
import org.xml.sax.helpers.AttributesImpl;
import org.xml.sax.helpers.XMLFilterImpl;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ConnectorLogger;
import com.metamatrix.connector.xml.SAXFilterProvider;
/**
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/cache/DocumentCache.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/cache/DocumentCache.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/cache/DocumentCache.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -40,8 +40,9 @@
import java.util.Set;
import java.util.Vector;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ConnectorLogger;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorLogger;
+
import com.metamatrix.connector.xml.base.XMLDocument;
/**
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/cache/ExecutionRecord.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/cache/ExecutionRecord.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/cache/ExecutionRecord.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -27,8 +27,9 @@
import java.util.Iterator;
import java.util.Map;
-import com.metamatrix.connector.api.ConnectorLogger;
+import org.teiid.connector.api.ConnectorLogger;
+
public class ExecutionRecord implements Record {
Record parent;
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/cache/IDocumentCache.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/cache/IDocumentCache.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/cache/IDocumentCache.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -23,7 +23,7 @@
package com.metamatrix.connector.xml.cache;
-import com.metamatrix.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorException;
public interface IDocumentCache {
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/cache/RequestPartRecord.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/cache/RequestPartRecord.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/cache/RequestPartRecord.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -25,8 +25,9 @@
import java.util.HashMap;
import java.util.Map;
-import com.metamatrix.connector.api.ConnectorLogger;
+import org.teiid.connector.api.ConnectorLogger;
+
public class RequestPartRecord implements Record {
/**
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/cache/RequestRecord.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/cache/RequestRecord.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/cache/RequestRecord.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -26,9 +26,10 @@
import java.util.HashMap;
import java.util.Map;
+
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorLogger;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ConnectorLogger;
import com.metamatrix.connector.xml.CachingConnector;
/**
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/file/FileConnectorState.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/file/FileConnectorState.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/file/FileConnectorState.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -25,10 +25,11 @@
import java.util.Properties;
-import com.metamatrix.connector.api.Connection;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ExecutionContext;
+import org.teiid.connector.api.Connection;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ExecutionContext;
+
import com.metamatrix.connector.xml.CachingConnector;
import com.metamatrix.connector.xml.DocumentProducer;
import com.metamatrix.connector.xml.XMLExecution;
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/file/FileExecutor.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/file/FileExecutor.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/file/FileExecutor.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -33,10 +33,10 @@
import java.util.ArrayList;
import org.jdom.Document;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorLogger;
+import org.teiid.connector.api.ExecutionContext;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ConnectorLogger;
-import com.metamatrix.connector.api.ExecutionContext;
import com.metamatrix.connector.xml.DocumentProducer;
import com.metamatrix.connector.xml.NamedDocumentExecutor;
import com.metamatrix.connector.xml.SAXFilterProvider;
@@ -180,7 +180,7 @@
try {
Class pluggableFilter = Thread.currentThread().getContextClassLoader().loadClass(m_state.getPluggableInputStreamFilterClass());
Constructor ctor = pluggableFilter.getConstructor(
- new Class[] { java.io.InputStream.class, com.metamatrix.connector.api.ConnectorLogger.class});
+ new Class[] { java.io.InputStream.class, org.teiid.connector.api.ConnectorLogger.class});
filter = (InputStream) ctor.newInstance(new Object[] {response, logger});
} catch (Exception cnf) {
throw new ConnectorException(cnf);
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/http/DefaultTrustDeserializer.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/http/DefaultTrustDeserializer.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/http/DefaultTrustDeserializer.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -28,8 +28,8 @@
import org.apache.commons.httpclient.HttpMethod;
import org.apache.commons.httpclient.UsernamePasswordCredentials;
import org.apache.commons.httpclient.auth.AuthScope;
+import org.teiid.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ConnectorException;
import com.metamatrix.connector.xml.XMLConnectorState;
import com.metamatrix.connector.xml.base.TrustedPayloadBridge;
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/http/HTTPConnectorState.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/http/HTTPConnectorState.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/http/HTTPConnectorState.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -37,11 +37,11 @@
import org.apache.commons.httpclient.UsernamePasswordCredentials;
import org.apache.commons.httpclient.auth.AuthScope;
import org.apache.commons.httpclient.params.HttpConnectionManagerParams;
+import org.teiid.connector.api.Connection;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ExecutionContext;
-import com.metamatrix.connector.api.Connection;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ExecutionContext;
import com.metamatrix.connector.xml.CachingConnector;
import com.metamatrix.connector.xml.DocumentProducer;
import com.metamatrix.connector.xml.XMLExecution;
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/http/HTTPExecutor.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/http/HTTPExecutor.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/http/HTTPExecutor.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -42,9 +42,9 @@
import org.apache.commons.httpclient.methods.StringRequestEntity;
import org.apache.commons.httpclient.util.ParameterParser;
import org.jdom.Document;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ExecutionContext;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ExecutionContext;
import com.metamatrix.connector.xml.CachingConnector;
import com.metamatrix.connector.xml.SAXFilterProvider;
import com.metamatrix.connector.xml.XMLConnection;
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/http/HTTPRequestor.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/http/HTTPRequestor.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/http/HTTPRequestor.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -37,9 +37,9 @@
import org.apache.commons.httpclient.methods.PostMethod;
import org.jdom.Document;
import org.jdom.output.XMLOutputter;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorLogger;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ConnectorLogger;
/**
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/http/HTTPTrustDeserializer.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/http/HTTPTrustDeserializer.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/http/HTTPTrustDeserializer.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -28,9 +28,9 @@
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.HttpMethod;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorLogger;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ConnectorLogger;
import com.metamatrix.connector.xml.TrustedPayloadHandler;
import com.metamatrix.connector.xml.XMLConnectorState;
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/jms/JMSConnection.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/jms/JMSConnection.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/jms/JMSConnection.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -35,14 +35,15 @@
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.api.ResultSetExecution;
-import com.metamatrix.connector.basic.BasicConnection;
-import com.metamatrix.connector.language.IQuery;
-import com.metamatrix.connector.language.IQueryCommand;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.api.ResultSetExecution;
+import org.teiid.connector.basic.BasicConnection;
+import org.teiid.connector.language.IQuery;
+import org.teiid.connector.language.IQueryCommand;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
+
import com.metamatrix.connector.xml.CachingConnector;
import com.metamatrix.connector.xml.IQueryPreprocessor;
import com.metamatrix.connector.xml.TrustedPayloadHandler;
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/jms/JMSExecution.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/jms/JMSExecution.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/jms/JMSExecution.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -33,15 +33,16 @@
import javax.jms.JMSException;
import javax.jms.Session;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ConnectorLogger;
-import com.metamatrix.connector.api.DataNotAvailableException;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.api.ResultSetExecution;
-import com.metamatrix.connector.basic.BasicExecution;
-import com.metamatrix.connector.language.IQuery;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorLogger;
+import org.teiid.connector.api.DataNotAvailableException;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.api.ResultSetExecution;
+import org.teiid.connector.basic.BasicExecution;
+import org.teiid.connector.language.IQuery;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
+
import com.metamatrix.connector.xml.SOAPConnectorState;
import com.metamatrix.connector.xml.XMLConnection;
import com.metamatrix.connector.xml.XMLExecution;
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/jms/JMSRequestExecutor.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/jms/JMSRequestExecutor.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/jms/JMSRequestExecutor.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -40,10 +40,10 @@
import javax.jms.TextMessage;
import org.jdom.Document;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorLogger;
+import org.teiid.connector.api.ExecutionContext;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ConnectorLogger;
-import com.metamatrix.connector.api.ExecutionContext;
import com.metamatrix.connector.xml.AsynchronousDocumentProducer;
import com.metamatrix.connector.xml.SOAPConnectorState;
import com.metamatrix.connector.xml.base.CriteriaDesc;
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/jms/JMSSOAPConnectorState.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/jms/JMSSOAPConnectorState.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/jms/JMSSOAPConnectorState.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -26,9 +26,10 @@
import java.util.Properties;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ConnectorLogger;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorLogger;
+
import com.metamatrix.connector.xml.SOAPConnectorState;
import com.metamatrix.connector.xml.soap.SOAPConnectorStateImpl;
import com.metamatrix.connector.xmlsource.soap.SecurityToken;
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/jms/JMSXMLConnectorState.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/jms/JMSXMLConnectorState.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/jms/JMSXMLConnectorState.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -29,10 +29,11 @@
import javax.jms.DeliveryMode;
import javax.jms.Session;
-import com.metamatrix.connector.api.Connection;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ExecutionContext;
+import org.teiid.connector.api.Connection;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ExecutionContext;
+
import com.metamatrix.connector.xml.CachingConnector;
import com.metamatrix.connector.xml.DocumentProducer;
import com.metamatrix.connector.xml.XMLExecution;
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/soap/FilteringHTTPSender.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/soap/FilteringHTTPSender.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/soap/FilteringHTTPSender.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -4,8 +4,8 @@
import java.lang.reflect.Constructor;
import org.apache.commons.httpclient.HttpMethodBase;
+import org.teiid.connector.api.ConnectorLogger;
-import com.metamatrix.connector.api.ConnectorLogger;
import com.metamatrix.connector.xml.XMLConnectorState;
import com.metamatrix.connector.xml.base.LoggingInputStreamFilter;
@@ -29,7 +29,7 @@
Class pluggableFilter = Thread.currentThread().getContextClassLoader().loadClass(state.getPluggableInputStreamFilterClass());
Constructor ctor = pluggableFilter.getConstructor(
- new Class[] { java.io.InputStream.class, com.metamatrix.connector.api.ConnectorLogger.class});
+ new Class[] { java.io.InputStream.class, org.teiid.connector.api.ConnectorLogger.class});
result = (InputStream) ctor.newInstance(new Object[] {result, logger});
return result;
}
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/soap/SOAPConnectorState.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/soap/SOAPConnectorState.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/soap/SOAPConnectorState.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -26,9 +26,10 @@
import java.util.Properties;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ConnectorLogger;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorLogger;
+
import com.metamatrix.connector.xml.DocumentProducer;
import com.metamatrix.connector.xml.XMLExecution;
import com.metamatrix.connector.xml.http.HTTPConnectorState;
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/soap/SOAPConnectorStateImpl.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/soap/SOAPConnectorStateImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/soap/SOAPConnectorStateImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -30,9 +30,10 @@
import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.HttpsURLConnection;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ConnectorLogger;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorLogger;
+
import com.metamatrix.connector.xml.SOAPConnectorState;
import com.metamatrix.connector.xml.base.Messages;
import com.metamatrix.connector.xml.http.HTTPConnectorState;
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/soap/SOAPDocBuilder.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/soap/SOAPDocBuilder.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/soap/SOAPDocBuilder.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -34,8 +34,8 @@
import org.jdom.Document;
import org.jdom.Element;
import org.jdom.Namespace;
+import org.teiid.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ConnectorException;
import com.metamatrix.connector.xml.SOAPConnectorState;
import com.metamatrix.connector.xml.base.CriteriaDesc;
import com.metamatrix.connector.xml.base.DocumentBuilder;
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/soap/SOAPExecutor.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/soap/SOAPExecutor.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/soap/SOAPExecutor.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -54,11 +54,11 @@
import org.jdom.Element;
import org.jdom.input.DOMBuilder;
import org.jdom.output.DOMOutputter;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ExecutionContext;
import org.w3c.dom.NodeList;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ExecutionContext;
import com.metamatrix.connector.xml.CachingConnector;
import com.metamatrix.connector.xml.SOAPConnectorState;
import com.metamatrix.connector.xml.TrustedPayloadHandler;
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/XMLConnectionFacory.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/XMLConnectionFacory.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/XMLConnectionFacory.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -24,12 +24,13 @@
import java.lang.reflect.Constructor;
-import com.metamatrix.connector.api.Connection;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ExecutionContext;
+import org.teiid.connector.api.Connection;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ExecutionContext;
+
/**
* This Connection facory which will handle the different connection semantics
* the supported type will be
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/XMLSourceCapabilities.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/XMLSourceCapabilities.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/XMLSourceCapabilities.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -22,7 +22,7 @@
package com.metamatrix.connector.xmlsource;
-import com.metamatrix.connector.basic.BasicConnectorCapabilities;
+import org.teiid.connector.basic.BasicConnectorCapabilities;
/**
*/
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/XMLSourceConnection.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/XMLSourceConnection.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/XMLSourceConnection.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -22,9 +22,9 @@
package com.metamatrix.connector.xmlsource;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.basic.BasicConnection;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.basic.BasicConnection;
/**
* A Base XML Connection to an XML Source
@@ -43,7 +43,7 @@
}
/**
- * @see com.metamatrix.connector.api.Connection#release()
+ * @see org.teiid.connector.api.Connection#release()
*/
public void close() {
XMLSourcePlugin.logInfo(this.env.getLogger(), "Connection_closed"); //$NON-NLS-1$
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/XMLSourceConnector.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/XMLSourceConnector.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/XMLSourceConnector.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -22,14 +22,14 @@
package com.metamatrix.connector.xmlsource;
-import com.metamatrix.connector.api.Connection;
-import com.metamatrix.connector.api.Connector;
-import com.metamatrix.connector.api.ConnectorCapabilities;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.api.ConnectorAnnotations.ConnectionPooling;
-import com.metamatrix.connector.basic.BasicConnector;
+import org.teiid.connector.api.Connection;
+import org.teiid.connector.api.Connector;
+import org.teiid.connector.api.ConnectorCapabilities;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.api.ConnectorAnnotations.ConnectionPooling;
+import org.teiid.connector.basic.BasicConnector;
/**
* XML Source connector, will give provide a XML document as source to
@@ -58,7 +58,7 @@
/**
* Stop the Connector
- * @see com.metamatrix.connector.api.Connector#stop()
+ * @see org.teiid.connector.api.Connector#stop()
*/
public void stop() {
if (!start) {
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/XMLSourceExecution.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/XMLSourceExecution.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/XMLSourceExecution.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -28,15 +28,16 @@
import javax.xml.transform.Source;
-import com.metamatrix.connector.DataPlugin;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.DataNotAvailableException;
-import com.metamatrix.connector.api.ProcedureExecution;
-import com.metamatrix.connector.basic.BasicExecution;
-import com.metamatrix.connector.language.IParameter;
+import org.teiid.connector.DataPlugin;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.DataNotAvailableException;
+import org.teiid.connector.api.ProcedureExecution;
+import org.teiid.connector.basic.BasicExecution;
+import org.teiid.connector.language.IParameter;
+
/**
* This is main class which will execute request in the XML Source
*/
@@ -78,21 +79,21 @@
}
/**
- * @see com.metamatrix.connector.api.ProcedureExecution#getOutputValue(com.metamatrix.connector.language.IParameter)
+ * @see org.teiid.connector.api.ProcedureExecution#getOutputValue(org.teiid.connector.language.IParameter)
*/
public Object getOutputValue(IParameter parameter) throws ConnectorException {
throw new ConnectorException(XMLSourcePlugin.Util.getString("No_outputs_allowed")); //$NON-NLS-1$
}
/**
- * @see com.metamatrix.connector.api.Execution#close()
+ * @see org.teiid.connector.api.Execution#close()
*/
public void close() throws ConnectorException {
// no-op
}
/**
- * @see com.metamatrix.connector.api.Execution#cancel()
+ * @see org.teiid.connector.api.Execution#cancel()
*/
public void cancel() throws ConnectorException {
// no-op
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/XMLSourcePlugin.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/XMLSourcePlugin.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/XMLSourcePlugin.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -24,7 +24,8 @@
import java.util.ResourceBundle;
-import com.metamatrix.connector.api.ConnectorLogger;
+import org.teiid.connector.api.ConnectorLogger;
+
import com.metamatrix.core.BundleUtil;
/**
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/file/FileConnection.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/file/FileConnection.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/file/FileConnection.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -25,12 +25,13 @@
import java.io.File;
import java.util.Properties;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.api.ProcedureExecution;
-import com.metamatrix.connector.language.IProcedure;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.api.ProcedureExecution;
+import org.teiid.connector.language.IProcedure;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
+
import com.metamatrix.connector.xmlsource.XMLSourceConnection;
import com.metamatrix.connector.xmlsource.XMLSourcePlugin;
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/file/FileExecution.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/file/FileExecution.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/file/FileExecution.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -31,12 +31,13 @@
import javax.xml.transform.Source;
import javax.xml.transform.stream.StreamSource;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.language.IProcedure;
-import com.metamatrix.connector.metadata.runtime.MetadataObject;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.language.IProcedure;
+import org.teiid.connector.metadata.runtime.MetadataObject;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
+
import com.metamatrix.connector.xmlsource.XMLSourceExecution;
import com.metamatrix.connector.xmlsource.XMLSourcePlugin;
@@ -70,7 +71,7 @@
}
/**
- * @see com.metamatrix.connector.api.ProcedureExecution#execute(com.metamatrix.connector.language.IProcedure, int)
+ * @see org.teiid.connector.api.ProcedureExecution#execute(org.teiid.connector.language.IProcedure, int)
*/
@Override
public void execute() throws ConnectorException {
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/soap/SecurityToken.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/soap/SecurityToken.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/soap/SecurityToken.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -36,8 +36,8 @@
import org.apache.ws.security.handler.WSHandlerConstants;
import org.apache.ws.security.message.token.UsernameToken;
import org.apache.ws.security.util.Base64;
+import org.teiid.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorEnvironment;
import com.metamatrix.connector.xml.TrustedPayloadHandler;
import com.metamatrix.connector.xmlsource.XMLSourcePlugin;
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/soap/ServiceOperation.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/soap/ServiceOperation.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/soap/ServiceOperation.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -43,9 +43,9 @@
import org.apache.axis.wsdl.symbolTable.Parameter;
import org.apache.axis.wsdl.symbolTable.Parameters;
import org.apache.axis.wsdl.symbolTable.TypeEntry;
+import org.teiid.connector.api.ConnectorEnvironment;
import org.w3c.dom.Element;
-import com.metamatrix.connector.api.ConnectorEnvironment;
import com.metamatrix.connector.xmlsource.XMLSourcePlugin;
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/soap/SoapConnection.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/soap/SoapConnection.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/soap/SoapConnection.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -48,13 +48,13 @@
import org.apache.axis.wsdl.symbolTable.ServiceEntry;
import org.apache.axis.wsdl.symbolTable.SymTabEntry;
import org.apache.axis.wsdl.symbolTable.SymbolTable;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.api.ProcedureExecution;
+import org.teiid.connector.language.IProcedure;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.api.ProcedureExecution;
-import com.metamatrix.connector.language.IProcedure;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
import com.metamatrix.connector.xmlsource.XMLSourceConnection;
import com.metamatrix.connector.xmlsource.XMLSourcePlugin;
Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/soap/SoapExecution.java
===================================================================
--- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/soap/SoapExecution.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/soap/SoapExecution.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -29,14 +29,15 @@
import javax.xml.transform.Source;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.language.IParameter;
-import com.metamatrix.connector.language.IProcedure;
-import com.metamatrix.connector.language.IParameter.Direction;
-import com.metamatrix.connector.metadata.runtime.MetadataObject;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.language.IParameter;
+import org.teiid.connector.language.IProcedure;
+import org.teiid.connector.language.IParameter.Direction;
+import org.teiid.connector.metadata.runtime.MetadataObject;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
+
import com.metamatrix.connector.xmlsource.XMLSourceExecution;
import com.metamatrix.connector.xmlsource.XMLSourcePlugin;
import com.metamatrix.connector.xmlsource.soap.ServiceOperation.ExcutionFailedException;
@@ -68,7 +69,7 @@
}
/**
- * @see com.metamatrix.connector.api.ProcedureExecution#execute(com.metamatrix.connector.language.IProcedure, int)
+ * @see org.teiid.connector.api.ProcedureExecution#execute(org.teiid.connector.language.IProcedure, int)
*/
public void execute() throws ConnectorException {
ArrayList argsList = new ArrayList();
Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/MockQueryPreprocessor.java
===================================================================
--- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/MockQueryPreprocessor.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/MockQueryPreprocessor.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -24,11 +24,11 @@
package com.metamatrix.connector.xml;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorLogger;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.language.IQuery;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorLogger;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.language.IQuery;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
public class MockQueryPreprocessor implements IQueryPreprocessor {
Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/MockXMLExecution.java
===================================================================
--- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/MockXMLExecution.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/MockXMLExecution.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -25,11 +25,11 @@
package com.metamatrix.connector.xml;
import org.mockito.Mockito;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.language.IQuery;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.language.IQuery;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
import com.metamatrix.connector.xml.base.ExecutionInfo;
import com.metamatrix.connector.xml.base.XMLConnectionImpl;
import com.metamatrix.connector.xml.base.XMLExecutionImpl;
Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/ProxyObjectFactory.java
===================================================================
--- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/ProxyObjectFactory.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/ProxyObjectFactory.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -30,14 +30,14 @@
import org.jdom.Document;
import org.jdom.input.SAXBuilder;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.language.IQuery;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
import com.metamatrix.cdk.api.EnvironmentUtility;
import com.metamatrix.cdk.api.TranslationUtility;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.language.IQuery;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
import com.metamatrix.connector.xml.SecureConnectorState;
import com.metamatrix.connector.xml.file.FileConnectorState;
import com.metamatrix.connector.xml.http.HTTPConnectorState;
Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestCriteriaDesc.java
===================================================================
--- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestCriteriaDesc.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestCriteriaDesc.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -27,23 +27,24 @@
import java.util.Iterator;
import java.util.List;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.language.IBaseInCriteria;
+import org.teiid.connector.language.ICompareCriteria;
+import org.teiid.connector.language.ICriteria;
+import org.teiid.connector.language.IElement;
+import org.teiid.connector.language.IExpression;
+import org.teiid.connector.language.IFrom;
+import org.teiid.connector.language.IGroup;
+import org.teiid.connector.language.IQuery;
+import org.teiid.connector.language.ISelect;
+import org.teiid.connector.language.ISelectSymbol;
+import org.teiid.connector.language.LanguageUtil;
+import org.teiid.connector.metadata.runtime.Element;
+import org.teiid.connector.metadata.runtime.Group;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
+
import junit.framework.TestCase;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.language.IBaseInCriteria;
-import com.metamatrix.connector.language.ICompareCriteria;
-import com.metamatrix.connector.language.ICriteria;
-import com.metamatrix.connector.language.IElement;
-import com.metamatrix.connector.language.IExpression;
-import com.metamatrix.connector.language.IFrom;
-import com.metamatrix.connector.language.IGroup;
-import com.metamatrix.connector.language.IQuery;
-import com.metamatrix.connector.language.ISelect;
-import com.metamatrix.connector.language.ISelectSymbol;
-import com.metamatrix.connector.language.LanguageUtil;
-import com.metamatrix.connector.metadata.runtime.Element;
-import com.metamatrix.connector.metadata.runtime.Group;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
/**
* created by JChoate on Jun 27, 2005
Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestExecutionInfo.java
===================================================================
--- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestExecutionInfo.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestExecutionInfo.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -29,14 +29,14 @@
import junit.framework.TestCase;
import org.mockito.Mockito;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorLogger;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.language.IQuery;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
import com.metamatrix.cdk.api.SysLogger;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ConnectorLogger;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.language.IQuery;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
import com.metamatrix.connector.xml.IQueryPreprocessor;
import com.metamatrix.connector.xml.MockQueryPreprocessor;
Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestFileLifeManager.java
===================================================================
--- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestFileLifeManager.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestFileLifeManager.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -25,9 +25,10 @@
import java.io.File;
import java.io.IOException;
+import org.teiid.connector.api.ConnectorEnvironment;
+
import junit.framework.TestCase;
-import com.metamatrix.connector.api.ConnectorEnvironment;
public class TestFileLifeManager extends TestCase {
Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestLargeTextExtractingXmlFilter.java
===================================================================
--- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestLargeTextExtractingXmlFilter.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestLargeTextExtractingXmlFilter.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -30,10 +30,10 @@
import org.jdom.Document;
import org.jdom.JDOMException;
import org.jdom.input.SAXBuilder;
+import org.teiid.connector.api.ConnectorLogger;
import org.xml.sax.XMLFilter;
import org.xml.sax.XMLReader;
-import com.metamatrix.connector.api.ConnectorLogger;
public class TestLargeTextExtractingXmlFilter extends TestCase {
Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestLoggingInputStreamFilter.java
===================================================================
--- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestLoggingInputStreamFilter.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestLoggingInputStreamFilter.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -26,9 +26,10 @@
import java.io.IOException;
import java.io.InputStream;
+import org.teiid.connector.api.ConnectorLogger;
+
import junit.framework.TestCase;
-import com.metamatrix.connector.api.ConnectorLogger;
public class TestLoggingInputStreamFilter extends TestCase {
Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestOutputXPathDesc.java
===================================================================
--- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestOutputXPathDesc.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestOutputXPathDesc.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -24,19 +24,20 @@
import java.util.List;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.language.ICompareCriteria;
+import org.teiid.connector.language.ICriteria;
+import org.teiid.connector.language.IElement;
+import org.teiid.connector.language.IExpression;
+import org.teiid.connector.language.ILiteral;
+import org.teiid.connector.language.IQuery;
+import org.teiid.connector.language.ISelect;
+import org.teiid.connector.language.ISelectSymbol;
+import org.teiid.connector.language.LanguageUtil;
+import org.teiid.connector.metadata.runtime.Element;
+
import junit.framework.TestCase;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.language.ICompareCriteria;
-import com.metamatrix.connector.language.ICriteria;
-import com.metamatrix.connector.language.IElement;
-import com.metamatrix.connector.language.IExpression;
-import com.metamatrix.connector.language.ILiteral;
-import com.metamatrix.connector.language.IQuery;
-import com.metamatrix.connector.language.ISelect;
-import com.metamatrix.connector.language.ISelectSymbol;
-import com.metamatrix.connector.language.LanguageUtil;
-import com.metamatrix.connector.metadata.runtime.Element;
/**
* created by JChoate on Jun 27, 2005
Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestParameterDescriptor.java
===================================================================
--- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestParameterDescriptor.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestParameterDescriptor.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -24,15 +24,16 @@
import java.util.List;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.language.IElement;
+import org.teiid.connector.language.IExpression;
+import org.teiid.connector.language.IQuery;
+import org.teiid.connector.language.ISelect;
+import org.teiid.connector.language.ISelectSymbol;
+import org.teiid.connector.metadata.runtime.Element;
+
import junit.framework.TestCase;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.language.IElement;
-import com.metamatrix.connector.language.IExpression;
-import com.metamatrix.connector.language.IQuery;
-import com.metamatrix.connector.language.ISelect;
-import com.metamatrix.connector.language.ISelectSymbol;
-import com.metamatrix.connector.metadata.runtime.Element;
/**
* created by JChoate on Jun 27, 2005
Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestQueryAnalyzer.java
===================================================================
--- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestQueryAnalyzer.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestQueryAnalyzer.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -25,16 +25,16 @@
import org.mockito.Mockito;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorLogger;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.language.IQuery;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
import junit.framework.TestCase;
import com.metamatrix.cdk.api.SysLogger;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ConnectorLogger;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.language.IQuery;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
import com.metamatrix.connector.xml.IQueryPreprocessor;
import com.metamatrix.connector.xml.MockQueryPreprocessor;
Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestStringBackedValueReference.java
===================================================================
--- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestStringBackedValueReference.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestStringBackedValueReference.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -22,9 +22,10 @@
package com.metamatrix.connector.xml.base;
+import org.teiid.connector.api.ConnectorException;
+
import junit.framework.TestCase;
-import com.metamatrix.connector.api.ConnectorException;
public class TestStringBackedValueReference extends TestCase {
Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestXMLCapabilities.java
===================================================================
--- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestXMLCapabilities.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestXMLCapabilities.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -24,9 +24,10 @@
import java.util.List;
+import org.teiid.connector.api.ConnectorCapabilities;
+
import junit.framework.TestCase;
-import com.metamatrix.connector.api.ConnectorCapabilities;
/**
* created by JChoate on Jun 27, 2005
Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestXMLConnection.java
===================================================================
--- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestXMLConnection.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestXMLConnection.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -24,10 +24,11 @@
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ExecutionContext;
+
import junit.framework.TestCase;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ExecutionContext;
public class TestXMLConnection extends TestCase {
Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestXMLConnector.java
===================================================================
--- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestXMLConnector.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestXMLConnector.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -25,12 +25,13 @@
import java.io.File;
import java.util.Properties;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ExecutionContext;
+
import junit.framework.TestCase;
import com.metamatrix.cdk.api.EnvironmentUtility;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ExecutionContext;
import com.metamatrix.connector.xml.XMLConnectorState;
import com.metamatrix.connector.xml.file.FileConnectorState;
Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestXMLConnectorState.java
===================================================================
--- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestXMLConnectorState.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestXMLConnectorState.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -24,15 +24,16 @@
import java.util.Properties;
+import org.teiid.connector.api.Connection;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.Execution;
+import org.teiid.connector.api.ExecutionContext;
+
import junit.framework.TestCase;
import com.metamatrix.cdk.api.EnvironmentUtility;
import com.metamatrix.cdk.api.SysLogger;
-import com.metamatrix.connector.api.Connection;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.Execution;
-import com.metamatrix.connector.api.ExecutionContext;
import com.metamatrix.connector.xml.CachingConnector;
import com.metamatrix.connector.xml.DocumentProducer;
import com.metamatrix.connector.xml.XMLConnectorState;
Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestXMLExecution.java
===================================================================
--- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestXMLExecution.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestXMLExecution.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -24,10 +24,11 @@
import java.util.List;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.language.IQuery;
+
import junit.framework.TestCase;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.language.IQuery;
/**
* created by JChoate on Jun 16, 2005
Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestXMLExtractor.java
===================================================================
--- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestXMLExtractor.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestXMLExtractor.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -28,10 +28,10 @@
import junit.framework.TestCase;
import org.jdom.Document;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorLogger;
import com.metamatrix.cdk.api.SysLogger;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ConnectorLogger;
public class TestXMLExtractor extends TestCase {
Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/cache/TestCache.java
===================================================================
--- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/cache/TestCache.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/cache/TestCache.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -25,12 +25,13 @@
import java.io.File;
+import org.teiid.connector.api.ConnectorException;
+
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
import com.metamatrix.cdk.api.EnvironmentUtility;
-import com.metamatrix.connector.api.ConnectorException;
import com.metamatrix.core.util.UnitTestUtil;
/**
Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/cache/TestRequestRecord.java
===================================================================
--- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/cache/TestRequestRecord.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/cache/TestRequestRecord.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -25,9 +25,9 @@
import junit.framework.TestCase;
import org.mockito.Mockito;
+import org.teiid.connector.api.ConnectorLogger;
import com.metamatrix.cdk.api.SysLogger;
-import com.metamatrix.connector.api.ConnectorLogger;
import com.metamatrix.connector.xml.CachingConnector;
public class TestRequestRecord extends TestCase {
Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/file/TestFileConnectorState.java
===================================================================
--- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/file/TestFileConnectorState.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/file/TestFileConnectorState.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -24,11 +24,12 @@
import java.util.Properties;
+import org.teiid.connector.api.ConnectorException;
+
import junit.framework.TestCase;
import com.metamatrix.cdk.api.EnvironmentUtility;
import com.metamatrix.cdk.api.SysLogger;
-import com.metamatrix.connector.api.ConnectorException;
import com.metamatrix.connector.xml.DocumentProducer;
import com.metamatrix.connector.xml.base.ProxyObjectFactory;
import com.metamatrix.connector.xml.base.XMLExecutionImpl;
Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/file/TestFileExecutor.java
===================================================================
--- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/file/TestFileExecutor.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/file/TestFileExecutor.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -27,18 +27,19 @@
import java.util.ArrayList;
import java.util.Properties;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.language.IElement;
+import org.teiid.connector.language.IExpression;
+import org.teiid.connector.language.IQuery;
+import org.teiid.connector.language.ISelectSymbol;
+import org.teiid.connector.metadata.runtime.Element;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
+
import junit.framework.TestCase;
import com.metamatrix.cdk.api.EnvironmentUtility;
import com.metamatrix.cdk.api.SysLogger;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.language.IElement;
-import com.metamatrix.connector.language.IExpression;
-import com.metamatrix.connector.language.IQuery;
-import com.metamatrix.connector.language.ISelectSymbol;
-import com.metamatrix.connector.metadata.runtime.Element;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
import com.metamatrix.connector.xml.MockXMLExecution;
import com.metamatrix.connector.xml.base.ExecutionInfo;
import com.metamatrix.connector.xml.base.OutputXPathDesc;
Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/http/TestHTTPConnectorState.java
===================================================================
--- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/http/TestHTTPConnectorState.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/http/TestHTTPConnectorState.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -24,11 +24,12 @@
import java.util.Properties;
+import org.teiid.connector.api.ConnectorException;
+
import junit.framework.TestCase;
import com.metamatrix.cdk.api.EnvironmentUtility;
import com.metamatrix.cdk.api.SysLogger;
-import com.metamatrix.connector.api.ConnectorException;
import com.metamatrix.connector.xml.base.ProxyObjectFactory;
/**
Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/jms/TestJMSConnectorState.java
===================================================================
--- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/jms/TestJMSConnectorState.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/jms/TestJMSConnectorState.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -27,12 +27,13 @@
import javax.jms.DeliveryMode;
import javax.jms.Session;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+
import junit.framework.TestCase;
import com.metamatrix.cdk.api.EnvironmentUtility;
import com.metamatrix.cdk.api.SysLogger;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
import com.metamatrix.connector.xml.base.ProxyObjectFactory;
public class TestJMSConnectorState extends TestCase {
Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/jms/TestJMSSOAPConnectorState.java
===================================================================
--- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/jms/TestJMSSOAPConnectorState.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/jms/TestJMSSOAPConnectorState.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -27,12 +27,13 @@
import javax.jms.DeliveryMode;
import javax.jms.Session;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+
import junit.framework.TestCase;
import com.metamatrix.cdk.api.EnvironmentUtility;
import com.metamatrix.cdk.api.SysLogger;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
import com.metamatrix.connector.xml.base.ProxyObjectFactory;
import com.metamatrix.connector.xml.soap.SOAPConnectorStateImpl;
Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xmlsource/file/TestFileConnection.java
===================================================================
--- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xmlsource/file/TestFileConnection.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xmlsource/file/TestFileConnection.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -24,11 +24,12 @@
import java.util.Properties;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+
import junit.framework.TestCase;
import com.metamatrix.cdk.api.EnvironmentUtility;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
import com.metamatrix.core.util.UnitTestUtil;
Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xmlsource/file/TestFileExecution.java
===================================================================
--- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xmlsource/file/TestFileExecution.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xmlsource/file/TestFileExecution.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -31,16 +31,16 @@
import junit.framework.TestCase;
import org.mockito.Mockito;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.language.ILanguageFactory;
+import org.teiid.connector.language.IParameter;
+import org.teiid.connector.language.IProcedure;
+import org.teiid.connector.language.IParameter.Direction;
+import org.teiid.connector.metadata.runtime.Procedure;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
import com.metamatrix.cdk.api.EnvironmentUtility;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.language.ILanguageFactory;
-import com.metamatrix.connector.language.IParameter;
-import com.metamatrix.connector.language.IProcedure;
-import com.metamatrix.connector.language.IParameter.Direction;
-import com.metamatrix.connector.metadata.runtime.Procedure;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
import com.metamatrix.core.util.UnitTestUtil;
Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xmlsource/soap/TestSoapConnection.java
===================================================================
--- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xmlsource/soap/TestSoapConnection.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xmlsource/soap/TestSoapConnection.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -25,11 +25,12 @@
import java.io.File;
import java.util.Properties;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+
import junit.framework.TestCase;
import com.metamatrix.cdk.api.EnvironmentUtility;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
import com.metamatrix.core.util.UnitTestUtil;
Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xmlsource/soap/TestSoapExecution.java
===================================================================
--- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xmlsource/soap/TestSoapExecution.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xmlsource/soap/TestSoapExecution.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -34,16 +34,16 @@
import junit.framework.TestSuite;
import org.mockito.Mockito;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ProcedureExecution;
+import org.teiid.connector.language.ILanguageFactory;
+import org.teiid.connector.language.IParameter;
+import org.teiid.connector.language.IProcedure;
+import org.teiid.connector.language.IParameter.Direction;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
import com.metamatrix.cdk.api.EnvironmentUtility;
import com.metamatrix.cdk.api.SysLogger;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ProcedureExecution;
-import com.metamatrix.connector.language.ILanguageFactory;
-import com.metamatrix.connector.language.IParameter;
-import com.metamatrix.connector.language.IProcedure;
-import com.metamatrix.connector.language.IParameter.Direction;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
import com.metamatrix.connector.xmlsource.file.TestFileExecution;
import com.metamatrix.connector.xmlsource.soap.service.WebServiceServer;
import com.metamatrix.core.util.UnitTestUtil;
Modified: trunk/connectors/sandbox/connector-exec/src/main/java/com/metamatrix/connector/exec/ExecAntExecution.java
===================================================================
--- trunk/connectors/sandbox/connector-exec/src/main/java/com/metamatrix/connector/exec/ExecAntExecution.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/sandbox/connector-exec/src/main/java/com/metamatrix/connector/exec/ExecAntExecution.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -43,19 +43,19 @@
import org.apache.tools.ant.taskdefs.ExecuteStreamHandler;
import org.apache.tools.ant.taskdefs.PumpStreamHandler;
import org.apache.tools.ant.types.Commandline.Argument;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorLogger;
+import org.teiid.connector.api.DataNotAvailableException;
+import org.teiid.connector.api.ResultSetExecution;
+import org.teiid.connector.basic.BasicExecution;
+import org.teiid.connector.language.IQuery;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
import com.metamatrix.common.config.CurrentConfiguration;
import com.metamatrix.common.config.api.Host;
import com.metamatrix.common.util.CommonPropertyNames;
import com.metamatrix.common.util.OSPlatformUtil;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ConnectorLogger;
-import com.metamatrix.connector.api.DataNotAvailableException;
-import com.metamatrix.connector.api.ResultSetExecution;
-import com.metamatrix.connector.basic.BasicExecution;
-import com.metamatrix.connector.language.IQuery;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
import com.metamatrix.core.util.Assertion;
import com.metamatrix.core.util.StringUtil;
import com.metamatrix.core.util.TempDirectory;
@@ -134,7 +134,7 @@
throws ConnectorException {
env.getLogger().logTrace("Exec executing command: " + query); //$NON-NLS-1$
- com.metamatrix.connector.language.ICriteria crit = query.getWhere();
+ org.teiid.connector.language.ICriteria crit = query.getWhere();
if (crit == null)
throw new ConnectorException(ExecPlugin.Util
.getString("ExecExecution.Must_have_criteria")); //$NON-NLS-1$
Modified: trunk/connectors/sandbox/connector-exec/src/main/java/com/metamatrix/connector/exec/ExecCapabilities.java
===================================================================
--- trunk/connectors/sandbox/connector-exec/src/main/java/com/metamatrix/connector/exec/ExecCapabilities.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/sandbox/connector-exec/src/main/java/com/metamatrix/connector/exec/ExecCapabilities.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -24,8 +24,9 @@
import java.util.Collections;
import java.util.List;
-import com.metamatrix.connector.basic.BasicConnectorCapabilities;
+import org.teiid.connector.basic.BasicConnectorCapabilities;
+
/**
*/
public class ExecCapabilities extends BasicConnectorCapabilities {
Modified: trunk/connectors/sandbox/connector-exec/src/main/java/com/metamatrix/connector/exec/ExecConnection.java
===================================================================
--- trunk/connectors/sandbox/connector-exec/src/main/java/com/metamatrix/connector/exec/ExecConnection.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/sandbox/connector-exec/src/main/java/com/metamatrix/connector/exec/ExecConnection.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -23,16 +23,17 @@
package com.metamatrix.connector.exec;
import java.util.List;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ConnectorLogger;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.api.ResultSetExecution;
-import com.metamatrix.connector.basic.BasicConnection;
-import com.metamatrix.connector.language.IQuery;
-import com.metamatrix.connector.language.IQueryCommand;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorLogger;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.api.ResultSetExecution;
+import org.teiid.connector.basic.BasicConnection;
+import org.teiid.connector.language.IQuery;
+import org.teiid.connector.language.IQueryCommand;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
+
public class ExecConnection extends BasicConnection {
ConnectorEnvironment env;
Modified: trunk/connectors/sandbox/connector-exec/src/main/java/com/metamatrix/connector/exec/ExecConnector.java
===================================================================
--- trunk/connectors/sandbox/connector-exec/src/main/java/com/metamatrix/connector/exec/ExecConnector.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/sandbox/connector-exec/src/main/java/com/metamatrix/connector/exec/ExecConnector.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -28,16 +28,17 @@
import java.util.List;
import java.util.Properties;
+import org.teiid.connector.api.Connection;
+import org.teiid.connector.api.ConnectorCapabilities;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorLogger;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.basic.BasicConnector;
+
import com.metamatrix.api.exception.MetaMatrixComponentException;
import com.metamatrix.common.extensionmodule.ExtensionModuleManager;
import com.metamatrix.common.extensionmodule.exception.ExtensionModuleNotFoundException;
-import com.metamatrix.connector.api.Connection;
-import com.metamatrix.connector.api.ConnectorCapabilities;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ConnectorLogger;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.basic.BasicConnector;
import com.metamatrix.core.util.ObjectConverterUtil;
/**
Modified: trunk/connectors/sandbox/connector-exec/src/main/java/com/metamatrix/connector/exec/ExecVisitor.java
===================================================================
--- trunk/connectors/sandbox/connector-exec/src/main/java/com/metamatrix/connector/exec/ExecVisitor.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/sandbox/connector-exec/src/main/java/com/metamatrix/connector/exec/ExecVisitor.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -25,15 +25,16 @@
import java.util.HashMap;
import java.util.Map;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.language.ICompareCriteria;
+import org.teiid.connector.language.ICriteria;
+import org.teiid.connector.language.IElement;
+import org.teiid.connector.language.IExpression;
+import org.teiid.connector.language.ILiteral;
+import org.teiid.connector.visitor.framework.HierarchyVisitor;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.language.ICompareCriteria;
-import com.metamatrix.connector.language.ICriteria;
-import com.metamatrix.connector.language.IElement;
-import com.metamatrix.connector.language.IExpression;
-import com.metamatrix.connector.language.ILiteral;
-import com.metamatrix.connector.visitor.framework.HierarchyVisitor;
+
/**
*/
public class ExecVisitor extends HierarchyVisitor {
Modified: trunk/connectors/sandbox/connector-exec/src/test/java/com/metamatrix/connector/exec/FakeExecConnector.java
===================================================================
--- trunk/connectors/sandbox/connector-exec/src/test/java/com/metamatrix/connector/exec/FakeExecConnector.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/sandbox/connector-exec/src/test/java/com/metamatrix/connector/exec/FakeExecConnector.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -28,8 +28,9 @@
import java.util.List;
import java.util.Properties;
-import com.metamatrix.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorException;
+
/**
* Implmentation of text connector.
*/
Modified: trunk/connectors/sandbox/connector-exec/src/test/java/com/metamatrix/connector/exec/TestsExec.java
===================================================================
--- trunk/connectors/sandbox/connector-exec/src/test/java/com/metamatrix/connector/exec/TestsExec.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/sandbox/connector-exec/src/test/java/com/metamatrix/connector/exec/TestsExec.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -30,11 +30,12 @@
import java.util.List;
import java.util.Properties;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ResultSetExecution;
+
import junit.framework.TestCase;
import com.metamatrix.cdk.api.ConnectorHost;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ResultSetExecution;
import com.metamatrix.core.util.UnitTestUtil;
/**
Modified: trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/ObjectConnection.java
===================================================================
--- trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/ObjectConnection.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/ObjectConnection.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -23,15 +23,16 @@
package com.metamatrix.connector.object;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorLogger;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.api.ProcedureExecution;
+import org.teiid.connector.basic.BasicConnection;
+import org.teiid.connector.language.IProcedure;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
+
import com.metamatrix.admin.api.exception.AdminException;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ConnectorLogger;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.api.ProcedureExecution;
-import com.metamatrix.connector.basic.BasicConnection;
-import com.metamatrix.connector.language.IProcedure;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
import com.metamatrix.connector.object.extension.IObjectSource;
import com.metamatrix.connector.object.extension.ISourceTranslator;
import com.metamatrix.connector.object.util.ObjectConnectorUtil;
Modified: trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/ObjectConnector.java
===================================================================
--- trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/ObjectConnector.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/ObjectConnector.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -22,14 +22,15 @@
package com.metamatrix.connector.object;
-import com.metamatrix.connector.api.Connection;
-import com.metamatrix.connector.api.ConnectorCapabilities;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ConnectorIdentity;
-import com.metamatrix.connector.api.ConnectorLogger;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.basic.BasicConnector;
+import org.teiid.connector.api.Connection;
+import org.teiid.connector.api.ConnectorCapabilities;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorIdentity;
+import org.teiid.connector.api.ConnectorLogger;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.basic.BasicConnector;
+
import com.metamatrix.connector.object.util.ObjectConnectorUtil;
/**
Modified: trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/ObjectConnectorCapabilities.java
===================================================================
--- trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/ObjectConnectorCapabilities.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/ObjectConnectorCapabilities.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -22,7 +22,7 @@
package com.metamatrix.connector.object;
-import com.metamatrix.connector.basic.BasicConnectorCapabilities;
+import org.teiid.connector.basic.BasicConnectorCapabilities;
/**
*/
Modified: trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/ObjectProcedureExecution.java
===================================================================
--- trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/ObjectProcedureExecution.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/ObjectProcedureExecution.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -24,15 +24,16 @@
import java.util.List;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ConnectorLogger;
-import com.metamatrix.connector.api.DataNotAvailableException;
-import com.metamatrix.connector.api.ProcedureExecution;
-import com.metamatrix.connector.basic.BasicExecution;
-import com.metamatrix.connector.language.IParameter;
-import com.metamatrix.connector.language.IProcedure;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorLogger;
+import org.teiid.connector.api.DataNotAvailableException;
+import org.teiid.connector.api.ProcedureExecution;
+import org.teiid.connector.basic.BasicExecution;
+import org.teiid.connector.language.IParameter;
+import org.teiid.connector.language.IProcedure;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
+
import com.metamatrix.connector.object.extension.IObjectCommand;
import com.metamatrix.connector.object.extension.IObjectSource;
import com.metamatrix.connector.object.extension.ISourceTranslator;
@@ -81,7 +82,7 @@
/**
- * @see com.metamatrix.connector.api.ProcedureExecution#execute(com.metamatrix.connector.language.IProcedure, int)
+ * @see org.teiid.connector.api.ProcedureExecution#execute(org.teiid.connector.language.IProcedure, int)
* @since 4.2
*/
public void execute() throws ConnectorException {
@@ -104,7 +105,7 @@
/**
- * @see com.metamatrix.connector.api.ProcedureExecution#getOutputValue(com.metamatrix.connector.language.IParameter)
+ * @see org.teiid.connector.api.ProcedureExecution#getOutputValue(org.teiid.connector.language.IParameter)
* @since 4.2
*/
public Object getOutputValue(IParameter parameter) throws ConnectorException {
Modified: trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/SourceConnectionFactory.java
===================================================================
--- trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/SourceConnectionFactory.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/SourceConnectionFactory.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -1,11 +1,11 @@
package com.metamatrix.connector.object;
-import com.metamatrix.connector.api.Connection;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ConnectorIdentity;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.api.SingleIdentity;
+import org.teiid.connector.api.Connection;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorIdentity;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.api.SingleIdentity;
public interface SourceConnectionFactory {
Modified: trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/extension/IObjectCommand.java
===================================================================
--- trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/extension/IObjectCommand.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/extension/IObjectCommand.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -25,9 +25,10 @@
import java.util.List;
import java.util.Map;
-import com.metamatrix.connector.language.ICommand;
+import org.teiid.connector.language.ICommand;
+
/**
* The IObjectCommand is the command to be executed. This indicates what is being
* executed and This also contains the metadata about
Modified: trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/extension/IObjectSource.java
===================================================================
--- trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/extension/IObjectSource.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/extension/IObjectSource.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -24,7 +24,8 @@
import java.util.List;
-import com.metamatrix.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorException;
+
import com.metamatrix.connector.object.ObjectProcedureExecution;
/**
Modified: trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/extension/ISourceTranslator.java
===================================================================
--- trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/extension/ISourceTranslator.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/extension/ISourceTranslator.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -27,12 +27,13 @@
import java.util.List;
import java.util.TimeZone;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.TypeFacility;
-import com.metamatrix.connector.language.ICommand;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.TypeFacility;
+import org.teiid.connector.language.ICommand;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
+
/**
* Specify source-specific behavior for translating results.
*/
Modified: trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/extension/command/ObjectCommand.java
===================================================================
--- trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/extension/command/ObjectCommand.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/extension/command/ObjectCommand.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -22,11 +22,12 @@
package com.metamatrix.connector.object.extension.command;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.language.ICommand;
-import com.metamatrix.connector.language.IMetadataReference;
-import com.metamatrix.connector.metadata.runtime.MetadataObject;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.language.ICommand;
+import org.teiid.connector.language.IMetadataReference;
+import org.teiid.connector.metadata.runtime.MetadataObject;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
+
import com.metamatrix.connector.object.extension.IObjectCommand;
import com.metamatrix.connector.object.util.ObjectConnectorUtil;
import com.metamatrix.core.util.ArgCheck;
Modified: trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/extension/command/ProcedureCommand.java
===================================================================
--- trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/extension/command/ProcedureCommand.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/extension/command/ProcedureCommand.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -29,12 +29,13 @@
import java.util.List;
import java.util.Map;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.language.IParameter;
-import com.metamatrix.connector.language.IProcedure;
-import com.metamatrix.connector.language.IParameter.Direction;
-import com.metamatrix.connector.metadata.runtime.Element;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.language.IParameter;
+import org.teiid.connector.language.IProcedure;
+import org.teiid.connector.language.IParameter.Direction;
+import org.teiid.connector.metadata.runtime.Element;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
+
import com.metamatrix.connector.object.ObjectPlugin;
import com.metamatrix.connector.object.util.ObjectConnectorUtil;
import com.metamatrix.core.MetaMatrixRuntimeException;
Modified: trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/extension/source/BaseObjectSource.java
===================================================================
--- trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/extension/source/BaseObjectSource.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/extension/source/BaseObjectSource.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -30,7 +30,8 @@
import java.util.Collections;
import java.util.List;
-import com.metamatrix.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorException;
+
import com.metamatrix.connector.object.ObjectSourceMethodManager;
import com.metamatrix.connector.object.extension.IObjectCommand;
import com.metamatrix.connector.object.extension.IObjectSource;
Modified: trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/extension/source/BaseSourceConnectionFactory.java
===================================================================
--- trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/extension/source/BaseSourceConnectionFactory.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/extension/source/BaseSourceConnectionFactory.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -24,12 +24,13 @@
*/
package com.metamatrix.connector.object.extension.source;
-import com.metamatrix.connector.api.Connection;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ConnectorIdentity;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.api.SingleIdentity;
+import org.teiid.connector.api.Connection;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorIdentity;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.api.SingleIdentity;
+
import com.metamatrix.connector.object.ObjectConnection;
import com.metamatrix.connector.object.SourceConnectionFactory;
import com.metamatrix.connector.object.extension.IObjectSource;
@@ -60,7 +61,7 @@
/**
- * @see com.metamatrix.data.pool.SourceConnectionFactory#createConnection(com.metamatrix.connector.api.ConnectorIdentity)
+ * @see com.metamatrix.data.pool.SourceConnectionFactory#createConnection(org.teiid.connector.api.ConnectorIdentity)
* @since 4.3
*/
public final Connection createConnection(ConnectorIdentity id) throws ConnectorException {
Modified: trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/extension/source/BasicSourceTranslator.java
===================================================================
--- trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/extension/source/BasicSourceTranslator.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/extension/source/BasicSourceTranslator.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -28,13 +28,14 @@
import java.util.List;
import java.util.TimeZone;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.TypeFacility;
-import com.metamatrix.connector.api.ValueTranslator;
-import com.metamatrix.connector.language.ICommand;
-import com.metamatrix.connector.language.IProcedure;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.TypeFacility;
+import org.teiid.connector.api.ValueTranslator;
+import org.teiid.connector.language.ICommand;
+import org.teiid.connector.language.IProcedure;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
+
import com.metamatrix.connector.object.ObjectPropertyNames;
import com.metamatrix.connector.object.extension.IObjectCommand;
import com.metamatrix.connector.object.extension.ISourceTranslator;
@@ -98,7 +99,7 @@
}
/**
- * @see com.metamatrix.connector.object.extension.ISourceTranslator#createObjectCommand(com.metamatrix.connector.metadata.runtime.RuntimeMetadata, com.metamatrix.connector.language.IProcedure)
+ * @see com.metamatrix.connector.object.extension.ISourceTranslator#createObjectCommand(org.teiid.connector.metadata.runtime.RuntimeMetadata, org.teiid.connector.language.IProcedure)
* @since 4.3
*/
public IObjectCommand createObjectCommand(RuntimeMetadata metadata,
Modified: trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/extension/value/BasicValueRetriever.java
===================================================================
--- trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/extension/value/BasicValueRetriever.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/extension/value/BasicValueRetriever.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -33,7 +33,8 @@
import java.util.Map;
import java.util.Properties;
-import com.metamatrix.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorException;
+
import com.metamatrix.connector.object.ObjectSourceMethodManager;
import com.metamatrix.connector.object.extension.IObjectCommand;
import com.metamatrix.connector.object.extension.IValueRetriever;
Modified: trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/extension/value/JavaUtilDateValueTranslator.java
===================================================================
--- trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/extension/value/JavaUtilDateValueTranslator.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/extension/value/JavaUtilDateValueTranslator.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -27,10 +27,11 @@
import java.sql.Timestamp;
import java.util.Date;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.api.ValueTranslator;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.api.ValueTranslator;
+
/**
*/
public class JavaUtilDateValueTranslator implements ValueTranslator {
Modified: trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/util/ObjectConnectorUtil.java
===================================================================
--- trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/util/ObjectConnectorUtil.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/util/ObjectConnectorUtil.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -24,13 +24,14 @@
import java.util.Properties;
-import com.metamatrix.connector.api.ConnectorCapabilities;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.language.ICommand;
-import com.metamatrix.connector.language.IMetadataReference;
-import com.metamatrix.connector.metadata.runtime.MetadataObject;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
+import org.teiid.connector.api.ConnectorCapabilities;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.language.ICommand;
+import org.teiid.connector.language.IMetadataReference;
+import org.teiid.connector.metadata.runtime.MetadataObject;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
+
import com.metamatrix.connector.object.ObjectPlugin;
import com.metamatrix.connector.object.ObjectPropertyNames;
import com.metamatrix.connector.object.SourceConnectionFactory;
Modified: trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/util/ObjectExecutionHelper.java
===================================================================
--- trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/util/ObjectExecutionHelper.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/connector/object/util/ObjectExecutionHelper.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -35,16 +35,17 @@
import java.util.List;
import java.util.TimeZone;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.api.TypeFacility;
+import org.teiid.connector.api.ValueTranslator;
+import org.teiid.connector.basic.BasicValueTranslator;
+import org.teiid.connector.visitor.util.SQLReservedWords;
+
import com.metamatrix.common.util.TimestampWithTimezone;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.api.TypeFacility;
-import com.metamatrix.connector.api.ValueTranslator;
-import com.metamatrix.connector.basic.BasicValueTranslator;
import com.metamatrix.connector.object.ObjectPlugin;
import com.metamatrix.connector.object.extension.IObjectCommand;
import com.metamatrix.connector.object.extension.ISourceTranslator;
-import com.metamatrix.connector.visitor.util.SQLReservedWords;
import com.metamatrix.core.util.StringUtil;
/**
Modified: trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/metamatrix/connector/jdbc/oracle/spatial/FilterFunctionModifier.java
===================================================================
--- trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/metamatrix/connector/jdbc/oracle/spatial/FilterFunctionModifier.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/metamatrix/connector/jdbc/oracle/spatial/FilterFunctionModifier.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -25,9 +25,10 @@
import java.util.ArrayList;
import java.util.List;
-import com.metamatrix.connector.language.IExpression;
-import com.metamatrix.connector.language.IFunction;
+import org.teiid.connector.language.IExpression;
+import org.teiid.connector.language.IFunction;
+
public class FilterFunctionModifier extends OracleSpatialFunctionModifier {
public IExpression modify(IFunction function) {
Modified: trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/metamatrix/connector/jdbc/oracle/spatial/NearestNeighborFunctionModifier.java
===================================================================
--- trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/metamatrix/connector/jdbc/oracle/spatial/NearestNeighborFunctionModifier.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/metamatrix/connector/jdbc/oracle/spatial/NearestNeighborFunctionModifier.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -25,9 +25,10 @@
import java.util.ArrayList;
import java.util.List;
-import com.metamatrix.connector.language.IExpression;
-import com.metamatrix.connector.language.IFunction;
+import org.teiid.connector.language.IExpression;
+import org.teiid.connector.language.IFunction;
+
public class NearestNeighborFunctionModifier extends OracleSpatialFunctionModifier {
public IExpression modify(IFunction function) {
Modified: trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/metamatrix/connector/jdbc/oracle/spatial/NnDistanceFunctionModifier.java
===================================================================
--- trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/metamatrix/connector/jdbc/oracle/spatial/NnDistanceFunctionModifier.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/metamatrix/connector/jdbc/oracle/spatial/NnDistanceFunctionModifier.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -24,10 +24,11 @@
import java.util.List;
-import com.metamatrix.connector.language.IExpression;
-import com.metamatrix.connector.language.IFunction;
+import org.teiid.connector.language.IExpression;
+import org.teiid.connector.language.IFunction;
+
/**
* @since 4.1
*/
Modified: trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/metamatrix/connector/jdbc/oracle/spatial/OracleSpatialConnector.java
===================================================================
--- trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/metamatrix/connector/jdbc/oracle/spatial/OracleSpatialConnector.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/metamatrix/connector/jdbc/oracle/spatial/OracleSpatialConnector.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -28,11 +28,11 @@
*/
package com.metamatrix.connector.jdbc.oracle.spatial;
+import org.teiid.connector.api.ConnectorCapabilities;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
import org.teiid.connector.jdbc.JDBCConnector;
-import com.metamatrix.connector.api.ConnectorCapabilities;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
public class OracleSpatialConnector extends JDBCConnector {
Modified: trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/metamatrix/connector/jdbc/oracle/spatial/OracleSpatialFunctionModifier.java
===================================================================
--- trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/metamatrix/connector/jdbc/oracle/spatial/OracleSpatialFunctionModifier.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/metamatrix/connector/jdbc/oracle/spatial/OracleSpatialFunctionModifier.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -25,9 +25,9 @@
import java.util.List;
import org.teiid.connector.jdbc.translator.BasicFunctionModifier;
+import org.teiid.connector.language.IExpression;
+import org.teiid.connector.language.ILiteral;
-import com.metamatrix.connector.language.IExpression;
-import com.metamatrix.connector.language.ILiteral;
public class OracleSpatialFunctionModifier extends BasicFunctionModifier {
Modified: trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/metamatrix/connector/jdbc/oracle/spatial/OracleSpatialSQLTranslator.java
===================================================================
--- trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/metamatrix/connector/jdbc/oracle/spatial/OracleSpatialSQLTranslator.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/metamatrix/connector/jdbc/oracle/spatial/OracleSpatialSQLTranslator.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -26,19 +26,19 @@
import java.util.Iterator;
import java.util.List;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.api.TypeFacility;
import org.teiid.connector.jdbc.translator.Translator;
+import org.teiid.connector.language.ICommand;
+import org.teiid.connector.language.ICriteria;
+import org.teiid.connector.language.IFunction;
+import org.teiid.connector.language.IQuery;
+import org.teiid.connector.language.ISelect;
+import org.teiid.connector.language.ISelectSymbol;
+import org.teiid.connector.visitor.util.CollectorVisitor;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.api.TypeFacility;
-import com.metamatrix.connector.language.ICommand;
-import com.metamatrix.connector.language.ICriteria;
-import com.metamatrix.connector.language.IFunction;
-import com.metamatrix.connector.language.IQuery;
-import com.metamatrix.connector.language.ISelect;
-import com.metamatrix.connector.language.ISelectSymbol;
-import com.metamatrix.connector.visitor.util.CollectorVisitor;
public class OracleSpatialSQLTranslator extends Translator {
Modified: trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/metamatrix/connector/jdbc/oracle/spatial/RelateFunctionModifier.java
===================================================================
--- trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/metamatrix/connector/jdbc/oracle/spatial/RelateFunctionModifier.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/metamatrix/connector/jdbc/oracle/spatial/RelateFunctionModifier.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -25,9 +25,10 @@
import java.util.ArrayList;
import java.util.List;
-import com.metamatrix.connector.language.IExpression;
-import com.metamatrix.connector.language.IFunction;
+import org.teiid.connector.language.IExpression;
+import org.teiid.connector.language.IFunction;
+
public class RelateFunctionModifier extends OracleSpatialFunctionModifier {
/**
Modified: trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/metamatrix/connector/jdbc/oracle/spatial/WithinDistanceFunctionModifier.java
===================================================================
--- trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/metamatrix/connector/jdbc/oracle/spatial/WithinDistanceFunctionModifier.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/metamatrix/connector/jdbc/oracle/spatial/WithinDistanceFunctionModifier.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -25,9 +25,10 @@
import java.util.ArrayList;
import java.util.List;
-import com.metamatrix.connector.language.IExpression;
-import com.metamatrix.connector.language.IFunction;
+import org.teiid.connector.language.IExpression;
+import org.teiid.connector.language.IFunction;
+
public class WithinDistanceFunctionModifier extends OracleSpatialFunctionModifier {
public IExpression modify(IFunction function) {
Modified: trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metamatrix/connector/yahoo/TickerCollectorVisitor.java
===================================================================
--- trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metamatrix/connector/yahoo/TickerCollectorVisitor.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metamatrix/connector/yahoo/TickerCollectorVisitor.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -24,10 +24,11 @@
import java.util.*;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.language.*;
-import com.metamatrix.connector.visitor.framework.HierarchyVisitor;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.language.*;
+import org.teiid.connector.visitor.framework.HierarchyVisitor;
+
/**
*/
public class TickerCollectorVisitor extends HierarchyVisitor {
Modified: trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metamatrix/connector/yahoo/YahooCapabilities.java
===================================================================
--- trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metamatrix/connector/yahoo/YahooCapabilities.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metamatrix/connector/yahoo/YahooCapabilities.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -25,8 +25,9 @@
import java.util.Collections;
import java.util.List;
-import com.metamatrix.connector.basic.BasicConnectorCapabilities;
+import org.teiid.connector.basic.BasicConnectorCapabilities;
+
/**
* Specifies the capabilities of this connector. The Yahoo connector
* supports only some basic criteria capability
Modified: trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metamatrix/connector/yahoo/YahooConnection.java
===================================================================
--- trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metamatrix/connector/yahoo/YahooConnection.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metamatrix/connector/yahoo/YahooConnection.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -22,14 +22,14 @@
package com.metamatrix.connector.yahoo;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.api.ResultSetExecution;
-import com.metamatrix.connector.basic.BasicConnection;
-import com.metamatrix.connector.language.IQuery;
-import com.metamatrix.connector.language.IQueryCommand;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.api.ResultSetExecution;
+import org.teiid.connector.basic.BasicConnection;
+import org.teiid.connector.language.IQuery;
+import org.teiid.connector.language.IQueryCommand;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
/**
* Serves as a connection for the Yahoo connector. Since there is no actual
Modified: trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metamatrix/connector/yahoo/YahooConnector.java
===================================================================
--- trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metamatrix/connector/yahoo/YahooConnector.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metamatrix/connector/yahoo/YahooConnector.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -22,8 +22,8 @@
package com.metamatrix.connector.yahoo;
-import com.metamatrix.connector.api.*;
-import com.metamatrix.connector.basic.BasicConnector;
+import org.teiid.connector.api.*;
+import org.teiid.connector.basic.BasicConnector;
public class YahooConnector extends BasicConnector {
Modified: trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metamatrix/connector/yahoo/YahooExecution.java
===================================================================
--- trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metamatrix/connector/yahoo/YahooExecution.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metamatrix/connector/yahoo/YahooExecution.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -39,21 +39,22 @@
import java.util.Set;
import java.util.StringTokenizer;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ConnectorLogger;
-import com.metamatrix.connector.api.DataNotAvailableException;
-import com.metamatrix.connector.api.ResultSetExecution;
-import com.metamatrix.connector.basic.BasicExecution;
-import com.metamatrix.connector.language.ICriteria;
-import com.metamatrix.connector.language.IElement;
-import com.metamatrix.connector.language.IExpression;
-import com.metamatrix.connector.language.IQuery;
-import com.metamatrix.connector.language.ISelect;
-import com.metamatrix.connector.language.ISelectSymbol;
-import com.metamatrix.connector.metadata.runtime.Element;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorLogger;
+import org.teiid.connector.api.DataNotAvailableException;
+import org.teiid.connector.api.ResultSetExecution;
+import org.teiid.connector.basic.BasicExecution;
+import org.teiid.connector.language.ICriteria;
+import org.teiid.connector.language.IElement;
+import org.teiid.connector.language.IExpression;
+import org.teiid.connector.language.IQuery;
+import org.teiid.connector.language.ISelect;
+import org.teiid.connector.language.ISelectSymbol;
+import org.teiid.connector.metadata.runtime.Element;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
+
/**
* Represents the execution of a command.
*/
Modified: trunk/connectors/sandbox/connector-yahoo/src/test/java/com/metamatrix/connector/yahoo/TestYahooTranslation.java
===================================================================
--- trunk/connectors/sandbox/connector-yahoo/src/test/java/com/metamatrix/connector/yahoo/TestYahooTranslation.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/connectors/sandbox/connector-yahoo/src/test/java/com/metamatrix/connector/yahoo/TestYahooTranslation.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -22,11 +22,12 @@
package com.metamatrix.connector.yahoo;
+import org.teiid.connector.language.ICommand;
+import org.teiid.connector.language.IQuery;
+
import junit.framework.TestCase;
import com.metamatrix.cdk.unittest.FakeTranslationFactory;
-import com.metamatrix.connector.language.ICommand;
-import com.metamatrix.connector.language.IQuery;
public class TestYahooTranslation extends TestCase {
Modified: trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/DefaultIndexConnectorBinding.java
===================================================================
--- trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/DefaultIndexConnectorBinding.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/DefaultIndexConnectorBinding.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -25,12 +25,13 @@
import java.util.Date;
import java.util.Properties;
+import org.teiid.connector.internal.ConnectorPropertyNames;
+
import com.metamatrix.common.config.api.ComponentTypeID;
import com.metamatrix.common.config.api.ConfigurationID;
import com.metamatrix.common.config.api.ConnectorBinding;
import com.metamatrix.common.config.model.ConfigurationVisitor;
import com.metamatrix.common.namedobject.BaseID;
-import com.metamatrix.connector.internal.ConnectorPropertyNames;
import com.metamatrix.core.MetaMatrixRuntimeException;
Modified: trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedDataService.java
===================================================================
--- trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedDataService.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedDataService.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -32,6 +32,9 @@
import java.util.Properties;
import java.util.concurrent.atomic.AtomicInteger;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.internal.ConnectorPropertyNames;
+
import com.metamatrix.api.exception.ComponentNotFoundException;
import com.metamatrix.api.exception.MetaMatrixComponentException;
import com.metamatrix.common.application.ApplicationEnvironment;
@@ -48,8 +51,6 @@
import com.metamatrix.common.util.crypto.CryptoUtil;
import com.metamatrix.common.vdb.api.VDBArchive;
import com.metamatrix.common.vdb.api.VDBDefn;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.internal.ConnectorPropertyNames;
import com.metamatrix.core.vdb.VDBStatus;
import com.metamatrix.dqp.embedded.DQPEmbeddedPlugin;
import com.metamatrix.dqp.embedded.configuration.ExtensionModuleReader;
Modified: trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedTrackingService.java
===================================================================
--- trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedTrackingService.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedTrackingService.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -24,10 +24,11 @@
import java.util.Properties;
+import org.teiid.connector.api.ExecutionContext;
+
import com.metamatrix.common.application.ApplicationEnvironment;
import com.metamatrix.common.application.exception.ApplicationInitializationException;
import com.metamatrix.common.application.exception.ApplicationLifecycleException;
-import com.metamatrix.connector.api.ExecutionContext;
import com.metamatrix.dqp.service.TrackingService;
import com.metamatrix.query.sql.lang.Command;
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/CapabilitiesConverter.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/CapabilitiesConverter.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/CapabilitiesConverter.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -24,7 +24,8 @@
import java.util.*;
-import com.metamatrix.connector.api.ConnectorCapabilities;
+import org.teiid.connector.api.ConnectorCapabilities;
+
import com.metamatrix.query.optimizer.capabilities.BasicSourceCapabilities;
import com.metamatrix.query.optimizer.capabilities.SourceCapabilities;
import com.metamatrix.query.optimizer.capabilities.SourceCapabilities.Capability;
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/ConnectorEnvironmentImpl.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/ConnectorEnvironmentImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/ConnectorEnvironmentImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -28,13 +28,14 @@
import java.util.Properties;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorLogger;
+import org.teiid.connector.api.TypeFacility;
+import org.teiid.connector.internal.ConnectorPropertyNames;
+import org.teiid.connector.language.ILanguageFactory;
+
import com.metamatrix.common.application.ApplicationEnvironment;
import com.metamatrix.common.queue.WorkerPool;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorLogger;
-import com.metamatrix.connector.api.TypeFacility;
-import com.metamatrix.connector.internal.ConnectorPropertyNames;
-import com.metamatrix.connector.language.ILanguageFactory;
import com.metamatrix.dqp.internal.datamgr.language.LanguageFactoryImpl;
/**
@@ -67,14 +68,14 @@
}
/**
- * @see com.metamatrix.connector.api.ConnectorEnvironment#getProperties()
+ * @see org.teiid.connector.api.ConnectorEnvironment#getProperties()
*/
public Properties getProperties() {
return this.properties;
}
/**
- * @see com.metamatrix.connector.api.ConnectorEnvironment#getConnectorName()
+ * @see org.teiid.connector.api.ConnectorEnvironment#getConnectorName()
*/
public String getConnectorName() {
return this.properties.getProperty(ConnectorPropertyNames.CONNECTOR_BINDING_NAME);
@@ -109,7 +110,7 @@
}
/**
- * @see com.metamatrix.connector.api.ConnectorEnvironment#getTypeFacility()
+ * @see org.teiid.connector.api.ConnectorEnvironment#getTypeFacility()
*/
public TypeFacility getTypeFacility() {
return TYPE_FACILITY;
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/ConnectorManager.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/ConnectorManager.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/ConnectorManager.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -41,6 +41,18 @@
import javax.transaction.xa.XAResource;
+import org.teiid.connector.api.Connection;
+import org.teiid.connector.api.Connector;
+import org.teiid.connector.api.ConnectorCapabilities;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.api.ConnectorAnnotations.ConnectionPooling;
+import org.teiid.connector.api.ConnectorAnnotations.SynchronousWorkers;
+import org.teiid.connector.internal.ConnectorPropertyNames;
+import org.teiid.connector.xa.api.XAConnection;
+import org.teiid.connector.xa.api.XAConnector;
+
import com.metamatrix.common.application.ApplicationEnvironment;
import com.metamatrix.common.application.ApplicationService;
import com.metamatrix.common.application.exception.ApplicationLifecycleException;
@@ -50,17 +62,6 @@
import com.metamatrix.common.queue.WorkerPoolFactory;
import com.metamatrix.common.queue.WorkerPoolStats;
import com.metamatrix.common.util.PropertiesUtils;
-import com.metamatrix.connector.api.Connection;
-import com.metamatrix.connector.api.Connector;
-import com.metamatrix.connector.api.ConnectorCapabilities;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.api.ConnectorAnnotations.ConnectionPooling;
-import com.metamatrix.connector.api.ConnectorAnnotations.SynchronousWorkers;
-import com.metamatrix.connector.internal.ConnectorPropertyNames;
-import com.metamatrix.connector.xa.api.XAConnection;
-import com.metamatrix.connector.xa.api.XAConnector;
import com.metamatrix.core.MetaMatrixCoreException;
import com.metamatrix.core.util.Assertion;
import com.metamatrix.core.util.ReflectionHelper;
@@ -89,7 +90,7 @@
import com.metamatrix.query.sql.lang.Command;
/**
- * The <code>ConnectorManager</code> manages a {@link com.metamatrix.connector.basic.BasicConnector Connector}
+ * The <code>ConnectorManager</code> manages a {@link org.teiid.connector.basic.BasicConnector Connector}
* and its associated workers' state.
*/
public class ConnectorManager implements ApplicationService {
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/ConnectorWorkItem.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/ConnectorWorkItem.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/ConnectorWorkItem.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -26,25 +26,26 @@
import java.util.Arrays;
import java.util.List;
+import org.teiid.connector.api.Connection;
+import org.teiid.connector.api.Connector;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.DataNotAvailableException;
+import org.teiid.connector.api.Execution;
+import org.teiid.connector.api.ProcedureExecution;
+import org.teiid.connector.api.ResultSetExecution;
+import org.teiid.connector.api.UpdateExecution;
+import org.teiid.connector.language.ICommand;
+import org.teiid.connector.language.IProcedure;
+import org.teiid.connector.language.IQueryCommand;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
+import org.teiid.connector.xa.api.XAConnector;
+
import com.metamatrix.api.exception.MetaMatrixComponentException;
import com.metamatrix.api.exception.MetaMatrixProcessingException;
import com.metamatrix.common.comm.api.ResultsReceiver;
import com.metamatrix.common.comm.exception.CommunicationException;
import com.metamatrix.common.log.LogManager;
import com.metamatrix.common.types.DataTypeManager;
-import com.metamatrix.connector.api.Connection;
-import com.metamatrix.connector.api.Connector;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.DataNotAvailableException;
-import com.metamatrix.connector.api.Execution;
-import com.metamatrix.connector.api.ProcedureExecution;
-import com.metamatrix.connector.api.ResultSetExecution;
-import com.metamatrix.connector.api.UpdateExecution;
-import com.metamatrix.connector.language.ICommand;
-import com.metamatrix.connector.language.IProcedure;
-import com.metamatrix.connector.language.IQueryCommand;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
-import com.metamatrix.connector.xa.api.XAConnector;
import com.metamatrix.core.util.Assertion;
import com.metamatrix.dqp.DQPPlugin;
import com.metamatrix.dqp.internal.datamgr.language.LanguageBridgeFactory;
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/ConnectorWrapper.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/ConnectorWrapper.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/ConnectorWrapper.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -22,16 +22,16 @@
package com.metamatrix.dqp.internal.datamgr.impl;
-import com.metamatrix.connector.api.Connection;
-import com.metamatrix.connector.api.Connector;
-import com.metamatrix.connector.api.ConnectorCapabilities;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ConnectorIdentity;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.xa.api.TransactionContext;
-import com.metamatrix.connector.xa.api.XAConnection;
-import com.metamatrix.connector.xa.api.XAConnector;
+import org.teiid.connector.api.Connection;
+import org.teiid.connector.api.Connector;
+import org.teiid.connector.api.ConnectorCapabilities;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorIdentity;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.xa.api.TransactionContext;
+import org.teiid.connector.xa.api.XAConnection;
+import org.teiid.connector.xa.api.XAConnector;
/**
* ConnectorWrapper adds default behavior to the wrapped connector.
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/DefaultConnectorLogger.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/DefaultConnectorLogger.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/DefaultConnectorLogger.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -26,8 +26,9 @@
*/
package com.metamatrix.dqp.internal.datamgr.impl;
+import org.teiid.connector.api.ConnectorLogger;
+
import com.metamatrix.common.log.LogManager;
-import com.metamatrix.connector.api.ConnectorLogger;
import com.metamatrix.core.log.MessageLevel;
import com.metamatrix.dqp.internal.datamgr.ConnectorID;
import com.metamatrix.dqp.util.LogConstants;
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/ExecutionContextImpl.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/ExecutionContextImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/ExecutionContextImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -27,9 +27,10 @@
import java.util.LinkedList;
import java.util.List;
+import org.teiid.connector.api.ConnectorIdentity;
+import org.teiid.connector.api.ExecutionContext;
+
import com.metamatrix.common.buffer.impl.BufferConfig;
-import com.metamatrix.connector.api.ConnectorIdentity;
-import com.metamatrix.connector.api.ExecutionContext;
import com.metamatrix.core.util.HashCodeUtil;
/**
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/ProcedureBatchHandler.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/ProcedureBatchHandler.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/ProcedureBatchHandler.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -31,11 +31,12 @@
import java.util.Iterator;
import java.util.List;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ProcedureExecution;
-import com.metamatrix.connector.language.IParameter;
-import com.metamatrix.connector.language.IProcedure;
-import com.metamatrix.connector.language.IParameter.Direction;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ProcedureExecution;
+import org.teiid.connector.language.IParameter;
+import org.teiid.connector.language.IProcedure;
+import org.teiid.connector.language.IParameter.Direction;
+
import com.metamatrix.dqp.DQPPlugin;
class ProcedureBatchHandler {
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/SynchConnectorWorkItem.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/SynchConnectorWorkItem.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/SynchConnectorWorkItem.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -28,13 +28,14 @@
import javax.transaction.xa.XAResource;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.xa.api.XAConnection;
+
import com.metamatrix.api.exception.MetaMatrixComponentException;
import com.metamatrix.api.exception.MetaMatrixProcessingException;
import com.metamatrix.common.comm.api.ResultsReceiver;
import com.metamatrix.common.log.LogManager;
import com.metamatrix.common.xa.XATransactionException;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.xa.api.XAConnection;
import com.metamatrix.dqp.message.AtomicRequestMessage;
import com.metamatrix.dqp.message.AtomicResultsMessage;
import com.metamatrix.dqp.transaction.TransactionServer;
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/TypeFacilityImpl.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/TypeFacilityImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/TypeFacilityImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -26,10 +26,11 @@
import java.util.Date;
import java.util.TimeZone;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.TypeFacility;
+
import com.metamatrix.common.types.*;
import com.metamatrix.common.util.TimestampWithTimezone;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.TypeFacility;
/**
*/
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/AggregateImpl.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/AggregateImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/AggregateImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -22,9 +22,9 @@
package com.metamatrix.dqp.internal.datamgr.language;
-import com.metamatrix.connector.language.IAggregate;
-import com.metamatrix.connector.language.IExpression;
-import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor;
+import org.teiid.connector.language.IAggregate;
+import org.teiid.connector.language.IExpression;
+import org.teiid.connector.visitor.framework.LanguageObjectVisitor;
public class AggregateImpl extends BaseLanguageObject implements IAggregate {
@@ -41,28 +41,28 @@
}
/**
- * @see com.metamatrix.connector.language.IAggregate#getName()
+ * @see org.teiid.connector.language.IAggregate#getName()
*/
public String getName() {
return this.aggName;
}
/**
- * @see com.metamatrix.connector.language.IAggregate#isDistinct()
+ * @see org.teiid.connector.language.IAggregate#isDistinct()
*/
public boolean isDistinct() {
return this.isDistinct;
}
/**
- * @see com.metamatrix.connector.language.IAggregate#getExpression()
+ * @see org.teiid.connector.language.IAggregate#getExpression()
*/
public IExpression getExpression() {
return this.expression;
}
/**
- * @see com.metamatrix.connector.language.ILanguageObject#acceptVisitor(com.metamatrix.data.visitor.LanguageObjectVisitor)
+ * @see org.teiid.connector.language.ILanguageObject#acceptVisitor(com.metamatrix.data.visitor.LanguageObjectVisitor)
*/
public void acceptVisitor(LanguageObjectVisitor visitor) {
visitor.visit(this);
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/BaseLanguageObject.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/BaseLanguageObject.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/BaseLanguageObject.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -22,8 +22,8 @@
package com.metamatrix.dqp.internal.datamgr.language;
-import com.metamatrix.connector.language.ILanguageObject;
-import com.metamatrix.connector.visitor.util.SQLStringVisitor;
+import org.teiid.connector.language.ILanguageObject;
+import org.teiid.connector.visitor.util.SQLStringVisitor;
/**
*/
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/BatchedUpdatesImpl.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/BatchedUpdatesImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/BatchedUpdatesImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -24,10 +24,11 @@
import java.util.List;
-import com.metamatrix.connector.language.IBatchedUpdates;
-import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor;
+import org.teiid.connector.language.IBatchedUpdates;
+import org.teiid.connector.visitor.framework.LanguageObjectVisitor;
+
/**
* @since 4.2
*/
@@ -40,7 +41,7 @@
}
/**
- * @see com.metamatrix.connector.language.IBatchedUpdates#getUpdateCommands()
+ * @see org.teiid.connector.language.IBatchedUpdates#getUpdateCommands()
* @since 4.2
*/
public List getUpdateCommands() {
@@ -48,7 +49,7 @@
}
/**
- * @see com.metamatrix.connector.language.ILanguageObject#acceptVisitor(com.metamatrix.connector.visitor.framework.LanguageObjectVisitor)
+ * @see org.teiid.connector.language.ILanguageObject#acceptVisitor(org.teiid.connector.visitor.framework.LanguageObjectVisitor)
* @since 4.2
*/
public void acceptVisitor(LanguageObjectVisitor visitor) {
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/BulkInsertImpl.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/BulkInsertImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/BulkInsertImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -25,11 +25,12 @@
import java.util.Collections;
import java.util.List;
-import com.metamatrix.connector.language.IBulkInsert;
-import com.metamatrix.connector.language.IGroup;
-import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor;
+import org.teiid.connector.language.IBulkInsert;
+import org.teiid.connector.language.IGroup;
+import org.teiid.connector.visitor.framework.LanguageObjectVisitor;
+
/**
* A simple variation of insert where multiple rows can be inserted as single
* operation.
@@ -47,7 +48,7 @@
}
/**
- * @see com.metamatrix.connector.language.IBulkInsert#getRows()
+ * @see org.teiid.connector.language.IBulkInsert#getRows()
*/
public List getRows() {
if (rowValues == null) {
@@ -65,20 +66,20 @@
}
/**
- * @see com.metamatrix.connector.language.IInsert#getValues()
+ * @see org.teiid.connector.language.IInsert#getValues()
*/
public List getValues() {
throw new UnsupportedOperationException("This operation is not supported"); //$NON-NLS-1$
}
/**
- * @see com.metamatrix.connector.language.IInsert#setValues(java.util.List)
+ * @see org.teiid.connector.language.IInsert#setValues(java.util.List)
*/
public void setValues(List values) {
throw new UnsupportedOperationException("This operation is not supported"); //$NON-NLS-1$
}
/**
- * @see com.metamatrix.connector.language.ILanguageObject#acceptVisitor(com.metamatrix.data.visitor.LanguageObjectVisitor)
+ * @see org.teiid.connector.language.ILanguageObject#acceptVisitor(com.metamatrix.data.visitor.LanguageObjectVisitor)
*/
public void acceptVisitor(LanguageObjectVisitor visitor) {
visitor.visit(this);
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/CompareCriteriaImpl.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/CompareCriteriaImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/CompareCriteriaImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -22,9 +22,9 @@
package com.metamatrix.dqp.internal.datamgr.language;
-import com.metamatrix.connector.language.ICompareCriteria;
-import com.metamatrix.connector.language.IExpression;
-import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor;
+import org.teiid.connector.language.ICompareCriteria;
+import org.teiid.connector.language.IExpression;
+import org.teiid.connector.visitor.framework.LanguageObjectVisitor;
public class CompareCriteriaImpl extends BaseLanguageObject implements ICompareCriteria {
@@ -38,21 +38,21 @@
this.operator = operator;
}
/**
- * @see com.metamatrix.connector.language.ICompareCriteria#getLeftExpression()
+ * @see org.teiid.connector.language.ICompareCriteria#getLeftExpression()
*/
public IExpression getLeftExpression() {
return leftExpression;
}
/**
- * @see com.metamatrix.connector.language.ICompareCriteria#getRightExpression()
+ * @see org.teiid.connector.language.ICompareCriteria#getRightExpression()
*/
public IExpression getRightExpression() {
return rightExpression;
}
/**
- * @see com.metamatrix.connector.language.ICompareCriteria#getOperator()
+ * @see org.teiid.connector.language.ICompareCriteria#getOperator()
*/
public Operator getOperator() {
return this.operator;
@@ -80,7 +80,7 @@
}
/**
- * @see com.metamatrix.connector.language.ILanguageObject#acceptVisitor(com.metamatrix.data.visitor.LanguageObjectVisitor)
+ * @see org.teiid.connector.language.ILanguageObject#acceptVisitor(com.metamatrix.data.visitor.LanguageObjectVisitor)
*/
public void acceptVisitor(LanguageObjectVisitor visitor) {
visitor.visit(this);
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/CompoundCriteriaImpl.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/CompoundCriteriaImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/CompoundCriteriaImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -24,9 +24,10 @@
import java.util.List;
-import com.metamatrix.connector.language.ICompoundCriteria;
-import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor;
+import org.teiid.connector.language.ICompoundCriteria;
+import org.teiid.connector.visitor.framework.LanguageObjectVisitor;
+
public class CompoundCriteriaImpl extends BaseLanguageObject implements ICompoundCriteria {
private List criteria = null;
@@ -38,21 +39,21 @@
}
/**
- * @see com.metamatrix.connector.language.ICompoundCriteria#getOperator()
+ * @see org.teiid.connector.language.ICompoundCriteria#getOperator()
*/
public Operator getOperator() {
return this.operator;
}
/**
- * @see com.metamatrix.connector.language.ICompoundCriteria#getCriteria()
+ * @see org.teiid.connector.language.ICompoundCriteria#getCriteria()
*/
public List getCriteria() {
return criteria;
}
/**
- * @see com.metamatrix.connector.language.ILanguageObject#acceptVisitor(com.metamatrix.data.visitor.LanguageObjectVisitor)
+ * @see org.teiid.connector.language.ILanguageObject#acceptVisitor(com.metamatrix.data.visitor.LanguageObjectVisitor)
*/
public void acceptVisitor(LanguageObjectVisitor visitor) {
visitor.visit(this);
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/DeleteImpl.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/DeleteImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/DeleteImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -22,10 +22,10 @@
package com.metamatrix.dqp.internal.datamgr.language;
-import com.metamatrix.connector.language.ICriteria;
-import com.metamatrix.connector.language.IDelete;
-import com.metamatrix.connector.language.IGroup;
-import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor;
+import org.teiid.connector.language.ICriteria;
+import org.teiid.connector.language.IDelete;
+import org.teiid.connector.language.IGroup;
+import org.teiid.connector.visitor.framework.LanguageObjectVisitor;
public class DeleteImpl extends BaseLanguageObject implements IDelete {
@@ -37,21 +37,21 @@
this.criteria = criteria;
}
/**
- * @see com.metamatrix.connector.language.IDelete#getGroup()
+ * @see org.teiid.connector.language.IDelete#getGroup()
*/
public IGroup getGroup() {
return group;
}
/**
- * @see com.metamatrix.connector.language.IDelete#getCriteria()
+ * @see org.teiid.connector.language.IDelete#getCriteria()
*/
public ICriteria getCriteria() {
return criteria;
}
/**
- * @see com.metamatrix.connector.language.ILanguageObject#acceptVisitor(com.metamatrix.data.visitor.LanguageObjectVisitor)
+ * @see org.teiid.connector.language.ILanguageObject#acceptVisitor(com.metamatrix.data.visitor.LanguageObjectVisitor)
*/
public void acceptVisitor(LanguageObjectVisitor visitor) {
visitor.visit(this);
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/ElementImpl.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/ElementImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/ElementImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -22,10 +22,10 @@
package com.metamatrix.dqp.internal.datamgr.language;
-import com.metamatrix.connector.language.IElement;
-import com.metamatrix.connector.language.IGroup;
-import com.metamatrix.connector.metadata.runtime.Element;
-import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor;
+import org.teiid.connector.language.IElement;
+import org.teiid.connector.language.IGroup;
+import org.teiid.connector.metadata.runtime.Element;
+import org.teiid.connector.visitor.framework.LanguageObjectVisitor;
public class ElementImpl extends BaseLanguageObject implements IElement {
@@ -42,14 +42,14 @@
}
/**
- * @see com.metamatrix.connector.language.IElement#getName()
+ * @see org.teiid.connector.language.IElement#getName()
*/
public String getName() {
return this.name;
}
/**
- * @see com.metamatrix.connector.language.IElement#getGroup()
+ * @see org.teiid.connector.language.IElement#getGroup()
*/
public IGroup getGroup() {
return group;
@@ -65,7 +65,7 @@
}
/**
- * @see com.metamatrix.connector.language.ILanguageObject#acceptVisitor(com.metamatrix.data.visitor.LanguageObjectVisitor)
+ * @see org.teiid.connector.language.ILanguageObject#acceptVisitor(com.metamatrix.data.visitor.LanguageObjectVisitor)
*/
public void acceptVisitor(LanguageObjectVisitor visitor) {
visitor.visit(this);
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/ExistsCriteriaImpl.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/ExistsCriteriaImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/ExistsCriteriaImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -22,10 +22,10 @@
package com.metamatrix.dqp.internal.datamgr.language;
-import com.metamatrix.connector.language.IExistsCriteria;
-import com.metamatrix.connector.language.IQuery;
-import com.metamatrix.connector.language.IQueryCommand;
-import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor;
+import org.teiid.connector.language.IExistsCriteria;
+import org.teiid.connector.language.IQuery;
+import org.teiid.connector.language.IQueryCommand;
+import org.teiid.connector.visitor.framework.LanguageObjectVisitor;
/**
*/
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/FromImpl.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/FromImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/FromImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -24,9 +24,10 @@
import java.util.List;
-import com.metamatrix.connector.language.IFrom;
-import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor;
+import org.teiid.connector.language.IFrom;
+import org.teiid.connector.visitor.framework.LanguageObjectVisitor;
+
public class FromImpl extends BaseLanguageObject implements IFrom {
private List items = null;
@@ -36,14 +37,14 @@
}
/**
- * @see com.metamatrix.connector.language.IFrom#getItems()
+ * @see org.teiid.connector.language.IFrom#getItems()
*/
public List getItems() {
return items;
}
/**
- * @see com.metamatrix.connector.language.ILanguageObject#acceptVisitor(com.metamatrix.data.visitor.LanguageObjectVisitor)
+ * @see org.teiid.connector.language.ILanguageObject#acceptVisitor(com.metamatrix.data.visitor.LanguageObjectVisitor)
*/
public void acceptVisitor(LanguageObjectVisitor visitor) {
visitor.visit(this);
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/FunctionImpl.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/FunctionImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/FunctionImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -25,10 +25,11 @@
import java.util.ArrayList;
import java.util.List;
-import com.metamatrix.connector.language.IExpression;
-import com.metamatrix.connector.language.IFunction;
-import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor;
+import org.teiid.connector.language.IExpression;
+import org.teiid.connector.language.IFunction;
+import org.teiid.connector.visitor.framework.LanguageObjectVisitor;
+
public class FunctionImpl extends BaseLanguageObject implements IFunction {
private String name;
@@ -46,21 +47,21 @@
}
/**
- * @see com.metamatrix.connector.language.IFunction#getName()
+ * @see org.teiid.connector.language.IFunction#getName()
*/
public String getName() {
return this.name;
}
/**
- * @see com.metamatrix.connector.language.IFunction#getParameters()
+ * @see org.teiid.connector.language.IFunction#getParameters()
*/
public List<IExpression> getParameters() {
return parameters;
}
/**
- * @see com.metamatrix.connector.language.ILanguageObject#acceptVisitor(com.metamatrix.data.visitor.LanguageObjectVisitor)
+ * @see org.teiid.connector.language.ILanguageObject#acceptVisitor(com.metamatrix.data.visitor.LanguageObjectVisitor)
*/
public void acceptVisitor(LanguageObjectVisitor visitor) {
visitor.visit(this);
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/GroupByImpl.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/GroupByImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/GroupByImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -24,9 +24,10 @@
import java.util.List;
-import com.metamatrix.connector.language.IGroupBy;
-import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor;
+import org.teiid.connector.language.IGroupBy;
+import org.teiid.connector.visitor.framework.LanguageObjectVisitor;
+
public class GroupByImpl extends BaseLanguageObject implements IGroupBy {
private List elements = null;
@@ -36,14 +37,14 @@
}
/**
- * @see com.metamatrix.connector.language.IGroupBy#getElements()
+ * @see org.teiid.connector.language.IGroupBy#getElements()
*/
public List getElements() {
return elements;
}
/**
- * @see com.metamatrix.connector.language.ILanguageObject#acceptVisitor(com.metamatrix.data.visitor.LanguageObjectVisitor)
+ * @see org.teiid.connector.language.ILanguageObject#acceptVisitor(com.metamatrix.data.visitor.LanguageObjectVisitor)
*/
public void acceptVisitor(LanguageObjectVisitor visitor) {
visitor.visit(this);
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/GroupImpl.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/GroupImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/GroupImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -22,9 +22,10 @@
package com.metamatrix.dqp.internal.datamgr.language;
-import com.metamatrix.connector.language.IGroup;
-import com.metamatrix.connector.metadata.runtime.Group;
-import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor;
+import org.teiid.connector.language.IGroup;
+import org.teiid.connector.metadata.runtime.Group;
+import org.teiid.connector.visitor.framework.LanguageObjectVisitor;
+
import com.metamatrix.core.util.HashCodeUtil;
import com.metamatrix.metadata.runtime.api.MetadataID;
@@ -41,14 +42,14 @@
}
/**
- * @see com.metamatrix.connector.language.IGroup#getContext()
+ * @see org.teiid.connector.language.IGroup#getContext()
*/
public String getContext() {
return context;
}
/**
- * @see com.metamatrix.connector.language.IGroup#getDefinition()
+ * @see org.teiid.connector.language.IGroup#getDefinition()
*/
public String getDefinition() {
return this.definition;
@@ -64,7 +65,7 @@
}
/**
- * @see com.metamatrix.connector.language.ILanguageObject#acceptVisitor(com.metamatrix.data.visitor.LanguageObjectVisitor)
+ * @see org.teiid.connector.language.ILanguageObject#acceptVisitor(com.metamatrix.data.visitor.LanguageObjectVisitor)
*/
public void acceptVisitor(LanguageObjectVisitor visitor) {
visitor.visit(this);
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/InCriteriaImpl.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/InCriteriaImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/InCriteriaImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -24,10 +24,11 @@
import java.util.List;
-import com.metamatrix.connector.language.IExpression;
-import com.metamatrix.connector.language.IInCriteria;
-import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor;
+import org.teiid.connector.language.IExpression;
+import org.teiid.connector.language.IInCriteria;
+import org.teiid.connector.visitor.framework.LanguageObjectVisitor;
+
public class InCriteriaImpl extends BaseLanguageObject implements IInCriteria {
private IExpression leftExpression = null;
@@ -40,28 +41,28 @@
this.negated = negated;
}
/**
- * @see com.metamatrix.connector.language.IInCriteria#getLeftExpression()
+ * @see org.teiid.connector.language.IInCriteria#getLeftExpression()
*/
public IExpression getLeftExpression() {
return leftExpression;
}
/**
- * @see com.metamatrix.connector.language.IInCriteria#getRightExpressions()
+ * @see org.teiid.connector.language.IInCriteria#getRightExpressions()
*/
public List getRightExpressions() {
return rightExpressions;
}
/**
- * @see com.metamatrix.connector.language.IInCriteria#isNegated()
+ * @see org.teiid.connector.language.IInCriteria#isNegated()
*/
public boolean isNegated() {
return this.negated;
}
/**
- * @see com.metamatrix.connector.language.ILanguageObject#acceptVisitor(com.metamatrix.data.visitor.LanguageObjectVisitor)
+ * @see org.teiid.connector.language.ILanguageObject#acceptVisitor(com.metamatrix.data.visitor.LanguageObjectVisitor)
*/
public void acceptVisitor(LanguageObjectVisitor visitor) {
visitor.visit(this);
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/InlineViewImpl.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/InlineViewImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/InlineViewImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -22,9 +22,9 @@
package com.metamatrix.dqp.internal.datamgr.language;
-import com.metamatrix.connector.language.IInlineView;
-import com.metamatrix.connector.language.IQueryCommand;
-import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor;
+import org.teiid.connector.language.IInlineView;
+import org.teiid.connector.language.IQueryCommand;
+import org.teiid.connector.visitor.framework.LanguageObjectVisitor;
/**
* Inline views are treated like aliased groups
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/InsertImpl.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/InsertImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/InsertImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -24,10 +24,11 @@
import java.util.List;
-import com.metamatrix.connector.language.IGroup;
-import com.metamatrix.connector.language.IInsert;
-import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor;
+import org.teiid.connector.language.IGroup;
+import org.teiid.connector.language.IInsert;
+import org.teiid.connector.visitor.framework.LanguageObjectVisitor;
+
public class InsertImpl extends BaseLanguageObject implements IInsert {
private IGroup group = null;
@@ -40,28 +41,28 @@
this.values = values;
}
/**
- * @see com.metamatrix.connector.language.IInsert#getGroup()
+ * @see org.teiid.connector.language.IInsert#getGroup()
*/
public IGroup getGroup() {
return group;
}
/**
- * @see com.metamatrix.connector.language.IInsert#getElements()
+ * @see org.teiid.connector.language.IInsert#getElements()
*/
public List getElements() {
return elements;
}
/**
- * @see com.metamatrix.connector.language.IInsert#getValues()
+ * @see org.teiid.connector.language.IInsert#getValues()
*/
public List getValues() {
return values;
}
/**
- * @see com.metamatrix.connector.language.ILanguageObject#acceptVisitor(com.metamatrix.data.visitor.LanguageObjectVisitor)
+ * @see org.teiid.connector.language.ILanguageObject#acceptVisitor(com.metamatrix.data.visitor.LanguageObjectVisitor)
*/
public void acceptVisitor(LanguageObjectVisitor visitor) {
visitor.visit(this);
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/IsNullCriteriaImpl.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/IsNullCriteriaImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/IsNullCriteriaImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -22,9 +22,9 @@
package com.metamatrix.dqp.internal.datamgr.language;
-import com.metamatrix.connector.language.IExpression;
-import com.metamatrix.connector.language.IIsNullCriteria;
-import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor;
+import org.teiid.connector.language.IExpression;
+import org.teiid.connector.language.IIsNullCriteria;
+import org.teiid.connector.visitor.framework.LanguageObjectVisitor;
public class IsNullCriteriaImpl extends BaseLanguageObject implements IIsNullCriteria {
@@ -37,21 +37,21 @@
}
/**
- * @see com.metamatrix.connector.language.IIsNullCriteria#getExpression()
+ * @see org.teiid.connector.language.IIsNullCriteria#getExpression()
*/
public IExpression getExpression() {
return expression;
}
/**
- * @see com.metamatrix.connector.language.IIsNullCriteria#isNegated()
+ * @see org.teiid.connector.language.IIsNullCriteria#isNegated()
*/
public boolean isNegated() {
return this.negated;
}
/**
- * @see com.metamatrix.connector.language.ILanguageObject#acceptVisitor(com.metamatrix.data.visitor.LanguageObjectVisitor)
+ * @see org.teiid.connector.language.ILanguageObject#acceptVisitor(com.metamatrix.data.visitor.LanguageObjectVisitor)
*/
public void acceptVisitor(LanguageObjectVisitor visitor) {
visitor.visit(this);
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/JoinImpl.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/JoinImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/JoinImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -24,10 +24,11 @@
import java.util.List;
-import com.metamatrix.connector.language.IFromItem;
-import com.metamatrix.connector.language.IJoin;
-import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor;
+import org.teiid.connector.language.IFromItem;
+import org.teiid.connector.language.IJoin;
+import org.teiid.connector.visitor.framework.LanguageObjectVisitor;
+
public class JoinImpl extends BaseLanguageObject implements IJoin {
private IFromItem leftItem = null;
@@ -42,35 +43,35 @@
this.criteria = criteria;
}
/**
- * @see com.metamatrix.connector.language.IJoin#getLeftItem()
+ * @see org.teiid.connector.language.IJoin#getLeftItem()
*/
public IFromItem getLeftItem() {
return leftItem;
}
/**
- * @see com.metamatrix.connector.language.IJoin#getRightItem()
+ * @see org.teiid.connector.language.IJoin#getRightItem()
*/
public IFromItem getRightItem() {
return rightItem;
}
/**
- * @see com.metamatrix.connector.language.IJoin#getJoinType()
+ * @see org.teiid.connector.language.IJoin#getJoinType()
*/
public JoinType getJoinType() {
return this.joinType;
}
/**
- * @see com.metamatrix.connector.language.IJoin#getCriteria()
+ * @see org.teiid.connector.language.IJoin#getCriteria()
*/
public List getCriteria() {
return criteria;
}
/**
- * @see com.metamatrix.connector.language.ILanguageObject#acceptVisitor(com.metamatrix.data.visitor.LanguageObjectVisitor)
+ * @see org.teiid.connector.language.ILanguageObject#acceptVisitor(com.metamatrix.data.visitor.LanguageObjectVisitor)
*/
public void acceptVisitor(LanguageObjectVisitor visitor) {
visitor.visit(this);
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/LanguageBridgeFactory.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/LanguageBridgeFactory.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/LanguageBridgeFactory.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -26,51 +26,52 @@
import java.util.Iterator;
import java.util.List;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.language.IAggregate;
+import org.teiid.connector.language.IBatchedUpdates;
+import org.teiid.connector.language.ICommand;
+import org.teiid.connector.language.ICompareCriteria;
+import org.teiid.connector.language.ICompoundCriteria;
+import org.teiid.connector.language.ICriteria;
+import org.teiid.connector.language.IDelete;
+import org.teiid.connector.language.IElement;
+import org.teiid.connector.language.IExistsCriteria;
+import org.teiid.connector.language.IExpression;
+import org.teiid.connector.language.IFrom;
+import org.teiid.connector.language.IFromItem;
+import org.teiid.connector.language.IFunction;
+import org.teiid.connector.language.IGroup;
+import org.teiid.connector.language.IGroupBy;
+import org.teiid.connector.language.IInCriteria;
+import org.teiid.connector.language.IInsert;
+import org.teiid.connector.language.IIsNullCriteria;
+import org.teiid.connector.language.IJoin;
+import org.teiid.connector.language.ILikeCriteria;
+import org.teiid.connector.language.ILimit;
+import org.teiid.connector.language.ILiteral;
+import org.teiid.connector.language.INotCriteria;
+import org.teiid.connector.language.IOrderBy;
+import org.teiid.connector.language.IOrderByItem;
+import org.teiid.connector.language.IParameter;
+import org.teiid.connector.language.IProcedure;
+import org.teiid.connector.language.IQuery;
+import org.teiid.connector.language.IQueryCommand;
+import org.teiid.connector.language.ISearchedCaseExpression;
+import org.teiid.connector.language.ISelect;
+import org.teiid.connector.language.ISetClause;
+import org.teiid.connector.language.ISetClauseList;
+import org.teiid.connector.language.ISetQuery;
+import org.teiid.connector.language.ISubqueryCompareCriteria;
+import org.teiid.connector.language.ISubqueryInCriteria;
+import org.teiid.connector.language.IUpdate;
+import org.teiid.connector.language.ICompareCriteria.Operator;
+import org.teiid.connector.language.IParameter.Direction;
+import org.teiid.connector.language.ISubqueryCompareCriteria.Quantifier;
+import org.teiid.connector.metadata.runtime.Parameter;
+import org.teiid.connector.metadata.runtime.Procedure;
+
import com.metamatrix.api.exception.MetaMatrixComponentException;
import com.metamatrix.common.log.LogManager;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.language.IAggregate;
-import com.metamatrix.connector.language.IBatchedUpdates;
-import com.metamatrix.connector.language.ICommand;
-import com.metamatrix.connector.language.ICompareCriteria;
-import com.metamatrix.connector.language.ICompoundCriteria;
-import com.metamatrix.connector.language.ICriteria;
-import com.metamatrix.connector.language.IDelete;
-import com.metamatrix.connector.language.IElement;
-import com.metamatrix.connector.language.IExistsCriteria;
-import com.metamatrix.connector.language.IExpression;
-import com.metamatrix.connector.language.IFrom;
-import com.metamatrix.connector.language.IFromItem;
-import com.metamatrix.connector.language.IFunction;
-import com.metamatrix.connector.language.IGroup;
-import com.metamatrix.connector.language.IGroupBy;
-import com.metamatrix.connector.language.IInCriteria;
-import com.metamatrix.connector.language.IInsert;
-import com.metamatrix.connector.language.IIsNullCriteria;
-import com.metamatrix.connector.language.IJoin;
-import com.metamatrix.connector.language.ILikeCriteria;
-import com.metamatrix.connector.language.ILimit;
-import com.metamatrix.connector.language.ILiteral;
-import com.metamatrix.connector.language.INotCriteria;
-import com.metamatrix.connector.language.IOrderBy;
-import com.metamatrix.connector.language.IOrderByItem;
-import com.metamatrix.connector.language.IParameter;
-import com.metamatrix.connector.language.IProcedure;
-import com.metamatrix.connector.language.IQuery;
-import com.metamatrix.connector.language.IQueryCommand;
-import com.metamatrix.connector.language.ISearchedCaseExpression;
-import com.metamatrix.connector.language.ISelect;
-import com.metamatrix.connector.language.ISetClause;
-import com.metamatrix.connector.language.ISetClauseList;
-import com.metamatrix.connector.language.ISetQuery;
-import com.metamatrix.connector.language.ISubqueryCompareCriteria;
-import com.metamatrix.connector.language.ISubqueryInCriteria;
-import com.metamatrix.connector.language.IUpdate;
-import com.metamatrix.connector.language.ICompareCriteria.Operator;
-import com.metamatrix.connector.language.IParameter.Direction;
-import com.metamatrix.connector.language.ISubqueryCompareCriteria.Quantifier;
-import com.metamatrix.connector.metadata.runtime.Parameter;
-import com.metamatrix.connector.metadata.runtime.Procedure;
import com.metamatrix.dqp.DQPPlugin;
import com.metamatrix.dqp.internal.datamgr.metadata.RuntimeMetadataImpl;
import com.metamatrix.dqp.message.ParameterInfo;
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/LanguageFactoryImpl.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/LanguageFactoryImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/LanguageFactoryImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -25,51 +25,52 @@
import java.util.Arrays;
import java.util.List;
-import com.metamatrix.connector.language.IAggregate;
-import com.metamatrix.connector.language.IBulkInsert;
-import com.metamatrix.connector.language.ICompareCriteria;
-import com.metamatrix.connector.language.ICompoundCriteria;
-import com.metamatrix.connector.language.ICriteria;
-import com.metamatrix.connector.language.IDelete;
-import com.metamatrix.connector.language.IElement;
-import com.metamatrix.connector.language.IExistsCriteria;
-import com.metamatrix.connector.language.IExpression;
-import com.metamatrix.connector.language.IFrom;
-import com.metamatrix.connector.language.IFromItem;
-import com.metamatrix.connector.language.IFunction;
-import com.metamatrix.connector.language.IGroup;
-import com.metamatrix.connector.language.IGroupBy;
-import com.metamatrix.connector.language.IInCriteria;
-import com.metamatrix.connector.language.IInlineView;
-import com.metamatrix.connector.language.IInsert;
-import com.metamatrix.connector.language.IIsNullCriteria;
-import com.metamatrix.connector.language.IJoin;
-import com.metamatrix.connector.language.ILanguageFactory;
-import com.metamatrix.connector.language.ILikeCriteria;
-import com.metamatrix.connector.language.ILimit;
-import com.metamatrix.connector.language.ILiteral;
-import com.metamatrix.connector.language.INotCriteria;
-import com.metamatrix.connector.language.IOrderBy;
-import com.metamatrix.connector.language.IOrderByItem;
-import com.metamatrix.connector.language.IParameter;
-import com.metamatrix.connector.language.IProcedure;
-import com.metamatrix.connector.language.IQuery;
-import com.metamatrix.connector.language.IQueryCommand;
-import com.metamatrix.connector.language.IScalarSubquery;
-import com.metamatrix.connector.language.ISearchedCaseExpression;
-import com.metamatrix.connector.language.ISelect;
-import com.metamatrix.connector.language.ISelectSymbol;
-import com.metamatrix.connector.language.ISetClause;
-import com.metamatrix.connector.language.ISetClauseList;
-import com.metamatrix.connector.language.ISetQuery;
-import com.metamatrix.connector.language.ISubqueryCompareCriteria;
-import com.metamatrix.connector.language.ISubqueryInCriteria;
-import com.metamatrix.connector.language.IUpdate;
-import com.metamatrix.connector.metadata.runtime.Element;
-import com.metamatrix.connector.metadata.runtime.Group;
-import com.metamatrix.connector.metadata.runtime.Parameter;
-import com.metamatrix.connector.metadata.runtime.Procedure;
+import org.teiid.connector.language.IAggregate;
+import org.teiid.connector.language.IBulkInsert;
+import org.teiid.connector.language.ICompareCriteria;
+import org.teiid.connector.language.ICompoundCriteria;
+import org.teiid.connector.language.ICriteria;
+import org.teiid.connector.language.IDelete;
+import org.teiid.connector.language.IElement;
+import org.teiid.connector.language.IExistsCriteria;
+import org.teiid.connector.language.IExpression;
+import org.teiid.connector.language.IFrom;
+import org.teiid.connector.language.IFromItem;
+import org.teiid.connector.language.IFunction;
+import org.teiid.connector.language.IGroup;
+import org.teiid.connector.language.IGroupBy;
+import org.teiid.connector.language.IInCriteria;
+import org.teiid.connector.language.IInlineView;
+import org.teiid.connector.language.IInsert;
+import org.teiid.connector.language.IIsNullCriteria;
+import org.teiid.connector.language.IJoin;
+import org.teiid.connector.language.ILanguageFactory;
+import org.teiid.connector.language.ILikeCriteria;
+import org.teiid.connector.language.ILimit;
+import org.teiid.connector.language.ILiteral;
+import org.teiid.connector.language.INotCriteria;
+import org.teiid.connector.language.IOrderBy;
+import org.teiid.connector.language.IOrderByItem;
+import org.teiid.connector.language.IParameter;
+import org.teiid.connector.language.IProcedure;
+import org.teiid.connector.language.IQuery;
+import org.teiid.connector.language.IQueryCommand;
+import org.teiid.connector.language.IScalarSubquery;
+import org.teiid.connector.language.ISearchedCaseExpression;
+import org.teiid.connector.language.ISelect;
+import org.teiid.connector.language.ISelectSymbol;
+import org.teiid.connector.language.ISetClause;
+import org.teiid.connector.language.ISetClauseList;
+import org.teiid.connector.language.ISetQuery;
+import org.teiid.connector.language.ISubqueryCompareCriteria;
+import org.teiid.connector.language.ISubqueryInCriteria;
+import org.teiid.connector.language.IUpdate;
+import org.teiid.connector.metadata.runtime.Element;
+import org.teiid.connector.metadata.runtime.Group;
+import org.teiid.connector.metadata.runtime.Parameter;
+import org.teiid.connector.metadata.runtime.Procedure;
+
/**
*/
public class LanguageFactoryImpl implements ILanguageFactory {
@@ -175,7 +176,7 @@
}
/**
- * @see com.metamatrix.connector.language.ILanguageFactory#createBulkInsert(com.metamatrix.connector.language.IGroup, java.util.List, java.util.List)
+ * @see org.teiid.connector.language.ILanguageFactory#createBulkInsert(org.teiid.connector.language.IGroup, java.util.List, java.util.List)
*/
public IBulkInsert createBulkInsert(IGroup group, List columns, List rows) {
return new BulkInsertImpl(group, columns, rows);
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/LikeCriteriaImpl.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/LikeCriteriaImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/LikeCriteriaImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -22,9 +22,9 @@
package com.metamatrix.dqp.internal.datamgr.language;
-import com.metamatrix.connector.language.IExpression;
-import com.metamatrix.connector.language.ILikeCriteria;
-import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor;
+import org.teiid.connector.language.IExpression;
+import org.teiid.connector.language.ILikeCriteria;
+import org.teiid.connector.visitor.framework.LanguageObjectVisitor;
public class LikeCriteriaImpl extends BaseLanguageObject implements ILikeCriteria {
@@ -42,35 +42,35 @@
}
/**
- * @see com.metamatrix.connector.language.ILikeCriteria#getLeftExpression()
+ * @see org.teiid.connector.language.ILikeCriteria#getLeftExpression()
*/
public IExpression getLeftExpression() {
return leftExpression;
}
/**
- * @see com.metamatrix.connector.language.ILikeCriteria#getRightExpression()
+ * @see org.teiid.connector.language.ILikeCriteria#getRightExpression()
*/
public IExpression getRightExpression() {
return rightExpression;
}
/**
- * @see com.metamatrix.connector.language.ILikeCriteria#getEscapeCharacter()
+ * @see org.teiid.connector.language.ILikeCriteria#getEscapeCharacter()
*/
public Character getEscapeCharacter() {
return this.escapeCharacter;
}
/**
- * @see com.metamatrix.connector.language.ILikeCriteria#isNegated()
+ * @see org.teiid.connector.language.ILikeCriteria#isNegated()
*/
public boolean isNegated() {
return this.isNegated;
}
/**
- * @see com.metamatrix.connector.language.ILanguageObject#acceptVisitor(com.metamatrix.data.visitor.LanguageObjectVisitor)
+ * @see org.teiid.connector.language.ILanguageObject#acceptVisitor(com.metamatrix.data.visitor.LanguageObjectVisitor)
*/
public void acceptVisitor(LanguageObjectVisitor visitor) {
visitor.visit(this);
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/LimitImpl.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/LimitImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/LimitImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -22,8 +22,8 @@
package com.metamatrix.dqp.internal.datamgr.language;
-import com.metamatrix.connector.language.ILimit;
-import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor;
+import org.teiid.connector.language.ILimit;
+import org.teiid.connector.visitor.framework.LanguageObjectVisitor;
/**
@@ -39,7 +39,7 @@
this.rowLimit = rowLimit;
}
/**
- * @see com.metamatrix.connector.language.ILimit#getRowLimit()
+ * @see org.teiid.connector.language.ILimit#getRowLimit()
* @since 4.3
*/
public int getRowLimit() {
@@ -47,7 +47,7 @@
}
/**
- * @see com.metamatrix.connector.language.ILimit#getRowOffset()
+ * @see org.teiid.connector.language.ILimit#getRowOffset()
* @since 4.3
*/
public int getRowOffset() {
@@ -55,7 +55,7 @@
}
/**
- * @see com.metamatrix.connector.language.ILanguageObject#acceptVisitor(com.metamatrix.connector.visitor.framework.LanguageObjectVisitor)
+ * @see org.teiid.connector.language.ILanguageObject#acceptVisitor(org.teiid.connector.visitor.framework.LanguageObjectVisitor)
* @since 4.3
*/
public void acceptVisitor(LanguageObjectVisitor visitor) {
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/LiteralImpl.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/LiteralImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/LiteralImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -22,8 +22,8 @@
package com.metamatrix.dqp.internal.datamgr.language;
-import com.metamatrix.connector.language.ILiteral;
-import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor;
+import org.teiid.connector.language.ILiteral;
+import org.teiid.connector.visitor.framework.LanguageObjectVisitor;
public class LiteralImpl extends BaseLanguageObject implements ILiteral {
@@ -37,14 +37,14 @@
}
/**
- * @see com.metamatrix.connector.language.ILiteral#getValue()
+ * @see org.teiid.connector.language.ILiteral#getValue()
*/
public Object getValue() {
return this.value;
}
/**
- * @see com.metamatrix.connector.language.ILanguageObject#acceptVisitor(com.metamatrix.data.visitor.LanguageObjectVisitor)
+ * @see org.teiid.connector.language.ILanguageObject#acceptVisitor(com.metamatrix.data.visitor.LanguageObjectVisitor)
*/
public void acceptVisitor(LanguageObjectVisitor visitor) {
visitor.visit(this);
@@ -72,14 +72,14 @@
}
/**
- * @see com.metamatrix.connector.language.ILiteral#isBindValue()
+ * @see org.teiid.connector.language.ILiteral#isBindValue()
*/
public boolean isBindValue() {
return bindValue;
}
/**
- * @see com.metamatrix.connector.language.ILiteral#setBindValue(boolean)
+ * @see org.teiid.connector.language.ILiteral#setBindValue(boolean)
*/
public void setBindValue(boolean bindValue) {
this.bindValue = bindValue;
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/NotCriteriaImpl.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/NotCriteriaImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/NotCriteriaImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -22,9 +22,9 @@
package com.metamatrix.dqp.internal.datamgr.language;
-import com.metamatrix.connector.language.ICriteria;
-import com.metamatrix.connector.language.INotCriteria;
-import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor;
+import org.teiid.connector.language.ICriteria;
+import org.teiid.connector.language.INotCriteria;
+import org.teiid.connector.visitor.framework.LanguageObjectVisitor;
public class NotCriteriaImpl extends BaseLanguageObject implements INotCriteria {
@@ -34,14 +34,14 @@
this.criteria = criteria;
}
/**
- * @see com.metamatrix.connector.language.INotCriteria#getCriteria()
+ * @see org.teiid.connector.language.INotCriteria#getCriteria()
*/
public ICriteria getCriteria() {
return criteria;
}
/**
- * @see com.metamatrix.connector.language.ILanguageObject#acceptVisitor(com.metamatrix.data.visitor.LanguageObjectVisitor)
+ * @see org.teiid.connector.language.ILanguageObject#acceptVisitor(com.metamatrix.data.visitor.LanguageObjectVisitor)
*/
public void acceptVisitor(LanguageObjectVisitor visitor) {
visitor.visit(this);
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/OrderByImpl.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/OrderByImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/OrderByImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -24,9 +24,10 @@
import java.util.List;
-import com.metamatrix.connector.language.IOrderBy;
-import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor;
+import org.teiid.connector.language.IOrderBy;
+import org.teiid.connector.visitor.framework.LanguageObjectVisitor;
+
public class OrderByImpl extends BaseLanguageObject implements IOrderBy {
private List items = null;
@@ -36,14 +37,14 @@
}
/**
- * @see com.metamatrix.connector.language.IOrderBy#getItems()
+ * @see org.teiid.connector.language.IOrderBy#getItems()
*/
public List getItems() {
return items;
}
/**
- * @see com.metamatrix.connector.language.ILanguageObject#acceptVisitor(com.metamatrix.data.visitor.LanguageObjectVisitor)
+ * @see org.teiid.connector.language.ILanguageObject#acceptVisitor(com.metamatrix.data.visitor.LanguageObjectVisitor)
*/
public void acceptVisitor(LanguageObjectVisitor visitor) {
visitor.visit(this);
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/OrderByItemImpl.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/OrderByItemImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/OrderByItemImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -22,9 +22,9 @@
package com.metamatrix.dqp.internal.datamgr.language;
-import com.metamatrix.connector.language.IElement;
-import com.metamatrix.connector.language.IOrderByItem;
-import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor;
+import org.teiid.connector.language.IElement;
+import org.teiid.connector.language.IOrderByItem;
+import org.teiid.connector.visitor.framework.LanguageObjectVisitor;
public class OrderByItemImpl extends BaseLanguageObject implements IOrderByItem {
@@ -39,21 +39,21 @@
}
/**
- * @see com.metamatrix.connector.language.IOrderByItem#getName()
+ * @see org.teiid.connector.language.IOrderByItem#getName()
*/
public String getName() {
return this.name;
}
/**
- * @see com.metamatrix.connector.language.IOrderByItem#getDirection()
+ * @see org.teiid.connector.language.IOrderByItem#getDirection()
*/
public boolean getDirection() {
return direction;
}
/**
- * @see com.metamatrix.connector.language.ILanguageObject#acceptVisitor(com.metamatrix.data.visitor.LanguageObjectVisitor)
+ * @see org.teiid.connector.language.ILanguageObject#acceptVisitor(com.metamatrix.data.visitor.LanguageObjectVisitor)
*/
public void acceptVisitor(LanguageObjectVisitor visitor) {
visitor.visit(this);
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/ParameterImpl.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/ParameterImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/ParameterImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -22,9 +22,9 @@
package com.metamatrix.dqp.internal.datamgr.language;
-import com.metamatrix.connector.language.IParameter;
-import com.metamatrix.connector.metadata.runtime.Parameter;
-import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor;
+import org.teiid.connector.language.IParameter;
+import org.teiid.connector.metadata.runtime.Parameter;
+import org.teiid.connector.visitor.framework.LanguageObjectVisitor;
public class ParameterImpl extends BaseLanguageObject implements IParameter {
@@ -44,21 +44,21 @@
}
/**
- * @see com.metamatrix.connector.language.IParameter#getIndex()
+ * @see org.teiid.connector.language.IParameter#getIndex()
*/
public int getIndex() {
return this.index;
}
/**
- * @see com.metamatrix.connector.language.IParameter#getDirection()
+ * @see org.teiid.connector.language.IParameter#getDirection()
*/
public Direction getDirection() {
return this.direction;
}
/**
- * @see com.metamatrix.connector.language.IParameter#getType()
+ * @see org.teiid.connector.language.IParameter#getType()
*/
public Class getType() {
return this.type;
@@ -72,7 +72,7 @@
}
/**
- * @see com.metamatrix.connector.language.ILanguageObject#acceptVisitor(com.metamatrix.data.visitor.LanguageObjectVisitor)
+ * @see org.teiid.connector.language.ILanguageObject#acceptVisitor(com.metamatrix.data.visitor.LanguageObjectVisitor)
*/
public void acceptVisitor(LanguageObjectVisitor visitor) {
visitor.visit(this);
@@ -119,7 +119,7 @@
}
/**
- * @see com.metamatrix.connector.language.IParameter#getValueSpecified()
+ * @see org.teiid.connector.language.IParameter#getValueSpecified()
* @since 4.3.2
*/
public boolean getValueSpecified() {
@@ -127,7 +127,7 @@
}
/**
- * @see com.metamatrix.connector.language.IParameter#setValueSpecified(boolean)
+ * @see org.teiid.connector.language.IParameter#setValueSpecified(boolean)
* @since 4.3.2
*/
public void setValueSpecified(boolean specified) {
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/ProcedureImpl.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/ProcedureImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/ProcedureImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -24,11 +24,12 @@
import java.util.List;
-import com.metamatrix.connector.language.IParameter;
-import com.metamatrix.connector.language.IProcedure;
-import com.metamatrix.connector.metadata.runtime.Procedure;
-import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor;
+import org.teiid.connector.language.IParameter;
+import org.teiid.connector.language.IProcedure;
+import org.teiid.connector.metadata.runtime.Procedure;
+import org.teiid.connector.visitor.framework.LanguageObjectVisitor;
+
public class ProcedureImpl extends BaseLanguageObject implements IProcedure {
private String name;
@@ -56,7 +57,7 @@
}
/**
- * @see com.metamatrix.connector.language.ILanguageObject#acceptVisitor(com.metamatrix.data.visitor.LanguageObjectVisitor)
+ * @see org.teiid.connector.language.ILanguageObject#acceptVisitor(com.metamatrix.data.visitor.LanguageObjectVisitor)
*/
public void acceptVisitor(LanguageObjectVisitor visitor) {
visitor.visit(this);
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/QueryCommandImpl.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/QueryCommandImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/QueryCommandImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -25,24 +25,25 @@
import java.util.Iterator;
import java.util.List;
-import com.metamatrix.connector.language.ILimit;
-import com.metamatrix.connector.language.IOrderBy;
-import com.metamatrix.connector.language.ISelectSymbol;
+import org.teiid.connector.language.ILimit;
+import org.teiid.connector.language.IOrderBy;
+import org.teiid.connector.language.ISelectSymbol;
-public abstract class QueryCommandImpl extends BaseLanguageObject implements com.metamatrix.connector.language.IQueryCommand {
+public abstract class QueryCommandImpl extends BaseLanguageObject implements org.teiid.connector.language.IQueryCommand {
+
private IOrderBy orderBy = null;
private ILimit limit = null;
/**
- * @see com.metamatrix.connector.language.IQuery#getOrderBy()
+ * @see org.teiid.connector.language.IQuery#getOrderBy()
*/
public IOrderBy getOrderBy() {
return orderBy;
}
/**
- * @see com.metamatrix.connector.language.IQuery#getLimit()
+ * @see org.teiid.connector.language.IQuery#getLimit()
*/
public ILimit getLimit() {
return limit;
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/QueryImpl.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/QueryImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/QueryImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -25,15 +25,16 @@
import java.util.Iterator;
import java.util.List;
-import com.metamatrix.connector.language.ICriteria;
-import com.metamatrix.connector.language.IFrom;
-import com.metamatrix.connector.language.IGroupBy;
-import com.metamatrix.connector.language.IOrderBy;
-import com.metamatrix.connector.language.IQuery;
-import com.metamatrix.connector.language.ISelect;
-import com.metamatrix.connector.language.ISelectSymbol;
-import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor;
+import org.teiid.connector.language.ICriteria;
+import org.teiid.connector.language.IFrom;
+import org.teiid.connector.language.IGroupBy;
+import org.teiid.connector.language.IOrderBy;
+import org.teiid.connector.language.IQuery;
+import org.teiid.connector.language.ISelect;
+import org.teiid.connector.language.ISelectSymbol;
+import org.teiid.connector.visitor.framework.LanguageObjectVisitor;
+
public class QueryImpl extends QueryCommandImpl implements IQuery {
private ISelect select = null;
@@ -52,35 +53,35 @@
this.setOrderBy(orderBy);
}
/**
- * @see com.metamatrix.connector.language.IQuery#getSelect()
+ * @see org.teiid.connector.language.IQuery#getSelect()
*/
public ISelect getSelect() {
return select;
}
/**
- * @see com.metamatrix.connector.language.IQuery#getFrom()
+ * @see org.teiid.connector.language.IQuery#getFrom()
*/
public IFrom getFrom() {
return from;
}
/**
- * @see com.metamatrix.connector.language.IQuery#getWhere()
+ * @see org.teiid.connector.language.IQuery#getWhere()
*/
public ICriteria getWhere() {
return where;
}
/**
- * @see com.metamatrix.connector.language.IQuery#getGroupBy()
+ * @see org.teiid.connector.language.IQuery#getGroupBy()
*/
public IGroupBy getGroupBy() {
return groupBy;
}
/**
- * @see com.metamatrix.connector.language.IQuery#getHaving()
+ * @see org.teiid.connector.language.IQuery#getHaving()
*/
public ICriteria getHaving() {
return having;
@@ -112,7 +113,7 @@
}
/**
- * @see com.metamatrix.connector.language.ILanguageObject#acceptVisitor(com.metamatrix.data.visitor.LanguageObjectVisitor)
+ * @see org.teiid.connector.language.ILanguageObject#acceptVisitor(com.metamatrix.data.visitor.LanguageObjectVisitor)
*/
public void acceptVisitor(LanguageObjectVisitor visitor) {
visitor.visit(this);
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/ScalarSubqueryImpl.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/ScalarSubqueryImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/ScalarSubqueryImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -22,9 +22,9 @@
package com.metamatrix.dqp.internal.datamgr.language;
-import com.metamatrix.connector.language.IQueryCommand;
-import com.metamatrix.connector.language.IScalarSubquery;
-import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor;
+import org.teiid.connector.language.IQueryCommand;
+import org.teiid.connector.language.IScalarSubquery;
+import org.teiid.connector.visitor.framework.LanguageObjectVisitor;
/**
*/
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/SearchedCaseExpressionImpl.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/SearchedCaseExpressionImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/SearchedCaseExpressionImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -24,11 +24,12 @@
import java.util.List;
-import com.metamatrix.connector.language.ICriteria;
-import com.metamatrix.connector.language.IExpression;
-import com.metamatrix.connector.language.ISearchedCaseExpression;
-import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor;
+import org.teiid.connector.language.ICriteria;
+import org.teiid.connector.language.IExpression;
+import org.teiid.connector.language.ISearchedCaseExpression;
+import org.teiid.connector.visitor.framework.LanguageObjectVisitor;
+
public class SearchedCaseExpressionImpl extends BaseLanguageObject implements ISearchedCaseExpression {
private List whenExpressions;
@@ -43,35 +44,35 @@
this.type = type;
}
/**
- * @see com.metamatrix.connector.language.ISearchedCaseExpression#getElseExpression()
+ * @see org.teiid.connector.language.ISearchedCaseExpression#getElseExpression()
*/
public IExpression getElseExpression() {
return elseExpression;
}
/**
- * @see com.metamatrix.connector.language.ISearchedCaseExpression#getThenExpression(int)
+ * @see org.teiid.connector.language.ISearchedCaseExpression#getThenExpression(int)
*/
public IExpression getThenExpression(int index) {
return (IExpression)thenExpressions.get(index);
}
/**
- * @see com.metamatrix.connector.language.ISearchedCaseExpression#getWhenCount()
+ * @see org.teiid.connector.language.ISearchedCaseExpression#getWhenCount()
*/
public int getWhenCount() {
return whenExpressions.size();
}
/**
- * @see com.metamatrix.connector.language.ISearchedCaseExpression#getWhenCriteria(int)
+ * @see org.teiid.connector.language.ISearchedCaseExpression#getWhenCriteria(int)
*/
public ICriteria getWhenCriteria(int index) {
return (ICriteria)whenExpressions.get(index);
}
/**
- * @see com.metamatrix.connector.language.ILanguageObject#acceptVisitor(com.metamatrix.data.visitor.LanguageObjectVisitor)
+ * @see org.teiid.connector.language.ILanguageObject#acceptVisitor(com.metamatrix.data.visitor.LanguageObjectVisitor)
*/
public void acceptVisitor(LanguageObjectVisitor visitor) {
visitor.visit(this);
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/SelectImpl.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/SelectImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/SelectImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -24,9 +24,10 @@
import java.util.List;
-import com.metamatrix.connector.language.ISelect;
-import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor;
+import org.teiid.connector.language.ISelect;
+import org.teiid.connector.visitor.framework.LanguageObjectVisitor;
+
public class SelectImpl extends BaseLanguageObject implements ISelect {
private List selectSymbols = null;
@@ -38,21 +39,21 @@
}
/**
- * @see com.metamatrix.connector.language.ISelect#getSelectSymbols()
+ * @see org.teiid.connector.language.ISelect#getSelectSymbols()
*/
public List getSelectSymbols() {
return selectSymbols;
}
/**
- * @see com.metamatrix.connector.language.ISelect#isDistinct()
+ * @see org.teiid.connector.language.ISelect#isDistinct()
*/
public boolean isDistinct() {
return this.isDistinct;
}
/**
- * @see com.metamatrix.connector.language.ILanguageObject#acceptVisitor(com.metamatrix.data.visitor.LanguageObjectVisitor)
+ * @see org.teiid.connector.language.ILanguageObject#acceptVisitor(com.metamatrix.data.visitor.LanguageObjectVisitor)
*/
public void acceptVisitor(LanguageObjectVisitor visitor) {
visitor.visit(this);
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/SelectSymbolImpl.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/SelectSymbolImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/SelectSymbolImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -22,9 +22,9 @@
package com.metamatrix.dqp.internal.datamgr.language;
-import com.metamatrix.connector.language.IExpression;
-import com.metamatrix.connector.language.ISelectSymbol;
-import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor;
+import org.teiid.connector.language.IExpression;
+import org.teiid.connector.language.ISelectSymbol;
+import org.teiid.connector.visitor.framework.LanguageObjectVisitor;
public class SelectSymbolImpl extends BaseLanguageObject implements ISelectSymbol {
@@ -37,7 +37,7 @@
this.expression = expression;
}
/**
- * @see com.metamatrix.connector.language.ISelectSymbol#hasAlias()
+ * @see org.teiid.connector.language.ISelectSymbol#hasAlias()
*/
public boolean hasAlias() {
return hasAlias;
@@ -48,21 +48,21 @@
}
/**
- * @see com.metamatrix.connector.language.ISelectSymbol#getOutputName()
+ * @see org.teiid.connector.language.ISelectSymbol#getOutputName()
*/
public String getOutputName() {
return name;
}
/**
- * @see com.metamatrix.connector.language.ISelectSymbol#getExpression()
+ * @see org.teiid.connector.language.ISelectSymbol#getExpression()
*/
public IExpression getExpression() {
return expression;
}
/**
- * @see com.metamatrix.connector.language.ILanguageObject#acceptVisitor(com.metamatrix.data.visitor.LanguageObjectVisitor)
+ * @see org.teiid.connector.language.ILanguageObject#acceptVisitor(com.metamatrix.data.visitor.LanguageObjectVisitor)
*/
public void acceptVisitor(LanguageObjectVisitor visitor) {
visitor.visit(this);
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/SetClauseImpl.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/SetClauseImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/SetClauseImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -22,10 +22,10 @@
package com.metamatrix.dqp.internal.datamgr.language;
-import com.metamatrix.connector.language.IElement;
-import com.metamatrix.connector.language.IExpression;
-import com.metamatrix.connector.language.ISetClause;
-import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor;
+import org.teiid.connector.language.IElement;
+import org.teiid.connector.language.IExpression;
+import org.teiid.connector.language.ISetClause;
+import org.teiid.connector.visitor.framework.LanguageObjectVisitor;
public class SetClauseImpl implements ISetClause {
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/SetClauseListImpl.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/SetClauseListImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/SetClauseListImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -25,10 +25,11 @@
import java.util.ArrayList;
import java.util.List;
-import com.metamatrix.connector.language.ISetClause;
-import com.metamatrix.connector.language.ISetClauseList;
-import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor;
+import org.teiid.connector.language.ISetClause;
+import org.teiid.connector.language.ISetClauseList;
+import org.teiid.connector.visitor.framework.LanguageObjectVisitor;
+
public class SetClauseListImpl implements ISetClauseList {
private List<ISetClause> clauses;
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/SetQueryImpl.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/SetQueryImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/SetQueryImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -22,11 +22,11 @@
package com.metamatrix.dqp.internal.datamgr.language;
-import com.metamatrix.connector.language.IQuery;
-import com.metamatrix.connector.language.IQueryCommand;
-import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor;
+import org.teiid.connector.language.IQuery;
+import org.teiid.connector.language.IQueryCommand;
+import org.teiid.connector.visitor.framework.LanguageObjectVisitor;
-public class SetQueryImpl extends QueryCommandImpl implements com.metamatrix.connector.language.ISetQuery {
+public class SetQueryImpl extends QueryCommandImpl implements org.teiid.connector.language.ISetQuery {
private boolean all;
private IQueryCommand leftQuery;
@@ -44,63 +44,63 @@
}
/**
- * @see com.metamatrix.connector.language.ISetQuery#getLeftQuery()
+ * @see org.teiid.connector.language.ISetQuery#getLeftQuery()
*/
public IQueryCommand getLeftQuery() {
return leftQuery;
}
/**
- * @see com.metamatrix.connector.language.ISetQuery#getOperation()
+ * @see org.teiid.connector.language.ISetQuery#getOperation()
*/
public Operation getOperation() {
return operation;
}
/**
- * @see com.metamatrix.connector.language.ISetQuery#getRightQuery()
+ * @see org.teiid.connector.language.ISetQuery#getRightQuery()
*/
public IQueryCommand getRightQuery() {
return rightQuery;
}
/**
- * @see com.metamatrix.connector.language.ISetQuery#isAll()
+ * @see org.teiid.connector.language.ISetQuery#isAll()
*/
public boolean isAll() {
return all;
}
/**
- * @see com.metamatrix.connector.language.ISetQuery#setAll(boolean)
+ * @see org.teiid.connector.language.ISetQuery#setAll(boolean)
*/
public void setAll(boolean all) {
this.all = all;
}
/**
- * @see com.metamatrix.connector.language.ISetQuery#setLeftQuery(com.metamatrix.connector.language.IQueryCommand)
+ * @see org.teiid.connector.language.ISetQuery#setLeftQuery(org.teiid.connector.language.IQueryCommand)
*/
public void setLeftQuery(IQueryCommand leftQuery) {
this.leftQuery = leftQuery;
}
/**
- * @see com.metamatrix.connector.language.ISetQuery#setOperation(com.metamatrix.connector.language.ISetQuery.Operation)
+ * @see org.teiid.connector.language.ISetQuery#setOperation(org.teiid.connector.language.ISetQuery.Operation)
*/
public void setOperation(Operation operation) {
this.operation = operation;
}
/**
- * @see com.metamatrix.connector.language.ISetQuery#setRightQuery(com.metamatrix.connector.language.IQueryCommand)
+ * @see org.teiid.connector.language.ISetQuery#setRightQuery(org.teiid.connector.language.IQueryCommand)
*/
public void setRightQuery(IQueryCommand rightQuery) {
this.rightQuery = rightQuery;
}
/**
- * @see com.metamatrix.connector.language.ILanguageObject#acceptVisitor(com.metamatrix.data.visitor.LanguageObjectVisitor)
+ * @see org.teiid.connector.language.ILanguageObject#acceptVisitor(com.metamatrix.data.visitor.LanguageObjectVisitor)
*/
public void acceptVisitor(LanguageObjectVisitor visitor) {
visitor.visit(this);
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/SubqueryCompareCriteriaImpl.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/SubqueryCompareCriteriaImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/SubqueryCompareCriteriaImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -22,9 +22,9 @@
package com.metamatrix.dqp.internal.datamgr.language;
-import com.metamatrix.connector.language.*;
-import com.metamatrix.connector.language.ICompareCriteria.Operator;
-import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor;
+import org.teiid.connector.language.*;
+import org.teiid.connector.language.ICompareCriteria.Operator;
+import org.teiid.connector.visitor.framework.LanguageObjectVisitor;
/**
*/
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/SubqueryInCriteriaImpl.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/SubqueryInCriteriaImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/SubqueryInCriteriaImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -22,8 +22,8 @@
package com.metamatrix.dqp.internal.datamgr.language;
-import com.metamatrix.connector.language.*;
-import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor;
+import org.teiid.connector.language.*;
+import org.teiid.connector.visitor.framework.LanguageObjectVisitor;
/**
*/
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/UpdateImpl.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/UpdateImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/UpdateImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -22,11 +22,11 @@
package com.metamatrix.dqp.internal.datamgr.language;
-import com.metamatrix.connector.language.ICriteria;
-import com.metamatrix.connector.language.IGroup;
-import com.metamatrix.connector.language.ISetClauseList;
-import com.metamatrix.connector.language.IUpdate;
-import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor;
+import org.teiid.connector.language.ICriteria;
+import org.teiid.connector.language.IGroup;
+import org.teiid.connector.language.ISetClauseList;
+import org.teiid.connector.language.IUpdate;
+import org.teiid.connector.visitor.framework.LanguageObjectVisitor;
public class UpdateImpl extends BaseLanguageObject implements IUpdate {
@@ -41,28 +41,28 @@
}
/**
- * @see com.metamatrix.connector.language.IUpdate#getGroup()
+ * @see org.teiid.connector.language.IUpdate#getGroup()
*/
public IGroup getGroup() {
return group;
}
/**
- * @see com.metamatrix.connector.language.IUpdate#getChanges()
+ * @see org.teiid.connector.language.IUpdate#getChanges()
*/
public ISetClauseList getChanges() {
return changes;
}
/**
- * @see com.metamatrix.connector.language.IUpdate#getCriteria()
+ * @see org.teiid.connector.language.IUpdate#getCriteria()
*/
public ICriteria getCriteria() {
return criteria;
}
/**
- * @see com.metamatrix.connector.language.ILanguageObject#acceptVisitor(com.metamatrix.data.visitor.LanguageObjectVisitor)
+ * @see org.teiid.connector.language.ILanguageObject#acceptVisitor(com.metamatrix.data.visitor.LanguageObjectVisitor)
*/
public void acceptVisitor(LanguageObjectVisitor visitor) {
visitor.visit(this);
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata/ElementImpl.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata/ElementImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata/ElementImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -24,12 +24,13 @@
*/
package com.metamatrix.dqp.internal.datamgr.metadata;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.metadata.runtime.Element;
+import org.teiid.connector.metadata.runtime.Group;
+
import com.metamatrix.api.exception.MetaMatrixComponentException;
import com.metamatrix.api.exception.query.QueryMetadataException;
import com.metamatrix.common.types.DataTypeManager;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.metadata.runtime.Element;
-import com.metamatrix.connector.metadata.runtime.Group;
import com.metamatrix.query.metadata.SupportConstants;
/**
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata/GroupImpl.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata/GroupImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata/GroupImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -27,11 +27,12 @@
import java.util.ArrayList;
import java.util.List;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.metadata.runtime.Element;
+import org.teiid.connector.metadata.runtime.Group;
+
import com.metamatrix.api.exception.MetaMatrixComponentException;
import com.metamatrix.api.exception.query.QueryMetadataException;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.metadata.runtime.Element;
-import com.metamatrix.connector.metadata.runtime.Group;
/**
*/
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata/MetadataObjectImpl.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata/MetadataObjectImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata/MetadataObjectImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -26,10 +26,11 @@
import java.util.Properties;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.metadata.runtime.MetadataObject;
+
import com.metamatrix.api.exception.MetaMatrixComponentException;
import com.metamatrix.api.exception.query.QueryMetadataException;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.metadata.runtime.MetadataObject;
import com.metamatrix.core.MetaMatrixRuntimeException;
import com.metamatrix.query.metadata.QueryMetadataInterface;
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata/ParameterImpl.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata/ParameterImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata/ParameterImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -26,12 +26,13 @@
import java.util.Collections;
import java.util.List;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.metadata.runtime.Element;
+import org.teiid.connector.metadata.runtime.Parameter;
+import org.teiid.connector.metadata.runtime.Procedure;
+
import com.metamatrix.api.exception.MetaMatrixComponentException;
import com.metamatrix.api.exception.query.QueryMetadataException;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.metadata.runtime.Element;
-import com.metamatrix.connector.metadata.runtime.Parameter;
-import com.metamatrix.connector.metadata.runtime.Procedure;
import com.metamatrix.dqp.DQPPlugin;
import com.metamatrix.dqp.message.ParameterInfo;
import com.metamatrix.query.metadata.SupportConstants;
@@ -90,7 +91,7 @@
}
/**
- * @see com.metamatrix.connector.metadata.runtime.TypeModel#getNullability()
+ * @see org.teiid.connector.metadata.runtime.TypeModel#getNullability()
* @since 4.3
*/
public int getNullability() throws ConnectorException {
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata/ProcedureImpl.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata/ProcedureImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata/ProcedureImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -27,8 +27,9 @@
import java.util.ArrayList;
import java.util.List;
-import com.metamatrix.connector.metadata.runtime.Parameter;
-import com.metamatrix.connector.metadata.runtime.Procedure;
+import org.teiid.connector.metadata.runtime.Parameter;
+import org.teiid.connector.metadata.runtime.Procedure;
+
import com.metamatrix.query.metadata.StoredProcedureInfo;
import com.metamatrix.query.sql.lang.SPParameter;
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata/RuntimeMetadataImpl.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata/RuntimeMetadataImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata/RuntimeMetadataImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -24,10 +24,11 @@
*/
package com.metamatrix.dqp.internal.datamgr.metadata;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.metadata.runtime.*;
+
import com.metamatrix.api.exception.MetaMatrixComponentException;
import com.metamatrix.api.exception.query.QueryMetadataException;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.metadata.runtime.*;
import com.metamatrix.core.util.ArgCheck;
import com.metamatrix.query.metadata.QueryMetadataInterface;
import com.metamatrix.query.metadata.StoredProcedureInfo;
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata/TypeModelImpl.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata/TypeModelImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata/TypeModelImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -22,11 +22,12 @@
package com.metamatrix.dqp.internal.datamgr.metadata;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.metadata.runtime.Element;
+import org.teiid.connector.metadata.runtime.TypeModel;
+
import com.metamatrix.api.exception.MetaMatrixComponentException;
import com.metamatrix.api.exception.query.QueryMetadataException;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.metadata.runtime.Element;
-import com.metamatrix.connector.metadata.runtime.TypeModel;
import com.metamatrix.query.metadata.SupportConstants;
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/pooling/connector/ConnectionPool.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/internal/pooling/connector/ConnectionPool.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/pooling/connector/ConnectionPool.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -37,16 +37,17 @@
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
+import org.teiid.connector.DataPlugin;
+import org.teiid.connector.api.Connection;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorIdentity;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.api.SingleIdentity;
+import org.teiid.connector.xa.api.TransactionContext;
+import org.teiid.connector.xa.api.XAConnector;
+
import com.metamatrix.common.log.LogManager;
import com.metamatrix.common.util.PropertiesUtils;
-import com.metamatrix.connector.DataPlugin;
-import com.metamatrix.connector.api.Connection;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ConnectorIdentity;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.api.SingleIdentity;
-import com.metamatrix.connector.xa.api.TransactionContext;
-import com.metamatrix.connector.xa.api.XAConnector;
import com.metamatrix.core.log.MessageLevel;
import com.metamatrix.core.util.ArgCheck;
import com.metamatrix.dqp.internal.datamgr.impl.ConnectorWrapper;
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/pooling/connector/ConnectionPoolException.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/internal/pooling/connector/ConnectionPoolException.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/pooling/connector/ConnectionPoolException.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -24,7 +24,7 @@
*/
package com.metamatrix.dqp.internal.pooling.connector;
-import com.metamatrix.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorException;
/**
* This class is for exceptions occurring within the connection pool.
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/pooling/connector/ConnectionWrapper.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/internal/pooling/connector/ConnectionWrapper.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/pooling/connector/ConnectionWrapper.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -24,16 +24,17 @@
import javax.transaction.xa.XAResource;
-import com.metamatrix.connector.api.Connection;
-import com.metamatrix.connector.api.ConnectorCapabilities;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ConnectorIdentity;
-import com.metamatrix.connector.api.Execution;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.language.ICommand;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
-import com.metamatrix.connector.xa.api.XAConnection;
+import org.teiid.connector.api.Connection;
+import org.teiid.connector.api.ConnectorCapabilities;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorIdentity;
+import org.teiid.connector.api.Execution;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.language.ICommand;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
+import org.teiid.connector.xa.api.XAConnection;
+
public class ConnectionWrapper implements XAConnection {
private Connection connection;
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/pooling/connector/PooledConnector.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/internal/pooling/connector/PooledConnector.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/pooling/connector/PooledConnector.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -31,14 +31,15 @@
import javax.transaction.Synchronization;
import javax.transaction.SystemException;
-import com.metamatrix.connector.api.Connection;
-import com.metamatrix.connector.api.Connector;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.xa.api.TransactionContext;
-import com.metamatrix.connector.xa.api.XAConnection;
-import com.metamatrix.connector.xa.api.XAConnector;
+import org.teiid.connector.api.Connection;
+import org.teiid.connector.api.Connector;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.xa.api.TransactionContext;
+import org.teiid.connector.xa.api.XAConnection;
+import org.teiid.connector.xa.api.XAConnector;
+
import com.metamatrix.dqp.internal.datamgr.impl.ConnectorWrapper;
/**
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/process/Request.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/internal/process/Request.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/process/Request.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -33,6 +33,8 @@
import javax.transaction.SystemException;
+import org.teiid.connector.xa.api.TransactionContext;
+
import com.metamatrix.api.exception.MetaMatrixComponentException;
import com.metamatrix.api.exception.MetaMatrixProcessingException;
import com.metamatrix.api.exception.query.QueryMetadataException;
@@ -47,7 +49,6 @@
import com.metamatrix.common.log.LogManager;
import com.metamatrix.common.types.DataTypeManager;
import com.metamatrix.common.xa.XATransactionException;
-import com.metamatrix.connector.xa.api.TransactionContext;
import com.metamatrix.core.id.IDGenerator;
import com.metamatrix.core.id.IntegerIDFactory;
import com.metamatrix.core.util.Assertion;
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/process/RequestWorkItem.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/internal/process/RequestWorkItem.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/process/RequestWorkItem.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -35,6 +35,8 @@
import javax.transaction.InvalidTransactionException;
import javax.transaction.SystemException;
+import org.teiid.connector.xa.api.TransactionContext;
+
import com.metamatrix.api.exception.MetaMatrixComponentException;
import com.metamatrix.api.exception.MetaMatrixException;
import com.metamatrix.api.exception.MetaMatrixProcessingException;
@@ -52,7 +54,6 @@
import com.metamatrix.common.log.LogManager;
import com.metamatrix.common.types.DataTypeManager;
import com.metamatrix.common.xa.XATransactionException;
-import com.metamatrix.connector.xa.api.TransactionContext;
import com.metamatrix.core.MetaMatrixCoreException;
import com.metamatrix.core.log.MessageLevel;
import com.metamatrix.core.util.Assertion;
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/transaction/TransactionContextImpl.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/internal/transaction/TransactionContextImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/transaction/TransactionContextImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -33,8 +33,9 @@
import javax.transaction.Transaction;
import javax.transaction.xa.XAResource;
+import org.teiid.connector.xa.api.TransactionContext;
+
import com.metamatrix.common.xa.MMXid;
-import com.metamatrix.connector.xa.api.TransactionContext;
import com.metamatrix.core.MetaMatrixRuntimeException;
import com.metamatrix.dqp.DQPPlugin;
@@ -121,7 +122,7 @@
}
/**
- * @see com.metamatrix.connector.xa.api.TransactionContext#getTransactionTimeout()
+ * @see org.teiid.connector.xa.api.TransactionContext#getTransactionTimeout()
*/
int getTransactionTimeout() {
return this.transactionTimeout;
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/transaction/TransactionProvider.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/internal/transaction/TransactionProvider.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/transaction/TransactionProvider.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -31,9 +31,10 @@
import javax.transaction.xa.XAException;
import javax.transaction.xa.XAResource;
+import org.teiid.connector.xa.api.XAConnection;
+
import com.metamatrix.common.xa.MMXid;
import com.metamatrix.common.xa.XATransactionException;
-import com.metamatrix.connector.xa.api.XAConnection;
public interface TransactionProvider {
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/transaction/TransactionServerImpl.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/internal/transaction/TransactionServerImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/transaction/TransactionServerImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -39,9 +39,10 @@
import javax.transaction.xa.XAResource;
import javax.transaction.xa.Xid;
+import org.teiid.connector.xa.api.TransactionContext;
+
import com.metamatrix.common.xa.MMXid;
import com.metamatrix.common.xa.XATransactionException;
-import com.metamatrix.connector.xa.api.TransactionContext;
import com.metamatrix.core.util.Assertion;
import com.metamatrix.dqp.DQPPlugin;
import com.metamatrix.dqp.internal.transaction.TransactionProvider.XAConnectionSource;
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/message/AtomicRequestMessage.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/message/AtomicRequestMessage.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/message/AtomicRequestMessage.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -28,8 +28,9 @@
import java.util.Date;
import java.util.concurrent.atomic.AtomicInteger;
+import org.teiid.connector.xa.api.TransactionContext;
+
import com.metamatrix.common.buffer.impl.BufferConfig;
-import com.metamatrix.connector.xa.api.TransactionContext;
import com.metamatrix.dqp.internal.datamgr.ConnectorID;
import com.metamatrix.dqp.internal.process.DQPWorkContext;
import com.metamatrix.query.sql.lang.Command;
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/message/AtomicResultsMessage.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/message/AtomicResultsMessage.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/message/AtomicResultsMessage.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -28,8 +28,9 @@
import java.io.ObjectOutput;
import java.util.List;
+import org.teiid.connector.api.ConnectorException;
+
import com.metamatrix.common.batch.BatchSerializer;
-import com.metamatrix.connector.api.ConnectorException;
import com.metamatrix.core.util.ExternalizeUtil;
public class AtomicResultsMessage implements Externalizable {
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/service/CustomizableTrackingMessage.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/service/CustomizableTrackingMessage.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/service/CustomizableTrackingMessage.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -22,7 +22,8 @@
package com.metamatrix.dqp.service;
-import com.metamatrix.connector.api.ExecutionContext;
+import org.teiid.connector.api.ExecutionContext;
+
import com.metamatrix.dqp.spi.CommandLoggerSPI;
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/service/CustomizableTrackingService.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/service/CustomizableTrackingService.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/service/CustomizableTrackingService.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -28,6 +28,8 @@
import java.util.concurrent.RejectedExecutionException;
import java.util.concurrent.TimeUnit;
+import org.teiid.connector.api.ExecutionContext;
+
import com.metamatrix.common.application.ApplicationEnvironment;
import com.metamatrix.common.application.DQPConfigSource;
import com.metamatrix.common.application.exception.ApplicationInitializationException;
@@ -37,7 +39,6 @@
import com.metamatrix.common.queue.WorkerPoolFactory;
import com.metamatrix.common.util.LogCommonConstants;
import com.metamatrix.common.util.PropertiesUtils;
-import com.metamatrix.connector.api.ExecutionContext;
import com.metamatrix.core.util.StringUtil;
import com.metamatrix.dqp.DQPPlugin;
import com.metamatrix.dqp.spi.CommandLoggerSPI;
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/service/TrackingService.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/service/TrackingService.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/service/TrackingService.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -24,8 +24,9 @@
*/
package com.metamatrix.dqp.service;
+import org.teiid.connector.api.ExecutionContext;
+
import com.metamatrix.common.application.ApplicationService;
-import com.metamatrix.connector.api.ExecutionContext;
import com.metamatrix.query.sql.lang.Command;
/**
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/spi/CommandLoggerSPI.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/spi/CommandLoggerSPI.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/spi/CommandLoggerSPI.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -24,7 +24,8 @@
import java.util.Properties;
-import com.metamatrix.connector.api.ExecutionContext;
+import org.teiid.connector.api.ExecutionContext;
+
import com.metamatrix.dqp.service.TrackingService;
/**
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/spi/basic/FileCommandLogger.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/spi/basic/FileCommandLogger.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/spi/basic/FileCommandLogger.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -30,7 +30,8 @@
import java.util.Date;
import java.util.Properties;
-import com.metamatrix.connector.api.ExecutionContext;
+import org.teiid.connector.api.ExecutionContext;
+
import com.metamatrix.dqp.spi.CommandLoggerSPI;
/**
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/transaction/TransactionServer.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/transaction/TransactionServer.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/transaction/TransactionServer.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -26,8 +26,9 @@
import javax.transaction.SystemException;
import javax.transaction.xa.XAResource;
+import org.teiid.connector.xa.api.TransactionContext;
+
import com.metamatrix.common.xa.XATransactionException;
-import com.metamatrix.connector.xa.api.TransactionContext;
import com.metamatrix.dqp.internal.transaction.TransactionProvider.XAConnectionSource;
public interface TransactionServer {
Modified: trunk/engine/src/main/java/com/metamatrix/query/function/source/SystemSource.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/query/function/source/SystemSource.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/query/function/source/SystemSource.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -28,8 +28,9 @@
import java.util.Collection;
import java.util.List;
+import org.teiid.connector.api.SourceSystemFunctions;
+
import com.metamatrix.common.types.DataTypeManager;
-import com.metamatrix.connector.api.SourceSystemFunctions;
import com.metamatrix.query.QueryPlugin;
import com.metamatrix.query.function.FunctionLibrary;
import com.metamatrix.query.function.FunctionMetadataSource;
Modified: trunk/engine/src/main/java/com/metamatrix/query/rewriter/QueryRewriter.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/query/rewriter/QueryRewriter.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/main/java/com/metamatrix/query/rewriter/QueryRewriter.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -42,6 +42,8 @@
import java.util.Set;
import java.util.StringTokenizer;
+import org.teiid.connector.api.SourceSystemFunctions;
+
import com.metamatrix.api.exception.MetaMatrixComponentException;
import com.metamatrix.api.exception.query.CriteriaEvaluationException;
import com.metamatrix.api.exception.query.ExpressionEvaluationException;
@@ -55,7 +57,6 @@
import com.metamatrix.common.types.DataTypeManager;
import com.metamatrix.common.types.Transform;
import com.metamatrix.common.util.TimestampWithTimezone;
-import com.metamatrix.connector.api.SourceSystemFunctions;
import com.metamatrix.core.MetaMatrixRuntimeException;
import com.metamatrix.core.util.Assertion;
import com.metamatrix.query.eval.Evaluator;
Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/impl/FakeConnector.java
===================================================================
--- trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/impl/FakeConnector.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/impl/FakeConnector.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -27,27 +27,28 @@
import javax.transaction.xa.XAResource;
+import org.teiid.connector.api.Connection;
+import org.teiid.connector.api.ConnectorCapabilities;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.DataNotAvailableException;
+import org.teiid.connector.api.Execution;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.api.ResultSetExecution;
+import org.teiid.connector.api.UpdateExecution;
+import org.teiid.connector.basic.BasicConnection;
+import org.teiid.connector.basic.BasicConnector;
+import org.teiid.connector.basic.BasicConnectorCapabilities;
+import org.teiid.connector.basic.BasicExecution;
+import org.teiid.connector.language.ICommand;
+import org.teiid.connector.language.IQueryCommand;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
+import org.teiid.connector.xa.api.TransactionContext;
+import org.teiid.connector.xa.api.XAConnection;
+import org.teiid.connector.xa.api.XAConnector;
+
import junit.framework.Assert;
-import com.metamatrix.connector.api.Connection;
-import com.metamatrix.connector.api.ConnectorCapabilities;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.DataNotAvailableException;
-import com.metamatrix.connector.api.Execution;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.api.ResultSetExecution;
-import com.metamatrix.connector.api.UpdateExecution;
-import com.metamatrix.connector.basic.BasicConnection;
-import com.metamatrix.connector.basic.BasicConnector;
-import com.metamatrix.connector.basic.BasicConnectorCapabilities;
-import com.metamatrix.connector.basic.BasicExecution;
-import com.metamatrix.connector.language.ICommand;
-import com.metamatrix.connector.language.IQueryCommand;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
-import com.metamatrix.connector.xa.api.TransactionContext;
-import com.metamatrix.connector.xa.api.XAConnection;
-import com.metamatrix.connector.xa.api.XAConnector;
public class FakeConnector extends BasicConnector implements XAConnector {
private static final int RESULT_SIZE = 5;
@@ -60,7 +61,7 @@
private ClassLoader classloader;
@Override
- public Connection getConnection(com.metamatrix.connector.api.ExecutionContext context) throws ConnectorException {
+ public Connection getConnection(org.teiid.connector.api.ExecutionContext context) throws ConnectorException {
return new FakeConnection();
}
@Override
Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/impl/FakeProcedureExecution.java
===================================================================
--- trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/impl/FakeProcedureExecution.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/impl/FakeProcedureExecution.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -25,12 +25,13 @@
import java.util.Arrays;
import java.util.List;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.DataNotAvailableException;
-import com.metamatrix.connector.api.ProcedureExecution;
-import com.metamatrix.connector.basic.BasicExecution;
-import com.metamatrix.connector.language.IParameter;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.DataNotAvailableException;
+import org.teiid.connector.api.ProcedureExecution;
+import org.teiid.connector.basic.BasicExecution;
+import org.teiid.connector.language.IParameter;
+
final class FakeProcedureExecution extends BasicExecution implements ProcedureExecution {
int resultSetSize;
Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/impl/TestConnectorManagerImpl.java
===================================================================
--- trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/impl/TestConnectorManagerImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/impl/TestConnectorManagerImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -34,10 +34,10 @@
import junit.framework.TestCase;
import org.mockito.Mockito;
+import org.teiid.connector.internal.ConnectorPropertyNames;
import com.metamatrix.common.application.ApplicationEnvironment;
import com.metamatrix.common.application.exception.ApplicationLifecycleException;
-import com.metamatrix.connector.internal.ConnectorPropertyNames;
import com.metamatrix.dqp.internal.datamgr.impl.TestConnectorWorkItem.QueueResultsReceiver;
import com.metamatrix.dqp.internal.pooling.connector.FakeSourceConnectionFactory;
import com.metamatrix.dqp.internal.process.DQPWorkContext;
Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/impl/TestConnectorWorkItem.java
===================================================================
--- trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/impl/TestConnectorWorkItem.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/impl/TestConnectorWorkItem.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -27,12 +27,13 @@
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ProcedureExecution;
+import org.teiid.connector.language.IProcedure;
+
import junit.framework.TestCase;
import com.metamatrix.common.comm.api.ResultsReceiver;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ProcedureExecution;
-import com.metamatrix.connector.language.IProcedure;
import com.metamatrix.dqp.client.ResultsFuture;
import com.metamatrix.dqp.internal.datamgr.ConnectorID;
import com.metamatrix.dqp.internal.datamgr.language.LanguageBridgeFactory;
Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestAggregateImpl.java
===================================================================
--- trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestAggregateImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestAggregateImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -22,8 +22,9 @@
package com.metamatrix.dqp.internal.datamgr.language;
+import org.teiid.connector.language.IAggregate;
+
import com.metamatrix.common.types.DataTypeManager;
-import com.metamatrix.connector.language.IAggregate;
import com.metamatrix.query.sql.ReservedWords;
import com.metamatrix.query.sql.symbol.AggregateSymbol;
import com.metamatrix.query.sql.symbol.Constant;
Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestBatchedUpdatesImpl.java
===================================================================
--- trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestBatchedUpdatesImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestBatchedUpdatesImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -25,11 +25,12 @@
import java.util.ArrayList;
import java.util.List;
+import org.teiid.connector.language.IDelete;
+import org.teiid.connector.language.IInsert;
+import org.teiid.connector.language.IUpdate;
+
import junit.framework.TestCase;
-import com.metamatrix.connector.language.IDelete;
-import com.metamatrix.connector.language.IInsert;
-import com.metamatrix.connector.language.IUpdate;
import com.metamatrix.query.sql.lang.BatchedUpdateCommand;
Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestBulkInsertImpl.java
===================================================================
--- trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestBulkInsertImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestBulkInsertImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -25,9 +25,10 @@
import java.util.ArrayList;
import java.util.Iterator;
+import org.teiid.connector.language.IElement;
+
import junit.framework.TestCase;
-import com.metamatrix.connector.language.IElement;
import com.metamatrix.query.sql.lang.BulkInsert;
import com.metamatrix.query.sql.symbol.GroupSymbol;
Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestCompareCriteriaImpl.java
===================================================================
--- trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestCompareCriteriaImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestCompareCriteriaImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -22,7 +22,8 @@
package com.metamatrix.dqp.internal.datamgr.language;
-import com.metamatrix.connector.language.ICompareCriteria.Operator;
+import org.teiid.connector.language.ICompareCriteria.Operator;
+
import com.metamatrix.query.sql.lang.CompareCriteria;
import com.metamatrix.query.sql.symbol.Constant;
Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestCompoundCriteriaImpl.java
===================================================================
--- trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestCompoundCriteriaImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestCompoundCriteriaImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -24,8 +24,9 @@
import java.util.Iterator;
-import com.metamatrix.connector.language.ICriteria;
-import com.metamatrix.connector.language.ICompoundCriteria.Operator;
+import org.teiid.connector.language.ICriteria;
+import org.teiid.connector.language.ICompoundCriteria.Operator;
+
import com.metamatrix.query.sql.lang.CompareCriteria;
import com.metamatrix.query.sql.lang.CompoundCriteria;
Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestElementImpl.java
===================================================================
--- trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestElementImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestElementImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -22,12 +22,13 @@
package com.metamatrix.dqp.internal.datamgr.language;
+import org.teiid.connector.language.IElement;
+import org.teiid.connector.language.IGroup;
+import org.teiid.connector.metadata.runtime.Element;
+
import junit.framework.TestCase;
import com.metamatrix.common.types.DataTypeManager;
-import com.metamatrix.connector.language.IElement;
-import com.metamatrix.connector.language.IGroup;
-import com.metamatrix.connector.metadata.runtime.Element;
import com.metamatrix.dqp.internal.datamgr.metadata.TestMetadataFactory;
import com.metamatrix.query.sql.symbol.ElementSymbol;
import com.metamatrix.query.unittest.FakeMetadataObject;
Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestFromImpl.java
===================================================================
--- trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestFromImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestFromImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -26,7 +26,8 @@
import java.util.Iterator;
import java.util.List;
-import com.metamatrix.connector.language.IFromItem;
+import org.teiid.connector.language.IFromItem;
+
import com.metamatrix.query.sql.lang.From;
import com.metamatrix.query.sql.lang.UnaryFromClause;
Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestFunctionImpl.java
===================================================================
--- trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestFunctionImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestFunctionImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -24,7 +24,8 @@
import java.util.List;
-import com.metamatrix.connector.language.IExpression;
+import org.teiid.connector.language.IExpression;
+
import com.metamatrix.query.sql.symbol.Constant;
import com.metamatrix.query.sql.symbol.Expression;
import com.metamatrix.query.sql.symbol.Function;
Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestGroupByImpl.java
===================================================================
--- trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestGroupByImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestGroupByImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -26,7 +26,8 @@
import java.util.Iterator;
import java.util.List;
-import com.metamatrix.connector.language.IElement;
+import org.teiid.connector.language.IElement;
+
import com.metamatrix.query.sql.lang.GroupBy;
import com.metamatrix.query.sql.symbol.ElementSymbol;
import com.metamatrix.query.sql.symbol.Expression;
Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestInCriteriaImpl.java
===================================================================
--- trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestInCriteriaImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestInCriteriaImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -26,8 +26,9 @@
import java.util.Iterator;
import java.util.List;
-import com.metamatrix.connector.language.IExpression;
-import com.metamatrix.connector.language.ILiteral;
+import org.teiid.connector.language.IExpression;
+import org.teiid.connector.language.ILiteral;
+
import com.metamatrix.query.sql.lang.SetCriteria;
import junit.framework.TestCase;
Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestInsertImpl.java
===================================================================
--- trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestInsertImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestInsertImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -25,8 +25,9 @@
import java.util.ArrayList;
import java.util.Iterator;
-import com.metamatrix.connector.language.IElement;
-import com.metamatrix.connector.language.IExpression;
+import org.teiid.connector.language.IElement;
+import org.teiid.connector.language.IExpression;
+
import com.metamatrix.query.sql.lang.Insert;
import com.metamatrix.query.sql.symbol.GroupSymbol;
Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestJoinImpl.java
===================================================================
--- trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestJoinImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestJoinImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -25,7 +25,8 @@
import java.util.ArrayList;
import java.util.Iterator;
-import com.metamatrix.connector.language.ICriteria;
+import org.teiid.connector.language.ICriteria;
+
import com.metamatrix.query.sql.lang.CompareCriteria;
import com.metamatrix.query.sql.lang.JoinPredicate;
import com.metamatrix.query.sql.lang.JoinType;
@@ -68,11 +69,11 @@
}
public void testGetJoinType() throws Exception {
- assertEquals(com.metamatrix.connector.language.IJoin.JoinType.CROSS_JOIN, example(JoinType.JOIN_CROSS).getJoinType());
- assertEquals(com.metamatrix.connector.language.IJoin.JoinType.FULL_OUTER_JOIN, example(JoinType.JOIN_FULL_OUTER).getJoinType());
- assertEquals(com.metamatrix.connector.language.IJoin.JoinType.INNER_JOIN, example(JoinType.JOIN_INNER).getJoinType());
- assertEquals(com.metamatrix.connector.language.IJoin.JoinType.LEFT_OUTER_JOIN, example(JoinType.JOIN_LEFT_OUTER).getJoinType());
- assertEquals(com.metamatrix.connector.language.IJoin.JoinType.RIGHT_OUTER_JOIN, example(JoinType.JOIN_RIGHT_OUTER).getJoinType());
+ assertEquals(org.teiid.connector.language.IJoin.JoinType.CROSS_JOIN, example(JoinType.JOIN_CROSS).getJoinType());
+ assertEquals(org.teiid.connector.language.IJoin.JoinType.FULL_OUTER_JOIN, example(JoinType.JOIN_FULL_OUTER).getJoinType());
+ assertEquals(org.teiid.connector.language.IJoin.JoinType.INNER_JOIN, example(JoinType.JOIN_INNER).getJoinType());
+ assertEquals(org.teiid.connector.language.IJoin.JoinType.LEFT_OUTER_JOIN, example(JoinType.JOIN_LEFT_OUTER).getJoinType());
+ assertEquals(org.teiid.connector.language.IJoin.JoinType.RIGHT_OUTER_JOIN, example(JoinType.JOIN_RIGHT_OUTER).getJoinType());
}
public void testGetCriteria() throws Exception {
Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestLikeCriteriaImpl.java
===================================================================
--- trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestLikeCriteriaImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestLikeCriteriaImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -22,7 +22,8 @@
package com.metamatrix.dqp.internal.datamgr.language;
-import com.metamatrix.connector.language.ILiteral;
+import org.teiid.connector.language.ILiteral;
+
import com.metamatrix.query.sql.lang.MatchCriteria;
import com.metamatrix.query.sql.symbol.Constant;
import com.metamatrix.query.sql.symbol.ElementSymbol;
Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestOrderByImpl.java
===================================================================
--- trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestOrderByImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestOrderByImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -26,7 +26,8 @@
import java.util.Iterator;
import java.util.List;
-import com.metamatrix.connector.language.IOrderByItem;
+import org.teiid.connector.language.IOrderByItem;
+
import com.metamatrix.query.sql.lang.OrderBy;
import junit.framework.TestCase;
Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestParameterImpl.java
===================================================================
--- trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestParameterImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestParameterImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -24,8 +24,9 @@
import java.sql.ResultSet;
-import com.metamatrix.connector.language.IParameter.Direction;
+import org.teiid.connector.language.IParameter.Direction;
+
import junit.framework.TestCase;
public class TestParameterImpl extends TestCase {
Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestProcedureImpl.java
===================================================================
--- trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestProcedureImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestProcedureImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -25,7 +25,8 @@
import java.util.Collections;
import java.util.Iterator;
-import com.metamatrix.connector.language.IParameter;
+import org.teiid.connector.language.IParameter;
+
import com.metamatrix.query.parser.QueryParser;
import com.metamatrix.query.resolver.QueryResolver;
import com.metamatrix.query.sql.lang.*;
Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestScalarSubqueryImpl.java
===================================================================
--- trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestScalarSubqueryImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestScalarSubqueryImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -22,10 +22,11 @@
package com.metamatrix.dqp.internal.datamgr.language;
+import org.teiid.connector.language.IQuery;
+import org.teiid.connector.language.ISelectSymbol;
+
import junit.framework.TestCase;
-import com.metamatrix.connector.language.IQuery;
-import com.metamatrix.connector.language.ISelectSymbol;
import com.metamatrix.query.sql.lang.Query;
import com.metamatrix.query.sql.symbol.ScalarSubquery;
import com.metamatrix.query.sql.symbol.SingleElementSymbol;
Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestSelectImpl.java
===================================================================
--- trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestSelectImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestSelectImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -26,7 +26,8 @@
import java.util.Iterator;
import java.util.List;
-import com.metamatrix.connector.language.ISelectSymbol;
+import org.teiid.connector.language.ISelectSymbol;
+
import com.metamatrix.query.sql.lang.Select;
import junit.framework.TestCase;
Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestSelectSymbolImpl.java
===================================================================
--- trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestSelectSymbolImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestSelectSymbolImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -22,7 +22,8 @@
package com.metamatrix.dqp.internal.datamgr.language;
-import com.metamatrix.connector.language.IExpression;
+import org.teiid.connector.language.IExpression;
+
import com.metamatrix.query.sql.symbol.*;
import junit.framework.TestCase;
Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestSetQueryImpl.java
===================================================================
--- trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestSetQueryImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestSetQueryImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -25,14 +25,15 @@
import java.util.ArrayList;
import java.util.List;
+import org.teiid.connector.language.IElement;
+import org.teiid.connector.language.IGroup;
+import org.teiid.connector.language.IOrderByItem;
+import org.teiid.connector.language.IQuery;
+import org.teiid.connector.language.ISelectSymbol;
+import org.teiid.connector.language.ISetQuery;
+
import junit.framework.TestCase;
-import com.metamatrix.connector.language.IElement;
-import com.metamatrix.connector.language.IGroup;
-import com.metamatrix.connector.language.IOrderByItem;
-import com.metamatrix.connector.language.IQuery;
-import com.metamatrix.connector.language.ISelectSymbol;
-import com.metamatrix.connector.language.ISetQuery;
import com.metamatrix.query.sql.lang.CompoundCriteria;
import com.metamatrix.query.sql.lang.Query;
import com.metamatrix.query.sql.lang.SetQuery;
Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestSubqueryCompareCriteriaImpl.java
===================================================================
--- trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestSubqueryCompareCriteriaImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/TestSubqueryCompareCriteriaImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -22,10 +22,11 @@
package com.metamatrix.dqp.internal.datamgr.language;
+import org.teiid.connector.language.ICompareCriteria;
+import org.teiid.connector.language.ISubqueryCompareCriteria.Quantifier;
+
import junit.framework.TestCase;
-import com.metamatrix.connector.language.ICompareCriteria;
-import com.metamatrix.connector.language.ISubqueryCompareCriteria.Quantifier;
import com.metamatrix.query.sql.lang.CompareCriteria;
import com.metamatrix.query.sql.lang.Query;
import com.metamatrix.query.sql.lang.SubqueryCompareCriteria;
Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/connector/FakeSourceConnectionFactory.java
===================================================================
--- trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/connector/FakeSourceConnectionFactory.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/connector/FakeSourceConnectionFactory.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -24,16 +24,16 @@
*/
package com.metamatrix.dqp.internal.pooling.connector;
-import com.metamatrix.connector.api.Connection;
-import com.metamatrix.connector.api.ConnectorCapabilities;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.Execution;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.basic.BasicConnection;
-import com.metamatrix.connector.basic.BasicConnector;
-import com.metamatrix.connector.language.ICommand;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
+import org.teiid.connector.api.Connection;
+import org.teiid.connector.api.ConnectorCapabilities;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.Execution;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.basic.BasicConnection;
+import org.teiid.connector.basic.BasicConnector;
+import org.teiid.connector.language.ICommand;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
/**
*/
Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/connector/FakeUserIdentityConnectionFactory.java
===================================================================
--- trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/connector/FakeUserIdentityConnectionFactory.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/connector/FakeUserIdentityConnectionFactory.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -24,10 +24,10 @@
*/
package com.metamatrix.dqp.internal.pooling.connector;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ConnectorIdentity;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.api.MappedUserIdentity;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorIdentity;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.api.MappedUserIdentity;
/**
*/
Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/connector/TestConnectionPool.java
===================================================================
--- trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/connector/TestConnectionPool.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/connector/TestConnectionPool.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -26,10 +26,11 @@
import java.util.List;
import java.util.Properties;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.api.MappedUserIdentity;
+
import junit.framework.TestCase;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.api.MappedUserIdentity;
import com.metamatrix.dqp.internal.datamgr.impl.ConnectorWrapper;
import com.metamatrix.dqp.internal.datamgr.impl.ExecutionContextImpl;
Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/connector/TestConnectionWrapper.java
===================================================================
--- trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/connector/TestConnectionWrapper.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/connector/TestConnectionWrapper.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -25,8 +25,8 @@
import junit.framework.TestCase;
import org.mockito.Mockito;
+import org.teiid.connector.basic.BasicConnection;
-import com.metamatrix.connector.basic.BasicConnection;
public class TestConnectionWrapper extends TestCase {
Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/connector/TestPerUserPool.java
===================================================================
--- trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/connector/TestPerUserPool.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/connector/TestPerUserPool.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -28,19 +28,19 @@
import junit.framework.TestCase;
import org.mockito.Mockito;
+import org.teiid.connector.api.Connection;
+import org.teiid.connector.api.Connector;
+import org.teiid.connector.api.ConnectorCapabilities;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorLogger;
+import org.teiid.connector.api.CredentialMap;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.api.MappedUserIdentity;
+import org.teiid.connector.basic.BasicConnector;
+import org.teiid.connector.internal.ConnectorPropertyNames;
import com.metamatrix.common.application.ApplicationEnvironment;
-import com.metamatrix.connector.api.Connection;
-import com.metamatrix.connector.api.Connector;
-import com.metamatrix.connector.api.ConnectorCapabilities;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ConnectorLogger;
-import com.metamatrix.connector.api.CredentialMap;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.api.MappedUserIdentity;
-import com.metamatrix.connector.basic.BasicConnector;
-import com.metamatrix.connector.internal.ConnectorPropertyNames;
import com.metamatrix.dqp.internal.datamgr.impl.ConnectorEnvironmentImpl;
import com.metamatrix.dqp.internal.datamgr.impl.ExecutionContextImpl;
Modified: trunk/engine/src/test/java/com/metamatrix/dqp/service/TestCustomizableTrackingService.java
===================================================================
--- trunk/engine/src/test/java/com/metamatrix/dqp/service/TestCustomizableTrackingService.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/test/java/com/metamatrix/dqp/service/TestCustomizableTrackingService.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -26,12 +26,13 @@
import java.util.List;
import java.util.Properties;
+import org.teiid.connector.api.ExecutionContext;
+
import junit.framework.TestCase;
import com.metamatrix.common.application.DQPConfigSource;
import com.metamatrix.common.application.exception.ApplicationInitializationException;
import com.metamatrix.common.application.exception.ApplicationLifecycleException;
-import com.metamatrix.connector.api.ExecutionContext;
import com.metamatrix.dqp.spi.CommandLoggerSPI;
import com.metamatrix.dqp.spi.TrackerLogConstants;
import com.metamatrix.query.sql.lang.Command;
Modified: trunk/engine/src/test/java/com/metamatrix/query/optimizer/TestJoinOptimization.java
===================================================================
--- trunk/engine/src/test/java/com/metamatrix/query/optimizer/TestJoinOptimization.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/test/java/com/metamatrix/query/optimizer/TestJoinOptimization.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -25,13 +25,14 @@
import java.util.ArrayList;
import java.util.List;
+import org.teiid.connector.api.SourceSystemFunctions;
+
import junit.framework.TestCase;
import com.metamatrix.api.exception.MetaMatrixComponentException;
import com.metamatrix.api.exception.query.QueryMetadataException;
import com.metamatrix.api.exception.query.QueryParserException;
import com.metamatrix.api.exception.query.QueryResolverException;
-import com.metamatrix.connector.api.SourceSystemFunctions;
import com.metamatrix.query.optimizer.capabilities.BasicSourceCapabilities;
import com.metamatrix.query.optimizer.capabilities.FakeCapabilitiesFinder;
import com.metamatrix.query.optimizer.capabilities.SourceCapabilities.Capability;
Modified: trunk/engine/src/test/java/com/metamatrix/query/optimizer/TestOptimizer.java
===================================================================
--- trunk/engine/src/test/java/com/metamatrix/query/optimizer/TestOptimizer.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/test/java/com/metamatrix/query/optimizer/TestOptimizer.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -30,6 +30,8 @@
import java.util.List;
import java.util.Set;
+import org.teiid.connector.api.SourceSystemFunctions;
+
import junit.framework.TestCase;
import com.metamatrix.api.exception.MetaMatrixComponentException;
@@ -39,7 +41,6 @@
import com.metamatrix.api.exception.query.QueryResolverException;
import com.metamatrix.api.exception.query.QueryValidatorException;
import com.metamatrix.common.types.DataTypeManager;
-import com.metamatrix.connector.api.SourceSystemFunctions;
import com.metamatrix.core.MetaMatrixRuntimeException;
import com.metamatrix.query.analysis.AnalysisRecord;
import com.metamatrix.query.mapping.relational.QueryNode;
Modified: trunk/engine/src/test/java/com/metamatrix/query/unittest/QueryMetadataInterfaceBuilder.java
===================================================================
--- trunk/engine/src/test/java/com/metamatrix/query/unittest/QueryMetadataInterfaceBuilder.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/engine/src/test/java/com/metamatrix/query/unittest/QueryMetadataInterfaceBuilder.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -28,8 +28,9 @@
import java.util.Iterator;
import java.util.List;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
+
import com.metamatrix.common.types.DataTypeManager;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
import com.metamatrix.core.MetaMatrixRuntimeException;
import com.metamatrix.dqp.internal.datamgr.metadata.RuntimeMetadataImpl;
import com.metamatrix.dqp.message.ParameterInfo;
Modified: trunk/server/src/main/java/com/metamatrix/common/comm/platform/socket/server/LogonImpl.java
===================================================================
--- trunk/server/src/main/java/com/metamatrix/common/comm/platform/socket/server/LogonImpl.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/server/src/main/java/com/metamatrix/common/comm/platform/socket/server/LogonImpl.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -27,6 +27,9 @@
import java.util.Map;
import java.util.Properties;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.CredentialMap;
+
import com.metamatrix.admin.api.exception.security.InvalidSessionException;
import com.metamatrix.api.exception.ComponentNotFoundException;
import com.metamatrix.api.exception.MetaMatrixComponentException;
@@ -35,8 +38,6 @@
import com.metamatrix.api.exception.security.SessionServiceException;
import com.metamatrix.common.api.MMURL;
import com.metamatrix.common.log.LogManager;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.CredentialMap;
import com.metamatrix.dqp.client.ResultsFuture;
import com.metamatrix.dqp.internal.process.DQPWorkContext;
import com.metamatrix.jdbc.api.ConnectionProperties;
Modified: trunk/server/src/main/java/com/metamatrix/server/connector/service/ConnectorService.java
===================================================================
--- trunk/server/src/main/java/com/metamatrix/server/connector/service/ConnectorService.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/server/src/main/java/com/metamatrix/server/connector/service/ConnectorService.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -41,6 +41,9 @@
import java.util.Map;
import java.util.Properties;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.internal.ConnectorPropertyNames;
+
import com.metamatrix.api.exception.MetaMatrixComponentException;
import com.metamatrix.common.application.ApplicationEnvironment;
import com.metamatrix.common.application.ApplicationService;
@@ -70,8 +73,6 @@
import com.metamatrix.common.util.VMNaming;
import com.metamatrix.common.util.crypto.CryptoException;
import com.metamatrix.common.util.crypto.CryptoUtil;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.internal.ConnectorPropertyNames;
import com.metamatrix.core.MetaMatrixCoreException;
import com.metamatrix.core.event.EventObjectListener;
import com.metamatrix.core.util.ReflectionHelper;
Modified: trunk/server/src/main/java/com/metamatrix/server/connector/service/ConnectorServiceInterface.java
===================================================================
--- trunk/server/src/main/java/com/metamatrix/server/connector/service/ConnectorServiceInterface.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/server/src/main/java/com/metamatrix/server/connector/service/ConnectorServiceInterface.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -28,9 +28,10 @@
import java.io.Serializable;
+import org.teiid.connector.api.ConnectorException;
+
import com.metamatrix.api.exception.MetaMatrixComponentException;
import com.metamatrix.common.comm.api.ResultsReceiver;
-import com.metamatrix.connector.api.ConnectorException;
import com.metamatrix.dqp.internal.datamgr.ConnectorID;
import com.metamatrix.dqp.internal.process.DQPWorkContext;
import com.metamatrix.dqp.message.AtomicRequestID;
Modified: trunk/server/src/main/java/com/metamatrix/server/dqp/service/PlatformDataService.java
===================================================================
--- trunk/server/src/main/java/com/metamatrix/server/dqp/service/PlatformDataService.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/server/src/main/java/com/metamatrix/server/dqp/service/PlatformDataService.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -31,6 +31,8 @@
import java.util.Properties;
import java.util.concurrent.ConcurrentHashMap;
+import org.teiid.connector.api.ConnectorException;
+
import com.metamatrix.api.exception.ComponentNotFoundException;
import com.metamatrix.api.exception.MetaMatrixComponentException;
import com.metamatrix.common.application.ApplicationEnvironment;
@@ -38,7 +40,6 @@
import com.metamatrix.common.application.exception.ApplicationLifecycleException;
import com.metamatrix.common.comm.api.ResultsReceiver;
import com.metamatrix.common.config.api.ConnectorBinding;
-import com.metamatrix.connector.api.ConnectorException;
import com.metamatrix.core.util.ArgCheck;
import com.metamatrix.dqp.internal.datamgr.ConnectorID;
import com.metamatrix.dqp.internal.process.DQPWorkContext;
Modified: trunk/server/src/main/java/com/metamatrix/server/dqp/service/tracker/DatabaseCommandLogger.java
===================================================================
--- trunk/server/src/main/java/com/metamatrix/server/dqp/service/tracker/DatabaseCommandLogger.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/server/src/main/java/com/metamatrix/server/dqp/service/tracker/DatabaseCommandLogger.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -26,9 +26,10 @@
import java.util.Properties;
+import org.teiid.connector.api.ExecutionContext;
+
import com.metamatrix.common.log.LogManager;
import com.metamatrix.common.util.LogCommonConstants;
-import com.metamatrix.connector.api.ExecutionContext;
import com.metamatrix.dqp.spi.CommandLoggerSPI;
import com.metamatrix.dqp.spi.TrackerLogConstants;
import com.metamatrix.server.ServerPlugin;
Modified: trunk/test-integration/src/test/java/com/metamatrix/cdk/api/TestTranslationUtility.java
===================================================================
--- trunk/test-integration/src/test/java/com/metamatrix/cdk/api/TestTranslationUtility.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/test-integration/src/test/java/com/metamatrix/cdk/api/TestTranslationUtility.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -22,13 +22,14 @@
package com.metamatrix.cdk.api;
+import org.teiid.connector.language.ICommand;
+import org.teiid.connector.language.IGroup;
+import org.teiid.connector.language.IQuery;
+import org.teiid.connector.metadata.runtime.MetadataObject;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
+
import junit.framework.TestCase;
-import com.metamatrix.connector.language.ICommand;
-import com.metamatrix.connector.language.IGroup;
-import com.metamatrix.connector.language.IQuery;
-import com.metamatrix.connector.metadata.runtime.MetadataObject;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
import com.metamatrix.core.util.UnitTestUtil;
public class TestTranslationUtility extends TestCase {
Modified: trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/extension/TestSQLConversionVisitor.java
===================================================================
--- trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/extension/TestSQLConversionVisitor.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/extension/TestSQLConversionVisitor.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -26,18 +26,18 @@
import junit.framework.TestCase;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ExecutionContext;
import org.teiid.connector.jdbc.JDBCPropertyNames;
import org.teiid.connector.jdbc.translator.SQLConversionVisitor;
import org.teiid.connector.jdbc.translator.TranslatedCommand;
import org.teiid.connector.jdbc.translator.Translator;
+import org.teiid.connector.language.ICommand;
+import org.teiid.connector.language.ILanguageObject;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
import com.metamatrix.cdk.api.EnvironmentUtility;
import com.metamatrix.cdk.api.TranslationUtility;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.language.ICommand;
-import com.metamatrix.connector.language.ILanguageObject;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
import com.metamatrix.core.util.UnitTestUtil;
import com.metamatrix.dqp.internal.datamgr.impl.ExecutionContextImpl;
import com.metamatrix.dqp.internal.datamgr.impl.FakeExecutionContextImpl;
Modified: trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/oracle/TestOracleSQLConversionVisitor.java
===================================================================
--- trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/oracle/TestOracleSQLConversionVisitor.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/oracle/TestOracleSQLConversionVisitor.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -26,18 +26,18 @@
import junit.framework.TestCase;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ExecutionContext;
import org.teiid.connector.jdbc.JDBCPropertyNames;
import org.teiid.connector.jdbc.oracle.OracleSQLTranslator;
import org.teiid.connector.jdbc.translator.TranslatedCommand;
+import org.teiid.connector.language.ICommand;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
import com.metamatrix.cdk.CommandBuilder;
import com.metamatrix.cdk.api.EnvironmentUtility;
import com.metamatrix.cdk.api.TranslationUtility;
import com.metamatrix.common.types.DataTypeManager;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.language.ICommand;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
import com.metamatrix.core.util.UnitTestUtil;
import com.metamatrix.dqp.internal.datamgr.impl.ExecutionContextImpl;
import com.metamatrix.dqp.internal.datamgr.impl.FakeExecutionContextImpl;
Modified: trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/util/TestJDBCExecutionHelper.java
===================================================================
--- trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/util/TestJDBCExecutionHelper.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/util/TestJDBCExecutionHelper.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -28,15 +28,15 @@
import java.util.ArrayList;
import java.util.List;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ExecutionContext;
import org.teiid.connector.jdbc.JDBCExecutionHelper;
+import org.teiid.connector.language.IQuery;
+import org.teiid.connector.language.ISelect;
import junit.framework.TestCase;
import com.metamatrix.common.types.DataTypeManager;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.language.IQuery;
-import com.metamatrix.connector.language.ISelect;
import com.metamatrix.dqp.internal.datamgr.impl.FakeExecutionContextImpl;
import com.metamatrix.dqp.internal.datamgr.impl.TypeFacilityImpl;
import com.metamatrix.dqp.internal.datamgr.language.LiteralImpl;
Modified: trunk/test-integration/src/test/java/com/metamatrix/data/language/TestLanguageUtil.java
===================================================================
--- trunk/test-integration/src/test/java/com/metamatrix/data/language/TestLanguageUtil.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/test-integration/src/test/java/com/metamatrix/data/language/TestLanguageUtil.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -26,13 +26,14 @@
import java.util.List;
import java.util.Set;
+import org.teiid.connector.language.ICriteria;
+import org.teiid.connector.language.IQuery;
+import org.teiid.connector.language.LanguageUtil;
+
import junit.framework.TestCase;
import com.metamatrix.cdk.api.TranslationUtility;
import com.metamatrix.cdk.unittest.FakeTranslationFactory;
-import com.metamatrix.connector.language.ICriteria;
-import com.metamatrix.connector.language.IQuery;
-import com.metamatrix.connector.language.LanguageUtil;
import com.metamatrix.dqp.internal.datamgr.language.LanguageFactoryImpl;
/**
Modified: trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runtime/MockConnector.java
===================================================================
--- trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runtime/MockConnector.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runtime/MockConnector.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -5,25 +5,25 @@
import junit.framework.TestCase;
import org.mockito.Mockito;
+import org.teiid.connector.api.Connection;
+import org.teiid.connector.api.ConnectorCapabilities;
+import org.teiid.connector.api.ConnectorEnvironment;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.api.ProcedureExecution;
+import org.teiid.connector.api.ResultSetExecution;
+import org.teiid.connector.basic.BasicConnection;
+import org.teiid.connector.basic.BasicConnector;
+import org.teiid.connector.basic.BasicConnectorCapabilities;
+import org.teiid.connector.language.IElement;
+import org.teiid.connector.language.IGroup;
+import org.teiid.connector.language.IProcedure;
+import org.teiid.connector.language.IQueryCommand;
+import org.teiid.connector.language.ISelectSymbol;
+import org.teiid.connector.metadata.runtime.Element;
+import org.teiid.connector.metadata.runtime.MetadataObject;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
-import com.metamatrix.connector.api.Connection;
-import com.metamatrix.connector.api.ConnectorCapabilities;
-import com.metamatrix.connector.api.ConnectorEnvironment;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.api.ProcedureExecution;
-import com.metamatrix.connector.api.ResultSetExecution;
-import com.metamatrix.connector.basic.BasicConnection;
-import com.metamatrix.connector.basic.BasicConnector;
-import com.metamatrix.connector.basic.BasicConnectorCapabilities;
-import com.metamatrix.connector.language.IElement;
-import com.metamatrix.connector.language.IGroup;
-import com.metamatrix.connector.language.IProcedure;
-import com.metamatrix.connector.language.IQueryCommand;
-import com.metamatrix.connector.language.ISelectSymbol;
-import com.metamatrix.connector.metadata.runtime.Element;
-import com.metamatrix.connector.metadata.runtime.MetadataObject;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
public class MockConnector extends BasicConnector {
Modified: trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runtime/TestElement.java
===================================================================
--- trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runtime/TestElement.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runtime/TestElement.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -24,13 +24,14 @@
import java.util.Properties;
+import org.teiid.connector.language.IElement;
+import org.teiid.connector.language.IQuery;
+import org.teiid.connector.language.ISelectSymbol;
+import org.teiid.connector.metadata.runtime.Element;
+
import junit.framework.TestCase;
import com.metamatrix.cdk.api.TranslationUtility;
-import com.metamatrix.connector.language.IElement;
-import com.metamatrix.connector.language.IQuery;
-import com.metamatrix.connector.language.ISelectSymbol;
-import com.metamatrix.connector.metadata.runtime.Element;
import com.metamatrix.core.util.UnitTestUtil;
/**
Modified: trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runtime/TestGroup.java
===================================================================
--- trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runtime/TestGroup.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runtime/TestGroup.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -24,12 +24,13 @@
import java.util.Properties;
+import org.teiid.connector.language.IGroup;
+import org.teiid.connector.language.IQuery;
+import org.teiid.connector.metadata.runtime.Group;
+
import junit.framework.TestCase;
import com.metamatrix.cdk.api.TranslationUtility;
-import com.metamatrix.connector.language.IGroup;
-import com.metamatrix.connector.language.IQuery;
-import com.metamatrix.connector.metadata.runtime.Group;
import com.metamatrix.core.util.UnitTestUtil;
/**
Modified: trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runtime/TestMetadataInConnector.java
===================================================================
--- trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runtime/TestMetadataInConnector.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runtime/TestMetadataInConnector.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -1,6 +1,7 @@
package com.metamatrix.data.metadata.runtime;
-import com.metamatrix.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorException;
+
import com.metamatrix.core.util.UnitTestUtil;
import com.metamatrix.jdbc.api.AbstractMMQueryTestCase;
Modified: trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runtime/TestMetadataObject.java
===================================================================
--- trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runtime/TestMetadataObject.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runtime/TestMetadataObject.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -27,18 +27,19 @@
import java.util.List;
import java.util.Set;
+import org.teiid.connector.language.IElement;
+import org.teiid.connector.language.IGroup;
+import org.teiid.connector.language.IProcedure;
+import org.teiid.connector.language.IQuery;
+import org.teiid.connector.language.ISelectSymbol;
+import org.teiid.connector.metadata.runtime.Element;
+import org.teiid.connector.metadata.runtime.Group;
+import org.teiid.connector.metadata.runtime.Parameter;
+import org.teiid.connector.metadata.runtime.Procedure;
+
import junit.framework.TestCase;
import com.metamatrix.cdk.api.TranslationUtility;
-import com.metamatrix.connector.language.IElement;
-import com.metamatrix.connector.language.IGroup;
-import com.metamatrix.connector.language.IProcedure;
-import com.metamatrix.connector.language.IQuery;
-import com.metamatrix.connector.language.ISelectSymbol;
-import com.metamatrix.connector.metadata.runtime.Element;
-import com.metamatrix.connector.metadata.runtime.Group;
-import com.metamatrix.connector.metadata.runtime.Parameter;
-import com.metamatrix.connector.metadata.runtime.Procedure;
import com.metamatrix.core.util.UnitTestUtil;
/**
Modified: trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runtime/TestParams.java
===================================================================
--- trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runtime/TestParams.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runtime/TestParams.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -26,14 +26,15 @@
import java.sql.Timestamp;
import java.util.List;
+import org.teiid.connector.language.IParameter;
+import org.teiid.connector.language.IProcedure;
+import org.teiid.connector.language.IParameter.Direction;
+import org.teiid.connector.metadata.runtime.Parameter;
+import org.teiid.connector.metadata.runtime.TypeModel;
+
import junit.framework.TestCase;
import com.metamatrix.cdk.api.TranslationUtility;
-import com.metamatrix.connector.language.IParameter;
-import com.metamatrix.connector.language.IProcedure;
-import com.metamatrix.connector.language.IParameter.Direction;
-import com.metamatrix.connector.metadata.runtime.Parameter;
-import com.metamatrix.connector.metadata.runtime.TypeModel;
import com.metamatrix.core.util.UnitTestUtil;
Modified: trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runtime/TestProcedure.java
===================================================================
--- trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runtime/TestProcedure.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runtime/TestProcedure.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -25,14 +25,15 @@
import java.util.List;
import java.util.Properties;
+import org.teiid.connector.language.IProcedure;
+import org.teiid.connector.metadata.runtime.Element;
+import org.teiid.connector.metadata.runtime.Parameter;
+import org.teiid.connector.metadata.runtime.Procedure;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
+
import junit.framework.TestCase;
import com.metamatrix.cdk.api.TranslationUtility;
-import com.metamatrix.connector.language.IProcedure;
-import com.metamatrix.connector.metadata.runtime.Element;
-import com.metamatrix.connector.metadata.runtime.Parameter;
-import com.metamatrix.connector.metadata.runtime.Procedure;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
import com.metamatrix.core.util.UnitTestUtil;
/**
Modified: trunk/test-integration/src/test/java/com/metamatrix/data/visitor/util/TestCollectorVisitor.java
===================================================================
--- trunk/test-integration/src/test/java/com/metamatrix/data/visitor/util/TestCollectorVisitor.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/test-integration/src/test/java/com/metamatrix/data/visitor/util/TestCollectorVisitor.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -24,9 +24,10 @@
import java.util.*;
-import com.metamatrix.connector.language.*;
-import com.metamatrix.connector.language.ICompareCriteria.Operator;
-import com.metamatrix.connector.visitor.util.CollectorVisitor;
+import org.teiid.connector.language.*;
+import org.teiid.connector.language.ICompareCriteria.Operator;
+import org.teiid.connector.visitor.util.CollectorVisitor;
+
import com.metamatrix.dqp.internal.datamgr.language.*;
import junit.framework.TestCase;
Modified: trunk/test-integration/src/test/java/com/metamatrix/data/visitor/util/TestSQLStringVisitor.java
===================================================================
--- trunk/test-integration/src/test/java/com/metamatrix/data/visitor/util/TestSQLStringVisitor.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/test-integration/src/test/java/com/metamatrix/data/visitor/util/TestSQLStringVisitor.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -28,19 +28,20 @@
import java.util.Arrays;
import java.util.List;
+import org.teiid.connector.language.ICommand;
+import org.teiid.connector.language.IElement;
+import org.teiid.connector.language.IExpression;
+import org.teiid.connector.language.IFunction;
+import org.teiid.connector.language.IGroup;
+import org.teiid.connector.language.ILanguageObject;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
+import org.teiid.connector.visitor.util.SQLReservedWords;
+import org.teiid.connector.visitor.util.SQLStringVisitor;
+
import junit.framework.TestCase;
import com.metamatrix.cdk.unittest.FakeTranslationFactory;
import com.metamatrix.common.types.DataTypeManager;
-import com.metamatrix.connector.language.ICommand;
-import com.metamatrix.connector.language.IElement;
-import com.metamatrix.connector.language.IExpression;
-import com.metamatrix.connector.language.IFunction;
-import com.metamatrix.connector.language.IGroup;
-import com.metamatrix.connector.language.ILanguageObject;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
-import com.metamatrix.connector.visitor.util.SQLReservedWords;
-import com.metamatrix.connector.visitor.util.SQLStringVisitor;
import com.metamatrix.dqp.internal.datamgr.language.AggregateImpl;
import com.metamatrix.dqp.internal.datamgr.language.ElementImpl;
import com.metamatrix.dqp.internal.datamgr.language.FunctionImpl;
Modified: trunk/txn-jbossts/src/test/java/com/metamatrix/xa/arjuna/FakeXAConnection.java
===================================================================
--- trunk/txn-jbossts/src/test/java/com/metamatrix/xa/arjuna/FakeXAConnection.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/txn-jbossts/src/test/java/com/metamatrix/xa/arjuna/FakeXAConnection.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -24,15 +24,16 @@
import javax.transaction.xa.XAResource;
-import com.metamatrix.connector.api.ConnectorCapabilities;
-import com.metamatrix.connector.api.ConnectorException;
-import com.metamatrix.connector.api.Execution;
-import com.metamatrix.connector.api.ExecutionContext;
-import com.metamatrix.connector.basic.BasicConnection;
-import com.metamatrix.connector.language.ICommand;
-import com.metamatrix.connector.metadata.runtime.RuntimeMetadata;
-import com.metamatrix.connector.xa.api.XAConnection;
+import org.teiid.connector.api.ConnectorCapabilities;
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.Execution;
+import org.teiid.connector.api.ExecutionContext;
+import org.teiid.connector.basic.BasicConnection;
+import org.teiid.connector.language.ICommand;
+import org.teiid.connector.metadata.runtime.RuntimeMetadata;
+import org.teiid.connector.xa.api.XAConnection;
+
class FakeXAConnection extends BasicConnection implements XAConnection {
String name;
boolean released = false;
Modified: trunk/txn-jbossts/src/test/java/com/metamatrix/xa/arjuna/TestArjunaRecovery.java
===================================================================
--- trunk/txn-jbossts/src/test/java/com/metamatrix/xa/arjuna/TestArjunaRecovery.java 2009-02-25 19:09:43 UTC (rev 501)
+++ trunk/txn-jbossts/src/test/java/com/metamatrix/xa/arjuna/TestArjunaRecovery.java 2009-02-25 20:18:40 UTC (rev 502)
@@ -30,12 +30,13 @@
import javax.transaction.xa.XAResource;
import javax.transaction.xa.Xid;
+import org.teiid.connector.api.ConnectorException;
+
import junit.framework.TestCase;
import com.arjuna.ats.arjuna.common.Configuration;
import com.arjuna.ats.arjuna.recovery.RecoveryConfiguration;
import com.metamatrix.common.xa.MMXid;
-import com.metamatrix.connector.api.ConnectorException;
import com.metamatrix.dqp.internal.transaction.TransactionProvider;
import com.metamatrix.dqp.service.TransactionService;
15 years, 10 months
- 1
- 0
teiid SVN: r501 - in trunk: connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc and 1 other directories.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2009-02-25 14:09:43 -0500 (Wed, 25 Feb 2009)
New Revision: 501
Modified:
trunk/common-core/src/test/java/com/metamatrix/common/util/TestPropertiesUtils.java
trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/JDBCConnector.java
trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/TestJDBCConnector.java
Log:
TEIID-164 fixes from rewiring integration tests
Modified: trunk/common-core/src/test/java/com/metamatrix/common/util/TestPropertiesUtils.java
===================================================================
--- trunk/common-core/src/test/java/com/metamatrix/common/util/TestPropertiesUtils.java 2009-02-25 18:27:26 UTC (rev 500)
+++ trunk/common-core/src/test/java/com/metamatrix/common/util/TestPropertiesUtils.java 2009-02-25 19:09:43 UTC (rev 501)
@@ -24,6 +24,7 @@
import java.io.File;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collections;
import java.util.Enumeration;
import java.util.HashMap;
@@ -670,4 +671,61 @@
assertEquals("Property 'x' with value 'y' is not a valid Integer.", e.getMessage());
}
}
+
+ static class Bean {
+ private int prop;
+ private String prop1;
+ private double prop2;
+ private List<String> prop3;
+
+ public int getProp() {
+ return prop;
+ }
+ public void setProp(int prop) {
+ this.prop = prop;
+ }
+ public String getProp1() {
+ return prop1;
+ }
+ public void setProp1(String prop1) {
+ this.prop1 = prop1;
+ }
+ public double getProp2() {
+ return prop2;
+ }
+ public void setProp2(double prop2) {
+ this.prop2 = prop2;
+ }
+ public List<String> getProp3() {
+ return prop3;
+ }
+ public void setProp3(List<String> prop3) {
+ this.prop3 = prop3;
+ }
+ }
+
+ public void testSetBeanProperties() {
+ Bean bean = new Bean();
+ Properties p = new Properties();
+ p.setProperty("prop", "0");
+ p.setProperty("prop1", "1");
+ p.setProperty("prop2", "2");
+ p.setProperty("prop3", "3");
+
+ PropertiesUtils.setBeanProperties(bean, p, null);
+
+ assertEquals(0, bean.getProp());
+ assertEquals("1", bean.getProp1());
+ assertEquals(2d, bean.getProp2());
+ assertEquals(Arrays.asList("3"), bean.getProp3());
+
+ p.setProperty("prop", "?");
+
+ try {
+ PropertiesUtils.setBeanProperties(bean, p, null);
+ fail("expected exception");
+ } catch (InvalidPropertyException e) {
+
+ }
+ }
}
Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/JDBCConnector.java
===================================================================
--- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/JDBCConnector.java 2009-02-25 18:27:26 UTC (rev 500)
+++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/JDBCConnector.java 2009-02-25 19:09:43 UTC (rev 501)
@@ -200,8 +200,13 @@
} catch (SQLException e) {
throw new ConnectorException(e);
}
- return new JDBCSourceConnection(conn, this.environment, sqlTranslator);
+ return createJDBCSourceConnection(conn, this.environment, this.sqlTranslator);
}
+
+ public Connection createJDBCSourceConnection(java.sql.Connection conn, ConnectorEnvironment env, Translator trans)
+ throws ConnectorException {
+ return new JDBCSourceConnection(conn, env, trans);
+ }
@Override
public XAConnection getXAConnection(
@@ -221,12 +226,18 @@
}
java.sql.Connection c = conn.getConnection();
setDefaultTransactionIsolationLevel(c);
- return new JDBCSourceXAConnection(c, conn, this.environment, sqlTranslator);
+ return createJDBCSourceXAConnection(conn, c, this.environment, this.sqlTranslator);
} catch (SQLException e) {
throw new ConnectorException(e);
}
}
+ public XAConnection createJDBCSourceXAConnection(
+ javax.sql.XAConnection conn, java.sql.Connection c, ConnectorEnvironment env, Translator trans)
+ throws ConnectorException, SQLException {
+ return new JDBCSourceXAConnection(c, conn, env, trans);
+ }
+
@Override
public ConnectorCapabilities getCapabilities() {
return capabilities;
Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/TestJDBCConnector.java
===================================================================
--- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/TestJDBCConnector.java 2009-02-25 18:27:26 UTC (rev 500)
+++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/TestJDBCConnector.java 2009-02-25 19:09:43 UTC (rev 501)
@@ -24,10 +24,12 @@
import java.util.Properties;
-import org.junit.Assert;
+import static org.junit.Assert.*;
import org.junit.Test;
+import org.teiid.connector.jdbc.xa.XAJDBCPropertyNames;
import com.metamatrix.connector.api.ConnectorCapabilities;
+import com.metamatrix.connector.api.ConnectorException;
public class TestJDBCConnector {
@@ -37,7 +39,7 @@
connProps.setProperty(JDBCPropertyNames.EXT_CAPABILITY_CLASS, SimpleCapabilities.class.getName());
ConnectorCapabilities caps = JDBCConnector.createCapabilities(connProps, this.getClass().getClassLoader());
int maxIn = caps.getMaxInCriteriaSize();
- Assert.assertEquals(expected, maxIn);
+ assertEquals(expected, maxIn);
}
@Test
@@ -54,4 +56,18 @@
public void test3() throws Exception {
helpTestMaxIn(1, 1);
}
+
+ @Test
+ public void testParseUrl() throws ConnectorException {
+ String urlWithEmptyProp = "jdbc:mmx:db2://aHost:aPort;DatabaseName=DB2_DataBase;CollectionID=aCollectionID;PackageName=aPackageName;BogusProp=aBogusProp;UnEmptyProp=;"; //$NON-NLS-1$
+ Properties props = new Properties();
+ JDBCConnector.parseURL(urlWithEmptyProp, props);
+
+ assertEquals("aPort", props.getProperty(XAJDBCPropertyNames.PORT_NUMBER));
+ assertEquals("aHost", props.getProperty(XAJDBCPropertyNames.SERVER_NAME));
+ assertEquals("XADS_aHost_null", props.getProperty(XAJDBCPropertyNames.DATASOURCE_NAME));
+ assertEquals("aBogusProp", props.getProperty("bogusprop"));
+ assertNull(props.getProperty("unemptyprop"));
+ }
+
}
15 years, 10 months
- 1
- 0
teiid SVN: r500 - in trunk/connectors/connector-jdbc/src: test/java and 1 other directory.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2009-02-25 13:27:26 -0500 (Wed, 25 Feb 2009)
New Revision: 500
Removed:
trunk/connectors/connector-jdbc/src/main/java/com/
trunk/connectors/connector-jdbc/src/test/java/com/
Log:
TEIID-164 fixes from rewiring integration tests
15 years, 10 months
- 1
- 0