Branch: refs/heads/master Home: https://github.com/teiid/teiid Commit: d66abb3e5a6be8fcaa048cc3410f59ca85dbf8ff https://github.com/teiid/teiid/commit/d66abb3e5a6be8fcaa048cc3410f59ca85d... Author: Van Halbert <vhalbert(a)redhat.com&gt; Date: 2014-09-25 (Thu, 25 Sep 2014) Changed paths: M connectors/connector-infinispan-dsl/pom.xml M connectors/connector-infinispan.6/pom.xml R connectors/connector-infinispan/kits/embedded-dist.xml R connectors/connector-infinispan/kits/jboss-as7-dist.xml R connectors/connector-infinispan/kits/jboss-as7/modules/org/jboss/teiid/resource-adapter/infinispan/main/module.xml R connectors/connector-infinispan/pom.xml R connectors/connector-infinispan/src/main/java/org/teiid/resource/adapter/infinispan/InfinispanManagedConnectionFactory.java R connectors/connector-infinispan/src/main/java/org/teiid/resource/adapter/infinispan/InfinispanResourceAdapter.java R connectors/connector-infinispan/src/main/java/org/teiid/resource/adapter/infinispan/PojoMarshaller.java R connectors/connector-infinispan/src/main/rar/META-INF/MANIFEST.MF R connectors/connector-infinispan/src/main/rar/META-INF/ra.xml R connectors/connector-infinispan/src/test/java/org/teiid/resource/adapter/infinispan/RemoteInfinispanTestHelper.java R connectors/connector-infinispan/src/test/java/org/teiid/resource/adapter/infinispan/TestInfinispanConfigFileLocalCache.java R connectors/connector-infinispan/src/test/java/org/teiid/resource/adapter/infinispan/TestInfinispanConfigFileRemoteCache.java R connectors/connector-infinispan/src/test/java/org/teiid/resource/adapter/infinispan/TestInfinispanJndiNameKeyOnlySearch.java R connectors/connector-infinispan/src/test/java/org/teiid/resource/adapter/infinispan/TestInfinispanServerList.java R connectors/connector-infinispan/src/test/java/org/teiid/resource/adapter/infinispan/util/Leg.java R connectors/connector-infinispan/src/test/java/org/teiid/resource/adapter/infinispan/util/Trade.java R connectors/connector-infinispan/src/test/java/org/teiid/resource/adapter/infinispan/util/TradesCacheSource.java R connectors/connector-infinispan/src/test/java/org/teiid/resource/adapter/infinispan/util/Transaction.java R connectors/connector-infinispan/src/test/resources/ObjectProject/Trade.vdb R connectors/connector-infinispan/src/test/resources/ObjectProject/Trade_Object.xmi R connectors/connector-infinispan/src/test/resources/ObjectProject/Trade_View.xmi R connectors/connector-infinispan/src/test/resources/hotrod-client.properties R connectors/connector-infinispan/src/test/resources/infinispan_persistent_config.xml R connectors/connector-infinispan/src/test/resources/infinispan_remote_config.xml M connectors/pom.xml M connectors/translator-infinispan-dsl/pom.xml M connectors/translator-object/pom.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/resource/adapter/infinispan/base/InfinispanConnectionImpl.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/infinispan/InfinispanExecutionFactory.java M connectors/translator-object/src/main/java/org/teiid/translator/object/metadata/JavaBeanMetadataProcessor.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/TestObjectExecutionFactory.java M connectors/translator-object/src/test/java/org/teiid/translator/object/infinispan/TestInfinispanConnection.java M connectors/translator-object/src/test/java/org/teiid/translator/object/util/TradesCacheSource.java M connectors/translator-object/src/test/resources/infinispan_persistent_config.xml M connectors/translator-object/src/test/resources/infinispan_persistent_indexing_config.xml M connectors/translator-object/src/test/resources/infinispan_remote_config.xml M pom.xml Log Message: ----------- TEIID-3137 changes to move to support Infinispan 6.0 and remote support for Infinispan 5 Commit: 8d24cb9353f4fe48b18931fedf9e4267567e02ee https://github.com/teiid/teiid/commit/8d24cb9353f4fe48b18931fedf9e4267567... Author: Van Halbert <vhalbert(a)redhat.com&gt; Date: 2014-09-29 (Mon, 29 Sep 2014) Changed paths: M connectors/translator-object/src/main/java/org/teiid/resource/adapter/infinispan/base/AbstractInfinispanManagedConnectionFactory.java Log Message: ----------- TEIID-3137 removed dependency on BasicCache Commit: 0a7df125fae9d44639719b4f24d9bacc08733602 https://github.com/teiid/teiid/commit/0a7df125fae9d44639719b4f24d9bacc087... Author: Van Halbert <vhalbert(a)redhat.com&gt; Date: 2014-09-29 (Mon, 29 Sep 2014) Changed paths: M connectors/translator-object/src/test/java/org/teiid/translator/object/infinispan/TestInfinispanConnection.java Log Message: ----------- TEIID-3137 fix test case to use Cache Commit: 24fe17b48e9e753455784399b0c9b24718e2efa1 https://github.com/teiid/teiid/commit/24fe17b48e9e753455784399b0c9b24718e... Author: Van Halbert <vhalbert(a)redhat.com&gt; Date: 2014-09-29 (Mon, 29 Sep 2014) Changed paths: M connectors/connector-infinispan.6/pom.xml M connectors/translator-object/pom.xml M pom.xml Log Message: ----------- TEIID-3137 fix dependencies Commit: 3d0602dfba7e20a4ec27fe3eb9269b94af44351a https://github.com/teiid/teiid/commit/3d0602dfba7e20a4ec27fe3eb9269b94af4... Author: Van Halbert <vhalbert(a)redhat.com&gt; Date: 2014-09-30 (Tue, 30 Sep 2014) Changed paths: M build/kits/jboss-as7/bin/scripts/teiid-domain-mode-install.cli M build/kits/jboss-as7/bin/scripts/teiid-standalone-mode-install.cli M build/kits/jboss-as7/standalone/configuration/standalone-teiid.xml Log Message: ----------- TEIID-3137 fixing the configurations by removing infinispan connector and translators till the packaging and module dependencies are worked out Commit: d0f71f56d526b41a5ba18cbb6745317e4d578382 https://github.com/teiid/teiid/commit/d0f71f56d526b41a5ba18cbb6745317e4d5... Author: Van Halbert <vhalbert(a)redhat.com&gt; Date: 2014-09-30 (Tue, 30 Sep 2014) Changed paths: R connectors/connector-infinispan-dsl/kits/jboss-as7/modules/org/infinispan/hotrod/6.2/module.xml M connectors/connector-infinispan-dsl/kits/jboss-as7/modules/org/jboss/teiid/resource-adapter/infinispan/dsl/main/module.xml M connectors/connector-infinispan-dsl/pom.xml M connectors/translator-infinispan-dsl/kits/jboss-as7/modules/org/jboss/teiid/translator/infinispan/dsl/main/module.xml Log Message: ----------- TEIID-3137 remove infinispan dependencies in the kits Commit: 02f01188e843f76f6645c7abc2cb81fd10673d60 https://github.com/teiid/teiid/commit/02f01188e843f76f6645c7abc2cb81fd106... Author: shawkins <shawkins(a)redhat.com&gt; Date: 2014-09-30 (Tue, 30 Sep 2014) Changed paths: M connectors/connector-infinispan-dsl/pom.xml M connectors/connector-infinispan.6/pom.xml R connectors/connector-infinispan/kits/embedded-dist.xml R connectors/connector-infinispan/kits/jboss-as7-dist.xml R connectors/connector-infinispan/kits/jboss-as7/modules/org/jboss/teiid/resource-adapter/infinispan/main/module.xml R connectors/connector-infinispan/src/main/java/org/teiid/resource/adapter/infinispan/InfinispanManagedConnectionFactory.java R connectors/connector-infinispan/src/main/java/org/teiid/resource/adapter/infinispan/InfinispanResourceAdapter.java R connectors/connector-infinispan/src/main/java/org/teiid/resource/adapter/infinispan/PojoMarshaller.java R connectors/connector-infinispan/src/main/rar/META-INF/MANIFEST.MF R connectors/connector-infinispan/src/main/rar/META-INF/ra.xml R connectors/connector-infinispan/src/test/java/org/teiid/resource/adapter/infinispan/RemoteInfinispanTestHelper.java R connectors/connector-infinispan/src/test/java/org/teiid/resource/adapter/infinispan/TestInfinispanConfigFileLocalCache.java R connectors/connector-infinispan/src/test/java/org/teiid/resource/adapter/infinispan/TestInfinispanConfigFileRemoteCache.java R connectors/connector-infinispan/src/test/java/org/teiid/resource/adapter/infinispan/TestInfinispanJndiNameKeyOnlySearch.java R connectors/connector-infinispan/src/test/java/org/teiid/resource/adapter/infinispan/TestInfinispanServerList.java R connectors/connector-infinispan/src/test/java/org/teiid/resource/adapter/infinispan/util/Leg.java R connectors/connector-infinispan/src/test/java/org/teiid/resource/adapter/infinispan/util/Trade.java R connectors/connector-infinispan/src/test/java/org/teiid/resource/adapter/infinispan/util/TradesCacheSource.java R connectors/connector-infinispan/src/test/java/org/teiid/resource/adapter/infinispan/util/Transaction.java R connectors/connector-infinispan/src/test/resources/ObjectProject/Trade.vdb R connectors/connector-infinispan/src/test/resources/ObjectProject/Trade_Object.xmi R connectors/connector-infinispan/src/test/resources/ObjectProject/Trade_View.xmi R connectors/connector-infinispan/src/test/resources/hotrod-client.properties R connectors/connector-infinispan/src/test/resources/infinispan_persistent_config.xml R connectors/connector-infinispan/src/test/resources/infinispan_remote_config.xml M connectors/pom.xml M connectors/translator-infinispan-dsl/pom.xml M connectors/translator-object/pom.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/resource/adapter/infinispan/base/InfinispanConnectionImpl.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/infinispan/InfinispanExecutionFactory.java M connectors/translator-object/src/main/java/org/teiid/translator/object/metadata/JavaBeanMetadataProcessor.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/TestObjectExecutionFactory.java M connectors/translator-object/src/test/java/org/teiid/translator/object/infinispan/TestInfinispanConnection.java M connectors/translator-object/src/test/java/org/teiid/translator/object/util/TradesCacheSource.java M connectors/translator-object/src/test/resources/infinispan_persistent_config.xml M connectors/translator-object/src/test/resources/infinispan_persistent_indexing_config.xml M connectors/translator-object/src/test/resources/infinispan_remote_config.xml M pom.xml Log Message: ----------- Merge branch 'teiid-3137' of https://github.com/vhalbert/teiid Conflicts: connectors/connector-infinispan/pom.xml connectors/translator-infinispan-dsl/pom.xml connectors/translator-object/pom.xml Commit: ba9394c6ac1848ba676307ae6168f767b162ace7 https://github.com/teiid/teiid/commit/ba9394c6ac1848ba676307ae6168f767b16... Author: Steven Hawkins <shawkins(a)redhat.com&gt; Date: 2014-09-30 (Tue, 30 Sep 2014) Changed paths: M build/kits/jboss-as7/bin/scripts/teiid-domain-mode-install.cli M build/kits/jboss-as7/bin/scripts/teiid-standalone-mode-install.cli M build/kits/jboss-as7/standalone/configuration/standalone-teiid.xml R connectors/connector-infinispan-dsl/kits/jboss-as7/modules/org/infinispan/hotrod/6.2/module.xml M connectors/connector-infinispan-dsl/kits/jboss-as7/modules/org/jboss/teiid/resource-adapter/infinispan/dsl/main/module.xml M connectors/connector-infinispan-dsl/pom.xml M connectors/translator-infinispan-dsl/kits/jboss-as7/modules/org/jboss/teiid/translator/infinispan/dsl/main/module.xml M test-integration/common/src/test/java/org/teiid/arquillian/IntegrationTestDeployment.java Log Message: ----------- Merge branch 'fix_configs' of https://github.com/vhalbert/teiid Conflicts: connectors/connector-infinispan-dsl/pom.xml Compare: https://github.com/teiid/teiid/compare/9b3c4839782e...ba9394c6ac18