Author: rareddy Date: 2011-11-14 20:42:44 -0500 (Mon, 14 Nov 2011) New Revision: 3648 Modified: branches/as7/api/src/main/java/org/teiid/translator/ExecutionFactory.java branches/as7/build/assembly/jboss-as7/dist.xml branches/as7/build/kits/jboss-as7/modules/org/jboss/teiid/translator/salesforce/api/main/module.xml branches/as7/connectors/connector-salesforce/pom.xml branches/as7/connectors/connector-salesforce/src/main/rar/META-INF/MANIFEST.MF branches/as7/connectors/connector-ws/pom.xml branches/as7/connectors/connector-ws/src/main/java/org/teiid/resource/adapter/ws/WSManagedConnectionFactory.java branches/as7/connectors/connector-ws/src/main/rar/META-INF/MANIFEST.MF branches/as7/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCExecutionFactory.java branches/as7/jboss-integration/src/main/java/org/teiid/jboss/TeiidAdd.java branches/as7/jboss-integration/src/main/java/org/teiid/jboss/Transport.java branches/as7/jboss-integration/src/main/java/org/teiid/jboss/VDBDeployer.java branches/as7/runtime/src/main/java/org/teiid/transport/SSLAwareChannelHandler.java branches/as7/runtime/src/main/java/org/teiid/transport/SocketListener.java Log: TEIID-1720: Adding dependencies for SF. Also modified the Data source dependencies directly to binding based services Modified: branches/as7/api/src/main/java/org/teiid/translator/ExecutionFactory.java =================================================================== --- branches/as7/api/src/main/java/org/teiid/translator/ExecutionFactory.java 2011-11-14 03:13:36 UTC (rev 3647) +++ branches/as7/api/src/main/java/org/teiid/translator/ExecutionFactory.java 2011-11-15 01:42:44 UTC (rev 3648) @@ -210,14 +210,6 @@ this.sourceRequired = value; } - /** - * Flag to determine between if a underlying connection is a data source or connection-factory - * @return false - */ - public boolean isJDBCSource() { - return false; - } - /** * Obtain a reference to the default LanguageFactory that can be used to construct * new language interface objects. This is typically needed when modifying the language Modified: branches/as7/build/assembly/jboss-as7/dist.xml =================================================================== --- branches/as7/build/assembly/jboss-as7/dist.xml 2011-11-14 03:13:36 UTC (rev 3647) +++ branches/as7/build/assembly/jboss-as7/dist.xml 2011-11-15 01:42:44 UTC (rev 3648) @@ -306,7 +306,7 @@ </includes> <binaries> - <includeDependencies>true</includeDependencies> + <includeDependencies>false</includeDependencies> <unpack>false</unpack> <dependencySets> <dependencySet> @@ -319,13 +319,35 @@ <outputDirectory>modules/org/jboss/teiid/translator/salesforce/main</outputDirectory> <fileMode>0644</fileMode> </binaries> - </moduleSet> <moduleSet> <includeSubModules>true</includeSubModules> <useAllReactorProjects>true</useAllReactorProjects> <includes> + <include>org.jboss.teiid.connectors:salesforce-api</include> + </includes> + + <binaries> + <includeDependencies>true</includeDependencies> + <unpack>false</unpack> + <dependencySets> + <dependencySet> + <useProjectArtifact>true</useProjectArtifact> + <unpack>false</unpack> + <useTransitiveDependencies>false</useTransitiveDependencies> + <useDefaultExcludes>true</useDefaultExcludes> + </dependencySet> + </dependencySets> + <outputDirectory>modules/org/jboss/teiid/translator/salesforce/api/main</outputDirectory> + <fileMode>0644</fileMode> + </binaries> + </moduleSet> + <moduleSet> + <includeSubModules>true</includeSubModules> + <useAllReactorProjects>true</useAllReactorProjects> + + <includes> <include>org.jboss.teiid.connectors:translator-ws</include> </includes> Modified: branches/as7/build/kits/jboss-as7/modules/org/jboss/teiid/translator/salesforce/api/main/module.xml =================================================================== --- branches/as7/build/kits/jboss-as7/modules/org/jboss/teiid/translator/salesforce/api/main/module.xml 2011-11-14 03:13:36 UTC (rev 3647) +++ branches/as7/build/kits/jboss-as7/modules/org/jboss/teiid/translator/salesforce/api/main/module.xml 2011-11-15 01:42:44 UTC (rev 3648) @@ -1,11 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<module xmlns="urn:jboss:module:1.0" name="org.jboss.teiid.transalator.salesforce.api"> +<module xmlns="urn:jboss:module:1.0" name="org.jboss.teiid.translator.salesforce.api"> <resources> <resource-root path="salesforce-api-${project.version}.jar" /> <!-- Insert resources here --> </resources> <dependencies> + <module name="javax.xml.ws.api"/> <module name="javax.api"/> + <module name="javax.jws.api"/> </dependencies> </module> \ No newline at end of file Modified: branches/as7/connectors/connector-salesforce/pom.xml =================================================================== --- branches/as7/connectors/connector-salesforce/pom.xml 2011-11-14 03:13:36 UTC (rev 3647) +++ branches/as7/connectors/connector-salesforce/pom.xml 2011-11-15 01:42:44 UTC (rev 3648) @@ -42,25 +42,25 @@ <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-frontend-jaxws</artifactId> - <version>2.2.2</version> + <version>2.4.2</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-transports-http</artifactId> - <version>2.2.2</version> + <version>2.4.2</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-ws-security</artifactId> - <version>2.2.2</version> + <version>2.4.2</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-ws-policy</artifactId> - <version>2.2.2</version> + <version>2.4.2</version> <scope>provided</scope> </dependency> </dependencies> Modified: branches/as7/connectors/connector-salesforce/src/main/rar/META-INF/MANIFEST.MF =================================================================== --- branches/as7/connectors/connector-salesforce/src/main/rar/META-INF/MANIFEST.MF 2011-11-14 03:13:36 UTC (rev 3647) +++ branches/as7/connectors/connector-salesforce/src/main/rar/META-INF/MANIFEST.MF 2011-11-15 01:42:44 UTC (rev 3648) @@ -1 +1 @@ -Dependencies: org.jboss.teiid.common-core,org.jboss.teiid.api,javax.api +Dependencies: javax.jws.api,org.jboss.ws.cxf.jbossws-cxf-client services,javax.wsdl4j.api,org.jboss.teiid.common-core,org.jboss.teiid.api,javax.api,org.jboss.teiid.translator.salesforce.api,org.jboss.teiid.translator.salesforce \ No newline at end of file Modified: branches/as7/connectors/connector-ws/pom.xml =================================================================== --- branches/as7/connectors/connector-ws/pom.xml 2011-11-14 03:13:36 UTC (rev 3647) +++ branches/as7/connectors/connector-ws/pom.xml 2011-11-15 01:42:44 UTC (rev 3648) @@ -31,25 +31,25 @@ <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-frontend-jaxws</artifactId> - <version>2.2.2</version> + <version>2.4.2</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-transports-http</artifactId> - <version>2.2.2</version> + <version>2.4.2</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-ws-security</artifactId> - <version>2.2.2</version> + <version>2.4.2</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-ws-policy</artifactId> - <version>2.2.2</version> + <version>2.4.2</version> <scope>provided</scope> </dependency> </dependencies> Modified: branches/as7/connectors/connector-ws/src/main/java/org/teiid/resource/adapter/ws/WSManagedConnectionFactory.java =================================================================== --- branches/as7/connectors/connector-ws/src/main/java/org/teiid/resource/adapter/ws/WSManagedConnectionFactory.java 2011-11-14 03:13:36 UTC (rev 3647) +++ branches/as7/connectors/connector-ws/src/main/java/org/teiid/resource/adapter/ws/WSManagedConnectionFactory.java 2011-11-15 01:42:44 UTC (rev 3648) @@ -53,7 +53,7 @@ private Bus bus; private QName portQName; - private List<Interceptor> outInterceptors; + private List<? extends Interceptor> outInterceptors; @Override public BasicConnectionFactory createConnectionFactory() throws ResourceException { @@ -135,7 +135,7 @@ return portQName; } - public List<Interceptor> getOutInterceptors() { + public List<? extends Interceptor> getOutInterceptors() { return outInterceptors; } Modified: branches/as7/connectors/connector-ws/src/main/rar/META-INF/MANIFEST.MF =================================================================== --- branches/as7/connectors/connector-ws/src/main/rar/META-INF/MANIFEST.MF 2011-11-14 03:13:36 UTC (rev 3647) +++ branches/as7/connectors/connector-ws/src/main/rar/META-INF/MANIFEST.MF 2011-11-15 01:42:44 UTC (rev 3648) @@ -1 +1 @@ -Dependencies: org.jboss.teiid.common-core,org.jboss.teiid.api,javax.api +Dependencies: javax.jws.api,org.jboss.ws.cxf.jbossws-cxf-client services,javax.wsdl4j.api,org.jboss.teiid.common-core,org.jboss.teiid.api,javax.api Modified: branches/as7/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCExecutionFactory.java =================================================================== --- branches/as7/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCExecutionFactory.java 2011-11-14 03:13:36 UTC (rev 3647) +++ branches/as7/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCExecutionFactory.java 2011-11-15 01:42:44 UTC (rev 3648) @@ -224,11 +224,6 @@ return true; } - @Override - public boolean isJDBCSource() { - return true; - } - @Override public ResultSetExecution createResultSetExecution(QueryExpression command, ExecutionContext executionContext, RuntimeMetadata metadata, Connection conn) throws TranslatorException { Modified: branches/as7/jboss-integration/src/main/java/org/teiid/jboss/TeiidAdd.java =================================================================== --- branches/as7/jboss-integration/src/main/java/org/teiid/jboss/TeiidAdd.java 2011-11-14 03:13:36 UTC (rev 3647) +++ branches/as7/jboss-integration/src/main/java/org/teiid/jboss/TeiidAdd.java 2011-11-15 01:42:44 UTC (rev 3648) @@ -327,7 +327,7 @@ processorTarget.addDeploymentProcessor(Phase.STRUCTURE, Phase.STRUCTURE_WAR_DEPLOYMENT_INIT|0x0001,new VDBStructureDeployer()); processorTarget.addDeploymentProcessor(Phase.PARSE, Phase.PARSE_WEB_DEPLOYMENT|0x0001, new VDBParserDeployer()); processorTarget.addDeploymentProcessor(Phase.DEPENDENCIES, Phase.DEPENDENCIES_WAR_MODULE|0x0001, new VDBDependencyDeployer()); - processorTarget.addDeploymentProcessor(Phase.INSTALL, Phase.INSTALL_WAR_DEPLOYMENT|0x0001, new VDBDeployer(translatorRepo, asyncThreadPoolName, statusChecker)); + processorTarget.addDeploymentProcessor(Phase.INSTALL, Phase.INSTALL_WAR_DEPLOYMENT|0x1000, new VDBDeployer(translatorRepo, asyncThreadPoolName, statusChecker)); // translator deployers processorTarget.addDeploymentProcessor(Phase.STRUCTURE, Phase.STRUCTURE_JDBC_DRIVER|0x0001,new TranslatorStructureDeployer()); Modified: branches/as7/jboss-integration/src/main/java/org/teiid/jboss/Transport.java =================================================================== --- branches/as7/jboss-integration/src/main/java/org/teiid/jboss/Transport.java 2011-11-14 03:13:36 UTC (rev 3647) +++ branches/as7/jboss-integration/src/main/java/org/teiid/jboss/Transport.java 2011-11-15 01:42:44 UTC (rev 3648) @@ -125,15 +125,19 @@ if (this.socketConfig != null) { InetSocketAddress address = getSocketBindingInjector().getValue().getSocketAddress(); Protocol protocol = Protocol.valueOf(socketConfig.getProtocol()); + boolean sslEnabled = false; + if (this.socketConfig.getSSLConfiguration() != null) { + sslEnabled = this.socketConfig.getSSLConfiguration().isSslEnabled(); + } if (protocol == Protocol.teiid) { this.socketListener = new SocketListener(address, this.socketConfig, this.csr, getBufferServiceInjector().getValue().getBufferManager()); - LogManager.logInfo(LogConstants.CTX_RUNTIME, IntegrationPlugin.Util.getString("socket_enabled","Teiid JDBC = ",(this.socketConfig.getSSLConfiguration().isSslEnabled()?"mms://":"mm://")+address.getHostName()+":"+address.getPort())); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ + LogManager.logInfo(LogConstants.CTX_RUNTIME, IntegrationPlugin.Util.getString("socket_enabled","Teiid JDBC = ",(sslEnabled?"mms://":"mm://")+address.getHostName()+":"+address.getPort())); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ } else if (protocol == Protocol.pg) { getVdbRepository().odbcEnabled(); ODBCSocketListener odbc = new ODBCSocketListener(address, this.socketConfig, this.csr, getBufferServiceInjector().getValue().getBufferManager(), getMaxODBCLobSizeAllowed(), this.logon); odbc.setAuthenticationType(this.sessionService.getAuthenticationType()); - LogManager.logInfo(LogConstants.CTX_RUNTIME, IntegrationPlugin.Util.getString("odbc_enabled","Teiid ODBC - SSL=", (this.socketConfig.getSSLConfiguration().isSslEnabled()?"ON":"OFF")+" Host = "+address.getHostName()+" Port = "+address.getPort())); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ + LogManager.logInfo(LogConstants.CTX_RUNTIME, IntegrationPlugin.Util.getString("odbc_enabled","Teiid ODBC - SSL=", (sslEnabled?"ON":"OFF")+" Host = "+address.getHostName()+" Port = "+address.getPort())); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ } else { throw new StartException(IntegrationPlugin.Util.getString("wrong_protocol")); //$NON-NLS-1$ Modified: branches/as7/jboss-integration/src/main/java/org/teiid/jboss/VDBDeployer.java =================================================================== --- branches/as7/jboss-integration/src/main/java/org/teiid/jboss/VDBDeployer.java 2011-11-14 03:13:36 UTC (rev 3647) +++ branches/as7/jboss-integration/src/main/java/org/teiid/jboss/VDBDeployer.java 2011-11-15 01:42:44 UTC (rev 3648) @@ -22,13 +22,12 @@ package org.teiid.jboss; import java.util.ArrayList; -import java.util.HashSet; -import java.util.IdentityHashMap; import java.util.List; import java.util.concurrent.Executor; import javax.naming.InitialContext; +import org.jboss.as.naming.deployment.ContextNames; import org.jboss.as.server.deployment.Attachments; import org.jboss.as.server.deployment.DeploymentPhaseContext; import org.jboss.as.server.deployment.DeploymentUnit; @@ -49,14 +48,12 @@ import org.teiid.deployers.VDBRepository; import org.teiid.deployers.VDBStatusChecker; import org.teiid.dqp.internal.datamgr.TranslatorRepository; -import org.teiid.jboss.VDBService.TranslatorNotFoundException; import org.teiid.logging.LogConstants; import org.teiid.logging.LogManager; import org.teiid.metadata.index.IndexMetadataFactory; import org.teiid.query.ObjectReplicator; import org.teiid.runtime.RuntimePlugin; import org.teiid.services.BufferServiceImpl; -import org.teiid.translator.ExecutionFactory; class VDBDeployer implements DeploymentUnitProcessor { @@ -139,7 +136,7 @@ // add dependencies to data-sources dataSourceDependencies(deployment, new DependentServices() { @Override - public void serviceFound(String dsName, ServiceName svcName) { + public void dependentService(final String dsName, final ServiceName svcName) { DataSourceListener dsl = new DataSourceListener(dsName, svcName, vdbStatusChecker); ServiceBuilder<DataSourceListener> sb = context.getServiceTarget().addService(TeiidServiceNames.dsListenerServiceName(dsName), dsl); sb.addDependency(svcName); @@ -178,7 +175,7 @@ } } - private void dataSourceDependencies(VDBMetaData deployment, DependentServices svcListener) throws DeploymentUnitProcessingException { + private void dataSourceDependencies(VDBMetaData deployment, DependentServices svcListener) { for (ModelMetaData model:deployment.getModelMetaDatas().values()) { for (String sourceName:model.getSourceNames()) { @@ -187,31 +184,17 @@ VDBTranslatorMetaData translator = deployment.getTranslator(translatorName); translatorName = translator.getType(); } - - boolean jdbcSource = true; - try { - ExecutionFactory ef = VDBService.getExecutionFactory(translatorName, new TranslatorRepository(), this.translatorRepository, deployment, new IdentityHashMap<Translator, ExecutionFactory<Object, Object>>(), new HashSet<String>()); - jdbcSource = ef.isJDBCSource(); - } catch (TranslatorNotFoundException e) { - if (e.getCause() != null) { - throw new DeploymentUnitProcessingException(e.getCause()); - } - throw new DeploymentUnitProcessingException(e.getMessage()); - } // Need to make the data source service as dependency; otherwise dynamic vdbs will not work correctly. String dsName = model.getSourceConnectionJndiName(sourceName); - ServiceName svcName = ServiceName.JBOSS.append("data-source", getJndiName(dsName)); //$NON-NLS-1$ - if (!jdbcSource) { - svcName = ServiceName.JBOSS.append("connector", "connection-factory", getJndiName(dsName)); //$NON-NLS-1$ //$NON-NLS-2$ - } - svcListener.serviceFound(dsName, svcName); + final ContextNames.BindInfo bindInfo = ContextNames.bindInfoFor(getJndiName(dsName)); + svcListener.dependentService(dsName, bindInfo.getBinderServiceName()); } } } interface DependentServices { - void serviceFound(String dsName, ServiceName svc); + void dependentService(String dsName, ServiceName svc); } static class DataSourceListener implements Service<DataSourceListener>{ @@ -283,19 +266,15 @@ VDBService vdbService = (VDBService)controller.getService(); vdbService.undeployInProgress(); - try { - dataSourceDependencies(deployment, new DependentServices() { - @Override - public void serviceFound(String dsName, ServiceName svcName) { - ServiceController<?> controller = deploymentUnit.getServiceRegistry().getService(TeiidServiceNames.dsListenerServiceName(dsName)); - if (controller != null) { - controller.setMode(ServiceController.Mode.REMOVE); - } + dataSourceDependencies(deployment, new DependentServices() { + @Override + public void dependentService(String dsName, ServiceName svcName) { + ServiceController<?> controller = deploymentUnit.getServiceRegistry().getService(TeiidServiceNames.dsListenerServiceName(dsName)); + if (controller != null) { + controller.setMode(ServiceController.Mode.REMOVE); } - }); - } catch (DeploymentUnitProcessingException e) { - LogManager.logDetail(LogConstants.CTX_RUNTIME, e, IntegrationPlugin.Util.getString("vdb-undeploy-failed", deployment.getName(), deployment.getVersion())); //$NON-NLS-1$ - } + } + }); controller.setMode(ServiceController.Mode.REMOVE); } } Modified: branches/as7/runtime/src/main/java/org/teiid/transport/SSLAwareChannelHandler.java =================================================================== --- branches/as7/runtime/src/main/java/org/teiid/transport/SSLAwareChannelHandler.java 2011-11-14 03:13:36 UTC (rev 3647) +++ branches/as7/runtime/src/main/java/org/teiid/transport/SSLAwareChannelHandler.java 2011-11-15 01:42:44 UTC (rev 3648) @@ -224,10 +224,12 @@ public ChannelPipeline getPipeline() throws Exception { ChannelPipeline pipeline = new DefaultChannelPipeline(); - SSLEngine engine = config.getServerSSLEngine(); - if (engine != null) { - pipeline.addLast("ssl", new SslHandler(engine)); //$NON-NLS-1$ - } + if (this.config != null) { + SSLEngine engine = config.getServerSSLEngine(); + if (engine != null) { + pipeline.addLast("ssl", new SslHandler(engine)); //$NON-NLS-1$ + } + } pipeline.addLast("decoder", new ObjectDecoder(1 << 20, classLoader, storageManager)); //$NON-NLS-1$ pipeline.addLast("chunker", new ChunkedWriteHandler()); //$NON-NLS-1$ pipeline.addLast("encoder", new ObjectEncoder()); //$NON-NLS-1$ Modified: branches/as7/runtime/src/main/java/org/teiid/transport/SocketListener.java =================================================================== --- branches/as7/runtime/src/main/java/org/teiid/transport/SocketListener.java 2011-11-14 03:13:36 UTC (rev 3647) +++ branches/as7/runtime/src/main/java/org/teiid/transport/SocketListener.java 2011-11-15 01:42:44 UTC (rev 3648) @@ -66,7 +66,9 @@ */ public SocketListener(InetSocketAddress address, int inputBufferSize, int outputBufferSize, int maxWorkers, SSLConfiguration config, ClientServiceRegistryImpl csr, StorageManager storageManager) { - this.isClientEncryptionEnabled = config.isClientEncryptionEnabled(); + if (config != null) { + this.isClientEncryptionEnabled = config.isClientEncryptionEnabled(); + } this.csr = csr; this.nettyPool = Executors.newCachedThreadPool(new NamedThreadFactory("NIO")); //$NON-NLS-1$