You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metamodel.apache.org by ka...@apache.org on 2014/03/24 22:16:57 UTC

[8/9] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-metamodel.git into hbase-module

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-metamodel.git into hbase-module

Project: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/commit/e2c3d3f7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/tree/e2c3d3f7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/diff/e2c3d3f7

Branch: refs/heads/hbase-module
Commit: e2c3d3f721133e7ee96715290202efd1e7c07e2b
Parents: 3e23c40 b920b5d
Author: Kasper Sørensen <i....@gmail.com>
Authored: Thu Mar 20 20:36:11 2014 +0100
Committer: Kasper Sørensen <i....@gmail.com>
Committed: Thu Mar 20 20:36:11 2014 +0100

----------------------------------------------------------------------
 CHANGES.txt                                     |   2 +
 .../org/apache/metamodel/MetaModelHelper.java   |   3 +-
 .../metamodel/QueryPostprocessDataContext.java  |   7 +-
 .../org/apache/metamodel/util/FileHelper.java   |   1 +
 .../metamodel/util/SimpleTableDefParser.java    | 112 ++++++++++
 .../org/apache/metamodel/MockDataContext.java   |  30 +--
 .../util/SimpleTableDefParserTest.java          |  84 +++++++
 .../apache/metamodel/DataContextFactory.java    |  60 ++++-
 jdbc/pom.xml                                    |   6 +
 .../metamodel/jdbc/JdbcCompiledQuery.java       | 218 ++++++++++---------
 .../jdbc/JdbcCompiledQueryLeaseFactory.java     |  19 +-
 .../apache/metamodel/jdbc/JdbcDataContext.java  |   4 +
 .../metamodel/jdbc/JdbcDataContextTest.java     |  97 ++++++++-
 pom.xml                                         |  12 +-
 .../AbstractDataContextFactoryBeanDelegate.java |  12 +-
 .../CouchDbDataContextFactoryBeanDelegate.java  |  41 ++++
 .../CsvDataContextFactoryBeanDelegate.java      |  18 +-
 .../spring/DataContextFactoryBean.java          | 108 ++++++++-
 .../spring/DataContextFactoryBeanDelegate.java  |   4 +-
 .../spring/DataContextFactoryParameters.java    |  79 +++++++
 .../ExcelDataContextFactoryBeanDelegate.java    |  10 +-
 .../JdbcDataContextFactoryBeanDelegate.java     |  18 +-
 .../MongoDbDataContextFactoryBeanDelegate.java  |  42 ++++
 .../PojoDataContextFactoryBeanDelegate.java     |  55 +++++
 .../spring/DataContextFactoryBeanTest.java      |  35 +++
 .../MockDataContextFactoryBeanDelegate.java     |   2 +-
 .../PojoDataContextFactoryBeanDelegateTest.java |  53 +++++
 27 files changed, 960 insertions(+), 172 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/e2c3d3f7/pom.xml
----------------------------------------------------------------------