[teiid-commits] [teiid/teiid] 82c9f6: Merge branch 'master' into kylin.dev.1

Steven Hawkins shawkins at redhat.com
Wed Jun 1 07:50:26 EDT 2016 

  Branch: refs/heads/master
  Home:   https://github.com/teiid/teiid
  Commit: 82c9f61f193c48661a64dccc551dac2cd7ca0828
      https://github.com/teiid/teiid/commit/82c9f61f193c48661a64dccc551dac2cd7ca0828
  Author: kylinsoong <kylinsoong.1214 at gmail.com>
  Date:   2016-06-01 (Wed, 01 Jun 2016)

  Changed paths:
    R connectors/connector-infinispan-libmode.6/.gitignore
    R connectors/connector-infinispan-libmode.6/kits/wildfly-dist.xml
    R connectors/connector-infinispan-libmode.6/kits/wildfly/docs/teiid/datasources/infinispan-library-mode/create-infinispan-lib-mode-ds.cli
    R connectors/connector-infinispan-libmode.6/kits/wildfly/docs/teiid/datasources/infinispan-library-mode/create-infinispan-lib-mode-ds.properties
    R connectors/connector-infinispan-libmode.6/kits/wildfly/docs/teiid/datasources/infinispan-library-mode/infinispan-lib-mode-ds.xml
    R connectors/connector-infinispan-libmode.6/kits/wildfly/docs/teiid/datasources/infinispan-library-mode/infinispan-lib-mode-materialization-ds.xml
    R connectors/connector-infinispan-libmode.6/kits/wildfly/docs/teiid/datasources/infinispan-library-mode/readme.txt
    R connectors/connector-infinispan-libmode.6/kits/wildfly/modules/org/jboss/teiid/resource-adapter/infinispan/libmode/6/META-INF/MANIFEST.MF
    R connectors/connector-infinispan-libmode.6/kits/wildfly/modules/org/jboss/teiid/resource-adapter/infinispan/libmode/6/META-INF/ra.xml
    R connectors/connector-infinispan-libmode.6/kits/wildfly/modules/org/jboss/teiid/resource-adapter/infinispan/libmode/6/module.xml
    A connectors/connector-infinispan-libmode.6/kits/wildfly/modules/org/jboss/teiid/resource-adapter/infinispan/libmode/META-INF/MANIFEST.MF
    A connectors/connector-infinispan-libmode.6/kits/wildfly/modules/org/jboss/teiid/resource-adapter/infinispan/libmode/META-INF/ra.xml
    A connectors/connector-infinispan-libmode.6/kits/wildfly/modules/org/jboss/teiid/resource-adapter/infinispan/libmode/module.xml
    R connectors/connector-infinispan-libmode.6/pom.xml
    R connectors/connector-infinispan-libmode.6/src/main/java/org/teiid/resource/adapter/infinispan/DSLSearch.java
    R connectors/connector-infinispan-libmode.6/src/main/java/org/teiid/resource/adapter/infinispan/InfinispanCacheRAConnection.java
    R connectors/connector-infinispan-libmode.6/src/main/java/org/teiid/resource/adapter/infinispan/InfinispanCacheWrapper.java
    R connectors/connector-infinispan-libmode.6/src/main/java/org/teiid/resource/adapter/infinispan/InfinispanManagedConnectionFactory.java
    R connectors/connector-infinispan-libmode.6/src/main/java/org/teiid/resource/adapter/infinispan/InfinispanResourceAdapter.java
    R connectors/connector-infinispan-libmode.6/src/main/java/org/teiid/resource/adapter/infinispan/local/LocalCacheConnection.java
    R connectors/connector-infinispan-libmode.6/src/main/resources/org/teiid/resource/adapter/infinispan/i18n.properties
    R connectors/connector-infinispan-libmode.6/src/test/java/org/teiid/resource/adapter/infinispan/InfinispanTestHelper.java
    R connectors/connector-infinispan-libmode.6/src/test/java/org/teiid/resource/adapter/infinispan/TestInfinispanConfigFileLocalCache.java
    R connectors/connector-infinispan-libmode.6/src/test/java/org/teiid/resource/adapter/infinispan/TestInfinispanJndiDSLSearch.java
    R connectors/connector-infinispan-libmode.6/src/test/java/org/teiid/resource/adapter/infinispan/TestInfinispanJndiNameKeyOnlySearch.java
    R connectors/connector-infinispan-libmode.6/src/test/java/org/teiid/resource/adapter/infinispan/TestInfinispanManagedConnectionFactory.java
    R connectors/connector-infinispan-libmode.6/src/test/java/org/teiid/resource/adapter/infinispan/TestInfinispanUpdateExecution.java
    R connectors/connector-infinispan-libmode.6/src/test/java/org/teiid/resource/adapter/infinispan/TradeAnnotatedObjectConnection.java
    R connectors/connector-infinispan-libmode.6/src/test/resources/ObjectProject/Trade.vdb
    R connectors/connector-infinispan-libmode.6/src/test/resources/ObjectProject/Trade_Object.xmi
    R connectors/connector-infinispan-libmode.6/src/test/resources/ObjectProject/Trade_View.xmi
    R connectors/connector-infinispan-libmode.6/src/test/resources/hotrod-client.properties
    R connectors/connector-infinispan-libmode.6/src/test/resources/infinispan_persistent_config.xml
    R connectors/connector-infinispan-libmode.6/src/test/resources/infinispan_remote_config.xml
    A connectors/connector-infinispan-libmode/.gitignore
    A connectors/connector-infinispan-libmode/kits/wildfly-dist.xml
    A connectors/connector-infinispan-libmode/kits/wildfly/docs/teiid/datasources/infinispan-library-mode/create-infinispan-lib-mode-ds.cli
    A connectors/connector-infinispan-libmode/kits/wildfly/docs/teiid/datasources/infinispan-library-mode/create-infinispan-lib-mode-ds.properties
    A connectors/connector-infinispan-libmode/kits/wildfly/docs/teiid/datasources/infinispan-library-mode/infinispan-lib-mode-ds.xml
    A connectors/connector-infinispan-libmode/kits/wildfly/docs/teiid/datasources/infinispan-library-mode/infinispan-lib-mode-materialization-ds.xml
    A connectors/connector-infinispan-libmode/kits/wildfly/docs/teiid/datasources/infinispan-library-mode/readme.txt
    A connectors/connector-infinispan-libmode/kits/wildfly/modules/org/jboss/teiid/resource-adapter/infinispan/libmode/META-INF/MANIFEST.MF
    A connectors/connector-infinispan-libmode/kits/wildfly/modules/org/jboss/teiid/resource-adapter/infinispan/libmode/META-INF/ra.xml
    A connectors/connector-infinispan-libmode/kits/wildfly/modules/org/jboss/teiid/resource-adapter/infinispan/libmode/module.xml
    A connectors/connector-infinispan-libmode/pom.xml
    A connectors/connector-infinispan-libmode/src/main/java/org/teiid/resource/adapter/infinispan/DSLSearch.java
    A connectors/connector-infinispan-libmode/src/main/java/org/teiid/resource/adapter/infinispan/InfinispanCacheRAConnection.java
    A connectors/connector-infinispan-libmode/src/main/java/org/teiid/resource/adapter/infinispan/InfinispanCacheWrapper.java
    A connectors/connector-infinispan-libmode/src/main/java/org/teiid/resource/adapter/infinispan/InfinispanManagedConnectionFactory.java
    A connectors/connector-infinispan-libmode/src/main/java/org/teiid/resource/adapter/infinispan/InfinispanResourceAdapter.java
    A connectors/connector-infinispan-libmode/src/main/java/org/teiid/resource/adapter/infinispan/local/LocalCacheConnection.java
    A connectors/connector-infinispan-libmode/src/main/resources/org/teiid/resource/adapter/infinispan/i18n.properties
    A connectors/connector-infinispan-libmode/src/test/java/org/teiid/resource/adapter/infinispan/InfinispanTestHelper.java
    A connectors/connector-infinispan-libmode/src/test/java/org/teiid/resource/adapter/infinispan/TestInfinispanConfigFileLocalCache.java
    A connectors/connector-infinispan-libmode/src/test/java/org/teiid/resource/adapter/infinispan/TestInfinispanJndiDSLSearch.java
    A connectors/connector-infinispan-libmode/src/test/java/org/teiid/resource/adapter/infinispan/TestInfinispanJndiNameKeyOnlySearch.java
    A connectors/connector-infinispan-libmode/src/test/java/org/teiid/resource/adapter/infinispan/TestInfinispanManagedConnectionFactory.java
    A connectors/connector-infinispan-libmode/src/test/java/org/teiid/resource/adapter/infinispan/TestInfinispanUpdateExecution.java
    A connectors/connector-infinispan-libmode/src/test/java/org/teiid/resource/adapter/infinispan/TradeAnnotatedObjectConnection.java
    A connectors/connector-infinispan-libmode/src/test/resources/ObjectProject/Trade.vdb
    A connectors/connector-infinispan-libmode/src/test/resources/ObjectProject/Trade_Object.xmi
    A connectors/connector-infinispan-libmode/src/test/resources/ObjectProject/Trade_View.xmi
    A connectors/connector-infinispan-libmode/src/test/resources/hotrod-client.properties
    A connectors/connector-infinispan-libmode/src/test/resources/infinispan_persistent_config.xml
    A connectors/connector-infinispan-libmode/src/test/resources/infinispan_remote_config.xml
    M connectors/pom.xml
    M connectors/translator-infinispan-libmode/src/main/java/org/teiid/translator/infinispan/libmode/InfinispanLibModeExecutionFactory.java
    M connectors/translator-simpledb/src/main/java/org/teiid/translator/simpledb/SimpleDBExecutionFactory.java
    M connectors/translator-simpledb/src/main/java/org/teiid/translator/simpledb/SimpleDBQueryExecution.java
    M connectors/translator-simpledb/src/main/java/org/teiid/translator/simpledb/SimpleDBSQLVisitor.java
    M connectors/translator-simpledb/src/test/java/org/teiid/translator/simpledb/visitors/TestSimpleDBExecution.java
    M engine/src/main/java/org/teiid/query/QueryPlugin.java
    M engine/src/main/java/org/teiid/query/metadata/MetadataValidator.java
    M engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java
    M engine/src/main/java/org/teiid/query/processor/proc/ExecDynamicSqlInstruction.java
    M engine/src/main/resources/org/teiid/query/i18n.properties
    M engine/src/test/java/org/teiid/query/metadata/TestMetadataValidator.java
    M engine/src/test/java/org/teiid/query/processor/TestWithClauseProcessing.java
    M engine/src/test/java/org/teiid/query/processor/proc/TestProcErrors.java
    M odata/src/main/java/org/teiid/odata/LocalClient.java
    M olingo/src/main/java/org/teiid/odata/api/Client.java
    M olingo/src/main/java/org/teiid/olingo/service/LocalClient.java
    M runtime/src/test/java/org/teiid/runtime/TestEmbeddedServer.java
    M test-integration/common/src/test/java/org/teiid/arquillian/IntegrationTestOData4.java

  Log Message:
  -----------
  Merge branch 'master' into kylin.dev.1


  Commit: 34a4ae0d3b2e6b42fed3e89d72853227b8b56449
      https://github.com/teiid/teiid/commit/34a4ae0d3b2e6b42fed3e89d72853227b8b56449
  Author: kylinsoong <kylinsoong.1214 at gmail.com>
  Date:   2016-06-01 (Wed, 01 Jun 2016)

  Changed paths:
    M engine/src/main/resources/org/teiid/query/i18n.properties

  Log Message:
  -----------
  TEIID-3999: fix a validation failed message


  Commit: da078da66e75f9416f801d67c45f8a1ea94e0f60
      https://github.com/teiid/teiid/commit/da078da66e75f9416f801d67c45f8a1ea94e0f60
  Author: Steven Hawkins <shawkins at redhat.com>
  Date:   2016-06-01 (Wed, 01 Jun 2016)

  Changed paths:
    M engine/src/main/resources/org/teiid/query/i18n.properties

  Log Message:
  -----------
  Merge pull request #704 from kylinsoong/kylin.dev.1

TEIID-3999: fix a validation failed message


Compare: https://github.com/teiid/teiid/compare/7e4aa554150e...da078da66e75

More information about the teiid-commits mailing list