Branch: refs/heads/master Home: https://github.com/teiid/teiid Commit: 5185f668c4d226a86160dd137d8369b2bc04353a https://github.com/teiid/teiid/commit/5185f668c4d226a86160dd137d8369b2bc0... Author: Van Halbert <vhalbert(a)redhat.com&gt; Date: 2016-03-24 (Thu, 24 Mar 2016) Changed paths: M connectors/connector-infinispan-dsl/pom.xml A connectors/connector-infinispan-dsl/src/main/java/org/teiid/resource/adapter/infinispan/dsl/AbstractInfinispanManagedConnectionFactory.java A connectors/connector-infinispan-dsl/src/main/java/org/teiid/resource/adapter/infinispan/dsl/DSLSearch.java A connectors/connector-infinispan-dsl/src/main/java/org/teiid/resource/adapter/infinispan/dsl/InfinispanConnectionImpl.java M connectors/connector-infinispan-dsl/src/main/java/org/teiid/resource/adapter/infinispan/dsl/InfinispanManagedConnectionFactory.java A connectors/connector-infinispan-dsl/src/test/java/org/jboss/teiid/jdg_remote/pojo/marshaller/AllTypesMarshaller.java A connectors/connector-infinispan-dsl/src/test/java/org/teiid/resource/adapter/infinispan/dsl/RemoteInfinispanTestHelper.java A connectors/connector-infinispan-dsl/src/test/java/org/teiid/resource/adapter/infinispan/dsl/TestInfinispanConfigFileRemoteCache.java A connectors/connector-infinispan-dsl/src/test/java/org/teiid/resource/adapter/infinispan/dsl/TestInfinispanServerListUsingAnnotations.java A connectors/connector-infinispan-dsl/src/test/java/org/teiid/resource/adapter/infinispan/dsl/TesttInfinispanConnectionFactory.java A connectors/connector-infinispan-dsl/src/test/resources/infinispan_remote_config.xml A connectors/connector-infinispan-dsl/src/test/resources/jdg.properties M connectors/connector-infinispan.6/kits/wildfly/modules/org/jboss/teiid/resource-adapter/infinispan/6/META-INF/ra.xml M connectors/connector-infinispan.6/kits/wildfly/modules/org/jboss/teiid/resource-adapter/infinispan/6/module.xml A connectors/connector-infinispan.6/src/main/java/org/teiid/resource/adapter/infinispan/DSLSearch.java M connectors/connector-infinispan.6/src/main/java/org/teiid/resource/adapter/infinispan/InfinispanCacheRAConnection.java M connectors/connector-infinispan.6/src/main/java/org/teiid/resource/adapter/infinispan/InfinispanCacheWrapper.java M connectors/connector-infinispan.6/src/main/java/org/teiid/resource/adapter/infinispan/InfinispanManagedConnectionFactory.java A connectors/connector-infinispan.6/src/main/java/org/teiid/resource/adapter/infinispan/LuceneSearch.java M connectors/connector-infinispan.6/src/main/java/org/teiid/resource/adapter/infinispan/local/LocalCacheConnection.java M connectors/connector-infinispan.6/src/main/java/org/teiid/resource/adapter/infinispan/remote/RemoteCacheConnection.java A connectors/connector-infinispan.6/src/test/java/org/teiid/resource/adapter/infinispan/InfinispanTestHelper.java R 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/TestInfinispanConfigFileLocalCache.java R connectors/connector-infinispan.6/src/test/java/org/teiid/resource/adapter/infinispan/TestInfinispanConfigFileRemoteCache.java A connectors/connector-infinispan.6/src/test/java/org/teiid/resource/adapter/infinispan/TestInfinispanJndiDSLSearch.java M connectors/connector-infinispan.6/src/test/java/org/teiid/resource/adapter/infinispan/TestInfinispanJndiNameKeyOnlySearch.java M connectors/connector-infinispan.6/src/test/java/org/teiid/resource/adapter/infinispan/TestInfinispanManagedConnectionFactory.java R connectors/connector-infinispan.6/src/test/java/org/teiid/resource/adapter/infinispan/TestInfinispanServerList.java A connectors/connector-infinispan.6/src/test/java/org/teiid/resource/adapter/infinispan/TestInfinispanUpdateExecution.java A connectors/connector-infinispan.6/src/test/java/org/teiid/resource/adapter/infinispan/TradeAnnotatedObjectConnection.java M connectors/connector-infinispan.6/src/test/resources/infinispan_persistent_config.xml M connectors/connector-infinispan.6/src/test/resources/infinispan_remote_config.xml M connectors/translator-infinispan-cache/kits/wildfly/modules/org/jboss/teiid/translator/infinispan/cache/main/module.xml M connectors/translator-infinispan-cache/pom.xml R connectors/translator-infinispan-cache/src/main/java/org/teiid/translator/infinispan/cache/DSLSearch.java M connectors/translator-infinispan-cache/src/main/java/org/teiid/translator/infinispan/cache/InfinispanCacheConnection.java M connectors/translator-infinispan-cache/src/main/java/org/teiid/translator/infinispan/cache/InfinispanCacheExecutionFactory.java R connectors/translator-infinispan-cache/src/main/java/org/teiid/translator/infinispan/cache/LuceneSearch.java M connectors/translator-infinispan-cache/src/test/java/org/teiid/translator/infinispan/cache/TestInfinispanConfigFileKeySearch.java R connectors/translator-infinispan-cache/src/test/java/org/teiid/translator/infinispan/cache/TestInfinispanConnection.java A connectors/translator-infinispan-cache/src/test/java/org/teiid/translator/infinispan/cache/TestInfinispanConnectionHelper.java M connectors/translator-infinispan-cache/src/test/java/org/teiid/translator/infinispan/cache/TestInfinispanExecutionFactory.java R connectors/translator-infinispan-cache/src/test/java/org/teiid/translator/infinispan/cache/TestInfinispanJndiDSLSearch.java R connectors/translator-infinispan-cache/src/test/java/org/teiid/translator/infinispan/cache/TestInfinispanJndiILuceneSearch.java R connectors/translator-infinispan-cache/src/test/java/org/teiid/translator/infinispan/cache/TestInfinispanUpdateExecution.java R connectors/translator-infinispan-cache/src/test/java/org/teiid/translator/infinispan/cache/TestInfinispanUpdateUsingLuceneExecution.java M connectors/translator-infinispan-cache/src/test/java/org/teiid/translator/object/testdata/annotated/Trade.java M connectors/translator-infinispan-cache/src/test/java/org/teiid/translator/object/testdata/annotated/TradeAnnotatedObjectConnection.java M connectors/translator-infinispan-cache/src/test/java/org/teiid/translator/object/testdata/annotated/TradesAnnotatedCacheSource.java M connectors/translator-infinispan-cache/src/test/resources/infinispan_persistent_config.xml M connectors/translator-infinispan-cache/src/test/resources/infinispan_persistent_indexing_config.xml R connectors/translator-infinispan-cache/src/test/resources/infinispan_remote_config.xml M connectors/translator-infinispan-dsl/kits/wildfly/modules/org/jboss/teiid/translator/infinispan/dsl/main/module.xml R connectors/translator-infinispan-dsl/src/main/java/org/teiid/resource/adapter/infinispan/dsl/base/AbstractInfinispanManagedConnectionFactory.java R connectors/translator-infinispan-dsl/src/main/java/org/teiid/resource/adapter/infinispan/dsl/base/InfinispanConnectionImpl.java R connectors/translator-infinispan-dsl/src/main/java/org/teiid/translator/infinispan/dsl/DSLSearch.java M connectors/translator-infinispan-dsl/src/main/java/org/teiid/translator/infinispan/dsl/InfinispanExecutionFactory.java A connectors/translator-infinispan-dsl/src/main/java/org/teiid/translator/infinispan/dsl/metadata/AnnotationMetadataProcessor.java M connectors/translator-infinispan-dsl/src/main/java/org/teiid/translator/infinispan/dsl/metadata/ProtobufMetadataProcessor.java M connectors/translator-infinispan-dsl/src/test/java/org/jboss/as/quickstarts/datagrid/hotrod/query/domain/Person.java M connectors/translator-infinispan-dsl/src/test/java/org/jboss/as/quickstarts/datagrid/hotrod/query/domain/PersonCacheConnection.java M connectors/translator-infinispan-dsl/src/test/java/org/jboss/as/quickstarts/datagrid/hotrod/query/domain/PersonCacheSource.java M connectors/translator-infinispan-dsl/src/test/java/org/jboss/teiid/jdg_remote/pojo/AllTypes.java M connectors/translator-infinispan-dsl/src/test/java/org/jboss/teiid/jdg_remote/pojo/AllTypesCacheSource.java R connectors/translator-infinispan-dsl/src/test/java/org/teiid/translator/infinispan/dsl/TestAbstractInfinispanConnectionFactory.java M connectors/translator-infinispan-dsl/src/test/java/org/teiid/translator/infinispan/dsl/TestInfinispanExecution.java M connectors/translator-infinispan-dsl/src/test/java/org/teiid/translator/infinispan/dsl/TestInfinispanExecutionUsingAllTypes.java M connectors/translator-infinispan-dsl/src/test/java/org/teiid/translator/infinispan/dsl/TestInfinispanUpdateExecution.java M connectors/translator-infinispan-dsl/src/test/java/org/teiid/translator/infinispan/dsl/TestInfinispanUpdateUsingAllTypes.java A connectors/translator-infinispan-dsl/src/test/java/org/teiid/translator/infinispan/dsl/metadata/TestAnnotationMetadataProcessor.java M connectors/translator-infinispan-dsl/src/test/java/org/teiid/translator/infinispan/dsl/metadata/TestProtobufMetadataProcessor.java M connectors/translator-object/kits/wildfly/modules/org/jboss/teiid/translator/object/main/module.xml 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/ObjectUpdateExecution.java M connectors/translator-object/src/main/java/org/teiid/translator/object/ObjectVisitor.java M connectors/translator-object/src/main/java/org/teiid/translator/object/SearchType.java M connectors/translator-object/src/main/java/org/teiid/translator/object/metadata/JavaBeanMetadataProcessor.java M connectors/translator-object/src/main/java/org/teiid/translator/object/simpleMap/SearchByKey.java M connectors/translator-object/src/main/java/org/teiid/translator/object/simpleMap/SimpleKeyVisitor.java M connectors/translator-object/src/main/java/org/teiid/translator/object/simpleMap/SimpleMapCacheConnection.java M connectors/translator-object/src/main/java/org/teiid/translator/object/simpleMap/SimpleMapCacheExecutionFactory.java M connectors/translator-object/src/test/java/org/teiid/translator/object/metadata/TestAnnotationMetadataProcessor.java M connectors/translator-object/src/test/java/org/teiid/translator/object/metadata/TestPersonMetadataProcessor.java M connectors/translator-object/src/test/java/org/teiid/translator/object/metadata/TestTradesMetadataProcessor.java M pom.xml Log Message: ----------- TEIID-3725 TEIID-2293 TEIID-4018 TEIID-2293 TEIID-4002 Promoting upstream from 8.12.x branch Commit: 6d4a76a701234061dfe7018c5713c31cb55fdd0f https://github.com/teiid/teiid/commit/6d4a76a701234061dfe7018c5713c31cb55... Author: Steven Hawkins <shawkins(a)redhat.com&gt; Date: 2016-03-24 (Thu, 24 Mar 2016) Log Message: ----------- Merge branch 'master' of github.com:teiid/teiid Compare: https://github.com/teiid/teiid/compare/e41a16feaa64...6d4a76a70123