Author: shawkins Date: 2009-05-22 14:40:57 -0400 (Fri, 22 May 2009) New Revision: 995 Added: trunk/connector-api/src/main/java/org/teiid/connector/api/ConnectorPropertyNames.java Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/api/ConnectorBindingType.java trunk/common-internal/src/main/java/com/metamatrix/common/config/model/BasicConnectorBindingType.java trunk/connector-api/src/main/java/org/teiid/connector/api/ConnectorAnnotations.java trunk/connector-api/src/main/java/org/teiid/connector/basic/BasicConnector.java trunk/connector-sdk/src/main/java/com/metamatrix/cdk/api/EnvironmentUtility.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/JDBCConnector.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/test/java/com/metamatrix/dqp/embedded/services/TestEmbeddedConfigurationService.java trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/impl/ConnectorEnvironmentImpl.java trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/impl/ConnectorManager.java trunk/engine/src/main/java/org/teiid/dqp/internal/pooling/connector/ConnectionPool.java trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/impl/TestConnectorManagerImpl.java trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/impl/TestConnectorWorkItem.java trunk/engine/src/test/java/org/teiid/dqp/internal/pooling/connector/TestPerUserPool.java trunk/server/src/main/java/com/metamatrix/server/connector/service/ConnectorService.java Log: TEIID-627 updating extension modules for connectors to be based upon the connector type classpath. also moving ConnectorPropertyNames Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/api/ConnectorBindingType.java =================================================================== --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/ConnectorBindingType.java 2009-05-22 18:31:39 UTC (rev 994) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/ConnectorBindingType.java 2009-05-22 18:40:57 UTC (rev 995) @@ -39,7 +39,7 @@ public static final String IS_XA = "IsXA"; //$NON-NLS-1$ public static final String CONNECTOR_CLASS = "ConnectorClass";//$NON-NLS-1$ public static final String MM_JAR_PROTOCOL = "extensionjar"; //$NON-NLS-1$ - public static final String CONNECTOR_CLASSPATH = "ConnectorClassPath"; //$NON-NLS-1$ + public static final String CONNECTOR_TYPE_CLASSPATH = "ConnectorTypeClassPath"; //$NON-NLS-1$ } /** Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/model/BasicConnectorBindingType.java =================================================================== --- trunk/common-internal/src/main/java/com/metamatrix/common/config/model/BasicConnectorBindingType.java 2009-05-22 18:31:39 UTC (rev 994) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/model/BasicConnectorBindingType.java 2009-05-22 18:40:57 UTC (rev 995) @@ -83,7 +83,7 @@ */ public String[] getExtensionModules() { ArrayList modules = new ArrayList(); - String classPath = getDefaultValue(Attributes.CONNECTOR_CLASSPATH); + String classPath = getDefaultValue(Attributes.CONNECTOR_TYPE_CLASSPATH); if (classPath != null) { StringTokenizer st = new StringTokenizer(classPath, ";"); //$NON-NLS-1$ while (st.hasMoreTokens()) { Modified: trunk/connector-api/src/main/java/org/teiid/connector/api/ConnectorAnnotations.java =================================================================== --- trunk/connector-api/src/main/java/org/teiid/connector/api/ConnectorAnnotations.java 2009-05-22 18:31:39 UTC (rev 994) +++ trunk/connector-api/src/main/java/org/teiid/connector/api/ConnectorAnnotations.java 2009-05-22 18:40:57 UTC (rev 995) @@ -27,7 +27,6 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.teiid.connector.internal.ConnectorPropertyNames; public class ConnectorAnnotations { Copied: trunk/connector-api/src/main/java/org/teiid/connector/api/ConnectorPropertyNames.java (from rev 992, trunk/connector-api/src/main/java/org/teiid/connector/internal/ConnectorPropertyNames.java) =================================================================== --- trunk/connector-api/src/main/java/org/teiid/connector/api/ConnectorPropertyNames.java (rev 0) +++ trunk/connector-api/src/main/java/org/teiid/connector/api/ConnectorPropertyNames.java 2009-05-22 18:40:57 UTC (rev 995) @@ -0,0 +1,114 @@ +/* + * 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.api; + +public class ConnectorPropertyNames { + + /** + * The property that specifies the class name of the custom connector class + * that connects to the data source. This property is required. + */ + public static final String CONNECTOR_CLASS = "ConnectorClass"; //$NON-NLS-1$ + + /** + * The environment property name whose value defines the maximum number + * of processor threads. This property is required. + */ + public static final String MAX_CONNECTIONS = "ConnectorMaxConnections"; //$NON-NLS-1$ + + /** + * This property can be used to specify the maximum number of rows to be returned + * from the datasource of this connector. The connector should stop adding records + * to the ResultsCollector when the rows collected is equal to this value. This + * property is optional and if no value is specified, we should return all the rows. + * @since 3.0 + */ + public static final String MAX_RESULT_ROWS = "MaxResultRows"; //$NON-NLS-1$ + + /** + * This property can be used to specify whether or not an exception should be thrown + * if the number of rows for a query exceeds the value of MAX_RESULT_ROWS. If this + * flag is set to false, then no more than MAX_RESULT_ROWS values will be returned but + * no exception will be thrown. + */ + public static final String EXCEPTION_ON_MAX_ROWS = "ExceptionOnMaxRows"; //$NON-NLS-1$ + + /** + * This property can be used to specify whether or not Connection Pooling is enabled. + * If this flag is set to false, then connection pooling is disabled. + */ + public static final String CONNECTION_POOL_ENABLED = "ConnectionPoolEnabled"; //$NON-NLS-1$ + + /** + * The environment property used to identify a <i>type</i> of connector binding. + * This property is required and is a component used to uniquely identify a + * connector instance. + * @since 4.0 + */ + public static final String CONNECTOR_BINDING_NAME = "ConnectorBindingName"; //$NON-NLS-1$ + + /** + * The environment property used to identify a routing ID. This value should + * be used to locate this particular connector from the DQP. + * @since 4.0 + */ + public static final String CONNECTOR_ID = "ConnectorID"; //$NON-NLS-1$ + + /** + * The name of the VM where the connector is running on. + * @since 4.0 + */ + public static final String CONNECTOR_VM_NAME = "ConnectorVMName"; //$NON-NLS-1$ + + /** + * Indicates whether the connector represents a pooled resource. If it does, then + * synchronous workers will be used. + */ + public static final String SYNCH_WORKERS = "SynchWorkers"; //$NON-NLS-1$ + + public static final String USING_CUSTOM_CLASSLOADER = "UsingCustomClassloader"; //$NON-NLS-1$ + + public static final String CONNECTOR_CLASSPATH = "ConnectorClassPath"; //$NON-NLS-1$ + + public static final String CONNECTOR_TYPE_CLASSPATH = "ConnectorTypeClassPath"; //$NON-NLS-1$ + + public static final String IS_XA = "IsXA"; //$NON-NLS-1$ + + public static final String USE_CREDENTIALS_MAP = "UseCredentialMap"; //$NON-NLS-1$ + + public static final String ADMIN_CONNECTIONS_ALLOWED = "AdminConnectionsAllowed"; //$NON-NLS-1$ + + public static final String USE_RESULTSET_CACHE = "ResultSetCacheEnabled"; //$NON-NLS-1$ + public static final String MAX_RESULTSET_CACHE_SIZE = "ResultSetCacheMaxSize"; //$NON-NLS-1$ + public static final String MAX_RESULTSET_CACHE_AGE = "ResultSetCacheMaxAge"; //$NON-NLS-1$ + public static final String RESULTSET_CACHE_SCOPE = "ResultSetCacheScope"; //$NON-NLS-1$ + + /** + * This property can be used to bypass the normal logic that throws an exception when a command + * is about to be executed by a non-XA compatible connector, but there is a global transaction. + */ + public static final String IS_IMMUTABLE = "Immutable"; //$NON-NLS-1$ + + public static final String USE_POST_DELEGATION = "UsePostDelegation"; //$NON-NLS-1$ + +} Property changes on: trunk/connector-api/src/main/java/org/teiid/connector/api/ConnectorPropertyNames.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:mergeinfo + Modified: trunk/connector-api/src/main/java/org/teiid/connector/basic/BasicConnector.java =================================================================== --- trunk/connector-api/src/main/java/org/teiid/connector/basic/BasicConnector.java 2009-05-22 18:31:39 UTC (rev 994) +++ trunk/connector-api/src/main/java/org/teiid/connector/basic/BasicConnector.java 2009-05-22 18:40:57 UTC (rev 995) @@ -5,11 +5,11 @@ import org.teiid.connector.api.ConnectorEnvironment; import org.teiid.connector.api.ConnectorException; import org.teiid.connector.api.ConnectorIdentity; +import org.teiid.connector.api.ConnectorPropertyNames; import org.teiid.connector.api.CredentialMap; import org.teiid.connector.api.ExecutionContext; import org.teiid.connector.api.MappedUserIdentity; import org.teiid.connector.api.SingleIdentity; -import org.teiid.connector.internal.ConnectorPropertyNames; import com.metamatrix.common.util.PropertiesUtils; 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-05-22 18:31:39 UTC (rev 994) +++ trunk/connector-sdk/src/main/java/com/metamatrix/cdk/api/EnvironmentUtility.java 2009-05-22 18:40:57 UTC (rev 995) @@ -27,8 +27,8 @@ import org.teiid.connector.api.ConnectorEnvironment; import org.teiid.connector.api.ConnectorLogger; +import org.teiid.connector.api.ConnectorPropertyNames; import org.teiid.connector.api.ExecutionContext; -import org.teiid.connector.internal.ConnectorPropertyNames; import org.teiid.dqp.internal.datamgr.impl.ConnectorEnvironmentImpl; import org.teiid.dqp.internal.datamgr.impl.ExecutionContextImpl; 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-05-22 18:31:39 UTC (rev 994) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/JDBCBaseExecution.java 2009-05-22 18:40:57 UTC (rev 995) @@ -34,9 +34,9 @@ import org.teiid.connector.api.ConnectorException; import org.teiid.connector.api.ConnectorIdentity; import org.teiid.connector.api.ConnectorLogger; +import org.teiid.connector.api.ConnectorPropertyNames; import org.teiid.connector.api.ExecutionContext; import org.teiid.connector.basic.BasicExecution; -import org.teiid.connector.internal.ConnectorPropertyNames; import org.teiid.connector.jdbc.translator.TranslatedCommand; import org.teiid.connector.jdbc.translator.Translator; import org.teiid.connector.language.ICommand; 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-05-22 18:31:39 UTC (rev 994) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/JDBCConnector.java 2009-05-22 18:40:57 UTC (rev 995) @@ -39,12 +39,12 @@ import org.teiid.connector.api.ConnectorEnvironment; import org.teiid.connector.api.ConnectorException; import org.teiid.connector.api.ConnectorLogger; +import org.teiid.connector.api.ConnectorPropertyNames; 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.xa.api.TransactionContext; import org.teiid.connector.xa.api.XAConnection; 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-05-22 18:31:39 UTC (rev 994) +++ trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/DefaultIndexConnectorBinding.java 2009-05-22 18:40:57 UTC (rev 995) @@ -25,7 +25,7 @@ import java.util.Date; import java.util.Properties; -import org.teiid.connector.internal.ConnectorPropertyNames; +import org.teiid.connector.api.ConnectorPropertyNames; import com.metamatrix.common.config.api.ComponentTypeID; import com.metamatrix.common.config.api.ConfigurationID; 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-05-22 18:31:39 UTC (rev 994) +++ trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedDataService.java 2009-05-22 18:40:57 UTC (rev 995) @@ -32,7 +32,7 @@ import java.util.concurrent.atomic.AtomicInteger; import org.teiid.connector.api.ConnectorException; -import org.teiid.connector.internal.ConnectorPropertyNames; +import org.teiid.connector.api.ConnectorPropertyNames; import org.teiid.dqp.internal.datamgr.impl.ConnectorManager; import org.teiid.dqp.internal.process.DQPWorkContext; Modified: trunk/embedded/src/test/java/com/metamatrix/dqp/embedded/services/TestEmbeddedConfigurationService.java =================================================================== --- trunk/embedded/src/test/java/com/metamatrix/dqp/embedded/services/TestEmbeddedConfigurationService.java 2009-05-22 18:31:39 UTC (rev 994) +++ trunk/embedded/src/test/java/com/metamatrix/dqp/embedded/services/TestEmbeddedConfigurationService.java 2009-05-22 18:40:57 UTC (rev 995) @@ -34,7 +34,7 @@ import junit.framework.TestCase; -import org.teiid.connector.internal.ConnectorPropertyNames; +import org.teiid.connector.api.ConnectorPropertyNames; import com.metamatrix.api.exception.MetaMatrixComponentException; import com.metamatrix.common.application.ApplicationEnvironment; Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/impl/ConnectorEnvironmentImpl.java =================================================================== --- trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/impl/ConnectorEnvironmentImpl.java 2009-05-22 18:31:39 UTC (rev 994) +++ trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/impl/ConnectorEnvironmentImpl.java 2009-05-22 18:40:57 UTC (rev 995) @@ -33,8 +33,8 @@ import org.teiid.connector.api.CacheScope; import org.teiid.connector.api.ConnectorEnvironment; import org.teiid.connector.api.ConnectorLogger; +import org.teiid.connector.api.ConnectorPropertyNames; import org.teiid.connector.api.TypeFacility; -import org.teiid.connector.internal.ConnectorPropertyNames; import org.teiid.connector.language.ILanguageFactory; import org.teiid.dqp.internal.cache.DQPContextCache; import org.teiid.dqp.internal.datamgr.language.LanguageFactoryImpl; Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/impl/ConnectorManager.java =================================================================== --- trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/impl/ConnectorManager.java 2009-05-22 18:31:39 UTC (rev 994) +++ trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/impl/ConnectorManager.java 2009-05-22 18:40:57 UTC (rev 995) @@ -45,10 +45,10 @@ import org.teiid.connector.api.ConnectorCapabilities; import org.teiid.connector.api.ConnectorEnvironment; import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorPropertyNames; 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 org.teiid.dqp.internal.cache.DQPContextCache; Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/pooling/connector/ConnectionPool.java =================================================================== --- trunk/engine/src/main/java/org/teiid/dqp/internal/pooling/connector/ConnectionPool.java 2009-05-22 18:31:39 UTC (rev 994) +++ trunk/engine/src/main/java/org/teiid/dqp/internal/pooling/connector/ConnectionPool.java 2009-05-22 18:40:57 UTC (rev 995) @@ -40,9 +40,9 @@ import org.teiid.connector.api.ConnectorEnvironment; import org.teiid.connector.api.ConnectorException; import org.teiid.connector.api.ConnectorIdentity; +import org.teiid.connector.api.ConnectorPropertyNames; import org.teiid.connector.api.ExecutionContext; import org.teiid.connector.api.SingleIdentity; -import org.teiid.connector.internal.ConnectorPropertyNames; import org.teiid.connector.xa.api.TransactionContext; import org.teiid.connector.xa.api.XAConnector; import org.teiid.dqp.internal.datamgr.impl.ConnectorWrapper; Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/impl/TestConnectorManagerImpl.java =================================================================== --- trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/impl/TestConnectorManagerImpl.java 2009-05-22 18:31:39 UTC (rev 994) +++ trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/impl/TestConnectorManagerImpl.java 2009-05-22 18:40:57 UTC (rev 995) @@ -35,7 +35,7 @@ import org.junit.Test; import org.mockito.Mockito; -import org.teiid.connector.internal.ConnectorPropertyNames; +import org.teiid.connector.api.ConnectorPropertyNames; import org.teiid.dqp.internal.cache.ResultSetCache; import org.teiid.dqp.internal.datamgr.impl.TestConnectorWorkItem.QueueResultsReceiver; import org.teiid.dqp.internal.pooling.connector.FakeSourceConnectionFactory; Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/impl/TestConnectorWorkItem.java =================================================================== --- trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/impl/TestConnectorWorkItem.java 2009-05-22 18:31:39 UTC (rev 994) +++ trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/impl/TestConnectorWorkItem.java 2009-05-22 18:40:57 UTC (rev 995) @@ -33,8 +33,8 @@ import junit.framework.TestCase; import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorPropertyNames; import org.teiid.connector.api.ProcedureExecution; -import org.teiid.connector.internal.ConnectorPropertyNames; import org.teiid.connector.language.IProcedure; import org.teiid.connector.xa.api.TransactionContext; import org.teiid.dqp.internal.datamgr.language.LanguageBridgeFactory; Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/pooling/connector/TestPerUserPool.java =================================================================== --- trunk/engine/src/test/java/org/teiid/dqp/internal/pooling/connector/TestPerUserPool.java 2009-05-22 18:31:39 UTC (rev 994) +++ trunk/engine/src/test/java/org/teiid/dqp/internal/pooling/connector/TestPerUserPool.java 2009-05-22 18:40:57 UTC (rev 995) @@ -34,11 +34,11 @@ import org.teiid.connector.api.ConnectorEnvironment; import org.teiid.connector.api.ConnectorException; import org.teiid.connector.api.ConnectorLogger; +import org.teiid.connector.api.ConnectorPropertyNames; 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 org.teiid.dqp.internal.datamgr.impl.ConnectorEnvironmentImpl; import org.teiid.dqp.internal.datamgr.impl.ExecutionContextImpl; 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-05-22 18:31:39 UTC (rev 994) +++ trunk/server/src/main/java/com/metamatrix/server/connector/service/ConnectorService.java 2009-05-22 18:40:57 UTC (rev 995) @@ -39,7 +39,7 @@ import java.util.Properties; import org.teiid.connector.api.ConnectorException; -import org.teiid.connector.internal.ConnectorPropertyNames; +import org.teiid.connector.api.ConnectorPropertyNames; import org.teiid.dqp.internal.datamgr.impl.ConnectorManager; import org.teiid.dqp.internal.process.DQPCore; import org.teiid.dqp.internal.process.DQPWorkContext;