Branch: refs/heads/master Home: https://github.com/teiid/teiid Commit: fb40aee278d7e993753f968fbdc4c19e8fb075af https://github.com/teiid/teiid/commit/fb40aee278d7e993753f968fbdc4c19e8fb... Author: vhalbert <vhalbert(a)redhat.com&gt; Date: 2013-12-04 (Wed, 04 Dec 2013) Changed paths: M build/assembly/jboss-as7/dist.xml A build/kits/jboss-as7/modules/system/layers/base/org/jboss/teiid/resource-adapter/infinispan/6.2/module.xml M build/kits/jboss-as7/modules/system/layers/base/org/jboss/teiid/resource-adapter/infinispan/main/module.xml M build/kits/jboss-as7/modules/system/layers/base/org/jboss/teiid/translator/object/main/module.xml A connectors/connector-infinispan.6/pom.xml A connectors/connector-infinispan.6/src/main/java/org/teiid/resource/adapter/infinispan/InfinispanConnectionImpl.java A 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/InfinispanPlugin.java A connectors/connector-infinispan.6/src/main/java/org/teiid/resource/adapter/infinispan/InfinispanResourceAdapter.java A connectors/connector-infinispan.6/src/main/java/org/teiid/resource/adapter/infinispan/PojoMarshaller.java A connectors/connector-infinispan.6/src/main/rar/META-INF/MANIFEST.MF A connectors/connector-infinispan.6/src/main/rar/META-INF/ra.xml A connectors/connector-infinispan.6/src/main/resources/org/teiid/resource/adapter/infinispan/i18n.properties A connectors/connector-infinispan.6/src/test/java/org/teiid/resource/adapter/infinispan/RemoteInfinispanTestHelper.java A connectors/connector-infinispan.6/src/test/java/org/teiid/resource/adapter/infinispan/TestInfinispanConfigFileLocalCache.java A 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/TestInfinispanJndiNameKeyOnlySearch.java A 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/util/Leg.java A connectors/connector-infinispan.6/src/test/java/org/teiid/resource/adapter/infinispan/util/Trade.java A connectors/connector-infinispan.6/src/test/java/org/teiid/resource/adapter/infinispan/util/TradesCacheSource.java A connectors/connector-infinispan.6/src/test/java/org/teiid/resource/adapter/infinispan/util/Transaction.java A connectors/connector-infinispan.6/src/test/resources/ObjectProject/Trade.vdb A connectors/connector-infinispan.6/src/test/resources/ObjectProject/Trade_Object.xmi A connectors/connector-infinispan.6/src/test/resources/ObjectProject/Trade_View.xmi A connectors/connector-infinispan.6/src/test/resources/hotrod-client.properties A connectors/connector-infinispan.6/src/test/resources/infinispan_persistent_config.xml A connectors/connector-infinispan.6/src/test/resources/infinispan_remote_config.xml M connectors/connector-infinispan/pom.xml M connectors/connector-infinispan/src/main/java/org/teiid/resource/adapter/infinispan/InfinispanConnectionImpl.java M connectors/connector-infinispan/src/main/java/org/teiid/resource/adapter/infinispan/InfinispanManagedConnectionFactory.java A connectors/connector-infinispan/src/main/java/org/teiid/resource/adapter/infinispan/PojoMarshaller.java M connectors/connector-infinispan/src/main/rar/META-INF/ra.xml M connectors/connector-infinispan/src/main/resources/org/teiid/resource/adapter/infinispan/i18n.properties M connectors/connector-infinispan/src/test/java/org/teiid/resource/adapter/infinispan/RemoteInfinispanTestHelper.java M connectors/connector-infinispan/src/test/java/org/teiid/resource/adapter/infinispan/TestInfinispanConfigFileLocalCache.java M connectors/connector-infinispan/src/test/java/org/teiid/resource/adapter/infinispan/TestInfinispanConfigFileRemoteCache.java A connectors/connector-infinispan/src/test/java/org/teiid/resource/adapter/infinispan/TestInfinispanJndiNameKeyOnlySearch.java M connectors/connector-infinispan/src/test/java/org/teiid/resource/adapter/infinispan/TestInfinispanServerList.java A connectors/connector-infinispan/src/test/java/org/teiid/resource/adapter/infinispan/util/Leg.java A connectors/connector-infinispan/src/test/java/org/teiid/resource/adapter/infinispan/util/Trade.java A connectors/connector-infinispan/src/test/java/org/teiid/resource/adapter/infinispan/util/TradesCacheSource.java A connectors/connector-infinispan/src/test/java/org/teiid/resource/adapter/infinispan/util/Transaction.java A connectors/connector-infinispan/src/test/resources/ObjectProject/Trade.vdb A connectors/connector-infinispan/src/test/resources/ObjectProject/Trade_Object.xmi A connectors/connector-infinispan/src/test/resources/ObjectProject/Trade_View.xmi R connectors/connector-infinispan/src/test/resources/infinispan_persistent_indexing_config.xml M connectors/pom.xml M connectors/translator-object/pom.xml A 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/infinispan/InfinispanCacheWrapper.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/LuceneSearch.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/BasicSearchTest.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 R connectors/translator-object/src/test/java/org/teiid/translator/object/infinispan/RemoteInfinispanTestHelper.java M connectors/translator-object/src/test/java/org/teiid/translator/object/infinispan/TestInfinispanConfigFileKeySearch.java A connectors/translator-object/src/test/java/org/teiid/translator/object/infinispan/TestInfinispanConnection.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/util/TradesCacheSource.java M connectors/translator-object/src/test/resources/ObjectProject/Trade.vdb M connectors/translator-object/src/test/resources/ObjectProject/Trade_Object.xmi M connectors/translator-object/src/test/resources/ObjectProject/Trade_View.xmi R connectors/translator-object/src/test/resources/TestInfinispanJndiILuceneSearch/testQueryAnd.expected R connectors/translator-object/src/test/resources/TestInfinispanJndiILuceneSearch/testQueryCompareEQBoolean.expected R connectors/translator-object/src/test/resources/TestInfinispanJndiILuceneSearch/testQueryCompareNEBoolean.expected R connectors/translator-object/src/test/resources/TestInfinispanJndiILuceneSearch/testQueryLikeCriteria1.expected R connectors/translator-object/src/test/resources/TestInfinispanJndiILuceneSearch/testQueryLikeCriteria2.expected R connectors/translator-object/src/test/resources/TestInfinispanJndiILuceneSearch/testQueryRangeAbove.expected R connectors/translator-object/src/test/resources/TestInfinispanJndiILuceneSearch/testQueryRangeBelow.expected R connectors/translator-object/src/test/resources/TestInfinispanJndiILuceneSearch/testQueryRangeBetween.expected M pom.xml Log Message: ----------- Teiid-2720 support JDG 6.2 Conflicts: build/assembly/jboss-as7/dist.xml connectors/connector-infinispan/pom.xml connectors/pom.xml connectors/translator-object/pom.xml pom.xml Commit: 3ac0083e11ca936c26f2a96899ca0b29a0095c0f https://github.com/teiid/teiid/commit/3ac0083e11ca936c26f2a96899ca0b29a00... Author: shawkins <shawkins(a)redhat.com&gt; Date: 2013-12-04 (Wed, 04 Dec 2013) Changed paths: R connectors/connector-infinispan.6/src/main/java/org/teiid/resource/adapter/infinispan/InfinispanConnectionImpl.java M connectors/connector-infinispan.6/src/main/java/org/teiid/resource/adapter/infinispan/InfinispanManagedConnectionFactory.java R connectors/connector-infinispan.6/src/main/java/org/teiid/resource/adapter/infinispan/InfinispanPlugin.java R connectors/connector-infinispan.6/src/main/resources/org/teiid/resource/adapter/infinispan/i18n.properties M connectors/connector-infinispan.6/src/test/java/org/teiid/resource/adapter/infinispan/TestInfinispanJndiNameKeyOnlySearch.java R connectors/connector-infinispan/src/main/java/org/teiid/resource/adapter/infinispan/InfinispanConnectionImpl.java M 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/InfinispanPlugin.java R connectors/connector-infinispan/src/main/resources/org/teiid/resource/adapter/infinispan/i18n.properties M connectors/connector-infinispan/src/test/java/org/teiid/resource/adapter/infinispan/TestInfinispanJndiNameKeyOnlySearch.java A connectors/translator-object/src/main/java/org/teiid/resource/adapter/infinispan/base/AbstractInfinispanManagedConnectionFactory.java A connectors/translator-object/src/main/java/org/teiid/resource/adapter/infinispan/base/InfinispanConnectionImpl.java A connectors/translator-object/src/main/java/org/teiid/resource/adapter/infinispan/base/InfinispanPlugin.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/SearchByKey.java R connectors/translator-object/src/main/java/org/teiid/translator/object/infinispan/InfinispanCacheWrapper.java A connectors/translator-object/src/main/resources/org/teiid/resource/adapter/infinispan/base/i18n.properties 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 Log Message: ----------- TEIID-2720 refining the jdg support Compare: https://github.com/teiid/teiid/compare/d4b96679863e...3ac0083e11ca