teiid SVN: r3750 - branches/7.6.x/documentation/admin-guide/src/main/docbook/en-US/content.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2011-12-19 13:29:52 -0500 (Mon, 19 Dec 2011)
New Revision: 3750
Modified:
branches/7.6.x/documentation/admin-guide/src/main/docbook/en-US/content/security.xml
Log:
TEIID-1873 adding more info about setting security domains
Modified: branches/7.6.x/documentation/admin-guide/src/main/docbook/en-US/content/security.xml
===================================================================
--- branches/7.6.x/documentation/admin-guide/src/main/docbook/en-US/content/security.xml 2011-12-17 03:27:07 UTC (rev 3749)
+++ branches/7.6.x/documentation/admin-guide/src/main/docbook/en-US/content/security.xml 2011-12-19 18:29:52 UTC (rev 3750)
@@ -70,10 +70,12 @@
<para>
Teiid can be configured with multiple named application policies
that group together relevant LoginModules. Each of these application
- policy (or domains) names can be used to fully
- qualify user names to
+ policy (or domain) names can be used to fully qualify user names to
authenticate only against that domain. The format for a qualified
- name is username@domainname.
+ name is username@domainname. The securityDomains property under the SessionService bean in &jboss-beans; should be used set
+ the comma separated list of desired domains. The securityDomains property defaults to a single domain named teiid-security.
+ The domain for admin access may also be changed if desired via the adminSecurityDomain property, however it is expected that the admin
+ domain will be the same one that is used by the AS profile service, which by default is named jmx-console.
</para>
<para>If a user name is not fully qualified, then the installed
domains will be consulted in order until a domain
@@ -147,7 +149,7 @@
You could do one of the following for Teiid:
<itemizedlist>
<listitem>
- <para>Reuse the jmx-console (or whatever name you choose) security domain for Teiid by changing the teiid configuration &jboss-beans; to point to jmx-console, rather than teiid-security.
+ <para>Reuse the jmx-console (or whatever name you choose) security domain for Teiid by changing the Teiid configuration &jboss-beans; to point to jmx-console, rather than teiid-security.
</para>
</listitem>
13 years
- 1
- 0
teiid SVN: r3749 - in trunk: build/kits/jboss-as7/modules/org/jboss/teiid/main and 7 other directories.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2011-12-16 22:27:07 -0500 (Fri, 16 Dec 2011)
New Revision: 3749
Added:
trunk/jboss-integration/src/main/java/org/teiid/jboss/CacheFactoryService.java
trunk/jboss-integration/src/main/java/org/teiid/jboss/DQPCoreService.java
trunk/jboss-integration/src/main/java/org/teiid/jboss/PreparedPlanCacheService.java
trunk/jboss-integration/src/main/java/org/teiid/jboss/TransportService.java
Removed:
trunk/cache-jbosscache/src/main/java/org/teiid/cache/jboss/ClusterableCacheFactory.java
trunk/jboss-integration/src/main/java/org/teiid/jboss/Transport.java
trunk/jboss-integration/src/main/java/org/teiid/jboss/deployers/RuntimeEngineDeployer.java
Modified:
trunk/build/kits/jboss-as7/domain/configuration/domain-teiid.xml
trunk/build/kits/jboss-as7/modules/org/jboss/teiid/main/module.xml
trunk/build/kits/jboss-as7/standalone/configuration/standalone-teiid.xml
trunk/cache-jbosscache/src/main/java/org/teiid/cache/jboss/JBossCacheFactory.java
trunk/jboss-integration/src/main/java/org/teiid/jboss/CacheService.java
trunk/jboss-integration/src/main/java/org/teiid/jboss/Element.java
trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidAdd.java
trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidOperationHandler.java
trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidSubsystemParser.java
trunk/jboss-integration/src/main/java/org/teiid/jboss/TransportAdd.java
trunk/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties
trunk/jboss-integration/src/main/resources/schema/jboss-teiid.xsd
trunk/jboss-integration/src/test/resources/teiid-model-config.txt
trunk/jboss-integration/src/test/resources/teiid-model-json.txt
trunk/jboss-integration/src/test/resources/teiid-sample-config.xml
trunk/jboss-integration/src/test/resources/teiid-transport-config.txt
Log:
TEIID-1720: Correcting the service loading for result set cache and their dependency chain.
Modified: trunk/build/kits/jboss-as7/domain/configuration/domain-teiid.xml
===================================================================
--- trunk/build/kits/jboss-as7/domain/configuration/domain-teiid.xml 2011-12-15 22:25:27 UTC (rev 3748)
+++ trunk/build/kits/jboss-as7/domain/configuration/domain-teiid.xml 2011-12-17 03:27:07 UTC (rev 3749)
@@ -386,7 +386,7 @@
<subsystem xmlns="urn:jboss:domain:teiid:1.0">
<async-thread-pool>teiid-async</async-thread-pool>
<distributed-cache jgroups-stack="udp" channel="teiid-rep"/>
- <resultset-cache container-name="teiid" name="resultset"/>
+ <resultset-cache infinispan-container="teiid"/>
<transport name="embedded"/>
<transport name="jdbc" protocol="teiid" socket-binding="teiid-jdbc">
Modified: trunk/build/kits/jboss-as7/modules/org/jboss/teiid/main/module.xml
===================================================================
--- trunk/build/kits/jboss-as7/modules/org/jboss/teiid/main/module.xml 2011-12-15 22:25:27 UTC (rev 3748)
+++ trunk/build/kits/jboss-as7/modules/org/jboss/teiid/main/module.xml 2011-12-17 03:27:07 UTC (rev 3749)
@@ -41,6 +41,7 @@
<module name="javax.transaction.api"/>
<module name="javax.activation.api"/>
<module name="org.jboss.as.clustering.jgroups"/>
+ <module name="org.infinispan"/>
<!-- These dependencies here for ra.xml description -->
<module name="org.jboss.as.connector"/>
<module name="org.jboss.ironjacamar.api"/>
Modified: trunk/build/kits/jboss-as7/standalone/configuration/standalone-teiid.xml
===================================================================
--- trunk/build/kits/jboss-as7/standalone/configuration/standalone-teiid.xml 2011-12-15 22:25:27 UTC (rev 3748)
+++ trunk/build/kits/jboss-as7/standalone/configuration/standalone-teiid.xml 2011-12-17 03:27:07 UTC (rev 3749)
@@ -259,7 +259,7 @@
</subsystem>
<subsystem xmlns="urn:jboss:domain:teiid:1.0">
<async-thread-pool>teiid-async</async-thread-pool>
- <resultset-cache container-name="teiid" name="resultset"/>
+ <resultset-cache infinispan-container="teiid"/>
<transport name="embedded"/>
<transport name="jdbc" protocol="teiid" socket-binding="teiid-jdbc">
Deleted: trunk/cache-jbosscache/src/main/java/org/teiid/cache/jboss/ClusterableCacheFactory.java
===================================================================
--- trunk/cache-jbosscache/src/main/java/org/teiid/cache/jboss/ClusterableCacheFactory.java 2011-12-15 22:25:27 UTC (rev 3748)
+++ trunk/cache-jbosscache/src/main/java/org/teiid/cache/jboss/ClusterableCacheFactory.java 2011-12-17 03:27:07 UTC (rev 3749)
@@ -1,100 +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.cache.jboss;
-
-import java.io.Serializable;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-import org.infinispan.manager.CacheContainer;
-import org.teiid.cache.Cache;
-import org.teiid.cache.CacheConfiguration;
-import org.teiid.cache.CacheFactory;
-import org.teiid.cache.DefaultCacheFactory;
-import org.teiid.core.TeiidRuntimeException;
-
-public class ClusterableCacheFactory implements CacheFactory, Serializable {
- private static final long serialVersionUID = -1992994494154581234L;
- private CacheFactory delegate;
- private String resultsetCacheName;
- private boolean enabled = false;
- private String cacheManagerName;
-
- @Override
- public <K, V> Cache<K, V> get(String location, CacheConfiguration config) {
- if (this.delegate == null) {
- Object cacheManager = getClusteredCache();
- if (cacheManager == null) {
- this.delegate = new DefaultCacheFactory(config);
- }
- else {
- try {
- this.delegate = new JBossCacheFactory(this.resultsetCacheName, (CacheContainer) cacheManager);
- } catch (Exception e) {
- throw new TeiidRuntimeException("Failed to obtain the clusted cache"); //$NON-NLS-1$
- }
- }
- }
- return delegate.get(location, config);
- }
-
- public void setResultsetCacheName(String name) {
- this.resultsetCacheName = name;
- }
-
- @Override
- public void destroy() {
- if (this.delegate != null) {
- this.delegate.destroy();
- }
- }
-
- private Object getClusteredCache() {
- if (this.enabled && this.cacheManagerName != null) {
- try {
- Context ctx = new InitialContext();
- return ctx.lookup(this.cacheManagerName);
- } catch (NamingException e) {
- return null;
- }
- }
- return null;
- }
-
- public void setEnabled(boolean value) {
- this.enabled = value;
- }
-
- public void setCacheManager(String mgrName) {
- this.cacheManagerName = mgrName;
- }
-
- @Override
- public boolean isReplicated() {
- if (delegate == null) {
- return false;
- }
- return delegate.isReplicated();
- }
-}
Modified: trunk/cache-jbosscache/src/main/java/org/teiid/cache/jboss/JBossCacheFactory.java
===================================================================
--- trunk/cache-jbosscache/src/main/java/org/teiid/cache/jboss/JBossCacheFactory.java 2011-12-15 22:25:27 UTC (rev 3748)
+++ trunk/cache-jbosscache/src/main/java/org/teiid/cache/jboss/JBossCacheFactory.java 2011-12-17 03:27:07 UTC (rev 3749)
@@ -38,7 +38,12 @@
public JBossCacheFactory(String name, CacheContainer cm) {
- this.cacheStore = cm.getCache(name);
+ if (name != null) {
+ this.cacheStore = cm.getCache(name);
+ }
+ else {
+ this.cacheStore = cm.getCache();
+ }
}
/**
Added: trunk/jboss-integration/src/main/java/org/teiid/jboss/CacheFactoryService.java
===================================================================
--- trunk/jboss-integration/src/main/java/org/teiid/jboss/CacheFactoryService.java (rev 0)
+++ trunk/jboss-integration/src/main/java/org/teiid/jboss/CacheFactoryService.java 2011-12-17 03:27:07 UTC (rev 3749)
@@ -0,0 +1,64 @@
+/*
+ * 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.jboss;
+
+import org.infinispan.manager.CacheContainer;
+import org.jboss.msc.service.Service;
+import org.jboss.msc.service.StartContext;
+import org.jboss.msc.service.StartException;
+import org.jboss.msc.service.StopContext;
+import org.jboss.msc.value.InjectedValue;
+import org.teiid.cache.CacheFactory;
+import org.teiid.cache.DefaultCacheFactory;
+import org.teiid.cache.jboss.JBossCacheFactory;
+
+class CacheFactoryService implements Service<CacheFactory> {
+ protected InjectedValue<CacheContainer> cacheContainerInjector = new InjectedValue<CacheContainer>();
+ private String cacheName;
+ private CacheFactory cacheFactory;
+
+ public CacheFactoryService(String cacheName){
+ this.cacheName = cacheName;
+ }
+
+ @Override
+ public void start(StartContext context) throws StartException {
+ CacheContainer cc = cacheContainerInjector.getValue();
+ if (cc != null) {
+ this.cacheFactory = new JBossCacheFactory(this.cacheName, cc);
+ }
+ else {
+ this.cacheFactory = new DefaultCacheFactory();
+ }
+ }
+
+ @Override
+ public void stop(StopContext context) {
+ this.cacheFactory.destroy();
+ this.cacheFactory = null;
+ }
+
+ @Override
+ public CacheFactory getValue() throws IllegalStateException, IllegalArgumentException {
+ return this.cacheFactory;
+ }
+}
Property changes on: trunk/jboss-integration/src/main/java/org/teiid/jboss/CacheFactoryService.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/CacheService.java
===================================================================
--- trunk/jboss-integration/src/main/java/org/teiid/jboss/CacheService.java 2011-12-15 22:25:27 UTC (rev 3748)
+++ trunk/jboss-integration/src/main/java/org/teiid/jboss/CacheService.java 2011-12-17 03:27:07 UTC (rev 3749)
@@ -26,24 +26,34 @@
import org.jboss.msc.service.StartException;
import org.jboss.msc.service.StopContext;
import org.jboss.msc.value.InjectedValue;
+import org.teiid.cache.CacheConfiguration;
+import org.teiid.cache.CacheFactory;
import org.teiid.dqp.internal.process.SessionAwareCache;
import org.teiid.dqp.service.BufferService;
class CacheService<T> implements Service<SessionAwareCache<T>> {
+
private SessionAwareCache<T> cache;
- public final InjectedValue<BufferService> bufferMgrInjector = new InjectedValue<BufferService>();
+ protected InjectedValue<BufferService> bufferMgrInjector = new InjectedValue<BufferService>();
+ protected InjectedValue<CacheFactory> cacheFactoryInjector = new InjectedValue<CacheFactory>();
+
+ private SessionAwareCache.Type type;
+ private CacheConfiguration config;
- public CacheService(SessionAwareCache<T> t){
- this.cache = t;
+ public CacheService(SessionAwareCache.Type type, CacheConfiguration config){
+ this.type = type;
+ this.config = config;
}
@Override
public void start(StartContext context) throws StartException {
+ this.cache = new SessionAwareCache<T>(cacheFactoryInjector.getValue(), this.type, this.config);
this.cache.setTupleBufferCache(this.bufferMgrInjector.getValue().getTupleBufferCache());
}
@Override
public void stop(StopContext context) {
+ this.cache = null;
}
@Override
Copied: trunk/jboss-integration/src/main/java/org/teiid/jboss/DQPCoreService.java (from rev 3748, trunk/jboss-integration/src/main/java/org/teiid/jboss/deployers/RuntimeEngineDeployer.java)
===================================================================
--- trunk/jboss-integration/src/main/java/org/teiid/jboss/DQPCoreService.java (rev 0)
+++ trunk/jboss-integration/src/main/java/org/teiid/jboss/DQPCoreService.java 2011-12-17 03:27:07 UTC (rev 3749)
@@ -0,0 +1,205 @@
+/*
+ * 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.jboss;
+
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
+
+import javax.resource.spi.XATerminator;
+import javax.resource.spi.work.WorkManager;
+import javax.transaction.TransactionManager;
+
+import org.jboss.msc.service.Service;
+import org.jboss.msc.service.ServiceController;
+import org.jboss.msc.service.ServiceName;
+import org.jboss.msc.service.StartContext;
+import org.jboss.msc.service.StopContext;
+import org.jboss.msc.value.InjectedValue;
+import org.teiid.adminapi.impl.SessionMetadata;
+import org.teiid.core.TeiidRuntimeException;
+import org.teiid.core.util.LRUCache;
+import org.teiid.deployers.CompositeVDB;
+import org.teiid.deployers.VDBLifeCycleListener;
+import org.teiid.deployers.VDBRepository;
+import org.teiid.dqp.internal.datamgr.TranslatorRepository;
+import org.teiid.dqp.internal.process.AuthorizationValidator;
+import org.teiid.dqp.internal.process.DQPConfiguration;
+import org.teiid.dqp.internal.process.DQPCore;
+import org.teiid.dqp.internal.process.SessionAwareCache;
+import org.teiid.dqp.internal.process.TransactionServerImpl;
+import org.teiid.dqp.service.BufferService;
+import org.teiid.dqp.service.TransactionService;
+import org.teiid.events.EventDistributorFactory;
+import org.teiid.logging.LogConstants;
+import org.teiid.logging.LogManager;
+import org.teiid.logging.MessageLevel;
+import org.teiid.services.BufferServiceImpl;
+import org.teiid.vdb.runtime.VDBKey;
+
+
+public class DQPCoreService extends DQPConfiguration implements Serializable, Service<DQPCore> {
+ private static final long serialVersionUID = -4676205340262775388L;
+
+ private transient TransactionServerImpl transactionServerImpl = new TransactionServerImpl();
+ private transient DQPCore dqpCore = new DQPCore();
+
+ private final InjectedValue<WorkManager> workManagerInjector = new InjectedValue<WorkManager>();
+ private final InjectedValue<XATerminator> xaTerminatorInjector = new InjectedValue<XATerminator>();
+ private final InjectedValue<TransactionManager> txnManagerInjector = new InjectedValue<TransactionManager>();
+ private final InjectedValue<BufferServiceImpl> bufferServiceInjector = new InjectedValue<BufferServiceImpl>();
+ private final InjectedValue<TranslatorRepository> translatorRepositoryInjector = new InjectedValue<TranslatorRepository>();
+ private final InjectedValue<VDBRepository> vdbRepositoryInjector = new InjectedValue<VDBRepository>();
+ private final InjectedValue<AuthorizationValidator> authorizationValidatorInjector = new InjectedValue<AuthorizationValidator>();
+ private final InjectedValue<SessionAwareCache> preparedPlanCacheInjector = new InjectedValue<SessionAwareCache>();
+ private final InjectedValue<SessionAwareCache> resultSetCacheInjector = new InjectedValue<SessionAwareCache>();
+ private final InjectedValue<EventDistributorFactory> eventDistributorFactoryInjector = new InjectedValue<EventDistributorFactory>();
+
+ @Override
+ public void start(final StartContext context) {
+ this.transactionServerImpl.setWorkManager(getWorkManagerInjector().getValue());
+ this.transactionServerImpl.setXaTerminator(getXaTerminatorInjector().getValue());
+ this.transactionServerImpl.setTransactionManager(getTxnManagerInjector().getValue());
+
+ setAuthorizationValidator(authorizationValidatorInjector.getValue());
+ setBufferService(bufferServiceInjector.getValue());
+
+ this.dqpCore.setTransactionService((TransactionService)LogManager.createLoggingProxy(LogConstants.CTX_TXN_LOG, transactionServerImpl, new Class[] {TransactionService.class}, MessageLevel.DETAIL, Thread.currentThread().getContextClassLoader()));
+ this.dqpCore.setMetadataRepository(getVdbRepository().getMetadataRepository());
+ this.dqpCore.setEventDistributor(getEventDistributorFactoryInjector().getValue().getEventDistributor());
+ this.dqpCore.setResultsetCache(getResultSetCacheInjector().getValue());
+ this.dqpCore.setPreparedPlanCache(getPreparedPlanCacheInjector().getValue());
+ this.dqpCore.start(this);
+
+
+ // add vdb life cycle listeners
+ getVdbRepository().addListener(new VDBLifeCycleListener() {
+
+ private Set<VDBKey> recentlyRemoved = Collections.newSetFromMap(new LRUCache<VDBKey, Boolean>(10000));
+
+ @Override
+ public void removed(String name, int version, CompositeVDB vdb) {
+ recentlyRemoved.add(new VDBKey(name, version));
+ }
+
+ @Override
+ public void added(String name, int version, CompositeVDB vdb) {
+ if (!recentlyRemoved.remove(new VDBKey(name, version))) {
+ return;
+ }
+ // terminate all the previous sessions
+ List<ServiceName> services = context.getController().getServiceContainer().getServiceNames();
+ for (ServiceName service:services) {
+ if (TeiidServiceNames.TRANSPORT_BASE.isParentOf(service)) {
+ ServiceController<?> transport = context.getController().getServiceContainer().getService(service);
+ if (transport != null) {
+ TransportService t = TransportService.class.cast(transport.getValue());
+ Collection<SessionMetadata> sessions = t.getActiveSessions();
+ for (SessionMetadata session:sessions) {
+ if (name.equalsIgnoreCase(session.getVDBName()) && version == session.getVDBVersion()){
+ t.terminateSession(session.getSessionId());
+ }
+ }
+ }
+ }
+ }
+
+ // dump the caches.
+ if (getResultSetCacheInjector().getValue() != null) {
+ getResultSetCacheInjector().getValue().clearForVDB(name, version);
+ }
+ if (getPreparedPlanCacheInjector().getValue() != null) {
+ getPreparedPlanCacheInjector().getValue().clearForVDB(name, version);
+ }
+ }
+ });
+
+ LogManager.logInfo(LogConstants.CTX_RUNTIME, IntegrationPlugin.Util.getString("engine_started", this.dqpCore.getRuntimeVersion(), new Date(System.currentTimeMillis()).toString())); //$NON-NLS-1$
+ }
+
+ @Override
+ public DQPCore getValue() throws IllegalStateException, IllegalArgumentException {
+ return this.dqpCore;
+ }
+
+ @Override
+ public void stop(StopContext context) {
+ try {
+ this.dqpCore.stop();
+ } catch(TeiidRuntimeException e) {
+ // this bean is already shutdown
+ }
+
+ LogManager.logInfo(LogConstants.CTX_RUNTIME, IntegrationPlugin.Util.getString("engine_stopped", new Date(System.currentTimeMillis()).toString())); //$NON-NLS-1$
+ }
+
+ public void setBufferService(BufferService service) {
+ this.dqpCore.setBufferService(service);
+ }
+
+ public InjectedValue<SessionAwareCache> getResultSetCacheInjector() {
+ return resultSetCacheInjector;
+ }
+
+ public InjectedValue<SessionAwareCache> getPreparedPlanCacheInjector() {
+ return preparedPlanCacheInjector;
+ }
+
+ public InjectedValue<TranslatorRepository> getTranslatorRepositoryInjector() {
+ return translatorRepositoryInjector;
+ }
+
+ public InjectedValue<VDBRepository> getVdbRepositoryInjector() {
+ return vdbRepositoryInjector;
+ }
+
+ private VDBRepository getVdbRepository() {
+ return vdbRepositoryInjector.getValue();
+ }
+
+ public InjectedValue<AuthorizationValidator> getAuthorizationValidatorInjector() {
+ return authorizationValidatorInjector;
+ }
+
+ public InjectedValue<BufferServiceImpl> getBufferServiceInjector() {
+ return bufferServiceInjector;
+ }
+
+ public InjectedValue<TransactionManager> getTxnManagerInjector() {
+ return txnManagerInjector;
+ }
+
+ public InjectedValue<XATerminator> getXaTerminatorInjector() {
+ return xaTerminatorInjector;
+ }
+
+ public InjectedValue<WorkManager> getWorkManagerInjector() {
+ return workManagerInjector;
+ }
+
+ public InjectedValue<EventDistributorFactory> getEventDistributorFactoryInjector() {
+ return eventDistributorFactoryInjector;
+ }
+}
Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/Element.java
===================================================================
--- trunk/jboss-integration/src/main/java/org/teiid/jboss/Element.java 2011-12-15 22:25:27 UTC (rev 3748)
+++ trunk/jboss-integration/src/main/java/org/teiid/jboss/Element.java 2011-12-17 03:27:07 UTC (rev 3749)
@@ -89,9 +89,9 @@
// Result set cache
RESULTSET_CACHE_ELEMENT("resultset-cache"),
- RSC_ENABLE_ATTRIBUTE("enable", "resultset-cache-enable", ModelType.BOOLEAN, false, null),
- RSC_NAME_ELEMENT("name", "resultset-cache-name", ModelType.STRING, false, "resultset"),
- RSC_CONTAINER_NAME_ELEMENT("container-name", "resultset-cache-container-name", ModelType.STRING, false, null),
+ RSC_ENABLE_ATTRIBUTE("enable", "resultset-cache-enable", ModelType.BOOLEAN, false, "true"),
+ RSC_NAME_ELEMENT("name", "resultset-cache-name", ModelType.STRING, false, null),
+ RSC_CONTAINER_NAME_ELEMENT("infinispan-container", "resultset-cache-infinispan-container", ModelType.STRING, false, null),
RSC_MAX_STALENESS_ELEMENT("max-staleness", "resultset-cache-max-staleness", ModelType.INT, false, "60"),
//transport
@@ -113,6 +113,7 @@
PG_MAX_LOB_SIZE_ALLOWED_ELEMENT("max-lob-size-in-bytes", "pg-max-lob-size-in-bytes", ModelType.INT, false, "5242880"), //$NON-NLS-1$ //$NON-NLS-2$
SSL_ELEMENT("ssl"),
+ SSL_ENABLE_ATTRIBUTE("enable", "ssl-enable", ModelType.BOOLEAN, false, "false"),
SSL_MODE_ATTRIBUTE("mode", "ssl-mode", ModelType.STRING, false, "login"),
SSL_AUTH_MODE_ATTRIBUTE("authentication-mode", "ssl-authentication-mode", ModelType.STRING, false, "anonymous"),
SSL_SSL_PROTOCOL_ATTRIBUTE("ssl-protocol", "ssl-ssl-protocol", ModelType.STRING, false, "SSLv3"),
Added: trunk/jboss-integration/src/main/java/org/teiid/jboss/PreparedPlanCacheService.java
===================================================================
--- trunk/jboss-integration/src/main/java/org/teiid/jboss/PreparedPlanCacheService.java (rev 0)
+++ trunk/jboss-integration/src/main/java/org/teiid/jboss/PreparedPlanCacheService.java 2011-12-17 03:27:07 UTC (rev 3749)
@@ -0,0 +1,45 @@
+/*
+ * 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.jboss;
+
+import org.jboss.msc.value.InjectedValue;
+import org.jboss.msc.value.Value;
+import org.teiid.cache.CacheConfiguration;
+import org.teiid.cache.CacheFactory;
+import org.teiid.cache.DefaultCacheFactory;
+import org.teiid.dqp.internal.process.PreparedPlan;
+import org.teiid.dqp.internal.process.SessionAwareCache;
+
+
+class PreparedPlanCacheService extends CacheService<PreparedPlan> {
+ public PreparedPlanCacheService(SessionAwareCache.Type type, CacheConfiguration config) {
+ super(type, config);
+ this.cacheFactoryInjector = new InjectedValue<CacheFactory>();
+ this.cacheFactoryInjector.setValue(new Value() {
+ @Override
+ public CacheFactory getValue() throws IllegalStateException, IllegalArgumentException {
+ return new DefaultCacheFactory();
+ }
+ });
+ }
+
+}
Property changes on: trunk/jboss-integration/src/main/java/org/teiid/jboss/PreparedPlanCacheService.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidAdd.java
===================================================================
--- trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidAdd.java 2011-12-15 22:25:27 UTC (rev 3748)
+++ trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidAdd.java 2011-12-17 03:27:07 UTC (rev 3749)
@@ -37,6 +37,7 @@
import javax.resource.spi.work.WorkManager;
import javax.transaction.TransactionManager;
+import org.infinispan.manager.CacheContainer;
import org.jboss.as.clustering.jgroups.ChannelFactory;
import org.jboss.as.controller.AbstractAddStepHandler;
import org.jboss.as.controller.OperationContext;
@@ -66,8 +67,7 @@
import org.teiid.PolicyDecider;
import org.teiid.cache.CacheConfiguration;
import org.teiid.cache.CacheConfiguration.Policy;
-import org.teiid.cache.DefaultCacheFactory;
-import org.teiid.cache.jboss.ClusterableCacheFactory;
+import org.teiid.cache.CacheFactory;
import org.teiid.deployers.SystemVDBDeployer;
import org.teiid.deployers.VDBRepository;
import org.teiid.deployers.VDBStatusChecker;
@@ -81,7 +81,6 @@
import org.teiid.dqp.internal.process.SessionAwareCache;
import org.teiid.dqp.service.BufferService;
import org.teiid.events.EventDistributorFactory;
-import org.teiid.jboss.deployers.RuntimeEngineDeployer;
import org.teiid.logging.LogConstants;
import org.teiid.logging.LogManager;
import org.teiid.metadata.MetadataRepository;
@@ -315,21 +314,48 @@
newControllers.add(target.addService(TeiidServiceNames.AUTHORIZATION_VALIDATOR, authValidatorService).install());
// resultset cache
- final SessionAwareCache<CachedResults> resultsetCache = buildResultsetCache(operation);
- CacheService<CachedResults> resultSetService = new CacheService<CachedResults>(resultsetCache);
- ServiceBuilder<SessionAwareCache<CachedResults>> resultsCacheBuilder = target.addService(TeiidServiceNames.CACHE_RESULTSET, resultSetService);
- resultsCacheBuilder.addDependency(TeiidServiceNames.BUFFER_MGR, BufferService.class, resultSetService.bufferMgrInjector);
- newControllers.add(resultsCacheBuilder.install());
+ boolean rsCache = true;
+ if (Element.RSC_ENABLE_ATTRIBUTE.isDefined(operation) && !Element.RSC_ENABLE_ATTRIBUTE.asBoolean(operation)) {
+ rsCache = false;
+ }
+
+ String infinispanCacheContainer = null;
+ if (Element.RSC_CONTAINER_NAME_ELEMENT.isDefined(operation)) {
+ infinispanCacheContainer = Element.RSC_CONTAINER_NAME_ELEMENT.asString(operation);
+ }
+
+ String cacheName = null;
+ if (Element.RSC_NAME_ELEMENT.isDefined(operation)) {
+ // if null; default cache will be used
+ cacheName = Element.RSC_NAME_ELEMENT.asString(operation);
+ }
- // prepared-plan cache
- final SessionAwareCache<PreparedPlan> preparedPlanCache = buildPreparedPlanCache(operation);
- CacheService<PreparedPlan> preparedPlanService = new CacheService<PreparedPlan>(preparedPlanCache);
+ if (rsCache) {
+ ServiceName cfName = ServiceName.JBOSS.append("teiid", "infinispan-cache-factory"); //$NON-NLS-1$ //$NON-NLS-2$
+ CacheFactoryService cfs = new CacheFactoryService(cacheName);
+ ServiceBuilder<CacheFactory> cacheFactoryBuilder = target.addService(cfName, cfs);
+
+ if (infinispanCacheContainer != null) {
+ cacheFactoryBuilder.addDependency(ServiceName.JBOSS.append("infinispan", infinispanCacheContainer), CacheContainer.class, cfs.cacheContainerInjector); //$NON-NLS-1$
+ }
+ newControllers.add(cacheFactoryBuilder.install());
+
+ CacheService<CachedResults> resultSetService = new CacheService<CachedResults>(SessionAwareCache.Type.RESULTSET, buildCacheConfig(operation));
+ ServiceBuilder<SessionAwareCache<CachedResults>> resultsCacheBuilder = target.addService(TeiidServiceNames.CACHE_RESULTSET, resultSetService);
+ resultsCacheBuilder.addDependency(TeiidServiceNames.BUFFER_MGR, BufferService.class, resultSetService.bufferMgrInjector);
+ resultsCacheBuilder.addDependency(cfName, CacheFactory.class, resultSetService.cacheFactoryInjector);
+ newControllers.add(resultsCacheBuilder.install());
+ }
+
+ // prepared-plan cache (note that there is no dependency on the cache factory for
+ // prepared plan cache, as it is always local)
+ CacheService<PreparedPlan> preparedPlanService = new PreparedPlanCacheService(SessionAwareCache.Type.PREPAREDPLAN, buildPreparedPlanCacheConfig(operation));
ServiceBuilder<SessionAwareCache<PreparedPlan>> preparedPlanCacheBuilder = target.addService(TeiidServiceNames.CACHE_PREPAREDPLAN, preparedPlanService);
preparedPlanCacheBuilder.addDependency(TeiidServiceNames.BUFFER_MGR, BufferService.class, preparedPlanService.bufferMgrInjector);
newControllers.add(preparedPlanCacheBuilder.install());
// Query Engine
- final RuntimeEngineDeployer engine = buildQueryEngine(operation);
+ final DQPCoreService engine = buildQueryEngine(operation);
String workManager = "default"; //$NON-NLS-1$
if (Element.WORKMANAGER.isDefined(operation)) {
workManager = Element.WORKMANAGER.asString(operation);
@@ -344,7 +370,7 @@
engineBuilder.addDependency(TeiidServiceNames.TRANSLATOR_REPO, TranslatorRepository.class, engine.getTranslatorRepositoryInjector());
engineBuilder.addDependency(TeiidServiceNames.VDB_REPO, VDBRepository.class, engine.getVdbRepositoryInjector());
engineBuilder.addDependency(TeiidServiceNames.AUTHORIZATION_VALIDATOR, AuthorizationValidator.class, engine.getAuthorizationValidatorInjector());
- engineBuilder.addDependency(TeiidServiceNames.CACHE_RESULTSET, SessionAwareCache.class, engine.getResultSetCacheInjector());
+ engineBuilder.addDependency(rsCache?DependencyType.REQUIRED:DependencyType.OPTIONAL, TeiidServiceNames.CACHE_RESULTSET, SessionAwareCache.class, engine.getResultSetCacheInjector());
engineBuilder.addDependency(TeiidServiceNames.CACHE_PREPAREDPLAN, SessionAwareCache.class, engine.getPreparedPlanCacheInjector());
engineBuilder.addDependency(TeiidServiceNames.EVENT_DISTRIBUTOR_FACTORY, EventDistributorFactory.class, engine.getEventDistributorFactoryInjector());
@@ -455,7 +481,7 @@
return bufferManger;
}
- private SessionAwareCache<CachedResults> buildResultsetCache(ModelNode node) {
+ private CacheConfiguration buildCacheConfig(ModelNode node) {
CacheConfiguration cacheConfig = new CacheConfiguration();
cacheConfig.setMaxEntries(1024);
@@ -464,40 +490,15 @@
cacheConfig.setLocation("resultset"); //$NON-NLS-1$
cacheConfig.setMaxStaleness(60);
- if (Element.RSC_ENABLE_ATTRIBUTE.isDefined(node)) {
- if (!Element.RSC_ENABLE_ATTRIBUTE.asBoolean(node)) {
- return null;
- }
- }
-
- ClusterableCacheFactory cacheFactory = null;
-
- if (Element.RSC_CONTAINER_NAME_ELEMENT.isDefined(node)) {
- cacheFactory = new ClusterableCacheFactory();
- cacheFactory.setCacheManager(Element.RSC_CONTAINER_NAME_ELEMENT.asString(node));
- }
- else {
- SessionAwareCache<CachedResults> resultsetCache = new SessionAwareCache<CachedResults>(new DefaultCacheFactory(), SessionAwareCache.Type.RESULTSET, cacheConfig);
- return resultsetCache;
- }
-
- if (Element.RSC_NAME_ELEMENT.isDefined(node)) {
- cacheFactory.setResultsetCacheName(Element.RSC_NAME_ELEMENT.asString(node));
- }
- else {
- cacheFactory.setResultsetCacheName("resultset"); //$NON-NLS-1$
- }
-
if (Element.RSC_MAX_STALENESS_ELEMENT.isDefined(node)) {
cacheConfig.setMaxStaleness(Element.RSC_MAX_STALENESS_ELEMENT.asInt(node));
}
- SessionAwareCache<CachedResults> resultsetCache = new SessionAwareCache<CachedResults>(cacheFactory, SessionAwareCache.Type.RESULTSET, cacheConfig);
- return resultsetCache;
+ return cacheConfig;
}
- private SessionAwareCache<PreparedPlan> buildPreparedPlanCache(ModelNode node) {
+ private CacheConfiguration buildPreparedPlanCacheConfig(ModelNode node) {
CacheConfiguration cacheConfig = new CacheConfiguration();
if (Element.PPC_MAX_ENTRIES_ATTRIBUTE.isDefined(node)) {
cacheConfig.setMaxEntries(Element.PPC_MAX_ENTRIES_ATTRIBUTE.asInt(node));
@@ -516,14 +517,13 @@
cacheConfig.setType(Policy.LRU.name());
cacheConfig.setLocation("prepared"); //$NON-NLS-1$
- SessionAwareCache<PreparedPlan> cache = new SessionAwareCache<PreparedPlan>(new DefaultCacheFactory(), SessionAwareCache.Type.PREPAREDPLAN, cacheConfig);
- return cache;
+ return cacheConfig;
}
- private RuntimeEngineDeployer buildQueryEngine(ModelNode node) {
- RuntimeEngineDeployer engine = new RuntimeEngineDeployer();
+ private DQPCoreService buildQueryEngine(ModelNode node) {
+ DQPCoreService engine = new DQPCoreService();
if (Element.MAX_THREADS_ELEMENT.isDefined(node)) {
engine.setMaxThreads(Element.MAX_THREADS_ELEMENT.asInt(node));
Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidOperationHandler.java
===================================================================
--- trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidOperationHandler.java 2011-12-15 22:25:27 UTC (rev 3748)
+++ trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidOperationHandler.java 2011-12-17 03:27:07 UTC (rev 3749)
@@ -84,7 +84,7 @@
import org.teiid.logging.LogManager;
abstract class TeiidOperationHandler extends BaseOperationHandler<DQPCore> {
- List<Transport> transports = new ArrayList<Transport>();
+ List<TransportService> transports = new ArrayList<TransportService>();
protected VDBRepository vdbRepo;
protected DQPCore engine;
@@ -104,7 +104,7 @@
if (TeiidServiceNames.TRANSPORT_BASE.isParentOf(name)) {
ServiceController<?> transport = context.getServiceRegistry(false).getService(name);
if (transport != null) {
- this.transports.add(Transport.class.cast(transport.getValue()));
+ this.transports.add(TransportService.class.cast(transport.getValue()));
}
}
}
@@ -156,7 +156,7 @@
protected void executeOperation(OperationContext context, DQPCore engine, ModelNode operation) throws OperationFailedException{
try {
int count = 0;
- for (Transport t: this.transports) {
+ for (TransportService t: this.transports) {
count += t.getActiveSessionsCount();
}
context.getResult().set(count);
@@ -177,7 +177,7 @@
@Override
protected void executeOperation(OperationContext context, DQPCore engine, ModelNode operation) throws OperationFailedException{
ModelNode result = context.getResult();
- for (Transport t: this.transports) {
+ for (TransportService t: this.transports) {
Collection<SessionMetadata> sessions = t.getActiveSessions();
for (SessionMetadata session:sessions) {
VDBMetadataMapper.SessionMetadataMapper.INSTANCE.wrap(session, result.add());
@@ -254,7 +254,7 @@
ModelNode result = context.getResult();
String vdbName = operation.get(OperationsConstants.VDB_NAME).asString();
int vdbVersion = operation.get(OperationsConstants.VDB_VERSION).asInt();
- for (Transport t: this.transports) {
+ for (TransportService t: this.transports) {
List<RequestMetadata> requests = t.getRequestsUsingVDB(vdbName,vdbVersion);
for (RequestMetadata request:requests) {
VDBMetadataMapper.RequestMetadataMapper.INSTANCE.wrap(request, result.add());
@@ -305,7 +305,7 @@
if (!operation.hasDefined(OperationsConstants.SESSION)) {
throw new OperationFailedException(new ModelNode().set(IntegrationPlugin.Util.getString(OperationsConstants.SESSION+MISSING)));
}
- for (Transport t: this.transports) {
+ for (TransportService t: this.transports) {
t.terminateSession(operation.get(OperationsConstants.SESSION).asString());
}
}
@@ -375,7 +375,10 @@
sc = context.getServiceRegistry(false).getRequiredService(TeiidServiceNames.CACHE_PREPAREDPLAN);
}
- return SessionAwareCache.class.cast(sc.getValue());
+ if (sc != null) {
+ return SessionAwareCache.class.cast(sc.getValue());
+ }
+ return null;
}
}
@@ -417,6 +420,10 @@
}
String cacheType = operation.get(OperationsConstants.CACHE_TYPE).asString();
+ if (cache == null) {
+ throw new OperationFailedException(new ModelNode().set(IntegrationPlugin.Util.getString("cache_not_found", cacheType))); //$NON-NLS-1$
+ }
+
if (operation.hasDefined(OperationsConstants.VDB_NAME) && operation.hasDefined(OperationsConstants.VDB_VERSION)) {
String vdbName = operation.get(OperationsConstants.VDB_NAME).asString();
int vdbVersion = operation.get(OperationsConstants.VDB_VERSION).asInt();
@@ -456,8 +463,12 @@
if (!operation.hasDefined(OperationsConstants.CACHE_TYPE)) {
throw new OperationFailedException(new ModelNode().set(IntegrationPlugin.Util.getString(OperationsConstants.CACHE_TYPE+MISSING)));
}
+ String cacheType = operation.get(OperationsConstants.CACHE_TYPE).asString();
+ if (cache == null) {
+ throw new OperationFailedException(new ModelNode().set(IntegrationPlugin.Util.getString("cache_not_found", cacheType))); //$NON-NLS-1$
+ }
+
ModelNode result = context.getResult();
- String cacheType = operation.get(OperationsConstants.CACHE_TYPE).asString();
CacheStatisticsMetadata stats = buildCacheStats(cacheType, cache);
VDBMetadataMapper.CacheStatisticsMetadataMapper.INSTANCE.wrap(stats, result);
}
Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidSubsystemParser.java
===================================================================
--- trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidSubsystemParser.java 2011-12-15 22:25:27 UTC (rev 3748)
+++ trunk/jboss-integration/src/main/java/org/teiid/jboss/TeiidSubsystemParser.java 2011-12-17 03:27:07 UTC (rev 3749)
@@ -162,6 +162,7 @@
if (like(node, Element.SSL_ELEMENT)) {
writer.writeStartElement(Element.SSL_ELEMENT.getLocalName());
+ writeAttribute(writer, Element.SSL_ENABLE_ATTRIBUTE, node);
writeAttribute(writer, Element.SSL_MODE_ATTRIBUTE, node);
writeAttribute(writer, Element.SSL_AUTH_MODE_ATTRIBUTE, node);
writeAttribute(writer, Element.SSL_SSL_PROTOCOL_ATTRIBUTE, node);
@@ -501,6 +502,7 @@
Element element = Element.forName(attrName, Element.SSL_ELEMENT);
switch(element) {
+ case SSL_ENABLE_ATTRIBUTE:
case SSL_MODE_ATTRIBUTE:
case SSL_AUTH_MODE_ATTRIBUTE:
case SSL_SSL_PROTOCOL_ATTRIBUTE:
Deleted: trunk/jboss-integration/src/main/java/org/teiid/jboss/Transport.java
===================================================================
--- trunk/jboss-integration/src/main/java/org/teiid/jboss/Transport.java 2011-12-15 22:25:27 UTC (rev 3748)
+++ trunk/jboss-integration/src/main/java/org/teiid/jboss/Transport.java 2011-12-17 03:27:07 UTC (rev 3749)
@@ -1,289 +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.jboss;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-import java.net.InetSocketAddress;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
-import org.jboss.as.network.SocketBinding;
-import org.jboss.as.security.plugins.SecurityDomainContext;
-import org.jboss.msc.service.Service;
-import org.jboss.msc.service.StartContext;
-import org.jboss.msc.service.StartException;
-import org.jboss.msc.service.StopContext;
-import org.jboss.msc.value.InjectedValue;
-import org.teiid.adminapi.AdminComponentException;
-import org.teiid.adminapi.AdminException;
-import org.teiid.adminapi.impl.RequestMetadata;
-import org.teiid.adminapi.impl.SessionMetadata;
-import org.teiid.client.DQP;
-import org.teiid.client.security.ILogon;
-import org.teiid.client.util.ExceptionUtil;
-import org.teiid.core.ComponentNotFoundException;
-import org.teiid.deployers.VDBRepository;
-import org.teiid.dqp.internal.process.DQPCore;
-import org.teiid.dqp.internal.process.DQPWorkContext;
-import org.teiid.dqp.service.SessionServiceException;
-import org.teiid.logging.LogConstants;
-import org.teiid.logging.LogManager;
-import org.teiid.logging.MessageLevel;
-import org.teiid.net.socket.AuthenticationType;
-import org.teiid.security.SecurityHelper;
-import org.teiid.services.BufferServiceImpl;
-import org.teiid.services.SessionServiceImpl;
-import org.teiid.transport.ClientServiceRegistry;
-import org.teiid.transport.ClientServiceRegistryImpl;
-import org.teiid.transport.LocalServerConnection;
-import org.teiid.transport.LogonImpl;
-import org.teiid.transport.ODBCSocketListener;
-import org.teiid.transport.SocketConfiguration;
-import org.teiid.transport.SocketListener;
-
-public class Transport implements Service<ClientServiceRegistry>, ClientServiceRegistry {
- private enum Protocol {teiid, pg};
- private ClientServiceRegistryImpl csr = new ClientServiceRegistryImpl();
- private transient ILogon logon;
- private SocketConfiguration socketConfig;
- final ConcurrentMap<String, SecurityDomainContext> securityDomains = new ConcurrentHashMap<String, SecurityDomainContext>();
- private List<String> authenticationDomains;;
- private long sessionMaxLimit;
- private long sessionExpirationTimeLimit;
- private SocketListener socketListener;
- private transient SessionServiceImpl sessionService;
- private AuthenticationType authenticationType;
- private int maxODBCLobSizeAllowed = 5*1024*1024; // 5 MB
- private boolean embedded;
- private String krb5Domain;
-
- private final InjectedValue<SocketBinding> socketBindingInjector = new InjectedValue<SocketBinding>();
- private final InjectedValue<VDBRepository> vdbRepositoryInjector = new InjectedValue<VDBRepository>();
- private final InjectedValue<DQPCore> dqpInjector = new InjectedValue<DQPCore>();
- private final InjectedValue<BufferServiceImpl> bufferServiceInjector = new InjectedValue<BufferServiceImpl>();
-
- @Override
- public <T> T getClientService(Class<T> iface) throws ComponentNotFoundException {
- return csr.getClientService(iface);
- }
-
- @Override
- public SecurityHelper getSecurityHelper() {
- return csr.getSecurityHelper();
- }
-
- @Override
- public ClientServiceRegistry getValue() throws IllegalStateException, IllegalArgumentException {
- return this;
- }
-
- @Override
- public void start(StartContext context) throws StartException {
- this.csr.setSecurityHelper(new JBossSecurityHelper());
-
- this.sessionService = new JBossSessionService(this.securityDomains);
- if (this.authenticationDomains != null && !this.authenticationDomains.isEmpty()) {
- this.sessionService.setSecurityDomains(this.authenticationDomains);
- }
- this.sessionService.setSessionExpirationTimeLimit(this.sessionExpirationTimeLimit);
- this.sessionService.setSessionMaxLimit(this.sessionMaxLimit);
- this.sessionService.setDqp(getDQP());
- this.sessionService.setVDBRepository(getVdbRepository());
- this.sessionService.setSecurityHelper(this.csr.getSecurityHelper());
- this.sessionService.setAuthenticationType(getAuthenticationType());
- this.sessionService.setGssSecurityDomain(this.krb5Domain);
- this.sessionService.start();
-
- // create the necessary services
- this.logon = new LogonImpl(this.sessionService, "teiid-cluster"); //$NON-NLS-1$
-
- 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", address.getHostName(), String.valueOf(address.getPort()), (sslEnabled?"ON":"OFF"), authenticationDomains)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- }
- 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", address.getHostName(), String.valueOf(address.getPort()), (sslEnabled?"ON":"OFF"), authenticationDomains)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- }
- else {
- throw new StartException(IntegrationPlugin.Util.getString("wrong_protocol")); //$NON-NLS-1$
- }
- }
- else {
- LogManager.logInfo(LogConstants.CTX_RUNTIME, IntegrationPlugin.Util.getString("embedded_enabled", LocalServerConnection.TEIID_RUNTIME_CONTEXT)); //$NON-NLS-1$
- }
-
- DQP dqpProxy = proxyService(DQP.class, getDQP(), LogConstants.CTX_DQP);
- this.csr.registerClientService(ILogon.class, logon, LogConstants.CTX_SECURITY);
- this.csr.registerClientService(DQP.class, dqpProxy, LogConstants.CTX_DQP);
- }
-
- @Override
- public void stop(StopContext context) {
- // Stop socket transport(s)
- if (this.socketListener != null) {
- this.socketListener.stop();
- this.socketListener = null;
- }
- this.sessionService.stop();
- }
-
- /**
- * Creates an proxy to validate the incoming session
- */
- private <T> T proxyService(final Class<T> iface, final T instance, String context) {
-
- return iface.cast(Proxy.newProxyInstance(this.getClass().getClassLoader(), new Class[] {iface}, new LogManager.LoggingProxy(instance, context, MessageLevel.TRACE) {
-
- public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
- Throwable exception = null;
- try {
- sessionService.validateSession(DQPWorkContext.getWorkContext().getSessionId());
- return super.invoke(proxy, method, args);
- } catch (InvocationTargetException e) {
- exception = e.getTargetException();
- } catch(Throwable t){
- exception = t;
- }
- throw ExceptionUtil.convertException(method, exception);
- }
- }));
- }
-
- public List<RequestMetadata> getRequestsUsingVDB(String vdbName, int vdbVersion) {
- List<RequestMetadata> requests = new ArrayList<RequestMetadata>();
- Collection<SessionMetadata> sessions = this.sessionService.getActiveSessions();
- for (SessionMetadata session:sessions) {
- if (session.getVDBName().equals(vdbName) && session.getVDBVersion() == vdbVersion) {
- requests.addAll(getDQP().getRequestsForSession(session.getSessionId()));
- }
- }
- return requests;
- }
-
- public void terminateSession(String terminateeId) {
- this.sessionService.terminateSession(terminateeId, DQPWorkContext.getWorkContext().getSessionId());
- }
-
- public Collection<SessionMetadata> getActiveSessions(){
- return this.sessionService.getActiveSessions();
- }
-
- public int getActiveSessionsCount() throws AdminException{
- try {
- return this.sessionService.getActiveSessionsCount();
- } catch (SessionServiceException e) {
- throw new AdminComponentException(e);
- }
- }
-
- public InjectedValue<SocketBinding> getSocketBindingInjector() {
- return this.socketBindingInjector;
- }
-
- public SocketConfiguration getSocketConfig() {
- return socketConfig;
- }
-
- public void setSocketConfig(SocketConfiguration socketConfig) {
- this.socketConfig = socketConfig;
- }
-
- public List<String> getAuthenticationDomains() {
- return authenticationDomains;
- }
-
- public void setAuthenticationDomains(List<String> authenticationDomains) {
- this.authenticationDomains = new LinkedList(authenticationDomains);
- }
-
- public void setSessionMaxLimit(long limit) {
- this.sessionMaxLimit = limit;
- }
-
- public void setSessionExpirationTimeLimit(long limit) {
- this.sessionExpirationTimeLimit = limit;
- }
-
- public AuthenticationType getAuthenticationType() {
- return authenticationType;
- }
-
- public void setAuthenticationType(AuthenticationType authenticationType) {
- this.authenticationType = authenticationType;
- }
-
- public InjectedValue<VDBRepository> getVdbRepositoryInjector() {
- return vdbRepositoryInjector;
- }
-
- private VDBRepository getVdbRepository() {
- return vdbRepositoryInjector.getValue();
- }
-
- private DQPCore getDQP() {
- return getDqpInjector().getValue();
- }
-
- public InjectedValue<DQPCore> getDqpInjector() {
- return dqpInjector;
- }
-
- public InjectedValue<BufferServiceImpl> getBufferServiceInjector() {
- return bufferServiceInjector;
- }
-
- private int getMaxODBCLobSizeAllowed() {
- return this.maxODBCLobSizeAllowed;
- }
-
- public void setMaxODBCLobSizeAllowed(int lobSize) {
- this.maxODBCLobSizeAllowed = lobSize;
- }
-
- public void setEmbedded(boolean v) {
- this.embedded = v;
- }
-
- public boolean isEmbedded() {
- return this.embedded;
- }
-
- public void setKrb5Domain(String domain) {
- this.krb5Domain = domain;
- }
-}
Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/TransportAdd.java
===================================================================
--- trunk/jboss-integration/src/main/java/org/teiid/jboss/TransportAdd.java 2011-12-15 22:25:27 UTC (rev 3748)
+++ trunk/jboss-integration/src/main/java/org/teiid/jboss/TransportAdd.java 2011-12-17 03:27:07 UTC (rev 3749)
@@ -81,6 +81,7 @@
Element.PG_MAX_LOB_SIZE_ALLOWED_ELEMENT,
+ Element.SSL_ENABLE_ATTRIBUTE,
Element.SSL_MODE_ATTRIBUTE,
Element.SSL_AUTH_MODE_ATTRIBUTE,
Element.SSL_SSL_PROTOCOL_ATTRIBUTE,
@@ -137,7 +138,7 @@
final PathAddress pathAddress = PathAddress.pathAddress(address);
final String transportName = pathAddress.getLastElement().getValue();
- Transport transport = new Transport();
+ TransportService transport = new TransportService();
String socketBinding = null;
if (Element.TRANSPORT_SOCKET_BINDING_ATTRIBUTE.isDefined(operation)) {
@@ -249,10 +250,14 @@
boolean sslEnabled = false;
SSLConfiguration ssl = new SSLConfiguration();
ssl.setAuthenticationMode(SSLConfiguration.ANONYMOUS);
+
+ if (Element.SSL_ENABLE_ATTRIBUTE.isDefined(node)) {
+ ssl.setMode(Element.SSL_ENABLE_ATTRIBUTE.asString(node));
+ sslEnabled = true;
+ }
if (Element.SSL_MODE_ATTRIBUTE.isDefined(node)) {
ssl.setMode(Element.SSL_MODE_ATTRIBUTE.asString(node));
- sslEnabled = true;
}
if (Element.SSL_SSL_PROTOCOL_ATTRIBUTE.isDefined(node)) {
Copied: trunk/jboss-integration/src/main/java/org/teiid/jboss/TransportService.java (from rev 3748, trunk/jboss-integration/src/main/java/org/teiid/jboss/Transport.java)
===================================================================
--- trunk/jboss-integration/src/main/java/org/teiid/jboss/TransportService.java (rev 0)
+++ trunk/jboss-integration/src/main/java/org/teiid/jboss/TransportService.java 2011-12-17 03:27:07 UTC (rev 3749)
@@ -0,0 +1,303 @@
+/*
+ * 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.jboss;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.net.InetSocketAddress;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+import org.jboss.as.network.SocketBinding;
+import org.jboss.as.security.plugins.SecurityDomainContext;
+import org.jboss.msc.service.Service;
+import org.jboss.msc.service.StartContext;
+import org.jboss.msc.service.StartException;
+import org.jboss.msc.service.StopContext;
+import org.jboss.msc.value.InjectedValue;
+import org.teiid.adminapi.AdminComponentException;
+import org.teiid.adminapi.AdminException;
+import org.teiid.adminapi.impl.RequestMetadata;
+import org.teiid.adminapi.impl.SessionMetadata;
+import org.teiid.client.DQP;
+import org.teiid.client.security.ILogon;
+import org.teiid.client.util.ExceptionUtil;
+import org.teiid.core.ComponentNotFoundException;
+import org.teiid.deployers.VDBRepository;
+import org.teiid.dqp.internal.process.DQPCore;
+import org.teiid.dqp.internal.process.DQPWorkContext;
+import org.teiid.dqp.service.SessionServiceException;
+import org.teiid.logging.LogConstants;
+import org.teiid.logging.LogManager;
+import org.teiid.logging.MessageLevel;
+import org.teiid.net.socket.AuthenticationType;
+import org.teiid.security.SecurityHelper;
+import org.teiid.services.BufferServiceImpl;
+import org.teiid.services.SessionServiceImpl;
+import org.teiid.transport.ClientServiceRegistry;
+import org.teiid.transport.ClientServiceRegistryImpl;
+import org.teiid.transport.LocalServerConnection;
+import org.teiid.transport.LogonImpl;
+import org.teiid.transport.ODBCSocketListener;
+import org.teiid.transport.SocketConfiguration;
+import org.teiid.transport.SocketListener;
+
+public class TransportService implements Service<ClientServiceRegistry>, ClientServiceRegistry {
+ private enum Protocol {teiid, pg};
+ private ClientServiceRegistryImpl csr = new ClientServiceRegistryImpl();
+ private transient ILogon logon;
+ private SocketConfiguration socketConfig;
+ final ConcurrentMap<String, SecurityDomainContext> securityDomains = new ConcurrentHashMap<String, SecurityDomainContext>();
+ private List<String> authenticationDomains;;
+ private long sessionMaxLimit;
+ private long sessionExpirationTimeLimit;
+ private SocketListener socketListener;
+ private transient SessionServiceImpl sessionService;
+ private AuthenticationType authenticationType;
+ private int maxODBCLobSizeAllowed = 5*1024*1024; // 5 MB
+ private boolean embedded;
+ private String krb5Domain;
+ private InetSocketAddress address = null;
+
+ private final InjectedValue<SocketBinding> socketBindingInjector = new InjectedValue<SocketBinding>();
+ private final InjectedValue<VDBRepository> vdbRepositoryInjector = new InjectedValue<VDBRepository>();
+ private final InjectedValue<DQPCore> dqpInjector = new InjectedValue<DQPCore>();
+ private final InjectedValue<BufferServiceImpl> bufferServiceInjector = new InjectedValue<BufferServiceImpl>();
+
+ @Override
+ public <T> T getClientService(Class<T> iface) throws ComponentNotFoundException {
+ return csr.getClientService(iface);
+ }
+
+ @Override
+ public SecurityHelper getSecurityHelper() {
+ return csr.getSecurityHelper();
+ }
+
+ @Override
+ public ClientServiceRegistry getValue() throws IllegalStateException, IllegalArgumentException {
+ return this;
+ }
+
+ @Override
+ public void start(StartContext context) throws StartException {
+ this.csr.setSecurityHelper(new JBossSecurityHelper());
+
+ this.sessionService = new JBossSessionService(this.securityDomains);
+ if (this.authenticationDomains != null && !this.authenticationDomains.isEmpty()) {
+ this.sessionService.setSecurityDomains(this.authenticationDomains);
+ }
+ this.sessionService.setSessionExpirationTimeLimit(this.sessionExpirationTimeLimit);
+ this.sessionService.setSessionMaxLimit(this.sessionMaxLimit);
+ this.sessionService.setDqp(getDQP());
+ this.sessionService.setVDBRepository(getVdbRepository());
+ this.sessionService.setSecurityHelper(this.csr.getSecurityHelper());
+ this.sessionService.setAuthenticationType(getAuthenticationType());
+ this.sessionService.setGssSecurityDomain(this.krb5Domain);
+ this.sessionService.start();
+
+ // create the necessary services
+ this.logon = new LogonImpl(this.sessionService, "teiid-cluster"); //$NON-NLS-1$
+
+ if (this.socketConfig != null) {
+ this.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", address.getHostName(), String.valueOf(address.getPort()), (sslEnabled?"ON":"OFF"), authenticationDomains)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ }
+ 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", address.getHostName(), String.valueOf(address.getPort()), (sslEnabled?"ON":"OFF"), authenticationDomains)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ }
+ else {
+ throw new StartException(IntegrationPlugin.Util.getString("wrong_protocol")); //$NON-NLS-1$
+ }
+ }
+ else {
+ LogManager.logInfo(LogConstants.CTX_RUNTIME, IntegrationPlugin.Util.getString("embedded_enabled", LocalServerConnection.TEIID_RUNTIME_CONTEXT)); //$NON-NLS-1$
+ }
+
+ DQP dqpProxy = proxyService(DQP.class, getDQP(), LogConstants.CTX_DQP);
+ this.csr.registerClientService(ILogon.class, logon, LogConstants.CTX_SECURITY);
+ this.csr.registerClientService(DQP.class, dqpProxy, LogConstants.CTX_DQP);
+ }
+
+ @Override
+ public void stop(StopContext context) {
+ // Stop socket transport(s)
+ if (this.socketListener != null) {
+ this.socketListener.stop();
+ this.socketListener = null;
+ }
+ this.sessionService.stop();
+
+ if (this.socketConfig != null) {
+ Protocol protocol = Protocol.valueOf(socketConfig.getProtocol());
+ if (protocol == Protocol.teiid) {
+ LogManager.logInfo(LogConstants.CTX_RUNTIME, IntegrationPlugin.Util.getString("socket_disabled", this.address.getHostName(), String.valueOf(this.address.getPort()))); //$NON-NLS-1$
+ }
+ else if (protocol == Protocol.pg) {
+ LogManager.logInfo(LogConstants.CTX_RUNTIME, IntegrationPlugin.Util.getString("odbc_disabled", this.address.getHostName(), String.valueOf(this.address.getPort()))); //$NON-NLS-1$
+ }
+ }
+ else {
+ LogManager.logInfo(LogConstants.CTX_RUNTIME, IntegrationPlugin.Util.getString("embedded_disabled", LocalServerConnection.TEIID_RUNTIME_CONTEXT)); //$NON-NLS-1$
+ }
+ }
+
+ /**
+ * Creates an proxy to validate the incoming session
+ */
+ private <T> T proxyService(final Class<T> iface, final T instance, String context) {
+
+ return iface.cast(Proxy.newProxyInstance(this.getClass().getClassLoader(), new Class[] {iface}, new LogManager.LoggingProxy(instance, context, MessageLevel.TRACE) {
+
+ public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+ Throwable exception = null;
+ try {
+ sessionService.validateSession(DQPWorkContext.getWorkContext().getSessionId());
+ return super.invoke(proxy, method, args);
+ } catch (InvocationTargetException e) {
+ exception = e.getTargetException();
+ } catch(Throwable t){
+ exception = t;
+ }
+ throw ExceptionUtil.convertException(method, exception);
+ }
+ }));
+ }
+
+ public List<RequestMetadata> getRequestsUsingVDB(String vdbName, int vdbVersion) {
+ List<RequestMetadata> requests = new ArrayList<RequestMetadata>();
+ Collection<SessionMetadata> sessions = this.sessionService.getActiveSessions();
+ for (SessionMetadata session:sessions) {
+ if (session.getVDBName().equals(vdbName) && session.getVDBVersion() == vdbVersion) {
+ requests.addAll(getDQP().getRequestsForSession(session.getSessionId()));
+ }
+ }
+ return requests;
+ }
+
+ public void terminateSession(String terminateeId) {
+ this.sessionService.terminateSession(terminateeId, DQPWorkContext.getWorkContext().getSessionId());
+ }
+
+ public Collection<SessionMetadata> getActiveSessions(){
+ return this.sessionService.getActiveSessions();
+ }
+
+ public int getActiveSessionsCount() throws AdminException{
+ try {
+ return this.sessionService.getActiveSessionsCount();
+ } catch (SessionServiceException e) {
+ throw new AdminComponentException(e);
+ }
+ }
+
+ public InjectedValue<SocketBinding> getSocketBindingInjector() {
+ return this.socketBindingInjector;
+ }
+
+ public SocketConfiguration getSocketConfig() {
+ return socketConfig;
+ }
+
+ public void setSocketConfig(SocketConfiguration socketConfig) {
+ this.socketConfig = socketConfig;
+ }
+
+ public List<String> getAuthenticationDomains() {
+ return authenticationDomains;
+ }
+
+ public void setAuthenticationDomains(List<String> authenticationDomains) {
+ this.authenticationDomains = new LinkedList(authenticationDomains);
+ }
+
+ public void setSessionMaxLimit(long limit) {
+ this.sessionMaxLimit = limit;
+ }
+
+ public void setSessionExpirationTimeLimit(long limit) {
+ this.sessionExpirationTimeLimit = limit;
+ }
+
+ public AuthenticationType getAuthenticationType() {
+ return authenticationType;
+ }
+
+ public void setAuthenticationType(AuthenticationType authenticationType) {
+ this.authenticationType = authenticationType;
+ }
+
+ public InjectedValue<VDBRepository> getVdbRepositoryInjector() {
+ return vdbRepositoryInjector;
+ }
+
+ private VDBRepository getVdbRepository() {
+ return vdbRepositoryInjector.getValue();
+ }
+
+ private DQPCore getDQP() {
+ return getDqpInjector().getValue();
+ }
+
+ public InjectedValue<DQPCore> getDqpInjector() {
+ return dqpInjector;
+ }
+
+ public InjectedValue<BufferServiceImpl> getBufferServiceInjector() {
+ return bufferServiceInjector;
+ }
+
+ private int getMaxODBCLobSizeAllowed() {
+ return this.maxODBCLobSizeAllowed;
+ }
+
+ public void setMaxODBCLobSizeAllowed(int lobSize) {
+ this.maxODBCLobSizeAllowed = lobSize;
+ }
+
+ public void setEmbedded(boolean v) {
+ this.embedded = v;
+ }
+
+ public boolean isEmbedded() {
+ return this.embedded;
+ }
+
+ public void setKrb5Domain(String domain) {
+ this.krb5Domain = domain;
+ }
+}
Property changes on: trunk/jboss-integration/src/main/java/org/teiid/jboss/TransportService.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Deleted: trunk/jboss-integration/src/main/java/org/teiid/jboss/deployers/RuntimeEngineDeployer.java
===================================================================
--- trunk/jboss-integration/src/main/java/org/teiid/jboss/deployers/RuntimeEngineDeployer.java 2011-12-15 22:25:27 UTC (rev 3748)
+++ trunk/jboss-integration/src/main/java/org/teiid/jboss/deployers/RuntimeEngineDeployer.java 2011-12-17 03:27:07 UTC (rev 3749)
@@ -1,204 +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.jboss.deployers;
-
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
-import java.util.Set;
-
-import javax.resource.spi.XATerminator;
-import javax.resource.spi.work.WorkManager;
-import javax.transaction.TransactionManager;
-
-import org.jboss.msc.service.Service;
-import org.jboss.msc.service.ServiceController;
-import org.jboss.msc.service.ServiceName;
-import org.jboss.msc.service.StartContext;
-import org.jboss.msc.service.StopContext;
-import org.jboss.msc.value.InjectedValue;
-import org.teiid.adminapi.impl.SessionMetadata;
-import org.teiid.core.TeiidRuntimeException;
-import org.teiid.core.util.LRUCache;
-import org.teiid.deployers.CompositeVDB;
-import org.teiid.deployers.VDBLifeCycleListener;
-import org.teiid.deployers.VDBRepository;
-import org.teiid.dqp.internal.datamgr.TranslatorRepository;
-import org.teiid.dqp.internal.process.AuthorizationValidator;
-import org.teiid.dqp.internal.process.DQPConfiguration;
-import org.teiid.dqp.internal.process.DQPCore;
-import org.teiid.dqp.internal.process.SessionAwareCache;
-import org.teiid.dqp.internal.process.TransactionServerImpl;
-import org.teiid.dqp.service.BufferService;
-import org.teiid.dqp.service.TransactionService;
-import org.teiid.events.EventDistributorFactory;
-import org.teiid.jboss.IntegrationPlugin;
-import org.teiid.jboss.TeiidServiceNames;
-import org.teiid.jboss.Transport;
-import org.teiid.logging.LogConstants;
-import org.teiid.logging.LogManager;
-import org.teiid.logging.MessageLevel;
-import org.teiid.services.BufferServiceImpl;
-import org.teiid.vdb.runtime.VDBKey;
-
-
-public class RuntimeEngineDeployer extends DQPConfiguration implements Serializable, Service<DQPCore> {
- private static final long serialVersionUID = -4676205340262775388L;
-
- private transient TransactionServerImpl transactionServerImpl = new TransactionServerImpl();
- private transient DQPCore dqpCore = new DQPCore();
-
- private final InjectedValue<WorkManager> workManagerInjector = new InjectedValue<WorkManager>();
- private final InjectedValue<XATerminator> xaTerminatorInjector = new InjectedValue<XATerminator>();
- private final InjectedValue<TransactionManager> txnManagerInjector = new InjectedValue<TransactionManager>();
- private final InjectedValue<BufferServiceImpl> bufferServiceInjector = new InjectedValue<BufferServiceImpl>();
- private final InjectedValue<TranslatorRepository> translatorRepositoryInjector = new InjectedValue<TranslatorRepository>();
- private final InjectedValue<VDBRepository> vdbRepositoryInjector = new InjectedValue<VDBRepository>();
- private final InjectedValue<AuthorizationValidator> authorizationValidatorInjector = new InjectedValue<AuthorizationValidator>();
- private final InjectedValue<SessionAwareCache> preparedPlanCacheInjector = new InjectedValue<SessionAwareCache>();
- private final InjectedValue<SessionAwareCache> resultSetCacheInjector = new InjectedValue<SessionAwareCache>();
- private final InjectedValue<EventDistributorFactory> eventDistributorFactoryInjector = new InjectedValue<EventDistributorFactory>();
-
- @Override
- public void start(final StartContext context) {
- this.transactionServerImpl.setWorkManager(getWorkManagerInjector().getValue());
- this.transactionServerImpl.setXaTerminator(getXaTerminatorInjector().getValue());
- this.transactionServerImpl.setTransactionManager(getTxnManagerInjector().getValue());
-
- setAuthorizationValidator(authorizationValidatorInjector.getValue());
- setBufferService(bufferServiceInjector.getValue());
-
- this.dqpCore.setTransactionService((TransactionService)LogManager.createLoggingProxy(LogConstants.CTX_TXN_LOG, transactionServerImpl, new Class[] {TransactionService.class}, MessageLevel.DETAIL, Thread.currentThread().getContextClassLoader()));
- this.dqpCore.setMetadataRepository(getVdbRepository().getMetadataRepository());
- this.dqpCore.setEventDistributor(getEventDistributorFactoryInjector().getValue().getEventDistributor());
- this.dqpCore.setResultsetCache(getResultSetCacheInjector().getValue());
- this.dqpCore.setPreparedPlanCache(getPreparedPlanCacheInjector().getValue());
- this.dqpCore.start(this);
-
-
- // add vdb life cycle listeners
- getVdbRepository().addListener(new VDBLifeCycleListener() {
-
- private Set<VDBKey> recentlyRemoved = Collections.newSetFromMap(new LRUCache<VDBKey, Boolean>(10000));
-
- @Override
- public void removed(String name, int version, CompositeVDB vdb) {
- recentlyRemoved.add(new VDBKey(name, version));
- }
-
- @Override
- public void added(String name, int version, CompositeVDB vdb) {
- if (!recentlyRemoved.remove(new VDBKey(name, version))) {
- return;
- }
- // terminate all the previous sessions
- List<ServiceName> services = context.getController().getServiceContainer().getServiceNames();
- for (ServiceName service:services) {
- if (TeiidServiceNames.TRANSPORT_BASE.isParentOf(service)) {
- ServiceController<?> transport = context.getController().getServiceContainer().getService(service);
- if (transport != null) {
- Transport t = Transport.class.cast(transport.getValue());
- Collection<SessionMetadata> sessions = t.getActiveSessions();
- for (SessionMetadata session:sessions) {
- if (name.equalsIgnoreCase(session.getVDBName()) && version == session.getVDBVersion()){
- t.terminateSession(session.getSessionId());
- }
- }
- }
- }
- }
-
- // dump the caches.
- getResultSetCacheInjector().getValue().clearForVDB(name, version);
- getPreparedPlanCacheInjector().getValue().clearForVDB(name, version);
- }
- });
-
- LogManager.logInfo(LogConstants.CTX_RUNTIME, IntegrationPlugin.Util.getString("engine_started", this.dqpCore.getRuntimeVersion(), new Date(System.currentTimeMillis()).toString())); //$NON-NLS-1$
- }
-
- @Override
- public DQPCore getValue() throws IllegalStateException, IllegalArgumentException {
- return this.dqpCore;
- }
-
- @Override
- public void stop(StopContext context) {
- try {
- this.dqpCore.stop();
- } catch(TeiidRuntimeException e) {
- // this bean is already shutdown
- }
-
- LogManager.logInfo(LogConstants.CTX_RUNTIME, IntegrationPlugin.Util.getString("engine_stopped", new Date(System.currentTimeMillis()).toString())); //$NON-NLS-1$
- }
-
- public void setBufferService(BufferService service) {
- this.dqpCore.setBufferService(service);
- }
-
- public InjectedValue<SessionAwareCache> getResultSetCacheInjector() {
- return resultSetCacheInjector;
- }
-
- public InjectedValue<SessionAwareCache> getPreparedPlanCacheInjector() {
- return preparedPlanCacheInjector;
- }
-
- public InjectedValue<TranslatorRepository> getTranslatorRepositoryInjector() {
- return translatorRepositoryInjector;
- }
-
- public InjectedValue<VDBRepository> getVdbRepositoryInjector() {
- return vdbRepositoryInjector;
- }
-
- private VDBRepository getVdbRepository() {
- return vdbRepositoryInjector.getValue();
- }
-
- public InjectedValue<AuthorizationValidator> getAuthorizationValidatorInjector() {
- return authorizationValidatorInjector;
- }
-
- public InjectedValue<BufferServiceImpl> getBufferServiceInjector() {
- return bufferServiceInjector;
- }
-
- public InjectedValue<TransactionManager> getTxnManagerInjector() {
- return txnManagerInjector;
- }
-
- public InjectedValue<XATerminator> getXaTerminatorInjector() {
- return xaTerminatorInjector;
- }
-
- public InjectedValue<WorkManager> getWorkManagerInjector() {
- return workManagerInjector;
- }
-
- public InjectedValue<EventDistributorFactory> getEventDistributorFactoryInjector() {
- return eventDistributorFactoryInjector;
- }
-}
Modified: trunk/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties
===================================================================
--- trunk/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties 2011-12-15 22:25:27 UTC (rev 3748)
+++ trunk/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties 2011-12-17 03:27:07 UTC (rev 3749)
@@ -22,8 +22,12 @@
engine_started=Teiid Engine {0} Started = {1}
socket_enabled=Teiid JDBC - Host = {0}, Port = {1}, SSL = {2}, security-domains = {3}
+socket_disabled=Teiid JDBC - Host = {0}, Port = {1} has been shutdown.
odbc_not_enabled=ODBC transport is not enabled in Teiid.
odbc_enabled=Teiid ODBC - Host = {0}, Port = {1}, SSL = {2}, security-domains = {3}
+odbc_disabled=Teiid ODBC - Host = {0}, Port = {1} has been shutdown.
+embedded_enabled=Teiid Embedded transport enabled. Bound to: {0}
+embedded_disabled=Teiid Embedded transport disabled. Local Connections will fail. UnBound : {0}
engine_stopped=Teiid Engine stopped {0}
admin_connection_closed=Teiid admin connection is already closed.
bad_vdb_extension=The extension of the file name must be either ".vdb" for designer vdb or "xxx-vdb.xml" for dynamic VDBs
@@ -64,9 +68,9 @@
translator.added = Teiid translator "{0}" added.
wrong_protocol=Wrong type of protocol supplied
socket_binding_not_defined=Socket binding not specified for transport {0}; only embedded access is granted.
-embedded_enabled=Teiid Embedded transport enabled. Bound to: {0}
vdb-undeploy-failed=error during the undeploy of vdb {0}.{1}
error_adding_translator_deployment=Error adding translator from deployment {0}
+cache_not_found=Cache Type {0} not found in the configuration
# subsystem description
teiid.add = Add the Teiid Subsystem
@@ -115,9 +119,9 @@
preparedplan-cache-max-age-in-seconds.describe=Max age in seconds
#resultset cache
-resultset-cache-enable.describe= Resultset cache enabled
-resultset-cache-container-name.describe=Infinispan cache container name
-resultset-cache-name.describe = Infinispan cache name for resultset
+resultset-cache-enable.describe= Resultset cache enabled (default true)
+resultset-cache-infinispan-container.describe=Infinispan cache container name
+resultset-cache-name.describe = Infinispan cache name for resultset; if not specified default cache on infinispan container is used.
resultset-cache-max-age-in-seconds.describe=Max age in seconds
resultset-cache-max-staleness.describe=Max staleness in seconds. Modifications are based upon data updates -1 indicates no max. (default 60 - 1 minute)
@@ -142,6 +146,7 @@
pg-max-lob-size-in-bytes.describe=Max LOB size in Postgres protocol, as streaming is not supported
+ssl-enable.describe=Enable SSL.
ssl-mode.describe=can be one of disabled, login, or enabled \
disabled = no transport or message level security will be used; \
login = only the login traffic will be encrypted at a message level \
Modified: trunk/jboss-integration/src/main/resources/schema/jboss-teiid.xsd
===================================================================
--- trunk/jboss-integration/src/main/resources/schema/jboss-teiid.xsd 2011-12-15 22:25:27 UTC (rev 3748)
+++ trunk/jboss-integration/src/main/resources/schema/jboss-teiid.xsd 2011-12-17 03:27:07 UTC (rev 3749)
@@ -215,8 +215,8 @@
<xs:documentation>Configuration for result set caching.</xs:documentation>
</xs:annotation>
<xs:complexType>
- <xs:attribute name="name" type="xs:string" use="required"/>
- <xs:attribute name="container-name" type="xs:string" use="required"/>
+ <xs:attribute name="name" type="xs:string"/>
+ <xs:attribute name="infinispan-container" type="xs:string" use="required"/>
<xs:attribute name="enable" type="xs:boolean" default="true"/>
<xs:attribute name="max-staleness" type="xs:int" default="60"/>
</xs:complexType>
@@ -370,7 +370,7 @@
</xs:attribute>
<xs:attribute name="ssl-protocol" type="xs:string"/>
<xs:attribute name="keymanagement-algorithm" type="xs:string"/>
-
+ <xs:attribute name="enable" type="xs:boolean"/>
</xs:complexType>
</xs:element>
</xs:sequence>
Modified: trunk/jboss-integration/src/test/resources/teiid-model-config.txt
===================================================================
--- trunk/jboss-integration/src/test/resources/teiid-model-config.txt 2011-12-15 22:25:27 UTC (rev 3748)
+++ trunk/jboss-integration/src/test/resources/teiid-model-config.txt 2011-12-17 03:27:07 UTC (rev 3749)
@@ -193,11 +193,10 @@
},
"resultset-cache-name" => {
"type" => STRING,
- "description" => "Infinispan cache name for resultset",
- "required" => false,
- "default" => "resultset"
+ "description" => "Infinispan cache name for resultset; if not specified default cache on infinispan container is used.",
+ "required" => false
},
- "resultset-cache-container-name" => {
+ "resultset-cache-infinispan-container" => {
"type" => STRING,
"description" => "Infinispan cache container name",
"required" => false
@@ -210,7 +209,8 @@
},
"resultset-cache-enable" => {
"type" => BOOLEAN,
- "description" => "Resultset cache enabled",
- "required" => false
+ "description" => "Resultset cache enabled (default true)",
+ "required" => false,
+ "default" => true
}
}}
\ No newline at end of file
Modified: trunk/jboss-integration/src/test/resources/teiid-model-json.txt
===================================================================
--- trunk/jboss-integration/src/test/resources/teiid-model-json.txt 2011-12-15 22:25:27 UTC (rev 3748)
+++ trunk/jboss-integration/src/test/resources/teiid-model-json.txt 2011-12-17 03:27:07 UTC (rev 3749)
@@ -27,7 +27,7 @@
"preparedplan-cache-max-age-in-seconds" : 28800,
"preparedplan-cache-max-entries" : 512,
"query-threshold-in-seconds" : 600,
- "resultset-cache-container-name" : "container",
+ "resultset-cache-infinispan-container" : "container",
"resultset-cache-enable" : false,
"resultset-cache-max-staleness" : 90,
"resultset-cache-name" : "cache",
@@ -59,6 +59,7 @@
"pg-max-lob-size-in-bytes" : 5242880,
"protocol" : "pg",
"socket-binding" : "teiid-odbc",
+ "ssl-enable" : true,
"ssl-authentication-mode" : "1-way",
"ssl-keymanagement-algorithm" : "algo",
"ssl-mode" : "login",
Modified: trunk/jboss-integration/src/test/resources/teiid-sample-config.xml
===================================================================
--- trunk/jboss-integration/src/test/resources/teiid-sample-config.xml 2011-12-15 22:25:27 UTC (rev 3748)
+++ trunk/jboss-integration/src/test/resources/teiid-sample-config.xml 2011-12-17 03:27:07 UTC (rev 3749)
@@ -24,7 +24,7 @@
<metadata-repository-module="javax.api"/>
-->
- <resultset-cache name="cache" container-name="container" enable="false" max-staleness="90"/>
+ <resultset-cache name="cache" infinispan-container="container" enable="false" max-staleness="90"/>
<preparedplan-cache max-entries="512" max-age-in-seconds="28800"/>
@@ -35,7 +35,7 @@
<transport name="odbc" protocol="pg" socket-binding="teiid-odbc" max-socket-threads="1" input-buffer-size="2" output-buffer-size="3">
<authentication security-domain="teiid-security,teiid-security2" max-sessions-allowed="5000" sessions-expiration-timelimit="0" krb5-domain="krb5"/>
<pg max-lob-size-in-bytes="5242880"/>
- <ssl mode="login" authentication-mode="1-way" ssl-protocol="ssl-protocol" keymanagement-algorithm="algo">
+ <ssl enable="true" mode="login" authentication-mode="1-way" ssl-protocol="ssl-protocol" keymanagement-algorithm="algo">
<keystore name="keystore name" password="keystore passs" type="keystore type"/>
<truststore name="truststore name" password="truststore pass"/>
</ssl>
Modified: trunk/jboss-integration/src/test/resources/teiid-transport-config.txt
===================================================================
--- trunk/jboss-integration/src/test/resources/teiid-transport-config.txt 2011-12-15 22:25:27 UTC (rev 3748)
+++ trunk/jboss-integration/src/test/resources/teiid-transport-config.txt 2011-12-17 03:27:07 UTC (rev 3749)
@@ -56,6 +56,12 @@
"required" => false,
"default" => 5242880
},
+ "ssl-enable" => {
+ "type" => BOOLEAN,
+ "description" => "Enable SSL.",
+ "required" => false,
+ "default" => false
+ },
"ssl-mode" => {
"type" => STRING,
"description" => "can be one of disabled, login, or enabled disabled = no transport or message level security will be used; login = only the login traffic will be encrypted at a message level using 128 bit AES with an ephemerial DH key exchange. No other config values are needed in this mode; enabled = traffic will be secured using this configuration,if the client supports SSL",
13 years
- 1
- 0
teiid SVN: r3748 - in branches/7.4.x: adminshell and 38 other directories.
by teiid-commits＠lists.jboss.org
Author: jolee
Date: 2011-12-15 17:25:27 -0500 (Thu, 15 Dec 2011)
New Revision: 3748
Modified:
branches/7.4.x/adminshell/pom.xml
branches/7.4.x/api/pom.xml
branches/7.4.x/build/kits/jboss-container/teiid-releasenotes.html
branches/7.4.x/build/pom.xml
branches/7.4.x/cache-jbosscache/pom.xml
branches/7.4.x/client-jdk15/pom.xml
branches/7.4.x/client/pom.xml
branches/7.4.x/common-core/pom.xml
branches/7.4.x/connectors/connector-file/pom.xml
branches/7.4.x/connectors/connector-ldap/pom.xml
branches/7.4.x/connectors/connector-salesforce/pom.xml
branches/7.4.x/connectors/connector-ws/pom.xml
branches/7.4.x/connectors/pom.xml
branches/7.4.x/connectors/salesforce-api/pom.xml
branches/7.4.x/connectors/sandbox/pom.xml
branches/7.4.x/connectors/sandbox/translator-yahoo/pom.xml
branches/7.4.x/connectors/translator-file/pom.xml
branches/7.4.x/connectors/translator-jdbc/pom.xml
branches/7.4.x/connectors/translator-ldap/pom.xml
branches/7.4.x/connectors/translator-loopback/pom.xml
branches/7.4.x/connectors/translator-olap/pom.xml
branches/7.4.x/connectors/translator-salesforce/pom.xml
branches/7.4.x/connectors/translator-ws/pom.xml
branches/7.4.x/console/pom.xml
branches/7.4.x/documentation/admin-guide/pom.xml
branches/7.4.x/documentation/caching-guide/pom.xml
branches/7.4.x/documentation/client-developers-guide/pom.xml
branches/7.4.x/documentation/developer-guide/pom.xml
branches/7.4.x/documentation/pom.xml
branches/7.4.x/documentation/quick-start-example/pom.xml
branches/7.4.x/documentation/reference/pom.xml
branches/7.4.x/engine/pom.xml
branches/7.4.x/hibernate-dialect/pom.xml
branches/7.4.x/jboss-integration/pom.xml
branches/7.4.x/metadata/pom.xml
branches/7.4.x/pom.xml
branches/7.4.x/runtime/pom.xml
branches/7.4.x/test-integration/common/pom.xml
branches/7.4.x/test-integration/db/pom.xml
branches/7.4.x/test-integration/pom.xml
Log:
SOA-3665 update version of teiid to 7.4.2 for inclusion in EDS 5.2 roll up patch
Modified: branches/7.4.x/adminshell/pom.xml
===================================================================
--- branches/7.4.x/adminshell/pom.xml 2011-12-15 22:22:44 UTC (rev 3747)
+++ branches/7.4.x/adminshell/pom.xml 2011-12-15 22:25:27 UTC (rev 3748)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.1</version>
+ <version>7.4.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-adminshell</artifactId>
Modified: branches/7.4.x/api/pom.xml
===================================================================
--- branches/7.4.x/api/pom.xml 2011-12-15 22:22:44 UTC (rev 3747)
+++ branches/7.4.x/api/pom.xml 2011-12-15 22:25:27 UTC (rev 3748)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.1</version>
+ <version>7.4.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-api</artifactId>
Modified: branches/7.4.x/build/kits/jboss-container/teiid-releasenotes.html
===================================================================
--- branches/7.4.x/build/kits/jboss-container/teiid-releasenotes.html 2011-12-15 22:22:44 UTC (rev 3747)
+++ branches/7.4.x/build/kits/jboss-container/teiid-releasenotes.html 2011-12-15 22:25:27 UTC (rev 3748)
@@ -253,7 +253,17 @@
<h2> Bug
</h2>
+<h4>From ${project.version}</h4>
<ul>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1863'>TEIID-1863</a>] - Default Salesforce URL in teiid-connector-salesforce.rar needs update to SF v22</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1852'>TEIID-1852</a>] - Misc. Salesforce Translator Issues</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1828'>TEIID-1828</a>] - Dependent critiera in query plan but missing in actual query and additional information is provided</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1803'>TEIID-1803</a>] - VDB deployment in EDS can be extremely slow based upon indexing needs</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1849'>TEIID-1849</a>] - enabledCipherSuites property gives error on startup of server</li>
+</ul>
+
+<h4>From 7.4.1</h4>
+<ul>
<li>[<a href='https://issues.jboss.org/browse/TEIID-99'>TEIID-99</a>] - Stored procedures should work in multisource connector binding scenarios
</li>
<li>[<a href='https://issues.jboss.org/browse/TEIID-1163'>TEIID-1163</a>] - Provide LOB support in ODBC
Modified: branches/7.4.x/build/pom.xml
===================================================================
--- branches/7.4.x/build/pom.xml 2011-12-15 22:22:44 UTC (rev 3747)
+++ branches/7.4.x/build/pom.xml 2011-12-15 22:25:27 UTC (rev 3748)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.1</version>
+ <version>7.4.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid</artifactId>
Modified: branches/7.4.x/cache-jbosscache/pom.xml
===================================================================
--- branches/7.4.x/cache-jbosscache/pom.xml 2011-12-15 22:22:44 UTC (rev 3747)
+++ branches/7.4.x/cache-jbosscache/pom.xml 2011-12-15 22:25:27 UTC (rev 3748)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.1</version>
+ <version>7.4.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-cache-jbosscache</artifactId>
Modified: branches/7.4.x/client/pom.xml
===================================================================
--- branches/7.4.x/client/pom.xml 2011-12-15 22:22:44 UTC (rev 3747)
+++ branches/7.4.x/client/pom.xml 2011-12-15 22:25:27 UTC (rev 3748)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.1</version>
+ <version>7.4.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-client</artifactId>
Modified: branches/7.4.x/client-jdk15/pom.xml
===================================================================
--- branches/7.4.x/client-jdk15/pom.xml 2011-12-15 22:22:44 UTC (rev 3747)
+++ branches/7.4.x/client-jdk15/pom.xml 2011-12-15 22:25:27 UTC (rev 3748)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.1</version>
+ <version>7.4.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-client-jdk15</artifactId>
Modified: branches/7.4.x/common-core/pom.xml
===================================================================
--- branches/7.4.x/common-core/pom.xml 2011-12-15 22:22:44 UTC (rev 3747)
+++ branches/7.4.x/common-core/pom.xml 2011-12-15 22:25:27 UTC (rev 3748)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.1</version>
+ <version>7.4.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-common-core</artifactId>
Modified: branches/7.4.x/connectors/connector-file/pom.xml
===================================================================
--- branches/7.4.x/connectors/connector-file/pom.xml 2011-12-15 22:22:44 UTC (rev 3747)
+++ branches/7.4.x/connectors/connector-file/pom.xml 2011-12-15 22:25:27 UTC (rev 3748)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.1</version>
+ <version>7.4.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-file</artifactId>
Modified: branches/7.4.x/connectors/connector-ldap/pom.xml
===================================================================
--- branches/7.4.x/connectors/connector-ldap/pom.xml 2011-12-15 22:22:44 UTC (rev 3747)
+++ branches/7.4.x/connectors/connector-ldap/pom.xml 2011-12-15 22:25:27 UTC (rev 3748)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.1</version>
+ <version>7.4.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-ldap</artifactId>
Modified: branches/7.4.x/connectors/connector-salesforce/pom.xml
===================================================================
--- branches/7.4.x/connectors/connector-salesforce/pom.xml 2011-12-15 22:22:44 UTC (rev 3747)
+++ branches/7.4.x/connectors/connector-salesforce/pom.xml 2011-12-15 22:25:27 UTC (rev 3748)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.1</version>
+ <version>7.4.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-salesforce</artifactId>
Modified: branches/7.4.x/connectors/connector-ws/pom.xml
===================================================================
--- branches/7.4.x/connectors/connector-ws/pom.xml 2011-12-15 22:22:44 UTC (rev 3747)
+++ branches/7.4.x/connectors/connector-ws/pom.xml 2011-12-15 22:25:27 UTC (rev 3748)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.1</version>
+ <version>7.4.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-ws</artifactId>
Modified: branches/7.4.x/connectors/pom.xml
===================================================================
--- branches/7.4.x/connectors/pom.xml 2011-12-15 22:22:44 UTC (rev 3747)
+++ branches/7.4.x/connectors/pom.xml 2011-12-15 22:25:27 UTC (rev 3748)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.1</version>
+ <version>7.4.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
Modified: branches/7.4.x/connectors/salesforce-api/pom.xml
===================================================================
--- branches/7.4.x/connectors/salesforce-api/pom.xml 2011-12-15 22:22:44 UTC (rev 3747)
+++ branches/7.4.x/connectors/salesforce-api/pom.xml 2011-12-15 22:25:27 UTC (rev 3748)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.1</version>
+ <version>7.4.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>salesforce-api</artifactId>
Modified: branches/7.4.x/connectors/sandbox/pom.xml
===================================================================
--- branches/7.4.x/connectors/sandbox/pom.xml 2011-12-15 22:22:44 UTC (rev 3747)
+++ branches/7.4.x/connectors/sandbox/pom.xml 2011-12-15 22:25:27 UTC (rev 3748)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.1</version>
+ <version>7.4.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid.connectors</groupId>
Modified: branches/7.4.x/connectors/sandbox/translator-yahoo/pom.xml
===================================================================
--- branches/7.4.x/connectors/sandbox/translator-yahoo/pom.xml 2011-12-15 22:22:44 UTC (rev 3747)
+++ branches/7.4.x/connectors/sandbox/translator-yahoo/pom.xml 2011-12-15 22:25:27 UTC (rev 3748)
@@ -3,7 +3,7 @@
<parent>
<artifactId>sandbox</artifactId>
<groupId>org.jboss.teiid.connectors</groupId>
- <version>7.4.1</version>
+ <version>7.4.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-yahoo</artifactId>
Modified: branches/7.4.x/connectors/translator-file/pom.xml
===================================================================
--- branches/7.4.x/connectors/translator-file/pom.xml 2011-12-15 22:22:44 UTC (rev 3747)
+++ branches/7.4.x/connectors/translator-file/pom.xml 2011-12-15 22:25:27 UTC (rev 3748)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.1</version>
+ <version>7.4.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-file</artifactId>
Modified: branches/7.4.x/connectors/translator-jdbc/pom.xml
===================================================================
--- branches/7.4.x/connectors/translator-jdbc/pom.xml 2011-12-15 22:22:44 UTC (rev 3747)
+++ branches/7.4.x/connectors/translator-jdbc/pom.xml 2011-12-15 22:25:27 UTC (rev 3748)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.1</version>
+ <version>7.4.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-jdbc</artifactId>
Modified: branches/7.4.x/connectors/translator-ldap/pom.xml
===================================================================
--- branches/7.4.x/connectors/translator-ldap/pom.xml 2011-12-15 22:22:44 UTC (rev 3747)
+++ branches/7.4.x/connectors/translator-ldap/pom.xml 2011-12-15 22:25:27 UTC (rev 3748)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.1</version>
+ <version>7.4.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-ldap</artifactId>
Modified: branches/7.4.x/connectors/translator-loopback/pom.xml
===================================================================
--- branches/7.4.x/connectors/translator-loopback/pom.xml 2011-12-15 22:22:44 UTC (rev 3747)
+++ branches/7.4.x/connectors/translator-loopback/pom.xml 2011-12-15 22:25:27 UTC (rev 3748)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.1</version>
+ <version>7.4.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-loopback</artifactId>
Modified: branches/7.4.x/connectors/translator-olap/pom.xml
===================================================================
--- branches/7.4.x/connectors/translator-olap/pom.xml 2011-12-15 22:22:44 UTC (rev 3747)
+++ branches/7.4.x/connectors/translator-olap/pom.xml 2011-12-15 22:25:27 UTC (rev 3748)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.1</version>
+ <version>7.4.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-olap</artifactId>
Modified: branches/7.4.x/connectors/translator-salesforce/pom.xml
===================================================================
--- branches/7.4.x/connectors/translator-salesforce/pom.xml 2011-12-15 22:22:44 UTC (rev 3747)
+++ branches/7.4.x/connectors/translator-salesforce/pom.xml 2011-12-15 22:25:27 UTC (rev 3748)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.1</version>
+ <version>7.4.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-salesforce</artifactId>
Modified: branches/7.4.x/connectors/translator-ws/pom.xml
===================================================================
--- branches/7.4.x/connectors/translator-ws/pom.xml 2011-12-15 22:22:44 UTC (rev 3747)
+++ branches/7.4.x/connectors/translator-ws/pom.xml 2011-12-15 22:25:27 UTC (rev 3748)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.1</version>
+ <version>7.4.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-ws</artifactId>
Modified: branches/7.4.x/console/pom.xml
===================================================================
--- branches/7.4.x/console/pom.xml 2011-12-15 22:22:44 UTC (rev 3747)
+++ branches/7.4.x/console/pom.xml 2011-12-15 22:25:27 UTC (rev 3748)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.1</version>
+ <version>7.4.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: branches/7.4.x/documentation/admin-guide/pom.xml
===================================================================
--- branches/7.4.x/documentation/admin-guide/pom.xml 2011-12-15 22:22:44 UTC (rev 3747)
+++ branches/7.4.x/documentation/admin-guide/pom.xml 2011-12-15 22:25:27 UTC (rev 3748)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.4.1</version>
+ <version>7.4.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>admin-guide</artifactId>
Modified: branches/7.4.x/documentation/caching-guide/pom.xml
===================================================================
--- branches/7.4.x/documentation/caching-guide/pom.xml 2011-12-15 22:22:44 UTC (rev 3747)
+++ branches/7.4.x/documentation/caching-guide/pom.xml 2011-12-15 22:25:27 UTC (rev 3748)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.4.1</version>
+ <version>7.4.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>caching-guide</artifactId>
Modified: branches/7.4.x/documentation/client-developers-guide/pom.xml
===================================================================
--- branches/7.4.x/documentation/client-developers-guide/pom.xml 2011-12-15 22:22:44 UTC (rev 3747)
+++ branches/7.4.x/documentation/client-developers-guide/pom.xml 2011-12-15 22:25:27 UTC (rev 3748)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.4.1</version>
+ <version>7.4.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>client-developers-guide</artifactId>
Modified: branches/7.4.x/documentation/developer-guide/pom.xml
===================================================================
--- branches/7.4.x/documentation/developer-guide/pom.xml 2011-12-15 22:22:44 UTC (rev 3747)
+++ branches/7.4.x/documentation/developer-guide/pom.xml 2011-12-15 22:25:27 UTC (rev 3748)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.4.1</version>
+ <version>7.4.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>developer-guide</artifactId>
Modified: branches/7.4.x/documentation/pom.xml
===================================================================
--- branches/7.4.x/documentation/pom.xml 2011-12-15 22:22:44 UTC (rev 3747)
+++ branches/7.4.x/documentation/pom.xml 2011-12-15 22:25:27 UTC (rev 3748)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.1</version>
+ <version>7.4.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
Modified: branches/7.4.x/documentation/quick-start-example/pom.xml
===================================================================
--- branches/7.4.x/documentation/quick-start-example/pom.xml 2011-12-15 22:22:44 UTC (rev 3747)
+++ branches/7.4.x/documentation/quick-start-example/pom.xml 2011-12-15 22:25:27 UTC (rev 3748)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.4.1</version>
+ <version>7.4.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>quick-start-example</artifactId>
Modified: branches/7.4.x/documentation/reference/pom.xml
===================================================================
--- branches/7.4.x/documentation/reference/pom.xml 2011-12-15 22:22:44 UTC (rev 3747)
+++ branches/7.4.x/documentation/reference/pom.xml 2011-12-15 22:25:27 UTC (rev 3748)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.4.1</version>
+ <version>7.4.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>reference</artifactId>
Modified: branches/7.4.x/engine/pom.xml
===================================================================
--- branches/7.4.x/engine/pom.xml 2011-12-15 22:22:44 UTC (rev 3747)
+++ branches/7.4.x/engine/pom.xml 2011-12-15 22:25:27 UTC (rev 3748)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.1</version>
+ <version>7.4.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-engine</artifactId>
Modified: branches/7.4.x/hibernate-dialect/pom.xml
===================================================================
--- branches/7.4.x/hibernate-dialect/pom.xml 2011-12-15 22:22:44 UTC (rev 3747)
+++ branches/7.4.x/hibernate-dialect/pom.xml 2011-12-15 22:25:27 UTC (rev 3748)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.1</version>
+ <version>7.4.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-hibernate-dialect</artifactId>
Modified: branches/7.4.x/jboss-integration/pom.xml
===================================================================
--- branches/7.4.x/jboss-integration/pom.xml 2011-12-15 22:22:44 UTC (rev 3747)
+++ branches/7.4.x/jboss-integration/pom.xml 2011-12-15 22:25:27 UTC (rev 3748)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.1</version>
+ <version>7.4.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
Modified: branches/7.4.x/metadata/pom.xml
===================================================================
--- branches/7.4.x/metadata/pom.xml 2011-12-15 22:22:44 UTC (rev 3747)
+++ branches/7.4.x/metadata/pom.xml 2011-12-15 22:25:27 UTC (rev 3748)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.1</version>
+ <version>7.4.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-metadata</artifactId>
Modified: branches/7.4.x/pom.xml
===================================================================
--- branches/7.4.x/pom.xml 2011-12-15 22:22:44 UTC (rev 3747)
+++ branches/7.4.x/pom.xml 2011-12-15 22:25:27 UTC (rev 3748)
@@ -5,7 +5,7 @@
<artifactId>teiid-parent</artifactId>
<packaging>pom</packaging>
<name>Teiid</name>
- <version>7.4.1</version>
+ <version>7.4.2</version>
<description>Federated SQL and XML query engine.</description>
<properties>
<ant.version>1.7.0</ant.version>
Modified: branches/7.4.x/runtime/pom.xml
===================================================================
--- branches/7.4.x/runtime/pom.xml 2011-12-15 22:22:44 UTC (rev 3747)
+++ branches/7.4.x/runtime/pom.xml 2011-12-15 22:25:27 UTC (rev 3748)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.1</version>
+ <version>7.4.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
Modified: branches/7.4.x/test-integration/common/pom.xml
===================================================================
--- branches/7.4.x/test-integration/common/pom.xml 2011-12-15 22:22:44 UTC (rev 3747)
+++ branches/7.4.x/test-integration/common/pom.xml 2011-12-15 22:25:27 UTC (rev 3748)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-test-integration</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.1</version>
+ <version>7.4.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>test-integration-common</artifactId>
Modified: branches/7.4.x/test-integration/db/pom.xml
===================================================================
--- branches/7.4.x/test-integration/db/pom.xml 2011-12-15 22:22:44 UTC (rev 3747)
+++ branches/7.4.x/test-integration/db/pom.xml 2011-12-15 22:25:27 UTC (rev 3748)
@@ -9,7 +9,7 @@
<parent>
<artifactId>teiid-test-integration</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.1</version>
+ <version>7.4.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: branches/7.4.x/test-integration/pom.xml
===================================================================
--- branches/7.4.x/test-integration/pom.xml 2011-12-15 22:22:44 UTC (rev 3747)
+++ branches/7.4.x/test-integration/pom.xml 2011-12-15 22:25:27 UTC (rev 3748)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.1</version>
+ <version>7.4.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-test-integration</artifactId>
13 years
- 1
- 0
teiid SVN: r3747 - tags.
by teiid-commits＠lists.jboss.org
Author: loleary
Date: 2011-12-15 17:22:44 -0500 (Thu, 15 Dec 2011)
New Revision: 3747
Added:
tags/teiid-parent-7.4.1.GA/
Log:
Tagging Teiid 7.4.1 release
13 years
- 1
- 0
teiid SVN: r3746 - in branches/7.6.x/engine/src: test/java/org/teiid/query/resolver and 1 other directory.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2011-12-15 16:45:35 -0500 (Thu, 15 Dec 2011)
New Revision: 3746
Modified:
branches/7.6.x/engine/src/main/java/org/teiid/query/resolver/command/InsertResolver.java
branches/7.6.x/engine/src/test/java/org/teiid/query/resolver/TestResolver.java
Log:
TEIID-1872 fix for implicit temp table creation
Modified: branches/7.6.x/engine/src/main/java/org/teiid/query/resolver/command/InsertResolver.java
===================================================================
--- branches/7.6.x/engine/src/main/java/org/teiid/query/resolver/command/InsertResolver.java 2011-12-15 19:34:02 UTC (rev 3745)
+++ branches/7.6.x/engine/src/main/java/org/teiid/query/resolver/command/InsertResolver.java 2011-12-15 21:45:35 UTC (rev 3746)
@@ -120,11 +120,7 @@
resolveTypes(insert, metadata, values, usingQuery);
if (!insert.getGroup().isResolved()) { //define the implicit temp group
- if(insert.getQueryExpression() != null) {
- ResolverUtil.resolveImplicitTempGroup(metadata, insert.getGroup(), insert.getQueryExpression().getProjectedSymbols());
- }else {
- ResolverUtil.resolveImplicitTempGroup(metadata, insert.getGroup(), insert.getVariables());
- }
+ ResolverUtil.resolveImplicitTempGroup(metadata, insert.getGroup(), insert.getVariables());
resolveVariables(metadata, insert, groups);
//ensure that the types match
Modified: branches/7.6.x/engine/src/test/java/org/teiid/query/resolver/TestResolver.java
===================================================================
--- branches/7.6.x/engine/src/test/java/org/teiid/query/resolver/TestResolver.java 2011-12-15 19:34:02 UTC (rev 3745)
+++ branches/7.6.x/engine/src/test/java/org/teiid/query/resolver/TestResolver.java 2011-12-15 21:45:35 UTC (rev 3746)
@@ -2998,5 +2998,9 @@
XMLQuery ex = (XMLQuery) SymbolMap.getExpression((Expression) q.getSelect().getSymbols().get(0));
assertEquals(DataTypeManager.DefaultDataClasses.XML, ex.getPassing().get(0).getExpression().getType());
}
+
+ @Test public void testImplicitTempTableWithExplicitColumns() {
+ helpResolve("insert into #temp(x, y) select e1, e2 from pm1.g1");
+ }
}
\ No newline at end of file
13 years
- 1
- 0
teiid SVN: r3745 - in branches/7.6.x/engine/src: main/java/org/teiid/query/tempdata and 1 other directories.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2011-12-15 14:34:02 -0500 (Thu, 15 Dec 2011)
New Revision: 3745
Modified:
branches/7.6.x/engine/src/main/java/org/teiid/query/sql/visitor/EvaluatableVisitor.java
branches/7.6.x/engine/src/main/java/org/teiid/query/tempdata/TempTableDataManager.java
branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestProcessor.java
Log:
TEIID-1870 fix to ensure non deterministic functions are pushdown as expected
Modified: branches/7.6.x/engine/src/main/java/org/teiid/query/sql/visitor/EvaluatableVisitor.java
===================================================================
--- branches/7.6.x/engine/src/main/java/org/teiid/query/sql/visitor/EvaluatableVisitor.java 2011-12-15 16:26:57 UTC (rev 3744)
+++ branches/7.6.x/engine/src/main/java/org/teiid/query/sql/visitor/EvaluatableVisitor.java 2011-12-15 19:34:02 UTC (rev 3745)
@@ -69,7 +69,7 @@
public void visit(Function obj) {
this.setDeterminismLevel(obj.getFunctionDescriptor().getDeterministic());
- if (obj.getFunctionDescriptor().getPushdown() == PushDown.MUST_PUSHDOWN) {
+ if (obj.getFunctionDescriptor().getPushdown() == PushDown.MUST_PUSHDOWN || obj.getFunctionDescriptor().getDeterministic() == Determinism.NONDETERMINISTIC) {
evaluationNotPossible(EvaluationLevel.PUSH_DOWN);
} else if (obj.getName().equalsIgnoreCase(FunctionLibrary.LOOKUP)
//TODO: if we had the context here we could plan better for non-prepared requests
Modified: branches/7.6.x/engine/src/main/java/org/teiid/query/tempdata/TempTableDataManager.java
===================================================================
--- branches/7.6.x/engine/src/main/java/org/teiid/query/tempdata/TempTableDataManager.java 2011-12-15 16:26:57 UTC (rev 3744)
+++ branches/7.6.x/engine/src/main/java/org/teiid/query/tempdata/TempTableDataManager.java 2011-12-15 19:34:02 UTC (rev 3745)
@@ -24,6 +24,7 @@
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
import java.util.concurrent.Callable;
@@ -170,9 +171,10 @@
Insert insert = (Insert)command;
TupleSource ts = insert.getTupleSource();
if (ts == null) {
+ Evaluator eval = new Evaluator(Collections.emptyMap(), this, context);
List<Object> values = new ArrayList<Object>(insert.getValues().size());
for (Expression expr : (List<Expression>)insert.getValues()) {
- values.add(Evaluator.evaluate(expr));
+ values.add(eval.evaluate(expr, null));
}
ts = new CollectionTupleSource(Arrays.asList(values).iterator());
}
Modified: branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestProcessor.java
===================================================================
--- branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestProcessor.java 2011-12-15 16:26:57 UTC (rev 3744)
+++ branches/7.6.x/engine/src/test/java/org/teiid/query/processor/TestProcessor.java 2011-12-15 19:34:02 UTC (rev 3745)
@@ -103,6 +103,7 @@
import org.teiid.query.util.CommandContext;
import org.teiid.query.validator.Validator;
import org.teiid.query.validator.ValidatorReport;
+import org.teiid.translator.SourceSystemFunctions;
@SuppressWarnings({"nls", "unchecked"})
public class TestProcessor {
@@ -7683,5 +7684,28 @@
}
+ @Test public void testNonDeterministicPushdown() throws Exception {
+ // Create query
+ String sql = "SELECT RAND(), lookup('pm1.g1', 'e1', 'e2', 1) FROM pm1.g1 limit 2"; //$NON-NLS-1$
+
+ List[] expected = new List[] {
+ Arrays.asList(new Double(0.1), "a"),
+ Arrays.asList(new Double(0.2), "a"),
+ };
+
+ // Construct data manager with data
+ HardcodedDataManager hdm = new HardcodedDataManager();
+ hdm.addData("SELECT RAND() FROM pm1.g1", expected);
+ hdm.addData("SELECT pm1.g1.e2, pm1.g1.e1 FROM pm1.g1", new List<?>[] {Arrays.asList(1, "a")});
+ BasicSourceCapabilities bsc = new BasicSourceCapabilities();
+ bsc.setCapabilitySupport(Capability.QUERY_SELECT_EXPRESSION, true);
+ bsc.setFunctionSupport(SourceSystemFunctions.RAND, true);
+ // Plan query
+ CommandContext cc = createCommandContext();
+ ProcessorPlan plan = helpGetPlan(helpParse(sql), RealMetadataFactory.example1Cached(), new DefaultCapabilitiesFinder(bsc), cc);
+
+ helpProcess(plan, cc, hdm, expected);
+ }
+
private static final boolean DEBUG = false;
}
13 years
- 1
- 0
teiid SVN: r3744 - in branches/7.1.x: adminshell and 38 other directories.
by teiid-commits＠lists.jboss.org
Author: jolee
Date: 2011-12-15 11:26:57 -0500 (Thu, 15 Dec 2011)
New Revision: 3744
Modified:
branches/7.1.x/adminshell/pom.xml
branches/7.1.x/api/pom.xml
branches/7.1.x/build/kits/jboss-container/teiid-releasenotes.html
branches/7.1.x/build/pom.xml
branches/7.1.x/cache-jbosscache/pom.xml
branches/7.1.x/client-jdk15/pom.xml
branches/7.1.x/client/pom.xml
branches/7.1.x/common-core/pom.xml
branches/7.1.x/connectors/connector-file/pom.xml
branches/7.1.x/connectors/connector-ldap/pom.xml
branches/7.1.x/connectors/connector-salesforce/pom.xml
branches/7.1.x/connectors/connector-ws/pom.xml
branches/7.1.x/connectors/pom.xml
branches/7.1.x/connectors/salesforce-api/pom.xml
branches/7.1.x/connectors/sandbox/pom.xml
branches/7.1.x/connectors/sandbox/translator-yahoo/pom.xml
branches/7.1.x/connectors/translator-file/pom.xml
branches/7.1.x/connectors/translator-jdbc/pom.xml
branches/7.1.x/connectors/translator-ldap/pom.xml
branches/7.1.x/connectors/translator-loopback/pom.xml
branches/7.1.x/connectors/translator-netezza/pom.xml
branches/7.1.x/connectors/translator-salesforce/pom.xml
branches/7.1.x/connectors/translator-ws/pom.xml
branches/7.1.x/console/pom.xml
branches/7.1.x/documentation/admin-guide/pom.xml
branches/7.1.x/documentation/caching-guide/pom.xml
branches/7.1.x/documentation/client-developers-guide/pom.xml
branches/7.1.x/documentation/developer-guide/pom.xml
branches/7.1.x/documentation/pom.xml
branches/7.1.x/documentation/quick-start-example/pom.xml
branches/7.1.x/documentation/reference/pom.xml
branches/7.1.x/engine/pom.xml
branches/7.1.x/hibernate-dialect/pom.xml
branches/7.1.x/jboss-integration/pom.xml
branches/7.1.x/metadata/pom.xml
branches/7.1.x/pom.xml
branches/7.1.x/runtime/pom.xml
branches/7.1.x/test-integration/common/pom.xml
branches/7.1.x/test-integration/db/pom.xml
branches/7.1.x/test-integration/pom.xml
Log:
SOA-3664 update version of teiid to 7.1.2.GA for inclusion in EDS 5.1 roll up patch
update release notes
Modified: branches/7.1.x/adminshell/pom.xml
===================================================================
--- branches/7.1.x/adminshell/pom.xml 2011-12-15 15:40:25 UTC (rev 3743)
+++ branches/7.1.x/adminshell/pom.xml 2011-12-15 16:26:57 UTC (rev 3744)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.2</version>
+ <version>7.1.2.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-adminshell</artifactId>
Modified: branches/7.1.x/api/pom.xml
===================================================================
--- branches/7.1.x/api/pom.xml 2011-12-15 15:40:25 UTC (rev 3743)
+++ branches/7.1.x/api/pom.xml 2011-12-15 16:26:57 UTC (rev 3744)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.2</version>
+ <version>7.1.2.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-api</artifactId>
Modified: branches/7.1.x/build/kits/jboss-container/teiid-releasenotes.html
===================================================================
--- branches/7.1.x/build/kits/jboss-container/teiid-releasenotes.html 2011-12-15 15:40:25 UTC (rev 3743)
+++ branches/7.1.x/build/kits/jboss-container/teiid-releasenotes.html 2011-12-15 16:26:57 UTC (rev 3744)
@@ -157,17 +157,45 @@
<h2><a name="Details">Detailed Release Notes</a></h2>
Detailed Release Notes - Teiid - Version ${project.version}
-
-<h2> Bug
-</h2>
+<h3> Bug
+</h3>
+<h4>From ${project.version}</h4>
<ul>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1764'>TEIID-1764</a>] - Hibernate Month Date Extraction
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1803'>TEIID-1803</a>] - VDB deployment in EDS can be extremely slow based upon indexing needs
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1706'>TEIID-1706</a>] - JOIN between two text file data sources extremely slow
-</li>
-</ul>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1706'>TEIID-1706</a>] - JOIN between two text file data sources extremely slow</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1764'>TEIID-1764</a>] - Hibernate Month Date Extraction</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1803'>TEIID-1803</a>] - VDB deployment in EDS can be extremely slow based upon indexing needs</li>
+</ul>
+<h4>From 7.1.1.CP3</h4>
+<ul>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1495'>TEIID-1495</a>] - Validate the TeraData Translator</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1654'>TEIID-1654</a>] - Node returns 0 rows for cached view when other node had it loaded and leaves cluster</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1656'>TEIID-1656</a>] - Add pushdown support for grouping expression over a UNION</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1652'>TEIID-1652</a>] - ODBC Data Row results should be batched</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1653'>TEIID-1653</a>] - Support Cursoring over ODBC protocol ( support UseDeclareFetch = 1)</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1493'>TEIID-1493</a>] - In a cluster the distributed cache is cleared by a node rejoining</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1657'>TEIID-1657</a>] - refreshMatView does not work correctly for an internal materialized view when clustering is enabled</li>
+</ul>
+<h4>From 7.1.1.CP2</h4>
+<ul>
+<li>[<a href='https://issues.jboss.org/browse/SOA-3103'>SOA-3103</a>] - TeraData Translator for EDS</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1631'>TEIID-1631</a>] - ODBC SQLDescribeCol does not work, When used with the Prepare Statement</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1623'>TEIID-1623</a>] - ODBC numeric and string precision issues</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1622'>TEIID-1622</a>] - Optional JOIN hints don't get optimized out for UNION ALL view</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1571'>TEIID-1571</a>] - Error due to merge virtual with join and group by</li>
+</ul>
+<h4>From 7.1.1.CP1</h4>
+<ul>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1564'>TEIID-1564</a>] - Clustered Caching Not Working</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1515'>TEIID-1515</a>] - ODBC does not report primarykeys on the tables</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1467'>TEIID-1467</a>] - Procedures in Teiid are not Resolvable if Their Models are Marked as Not Visible</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1489'>TEIID-1489</a>] - Teiid assumes fqns in transformations, but they are no longer required to be there</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1498'>TEIID-1498</a>] - Incorrect rewrite of not disjunctive criteria</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1506'>TEIID-1506</a>] - ODBC Driver reporting BigInteger, BigDecimal columns as Strings</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1492'>TEIID-1492</a>] - StackOverflowError in DefaultCache</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1505'>TEIID-1505</a>] - MaxActivePlans is not being read from the configuration</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1477'>TEIID-1477</a>] - Teiid ODBC has an issue supporting the postgres 8.01 client</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1469'>TEIID-1469</a>] - Teiid Plugin uses Invalid Datatype Mask for SessionID Parameter to Terminate Session Operation</li>
+</ul>
<h2><a name="Documentation">Documentation and Help</a></h2>
@@ -210,4 +238,4 @@
information.</p>
</BODY>
-</HTML>
\ No newline at end of file
+</HTML>
Modified: branches/7.1.x/build/pom.xml
===================================================================
--- branches/7.1.x/build/pom.xml 2011-12-15 15:40:25 UTC (rev 3743)
+++ branches/7.1.x/build/pom.xml 2011-12-15 16:26:57 UTC (rev 3744)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.2</version>
+ <version>7.1.2.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid</artifactId>
Modified: branches/7.1.x/cache-jbosscache/pom.xml
===================================================================
--- branches/7.1.x/cache-jbosscache/pom.xml 2011-12-15 15:40:25 UTC (rev 3743)
+++ branches/7.1.x/cache-jbosscache/pom.xml 2011-12-15 16:26:57 UTC (rev 3744)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.2</version>
+ <version>7.1.2.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-cache-jbosscache</artifactId>
Modified: branches/7.1.x/client/pom.xml
===================================================================
--- branches/7.1.x/client/pom.xml 2011-12-15 15:40:25 UTC (rev 3743)
+++ branches/7.1.x/client/pom.xml 2011-12-15 16:26:57 UTC (rev 3744)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.2</version>
+ <version>7.1.2.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-client</artifactId>
Modified: branches/7.1.x/client-jdk15/pom.xml
===================================================================
--- branches/7.1.x/client-jdk15/pom.xml 2011-12-15 15:40:25 UTC (rev 3743)
+++ branches/7.1.x/client-jdk15/pom.xml 2011-12-15 16:26:57 UTC (rev 3744)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.2</version>
+ <version>7.1.2.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-client-jdk15</artifactId>
Modified: branches/7.1.x/common-core/pom.xml
===================================================================
--- branches/7.1.x/common-core/pom.xml 2011-12-15 15:40:25 UTC (rev 3743)
+++ branches/7.1.x/common-core/pom.xml 2011-12-15 16:26:57 UTC (rev 3744)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.2</version>
+ <version>7.1.2.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-common-core</artifactId>
Modified: branches/7.1.x/connectors/connector-file/pom.xml
===================================================================
--- branches/7.1.x/connectors/connector-file/pom.xml 2011-12-15 15:40:25 UTC (rev 3743)
+++ branches/7.1.x/connectors/connector-file/pom.xml 2011-12-15 16:26:57 UTC (rev 3744)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.2</version>
+ <version>7.1.2.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-file</artifactId>
Modified: branches/7.1.x/connectors/connector-ldap/pom.xml
===================================================================
--- branches/7.1.x/connectors/connector-ldap/pom.xml 2011-12-15 15:40:25 UTC (rev 3743)
+++ branches/7.1.x/connectors/connector-ldap/pom.xml 2011-12-15 16:26:57 UTC (rev 3744)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.2</version>
+ <version>7.1.2.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-ldap</artifactId>
Modified: branches/7.1.x/connectors/connector-salesforce/pom.xml
===================================================================
--- branches/7.1.x/connectors/connector-salesforce/pom.xml 2011-12-15 15:40:25 UTC (rev 3743)
+++ branches/7.1.x/connectors/connector-salesforce/pom.xml 2011-12-15 16:26:57 UTC (rev 3744)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.2</version>
+ <version>7.1.2.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-salesforce</artifactId>
Modified: branches/7.1.x/connectors/connector-ws/pom.xml
===================================================================
--- branches/7.1.x/connectors/connector-ws/pom.xml 2011-12-15 15:40:25 UTC (rev 3743)
+++ branches/7.1.x/connectors/connector-ws/pom.xml 2011-12-15 16:26:57 UTC (rev 3744)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.2</version>
+ <version>7.1.2.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-ws</artifactId>
Modified: branches/7.1.x/connectors/pom.xml
===================================================================
--- branches/7.1.x/connectors/pom.xml 2011-12-15 15:40:25 UTC (rev 3743)
+++ branches/7.1.x/connectors/pom.xml 2011-12-15 16:26:57 UTC (rev 3744)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.2</version>
+ <version>7.1.2.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
Modified: branches/7.1.x/connectors/salesforce-api/pom.xml
===================================================================
--- branches/7.1.x/connectors/salesforce-api/pom.xml 2011-12-15 15:40:25 UTC (rev 3743)
+++ branches/7.1.x/connectors/salesforce-api/pom.xml 2011-12-15 16:26:57 UTC (rev 3744)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.2</version>
+ <version>7.1.2.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>salesforce-api</artifactId>
Modified: branches/7.1.x/connectors/sandbox/pom.xml
===================================================================
--- branches/7.1.x/connectors/sandbox/pom.xml 2011-12-15 15:40:25 UTC (rev 3743)
+++ branches/7.1.x/connectors/sandbox/pom.xml 2011-12-15 16:26:57 UTC (rev 3744)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.2</version>
+ <version>7.1.2.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid.connectors</groupId>
Modified: branches/7.1.x/connectors/sandbox/translator-yahoo/pom.xml
===================================================================
--- branches/7.1.x/connectors/sandbox/translator-yahoo/pom.xml 2011-12-15 15:40:25 UTC (rev 3743)
+++ branches/7.1.x/connectors/sandbox/translator-yahoo/pom.xml 2011-12-15 16:26:57 UTC (rev 3744)
@@ -3,7 +3,7 @@
<parent>
<artifactId>sandbox</artifactId>
<groupId>org.jboss.teiid.connectors</groupId>
- <version>7.1.2</version>
+ <version>7.1.2.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-yahoo</artifactId>
Modified: branches/7.1.x/connectors/translator-file/pom.xml
===================================================================
--- branches/7.1.x/connectors/translator-file/pom.xml 2011-12-15 15:40:25 UTC (rev 3743)
+++ branches/7.1.x/connectors/translator-file/pom.xml 2011-12-15 16:26:57 UTC (rev 3744)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.2</version>
+ <version>7.1.2.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-file</artifactId>
Modified: branches/7.1.x/connectors/translator-jdbc/pom.xml
===================================================================
--- branches/7.1.x/connectors/translator-jdbc/pom.xml 2011-12-15 15:40:25 UTC (rev 3743)
+++ branches/7.1.x/connectors/translator-jdbc/pom.xml 2011-12-15 16:26:57 UTC (rev 3744)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.2</version>
+ <version>7.1.2.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-jdbc</artifactId>
Modified: branches/7.1.x/connectors/translator-ldap/pom.xml
===================================================================
--- branches/7.1.x/connectors/translator-ldap/pom.xml 2011-12-15 15:40:25 UTC (rev 3743)
+++ branches/7.1.x/connectors/translator-ldap/pom.xml 2011-12-15 16:26:57 UTC (rev 3744)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.2</version>
+ <version>7.1.2.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-ldap</artifactId>
Modified: branches/7.1.x/connectors/translator-loopback/pom.xml
===================================================================
--- branches/7.1.x/connectors/translator-loopback/pom.xml 2011-12-15 15:40:25 UTC (rev 3743)
+++ branches/7.1.x/connectors/translator-loopback/pom.xml 2011-12-15 16:26:57 UTC (rev 3744)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.2</version>
+ <version>7.1.2.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-loopback</artifactId>
Modified: branches/7.1.x/connectors/translator-netezza/pom.xml
===================================================================
--- branches/7.1.x/connectors/translator-netezza/pom.xml 2011-12-15 15:40:25 UTC (rev 3743)
+++ branches/7.1.x/connectors/translator-netezza/pom.xml 2011-12-15 16:26:57 UTC (rev 3744)
@@ -4,7 +4,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.2</version>
+ <version>7.1.2.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: branches/7.1.x/connectors/translator-salesforce/pom.xml
===================================================================
--- branches/7.1.x/connectors/translator-salesforce/pom.xml 2011-12-15 15:40:25 UTC (rev 3743)
+++ branches/7.1.x/connectors/translator-salesforce/pom.xml 2011-12-15 16:26:57 UTC (rev 3744)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.2</version>
+ <version>7.1.2.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-salesforce</artifactId>
Modified: branches/7.1.x/connectors/translator-ws/pom.xml
===================================================================
--- branches/7.1.x/connectors/translator-ws/pom.xml 2011-12-15 15:40:25 UTC (rev 3743)
+++ branches/7.1.x/connectors/translator-ws/pom.xml 2011-12-15 16:26:57 UTC (rev 3744)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.2</version>
+ <version>7.1.2.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-ws</artifactId>
Modified: branches/7.1.x/console/pom.xml
===================================================================
--- branches/7.1.x/console/pom.xml 2011-12-15 15:40:25 UTC (rev 3743)
+++ branches/7.1.x/console/pom.xml 2011-12-15 16:26:57 UTC (rev 3744)
@@ -4,7 +4,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.2</version>
+ <version>7.1.2.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: branches/7.1.x/documentation/admin-guide/pom.xml
===================================================================
--- branches/7.1.x/documentation/admin-guide/pom.xml 2011-12-15 15:40:25 UTC (rev 3743)
+++ branches/7.1.x/documentation/admin-guide/pom.xml 2011-12-15 16:26:57 UTC (rev 3744)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.1.2</version>
+ <version>7.1.2.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>admin-guide</artifactId>
Modified: branches/7.1.x/documentation/caching-guide/pom.xml
===================================================================
--- branches/7.1.x/documentation/caching-guide/pom.xml 2011-12-15 15:40:25 UTC (rev 3743)
+++ branches/7.1.x/documentation/caching-guide/pom.xml 2011-12-15 16:26:57 UTC (rev 3744)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.1.2</version>
+ <version>7.1.2.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>caching-guide</artifactId>
Modified: branches/7.1.x/documentation/client-developers-guide/pom.xml
===================================================================
--- branches/7.1.x/documentation/client-developers-guide/pom.xml 2011-12-15 15:40:25 UTC (rev 3743)
+++ branches/7.1.x/documentation/client-developers-guide/pom.xml 2011-12-15 16:26:57 UTC (rev 3744)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.1.2</version>
+ <version>7.1.2.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>client-developers-guide</artifactId>
Modified: branches/7.1.x/documentation/developer-guide/pom.xml
===================================================================
--- branches/7.1.x/documentation/developer-guide/pom.xml 2011-12-15 15:40:25 UTC (rev 3743)
+++ branches/7.1.x/documentation/developer-guide/pom.xml 2011-12-15 16:26:57 UTC (rev 3744)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.1.2</version>
+ <version>7.1.2.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>developer-guide</artifactId>
Modified: branches/7.1.x/documentation/pom.xml
===================================================================
--- branches/7.1.x/documentation/pom.xml 2011-12-15 15:40:25 UTC (rev 3743)
+++ branches/7.1.x/documentation/pom.xml 2011-12-15 16:26:57 UTC (rev 3744)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.2</version> </parent>
+ <version>7.1.2.GA</version> </parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
Modified: branches/7.1.x/documentation/quick-start-example/pom.xml
===================================================================
--- branches/7.1.x/documentation/quick-start-example/pom.xml 2011-12-15 15:40:25 UTC (rev 3743)
+++ branches/7.1.x/documentation/quick-start-example/pom.xml 2011-12-15 16:26:57 UTC (rev 3744)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.1.2</version>
+ <version>7.1.2.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>quick-start-example</artifactId>
Modified: branches/7.1.x/documentation/reference/pom.xml
===================================================================
--- branches/7.1.x/documentation/reference/pom.xml 2011-12-15 15:40:25 UTC (rev 3743)
+++ branches/7.1.x/documentation/reference/pom.xml 2011-12-15 16:26:57 UTC (rev 3744)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.1.2</version>
+ <version>7.1.2.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>reference</artifactId>
Modified: branches/7.1.x/engine/pom.xml
===================================================================
--- branches/7.1.x/engine/pom.xml 2011-12-15 15:40:25 UTC (rev 3743)
+++ branches/7.1.x/engine/pom.xml 2011-12-15 16:26:57 UTC (rev 3744)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.2</version>
+ <version>7.1.2.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-engine</artifactId>
Modified: branches/7.1.x/hibernate-dialect/pom.xml
===================================================================
--- branches/7.1.x/hibernate-dialect/pom.xml 2011-12-15 15:40:25 UTC (rev 3743)
+++ branches/7.1.x/hibernate-dialect/pom.xml 2011-12-15 16:26:57 UTC (rev 3744)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.2</version>
+ <version>7.1.2.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-hibernate-dialect</artifactId>
Modified: branches/7.1.x/jboss-integration/pom.xml
===================================================================
--- branches/7.1.x/jboss-integration/pom.xml 2011-12-15 15:40:25 UTC (rev 3743)
+++ branches/7.1.x/jboss-integration/pom.xml 2011-12-15 16:26:57 UTC (rev 3744)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.2</version>
+ <version>7.1.2.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
Modified: branches/7.1.x/metadata/pom.xml
===================================================================
--- branches/7.1.x/metadata/pom.xml 2011-12-15 15:40:25 UTC (rev 3743)
+++ branches/7.1.x/metadata/pom.xml 2011-12-15 16:26:57 UTC (rev 3744)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.2</version>
+ <version>7.1.2.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-metadata</artifactId>
Modified: branches/7.1.x/pom.xml
===================================================================
--- branches/7.1.x/pom.xml 2011-12-15 15:40:25 UTC (rev 3743)
+++ branches/7.1.x/pom.xml 2011-12-15 16:26:57 UTC (rev 3744)
@@ -5,7 +5,7 @@
<artifactId>teiid-parent</artifactId>
<packaging>pom</packaging>
<name>Teiid</name>
- <version>7.1.2</version>
+ <version>7.1.2.GA</version>
<description>Federated SQL and XML query engine.</description>
<properties>
<ant.version>1.7.0</ant.version>
Modified: branches/7.1.x/runtime/pom.xml
===================================================================
--- branches/7.1.x/runtime/pom.xml 2011-12-15 15:40:25 UTC (rev 3743)
+++ branches/7.1.x/runtime/pom.xml 2011-12-15 16:26:57 UTC (rev 3744)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.2</version>
+ <version>7.1.2.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
Modified: branches/7.1.x/test-integration/common/pom.xml
===================================================================
--- branches/7.1.x/test-integration/common/pom.xml 2011-12-15 15:40:25 UTC (rev 3743)
+++ branches/7.1.x/test-integration/common/pom.xml 2011-12-15 16:26:57 UTC (rev 3744)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-test-integration</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.2</version>
+ <version>7.1.2.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>test-integration-common</artifactId>
Modified: branches/7.1.x/test-integration/db/pom.xml
===================================================================
--- branches/7.1.x/test-integration/db/pom.xml 2011-12-15 15:40:25 UTC (rev 3743)
+++ branches/7.1.x/test-integration/db/pom.xml 2011-12-15 16:26:57 UTC (rev 3744)
@@ -9,7 +9,7 @@
<parent>
<artifactId>teiid-test-integration</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.2</version>
+ <version>7.1.2.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: branches/7.1.x/test-integration/pom.xml
===================================================================
--- branches/7.1.x/test-integration/pom.xml 2011-12-15 15:40:25 UTC (rev 3743)
+++ branches/7.1.x/test-integration/pom.xml 2011-12-15 16:26:57 UTC (rev 3744)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.2</version>
+ <version>7.1.2.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-test-integration</artifactId>
13 years
- 1
- 0
teiid SVN: r3743 - in branches/7.6.x: runtime/src/main/java/org/teiid/deployers and 1 other directories.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2011-12-15 10:40:25 -0500 (Thu, 15 Dec 2011)
New Revision: 3743
Modified:
branches/7.6.x/documentation/reference/src/main/docbook/en-US/content/vdbs.xml
branches/7.6.x/runtime/src/main/java/org/teiid/deployers/VDBDeployer.java
branches/7.6.x/runtime/src/main/resources/org/teiid/runtime/i18n.properties
Log:
TEIID-1867 adding source name validation to the creation of connector managers
Modified: branches/7.6.x/documentation/reference/src/main/docbook/en-US/content/vdbs.xml
===================================================================
--- branches/7.6.x/documentation/reference/src/main/docbook/en-US/content/vdbs.xml 2011-12-15 14:25:36 UTC (rev 3742)
+++ branches/7.6.x/documentation/reference/src/main/docbook/en-US/content/vdbs.xml 2011-12-15 15:40:25 UTC (rev 3743)
@@ -103,7 +103,7 @@
</para>
<para>
The name of the model is used as a
- top level schema name for all of the metadata imported from the
+ top level schema name for all of the metadata imported from the
connector. The name should be unique among all Models in the VDB and
should not contain the '.' character.
</para>
@@ -123,6 +123,7 @@
<itemizedlist>
<title>Source Element</title>
+ <para>A source is a named binding of a translator and connection source to a model.</para>
<listitem>
<para>
<emphasis>name</emphasis>
@@ -131,7 +132,9 @@
The name of the source to use for this
model. This can be any name you like, but will typically be the same
as the model name. Having a name different than the model name is
- only useful in multi-source scenarios.
+ only useful in multi-source scenarios. In multi-source, the source names under a given model must
+ be unique. If you have the same source bound to multiple models it may have the same name
+ for each. An exception will be raised if the same source name is used for different sources.
</para>
</listitem>
<listitem>
Modified: branches/7.6.x/runtime/src/main/java/org/teiid/deployers/VDBDeployer.java
===================================================================
--- branches/7.6.x/runtime/src/main/java/org/teiid/deployers/VDBDeployer.java 2011-12-15 14:25:36 UTC (rev 3742)
+++ branches/7.6.x/runtime/src/main/java/org/teiid/deployers/VDBDeployer.java 2011-12-15 15:40:25 UTC (rev 3743)
@@ -176,13 +176,23 @@
IdentityHashMap<Translator, ExecutionFactory<Object, Object>> map = new IdentityHashMap<Translator, ExecutionFactory<Object, Object>>();
for (Model model:deployment.getModels()) {
- for (String source:model.getSourceNames()) {
- if (cmr.getConnectorManager(source) != null) {
+ List<String> sourceNames = model.getSourceNames();
+ if (sourceNames.size() != new HashSet<String>(sourceNames).size()) {
+ throw new DeploymentException(RuntimePlugin.Util.getString("duplicate_source_name", model.getName(), deployment.getName(), deployment.getVersion())); //$NON-NLS-1$
+ }
+ for (String source:sourceNames) {
+ ConnectorManager cm = cmr.getConnectorManager(source);
+ String name = model.getSourceTranslatorName(source);
+ String connection = model.getSourceConnectionJndiName(source);
+ if (cm != null) {
+ if (!cm.getTranslatorName().equals(name)
+ || !cm.getConnectionName().equals(connection)) {
+ throw new DeploymentException(RuntimePlugin.Util.getString("source_name_mismatch", source, deployment.getName(), deployment.getVersion())); //$NON-NLS-1$
+ }
continue;
}
- String name = model.getSourceTranslatorName(source);
- ConnectorManager cm = new ConnectorManager(name, model.getSourceConnectionJndiName(source));
+ cm = new ConnectorManager(name, connection);
ExecutionFactory<Object, Object> ef = getExecutionFactory(name, repo, deployment, map, new HashSet<String>());
cm.setExecutionFactory(ef);
cm.setModelName(model.getName());
Modified: branches/7.6.x/runtime/src/main/resources/org/teiid/runtime/i18n.properties
===================================================================
--- branches/7.6.x/runtime/src/main/resources/org/teiid/runtime/i18n.properties 2011-12-15 14:25:36 UTC (rev 3742)
+++ branches/7.6.x/runtime/src/main/resources/org/teiid/runtime/i18n.properties 2011-12-15 15:40:25 UTC (rev 3743)
@@ -49,6 +49,8 @@
SocketClientInstance.invalid_sessionkey=Invalid session key used during handshake
SSLAwareChannelHandler.channel_closed=Channel closed
+duplicate_source_name=Source names are not unique for model {0} in {1}.{2}
+source_name_mismatch=There are different sources with the name {0} in {1}.{2}
invlaid_vdb_file=Invalid VDB file deployment failed {0}
redeploying_vdb=Re-deploying VDB {0}
validity_errors_in_vdb=VDB has validity errors; failed to deploy - {0}
13 years
- 1
- 0
teiid SVN: r3742 - branches/7.1.x/build/kits/jboss-container.
by teiid-commits＠lists.jboss.org
Author: jolee
Date: 2011-12-15 09:25:36 -0500 (Thu, 15 Dec 2011)
New Revision: 3742
Modified:
branches/7.1.x/build/kits/jboss-container/teiid-releasenotes.html
Log:
SOA-3664 update version of teiid to 7.1.2 for inclusion in EDS 5.1 roll up patch
Modified: branches/7.1.x/build/kits/jboss-container/teiid-releasenotes.html
===================================================================
--- branches/7.1.x/build/kits/jboss-container/teiid-releasenotes.html 2011-12-15 14:25:26 UTC (rev 3741)
+++ branches/7.1.x/build/kits/jboss-container/teiid-releasenotes.html 2011-12-15 14:25:36 UTC (rev 3742)
@@ -157,6 +157,17 @@
<h2><a name="Details">Detailed Release Notes</a></h2>
Detailed Release Notes - Teiid - Version ${project.version}
+
+<h2> Bug
+</h2>
+<ul>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1764'>TEIID-1764</a>] - Hibernate Month Date Extraction
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1803'>TEIID-1803</a>] - VDB deployment in EDS can be extremely slow based upon indexing needs
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1706'>TEIID-1706</a>] - JOIN between two text file data sources extremely slow
+</li>
+</ul>
<h2><a name="Documentation">Documentation and Help</a></h2>
13 years
- 1
- 0
teiid SVN: r3741 - in branches/7.1.x: adminshell and 37 other directories.
by teiid-commits＠lists.jboss.org
Author: jolee
Date: 2011-12-15 09:25:26 -0500 (Thu, 15 Dec 2011)
New Revision: 3741
Modified:
branches/7.1.x/adminshell/pom.xml
branches/7.1.x/api/pom.xml
branches/7.1.x/build/pom.xml
branches/7.1.x/cache-jbosscache/pom.xml
branches/7.1.x/client-jdk15/pom.xml
branches/7.1.x/client/pom.xml
branches/7.1.x/common-core/pom.xml
branches/7.1.x/connectors/connector-file/pom.xml
branches/7.1.x/connectors/connector-ldap/pom.xml
branches/7.1.x/connectors/connector-salesforce/pom.xml
branches/7.1.x/connectors/connector-ws/pom.xml
branches/7.1.x/connectors/pom.xml
branches/7.1.x/connectors/salesforce-api/pom.xml
branches/7.1.x/connectors/sandbox/pom.xml
branches/7.1.x/connectors/sandbox/translator-yahoo/pom.xml
branches/7.1.x/connectors/translator-file/pom.xml
branches/7.1.x/connectors/translator-jdbc/pom.xml
branches/7.1.x/connectors/translator-ldap/pom.xml
branches/7.1.x/connectors/translator-loopback/pom.xml
branches/7.1.x/connectors/translator-netezza/pom.xml
branches/7.1.x/connectors/translator-salesforce/pom.xml
branches/7.1.x/connectors/translator-ws/pom.xml
branches/7.1.x/console/pom.xml
branches/7.1.x/documentation/admin-guide/pom.xml
branches/7.1.x/documentation/caching-guide/pom.xml
branches/7.1.x/documentation/client-developers-guide/pom.xml
branches/7.1.x/documentation/developer-guide/pom.xml
branches/7.1.x/documentation/pom.xml
branches/7.1.x/documentation/quick-start-example/pom.xml
branches/7.1.x/documentation/reference/pom.xml
branches/7.1.x/engine/pom.xml
branches/7.1.x/hibernate-dialect/pom.xml
branches/7.1.x/jboss-integration/pom.xml
branches/7.1.x/metadata/pom.xml
branches/7.1.x/pom.xml
branches/7.1.x/runtime/pom.xml
branches/7.1.x/test-integration/common/pom.xml
branches/7.1.x/test-integration/db/pom.xml
branches/7.1.x/test-integration/pom.xml
Log:
update of all pom.xml to show version 7.1.2
Modified: branches/7.1.x/adminshell/pom.xml
===================================================================
--- branches/7.1.x/adminshell/pom.xml 2011-12-14 22:19:17 UTC (rev 3740)
+++ branches/7.1.x/adminshell/pom.xml 2011-12-15 14:25:26 UTC (rev 3741)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.1.CP3</version>
+ <version>7.1.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-adminshell</artifactId>
Modified: branches/7.1.x/api/pom.xml
===================================================================
--- branches/7.1.x/api/pom.xml 2011-12-14 22:19:17 UTC (rev 3740)
+++ branches/7.1.x/api/pom.xml 2011-12-15 14:25:26 UTC (rev 3741)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.1.CP3</version>
+ <version>7.1.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-api</artifactId>
Modified: branches/7.1.x/build/pom.xml
===================================================================
--- branches/7.1.x/build/pom.xml 2011-12-14 22:19:17 UTC (rev 3740)
+++ branches/7.1.x/build/pom.xml 2011-12-15 14:25:26 UTC (rev 3741)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.1.CP3</version>
+ <version>7.1.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid</artifactId>
Modified: branches/7.1.x/cache-jbosscache/pom.xml
===================================================================
--- branches/7.1.x/cache-jbosscache/pom.xml 2011-12-14 22:19:17 UTC (rev 3740)
+++ branches/7.1.x/cache-jbosscache/pom.xml 2011-12-15 14:25:26 UTC (rev 3741)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.1.CP3</version>
+ <version>7.1.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-cache-jbosscache</artifactId>
Modified: branches/7.1.x/client/pom.xml
===================================================================
--- branches/7.1.x/client/pom.xml 2011-12-14 22:19:17 UTC (rev 3740)
+++ branches/7.1.x/client/pom.xml 2011-12-15 14:25:26 UTC (rev 3741)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.1.CP3</version>
+ <version>7.1.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-client</artifactId>
Modified: branches/7.1.x/client-jdk15/pom.xml
===================================================================
--- branches/7.1.x/client-jdk15/pom.xml 2011-12-14 22:19:17 UTC (rev 3740)
+++ branches/7.1.x/client-jdk15/pom.xml 2011-12-15 14:25:26 UTC (rev 3741)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.1.CP3</version>
+ <version>7.1.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-client-jdk15</artifactId>
Modified: branches/7.1.x/common-core/pom.xml
===================================================================
--- branches/7.1.x/common-core/pom.xml 2011-12-14 22:19:17 UTC (rev 3740)
+++ branches/7.1.x/common-core/pom.xml 2011-12-15 14:25:26 UTC (rev 3741)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.1.CP3</version>
+ <version>7.1.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-common-core</artifactId>
Modified: branches/7.1.x/connectors/connector-file/pom.xml
===================================================================
--- branches/7.1.x/connectors/connector-file/pom.xml 2011-12-14 22:19:17 UTC (rev 3740)
+++ branches/7.1.x/connectors/connector-file/pom.xml 2011-12-15 14:25:26 UTC (rev 3741)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.1.CP3</version>
+ <version>7.1.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-file</artifactId>
Modified: branches/7.1.x/connectors/connector-ldap/pom.xml
===================================================================
--- branches/7.1.x/connectors/connector-ldap/pom.xml 2011-12-14 22:19:17 UTC (rev 3740)
+++ branches/7.1.x/connectors/connector-ldap/pom.xml 2011-12-15 14:25:26 UTC (rev 3741)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.1.CP3</version>
+ <version>7.1.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-ldap</artifactId>
Modified: branches/7.1.x/connectors/connector-salesforce/pom.xml
===================================================================
--- branches/7.1.x/connectors/connector-salesforce/pom.xml 2011-12-14 22:19:17 UTC (rev 3740)
+++ branches/7.1.x/connectors/connector-salesforce/pom.xml 2011-12-15 14:25:26 UTC (rev 3741)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.1.CP3</version>
+ <version>7.1.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-salesforce</artifactId>
Modified: branches/7.1.x/connectors/connector-ws/pom.xml
===================================================================
--- branches/7.1.x/connectors/connector-ws/pom.xml 2011-12-14 22:19:17 UTC (rev 3740)
+++ branches/7.1.x/connectors/connector-ws/pom.xml 2011-12-15 14:25:26 UTC (rev 3741)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.1.CP3</version>
+ <version>7.1.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-ws</artifactId>
Modified: branches/7.1.x/connectors/pom.xml
===================================================================
--- branches/7.1.x/connectors/pom.xml 2011-12-14 22:19:17 UTC (rev 3740)
+++ branches/7.1.x/connectors/pom.xml 2011-12-15 14:25:26 UTC (rev 3741)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.1.CP3</version>
+ <version>7.1.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
Modified: branches/7.1.x/connectors/salesforce-api/pom.xml
===================================================================
--- branches/7.1.x/connectors/salesforce-api/pom.xml 2011-12-14 22:19:17 UTC (rev 3740)
+++ branches/7.1.x/connectors/salesforce-api/pom.xml 2011-12-15 14:25:26 UTC (rev 3741)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.1.CP3</version>
+ <version>7.1.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>salesforce-api</artifactId>
Modified: branches/7.1.x/connectors/sandbox/pom.xml
===================================================================
--- branches/7.1.x/connectors/sandbox/pom.xml 2011-12-14 22:19:17 UTC (rev 3740)
+++ branches/7.1.x/connectors/sandbox/pom.xml 2011-12-15 14:25:26 UTC (rev 3741)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.1.CP3</version>
+ <version>7.1.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid.connectors</groupId>
Modified: branches/7.1.x/connectors/sandbox/translator-yahoo/pom.xml
===================================================================
--- branches/7.1.x/connectors/sandbox/translator-yahoo/pom.xml 2011-12-14 22:19:17 UTC (rev 3740)
+++ branches/7.1.x/connectors/sandbox/translator-yahoo/pom.xml 2011-12-15 14:25:26 UTC (rev 3741)
@@ -3,7 +3,7 @@
<parent>
<artifactId>sandbox</artifactId>
<groupId>org.jboss.teiid.connectors</groupId>
- <version>7.1.1.CP3</version>
+ <version>7.1.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-yahoo</artifactId>
Modified: branches/7.1.x/connectors/translator-file/pom.xml
===================================================================
--- branches/7.1.x/connectors/translator-file/pom.xml 2011-12-14 22:19:17 UTC (rev 3740)
+++ branches/7.1.x/connectors/translator-file/pom.xml 2011-12-15 14:25:26 UTC (rev 3741)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.1.CP3</version>
+ <version>7.1.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-file</artifactId>
Modified: branches/7.1.x/connectors/translator-jdbc/pom.xml
===================================================================
--- branches/7.1.x/connectors/translator-jdbc/pom.xml 2011-12-14 22:19:17 UTC (rev 3740)
+++ branches/7.1.x/connectors/translator-jdbc/pom.xml 2011-12-15 14:25:26 UTC (rev 3741)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.1.CP3</version>
+ <version>7.1.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-jdbc</artifactId>
Modified: branches/7.1.x/connectors/translator-ldap/pom.xml
===================================================================
--- branches/7.1.x/connectors/translator-ldap/pom.xml 2011-12-14 22:19:17 UTC (rev 3740)
+++ branches/7.1.x/connectors/translator-ldap/pom.xml 2011-12-15 14:25:26 UTC (rev 3741)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.1.CP3</version>
+ <version>7.1.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-ldap</artifactId>
Modified: branches/7.1.x/connectors/translator-loopback/pom.xml
===================================================================
--- branches/7.1.x/connectors/translator-loopback/pom.xml 2011-12-14 22:19:17 UTC (rev 3740)
+++ branches/7.1.x/connectors/translator-loopback/pom.xml 2011-12-15 14:25:26 UTC (rev 3741)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.1.CP3</version>
+ <version>7.1.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-loopback</artifactId>
Modified: branches/7.1.x/connectors/translator-netezza/pom.xml
===================================================================
--- branches/7.1.x/connectors/translator-netezza/pom.xml 2011-12-14 22:19:17 UTC (rev 3740)
+++ branches/7.1.x/connectors/translator-netezza/pom.xml 2011-12-15 14:25:26 UTC (rev 3741)
@@ -4,7 +4,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.1.CP3</version>
+ <version>7.1.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: branches/7.1.x/connectors/translator-salesforce/pom.xml
===================================================================
--- branches/7.1.x/connectors/translator-salesforce/pom.xml 2011-12-14 22:19:17 UTC (rev 3740)
+++ branches/7.1.x/connectors/translator-salesforce/pom.xml 2011-12-15 14:25:26 UTC (rev 3741)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.1.CP3</version>
+ <version>7.1.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-salesforce</artifactId>
Modified: branches/7.1.x/connectors/translator-ws/pom.xml
===================================================================
--- branches/7.1.x/connectors/translator-ws/pom.xml 2011-12-14 22:19:17 UTC (rev 3740)
+++ branches/7.1.x/connectors/translator-ws/pom.xml 2011-12-15 14:25:26 UTC (rev 3741)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.1.CP3</version>
+ <version>7.1.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-ws</artifactId>
Modified: branches/7.1.x/console/pom.xml
===================================================================
--- branches/7.1.x/console/pom.xml 2011-12-14 22:19:17 UTC (rev 3740)
+++ branches/7.1.x/console/pom.xml 2011-12-15 14:25:26 UTC (rev 3741)
@@ -4,7 +4,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.1.CP3</version>
+ <version>7.1.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: branches/7.1.x/documentation/admin-guide/pom.xml
===================================================================
--- branches/7.1.x/documentation/admin-guide/pom.xml 2011-12-14 22:19:17 UTC (rev 3740)
+++ branches/7.1.x/documentation/admin-guide/pom.xml 2011-12-15 14:25:26 UTC (rev 3741)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.1.1.CP3</version>
+ <version>7.1.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>admin-guide</artifactId>
Modified: branches/7.1.x/documentation/caching-guide/pom.xml
===================================================================
--- branches/7.1.x/documentation/caching-guide/pom.xml 2011-12-14 22:19:17 UTC (rev 3740)
+++ branches/7.1.x/documentation/caching-guide/pom.xml 2011-12-15 14:25:26 UTC (rev 3741)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.1.1.CP3</version>
+ <version>7.1.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>caching-guide</artifactId>
Modified: branches/7.1.x/documentation/client-developers-guide/pom.xml
===================================================================
--- branches/7.1.x/documentation/client-developers-guide/pom.xml 2011-12-14 22:19:17 UTC (rev 3740)
+++ branches/7.1.x/documentation/client-developers-guide/pom.xml 2011-12-15 14:25:26 UTC (rev 3741)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.1.1.CP3</version>
+ <version>7.1.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>client-developers-guide</artifactId>
Modified: branches/7.1.x/documentation/developer-guide/pom.xml
===================================================================
--- branches/7.1.x/documentation/developer-guide/pom.xml 2011-12-14 22:19:17 UTC (rev 3740)
+++ branches/7.1.x/documentation/developer-guide/pom.xml 2011-12-15 14:25:26 UTC (rev 3741)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.1.1.CP3</version>
+ <version>7.1.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>developer-guide</artifactId>
Modified: branches/7.1.x/documentation/pom.xml
===================================================================
--- branches/7.1.x/documentation/pom.xml 2011-12-14 22:19:17 UTC (rev 3740)
+++ branches/7.1.x/documentation/pom.xml 2011-12-15 14:25:26 UTC (rev 3741)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.1.CP3</version> </parent>
+ <version>7.1.2</version> </parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
Modified: branches/7.1.x/documentation/quick-start-example/pom.xml
===================================================================
--- branches/7.1.x/documentation/quick-start-example/pom.xml 2011-12-14 22:19:17 UTC (rev 3740)
+++ branches/7.1.x/documentation/quick-start-example/pom.xml 2011-12-15 14:25:26 UTC (rev 3741)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.1.1.CP3</version>
+ <version>7.1.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>quick-start-example</artifactId>
Modified: branches/7.1.x/documentation/reference/pom.xml
===================================================================
--- branches/7.1.x/documentation/reference/pom.xml 2011-12-14 22:19:17 UTC (rev 3740)
+++ branches/7.1.x/documentation/reference/pom.xml 2011-12-15 14:25:26 UTC (rev 3741)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.1.1.CP3</version>
+ <version>7.1.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>reference</artifactId>
Modified: branches/7.1.x/engine/pom.xml
===================================================================
--- branches/7.1.x/engine/pom.xml 2011-12-14 22:19:17 UTC (rev 3740)
+++ branches/7.1.x/engine/pom.xml 2011-12-15 14:25:26 UTC (rev 3741)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.1.CP3</version>
+ <version>7.1.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-engine</artifactId>
Modified: branches/7.1.x/hibernate-dialect/pom.xml
===================================================================
--- branches/7.1.x/hibernate-dialect/pom.xml 2011-12-14 22:19:17 UTC (rev 3740)
+++ branches/7.1.x/hibernate-dialect/pom.xml 2011-12-15 14:25:26 UTC (rev 3741)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.1.CP3</version>
+ <version>7.1.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-hibernate-dialect</artifactId>
Modified: branches/7.1.x/jboss-integration/pom.xml
===================================================================
--- branches/7.1.x/jboss-integration/pom.xml 2011-12-14 22:19:17 UTC (rev 3740)
+++ branches/7.1.x/jboss-integration/pom.xml 2011-12-15 14:25:26 UTC (rev 3741)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.1.CP3</version>
+ <version>7.1.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
Modified: branches/7.1.x/metadata/pom.xml
===================================================================
--- branches/7.1.x/metadata/pom.xml 2011-12-14 22:19:17 UTC (rev 3740)
+++ branches/7.1.x/metadata/pom.xml 2011-12-15 14:25:26 UTC (rev 3741)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.1.CP3</version>
+ <version>7.1.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-metadata</artifactId>
Modified: branches/7.1.x/pom.xml
===================================================================
--- branches/7.1.x/pom.xml 2011-12-14 22:19:17 UTC (rev 3740)
+++ branches/7.1.x/pom.xml 2011-12-15 14:25:26 UTC (rev 3741)
@@ -5,7 +5,7 @@
<artifactId>teiid-parent</artifactId>
<packaging>pom</packaging>
<name>Teiid</name>
- <version>7.1.1.CP3</version>
+ <version>7.1.2</version>
<description>Federated SQL and XML query engine.</description>
<properties>
<ant.version>1.7.0</ant.version>
Modified: branches/7.1.x/runtime/pom.xml
===================================================================
--- branches/7.1.x/runtime/pom.xml 2011-12-14 22:19:17 UTC (rev 3740)
+++ branches/7.1.x/runtime/pom.xml 2011-12-15 14:25:26 UTC (rev 3741)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.1.CP3</version>
+ <version>7.1.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
Modified: branches/7.1.x/test-integration/common/pom.xml
===================================================================
--- branches/7.1.x/test-integration/common/pom.xml 2011-12-14 22:19:17 UTC (rev 3740)
+++ branches/7.1.x/test-integration/common/pom.xml 2011-12-15 14:25:26 UTC (rev 3741)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-test-integration</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.1.CP3</version>
+ <version>7.1.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>test-integration-common</artifactId>
Modified: branches/7.1.x/test-integration/db/pom.xml
===================================================================
--- branches/7.1.x/test-integration/db/pom.xml 2011-12-14 22:19:17 UTC (rev 3740)
+++ branches/7.1.x/test-integration/db/pom.xml 2011-12-15 14:25:26 UTC (rev 3741)
@@ -9,7 +9,7 @@
<parent>
<artifactId>teiid-test-integration</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.1.CP3</version>
+ <version>7.1.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: branches/7.1.x/test-integration/pom.xml
===================================================================
--- branches/7.1.x/test-integration/pom.xml 2011-12-14 22:19:17 UTC (rev 3740)
+++ branches/7.1.x/test-integration/pom.xml 2011-12-15 14:25:26 UTC (rev 3741)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.1.1.CP3</version>
+ <version>7.1.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-test-integration</artifactId>
13 years
- 1
- 0