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:26:08 UTC
[4/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/346524ad
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/tree/346524ad
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/diff/346524ad
Branch: refs/heads/master
Commit: 346524ad3d53ad18e51dadde17680e41be60db47
Parents: eba65a0 ea8dbeb
Author: Kasper Sørensen <i....@gmail.com>
Authored: Tue Jan 28 21:59:10 2014 +0100
Committer: Kasper Sørensen <i....@gmail.com>
Committed: Tue Jan 28 21:59:10 2014 +0100
----------------------------------------------------------------------
CHANGES.txt | 24 ++
DISCLAIMER | 15 +
HEADER.txt | 16 -
LICENSE | 202 +++++++++
NOTICE | 9 +
README | 34 ++
access/.gitignore | 4 -
access/pom.xml | 42 --
.../metamodel/access/AccessDataContext.java | 170 --------
.../apache/metamodel/access/package-info.java | 23 --
.../metamodel/access/AccessDataContextTest.java | 125 ------
access/src/test/resources/developers.mdb | Bin 192512 -> 0 bytes
core/pom.xml | 21 +-
.../apache/metamodel/AbstractDataContext.java | 98 +++++
.../apache/metamodel/create/CreateTable.java | 2 +-
.../create/CreateTableColumnBuilder.java | 3 +
.../org/apache/metamodel/data/DefaultRow.java | 56 ++-
.../org/apache/metamodel/schema/ColumnType.java | 2 +-
.../apache/metamodel/schema/MutableColumn.java | 5 +
.../apache/metamodel/schema/MutableTable.java | 5 +
.../org/apache/metamodel/update/Update.java | 7 +-
.../metamodel/util/ClasspathResource.java | 10 +-
.../org/apache/metamodel/util/DateUtils.java | 3 +-
.../org/apache/metamodel/util/FileResource.java | 10 +
.../apache/metamodel/util/InMemoryResource.java | 5 +
.../org/apache/metamodel/util/Resource.java | 8 +
.../apache/metamodel/util/ResourceUtils.java | 67 +++
.../org/apache/metamodel/util/UrlResource.java | 5 +
.../metamodel/AbstractDataContextTest.java | 410 ++++++++++---------
.../metamodel/create/SyntaxExamplesTest.java | 27 +-
.../apache/metamodel/data/DefaultRowTest.java | 18 +
.../metamodel/update/SyntaxExamplesTest.java | 39 ++
.../metamodel/util/ResourceUtilsTest.java | 51 +++
couchdb/pom.xml | 21 +-
csv/pom.xml | 21 +-
.../apache/metamodel/csv/CsvConfiguration.java | 270 ++++++------
.../metamodel/csv/CsvCreateTableBuilder.java | 39 +-
.../apache/metamodel/csv/CsvDataContext.java | 62 ++-
.../org/apache/metamodel/csv/CsvDataSet.java | 2 +-
.../java/org/apache/metamodel/csv/CsvTable.java | 20 +-
.../metamodel/csv/SingleLineCsvDataSet.java | 124 ++++++
.../apache/metamodel/csv/SingleLineCsvRow.java | 112 +++++
.../metamodel/csv/CsvBigFileMemoryTest.java | 173 ++++----
.../metamodel/csv/CsvDataContextTest.java | 48 +--
.../metamodel/csv/SingleLineCsvDataSetTest.java | 49 +++
.../InterceptionCsvIntegrationTest.java | 2 +-
excel/pom.xml | 23 +-
.../excel/XlsxSpreadsheetReaderDelegate.java | 12 +-
fixedwidth/pom.xml | 21 +-
.../fixedwidth/FixedWidthDataContext.java | 5 +-
.../fixedwidth/FixedWidthDataContextTest.java | 22 +-
full/pom.xml | 26 +-
.../apache/metamodel/DataContextFactory.java | 54 +--
jdbc/pom.xml | 21 +-
.../jdbc/dialects/DB2QueryRewriter.java | 5 +-
.../org/apache/metamodel/DB2Test.java | 18 +
.../org/apache/metamodel/FirebirdTest.java | 18 +
.../org/apache/metamodel/MysqlTest.java | 18 +
.../org/apache/metamodel/OracleTest.java | 18 +
.../org/apache/metamodel/PostgresqlTest.java | 18 +
.../metamodel/SQLServerJtdsDriverTest.java | 18 +
.../metamodel/SQLServerMicrosoftDriverTest.java | 18 +
.../dialects/DB2QueryRewriterTest.java | 36 ++
mongodb/pom.xml | 21 +-
openoffice/pom.xml | 21 +-
pojo/pom.xml | 21 +-
pom.xml | 140 ++++++-
salesforce/pom.xml | 21 +-
.../salesforce/SalesforceDataContext.java | 47 ++-
.../metamodel/salesforce/SalesforceDataSet.java | 23 +-
.../metamodel/salesforce/SalesforceTable.java | 7 +-
.../salesforce/SalesforceDataContextTest.java | 113 ++++-
spring/.gitignore | 4 +
spring/pom.xml | 77 ++++
.../AbstractDataContextFactoryBeanDelegate.java | 95 +++++
.../CsvDataContextFactoryBeanDelegate.java | 46 +++
.../spring/DataContextFactoryBean.java | 279 +++++++++++++
.../spring/DataContextFactoryBeanDelegate.java | 46 +++
.../ExcelDataContextFactoryBeanDelegate.java | 42 ++
.../JdbcDataContextFactoryBeanDelegate.java | 73 ++++
.../apache/metamodel/spring/SpringResource.java | 142 +++++++
...CsvDefaultConfigurationFromResourceTest.java | 58 +++
...vSpecifiedConfigurationFromFilenameTest.java | 58 +++
...lSpecifiedConfigurationFromFilenameTest.java | 59 +++
.../MockDataContextFactoryBeanDelegate.java | 40 ++
.../spring/MockDataContextTypeTest.java | 44 ++
spring/src/test/resources/data/example.csv | 2 +
spring/src/test/resources/data/example.xlsx | Bin 0 -> 7449 bytes
.../resources/examples/csv-using-filename.xml | 14 +
.../examples/csv-using-spring-resource.xml | 11 +
.../resources/examples/excel-using-filename.xml | 13 +
.../examples/mock-datacontext-type.xml | 11 +
src/site/apt/database_compliancy.apt | 98 -----
src/site/apt/download.apt.vm | 39 --
src/site/apt/example_compiled_queries.apt | 35 --
src/site/apt/example_composite_datacontext.apt | 68 ---
src/site/apt/example_inserting_data.apt | 63 ---
src/site/apt/example_interceptors.apt | 42 --
src/site/apt/example_pojo_datastores.apt | 39 --
src/site/apt/example_salesforce_setup.apt | 39 --
src/site/apt/example_schema_traversal.apt | 56 ---
src/site/apt/example_simple_queries.apt | 83 ----
src/site/apt/example_type_conversion.apt | 34 --
src/site/apt/example_xml_mapping.apt | 158 -------
src/site/apt/goals.apt | 33 --
src/site/apt/index.apt.vm | 72 ----
src/site/apt/license.apt | 185 ---------
src/site/apt/project_cases.apt | 45 --
src/site/apt/schema_and_table_semantics.apt | 83 ----
src/site/fml/faq.fml | 207 ----------
src/site/fml/whats_new_1.5.fml | 171 --------
src/site/fml/whats_new_1.6.fml | 41 --
src/site/fml/whats_new_1.7.fml | 77 ----
src/site/fml/whats_new_2.0.fml | 86 ----
src/site/fml/whats_new_2.1.fml | 106 -----
src/site/fml/whats_new_2.2.fml | 91 ----
src/site/fml/whats_new_3.0.fml | 128 ------
src/site/fml/whats_new_3.1.fml | 51 ---
src/site/fml/whats_new_3.2.fml | 49 ---
src/site/fml/whats_new_3.3.fml | 68 ---
src/site/fml/whats_new_3.4.fml | 94 -----
src/site/resources/bg.png | Bin 241 -> 0 bytes
src/site/resources/border-radius.htc | 81 ----
src/site/resources/interceptors.png | Bin 83033 -> 0 bytes
src/site/resources/logo.png | Bin 7165 -> 0 bytes
src/site/resources/modules.png | Bin 139516 -> 0 bytes
.../salesforce_security_token_menu.png | Bin 57210 -> 0 bytes
src/site/resources/styles.css | 161 --------
src/site/site.xml | 70 ----
sugarcrm/pom.xml | 21 +-
sugarcrm/src/jaxws/binding/bindings.xml | 18 +
.../com/sugarcrm/ws/soap/Sugarsoap_handler.xml | 18 +
sugarcrm/src/wsdl/soap-encoding.xsd | 19 +-
sugarcrm/src/wsdl/soap-wsdl.xsd | 18 +
sugarcrm/src/wsdl/sugarcrm.wsdl | 18 +
xml/pom.xml | 21 +-
136 files changed, 3495 insertions(+), 3629 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/346524ad/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 92f4106,b374f93..c284e46
--- a/pom.xml
+++ b/pom.xml
@@@ -38,9 -62,7 +62,8 @@@ under the License
<module>excel</module>
<module>csv</module>
<module>xml</module>
- <module>access</module>
<module>jdbc</module>
+ <module>hbase</module>
<module>mongodb</module>
<module>couchdb</module>
<module>openoffice</module>