From ebf65c848558cf51a6f6b402bbf285257d5374ba Mon Sep 17 00:00:00 2001 From: shawkins Date: Mon, 2 Nov 2015 08:45:39 -0500 Subject: [PATCH] TEIID-3797 using the term local consistently --- .../bin/scripts/teiid-domain-mode-install.cli | 2 +- .../scripts/teiid-standalone-mode-install.cli | 2 +- .../docs/teiid/teiid-releasenotes.html | 141 +++++++++--------- .../configuration/standalone-teiid.xml | 2 +- .../src/main/java/org/teiid/jdbc/JDBCURL.java | 4 +- ...EmbeddedProfile.java => LocalProfile.java} | 2 +- .../java/org/teiid/jdbc/ModuleHelper.java | 2 +- .../java/org/teiid/jdbc/StatementImpl.java | 2 +- .../main/java/org/teiid/jdbc/TeiidDriver.java | 12 +- .../dqp/internal/process/DQPWorkContext.java | 8 +- .../org/teiid/query/util/CommandContext.java | 6 +- .../org/teiid/jboss/IntegrationPlugin.java | 1 - .../org/teiid/jboss/TeiidServiceNames.java | 6 +- .../java/org/teiid/jboss/TransportAdd.java | 9 +- .../java/org/teiid/jboss/TransportRemove.java | 4 +- .../org/teiid/jboss/TransportService.java | 12 +- .../resources/org/teiid/jboss/i18n.properties | 7 +- .../java/org/teiid/odata/LocalClient.java | 10 +- .../org/teiid/olingo/service/LocalClient.java | 10 +- .../org/teiid/runtime/EmbeddedServer.java | 6 +- .../transport/LocalServerConnection.java | 8 +- 21 files changed, 127 insertions(+), 129 deletions(-) rename client/src/main/java/org/teiid/jdbc/{EmbeddedProfile.java => LocalProfile.java} (97%) diff --git a/build/kits/jboss-as7/overlay/bin/scripts/teiid-domain-mode-install.cli b/build/kits/jboss-as7/overlay/bin/scripts/teiid-domain-mode-install.cli index 5e7f4c2a2b..aecc3beaa4 100644 --- a/build/kits/jboss-as7/overlay/bin/scripts/teiid-domain-mode-install.cli +++ b/build/kits/jboss-as7/overlay/bin/scripts/teiid-domain-mode-install.cli @@ -37,7 +37,7 @@ connect /profile=ha/subsystem=threads/unbounded-queue-thread-pool=teiid-async:add(max-threads=4) /profile=ha/subsystem=teiid:add(async-thread-pool=teiid-async, distributed-cache-jgroups-stack=udp, resultset-cache-infinispan-container=teiid-cache, preparedplan-cache-infinispan-container=teiid-cache, policy-decider-module=org.jboss.teiid) -/profile=ha/subsystem=teiid/transport=embedded:add() +/profile=ha/subsystem=teiid/transport=local:add() /profile=ha/subsystem=teiid/transport=odata:add(authentication-security-domain=teiid-security) /profile=ha/subsystem=teiid/transport=jdbc:add(protocol=teiid, socket-binding=teiid-jdbc, authentication-security-domain=teiid-security) /profile=ha/subsystem=teiid/transport=odbc:add(protocol=pg, socket-binding=teiid-odbc, authentication-security-domain=teiid-security, ssl-mode=disabled) diff --git a/build/kits/jboss-as7/overlay/bin/scripts/teiid-standalone-mode-install.cli b/build/kits/jboss-as7/overlay/bin/scripts/teiid-standalone-mode-install.cli index ee7a73f4bc..a38a6dab6d 100644 --- a/build/kits/jboss-as7/overlay/bin/scripts/teiid-standalone-mode-install.cli +++ b/build/kits/jboss-as7/overlay/bin/scripts/teiid-standalone-mode-install.cli @@ -33,7 +33,7 @@ connect /subsystem=threads/unbounded-queue-thread-pool=teiid-async:add(max-threads=4) /subsystem=teiid:add(async-thread-pool=teiid-async, resultset-cache-infinispan-container=teiid-cache, preparedplan-cache-infinispan-container=teiid-cache, policy-decider-module=org.jboss.teiid) -/subsystem=teiid/transport=embedded:add() +/subsystem=teiid/transport=local:add() /subsystem=teiid/transport=odata:add(authentication-security-domain=teiid-security) /subsystem=teiid/transport=jdbc:add(protocol=teiid, socket-binding=teiid-jdbc, authentication-security-domain=teiid-security) /subsystem=teiid/transport=odbc:add(protocol=pg, socket-binding=teiid-odbc, authentication-security-domain=teiid-security, ssl-mode=disabled) diff --git a/build/kits/jboss-as7/overlay/docs/teiid/teiid-releasenotes.html b/build/kits/jboss-as7/overlay/docs/teiid/teiid-releasenotes.html index 3720517db5..054f1ad0fd 100644 --- a/build/kits/jboss-as7/overlay/docs/teiid/teiid-releasenotes.html +++ b/build/kits/jboss-as7/overlay/docs/teiid/teiid-releasenotes.html @@ -25,83 +25,83 @@

Overview

Highlights

Compatibility Issues

from 8.x

from 8.11

from 8.10

from 8.9

from 8.6

from 8.5

from 8.4

from 8.3

from 8.2

from 8.1

from 8.0

@@ -146,11 +146,11 @@

from 8.0

  • Datatype default values have been corrected for Teiid built-in types. All datatypes are now nullable by default, only character string types are case sensitive, numeric types have radix 10, and length/precision/scale have been set appropriately.
  • pg catalog and dynamic vdb created metadata will use a generated Teiid id rather than a random UUID.
  • transport ssl config no longer uses the enabled attribute. Use mode=disabled to disable the usage of encryption. -
  • TEIID-2105 If a MetadataRepository throws a RuntimeException during load, that will be treated as a non-recoverable error and the VDB will have a FAILED status. -
  • TEIID-2105 It was an undocumented behavior that is a source did not specify a jndi connection that "java:/name" would be assumed. That is no longer the case. It the source needs a connection, then one must be specified. -
  • TEIID-2127 if ExecutionFactory.isSourceRequired returns true (the default) then not obtaining a connection will for an Execution will result in an error. If an ExecutionFactory does not use a source, then no connection-jndi-name should be +
  • TEIID-2105 If a MetadataRepository throws a RuntimeException during load, that will be treated as a non-recoverable error and the VDB will have a FAILED status. +
  • TEIID-2105 It was an undocumented behavior that is a source did not specify a jndi connection that "java:/name" would be assumed. That is no longer the case. It the source needs a connection, then one must be specified. +
  • TEIID-2127 if ExecutionFactory.isSourceRequired returns true (the default) then not obtaining a connection will for an Execution will result in an error. If an ExecutionFactory does not use a source, then no connection-jndi-name should be specified and isSourceRequired should return false (see setSourceRequired). If isSourceRequired returns false and a connection-jndi-name is specified, then Teiid will still attempt to obtain a connection, but no exception will be thrown if a connection isn't available. -
  • TEIID-2138 the odbc layer will report standard_conforming_strings as on, rather than off to better reflect the string literal handling of Teiid. +
  • TEIID-2138 the odbc layer will report standard_conforming_strings as on, rather than off to better reflect the string literal handling of Teiid.

    Configuration Issues

    @@ -159,39 +159,40 @@

    Configuration Issues

    from 8.x

    from 8.11

    from 8.9

    from 8.8

    from 8.4

    from 8.3

    from 8.1

    @@ -202,8 +203,8 @@

    from 8.1

    from 8.1

    @@ -214,16 +215,16 @@

    from 8.0

    Other Issues

    Thirdparty Library Updates

    diff --git a/build/kits/jboss-as7/overlay/standalone/configuration/standalone-teiid.xml b/build/kits/jboss-as7/overlay/standalone/configuration/standalone-teiid.xml index daf65c4949..a196b87ec0 100644 --- a/build/kits/jboss-as7/overlay/standalone/configuration/standalone-teiid.xml +++ b/build/kits/jboss-as7/overlay/standalone/configuration/standalone-teiid.xml @@ -359,7 +359,7 @@ - + diff --git a/client/src/main/java/org/teiid/jdbc/JDBCURL.java b/client/src/main/java/org/teiid/jdbc/JDBCURL.java index 0ed52b01ab..072a63b632 100644 --- a/client/src/main/java/org/teiid/jdbc/JDBCURL.java +++ b/client/src/main/java/org/teiid/jdbc/JDBCURL.java @@ -62,7 +62,7 @@ private static Map buildProps() { ExecutionProperties.PROP_FETCH_SIZE, ExecutionProperties.PROP_XML_FORMAT, ExecutionProperties.PROP_XML_VALIDATION, - EmbeddedProfile.USE_CALLING_THREAD, + LocalProfile.USE_CALLING_THREAD, ExecutionProperties.DISABLE_LOCAL_TRANSACTIONS, ExecutionProperties.JDBC4COLUMNNAMEANDLABELSEMANTICS}) { result.put(key, key); @@ -80,7 +80,7 @@ private static Map getKnownProperties() { BaseDataSource.VDB_VERSION, BaseDataSource.USER_NAME, BaseDataSource.PASSWORD, - EmbeddedProfile.WAIT_FOR_LOAD, + LocalProfile.WAIT_FOR_LOAD, TeiidURL.CONNECTION.AUTO_FAILOVER, TeiidURL.CONNECTION.DISCOVERY_STRATEGY, TeiidURL.CONNECTION.PASSTHROUGH_AUTHENTICATION, diff --git a/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java b/client/src/main/java/org/teiid/jdbc/LocalProfile.java similarity index 97% rename from client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java rename to client/src/main/java/org/teiid/jdbc/LocalProfile.java index 0cc6e9da95..a3fddd6776 100644 --- a/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java +++ b/client/src/main/java/org/teiid/jdbc/LocalProfile.java @@ -30,7 +30,7 @@ import org.teiid.net.ServerConnection; -public class EmbeddedProfile implements ConnectionProfile { +public class LocalProfile implements ConnectionProfile { public static final String USE_CALLING_THREAD = "useCallingThread"; //$NON-NLS-1$ public static final String WAIT_FOR_LOAD = "waitForLoad"; //$NON-NLS-1$ diff --git a/client/src/main/java/org/teiid/jdbc/ModuleHelper.java b/client/src/main/java/org/teiid/jdbc/ModuleHelper.java index 66d2009cec..d237b0ebc7 100644 --- a/client/src/main/java/org/teiid/jdbc/ModuleHelper.java +++ b/client/src/main/java/org/teiid/jdbc/ModuleHelper.java @@ -50,7 +50,7 @@ static ServerConnection createFromModule(Properties info) } final Module module = callerModuleLoader.loadModule(ModuleIdentifier.create("org.jboss.teiid")); //$NON-NLS-1$ Thread.currentThread().setContextClassLoader(module.getClassLoader()); - return (ServerConnection)ReflectionHelper.create("org.teiid.transport.LocalServerConnection", Arrays.asList(info, PropertiesUtils.getBooleanProperty(info, EmbeddedProfile.USE_CALLING_THREAD, true)), Thread.currentThread().getContextClassLoader()); //$NON-NLS-1$ + return (ServerConnection)ReflectionHelper.create("org.teiid.transport.LocalServerConnection", Arrays.asList(info, PropertiesUtils.getBooleanProperty(info, LocalProfile.USE_CALLING_THREAD, true)), Thread.currentThread().getContextClassLoader()); //$NON-NLS-1$ } catch (ModuleLoadException e) { throw new ConnectionException(JDBCPlugin.Event.TEIID20008, e, JDBCPlugin.Util.gs(JDBCPlugin.Event.TEIID20008)); } finally { diff --git a/client/src/main/java/org/teiid/jdbc/StatementImpl.java b/client/src/main/java/org/teiid/jdbc/StatementImpl.java index 37ae66d9f1..1c203cdaf4 100644 --- a/client/src/main/java/org/teiid/jdbc/StatementImpl.java +++ b/client/src/main/java/org/teiid/jdbc/StatementImpl.java @@ -681,7 +681,7 @@ boolean useCallingThread() throws SQLException { if (this.getConnection().getServerConnection() == null || !this.getConnection().getServerConnection().isLocal()) { return false; } - String useCallingThread = getExecutionProperty(EmbeddedProfile.USE_CALLING_THREAD); + String useCallingThread = getExecutionProperty(LocalProfile.USE_CALLING_THREAD); return (useCallingThread == null || Boolean.valueOf(useCallingThread)); } diff --git a/client/src/main/java/org/teiid/jdbc/TeiidDriver.java b/client/src/main/java/org/teiid/jdbc/TeiidDriver.java index 3d80ec833e..635680355f 100644 --- a/client/src/main/java/org/teiid/jdbc/TeiidDriver.java +++ b/client/src/main/java/org/teiid/jdbc/TeiidDriver.java @@ -70,7 +70,7 @@ public class TeiidDriver implements Driver { } private ConnectionProfile socketProfile = new SocketProfile(); - private ConnectionProfile embeddedProfile; + private ConnectionProfile localProfile; public static TeiidDriver getInstance() { return INSTANCE; @@ -94,15 +94,15 @@ public ConnectionImpl connect(String url, Properties info) throws SQLException { try { if (conn == ConnectionType.Embedded) { - if (embeddedProfile == null) { + if (localProfile == null) { try { getClass().getClassLoader().loadClass("org.jboss.modules.Module"); //$NON-NLS-1$ } catch(ClassNotFoundException e) { throw new TeiidSQLException(JDBCPlugin.Util.gs("module_load_failed")); //$NON-NLS-1$ } - embeddedProfile = new EmbeddedProfile(); + localProfile = new LocalProfile(); } - myConnection = embeddedProfile.connect(url, info); + myConnection = localProfile.connect(url, info); } else { myConnection = socketProfile.connect(url, info); } @@ -118,8 +118,8 @@ public ConnectionImpl connect(String url, Properties info) throws SQLException { return myConnection; } - public void setEmbeddedProfile(ConnectionProfile embeddedProfile) { - this.embeddedProfile = embeddedProfile; + public void setLocalProfile(ConnectionProfile embeddedProfile) { + this.localProfile = embeddedProfile; } public void setSocketProfile(ConnectionProfile socketProfile) { diff --git a/engine/src/main/java/org/teiid/dqp/internal/process/DQPWorkContext.java b/engine/src/main/java/org/teiid/dqp/internal/process/DQPWorkContext.java index d9b2abfc5b..7e30e431bc 100644 --- a/engine/src/main/java/org/teiid/dqp/internal/process/DQPWorkContext.java +++ b/engine/src/main/java/org/teiid/dqp/internal/process/DQPWorkContext.java @@ -46,7 +46,7 @@ import org.teiid.client.security.SessionToken; import org.teiid.core.util.PropertiesUtils; import org.teiid.dqp.message.RequestID; -import org.teiid.jdbc.EmbeddedProfile; +import org.teiid.jdbc.LocalProfile; import org.teiid.logging.LogManager; import org.teiid.metadata.MetadataFactory; import org.teiid.query.metadata.SystemMetadata; @@ -144,7 +144,7 @@ public static void setWorkContext(DQPWorkContext context) { private boolean admin; private MetadataFactory metadataFactory; - private transient EmbeddedProfile connectionProfile = new EmbeddedProfile(); + private transient LocalProfile connectionProfile = new LocalProfile(); public DQPWorkContext() { } @@ -359,11 +359,11 @@ public MetadataFactory getTempMetadataFactory() { return this.metadataFactory; } - public void setConnectionProfile(EmbeddedProfile connectionProfile) { + public void setConnectionProfile(LocalProfile connectionProfile) { this.connectionProfile = connectionProfile; } - public EmbeddedProfile getConnectionProfile() { + public LocalProfile getConnectionProfile() { return connectionProfile; } diff --git a/engine/src/main/java/org/teiid/query/util/CommandContext.java b/engine/src/main/java/org/teiid/query/util/CommandContext.java index 6b1002e7bd..9a98fdd72c 100644 --- a/engine/src/main/java/org/teiid/query/util/CommandContext.java +++ b/engine/src/main/java/org/teiid/query/util/CommandContext.java @@ -64,7 +64,7 @@ import org.teiid.dqp.service.TransactionContext; import org.teiid.dqp.service.TransactionService; import org.teiid.jdbc.ConnectionImpl; -import org.teiid.jdbc.EmbeddedProfile; +import org.teiid.jdbc.LocalProfile; import org.teiid.jdbc.TeiidConnection; import org.teiid.jdbc.TeiidSQLException; import org.teiid.logging.LogConstants; @@ -1052,10 +1052,10 @@ public static GlobalTableStoreImpl removeSessionScopedStore(SessionMetadata sess @Override public TeiidConnection getConnection() throws TeiidSQLException { - EmbeddedProfile ep = getDQPWorkContext().getConnectionProfile(); + LocalProfile ep = getDQPWorkContext().getConnectionProfile(); //TODO: this is problematic as the client properties are not conveyed Properties info = new Properties(); - info.put(EmbeddedProfile.DQP_WORK_CONTEXT, getDQPWorkContext()); + info.put(LocalProfile.DQP_WORK_CONTEXT, getDQPWorkContext()); String url = "jdbc:teiid:" + getVdbName() + "." + getVdbVersion(); //$NON-NLS-1$ //$NON-NLS-2$ ServerConnection sc; try { diff --git a/jboss-integration/src/main/java/org/teiid/jboss/IntegrationPlugin.java b/jboss-integration/src/main/java/org/teiid/jboss/IntegrationPlugin.java index 74a2747ff6..df8cdb89d0 100644 --- a/jboss-integration/src/main/java/org/teiid/jboss/IntegrationPlugin.java +++ b/jboss-integration/src/main/java/org/teiid/jboss/IntegrationPlugin.java @@ -88,7 +88,6 @@ public static enum Event implements BundleUtil.Event { TEIID50077, TEIID50088, TEIID50089, - TEIID50090, //Missing context TEIID50091, // rest different # of param count TEIID50092, // rest procedure execution TEIID50093, diff --git a/jboss-integration/src/main/java/org/teiid/jboss/TeiidServiceNames.java b/jboss-integration/src/main/java/org/teiid/jboss/TeiidServiceNames.java index 2f6cd12f1a..6d6bd13d52 100644 --- a/jboss-integration/src/main/java/org/teiid/jboss/TeiidServiceNames.java +++ b/jboss-integration/src/main/java/org/teiid/jboss/TeiidServiceNames.java @@ -33,7 +33,7 @@ public class TeiidServiceNames { public static ServiceName VDB_REPO = ServiceName.JBOSS.append("teiid", "vdb-repository");//$NON-NLS-1$ //$NON-NLS-2$ public static ServiceName TRANSLATOR_BASE = ServiceName.JBOSS.append("teiid", "translator");//$NON-NLS-1$ //$NON-NLS-2$ public static ServiceName TRANSPORT_BASE = ServiceName.JBOSS.append("teiid", "transport");//$NON-NLS-1$ //$NON-NLS-2$ - private static ServiceName EMBEDDED_TRANSPORT_BASE = ServiceName.JBOSS.append("teiid", "embedded", "transport");//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + private static ServiceName LOCAL_TRANSPORT_BASE = ServiceName.JBOSS.append("teiid", "local", "transport");//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ public static ServiceName BUFFER_DIR = ServiceName.JBOSS.append("teiid", "buffer.dir");//$NON-NLS-1$ //$NON-NLS-2$ public static ServiceName DATA_DIR = ServiceName.JBOSS.append("teiid", "data.dir");//$NON-NLS-1$ //$NON-NLS-2$ public static ServiceName BUFFER_MGR = ServiceName.JBOSS.append("teiid", "buffer-mgr");//$NON-NLS-1$ //$NON-NLS-2$ @@ -88,8 +88,8 @@ public static ServiceName transportServiceName(String name) { return ServiceName.of(TRANSPORT_BASE, name); } - public static ServiceName embeddedTransportServiceName(String name) { - return EMBEDDED_TRANSPORT_BASE.append(name); + public static ServiceName localTransportServiceName(String name) { + return LOCAL_TRANSPORT_BASE.append(name); } public static ServiceName dsListenerServiceName(String vdbName, int version, String name) throws InvalidServiceNameException { diff --git a/jboss-integration/src/main/java/org/teiid/jboss/TransportAdd.java b/jboss-integration/src/main/java/org/teiid/jboss/TransportAdd.java index 8a51e6bf27..035add0ed1 100644 --- a/jboss-integration/src/main/java/org/teiid/jboss/TransportAdd.java +++ b/jboss-integration/src/main/java/org/teiid/jboss/TransportAdd.java @@ -50,7 +50,6 @@ import org.teiid.dqp.service.SessionService; import org.teiid.logging.LogConstants; import org.teiid.logging.LogManager; -import org.teiid.net.socket.AuthenticationType; import org.teiid.transport.ClientServiceRegistry; import org.teiid.transport.LocalServerConnection; import org.teiid.transport.SSLConfiguration; @@ -107,7 +106,7 @@ protected void performRuntime(final OperationContext context, final ModelNode op transport.setSocketConfig(buildSocketConfiguration(context, operation)); } else { - transport.setEmbedded(true); + transport.setLocal(true); LogManager.logDetail(LogConstants.CTX_SECURITY, IntegrationPlugin.Util.getString("socket_binding_not_defined", transportName)); //$NON-NLS-1$ } @@ -128,9 +127,9 @@ protected void performRuntime(final OperationContext context, final ModelNode op newControllers.add(transportBuilder.install()); // register a JNDI name, this looks hard. - if (transport.isEmbedded() && !isEmbeddedRegistered(transportName)) { + if (transport.isLocal() && !isLocalRegistered(transportName)) { final ReferenceFactoryService referenceFactoryService = new ReferenceFactoryService(); - final ServiceName referenceFactoryServiceName = TeiidServiceNames.embeddedTransportServiceName(transportName).append("reference-factory"); //$NON-NLS-1$ + final ServiceName referenceFactoryServiceName = TeiidServiceNames.localTransportServiceName(transportName).append("reference-factory"); //$NON-NLS-1$ final ServiceBuilder referenceBuilder = target.addService(referenceFactoryServiceName,referenceFactoryService); referenceBuilder.addDependency(TeiidServiceNames.transportServiceName(transportName), ClientServiceRegistry.class, referenceFactoryService.getInjector()); referenceBuilder.setInitialMode(ServiceController.Mode.ACTIVE); @@ -147,7 +146,7 @@ protected void performRuntime(final OperationContext context, final ModelNode op } } - protected boolean isEmbeddedRegistered(String transportName) { + protected boolean isLocalRegistered(String transportName) { try { InitialContext ic = new InitialContext(); ic.lookup(LocalServerConnection.jndiNameForRuntime(transportName)); diff --git a/jboss-integration/src/main/java/org/teiid/jboss/TransportRemove.java b/jboss-integration/src/main/java/org/teiid/jboss/TransportRemove.java index 7a306cfa20..ba97e327b7 100644 --- a/jboss-integration/src/main/java/org/teiid/jboss/TransportRemove.java +++ b/jboss-integration/src/main/java/org/teiid/jboss/TransportRemove.java @@ -51,10 +51,10 @@ protected void performRuntime(OperationContext context, ModelNode operation, Mod if (controller != null) { TransportService transport = TransportService.class.cast(controller.getValue()); - if (transport.isEmbedded()) { + if (transport.isLocal()) { final ContextNames.BindInfo bindInfo = ContextNames.bindInfoFor(LocalServerConnection.jndiNameForRuntime(transportName)); context.removeService(bindInfo.getBinderServiceName()); - context.removeService(TeiidServiceNames.embeddedTransportServiceName(transportName).append("reference-factory")); //$NON-NLS-1$ + context.removeService(TeiidServiceNames.localTransportServiceName(transportName).append("reference-factory")); //$NON-NLS-1$ } context.removeService(serviceName); } diff --git a/jboss-integration/src/main/java/org/teiid/jboss/TransportService.java b/jboss-integration/src/main/java/org/teiid/jboss/TransportService.java index efbfc13486..88a6a25b50 100644 --- a/jboss-integration/src/main/java/org/teiid/jboss/TransportService.java +++ b/jboss-integration/src/main/java/org/teiid/jboss/TransportService.java @@ -72,7 +72,7 @@ public class TransportService extends ClientServiceRegistryImpl implements Servi private SocketListener socketListener; private AuthenticationType authenticationType; private int maxODBCLobSizeAllowed = 5*1024*1024; // 5 MB - private boolean embedded; + private boolean local; private InetSocketAddress address = null; private String transportName; @@ -140,7 +140,7 @@ public void start(StartContext context) throws StartException { } else if (socketConfig.getProtocol() == WireProtocol.pg) { TeiidDriver driver = new TeiidDriver(); - driver.setEmbeddedProfile(new ConnectionProfile() { + driver.setLocalProfile(new ConnectionProfile() { @Override public ConnectionImpl connect(String url, Properties info) throws TeiidSQLException { try { @@ -290,11 +290,11 @@ public void setMaxODBCLobSizeAllowed(int lobSize) { this.maxODBCLobSizeAllowed = lobSize; } - public void setEmbedded(boolean v) { - this.embedded = v; + public void setLocal(boolean v) { + this.local = v; } - public boolean isEmbedded() { - return this.embedded; + public boolean isLocal() { + return this.local; } } diff --git a/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties b/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties index 356959aa9d..0f63242c70 100644 --- a/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties +++ b/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties @@ -25,8 +25,8 @@ TEIID50012=Teiid JDBC - Name = {0}, Host = {1}, Port = {2}, SSL = {3}, security TEIID50039=Teiid JDBC - Name = {0}, Host = {1}, Port = {2} has been shutdown. TEIID50037=Teiid ODBC - Name = {0}, Host = {1}, Port = {2}, SSL = {3}, security-domains = {4} TEIID50040=Teiid ODBC - Name = {0}, Host = {1}, Port = {2} has been shutdown. -TEIID50038=Teiid Embedded transport enabled. Bound to: {0} -TEIID50041=Teiid Embedded transport disabled. Local Connections will fail. UnBound : {0} +TEIID50038=Teiid Local transport enabled. Bound to: {0} +TEIID50041=Teiid Local transport disabled. Local Connections will fail. UnBound : {0} TEIID50002=Teiid Engine stopped {0} event_distributor_bound=org.teiid.events.EventDistributorFactory is bound to {0} for manual control of Teiid events. TEIID50019=Re-deploying VDB {0} @@ -44,7 +44,7 @@ translator.remove=Remove Translator TEIID50011=Security enabled for transport "{1}" with security-domain set to {0} TEIID50006 = Teiid translator "{0}" added. TEIID50013=Wrong type of protocol supplied -socket_binding_not_defined=Socket binding not specified for transport {0}; only embedded access is granted. +socket_binding_not_defined=Socket binding not specified for transport {0}; only local access is granted. TEIID50070=Error adding translator from deployment {0} TEIID50071=Cache Type {0} not found in the configuration TEIID50018= failed to process VDB archive {0} @@ -67,7 +67,6 @@ TEIID50074=VDB has validity errors; failed to deploy - {0} TEIID50075=No "path" information found to load the FUNCTION model {0}; FUNCTION model must have path information. TEIID50076=For {0}.{1} VDB, recursive delegation {2} found. TEIID50077=The translator type "{0}" was not found in configuration; VDB {1}.{2} will not be started until translator is available. -TEIID50090=No context associated. More than likely either pass-through authentication should not be used or there are no security domains defined on the embedded transport. TEIID50091=The URI parameters defined on procedure {0}, do not match to number of parameters defined on procedure. Correct and reploy VDB to expose this procedure through REST. TEIID50092=Only result produceing procedures are allowed TEIID50093=Cache factory not found; Make sure the Infinispan based cache factory is correctly configured for Teiid. diff --git a/odata/src/main/java/org/teiid/odata/LocalClient.java b/odata/src/main/java/org/teiid/odata/LocalClient.java index e07a3cac7e..185fd20a76 100644 --- a/odata/src/main/java/org/teiid/odata/LocalClient.java +++ b/odata/src/main/java/org/teiid/odata/LocalClient.java @@ -70,7 +70,7 @@ import org.teiid.core.util.PropertiesUtils; import org.teiid.jdbc.CallableStatementImpl; import org.teiid.jdbc.ConnectionImpl; -import org.teiid.jdbc.EmbeddedProfile; +import org.teiid.jdbc.LocalProfile; import org.teiid.jdbc.PreparedStatementImpl; import org.teiid.jdbc.TeiidDriver; import org.teiid.logging.LogConstants; @@ -119,11 +119,11 @@ public LocalClient(String vdbName, int vdbVersion, Properties props) { if (this.initProperties.getProperty(TeiidURL.CONNECTION.PASSTHROUGH_AUTHENTICATION) == null) { this.initProperties.put(TeiidURL.CONNECTION.PASSTHROUGH_AUTHENTICATION, "true"); //$NON-NLS-1$ } - if (this.initProperties.getProperty(EmbeddedProfile.TRANSPORT_NAME) == null) { - this.initProperties.setProperty(EmbeddedProfile.TRANSPORT_NAME, "odata"); + if (this.initProperties.getProperty(LocalProfile.TRANSPORT_NAME) == null) { + this.initProperties.setProperty(LocalProfile.TRANSPORT_NAME, "odata"); } - if (this.initProperties.getProperty(EmbeddedProfile.WAIT_FOR_LOAD) == null) { - this.initProperties.put(EmbeddedProfile.WAIT_FOR_LOAD, "0"); //$NON-NLS-1$ + if (this.initProperties.getProperty(LocalProfile.WAIT_FOR_LOAD) == null) { + this.initProperties.put(LocalProfile.WAIT_FOR_LOAD, "0"); //$NON-NLS-1$ } this.connectionString = sb.toString(); } diff --git a/olingo/src/main/java/org/teiid/olingo/service/LocalClient.java b/olingo/src/main/java/org/teiid/olingo/service/LocalClient.java index d11373a37f..276eeef82f 100644 --- a/olingo/src/main/java/org/teiid/olingo/service/LocalClient.java +++ b/olingo/src/main/java/org/teiid/olingo/service/LocalClient.java @@ -37,7 +37,7 @@ import org.teiid.core.TeiidRuntimeException; import org.teiid.core.util.PropertiesUtils; import org.teiid.jdbc.ConnectionImpl; -import org.teiid.jdbc.EmbeddedProfile; +import org.teiid.jdbc.LocalProfile; import org.teiid.jdbc.PreparedStatementImpl; import org.teiid.jdbc.TeiidDriver; import org.teiid.logging.LogConstants; @@ -107,11 +107,11 @@ public static ConnectionImpl buildConnection(TeiidDriver driver, String vdbName, if (props.getProperty(TeiidURL.CONNECTION.PASSTHROUGH_AUTHENTICATION) == null) { props.setProperty(TeiidURL.CONNECTION.PASSTHROUGH_AUTHENTICATION, "true"); //$NON-NLS-1$ } - if (props.getProperty(EmbeddedProfile.TRANSPORT_NAME) == null) { - props.setProperty(EmbeddedProfile.TRANSPORT_NAME, "odata"); + if (props.getProperty(LocalProfile.TRANSPORT_NAME) == null) { + props.setProperty(LocalProfile.TRANSPORT_NAME, "odata"); } - if (props.getProperty(EmbeddedProfile.WAIT_FOR_LOAD) == null) { - props.setProperty(EmbeddedProfile.WAIT_FOR_LOAD, "0"); //$NON-NLS-1$ + if (props.getProperty(LocalProfile.WAIT_FOR_LOAD) == null) { + props.setProperty(LocalProfile.WAIT_FOR_LOAD, "0"); //$NON-NLS-1$ } ConnectionImpl connection = driver.connect(sb.toString(), props); return connection; diff --git a/runtime/src/main/java/org/teiid/runtime/EmbeddedServer.java b/runtime/src/main/java/org/teiid/runtime/EmbeddedServer.java index 9ec39d0c49..0427af7afe 100644 --- a/runtime/src/main/java/org/teiid/runtime/EmbeddedServer.java +++ b/runtime/src/main/java/org/teiid/runtime/EmbeddedServer.java @@ -88,7 +88,7 @@ import org.teiid.events.EventDistributorFactory; import org.teiid.jdbc.CallableStatementImpl; import org.teiid.jdbc.ConnectionImpl; -import org.teiid.jdbc.EmbeddedProfile; +import org.teiid.jdbc.LocalProfile; import org.teiid.jdbc.PreparedStatementImpl; import org.teiid.jdbc.TeiidDriver; import org.teiid.jdbc.TeiidPreparedStatement; @@ -137,7 +137,7 @@ public class EmbeddedServer extends AbstractVDBDeployer implements EventDistribu LogManager.setLogListener(new JBossLogger()); } - private EmbeddedProfile embeddedProfile = new EmbeddedProfile() { + private LocalProfile embeddedProfile = new LocalProfile() { @Override public ConnectionImpl connect(String url, Properties info) throws TeiidSQLException { @@ -453,7 +453,7 @@ private void setBufferManagerProperties(EmbeddedConfiguration config) { } private void initDriver() { - driver.setEmbeddedProfile(embeddedProfile); + driver.setLocalProfile(embeddedProfile); } private SocketListener startTransport(SocketConfiguration socketConfig, BufferManager bm, int maxODBCLobSize) { diff --git a/runtime/src/main/java/org/teiid/transport/LocalServerConnection.java b/runtime/src/main/java/org/teiid/transport/LocalServerConnection.java index 37b0612404..623a3a6a87 100644 --- a/runtime/src/main/java/org/teiid/transport/LocalServerConnection.java +++ b/runtime/src/main/java/org/teiid/transport/LocalServerConnection.java @@ -47,7 +47,7 @@ import org.teiid.deployers.VDBLifeCycleListener; import org.teiid.deployers.VDBRepository; import org.teiid.dqp.internal.process.DQPWorkContext; -import org.teiid.jdbc.EmbeddedProfile; +import org.teiid.jdbc.LocalProfile; import org.teiid.logging.LogConstants; import org.teiid.logging.LogManager; import org.teiid.net.CommunicationException; @@ -76,9 +76,9 @@ public static String jndiNameForRuntime(String embeddedTransportName) { public LocalServerConnection(Properties connectionProperties, boolean useCallingThread) throws CommunicationException, ConnectionException{ this.connectionProperties = connectionProperties; - this.csr = getClientServiceRegistry(connectionProperties.getProperty(EmbeddedProfile.TRANSPORT_NAME, "embedded")); //$NON-NLS-1$ + this.csr = getClientServiceRegistry(connectionProperties.getProperty(LocalProfile.TRANSPORT_NAME, "local")); //$NON-NLS-1$ - DQPWorkContext context = (DQPWorkContext)connectionProperties.get(EmbeddedProfile.DQP_WORK_CONTEXT); + DQPWorkContext context = (DQPWorkContext)connectionProperties.get(LocalProfile.DQP_WORK_CONTEXT); if (context == null) { String vdbVersion = connectionProperties.getProperty(TeiidURL.JDBC.VDB_VERSION); String vdbName = connectionProperties.getProperty(TeiidURL.JDBC.VDB_NAME); @@ -91,7 +91,7 @@ public LocalServerConnection(Properties connectionProperties, boolean useCalling if (vdbVersion != null) { int waitForLoad = PropertiesUtils.getIntProperty(connectionProperties, TeiidURL.CONNECTION.LOGIN_TIMEOUT, -1); if (waitForLoad == -1) { - waitForLoad = PropertiesUtils.getIntProperty(connectionProperties, EmbeddedProfile.WAIT_FOR_LOAD, -1); + waitForLoad = PropertiesUtils.getIntProperty(connectionProperties, LocalProfile.WAIT_FOR_LOAD, -1); } else { waitForLoad *= 1000; //seconds to milliseconds }