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/05/18 21:00:40 UTC
[4/6] git commit: Merge branch 'master' into columntype_as_interface
Merge branch 'master' into columntype_as_interface
Conflicts:
couchdb/src/main/java/org/apache/metamodel/couchdb/CouchDbDataContext.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/commit/dc107fc6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/tree/dc107fc6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/diff/dc107fc6
Branch: refs/heads/master
Commit: dc107fc6330df685e2a2eef64f0351acc3e808b3
Parents: 80be0a3 ac9690d
Author: Kasper Sørensen <i....@gmail.com>
Authored: Sat May 3 19:46:23 2014 +0200
Committer: Kasper Sørensen <i....@gmail.com>
Committed: Sat May 3 19:46:23 2014 +0200
----------------------------------------------------------------------
CHANGES.txt | 6 +-
CONTRIBUTE.md | 45 ++
README | 6 +-
core/pom.xml | 2 +-
.../metamodel/data/RowPublisherDataSet.java | 7 +-
couchdb/pom.xml | 2 +-
.../metamodel/couchdb/CouchDbDataContext.java | 13 +-
.../couchdb/CouchDbDataContextTest.java | 127 ++--
.../metamodel/couchdb/CouchDbTestCase.java | 80 +++
csv/pom.xml | 2 +-
...del-integrationtest-configuration.properties | 46 ++
excel/pom.xml | 2 +-
.../excel/DefaultSpreadsheetReaderDelegate.java | 2 -
.../metamodel/excel/ExcelDataContext.java | 4 +
.../excel/XlsxSpreadsheetReaderDelegate.java | 2 -
.../metamodel/excel/ExcelDataContextTest.java | 72 ++-
fixedwidth/pom.xml | 2 +-
full/pom.xml | 2 +-
hbase/pom.xml | 9 +-
.../metamodel/hbase/HBaseDataContextTest.java | 28 +-
.../apache/metamodel/hbase/HBaseTestCase.java | 74 +++
jdbc/pom.xml | 2 +-
mongodb/pom.xml | 2 +-
.../mongodb/MongoDbDataContextTest.java | 586 +++++++++----------
.../metamodel/mongodb/MongoDbTestCase.java | 94 +++
openoffice/pom.xml | 2 +-
pojo/pom.xml | 2 +-
pom.xml | 11 +-
salesforce/pom.xml | 2 +-
.../salesforce/SalesforceTestCase.java | 17 +-
spring/pom.xml | 2 +-
sugarcrm/pom.xml | 2 +-
.../metamodel/sugarcrm/SugarCrmTestCase.java | 18 +-
xml/pom.xml | 2 +-
34 files changed, 826 insertions(+), 449 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/dc107fc6/couchdb/src/main/java/org/apache/metamodel/couchdb/CouchDbDataContext.java
----------------------------------------------------------------------