Branch: refs/heads/master Home: https://github.com/teiid/teiid Commit: 3bf6966bfead822b16f00caf73c22fd247fbae7f https://github.com/teiid/teiid/commit/3bf6966bfead822b16f00caf73c22fd247f... Author: kylinsoong <kylinsoong.1214(a)gmail.com&gt; Date: 2015-04-27 (Mon, 27 Apr 2015) Changed paths: M build/assembly/embedded-dist.xml M build/kits/embedded/examples/embedded-portfolio/src/org/teiid/example/TeiidEmbeddedPortfolio.java M build/pom.xml M pom.xml M runtime/pom.xml A runtime/src/main/java/org/teiid/runtime/EmbeddedHelper.java A runtime/src/test/java/org/teiid/runtime/TestEmbeddedHelper.java M runtime/src/test/java/org/teiid/runtime/TestEmbeddedServerAdmin.java Log Message: ----------- TEIID-3431: add EmbeddedHelper class for supply transactionmanager functionality Commit: 372be2ff149f77a4463d284270874e20432dddbd https://github.com/teiid/teiid/commit/372be2ff149f77a4463d284270874e20432... Author: kylinsoong <kylinsoong.1214(a)gmail.com&gt; Date: 2015-04-27 (Mon, 27 Apr 2015) Changed paths: M build/assembly/embedded-dist.xml M build/pom.xml A runtime/kits/embedded-dist.xml M runtime/pom.xml M runtime/src/main/java/org/teiid/runtime/EmbeddedHelper.java M runtime/src/test/java/org/teiid/runtime/TestEmbeddedHelper.java Log Message: ----------- TEIID-3431: add newDataSource method to EmbeddedHelper Commit: 30f21c0d1a67e091f175dfe7ec297be9c81d9991 https://github.com/teiid/teiid/commit/30f21c0d1a67e091f175dfe7ec297be9c81... Author: kylinsoong <kylinsoong.1214(a)gmail.com&gt; Date: 2015-04-28 (Tue, 28 Apr 2015) Changed paths: M build/assembly/embedded-dist.xml M build/kits/embedded/examples/embedded-portfolio/run.bat M build/kits/embedded/examples/embedded-portfolio/run.sh M build/kits/embedded/examples/embedded-portfolio/src/org/teiid/example/TeiidEmbeddedPortfolio.java M build/kits/embedded/examples/hbase-as-a-datasource/run.bat M build/kits/embedded/examples/hbase-as-a-datasource/run.sh M build/kits/embedded/examples/hbase-as-a-datasource/src/org/teiid/example/TeiidEmbeddedHBaseDataSource.java M build/pom.xml M connectors/translator-hbase/pom.xml M connectors/translator-hbase/src/test/java/org/teiid/translator/hbase/TestHBaseExecution.java M connectors/translator-hbase/src/test/java/org/teiid/translator/hbase/TestHBaseUtil.java M pom.xml R runtime/kits/embedded-dist.xml M runtime/pom.xml Log Message: ----------- TEIID-3431: remove bittronix dependency, update maven assembly file Commit: 1536d13a90e2e5357ba286e45e20f98674e010dc https://github.com/teiid/teiid/commit/1536d13a90e2e5357ba286e45e20f98674e... Author: kylinsoong <kylinsoong.1214(a)gmail.com&gt; Date: 2015-05-04 (Mon, 04 May 2015) Changed paths: M build/assembly/embedded-dist.xml A build/kits/embedded/examples/embedded-portfolio/src/org/teiid/example/EmbeddedHelper.java M build/kits/embedded/examples/embedded-portfolio/src/org/teiid/example/TeiidEmbeddedPortfolio.java A build/kits/embedded/examples/hbase-as-a-datasource/src/org/teiid/example/EmbeddedHelper.java M build/kits/embedded/examples/hbase-as-a-datasource/src/org/teiid/example/TeiidEmbeddedHBaseDataSource.java M build/pom.xml M connectors/translator-hbase/pom.xml M connectors/translator-hbase/src/test/java/org/teiid/translator/hbase/TestHBaseExecution.java M connectors/translator-hbase/src/test/java/org/teiid/translator/hbase/TestHBaseUtil.java M pom.xml M runtime/pom.xml R runtime/src/main/java/org/teiid/runtime/EmbeddedHelper.java R runtime/src/test/java/org/teiid/runtime/TestEmbeddedHelper.java M runtime/src/test/java/org/teiid/runtime/TestEmbeddedServerAdmin.java Log Message: ----------- TEIID-3431: remove ironjacamar/narayana from runtime, add it just as an example Commit: 52433b12edea8f9a2ccda33c2b8a6e47f4e3fa99 https://github.com/teiid/teiid/commit/52433b12edea8f9a2ccda33c2b8a6e47f4e... Author: Steven Hawkins <shawkins(a)redhat.com&gt; Date: 2015-05-04 (Mon, 04 May 2015) Changed paths: M build/assembly/embedded-dist.xml M build/kits/embedded/examples/embedded-portfolio/run.bat M build/kits/embedded/examples/embedded-portfolio/run.sh A build/kits/embedded/examples/embedded-portfolio/src/org/teiid/example/EmbeddedHelper.java M build/kits/embedded/examples/embedded-portfolio/src/org/teiid/example/TeiidEmbeddedPortfolio.java M build/kits/embedded/examples/hbase-as-a-datasource/run.bat M build/kits/embedded/examples/hbase-as-a-datasource/run.sh A build/kits/embedded/examples/hbase-as-a-datasource/src/org/teiid/example/EmbeddedHelper.java M build/kits/embedded/examples/hbase-as-a-datasource/src/org/teiid/example/TeiidEmbeddedHBaseDataSource.java M build/pom.xml M connectors/translator-hbase/pom.xml M pom.xml M runtime/pom.xml M runtime/src/test/java/org/teiid/runtime/TestEmbeddedServerAdmin.java Log Message: ----------- Merge branch 'master' of https://github.com/kylinsoong/teiid Conflicts: pom.xml Compare: https://github.com/teiid/teiid/compare/3190531b7d9a...52433b12edea