[teiid-commits] teiid SVN: r4334 - in trunk: build/kits/embedded/examples/embedded-portfolio/src/org/teiid/example and 4 other directories.
teiid-commits at lists.jboss.org
teiid-commits at lists.jboss.org
Thu Aug 16 11:35:25 EDT 2012
Author: shawkins
Date: 2012-08-16 11:35:25 -0400 (Thu, 16 Aug 2012)
New Revision: 4334
Removed:
trunk/build/kits/embedded/examples/embedded-portfolio/src/org/teiid/example/AbstractConnectionFactory.java
Modified:
trunk/api/src/main/java/org/teiid/resource/spi/BasicConnectionFactory.java
trunk/build/kits/embedded/examples/embedded-portfolio/src/org/teiid/example/TeiidEmbeddedPortfolio.java
trunk/connectors/connector-file/src/main/java/org/teiid/resource/adapter/file/FileManagedConnectionFactory.java
trunk/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/ldap/LDAPManagedConnectionFactory.java
trunk/connectors/connector-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/SalesForceManagedConnectionFactory.java
trunk/connectors/connector-ws/src/main/java/org/teiid/resource/adapter/ws/WSManagedConnectionFactory.java
Log:
TEIID-2062 switching the example to use the BasicConnectionFactory
Modified: trunk/api/src/main/java/org/teiid/resource/spi/BasicConnectionFactory.java
===================================================================
--- trunk/api/src/main/java/org/teiid/resource/spi/BasicConnectionFactory.java 2012-08-16 15:34:35 UTC (rev 4333)
+++ trunk/api/src/main/java/org/teiid/resource/spi/BasicConnectionFactory.java 2012-08-16 15:35:25 UTC (rev 4334)
@@ -1,3 +1,25 @@
+/*
+ * 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.resource.spi;
import javax.naming.NamingException;
@@ -8,12 +30,12 @@
import javax.resource.cci.RecordFactory;
import javax.resource.cci.ResourceAdapterMetaData;
-public abstract class BasicConnectionFactory implements ConnectionFactory {
+public abstract class BasicConnectionFactory<T extends BasicConnection> implements ConnectionFactory {
private static final long serialVersionUID = 2900581028589520388L;
private Reference reference;
@Override
- public abstract BasicConnection getConnection() throws ResourceException;
+ public abstract T getConnection() throws ResourceException;
@Override
public BasicConnection getConnection(ConnectionSpec arg0) throws ResourceException {
Deleted: trunk/build/kits/embedded/examples/embedded-portfolio/src/org/teiid/example/AbstractConnectionFactory.java
===================================================================
--- trunk/build/kits/embedded/examples/embedded-portfolio/src/org/teiid/example/AbstractConnectionFactory.java 2012-08-16 15:34:35 UTC (rev 4333)
+++ trunk/build/kits/embedded/examples/embedded-portfolio/src/org/teiid/example/AbstractConnectionFactory.java 2012-08-16 15:35:25 UTC (rev 4334)
@@ -1,59 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * See the COPYRIGHT.txt file distributed with this work for information
- * regarding copyright ownership. Some portions may be licensed
- * to Red Hat, Inc. under one or more contributor license agreements.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA.
- */
-package org.teiid.example;
-
-import javax.naming.NamingException;
-import javax.naming.Reference;
-import javax.resource.ResourceException;
-import javax.resource.cci.*;
-
-public abstract class AbstractConnectionFactory<C extends javax.resource.cci.Connection> implements ConnectionFactory {
- private static final long serialVersionUID = 4906165501503764939L;
-
- @Override
- public void setReference(Reference reference) {
- }
-
- @Override
- public Reference getReference() throws NamingException {
- return null;
- }
-
- @Override
- public abstract C getConnection() throws ResourceException;
-
- @Override
- public C getConnection(ConnectionSpec properties)
- throws ResourceException {
- return null;
- }
-
- @Override
- public RecordFactory getRecordFactory() throws ResourceException {
- return null;
- }
-
- @Override
- public ResourceAdapterMetaData getMetaData() throws ResourceException {
- return null;
- }
-}
Modified: trunk/build/kits/embedded/examples/embedded-portfolio/src/org/teiid/example/TeiidEmbeddedPortfolio.java
===================================================================
--- trunk/build/kits/embedded/examples/embedded-portfolio/src/org/teiid/example/TeiidEmbeddedPortfolio.java 2012-08-16 15:34:35 UTC (rev 4333)
+++ trunk/build/kits/embedded/examples/embedded-portfolio/src/org/teiid/example/TeiidEmbeddedPortfolio.java 2012-08-16 15:35:25 UTC (rev 4334)
@@ -40,9 +40,9 @@
import org.teiid.core.util.ObjectConverterUtil;
import org.teiid.jdbc.TeiidDriver;
import org.teiid.resource.adapter.file.FileConnectionImpl;
+import org.teiid.resource.spi.BasicConnectionFactory;
import org.teiid.runtime.EmbeddedConfiguration;
import org.teiid.runtime.EmbeddedServer;
-import org.teiid.translator.FileConnection;
import org.teiid.translator.TranslatorException;
import org.teiid.translator.file.FileExecutionFactory;
import org.teiid.translator.jdbc.h2.H2ExecutionFactory;
@@ -72,9 +72,9 @@
*/
@SuppressWarnings("serial")
private static final class FileConnectionFactory extends
- AbstractConnectionFactory<FileConnection> {
+ BasicConnectionFactory<FileConnectionImpl> {
@Override
- public FileConnection getConnection() throws ResourceException {
+ public FileConnectionImpl getConnection() throws ResourceException {
return new FileConnectionImpl(".", null, false);
}
}
@@ -174,7 +174,7 @@
// configure the connection provider and translator for file based source.
// NOTE: every source that is being integrated, needs its connection provider and its translator
// check out https://docs.jboss.org/author/display/TEIID/Built-in+Translators prebuit translators
- final ConnectionFactory cf = new FileConnectionFactory();;
+ final ConnectionFactory cf = new FileConnectionFactory();
teiidServer.addConnectionFactoryProvider("source-file", new EmbeddedServer.ConnectionFactoryProvider<ConnectionFactory>() {
@Override
public ConnectionFactory getConnectionFactory() throws TranslatorException {
Modified: trunk/connectors/connector-file/src/main/java/org/teiid/resource/adapter/file/FileManagedConnectionFactory.java
===================================================================
--- trunk/connectors/connector-file/src/main/java/org/teiid/resource/adapter/file/FileManagedConnectionFactory.java 2012-08-16 15:34:35 UTC (rev 4333)
+++ trunk/connectors/connector-file/src/main/java/org/teiid/resource/adapter/file/FileManagedConnectionFactory.java 2012-08-16 15:35:25 UTC (rev 4334)
@@ -28,7 +28,6 @@
import org.teiid.core.BundleUtil;
import org.teiid.core.util.StringUtil;
-import org.teiid.resource.spi.BasicConnection;
import org.teiid.resource.spi.BasicConnectionFactory;
import org.teiid.resource.spi.BasicManagedConnectionFactory;
@@ -43,15 +42,15 @@
@Override
@SuppressWarnings("serial")
- public BasicConnectionFactory createConnectionFactory() throws ResourceException {
+ public BasicConnectionFactory<FileConnectionImpl> createConnectionFactory() throws ResourceException {
if (this.parentDirectory == null) {
throw new InvalidPropertyException(UTIL.getString("parentdirectory_not_set")); //$NON-NLS-1$
}
final Map<String, String> map = StringUtil.valueOf(this.fileMapping, Map.class);
- return new BasicConnectionFactory() {
+ return new BasicConnectionFactory<FileConnectionImpl>() {
@Override
- public BasicConnection getConnection() throws ResourceException {
+ public FileConnectionImpl getConnection() throws ResourceException {
return new FileConnectionImpl(parentDirectory, map, allowParentPaths);
}
};
Modified: trunk/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/ldap/LDAPManagedConnectionFactory.java
===================================================================
--- trunk/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/ldap/LDAPManagedConnectionFactory.java 2012-08-16 15:34:35 UTC (rev 4333)
+++ trunk/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/ldap/LDAPManagedConnectionFactory.java 2012-08-16 15:35:25 UTC (rev 4334)
@@ -39,8 +39,8 @@
@Override
@SuppressWarnings("serial")
- public BasicConnectionFactory createConnectionFactory() throws ResourceException {
- return new BasicConnectionFactory() {
+ public BasicConnectionFactory<LDAPConnectionImpl> createConnectionFactory() throws ResourceException {
+ return new BasicConnectionFactory<LDAPConnectionImpl>() {
@Override
public LDAPConnectionImpl getConnection() throws ResourceException {
return new LDAPConnectionImpl(LDAPManagedConnectionFactory.this);
Modified: trunk/connectors/connector-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/SalesForceManagedConnectionFactory.java
===================================================================
--- trunk/connectors/connector-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/SalesForceManagedConnectionFactory.java 2012-08-16 15:34:35 UTC (rev 4333)
+++ trunk/connectors/connector-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/SalesForceManagedConnectionFactory.java 2012-08-16 15:35:25 UTC (rev 4334)
@@ -90,7 +90,7 @@
}
@Override
- public BasicConnectionFactory createConnectionFactory() throws ResourceException {
+ public BasicConnectionFactory<SalesforceConnectionImpl> createConnectionFactory() throws ResourceException {
QName portQName = SforceService.SERVICE;
if (this.configFile != null) {
this.bus = new SpringBusFactory().createBus(this.configFile);
@@ -101,7 +101,7 @@
}
}
- return new BasicConnectionFactory() {
+ return new BasicConnectionFactory<SalesforceConnectionImpl>() {
private static final long serialVersionUID = 5028356110047329135L;
@Override
Modified: trunk/connectors/connector-ws/src/main/java/org/teiid/resource/adapter/ws/WSManagedConnectionFactory.java
===================================================================
--- trunk/connectors/connector-ws/src/main/java/org/teiid/resource/adapter/ws/WSManagedConnectionFactory.java 2012-08-16 15:34:35 UTC (rev 4333)
+++ trunk/connectors/connector-ws/src/main/java/org/teiid/resource/adapter/ws/WSManagedConnectionFactory.java 2012-08-16 15:35:25 UTC (rev 4334)
@@ -32,7 +32,6 @@
import org.apache.cxf.interceptor.Interceptor;
import org.apache.cxf.jaxws.JaxWsClientFactoryBean;
import org.teiid.core.BundleUtil;
-import org.teiid.resource.spi.BasicConnection;
import org.teiid.resource.spi.BasicConnectionFactory;
import org.teiid.resource.spi.BasicManagedConnectionFactory;
@@ -58,7 +57,7 @@
@SuppressWarnings("serial")
@Override
- public BasicConnectionFactory createConnectionFactory() throws ResourceException {
+ public BasicConnectionFactory<WSConnectionImpl> createConnectionFactory() throws ResourceException {
String configName = getConfigName();
if (configName == null) {
configName = WSConnectionImpl.DEFAULT_LOCAL_NAME;
@@ -73,9 +72,9 @@
}
outInterceptors = instance.getOutInterceptors();
}
- return new BasicConnectionFactory() {
+ return new BasicConnectionFactory<WSConnectionImpl>() {
@Override
- public BasicConnection getConnection() throws ResourceException {
+ public WSConnectionImpl getConnection() throws ResourceException {
return new WSConnectionImpl(WSManagedConnectionFactory.this);
}
};
More information about the teiid-commits
mailing list