Branch: refs/heads/master Home: https://github.com/teiid/teiid Commit: 08182fd19e317a8eba8aa90845a864fd4046966f https://github.com/teiid/teiid/commit/08182fd19e317a8eba8aa90845a864fd404... Author: Van Halbert <vhalbert(a)redhat.com&gt; Date: 2014-11-11 (Tue, 11 Nov 2014) Changed paths: M connectors/connector-infinispan.6/src/test/java/org/teiid/resource/adapter/infinispan/RemoteInfinispanTestHelper.java M connectors/connector-infinispan.6/src/test/java/org/teiid/resource/adapter/infinispan/TestInfinispanJndiNameKeyOnlySearch.java M connectors/translator-infinispan-dsl/pom.xml M connectors/translator-object/kits/jboss-as7/modules/org/jboss/teiid/translator/object/main/module.xml M connectors/translator-object/src/main/java/org/teiid/resource/adapter/infinispan/base/AbstractInfinispanManagedConnectionFactory.java M connectors/translator-object/src/main/java/org/teiid/translator/object/CacheContainerWrapper.java M connectors/translator-object/src/main/java/org/teiid/translator/object/ObjectConnection.java M connectors/translator-object/src/main/java/org/teiid/translator/object/ObjectExecution.java M connectors/translator-object/src/main/java/org/teiid/translator/object/ObjectExecutionFactory.java M connectors/translator-object/src/main/java/org/teiid/translator/object/SearchByKey.java A connectors/translator-object/src/main/java/org/teiid/translator/object/SearchType.java A connectors/translator-object/src/main/java/org/teiid/translator/object/infinispan/DSLSearch.java M connectors/translator-object/src/main/java/org/teiid/translator/object/infinispan/InfinispanExecutionFactory.java M connectors/translator-object/src/main/java/org/teiid/translator/object/infinispan/InfinispanUpdateExecution.java M connectors/translator-object/src/main/java/org/teiid/translator/object/infinispan/LuceneSearch.java M connectors/translator-object/src/test/java/org/teiid/translator/object/TestMapCacheKeySearch.java M connectors/translator-object/src/test/java/org/teiid/translator/object/TestObjectConnection.java M connectors/translator-object/src/test/java/org/teiid/translator/object/TestObjectExecutionFactory.java M connectors/translator-object/src/test/java/org/teiid/translator/object/infinispan/TestInfinispanConfigFileKeySearch.java M connectors/translator-object/src/test/java/org/teiid/translator/object/infinispan/TestInfinispanConnection.java A connectors/translator-object/src/test/java/org/teiid/translator/object/infinispan/TestInfinispanJndiDSLSearch.java M connectors/translator-object/src/test/java/org/teiid/translator/object/infinispan/TestInfinispanJndiILuceneSearch.java M connectors/translator-object/src/test/java/org/teiid/translator/object/infinispan/TestInfinispanUpdateExecution.java M connectors/translator-object/src/test/java/org/teiid/translator/object/testdata/Trade.java A connectors/translator-object/src/test/java/org/teiid/translator/object/testdata/TradesCacheSource.java A connectors/translator-object/src/test/java/org/teiid/translator/object/testdata/annotated/Leg.java A connectors/translator-object/src/test/java/org/teiid/translator/object/testdata/annotated/MyFieldBridge.java A connectors/translator-object/src/test/java/org/teiid/translator/object/testdata/annotated/Trade.java A connectors/translator-object/src/test/java/org/teiid/translator/object/testdata/annotated/TradesAnnotatedCacheSource.java A connectors/translator-object/src/test/java/org/teiid/translator/object/testdata/annotated/Transaction.java R connectors/translator-object/src/test/java/org/teiid/translator/object/util/TradesCacheSource.java Log Message: ----------- TEIID-3137 pushing changes upstream from 8.7. One small change was required to DSLSearch to work using Infin. 6.0, instead of Infin. 6.1 removed the unneeded dependency on the pojo module TEIID-3137 misc changes