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/01/28 22:18:45 UTC
[01/50] [abbrv] git commit: Removing the gpg-plugin as it is defined
in the parent pom under the release profile.
Updated Branches:
refs/heads/hbase-module 45982c2f1 -> 055ce27b6 (forced update)
Removing the gpg-plugin as it is defined in the parent pom under the
release profile.
Project: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/commit/34a45440
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/tree/34a45440
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/diff/34a45440
Branch: refs/heads/hbase-module
Commit: 34a45440a550c4d668c62c0dd09034185f0ddd25
Parents: 712c485
Author: ak.ankitkumar@gmail.com <ak...@gmail.com>
Authored: Wed Sep 18 15:22:41 2013 +0200
Committer: ak.ankitkumar@gmail.com <ak...@gmail.com>
Committed: Wed Sep 18 15:22:41 2013 +0200
----------------------------------------------------------------------
pom.xml | 59 +++++++++++++++++++++++++++++++++++++++++++++--------------
1 file changed, 45 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/34a45440/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f3b0609..51ce264 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,6 @@
<!-- Version printed in the docs -->
<siteDownloadVersion>${project.version}</siteDownloadVersion>
<checksum-maven-plugin.version>1.2</checksum-maven-plugin.version>
- <maven-gpg-plugin.version>1.4</maven-gpg-plugin.version>
<skipTests>false</skipTests>
</properties>
<parent>
@@ -144,6 +143,51 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>rat-verify</id>
+ <phase>test</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <licenses>
+ <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
+ <licenseFamilyCategory>ASL20</licenseFamilyCategory>
+ <licenseFamilyName>Apache Software License, 2.0</licenseFamilyName>
+ <notes>Single licensed ASL v2.0</notes>
+ <patterns>
+ <pattern>Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.</pattern>
+ </patterns>
+ </license>
+ </licenses>
+ <excludeSubProjects>false</excludeSubProjects>
+ <excludes>
+ <exclude>CHANGES.txt</exclude>
+ <exclude>README.txt</exclude>
+ <exclude>NOTICE.txt</exclude>
+ <exclude>LICENSE.txt</exclude>
+ <exclude>KEYS</exclude>
+ <exclude>**/.gitignore/**</exclude>
+ <exclude>.git/**</exclude>
+ <exclude>.project</exclude>
+ <exclude>*/.settings/*</exclude>
+ <exclude>**/src/test/**</exclude>
+ <exclude>**/src/site/**</exclude>
+ <exclude>**/*.xml/**</exclude>
+ <exclude>**/*.wsdl/**</exclude>
+ <exclude>**/*.xsd/**</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/target/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
<!-- Ensure inclusion of license header in all main java files -->
<groupId>com.google.code.maven-license-plugin</groupId>
<artifactId>maven-license-plugin</artifactId>
@@ -223,19 +267,6 @@
</executions>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <executions>
- <execution>
- <id>sign-artifacts</id>
- <phase>verify</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>net.ju-n.maven.plugins</groupId>
<artifactId>checksum-maven-plugin</artifactId>
<version>${checksum-maven-plugin.version}</version>
[39/50] [abbrv] git commit: METAMODEL-34: Removed non-bundled
dependencies' licenses from LICENSE file
Posted by ka...@apache.org.
METAMODEL-34: Removed non-bundled dependencies' licenses from LICENSE
file
Project: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/commit/fccac56f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/tree/fccac56f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/diff/fccac56f
Branch: refs/heads/hbase-module
Commit: fccac56f9fef658998e68bd05f344754cde3771f
Parents: 4841d1b
Author: Kasper Sørensen <i....@gmail.com>
Authored: Fri Jan 17 09:21:13 2014 +0100
Committer: Kasper Sørensen <i....@gmail.com>
Committed: Fri Jan 17 09:21:13 2014 +0100
----------------------------------------------------------------------
HEADER.txt | 16 -----
LICENSE | 179 +-------------------------------------------------------
pom.xml | 23 --------
3 files changed, 1 insertion(+), 217 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/fccac56f/HEADER.txt
----------------------------------------------------------------------
diff --git a/HEADER.txt b/HEADER.txt
deleted file mode 100644
index 90705e0..0000000
--- a/HEADER.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/fccac56f/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 4363154..7a4a3ea 100644
--- a/LICENSE
+++ b/LICENSE
@@ -199,181 +199,4 @@
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
- limitations under the License.
-
- For the library dom4j-1.6.1.jar
-
- Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved.
-
-Redistribution and use of this software and associated documentation
-("Software"), with or without modification, are permitted provided
-that the following conditions are met:
-
-1. Redistributions of source code must retain copyright
- statements and notices. Redistributions must also contain a
- copy of this document.
-
-2. Redistributions in binary form must reproduce the
- above copyright notice, this list of conditions and the
- following disclaimer in the documentation and/or other
- materials provided with the distribution.
-
-3. The name "DOM4J" must not be used to endorse or promote
- products derived from this Software without prior written
- permission of MetaStuff, Ltd. For written permission,
- please contact dom4j-info@metastuff.com.
-
-4. Products derived from this Software may not be called "DOM4J"
- nor may "DOM4J" appear in their names without prior written
- permission of MetaStuff, Ltd. DOM4J is a registered
- trademark of MetaStuff, Ltd.
-
-5. Due credit should be given to the DOM4J Project -
- http://www.dom4j.org
-
-THIS SOFTWARE IS PROVIDED BY METASTUFF, LTD. AND CONTRIBUTORS
-``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
-NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-METASTUFF, LTD. OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
- For force-wsc-24.0.0.jar & force-partner-api-24.0.0.jar
-
-Copyright (c) 2013, salesforce.com, inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided
-that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of conditions and the
- following disclaimer.
-
- Redistributions in binary form must reproduce the above copyright notice, this list of conditions and
- the following disclaimer in the documentation and/or other materials provided with the distribution.
-
- Neither the name of salesforce.com, inc. nor the names of its contributors may be used to endorse or
- promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-
- For hsqldb-1.8.0.10.jar component
-
- COPYRIGHTS AND LICENSES (based on BSD License)
-
-For work developed by the HSQL Development Group:
-
-Copyright (c) 2001-2010, The HSQL Development Group
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this
-list of conditions and the following disclaimer.
-
-Redistributions in binary form must reproduce the above copyright notice,
-this list of conditions and the following disclaimer in the documentation
-and/or other materials provided with the distribution.
-
-Neither the name of the HSQL Development Group nor the names of its
-contributors may be used to endorse or promote products derived from this
-software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL HSQL DEVELOPMENT GROUP, HSQLDB.ORG,
-OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-For work originally developed by the Hypersonic SQL Group:
-
-Copyright (c) 1995-2000 by the Hypersonic SQL Group.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this
-list of conditions and the following disclaimer.
-
-Redistributions in binary form must reproduce the above copyright notice,
-this list of conditions and the following disclaimer in the documentation
-and/or other materials provided with the distribution.
-
-Neither the name of the Hypersonic SQL Group nor the names of its
-contributors may be used to endorse or promote products derived from this
-software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE HYPERSONIC SQL GROUP,
-OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-This software consists of voluntary contributions made by many individuals on behalf of the
-Hypersonic SQL Group.
-
-For slf4j-api-1.7.4.jar component
-Copyright (c) 2004-2013 QOS.ch All rights reserved. Permission is hereby granted, free of charge,
-to any person obtaining a copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation the rights to use, copy,
-modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit
-persons to whom the Software is furnished to do so, subject to the following conditions: The above
-copyright notice and this permission notice shall be included in all copies or substantial portions
-of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES
-OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-For jcl-over-slf4j-1.7.4.jar
-
-The MIT License (MIT)
-
-Copyright (c) <year> <copyright holders>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+ limitations under the License.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/fccac56f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3bbc418..42efb36 100644
--- a/pom.xml
+++ b/pom.xml
@@ -176,29 +176,6 @@ under the License.
</execution>
</executions>
</plugin>
- <plugin>
- <!-- Ensure inclusion of license header in all main java files -->
- <groupId>com.google.code.maven-license-plugin</groupId>
- <artifactId>maven-license-plugin</artifactId>
- <version>1.4.0</version>
- <inherited>false</inherited>
- <configuration>
- <header>HEADER.txt</header>
- <aggregate>true</aggregate>
- <includes>
- <include>**/src/**/java/org/**</include>
- </includes>
- </configuration>
- <executions>
- <execution>
- <id>verify-license-headers</id>
- <phase>verify</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
[16/50] [abbrv] git commit: [maven-release-plugin] prepare release
MetaModel-4.0.0-incubating
Posted by ka...@apache.org.
[maven-release-plugin] prepare release MetaModel-4.0.0-incubating
Project: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/commit/6144c227
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/tree/6144c227
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/diff/6144c227
Branch: refs/heads/hbase-module
Commit: 6144c22783509d11afebf64ff5f46a6ac59e0364
Parents: 1887b20
Author: ak.ankitkumar@gmail.com <ak...@gmail.com>
Authored: Fri Nov 15 13:38:44 2013 +0100
Committer: ak.ankitkumar@gmail.com <ak...@gmail.com>
Committed: Fri Nov 15 13:38:44 2013 +0100
----------------------------------------------------------------------
core/pom.xml | 2 +-
couchdb/pom.xml | 2 +-
csv/pom.xml | 2 +-
excel/pom.xml | 2 +-
fixedwidth/pom.xml | 2 +-
full/pom.xml | 2 +-
jdbc/pom.xml | 2 +-
mongodb/pom.xml | 2 +-
openoffice/pom.xml | 2 +-
pojo/pom.xml | 2 +-
pom.xml | 8 ++++----
salesforce/pom.xml | 2 +-
sugarcrm/pom.xml | 2 +-
xml/pom.xml | 2 +-
14 files changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/6144c227/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index b33280e..8a925a3 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating-SNAPSHOT</version>
+ <version>4.0.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-core</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/6144c227/couchdb/pom.xml
----------------------------------------------------------------------
diff --git a/couchdb/pom.xml b/couchdb/pom.xml
index 80b7f4c..8cb1e77 100644
--- a/couchdb/pom.xml
+++ b/couchdb/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating-SNAPSHOT</version>
+ <version>4.0.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-couchdb</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/6144c227/csv/pom.xml
----------------------------------------------------------------------
diff --git a/csv/pom.xml b/csv/pom.xml
index a246374..b17af3b 100644
--- a/csv/pom.xml
+++ b/csv/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating-SNAPSHOT</version>
+ <version>4.0.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-csv</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/6144c227/excel/pom.xml
----------------------------------------------------------------------
diff --git a/excel/pom.xml b/excel/pom.xml
index ecf3a8f..86a5e41 100644
--- a/excel/pom.xml
+++ b/excel/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating-SNAPSHOT</version>
+ <version>4.0.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-excel</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/6144c227/fixedwidth/pom.xml
----------------------------------------------------------------------
diff --git a/fixedwidth/pom.xml b/fixedwidth/pom.xml
index 527ad65..3d38d58 100644
--- a/fixedwidth/pom.xml
+++ b/fixedwidth/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating-SNAPSHOT</version>
+ <version>4.0.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-fixedwidth</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/6144c227/full/pom.xml
----------------------------------------------------------------------
diff --git a/full/pom.xml b/full/pom.xml
index 973cbc7..90c1547 100644
--- a/full/pom.xml
+++ b/full/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating-SNAPSHOT</version>
+ <version>4.0.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-full</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/6144c227/jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
index 16080b2..dae74fd 100644
--- a/jdbc/pom.xml
+++ b/jdbc/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating-SNAPSHOT</version>
+ <version>4.0.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-jdbc</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/6144c227/mongodb/pom.xml
----------------------------------------------------------------------
diff --git a/mongodb/pom.xml b/mongodb/pom.xml
index 45776d0..be31432 100644
--- a/mongodb/pom.xml
+++ b/mongodb/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating-SNAPSHOT</version>
+ <version>4.0.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-mongodb</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/6144c227/openoffice/pom.xml
----------------------------------------------------------------------
diff --git a/openoffice/pom.xml b/openoffice/pom.xml
index 47b14b8..63f5dcc 100644
--- a/openoffice/pom.xml
+++ b/openoffice/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating-SNAPSHOT</version>
+ <version>4.0.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-openoffice</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/6144c227/pojo/pom.xml
----------------------------------------------------------------------
diff --git a/pojo/pom.xml b/pojo/pom.xml
index 51b75c3..6f863c7 100644
--- a/pojo/pom.xml
+++ b/pojo/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating-SNAPSHOT</version>
+ <version>4.0.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-pojo</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/6144c227/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index af08c22..901d685 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,8 +17,7 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -42,10 +41,11 @@ under the License.
<url>https://git-wip-us.apache.org/repos/asf?p=incubator-metamodel.git</url>
<connection>scm:git:http://git-wip-us.apache.org/repos/asf/incubator-metamodel.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-metamodel.git</developerConnection>
- </scm>
+ <tag>MetaModel-4.0.0-incubating</tag>
+ </scm>
<groupId>org.apache.metamodel</groupId>
<artifactId>MetaModel</artifactId>
- <version>4.0.0-incubating-SNAPSHOT</version>
+ <version>4.0.0-incubating</version>
<name>MetaModel</name>
<description>MetaModel is a library that encapsulates the differences and enhances
the capabilities of different datastores. Rich querying abilities are
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/6144c227/salesforce/pom.xml
----------------------------------------------------------------------
diff --git a/salesforce/pom.xml b/salesforce/pom.xml
index bb043cb..8433e4c 100644
--- a/salesforce/pom.xml
+++ b/salesforce/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating-SNAPSHOT</version>
+ <version>4.0.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-salesforce</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/6144c227/sugarcrm/pom.xml
----------------------------------------------------------------------
diff --git a/sugarcrm/pom.xml b/sugarcrm/pom.xml
index 0f88f71..07d1ad9 100644
--- a/sugarcrm/pom.xml
+++ b/sugarcrm/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating-SNAPSHOT</version>
+ <version>4.0.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-sugarcrm</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/6144c227/xml/pom.xml
----------------------------------------------------------------------
diff --git a/xml/pom.xml b/xml/pom.xml
index a3fc371..ba762cb 100644
--- a/xml/pom.xml
+++ b/xml/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating-SNAPSHOT</version>
+ <version>4.0.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-xml</artifactId>
[41/50] [abbrv] git commit: METAMODEL-35: Improved paged queries on
DB2 by carrying ORDER BY clause to OVER function.
Posted by ka...@apache.org.
METAMODEL-35: Improved paged queries on DB2 by carrying ORDER BY clause
to OVER function.
Project: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/commit/bdef4329
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/tree/bdef4329
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/diff/bdef4329
Branch: refs/heads/hbase-module
Commit: bdef4329763498b71a9eb780eb6e54427be37541
Parents: d05da0c
Author: Gagan Deep Juneja <ga...@gmail.com>
Authored: Wed Jan 22 14:15:49 2014 +0100
Committer: kaspersor <i....@gmail.com>
Committed: Wed Jan 22 14:15:49 2014 +0100
----------------------------------------------------------------------
.../jdbc/dialects/DB2QueryRewriter.java | 5 ++-
.../dialects/DB2QueryRewriterTest.java | 36 ++++++++++++++++++++
2 files changed, 40 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/bdef4329/jdbc/src/main/java/org/apache/metamodel/jdbc/dialects/DB2QueryRewriter.java
----------------------------------------------------------------------
diff --git a/jdbc/src/main/java/org/apache/metamodel/jdbc/dialects/DB2QueryRewriter.java b/jdbc/src/main/java/org/apache/metamodel/jdbc/dialects/DB2QueryRewriter.java
index ef21fbf..fcb0e27 100644
--- a/jdbc/src/main/java/org/apache/metamodel/jdbc/dialects/DB2QueryRewriter.java
+++ b/jdbc/src/main/java/org/apache/metamodel/jdbc/dialects/DB2QueryRewriter.java
@@ -100,7 +100,10 @@ public class DB2QueryRewriter extends DefaultQueryRewriter implements IQueryRewr
outerQuery.select(new SelectItem(selectItem, subQuerySelectItem));
}
- innerQuery.select(new SelectItem("ROW_NUMBER() OVER()", "metamodel_row_number"));
+ final String rewrittenOrderByClause = rewriteOrderByClause(innerQuery, innerQuery.getOrderByClause());
+ final String rowOver = "ROW_NUMBER() " + "OVER(" + rewrittenOrderByClause + ")";
+ innerQuery.select(new SelectItem(rowOver, "metamodel_row_number"));
+ innerQuery.getOrderByClause().removeItems();
final String baseQueryString = rewriteQuery(outerQuery);
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/bdef4329/jdbc/src/test/java/org/apache/metamodel/dialects/DB2QueryRewriterTest.java
----------------------------------------------------------------------
diff --git a/jdbc/src/test/java/org/apache/metamodel/dialects/DB2QueryRewriterTest.java b/jdbc/src/test/java/org/apache/metamodel/dialects/DB2QueryRewriterTest.java
index b71e98a..9108461 100644
--- a/jdbc/src/test/java/org/apache/metamodel/dialects/DB2QueryRewriterTest.java
+++ b/jdbc/src/test/java/org/apache/metamodel/dialects/DB2QueryRewriterTest.java
@@ -68,7 +68,34 @@ public class DB2QueryRewriterTest extends TestCase {
"SELECT metamodel_subquery.bar FROM (SELECT sch.foo.bar, ROW_NUMBER() OVER() AS metamodel_row_number FROM sch.foo) metamodel_subquery WHERE metamodel_row_number > 400",
str);
}
+
+ public void testRewriteFirstRowWithoutOrderByClause() throws Exception {
+ Query q = new Query().from(table).select(col).setFirstRow(401);
+ String str = new DB2QueryRewriter(null).rewriteQuery(q);
+
+ assertEquals(
+ "SELECT metamodel_subquery.bar FROM (SELECT sch.foo.bar, ROW_NUMBER() OVER() AS metamodel_row_number FROM sch.foo) metamodel_subquery WHERE metamodel_row_number > 400",
+ str);
+ }
+
+ public void testRewriteFirstRowWithOrderByClause() throws Exception {
+ Query q = new Query().from(table).select(col).setFirstRow(401);
+ q.orderBy(col);
+ String str = new DB2QueryRewriter(null).rewriteQuery(q);
+
+ assertEquals(
+ "SELECT metamodel_subquery.bar FROM (SELECT sch.foo.bar, ROW_NUMBER() OVER( ORDER BY sch.foo.bar ASC) AS metamodel_row_number FROM sch.foo) metamodel_subquery WHERE metamodel_row_number > 400",
+ str);
+ }
+ public void testRewriteFirstRowAndMaxRowsWithoutOrderByClause() throws Exception {
+ Query q = new Query().from(table).select(col).setFirstRow(401).setMaxRows(400);
+ String str = new DB2QueryRewriter(null).rewriteQuery(q);
+ assertEquals(
+ "SELECT metamodel_subquery.bar FROM (SELECT sch.foo.bar, ROW_NUMBER() OVER() AS metamodel_row_number FROM sch.foo) metamodel_subquery WHERE metamodel_row_number BETWEEN 401 AND 800",
+ str);
+ }
+
public void testRewriteFirstRowAndMaxRows() throws Exception {
Query q = new Query().from(table).select(col).setFirstRow(401).setMaxRows(400);
String str = new DB2QueryRewriter(null).rewriteQuery(q);
@@ -76,6 +103,15 @@ public class DB2QueryRewriterTest extends TestCase {
"SELECT metamodel_subquery.bar FROM (SELECT sch.foo.bar, ROW_NUMBER() OVER() AS metamodel_row_number FROM sch.foo) metamodel_subquery WHERE metamodel_row_number BETWEEN 401 AND 800",
str);
}
+
+ public void testRewriteFirstRowAndMaxRowsWithOrderByClause() throws Exception {
+ Query q = new Query().from(table).select(col).setFirstRow(401).setMaxRows(400);
+ q.orderBy(col);
+ String str = new DB2QueryRewriter(null).rewriteQuery(q);
+ assertEquals(
+ "SELECT metamodel_subquery.bar FROM (SELECT sch.foo.bar, ROW_NUMBER() OVER( ORDER BY sch.foo.bar ASC) AS metamodel_row_number FROM sch.foo) metamodel_subquery WHERE metamodel_row_number BETWEEN 401 AND 800",
+ str);
+ }
public void testRewriteColumnType() throws Exception {
assertEquals("SMALLINT", new DB2QueryRewriter(null).rewriteColumnType(ColumnType.BOOLEAN));
[23/50] [abbrv] git commit: Adding Readme.txt with build instructions.
Posted by ka...@apache.org.
Adding Readme.txt with build instructions.
Project: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/commit/39b8c77f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/tree/39b8c77f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/diff/39b8c77f
Branch: refs/heads/hbase-module
Commit: 39b8c77fe7692ce472e6088fc2320517bf14d553
Parents: f9092d6
Author: ankitkumar2711 <ak...@gmail.com>
Authored: Thu Nov 28 14:57:23 2013 +0100
Committer: ankitkumar2711 <ak...@gmail.com>
Committed: Thu Nov 28 14:57:23 2013 +0100
----------------------------------------------------------------------
README | 21 +++++++++++++++++++++
pom.xml | 3 ++-
2 files changed, 23 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/39b8c77f/README
----------------------------------------------------------------------
diff --git a/README b/README
new file mode 100644
index 0000000..f2a911c
--- /dev/null
+++ b/README
@@ -0,0 +1,21 @@
+README file for Apache Metamodel
+===========================
+
+MetaModel is a data access framework, providing a common interface for exploration and querying of different types of datastores.
+
+Mail Lists
+=========
+
+Dev list dev@metamodel.incubator.apache.org
+
+Website
+=======
+
+http://incubator.apache.org/projects/metamodel.html
+
+Building Code
+==============
+
+Metamodel uses maven for build. So code can be build by mvn clean install.
+
+
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/39b8c77f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2e3d411..2112961 100644
--- a/pom.xml
+++ b/pom.xml
@@ -190,7 +190,7 @@ under the License.
<excludeSubProjects>false</excludeSubProjects>
<excludes>
<exclude>CHANGES.txt</exclude>
- <exclude>README.txt</exclude>
+ <exclude>README</exclude>
<exclude>NOTICE.txt</exclude>
<exclude>LICENSE.txt</exclude>
<exclude>KEYS</exclude>
@@ -203,6 +203,7 @@ under the License.
<exclude>**/.settings/**</exclude>
<exclude>**/target/**</exclude>
<exclude>DEPENDENCIES</exclude>
+ <exclude>DISCLAIMER</exclude>
</excludes>
</configuration>
</plugin>
[02/50] [abbrv] git commit: Added the SCM additional tags.
Posted by ka...@apache.org.
Added the SCM additional tags.
Project: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/commit/7601f8e9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/tree/7601f8e9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/diff/7601f8e9
Branch: refs/heads/hbase-module
Commit: 7601f8e975f8d78b47a8e9ff167b4ea1240289c2
Parents: 34a4544
Author: ak.ankitkumar@gmail.com <ak...@gmail.com>
Authored: Fri Sep 20 16:16:46 2013 +0200
Committer: ak.ankitkumar@gmail.com <ak...@gmail.com>
Committed: Fri Sep 20 16:16:46 2013 +0200
----------------------------------------------------------------------
pom.xml | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/7601f8e9/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 51ce264..3ed9936 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,6 +21,8 @@
</parent>
<scm>
<url>https://git-wip-us.apache.org/repos/asf?p=incubator-metamodel.git</url>
+ <connection>scm:git:http://git-wip-us.apache.org/repos/asf/incubator-metamodel.git</connection>
+ <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-metamodel.git</developerConnection>
</scm>
<groupId>org.apache.metamodel</groupId>
<artifactId>MetaModel</artifactId>
[35/50] [abbrv] git commit: Added test case for Excel data contexts.
Posted by ka...@apache.org.
Added test case for Excel data contexts.
Project: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/commit/5ce666fa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/tree/5ce666fa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/diff/5ce666fa
Branch: refs/heads/hbase-module
Commit: 5ce666fa3b601ddee57e24a7bfb86d49046cd582
Parents: 5bc3d1b
Author: Kasper Sørensen <i....@gmail.com>
Authored: Sun Jan 5 20:55:39 2014 +0100
Committer: Kasper Sørensen <i....@gmail.com>
Committed: Sun Jan 5 20:55:39 2014 +0100
----------------------------------------------------------------------
...vSpecifiedConfigurationFromFilenameTest.java | 3 ++
...lSpecifiedConfigurationFromFilenameTest.java | 41 +++++++++++++++++++
spring/src/test/resources/data/example.xlsx | Bin 0 -> 7449 bytes
.../resources/examples/csv-using-filename.xml | 1 +
.../resources/examples/excel-using-filename.xml | 13 ++++++
5 files changed, 58 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/5ce666fa/spring/src/test/java/org/apache/metamodel/spring/CsvSpecifiedConfigurationFromFilenameTest.java
----------------------------------------------------------------------
diff --git a/spring/src/test/java/org/apache/metamodel/spring/CsvSpecifiedConfigurationFromFilenameTest.java b/spring/src/test/java/org/apache/metamodel/spring/CsvSpecifiedConfigurationFromFilenameTest.java
index 6867fbf..a2ba1fd 100644
--- a/spring/src/test/java/org/apache/metamodel/spring/CsvSpecifiedConfigurationFromFilenameTest.java
+++ b/spring/src/test/java/org/apache/metamodel/spring/CsvSpecifiedConfigurationFromFilenameTest.java
@@ -8,6 +8,7 @@ import org.apache.metamodel.DataContext;
import org.apache.metamodel.csv.CsvDataContext;
import org.apache.metamodel.util.FileResource;
import org.apache.metamodel.util.Resource;
+import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
@@ -33,5 +34,7 @@ public class CsvSpecifiedConfigurationFromFilenameTest {
assertEquals("example.csv", resource.getName());
assertEquals("[\"foo\", bar]", Arrays.toString(csv.getDefaultSchema().getTable(0).getColumnNames()));
+
+ Assert.assertFalse(csv.getConfiguration().isMultilineValues());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/5ce666fa/spring/src/test/java/org/apache/metamodel/spring/ExcelSpecifiedConfigurationFromFilenameTest.java
----------------------------------------------------------------------
diff --git a/spring/src/test/java/org/apache/metamodel/spring/ExcelSpecifiedConfigurationFromFilenameTest.java b/spring/src/test/java/org/apache/metamodel/spring/ExcelSpecifiedConfigurationFromFilenameTest.java
new file mode 100644
index 0000000..86b80c5
--- /dev/null
+++ b/spring/src/test/java/org/apache/metamodel/spring/ExcelSpecifiedConfigurationFromFilenameTest.java
@@ -0,0 +1,41 @@
+package org.apache.metamodel.spring;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Arrays;
+
+import org.apache.metamodel.DataContext;
+import org.apache.metamodel.excel.ExcelDataContext;
+import org.apache.metamodel.util.FileResource;
+import org.apache.metamodel.util.Resource;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration("classpath:examples/excel-using-filename.xml")
+public class ExcelSpecifiedConfigurationFromFilenameTest {
+
+ @Autowired
+ private DataContext dataContext;
+
+ @Test
+ public void testReadDataContext() {
+ assertEquals(ExcelDataContext.class, dataContext.getClass());
+
+ ExcelDataContext excel = (ExcelDataContext) dataContext;
+ Resource resource = excel.getResource();
+
+ assertEquals(FileResource.class, resource.getClass());
+
+ assertEquals("example.xlsx", resource.getName());
+
+ assertEquals("[hello, world]", Arrays.toString(excel.getDefaultSchema().getTable(0).getColumnNames()));
+
+ Assert.assertTrue(excel.getConfiguration().isSkipEmptyLines());
+ Assert.assertTrue(excel.getConfiguration().isSkipEmptyColumns());
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/5ce666fa/spring/src/test/resources/data/example.xlsx
----------------------------------------------------------------------
diff --git a/spring/src/test/resources/data/example.xlsx b/spring/src/test/resources/data/example.xlsx
new file mode 100644
index 0000000..b3661d9
Binary files /dev/null and b/spring/src/test/resources/data/example.xlsx differ
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/5ce666fa/spring/src/test/resources/examples/csv-using-filename.xml
----------------------------------------------------------------------
diff --git a/spring/src/test/resources/examples/csv-using-filename.xml b/spring/src/test/resources/examples/csv-using-filename.xml
index df6320e..c0934ed 100644
--- a/spring/src/test/resources/examples/csv-using-filename.xml
+++ b/spring/src/test/resources/examples/csv-using-filename.xml
@@ -8,6 +8,7 @@
<property name="filename" value="src/test/resources/data/example.csv" />
<property name="quoteChar" value="none" />
<property name="separatorChar" value="," />
+ <property name="multilineValues" value="false" />
</bean>
</beans>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/5ce666fa/spring/src/test/resources/examples/excel-using-filename.xml
----------------------------------------------------------------------
diff --git a/spring/src/test/resources/examples/excel-using-filename.xml b/spring/src/test/resources/examples/excel-using-filename.xml
new file mode 100644
index 0000000..0fa5e19
--- /dev/null
+++ b/spring/src/test/resources/examples/excel-using-filename.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+
+ <bean class="org.apache.metamodel.spring.DataContextFactoryBean">
+ <property name="type" value="Excel" />
+ <property name="filename" value="src/test/resources/data/example.xlsx" />
+ <property name="skipEmptyLines" value="true" />
+ <property name="skipEmptyColumns" value="true" />
+ </bean>
+
+</beans>
\ No newline at end of file
[18/50] [abbrv] git commit: METAMODEL-30: Fixed
Posted by ka...@apache.org.
METAMODEL-30: Fixed
Project: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/commit/3e395f64
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/tree/3e395f64
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/diff/3e395f64
Branch: refs/heads/hbase-module
Commit: 3e395f640c7ac6aa50f8effce40c68281f43b618
Parents: ea419ba
Author: kaspers <ka...@kaspers-think.humaninference.com>
Authored: Mon Nov 25 15:58:44 2013 +0100
Committer: kaspers <ka...@kaspers-think.humaninference.com>
Committed: Mon Nov 25 15:58:44 2013 +0100
----------------------------------------------------------------------
CHANGES.txt | 3 ++-
.../java/org/apache/metamodel/csv/CsvDataContext.java | 14 +++++++++++---
2 files changed, 13 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/3e395f64/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index d46a510..78cb3ef 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -11,4 +11,5 @@
* Setting up the project on apache infrastructure
* [METAMODEL-10] - Exclude Jackcess dependency (Access module) from MetaModel
* Renaming the package hierarchy from org.eobjects.metamodel to org.apache.metamodel
- * [METAMODEL-29] - Fixed issue in CreateTable builder class, causing it to only support a single column definition
\ No newline at end of file
+ * [METAMODEL-29] - Fixed issue in CreateTable builder class, causing it to only support a single column definition
+ * [METAMODEL-30] - Fixed issue with count(*) queries on CSV resources that does not provide a byte stream length
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/3e395f64/csv/src/main/java/org/apache/metamodel/csv/CsvDataContext.java
----------------------------------------------------------------------
diff --git a/csv/src/main/java/org/apache/metamodel/csv/CsvDataContext.java b/csv/src/main/java/org/apache/metamodel/csv/CsvDataContext.java
index c34c52b..9d56b1b 100644
--- a/csv/src/main/java/org/apache/metamodel/csv/CsvDataContext.java
+++ b/csv/src/main/java/org/apache/metamodel/csv/CsvDataContext.java
@@ -270,15 +270,23 @@ public final class CsvDataContext extends QueryPostprocessDataContext implements
if (!functionApproximationAllowed) {
return null;
}
+
+ if (whereItems != null && !whereItems.isEmpty()) {
+ return null;
+ }
+
+ final long length = _resource.getSize();
+ if (length < 0) {
+ // METAMODEL-30: Sometimes the size of the resource is not known
+ return null;
+ }
return _resource.read(new Func<InputStream, Number>() {
@Override
public Number eval(InputStream inputStream) {
try {
- final long length = _resource.getSize();
// read up to 5 megs of the file and approximate number of
- // lines
- // based on that.
+ // lines based on that.
final int sampleSize = (int) Math.min(length, 1024 * 1024 * 5);
final int chunkSize = Math.min(sampleSize, 1024 * 1024);
[25/50] [abbrv] git commit: Setting a fixed timestamp in the test
case as with different timezones the old way of getting time from a Date
variable was failing.
Posted by ka...@apache.org.
Setting a fixed timestamp in the test case as with different timezones
the old way of getting time from a Date variable was failing.
Project: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/commit/409ee548
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/tree/409ee548
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/diff/409ee548
Branch: refs/heads/hbase-module
Commit: 409ee548b22b05b2eefa61042bb50ae8b0d49951
Parents: c549ef0
Author: ankitkumar2711 <ak...@gmail.com>
Authored: Mon Dec 2 15:14:20 2013 +0100
Committer: ankitkumar2711 <ak...@gmail.com>
Committed: Mon Dec 2 15:14:20 2013 +0100
----------------------------------------------------------------------
.../salesforce/SalesforceDataContextTest.java | 23 +++++---------------
1 file changed, 5 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/409ee548/salesforce/src/test/java/org/apache/metamodel/salesforce/SalesforceDataContextTest.java
----------------------------------------------------------------------
diff --git a/salesforce/src/test/java/org/apache/metamodel/salesforce/SalesforceDataContextTest.java b/salesforce/src/test/java/org/apache/metamodel/salesforce/SalesforceDataContextTest.java
index 8d4da09..e7acc84 100644
--- a/salesforce/src/test/java/org/apache/metamodel/salesforce/SalesforceDataContextTest.java
+++ b/salesforce/src/test/java/org/apache/metamodel/salesforce/SalesforceDataContextTest.java
@@ -41,6 +41,8 @@ import org.apache.metamodel.schema.ColumnType;
import org.apache.metamodel.schema.MutableColumn;
import org.apache.metamodel.schema.Schema;
import org.apache.metamodel.schema.Table;
+import org.apache.metamodel.util.DateUtils;
+import org.apache.metamodel.util.Month;
public class SalesforceDataContextTest extends SalesforceTestCase {
@@ -351,29 +353,14 @@ public class SalesforceDataContextTest extends SalesforceTestCase {
public void testRewriteWhereItem() throws Exception {
final StringBuilder sb = new StringBuilder("FOOBAR: ");
- final Calendar cal = Calendar.getInstance();
- cal.setTimeZone(TimeZone.getTimeZone("GMT+1"));
- cal.setTimeInMillis(0);
- cal.set(Calendar.HOUR, 0);
- cal.set(Calendar.MINUTE, 0);
- cal.set(Calendar.SECOND, 0);
- cal.set(Calendar.MILLISECOND, 0);
- cal.set(Calendar.HOUR, 0);
- cal.set(Calendar.MINUTE, 0);
- cal.set(Calendar.YEAR, 2013);
- cal.set(Calendar.MONTH, Calendar.JANUARY);
- cal.set(Calendar.DAY_OF_MONTH, 23);
- cal.set(Calendar.AM_PM, 0);
- final Date date = cal.getTime();
- final Timestamp dateTime = new Timestamp(date.getTime());
+ final Date date = DateUtils.get(2013, Month.JANUARY, 23);
+ final Timestamp dateTime = new Timestamp(0l);
final List<FilterItem> children = new ArrayList<FilterItem>();
children.add(new FilterItem(new SelectItem(new MutableColumn("foo")), OperatorType.EQUALS_TO, "hello\n 'world'"));
children.add(new FilterItem(new SelectItem(new MutableColumn("bar")), OperatorType.EQUALS_TO, 123));
children.add(new FilterItem(new SelectItem(new MutableColumn("baz").setType(ColumnType.DATE)),
OperatorType.EQUALS_TO, date));
- children.add(new FilterItem(new SelectItem(new MutableColumn("zaz").setType(ColumnType.TIMESTAMP)),
- OperatorType.EQUALS_TO, date));
children.add(new FilterItem(new SelectItem(new MutableColumn("saz").setType(ColumnType.TIMESTAMP)),
OperatorType.EQUALS_TO, dateTime));
@@ -382,7 +369,7 @@ public class SalesforceDataContextTest extends SalesforceTestCase {
SalesforceDataContext.rewriteFilterItem(sb, filterItem);
assertEquals(
- "FOOBAR: (foo = 'hello\\n \\'world\\'' OR bar = 123 OR baz = 2013-01-23 OR zaz = 2013-01-22T23:00:00+0000 OR saz = 2013-01-22T23:00:00+0000)",
+ "FOOBAR: (foo = 'hello\\n \\'world\\'' OR bar = 123 OR baz = 2013-01-23 OR saz = 1970-01-01T00:00:00+0000)",
sb.toString());
}
}
[50/50] [abbrv] git commit: Added gitignore
Posted by ka...@apache.org.
Added gitignore
Project: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/commit/055ce27b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/tree/055ce27b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/diff/055ce27b
Branch: refs/heads/hbase-module
Commit: 055ce27b6aac48abf86f35a191af8388d2079fd5
Parents: f530e63
Author: Kasper Sørensen <i....@gmail.com>
Authored: Tue Jan 28 22:07:39 2014 +0100
Committer: Kasper Sørensen <i....@gmail.com>
Committed: Tue Jan 28 22:07:39 2014 +0100
----------------------------------------------------------------------
hbase/.gitignore | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/055ce27b/hbase/.gitignore
----------------------------------------------------------------------
diff --git a/hbase/.gitignore b/hbase/.gitignore
new file mode 100644
index 0000000..4e247ee
--- /dev/null
+++ b/hbase/.gitignore
@@ -0,0 +1,4 @@
+/.settings
+/target
+/.classpath
+/.project
[14/50] [abbrv] git commit: [maven-release-plugin] prepare release
MetaModel-4.0.0-incubating
Posted by ka...@apache.org.
[maven-release-plugin] prepare release MetaModel-4.0.0-incubating
Project: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/commit/e08389db
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/tree/e08389db
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/diff/e08389db
Branch: refs/heads/hbase-module
Commit: e08389db6d333407cfbffc5ae3ad4e4882264a86
Parents: 0ae1c3f
Author: ak.ankitkumar@gmail.com <ak...@gmail.com>
Authored: Fri Nov 15 13:04:25 2013 +0100
Committer: ak.ankitkumar@gmail.com <ak...@gmail.com>
Committed: Fri Nov 15 13:04:25 2013 +0100
----------------------------------------------------------------------
core/pom.xml | 2 +-
couchdb/pom.xml | 2 +-
csv/pom.xml | 2 +-
excel/pom.xml | 2 +-
fixedwidth/pom.xml | 2 +-
full/pom.xml | 2 +-
jdbc/pom.xml | 2 +-
mongodb/pom.xml | 2 +-
openoffice/pom.xml | 2 +-
pojo/pom.xml | 2 +-
pom.xml | 8 ++++----
salesforce/pom.xml | 2 +-
sugarcrm/pom.xml | 2 +-
xml/pom.xml | 2 +-
14 files changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/e08389db/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index b33280e..8a925a3 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating-SNAPSHOT</version>
+ <version>4.0.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-core</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/e08389db/couchdb/pom.xml
----------------------------------------------------------------------
diff --git a/couchdb/pom.xml b/couchdb/pom.xml
index 80b7f4c..8cb1e77 100644
--- a/couchdb/pom.xml
+++ b/couchdb/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating-SNAPSHOT</version>
+ <version>4.0.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-couchdb</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/e08389db/csv/pom.xml
----------------------------------------------------------------------
diff --git a/csv/pom.xml b/csv/pom.xml
index a246374..b17af3b 100644
--- a/csv/pom.xml
+++ b/csv/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating-SNAPSHOT</version>
+ <version>4.0.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-csv</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/e08389db/excel/pom.xml
----------------------------------------------------------------------
diff --git a/excel/pom.xml b/excel/pom.xml
index ecf3a8f..86a5e41 100644
--- a/excel/pom.xml
+++ b/excel/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating-SNAPSHOT</version>
+ <version>4.0.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-excel</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/e08389db/fixedwidth/pom.xml
----------------------------------------------------------------------
diff --git a/fixedwidth/pom.xml b/fixedwidth/pom.xml
index 527ad65..3d38d58 100644
--- a/fixedwidth/pom.xml
+++ b/fixedwidth/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating-SNAPSHOT</version>
+ <version>4.0.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-fixedwidth</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/e08389db/full/pom.xml
----------------------------------------------------------------------
diff --git a/full/pom.xml b/full/pom.xml
index 973cbc7..90c1547 100644
--- a/full/pom.xml
+++ b/full/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating-SNAPSHOT</version>
+ <version>4.0.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-full</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/e08389db/jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
index 16080b2..dae74fd 100644
--- a/jdbc/pom.xml
+++ b/jdbc/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating-SNAPSHOT</version>
+ <version>4.0.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-jdbc</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/e08389db/mongodb/pom.xml
----------------------------------------------------------------------
diff --git a/mongodb/pom.xml b/mongodb/pom.xml
index 45776d0..be31432 100644
--- a/mongodb/pom.xml
+++ b/mongodb/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating-SNAPSHOT</version>
+ <version>4.0.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-mongodb</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/e08389db/openoffice/pom.xml
----------------------------------------------------------------------
diff --git a/openoffice/pom.xml b/openoffice/pom.xml
index 47b14b8..63f5dcc 100644
--- a/openoffice/pom.xml
+++ b/openoffice/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating-SNAPSHOT</version>
+ <version>4.0.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-openoffice</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/e08389db/pojo/pom.xml
----------------------------------------------------------------------
diff --git a/pojo/pom.xml b/pojo/pom.xml
index 51b75c3..6f863c7 100644
--- a/pojo/pom.xml
+++ b/pojo/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating-SNAPSHOT</version>
+ <version>4.0.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-pojo</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/e08389db/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index af08c22..901d685 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,8 +17,7 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -42,10 +41,11 @@ under the License.
<url>https://git-wip-us.apache.org/repos/asf?p=incubator-metamodel.git</url>
<connection>scm:git:http://git-wip-us.apache.org/repos/asf/incubator-metamodel.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-metamodel.git</developerConnection>
- </scm>
+ <tag>MetaModel-4.0.0-incubating</tag>
+ </scm>
<groupId>org.apache.metamodel</groupId>
<artifactId>MetaModel</artifactId>
- <version>4.0.0-incubating-SNAPSHOT</version>
+ <version>4.0.0-incubating</version>
<name>MetaModel</name>
<description>MetaModel is a library that encapsulates the differences and enhances
the capabilities of different datastores. Rich querying abilities are
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/e08389db/salesforce/pom.xml
----------------------------------------------------------------------
diff --git a/salesforce/pom.xml b/salesforce/pom.xml
index bb043cb..8433e4c 100644
--- a/salesforce/pom.xml
+++ b/salesforce/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating-SNAPSHOT</version>
+ <version>4.0.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-salesforce</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/e08389db/sugarcrm/pom.xml
----------------------------------------------------------------------
diff --git a/sugarcrm/pom.xml b/sugarcrm/pom.xml
index 0f88f71..07d1ad9 100644
--- a/sugarcrm/pom.xml
+++ b/sugarcrm/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating-SNAPSHOT</version>
+ <version>4.0.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-sugarcrm</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/e08389db/xml/pom.xml
----------------------------------------------------------------------
diff --git a/xml/pom.xml b/xml/pom.xml
index a3fc371..ba762cb 100644
--- a/xml/pom.xml
+++ b/xml/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating-SNAPSHOT</version>
+ <version>4.0.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-xml</artifactId>
[11/50] [abbrv] git commit: METAMODEL-29: Fixed issue with interface
returned by CreateTable builder class.
Posted by ka...@apache.org.
METAMODEL-29: Fixed issue with interface returned by CreateTable builder
class.
Project: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/commit/05dce3ff
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/tree/05dce3ff
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/diff/05dce3ff
Branch: refs/heads/hbase-module
Commit: 05dce3ff346fab76d4354770db9b018440914451
Parents: 4a3ddf0
Author: Kasper Sørensen <i....@gmail.com>
Authored: Mon Oct 21 20:27:16 2013 +0200
Committer: Kasper Sørensen <i....@gmail.com>
Committed: Mon Oct 21 20:27:16 2013 +0200
----------------------------------------------------------------------
CHANGES.txt | 3 +-
.../apache/metamodel/create/CreateTable.java | 2 +-
.../create/CreateTableColumnBuilder.java | 3 ++
.../org/apache/metamodel/update/Update.java | 7 +++-
.../metamodel/create/SyntaxExamplesTest.java | 27 ++++++++++----
.../metamodel/update/SyntaxExamplesTest.java | 39 ++++++++++++++++++++
6 files changed, 70 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/05dce3ff/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index b0cdfb8..d46a510 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -10,4 +10,5 @@
* Performance improvement to CSV reading when values are only single line based
* Setting up the project on apache infrastructure
* [METAMODEL-10] - Exclude Jackcess dependency (Access module) from MetaModel
- * Renaming the package hierarchy from org.eobjects.metamodel to org.apache.metamodel
\ No newline at end of file
+ * Renaming the package hierarchy from org.eobjects.metamodel to org.apache.metamodel
+ * [METAMODEL-29] - Fixed issue in CreateTable builder class, causing it to only support a single column definition
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/05dce3ff/core/src/main/java/org/apache/metamodel/create/CreateTable.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/metamodel/create/CreateTable.java b/core/src/main/java/org/apache/metamodel/create/CreateTable.java
index b189bd2..9efe5b5 100644
--- a/core/src/main/java/org/apache/metamodel/create/CreateTable.java
+++ b/core/src/main/java/org/apache/metamodel/create/CreateTable.java
@@ -54,7 +54,7 @@ public final class CreateTable implements UpdateScript {
* @param name
* @return
*/
- public ColumnBuilder<CreateTableColumnBuilder> withColumn(String name) {
+ public CreateTableColumnBuilder withColumn(String name) {
MutableColumn column = new MutableColumn(name);
_table.addColumn(column);
return new CreateTableColumnBuilder(this, column);
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/05dce3ff/core/src/main/java/org/apache/metamodel/create/CreateTableColumnBuilder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/metamodel/create/CreateTableColumnBuilder.java b/core/src/main/java/org/apache/metamodel/create/CreateTableColumnBuilder.java
index 8cd1e0d..8b5d39e 100644
--- a/core/src/main/java/org/apache/metamodel/create/CreateTableColumnBuilder.java
+++ b/core/src/main/java/org/apache/metamodel/create/CreateTableColumnBuilder.java
@@ -39,4 +39,7 @@ public final class CreateTableColumnBuilder extends AbstractColumnBuilder<Create
_createTable.run(callback);
}
+ public CreateTableColumnBuilder withColumn(String name) {
+ return _createTable.withColumn(name);
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/05dce3ff/core/src/main/java/org/apache/metamodel/update/Update.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/metamodel/update/Update.java b/core/src/main/java/org/apache/metamodel/update/Update.java
index dc3c813..53f83d9 100644
--- a/core/src/main/java/org/apache/metamodel/update/Update.java
+++ b/core/src/main/java/org/apache/metamodel/update/Update.java
@@ -33,6 +33,7 @@ import org.apache.metamodel.query.SelectItem;
import org.apache.metamodel.query.builder.AbstractFilterBuilder;
import org.apache.metamodel.query.builder.FilterBuilder;
import org.apache.metamodel.schema.Column;
+import org.apache.metamodel.schema.Schema;
import org.apache.metamodel.schema.Table;
/**
@@ -47,13 +48,17 @@ public final class Update extends AbstractRowBuilder<Update> implements UpdateSc
private final Table _table;
private final List<FilterItem> _whereItems;
-
+
public Update(Table table) {
super(table);
_table = table;
_whereItems = new ArrayList<FilterItem>();
}
+ public Update(Schema schema, String tableName) {
+ this(schema.getTableByName(tableName));
+ }
+
@Override
public Table getTable() {
return _table;
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/05dce3ff/core/src/test/java/org/apache/metamodel/create/SyntaxExamplesTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/metamodel/create/SyntaxExamplesTest.java b/core/src/test/java/org/apache/metamodel/create/SyntaxExamplesTest.java
index 2261969..45eab15 100644
--- a/core/src/test/java/org/apache/metamodel/create/SyntaxExamplesTest.java
+++ b/core/src/test/java/org/apache/metamodel/create/SyntaxExamplesTest.java
@@ -20,19 +20,30 @@ package org.apache.metamodel.create;
import junit.framework.TestCase;
+import org.apache.metamodel.UpdateScript;
import org.apache.metamodel.schema.Column;
+import org.apache.metamodel.schema.ColumnType;
import org.apache.metamodel.schema.Schema;
import org.apache.metamodel.schema.Table;
+/**
+ * Abstract test class (will not be executed) to check the builder API's
+ * syntactical applicability.
+ */
public abstract class SyntaxExamplesTest extends TestCase {
- private TableCreatable dc;
- private Table table;
- private Column col;
- private Schema schema;
+ private TableCreatable dc;
+ private Table table;
+ private Column col;
+ private Schema schema;
+
+ public void testCreateLikeExistingStructure() throws Exception {
+ dc.createTable(schema, "foo").like(table).withColumn("bar").like(col).nullable(false).execute();
+ }
- public void testCreateLikeExistingStructure() throws Exception {
- dc.createTable(schema, "foo").like(table).withColumn("bar").like(col)
- .nullable(false).execute();
- }
+ public void testCreateTableClass() throws Exception {
+ UpdateScript ct = new CreateTable(schema, "table").withColumn("foo").ofType(ColumnType.VARCHAR)
+ .withColumn("bar").withColumn("baz");
+ assertNotNull(ct);
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/05dce3ff/core/src/test/java/org/apache/metamodel/update/SyntaxExamplesTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/metamodel/update/SyntaxExamplesTest.java b/core/src/test/java/org/apache/metamodel/update/SyntaxExamplesTest.java
new file mode 100644
index 0000000..d523ad7
--- /dev/null
+++ b/core/src/test/java/org/apache/metamodel/update/SyntaxExamplesTest.java
@@ -0,0 +1,39 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.metamodel.update;
+
+import junit.framework.TestCase;
+
+import org.apache.metamodel.schema.Column;
+import org.apache.metamodel.schema.Schema;
+
+/**
+ * Abstract test class (will not be executed) to check the builder API's
+ * syntactical applicability.
+ */
+public abstract class SyntaxExamplesTest extends TestCase {
+
+ private Column col;
+ private Schema schema;
+
+ public void testUpdateClass() throws Exception {
+ Update u = new Update(schema, "table").value(col, "foo").where("baz").eq("bar");
+ assertNotNull(u);
+ }
+}
\ No newline at end of file
[13/50] [abbrv] git commit: [maven-release-plugin] rollback the
release of MetaModel-4.0.0-incubating
Posted by ka...@apache.org.
[maven-release-plugin] rollback the release of MetaModel-4.0.0-incubating
Project: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/commit/0ae1c3f5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/tree/0ae1c3f5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/diff/0ae1c3f5
Branch: refs/heads/hbase-module
Commit: 0ae1c3f502ad2d3f7cf2ae61645179b8256d738e
Parents: 2323860
Author: ak.ankitkumar@gmail.com <ak...@gmail.com>
Authored: Fri Nov 15 13:00:22 2013 +0100
Committer: ak.ankitkumar@gmail.com <ak...@gmail.com>
Committed: Fri Nov 15 13:00:22 2013 +0100
----------------------------------------------------------------------
core/pom.xml | 2 +-
couchdb/pom.xml | 2 +-
csv/pom.xml | 2 +-
excel/pom.xml | 2 +-
fixedwidth/pom.xml | 2 +-
full/pom.xml | 2 +-
jdbc/pom.xml | 2 +-
mongodb/pom.xml | 2 +-
openoffice/pom.xml | 2 +-
pojo/pom.xml | 2 +-
pom.xml | 8 ++++----
salesforce/pom.xml | 2 +-
sugarcrm/pom.xml | 2 +-
xml/pom.xml | 2 +-
14 files changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/0ae1c3f5/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 8a925a3..b33280e 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating</version>
+ <version>4.0.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-core</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/0ae1c3f5/couchdb/pom.xml
----------------------------------------------------------------------
diff --git a/couchdb/pom.xml b/couchdb/pom.xml
index 8cb1e77..80b7f4c 100644
--- a/couchdb/pom.xml
+++ b/couchdb/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating</version>
+ <version>4.0.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-couchdb</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/0ae1c3f5/csv/pom.xml
----------------------------------------------------------------------
diff --git a/csv/pom.xml b/csv/pom.xml
index b17af3b..a246374 100644
--- a/csv/pom.xml
+++ b/csv/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating</version>
+ <version>4.0.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-csv</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/0ae1c3f5/excel/pom.xml
----------------------------------------------------------------------
diff --git a/excel/pom.xml b/excel/pom.xml
index 86a5e41..ecf3a8f 100644
--- a/excel/pom.xml
+++ b/excel/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating</version>
+ <version>4.0.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-excel</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/0ae1c3f5/fixedwidth/pom.xml
----------------------------------------------------------------------
diff --git a/fixedwidth/pom.xml b/fixedwidth/pom.xml
index 3d38d58..527ad65 100644
--- a/fixedwidth/pom.xml
+++ b/fixedwidth/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating</version>
+ <version>4.0.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-fixedwidth</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/0ae1c3f5/full/pom.xml
----------------------------------------------------------------------
diff --git a/full/pom.xml b/full/pom.xml
index 90c1547..973cbc7 100644
--- a/full/pom.xml
+++ b/full/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating</version>
+ <version>4.0.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-full</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/0ae1c3f5/jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
index dae74fd..16080b2 100644
--- a/jdbc/pom.xml
+++ b/jdbc/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating</version>
+ <version>4.0.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-jdbc</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/0ae1c3f5/mongodb/pom.xml
----------------------------------------------------------------------
diff --git a/mongodb/pom.xml b/mongodb/pom.xml
index be31432..45776d0 100644
--- a/mongodb/pom.xml
+++ b/mongodb/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating</version>
+ <version>4.0.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-mongodb</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/0ae1c3f5/openoffice/pom.xml
----------------------------------------------------------------------
diff --git a/openoffice/pom.xml b/openoffice/pom.xml
index 63f5dcc..47b14b8 100644
--- a/openoffice/pom.xml
+++ b/openoffice/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating</version>
+ <version>4.0.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-openoffice</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/0ae1c3f5/pojo/pom.xml
----------------------------------------------------------------------
diff --git a/pojo/pom.xml b/pojo/pom.xml
index 6f863c7..51b75c3 100644
--- a/pojo/pom.xml
+++ b/pojo/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating</version>
+ <version>4.0.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-pojo</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/0ae1c3f5/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 901d685..af08c22 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,8 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -41,11 +42,10 @@ under the License.
<url>https://git-wip-us.apache.org/repos/asf?p=incubator-metamodel.git</url>
<connection>scm:git:http://git-wip-us.apache.org/repos/asf/incubator-metamodel.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-metamodel.git</developerConnection>
- <tag>MetaModel-4.0.0-incubating</tag>
- </scm>
+ </scm>
<groupId>org.apache.metamodel</groupId>
<artifactId>MetaModel</artifactId>
- <version>4.0.0-incubating</version>
+ <version>4.0.0-incubating-SNAPSHOT</version>
<name>MetaModel</name>
<description>MetaModel is a library that encapsulates the differences and enhances
the capabilities of different datastores. Rich querying abilities are
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/0ae1c3f5/salesforce/pom.xml
----------------------------------------------------------------------
diff --git a/salesforce/pom.xml b/salesforce/pom.xml
index 8433e4c..bb043cb 100644
--- a/salesforce/pom.xml
+++ b/salesforce/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating</version>
+ <version>4.0.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-salesforce</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/0ae1c3f5/sugarcrm/pom.xml
----------------------------------------------------------------------
diff --git a/sugarcrm/pom.xml b/sugarcrm/pom.xml
index 07d1ad9..0f88f71 100644
--- a/sugarcrm/pom.xml
+++ b/sugarcrm/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating</version>
+ <version>4.0.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-sugarcrm</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/0ae1c3f5/xml/pom.xml
----------------------------------------------------------------------
diff --git a/xml/pom.xml b/xml/pom.xml
index ba762cb..a3fc371 100644
--- a/xml/pom.xml
+++ b/xml/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating</version>
+ <version>4.0.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-xml</artifactId>
[47/50] [abbrv] git commit: Updated and fixed typos in README file
Posted by ka...@apache.org.
Updated and fixed typos in README file
Project: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/commit/ea8dbeb2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/tree/ea8dbeb2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/diff/ea8dbeb2
Branch: refs/heads/hbase-module
Commit: ea8dbeb2ff1a8bf1ec4f9b1d21e624524040824f
Parents: b12c771
Author: Kasper Sørensen <i....@gmail.com>
Authored: Mon Jan 27 22:23:36 2014 +0100
Committer: Kasper Sørensen <i....@gmail.com>
Committed: Mon Jan 27 22:23:36 2014 +0100
----------------------------------------------------------------------
README | 33 +++++++++++++++++++++++----------
1 file changed, 23 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/ea8dbeb2/README
----------------------------------------------------------------------
diff --git a/README b/README
index f2a911c..bd62b69 100644
--- a/README
+++ b/README
@@ -1,21 +1,34 @@
-README file for Apache Metamodel
-===========================
+README file for Apache MetaModel
+================================
-MetaModel is a data access framework, providing a common interface for exploration and querying of different types of datastores.
+MetaModel is a data access framework, providing a common interface for
+exploration and querying of different types of datastores.
-Mail Lists
-=========
-Dev list dev@metamodel.incubator.apache.org
+Mailing lists
+=============
+
+Developer list: dev@metamodel.incubator.apache.org
+Commits list: commits@metamodel.incubator.apache.org
+
Website
=======
-http://incubator.apache.org/projects/metamodel.html
+http://metamodel.incubator.apache.org/
+
+
+Wiki
+====
+
+http://wiki.apache.org/metamodel/
+
+
+Building code
+=============
-Building Code
-==============
+MetaModel uses maven for build. So code can be built with:
-Metamodel uses maven for build. So code can be build by mvn clean install.
+> mvn clean install.
[07/50] [abbrv] git commit: Updated changes.txt in terms of
formatting (no tabs or newlines) and a few missing words.
Posted by ka...@apache.org.
Updated changes.txt in terms of formatting (no tabs or newlines) and a
few missing words.
Project: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/commit/136d446c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/tree/136d446c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/diff/136d446c
Branch: refs/heads/hbase-module
Commit: 136d446cc220ef988c19439b834c7f6a59de470f
Parents: 8b2cd47
Author: kaspers <ka...@kaspers-think.humaninference.com>
Authored: Wed Sep 25 12:03:36 2013 +0200
Committer: kaspers <ka...@kaspers-think.humaninference.com>
Committed: Wed Sep 25 12:03:36 2013 +0200
----------------------------------------------------------------------
CHANGES.txt | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/136d446c/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 01dcf03..b0cdfb8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,13 +1,13 @@
-4.0
-
- * [METAMODEL-9] - SalesforceDataSet is throwing exception for insert sql of record having date/time.
- * [METAMODEL-4] - Use folder name as schema name for file based DataContexts
- * [METAMODEL-5] - Faster CsvDataContext implementation for single-line values
- * [METAMODEL-26] - Provide endpoint URL with SalesforceDataContext
- * Upgraded Apache POI dependency to v. 3.9
- * Improved fluent Query builder API by adding string parameter based
- * Added a utility ObjectInputStream for deserializing legacy
- * Performance improvement to CSV reading when values are only single line
- * Setting up the project on apache infrastructure
- * [METAMODEL-10] - Exclude Jackcess dependency (Access module) from MetaModel
- * Renaming the package hierarchy from org.eobjects to org.apache
+4.0
+
+ * [METAMODEL-9] - SalesforceDataSet is throwing exception for insert sql of record having date/time.
+ * [METAMODEL-4] - Use folder name as schema name for file based DataContexts
+ * [METAMODEL-5] - Faster CsvDataContext implementation for single-line values
+ * [METAMODEL-26] - Provide endpoint URL with SalesforceDataContext
+ * Upgraded Apache POI dependency to v. 3.9
+ * Improved fluent Query builder API by adding string parameter based methods for joining tables
+ * Added a utility ObjectInputStream for deserializing legacy MetaModel objects
+ * Performance improvement to CSV reading when values are only single line based
+ * Setting up the project on apache infrastructure
+ * [METAMODEL-10] - Exclude Jackcess dependency (Access module) from MetaModel
+ * Renaming the package hierarchy from org.eobjects.metamodel to org.apache.metamodel
\ No newline at end of file
[42/50] [abbrv] METAMODEL-37: Removing old site sources
Posted by ka...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/58bdfce5/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
deleted file mode 100644
index b4df4ee..0000000
--- a/src/site/site.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<project xmlns="http://maven.apache.org/DECORATION/1.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd"
- name="MetaModel">
-
- <bannerLeft>
- <name>MetaModel</name>
- <href>index.html</href>
- </bannerLeft>
-
- <version position="none" />
-
- <body>
- <head>
- <link rel="stylesheet" href="styles.css" type="text/css" />
- </head>
-
- <menu name="About MetaModel">
- <item name="Home" href="index.html" />
- <item name="Project goals" href="goals.html" />
- <item name="News" href="http://eobjects.org/trac/blog/category/metamodel" target="_blank" />
- <item name="Database compliancy" href="database_compliancy.html" />
- <item name="Schema and table semantics" href="schema_and_table_semantics.html" />
- <item name="Projects that use MetaModel" href="project_cases.html" />
- <item name="FAQ" href="faq.html" />
- </menu>
-
- <menu name="See it (examples)">
- <item name="Traverse schema model" href="example_schema_traversal.html" />
- <item name="Simple queries to get started" href="example_simple_queries.html" />
- <item name="Compiled queries" href="example_compiled_queries.html" />
- <item name="Inserting data" href="example_inserting_data.html" />
- <item name="POJO datastores" href="example_pojo_datastores.html" />
- <item name="Connecting to Salesforce.com" href="example_salesforce_setup.html" />
- <item name="Composite DataContext" href="example_composite_datacontext.html" />
- <item name="Automatic type conversion" href="example_type_conversion.html" />
- <item name="Using interceptors" href="example_interceptors.html" />
- <item name="XML table mapping" href="example_xml_mapping.html" />
- </menu>
-
- <menu name="Use it">
- <item name="API Documentation" href="apidocs/" />
- <item name="Downloads" href="download.html" />
- <item name="License" href="license.html" />
- </menu>
-
- <menu name="Changes">
- <item name="What's new in 3.4?" href="whats_new_3.4.html" />
- <item name="What's new in 3.3?" href="whats_new_3.3.html" />
- <item name="What's new in 3.2?" href="whats_new_3.2.html" />
- <item name="What's new in 3.1?" href="whats_new_3.1.html" />
- <item name="What's new in 3.0?" href="whats_new_3.0.html" />
- <item name="What's new in 2.2?" href="whats_new_2.2.html" />
- <item name="What's new in 2.1?" href="whats_new_2.1.html" />
- <item name="What's new in 2.0?" href="whats_new_2.0.html" />
- <item name="What's new in 1.7?" href="whats_new_1.7.html" />
- <item name="What's new in 1.6?" href="whats_new_1.6.html" />
- <item name="What's new in 1.5?" href="whats_new_1.5.html" />
- </menu>
-
- <menu name="Develop it">
- <item name="Mailing list" href="http://groups.google.com/group/metamodel" target="_blank" />
- <item name="User forum" href="http://eobjects.org/trac/discussion/forum/7" target="_blank" />
- <item name="Source code" href="source-repository.html" />
- <item name="Issue tracking" href="issue-tracking.html" />
- </menu>
-
- </body>
-</project>
[10/50] [abbrv] git commit: Removed xml exclude from RAT plugin
execution.
Posted by ka...@apache.org.
Removed xml exclude from RAT plugin execution.
Project: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/commit/4a3ddf03
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/tree/4a3ddf03
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/diff/4a3ddf03
Branch: refs/heads/hbase-module
Commit: 4a3ddf03c8770705b8f1a7371c2de0892cb7837d
Parents: c54a170
Author: ak.ankitkumar@gmail.com <ak...@gmail.com>
Authored: Mon Sep 30 15:03:52 2013 +0200
Committer: ak.ankitkumar@gmail.com <ak...@gmail.com>
Committed: Mon Sep 30 15:03:52 2013 +0200
----------------------------------------------------------------------
pom.xml | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/4a3ddf03/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0e002b8..af08c22 100644
--- a/pom.xml
+++ b/pom.xml
@@ -198,8 +198,6 @@ under the License.
<exclude>.git/**</exclude>
<exclude>**/src/test/**</exclude>
<exclude>**/src/site/**</exclude>
-<!-- <exclude>**/*.xml/**</exclude>
- <exclude>**/*.xml*/**</exclude>-->
<exclude>**/.project</exclude>
<exclude>**/.classpath</exclude>
<exclude>**/.settings/**</exclude>
@@ -479,5 +477,4 @@ under the License.
</dependency>
</dependencies>
</dependencyManagement>
-
</project>
[06/50] [abbrv] git commit: Modified changes.txt as per comments
received from group members.
Posted by ka...@apache.org.
Modified changes.txt as per comments received from group members.
Project: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/commit/8b2cd47e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/tree/8b2cd47e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/diff/8b2cd47e
Branch: refs/heads/hbase-module
Commit: 8b2cd47e168d4f6e9322c534b3b5b5e25664d56b
Parents: 280ed98
Author: ak.ankitkumar@gmail.com <ak...@gmail.com>
Authored: Wed Sep 25 10:24:41 2013 +0200
Committer: ak.ankitkumar@gmail.com <ak...@gmail.com>
Committed: Wed Sep 25 10:24:41 2013 +0200
----------------------------------------------------------------------
CHANGES.txt | 27 ++-------------------------
1 file changed, 2 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/8b2cd47e/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 9ac849a..01dcf03 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,17 +1,6 @@
-Release 4.0 - 2013-09-20
+4.0
-Release Notes - Apache Metamodel - Version 4.0
-
-** Sub-task
-
-
-
-** Bug
- * [METAMODEL-9] - SalesforceDataSet is throwing exception for insert sql of record having date/time.
-
-
-
-** Improvement
+ * [METAMODEL-9] - SalesforceDataSet is throwing exception for insert sql of record having date/time.
* [METAMODEL-4] - Use folder name as schema name for file based DataContexts
* [METAMODEL-5] - Faster CsvDataContext implementation for single-line values
* [METAMODEL-26] - Provide endpoint URL with SalesforceDataContext
@@ -20,17 +9,5 @@ Release Notes - Apache Metamodel - Version 4.0
* Added a utility ObjectInputStream for deserializing legacy
* Performance improvement to CSV reading when values are only single line
* Setting up the project on apache infrastructure
-
-** New Feature
-
-
-
-** Task
* [METAMODEL-10] - Exclude Jackcess dependency (Access module) from MetaModel
* Renaming the package hierarchy from org.eobjects to org.apache
-
-
-
-
-** Wish
-
[03/50] [abbrv] git commit: Adding the Changes file
Posted by ka...@apache.org.
Adding the Changes file
Project: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/commit/3bd0e15b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/tree/3bd0e15b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/diff/3bd0e15b
Branch: refs/heads/hbase-module
Commit: 3bd0e15b69ea1a475768e7fe0d83f7adabfbd529
Parents: 7601f8e
Author: ak.ankitkumar@gmail.com <ak...@gmail.com>
Authored: Fri Sep 20 16:40:36 2013 +0200
Committer: ak.ankitkumar@gmail.com <ak...@gmail.com>
Committed: Fri Sep 20 16:40:36 2013 +0200
----------------------------------------------------------------------
CHANGES.txt | 36 ++++++++++++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/3bd0e15b/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
new file mode 100644
index 0000000..9ac849a
--- /dev/null
+++ b/CHANGES.txt
@@ -0,0 +1,36 @@
+Release 4.0 - 2013-09-20
+
+Release Notes - Apache Metamodel - Version 4.0
+
+** Sub-task
+
+
+
+** Bug
+ * [METAMODEL-9] - SalesforceDataSet is throwing exception for insert sql of record having date/time.
+
+
+
+** Improvement
+ * [METAMODEL-4] - Use folder name as schema name for file based DataContexts
+ * [METAMODEL-5] - Faster CsvDataContext implementation for single-line values
+ * [METAMODEL-26] - Provide endpoint URL with SalesforceDataContext
+ * Upgraded Apache POI dependency to v. 3.9
+ * Improved fluent Query builder API by adding string parameter based
+ * Added a utility ObjectInputStream for deserializing legacy
+ * Performance improvement to CSV reading when values are only single line
+ * Setting up the project on apache infrastructure
+
+** New Feature
+
+
+
+** Task
+ * [METAMODEL-10] - Exclude Jackcess dependency (Access module) from MetaModel
+ * Renaming the package hierarchy from org.eobjects to org.apache
+
+
+
+
+** Wish
+
[19/50] [abbrv] git commit: Adding the DEPENDENCIES exclude for RAT
plugin.
Posted by ka...@apache.org.
Adding the DEPENDENCIES exclude for RAT plugin.
Project: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/commit/69f7edc3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/tree/69f7edc3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/diff/69f7edc3
Branch: refs/heads/hbase-module
Commit: 69f7edc390b0cc7f9b9f96b94d568d77371fcbf6
Parents: ea419ba
Author: ankitkumar2711 <ak...@gmail.com>
Authored: Tue Nov 26 14:37:27 2013 +0100
Committer: ankitkumar2711 <ak...@gmail.com>
Committed: Tue Nov 26 14:37:27 2013 +0100
----------------------------------------------------------------------
pom.xml | 961 ++++++++++++++++++++++++++++++-----------------------------
1 file changed, 481 insertions(+), 480 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/69f7edc3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d9fc0ef..2e3d411 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,480 +1,481 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <sshwagon.version>2.3</sshwagon.version>
- <javadoc.version>2.9</javadoc.version>
- <slf4j.version>1.7.4</slf4j.version>
- <junit.version>4.11</junit.version>
- <easymock.version>3.1</easymock.version>
- <httpcomponents.version>4.2.3</httpcomponents.version>
- <!-- Version printed in the docs -->
- <siteDownloadVersion>${project.version}</siteDownloadVersion>
- <checksum-maven-plugin.version>1.2</checksum-maven-plugin.version>
- <skipTests>false</skipTests>
- </properties>
- <parent>
- <groupId>org.apache</groupId>
- <artifactId>apache</artifactId>
- <version>13</version>
- </parent>
- <scm>
- <url>https://git-wip-us.apache.org/repos/asf?p=incubator-metamodel.git</url>
- <connection>scm:git:http://git-wip-us.apache.org/repos/asf/incubator-metamodel.git</connection>
- <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-metamodel.git</developerConnection>
- <tag>HEAD</tag>
- </scm>
- <groupId>org.apache.metamodel</groupId>
- <artifactId>MetaModel</artifactId>
- <version>4.0.1-incubating-SNAPSHOT</version>
- <name>MetaModel</name>
- <description>MetaModel is a library that encapsulates the differences and enhances
- the capabilities of different datastores. Rich querying abilities are
- offered to datastores that do not otherwise support advanced querying
- and a unified view of the datastore structure is offered through a
- single model of the schemas, tables, columns and relationships.</description>
- <url>http://metamodel.incubator.apache.org</url>
- <inceptionYear>2007</inceptionYear>
- <packaging>pom</packaging>
- <modules>
- <module>core</module>
- <module>pojo</module>
- <module>fixedwidth</module>
- <module>excel</module>
- <module>csv</module>
- <module>xml</module>
- <module>jdbc</module>
- <module>mongodb</module>
- <module>couchdb</module>
- <module>openoffice</module>
- <module>salesforce</module>
- <module>sugarcrm</module>
- <module>full</module>
- </modules>
- <issueManagement>
- <system>Jira</system>
- <url>https://issues.apache.org/jira/browse/METAMODEL</url>
- </issueManagement>
- <mailingLists>
- <mailingList>
- <name>Development</name>
- <post>dev@metamodel.incubator.apache.org</post>
- <subscribe>dev-subscribe@metamodel.incubator.apache.org</subscribe>
- <unsubscribe>dev-unsubscribe@metamodel.incubator.apache.org</unsubscribe>
- <archive>http://mail-archives.apache.org/mod_mbox/incubator-metamodel-dev/</archive>
- </mailingList>
- <mailingList>
- <name>Commits</name>
- <post>commits@metamodel.incubator.apache.org</post>
- <subscribe>commits-subscribe@metamodel.incubator.apache.org</subscribe>
- <unsubscribe>commits-unsubscribe@metamodel.incubator.apache.org</unsubscribe>
- <archive>http://mail-archives.apache.org/mod_mbox/incubator-metamodel-commits/</archive>
- </mailingList>
- </mailingLists>
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
- <developers>
- <developer>
- <id>kasper</id>
- <name>Kasper Sørensen</name>
- <email>kasper.sorensen@humaninference.com</email>
- <url>http://kasper.eobjects.org</url>
- <organization>Human Inference</organization>
- <organizationUrl>http://www.humaninference.com</organizationUrl>
- </developer>
- </developers>
- <contributors>
- <contributor>
- <name>Saurabh Gupta</name>
- <organization>Xebia India</organization>
- </contributor>
- <contributor>
- <name>Balendra Singh</name>
- <organization>Xebia India</organization>
- </contributor>
- <contributor>
- <name>Sameer Arora</name>
- <organization>Xebia India</organization>
- </contributor>
- </contributors>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
- <distributionManagement>
- <repository>
- <id>apache.releases.https</id>
- <name>Apache Release Distribution Repository</name>
- <url>https://repository.apache.org/service/local/staging/deploy/maven2</url>
- </repository>
- <snapshotRepository>
- <id>apache.snapshots.https</id>
- <name>Apache Development Snapshot Repository</name>
- <url>https://repository.apache.org/content/repositories/snapshots</url>
- </snapshotRepository>
- </distributionManagement>
-
- <repositories>
- <repository>
- <id>apache.snapshots</id>
- <url>http://repository.apache.org/snapshots/</url>
- <name>Apache Snapshot Repo</name>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- </repositories>
-
- <build>
- <plugins>
- <plugin>
- <!-- Ensures java 6 compatibility -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- <encoding>utf-8</encoding>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <executions>
- <execution>
- <id>rat-verify</id>
- <phase>test</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <licenses>
- <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
- <licenseFamilyCategory>ASL20</licenseFamilyCategory>
- <licenseFamilyName>Apache Software License, 2.0</licenseFamilyName>
- <notes>Single licensed ASL v2.0</notes>
- <patterns>
- <pattern>Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.</pattern>
- </patterns>
- </license>
- </licenses>
- <excludeSubProjects>false</excludeSubProjects>
- <excludes>
- <exclude>CHANGES.txt</exclude>
- <exclude>README.txt</exclude>
- <exclude>NOTICE.txt</exclude>
- <exclude>LICENSE.txt</exclude>
- <exclude>KEYS</exclude>
- <exclude>**/.gitignore/**</exclude>
- <exclude>.git/**</exclude>
- <exclude>**/src/test/**</exclude>
- <exclude>**/src/site/**</exclude>
- <exclude>**/.project</exclude>
- <exclude>**/.classpath</exclude>
- <exclude>**/.settings/**</exclude>
- <exclude>**/target/**</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <!-- Ensure inclusion of license header in all main java files -->
- <groupId>com.google.code.maven-license-plugin</groupId>
- <artifactId>maven-license-plugin</artifactId>
- <version>1.4.0</version>
- <inherited>false</inherited>
- <configuration>
- <header>HEADER.txt</header>
- <aggregate>true</aggregate>
- <includes>
- <include>**/src/**/java/org/**</include>
- </includes>
- </configuration>
- <executions>
- <execution>
- <id>verify-license-headers</id>
- <phase>verify</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <autoVersionSubmodules>true</autoVersionSubmodules>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.sonar</groupId>
- <artifactId>sonar-maven3-plugin</artifactId>
- <version>2.8</version>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <version>2.5.2</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <dependencies>
- <dependency>
- <!-- Provide support for scp based deployment of site -->
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-ssh</artifactId>
- <version>${sshwagon.version}</version>
- </dependency>
- </dependencies>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <executions>
- <execution>
- <!-- create aggregate report when "mvn site" is invoked. -->
- <id>aggregate</id>
- <goals>
- <goal>aggregate</goal>
- </goals>
- <phase>site</phase>
- <configuration>
- <excludePackageNames>org.apache.metamodel.jdbc.dialects:org.apache.metamodel.detect</excludePackageNames>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>net.ju-n.maven.plugins</groupId>
- <artifactId>checksum-maven-plugin</artifactId>
- <version>${checksum-maven-plugin.version}</version>
- </plugin>
-
- <plugin>
- <!-- enforce certain banned dependencies -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <id>enforce-versions</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <bannedDependencies>
- <excludes>
- <exclude>commons-logging:commons-logging</exclude>
- </excludes>
- </bannedDependencies>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
-
- <extensions>
- <extension>
- <!-- Provide support for scp based deployment of site -->
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-ssh</artifactId>
- <version>${sshwagon.version}</version>
- </extension>
- </extensions>
-
- <pluginManagement>
- <plugins>
- <plugin>
- <!-- Ignore instructions for m2e (overrides eclipse warning) -->
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <versionRange>[1.0,)</versionRange>
- <goals>
- <goal>enforce</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore />
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>${javadoc.version}</version>
- <reportSets>
- <reportSet>
- <id>aggregate</id>
- <reports>
- <report>aggregate</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.6</version>
- <configuration>
- <dependencyDetailsEnabled>false</dependencyDetailsEnabled>
- <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>${httpcomponents.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>commons-logging</artifactId>
- <groupId>commons-logging</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
- <version>${httpcomponents.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient-cache</artifactId>
- <version>${httpcomponents.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.6</version>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.7</version>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>2.4</version>
- </dependency>
- <dependency>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
- <version>1.6</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-core-asl</artifactId>
- <version>1.9.12</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- <version>1.9.12</version>
- </dependency>
- <dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>1.8.0.10</version>
- </dependency>
-
- <!-- Test dependencies -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <version>${easymock.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-nop</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-</project>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <sshwagon.version>2.3</sshwagon.version>
+ <javadoc.version>2.9</javadoc.version>
+ <slf4j.version>1.7.4</slf4j.version>
+ <junit.version>4.11</junit.version>
+ <easymock.version>3.1</easymock.version>
+ <httpcomponents.version>4.2.3</httpcomponents.version>
+ <!-- Version printed in the docs -->
+ <siteDownloadVersion>${project.version}</siteDownloadVersion>
+ <checksum-maven-plugin.version>1.2</checksum-maven-plugin.version>
+ <skipTests>false</skipTests>
+ </properties>
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>13</version>
+ </parent>
+ <scm>
+ <url>https://git-wip-us.apache.org/repos/asf?p=incubator-metamodel.git</url>
+ <connection>scm:git:http://git-wip-us.apache.org/repos/asf/incubator-metamodel.git</connection>
+ <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-metamodel.git</developerConnection>
+ <tag>HEAD</tag>
+ </scm>
+ <groupId>org.apache.metamodel</groupId>
+ <artifactId>MetaModel</artifactId>
+ <version>4.0.1-incubating-SNAPSHOT</version>
+ <name>MetaModel</name>
+ <description>MetaModel is a library that encapsulates the differences and enhances
+ the capabilities of different datastores. Rich querying abilities are
+ offered to datastores that do not otherwise support advanced querying
+ and a unified view of the datastore structure is offered through a
+ single model of the schemas, tables, columns and relationships.</description>
+ <url>http://metamodel.incubator.apache.org</url>
+ <inceptionYear>2007</inceptionYear>
+ <packaging>pom</packaging>
+ <modules>
+ <module>core</module>
+ <module>pojo</module>
+ <module>fixedwidth</module>
+ <module>excel</module>
+ <module>csv</module>
+ <module>xml</module>
+ <module>jdbc</module>
+ <module>mongodb</module>
+ <module>couchdb</module>
+ <module>openoffice</module>
+ <module>salesforce</module>
+ <module>sugarcrm</module>
+ <module>full</module>
+ </modules>
+ <issueManagement>
+ <system>Jira</system>
+ <url>https://issues.apache.org/jira/browse/METAMODEL</url>
+ </issueManagement>
+ <mailingLists>
+ <mailingList>
+ <name>Development</name>
+ <post>dev@metamodel.incubator.apache.org</post>
+ <subscribe>dev-subscribe@metamodel.incubator.apache.org</subscribe>
+ <unsubscribe>dev-unsubscribe@metamodel.incubator.apache.org</unsubscribe>
+ <archive>http://mail-archives.apache.org/mod_mbox/incubator-metamodel-dev/</archive>
+ </mailingList>
+ <mailingList>
+ <name>Commits</name>
+ <post>commits@metamodel.incubator.apache.org</post>
+ <subscribe>commits-subscribe@metamodel.incubator.apache.org</subscribe>
+ <unsubscribe>commits-unsubscribe@metamodel.incubator.apache.org</unsubscribe>
+ <archive>http://mail-archives.apache.org/mod_mbox/incubator-metamodel-commits/</archive>
+ </mailingList>
+ </mailingLists>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ <developers>
+ <developer>
+ <id>kasper</id>
+ <name>Kasper Sørensen</name>
+ <email>kasper.sorensen@humaninference.com</email>
+ <url>http://kasper.eobjects.org</url>
+ <organization>Human Inference</organization>
+ <organizationUrl>http://www.humaninference.com</organizationUrl>
+ </developer>
+ </developers>
+ <contributors>
+ <contributor>
+ <name>Saurabh Gupta</name>
+ <organization>Xebia India</organization>
+ </contributor>
+ <contributor>
+ <name>Balendra Singh</name>
+ <organization>Xebia India</organization>
+ </contributor>
+ <contributor>
+ <name>Sameer Arora</name>
+ <organization>Xebia India</organization>
+ </contributor>
+ </contributors>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ <distributionManagement>
+ <repository>
+ <id>apache.releases.https</id>
+ <name>Apache Release Distribution Repository</name>
+ <url>https://repository.apache.org/service/local/staging/deploy/maven2</url>
+ </repository>
+ <snapshotRepository>
+ <id>apache.snapshots.https</id>
+ <name>Apache Development Snapshot Repository</name>
+ <url>https://repository.apache.org/content/repositories/snapshots</url>
+ </snapshotRepository>
+ </distributionManagement>
+
+ <repositories>
+ <repository>
+ <id>apache.snapshots</id>
+ <url>http://repository.apache.org/snapshots/</url>
+ <name>Apache Snapshot Repo</name>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </repository>
+ </repositories>
+
+ <build>
+ <plugins>
+ <plugin>
+ <!-- Ensures java 6 compatibility -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ <encoding>utf-8</encoding>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>rat-verify</id>
+ <phase>test</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <licenses>
+ <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
+ <licenseFamilyCategory>ASL20</licenseFamilyCategory>
+ <licenseFamilyName>Apache Software License, 2.0</licenseFamilyName>
+ <notes>Single licensed ASL v2.0</notes>
+ <patterns>
+ <pattern>Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.</pattern>
+ </patterns>
+ </license>
+ </licenses>
+ <excludeSubProjects>false</excludeSubProjects>
+ <excludes>
+ <exclude>CHANGES.txt</exclude>
+ <exclude>README.txt</exclude>
+ <exclude>NOTICE.txt</exclude>
+ <exclude>LICENSE.txt</exclude>
+ <exclude>KEYS</exclude>
+ <exclude>**/.gitignore/**</exclude>
+ <exclude>.git/**</exclude>
+ <exclude>**/src/test/**</exclude>
+ <exclude>**/src/site/**</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.settings/**</exclude>
+ <exclude>**/target/**</exclude>
+ <exclude>DEPENDENCIES</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <!-- Ensure inclusion of license header in all main java files -->
+ <groupId>com.google.code.maven-license-plugin</groupId>
+ <artifactId>maven-license-plugin</artifactId>
+ <version>1.4.0</version>
+ <inherited>false</inherited>
+ <configuration>
+ <header>HEADER.txt</header>
+ <aggregate>true</aggregate>
+ <includes>
+ <include>**/src/**/java/org/**</include>
+ </includes>
+ </configuration>
+ <executions>
+ <execution>
+ <id>verify-license-headers</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.sonar</groupId>
+ <artifactId>sonar-maven3-plugin</artifactId>
+ <version>2.8</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ <version>2.5.2</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <!-- Provide support for scp based deployment of site -->
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-ssh</artifactId>
+ <version>${sshwagon.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <!-- create aggregate report when "mvn site" is invoked. -->
+ <id>aggregate</id>
+ <goals>
+ <goal>aggregate</goal>
+ </goals>
+ <phase>site</phase>
+ <configuration>
+ <excludePackageNames>org.apache.metamodel.jdbc.dialects:org.apache.metamodel.detect</excludePackageNames>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>net.ju-n.maven.plugins</groupId>
+ <artifactId>checksum-maven-plugin</artifactId>
+ <version>${checksum-maven-plugin.version}</version>
+ </plugin>
+
+ <plugin>
+ <!-- enforce certain banned dependencies -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enforce-versions</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <bannedDependencies>
+ <excludes>
+ <exclude>commons-logging:commons-logging</exclude>
+ </excludes>
+ </bannedDependencies>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ </plugins>
+
+ <extensions>
+ <extension>
+ <!-- Provide support for scp based deployment of site -->
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-ssh</artifactId>
+ <version>${sshwagon.version}</version>
+ </extension>
+ </extensions>
+
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <!-- Ignore instructions for m2e (overrides eclipse warning) -->
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <versionRange>[1.0,)</versionRange>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>${javadoc.version}</version>
+ <reportSets>
+ <reportSet>
+ <id>aggregate</id>
+ <reports>
+ <report>aggregate</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.6</version>
+ <configuration>
+ <dependencyDetailsEnabled>false</dependencyDetailsEnabled>
+ <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>${httpcomponents.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>commons-logging</artifactId>
+ <groupId>commons-logging</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ <version>${httpcomponents.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient-cache</artifactId>
+ <version>${httpcomponents.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.6</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.7</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.4</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <version>1.6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core-asl</artifactId>
+ <version>1.9.12</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ <version>1.9.12</version>
+ </dependency>
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>1.8.0.10</version>
+ </dependency>
+
+ <!-- Test dependencies -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>${easymock.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-nop</artifactId>
+ <version>${slf4j.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+</project>
[38/50] [abbrv] git commit: Improvement to javadoc
Posted by ka...@apache.org.
Improvement to javadoc
Project: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/commit/f8f57360
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/tree/f8f57360
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/diff/f8f57360
Branch: refs/heads/hbase-module
Commit: f8f57360b517eabf5a43a6642cdda9dbc71e5c80
Parents: 9eb49ab
Author: Kasper Sørensen <i....@gmail.com>
Authored: Wed Jan 15 10:23:43 2014 +0100
Committer: Kasper Sørensen <i....@gmail.com>
Committed: Wed Jan 15 10:23:43 2014 +0100
----------------------------------------------------------------------
.../org/apache/metamodel/spring/DataContextFactoryBean.java | 7 ++++++-
.../metamodel/spring/DataContextFactoryBeanDelegate.java | 5 ++++-
2 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/f8f57360/spring/src/main/java/org/apache/metamodel/spring/DataContextFactoryBean.java
----------------------------------------------------------------------
diff --git a/spring/src/main/java/org/apache/metamodel/spring/DataContextFactoryBean.java b/spring/src/main/java/org/apache/metamodel/spring/DataContextFactoryBean.java
index 9d35d57..9461891 100644
--- a/spring/src/main/java/org/apache/metamodel/spring/DataContextFactoryBean.java
+++ b/spring/src/main/java/org/apache/metamodel/spring/DataContextFactoryBean.java
@@ -76,7 +76,12 @@ public class DataContextFactoryBean implements FactoryBean<DataContext> {
throw new UnsupportedOperationException("Unsupported DataContext type: " + _type);
}
- return delegate.createDataContext(this);
+ final DataContext dataContext = delegate.createDataContext(this);
+ if (dataContext == null) {
+ throw new IllegalStateException("Factory method failed to produce a non-null DataContext instance");
+ }
+
+ return dataContext;
}
private DataContextFactoryBeanDelegate createDelegateFromType() {
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/f8f57360/spring/src/main/java/org/apache/metamodel/spring/DataContextFactoryBeanDelegate.java
----------------------------------------------------------------------
diff --git a/spring/src/main/java/org/apache/metamodel/spring/DataContextFactoryBeanDelegate.java b/spring/src/main/java/org/apache/metamodel/spring/DataContextFactoryBeanDelegate.java
index dd98066..625870f 100644
--- a/spring/src/main/java/org/apache/metamodel/spring/DataContextFactoryBeanDelegate.java
+++ b/spring/src/main/java/org/apache/metamodel/spring/DataContextFactoryBeanDelegate.java
@@ -37,7 +37,10 @@ public interface DataContextFactoryBeanDelegate {
* Creates the particular {@link DataContext} object.
*
* @param bean
- * @return
+ * the {@link DataContextFactoryBean} with properties set as per
+ * the spring configuration.
+ * @return a non-null {@link DataContext} object, built with the properties
+ * set on the {@link DataContextFactoryBean}
*/
public DataContext createDataContext(DataContextFactoryBean bean);
}
[49/50] [abbrv] git commit: Added license to POM
Posted by ka...@apache.org.
Added license to POM
Project: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/commit/f530e638
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/tree/f530e638
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/diff/f530e638
Branch: refs/heads/hbase-module
Commit: f530e638bb93be90a896d39924a8bc78a1c2bd3b
Parents: 346524a
Author: Kasper Sørensen <i....@gmail.com>
Authored: Tue Jan 28 22:06:21 2014 +0100
Committer: Kasper Sørensen <i....@gmail.com>
Committed: Tue Jan 28 22:06:21 2014 +0100
----------------------------------------------------------------------
hbase/pom.xml | 21 ++++++++++++++++++++-
1 file changed, 20 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/f530e638/hbase/pom.xml
----------------------------------------------------------------------
diff --git a/hbase/pom.xml b/hbase/pom.xml
index 382d116..66a9344 100644
--- a/hbase/pom.xml
+++ b/hbase/pom.xml
@@ -1,9 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>3.4.4</version>
+ <version>4.0.1-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-hbase</artifactId>
[33/50] [abbrv] git commit: Added initial draft of
DataContextFactoryBean with support for JDBC, CSV and Excel
Posted by ka...@apache.org.
Added initial draft of DataContextFactoryBean with support for JDBC, CSV
and Excel
Project: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/commit/f387893c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/tree/f387893c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/diff/f387893c
Branch: refs/heads/hbase-module
Commit: f387893c5e1e0333371f0760650b74a76117b589
Parents: f8a4e8f
Author: Kasper Sørensen <i....@gmail.com>
Authored: Sun Jan 5 19:35:32 2014 +0100
Committer: Kasper Sørensen <i....@gmail.com>
Committed: Sun Jan 5 19:35:32 2014 +0100
----------------------------------------------------------------------
pom.xml | 19 ++
spring/.gitignore | 4 +
spring/pom.xml | 6 +
.../spring/DataContextFactoryBean.java | 207 +++++++++++++++++++
.../apache/metamodel/spring/SpringResource.java | 115 +++++++++++
5 files changed, 351 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/f387893c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 40b871c..f7c846a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -319,6 +319,25 @@ under the License.
<ignore />
</action>
</pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>
+ org.apache.rat
+ </groupId>
+ <artifactId>
+ apache-rat-plugin
+ </artifactId>
+ <versionRange>
+ [0.8,)
+ </versionRange>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/f387893c/spring/.gitignore
----------------------------------------------------------------------
diff --git a/spring/.gitignore b/spring/.gitignore
new file mode 100644
index 0000000..954270f
--- /dev/null
+++ b/spring/.gitignore
@@ -0,0 +1,4 @@
+/.settings
+/target
+/.classpath
+/.project
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/f387893c/spring/pom.xml
----------------------------------------------------------------------
diff --git a/spring/pom.xml b/spring/pom.xml
index 6c8c355..bb1e6ec 100644
--- a/spring/pom.xml
+++ b/spring/pom.xml
@@ -39,6 +39,12 @@ under the License.
<version>${project.version}</version>
<optional>true</optional>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>3.0.7.RELEASE</version>
+ <scope>provided</scope>
+ </dependency>
<!-- test -->
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/f387893c/spring/src/main/java/org/apache/metamodel/spring/DataContextFactoryBean.java
----------------------------------------------------------------------
diff --git a/spring/src/main/java/org/apache/metamodel/spring/DataContextFactoryBean.java b/spring/src/main/java/org/apache/metamodel/spring/DataContextFactoryBean.java
new file mode 100644
index 0000000..c231126
--- /dev/null
+++ b/spring/src/main/java/org/apache/metamodel/spring/DataContextFactoryBean.java
@@ -0,0 +1,207 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.metamodel.spring;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+
+import javax.sql.DataSource;
+
+import org.apache.metamodel.DataContext;
+import org.apache.metamodel.csv.CsvConfiguration;
+import org.apache.metamodel.csv.CsvDataContext;
+import org.apache.metamodel.excel.ExcelConfiguration;
+import org.apache.metamodel.excel.ExcelDataContext;
+import org.apache.metamodel.jdbc.JdbcDataContext;
+import org.apache.metamodel.schema.TableType;
+import org.apache.metamodel.util.BooleanComparator;
+import org.apache.metamodel.util.FileHelper;
+import org.apache.metamodel.util.FileResource;
+import org.apache.metamodel.util.Resource;
+import org.apache.metamodel.util.UrlResource;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
+import org.springframework.beans.factory.FactoryBean;
+
+/**
+ * A spring {@link FactoryBean} that produces MetaModel {@link DataContext}
+ * objects based on property values that will typically be injected by the
+ * Spring configuration.
+ */
+public class DataContextFactoryBean implements FactoryBean<DataContext> {
+
+ private static final Logger logger = LoggerFactory.getLogger(DataContextFactoryBean.class);
+
+ private String _type;
+ private org.springframework.core.io.Resource _resource;
+ private String _filename;
+ private String _url;
+ private String _columnNameLineNumber;
+ private String _skipEmptyLines;
+ private String _skipEmptyColumns;
+ private String _encoding;
+ private String _separatorChar;
+ private String _quoteChar;
+ private String _escapeChar;
+ private String _failOnInconsistentRowLength;
+ private String _multilineValues;
+ private TableType[] _tableTypes;
+ private String _catalogName;
+ private DataSource _dataSource;
+ private String _username;
+ private String _password;
+ private String _driverClassName;
+
+ @Override
+ public DataContext getObject() throws Exception {
+ String type = _type == null ? "" : _type.toLowerCase();
+ if ("csv".equals(type)) {
+ return createCsvDataContext();
+ } else if ("excel".equals(type)) {
+ return createExcelDataContext();
+ } else if ("jdbc".equals(type)) {
+ return createJdbcDataContext();
+ }
+
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ private DataContext createJdbcDataContext() {
+ TableType[] tableTypes = _tableTypes;
+ if (tableTypes == null) {
+ tableTypes = TableType.DEFAULT_TABLE_TYPES;
+ }
+
+ if (_dataSource == null) {
+ final String driverClassName = getString(_driverClassName, null);
+ if (driverClassName != null) {
+ try {
+ Class.forName(driverClassName);
+ } catch (ClassNotFoundException e) {
+ logger.error("Failed to initialize JDBC driver class '" + driverClassName + "'!", e);
+ }
+ }
+
+ final Connection connection;
+ try {
+ if (_username == null && _password == null) {
+ connection = DriverManager.getConnection(_url);
+ } else {
+ connection = DriverManager.getConnection(_url, _username, _password);
+ }
+ } catch (Exception e) {
+ logger.error("Failed to get JDBC connection using URL: " + _url, e);
+ throw new IllegalStateException("Failed to get JDBC connection", e);
+ }
+
+ return new JdbcDataContext(connection, tableTypes, _catalogName);
+ }
+
+ return new JdbcDataContext(_dataSource, tableTypes, _catalogName);
+ }
+
+ private DataContext createExcelDataContext() {
+ final int columnNameLineNumber = getInt(_columnNameLineNumber, ExcelConfiguration.DEFAULT_COLUMN_NAME_LINE);
+ final boolean skipEmptyLines = getBoolean(_skipEmptyLines, true);
+ final boolean skipEmptyColumns = getBoolean(_skipEmptyColumns, false);
+ final ExcelConfiguration configuration = new ExcelConfiguration(columnNameLineNumber, skipEmptyLines,
+ skipEmptyColumns);
+ return new ExcelDataContext(getResourceInternal(), configuration);
+ }
+
+ private DataContext createCsvDataContext() {
+ final int columnNameLineNumber = getInt(_columnNameLineNumber, CsvConfiguration.DEFAULT_COLUMN_NAME_LINE);
+ final String encoding = getString(_encoding, FileHelper.DEFAULT_ENCODING);
+ final char separatorChar = getChar(_separatorChar, CsvConfiguration.DEFAULT_SEPARATOR_CHAR);
+ final char quoteChar = getChar(_quoteChar, CsvConfiguration.DEFAULT_QUOTE_CHAR);
+ final char escapeChar = getChar(_escapeChar, CsvConfiguration.DEFAULT_ESCAPE_CHAR);
+ final boolean failOnInconsistentRowLength = getBoolean(_failOnInconsistentRowLength, false);
+ final boolean multilineValues = getBoolean(_multilineValues, true);
+ final CsvConfiguration configuration = new CsvConfiguration(columnNameLineNumber, encoding, separatorChar,
+ quoteChar, escapeChar, failOnInconsistentRowLength, multilineValues);
+ return new CsvDataContext(getResourceInternal(), configuration);
+ }
+
+ private Resource getResourceInternal() {
+ if (_resource != null) {
+ return new SpringResource(_resource);
+ } else if (_filename != null) {
+ return new FileResource(_filename);
+ } else if (_url != null) {
+ return new UrlResource(_url);
+ }
+ return null;
+ }
+
+ @Override
+ public Class<DataContext> getObjectType() {
+ return DataContext.class;
+ }
+
+ @Override
+ public boolean isSingleton() {
+ return false;
+ }
+
+ private int getInt(String value, int ifNull) {
+ if (value == null) {
+ return ifNull;
+ }
+ value = value.trim();
+ if (value.isEmpty()) {
+ return ifNull;
+ }
+ return Integer.parseInt(value);
+ }
+
+ private String getString(String value, String ifNull) {
+ if (value == null) {
+ return ifNull;
+ }
+ value = value.trim();
+ if (value.isEmpty()) {
+ return ifNull;
+ }
+ return value;
+ }
+
+ private char getChar(String value, char ifNull) {
+ if (value == null) {
+ return ifNull;
+ }
+ value = value.trim();
+ if (value.isEmpty()) {
+ return ifNull;
+ }
+ // TODO: Check special strings like "
+ return value.charAt(0);
+ }
+
+ private boolean getBoolean(String value, boolean ifNull) {
+ if (value == null) {
+ return ifNull;
+ }
+ value = value.trim();
+ if (value.isEmpty()) {
+ return ifNull;
+ }
+ return BooleanComparator.parseBoolean(value);
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/f387893c/spring/src/main/java/org/apache/metamodel/spring/SpringResource.java
----------------------------------------------------------------------
diff --git a/spring/src/main/java/org/apache/metamodel/spring/SpringResource.java b/spring/src/main/java/org/apache/metamodel/spring/SpringResource.java
new file mode 100644
index 0000000..2b0f532
--- /dev/null
+++ b/spring/src/main/java/org/apache/metamodel/spring/SpringResource.java
@@ -0,0 +1,115 @@
+package org.apache.metamodel.spring;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+import org.apache.metamodel.util.Action;
+import org.apache.metamodel.util.FileHelper;
+import org.apache.metamodel.util.Func;
+import org.apache.metamodel.util.Resource;
+import org.apache.metamodel.util.ResourceException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * A {@link Resource} implementation based on spring's similar
+ * {@link org.springframework.core.io.Resource} concept.
+ */
+public class SpringResource implements Resource {
+
+ private static final Logger logger = LoggerFactory.getLogger(SpringResource.class);
+
+ private final org.springframework.core.io.Resource _resource;
+
+ public SpringResource(org.springframework.core.io.Resource resource) {
+ _resource = resource;
+ }
+
+ @Override
+ public void append(Action<OutputStream> arg0) throws ResourceException {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public long getLastModified() {
+ try {
+ return _resource.lastModified();
+ } catch (IOException e) {
+ logger.warn("Failed to get last modified date of resource: " + _resource, e);
+ return -1;
+ }
+ }
+
+ @Override
+ public String getName() {
+ return _resource.getFilename();
+ }
+
+ @Override
+ public String getQualifiedPath() {
+ try {
+ return _resource.getURI().toString();
+ } catch (IOException e) {
+ throw new IllegalStateException("Failed to get URI of resource: " + _resource, e);
+ }
+ }
+
+ @Override
+ public long getSize() {
+ try {
+ return _resource.contentLength();
+ } catch (IOException e) {
+ throw new IllegalStateException("Failed to get content length of resource: " + _resource, e);
+ }
+ }
+
+ @Override
+ public boolean isExists() {
+ return _resource.exists();
+ }
+
+ @Override
+ public boolean isReadOnly() {
+ return true;
+ }
+
+ @Override
+ public InputStream read() throws ResourceException {
+ try {
+ return _resource.getInputStream();
+ } catch (IOException e) {
+ throw new IllegalStateException("Failed to get input stream of resource: " + _resource, e);
+ }
+ }
+
+ @Override
+ public void read(Action<InputStream> action) throws ResourceException {
+ final InputStream in = read();
+ try {
+ action.run(in);
+ } catch (Exception e) {
+ throw new ResourceException(this, "Error occurred in read callback", e);
+ } finally {
+ FileHelper.safeClose(in);
+ }
+ }
+
+ @Override
+ public <E> E read(Func<InputStream, E> func) throws ResourceException {
+ final InputStream in = read();
+ try {
+ return func.eval(in);
+ } catch (Exception e) {
+ throw new ResourceException(this, "Error occurred in read callback", e);
+ } finally {
+ FileHelper.safeClose(in);
+ }
+ }
+
+ @Override
+ public void write(Action<OutputStream> arg0) throws ResourceException {
+ throw new UnsupportedOperationException();
+ }
+
+}
[48/50] [abbrv] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-metamodel.git into
hbase-module
Posted by ka...@apache.org.
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/hbase-module
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>
[04/50] [abbrv] git commit: Exclusions in RAT plugin.
Posted by ka...@apache.org.
Exclusions in RAT plugin.
Project: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/commit/53ee770b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/tree/53ee770b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/diff/53ee770b
Branch: refs/heads/hbase-module
Commit: 53ee770b0078f242724259d667f9ca8871c60652
Parents: 3bd0e15
Author: ak.ankitkumar@gmail.com <ak...@gmail.com>
Authored: Fri Sep 20 17:05:19 2013 +0200
Committer: ak.ankitkumar@gmail.com <ak...@gmail.com>
Committed: Fri Sep 20 17:05:19 2013 +0200
----------------------------------------------------------------------
pom.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/53ee770b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3ed9936..78ac8fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -182,6 +182,7 @@
<exclude>**/src/test/**</exclude>
<exclude>**/src/site/**</exclude>
<exclude>**/*.xml/**</exclude>
+ <exclude>**/*.xml*/**</exclude>
<exclude>**/*.wsdl/**</exclude>
<exclude>**/*.xsd/**</exclude>
<exclude>**/.project</exclude>
[17/50] [abbrv] git commit: [maven-release-plugin] prepare for next
development iteration
Posted by ka...@apache.org.
[maven-release-plugin] prepare for next development iteration
Project: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/commit/ea419bac
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/tree/ea419bac
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/diff/ea419bac
Branch: refs/heads/hbase-module
Commit: ea419bacf33b2da98c40755a8c1b95ba6672f86e
Parents: 6144c22
Author: ak.ankitkumar@gmail.com <ak...@gmail.com>
Authored: Fri Nov 15 13:38:55 2013 +0100
Committer: ak.ankitkumar@gmail.com <ak...@gmail.com>
Committed: Fri Nov 15 13:38:55 2013 +0100
----------------------------------------------------------------------
core/pom.xml | 2 +-
couchdb/pom.xml | 2 +-
csv/pom.xml | 2 +-
excel/pom.xml | 2 +-
fixedwidth/pom.xml | 2 +-
full/pom.xml | 2 +-
jdbc/pom.xml | 2 +-
mongodb/pom.xml | 2 +-
openoffice/pom.xml | 2 +-
pojo/pom.xml | 2 +-
pom.xml | 4 ++--
salesforce/pom.xml | 2 +-
sugarcrm/pom.xml | 2 +-
xml/pom.xml | 2 +-
14 files changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/ea419bac/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 8a925a3..dd8fc8a 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating</version>
+ <version>4.0.1-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-core</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/ea419bac/couchdb/pom.xml
----------------------------------------------------------------------
diff --git a/couchdb/pom.xml b/couchdb/pom.xml
index 8cb1e77..2f0d35d 100644
--- a/couchdb/pom.xml
+++ b/couchdb/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating</version>
+ <version>4.0.1-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-couchdb</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/ea419bac/csv/pom.xml
----------------------------------------------------------------------
diff --git a/csv/pom.xml b/csv/pom.xml
index b17af3b..99b55e0 100644
--- a/csv/pom.xml
+++ b/csv/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating</version>
+ <version>4.0.1-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-csv</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/ea419bac/excel/pom.xml
----------------------------------------------------------------------
diff --git a/excel/pom.xml b/excel/pom.xml
index 86a5e41..3a9cdda 100644
--- a/excel/pom.xml
+++ b/excel/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating</version>
+ <version>4.0.1-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-excel</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/ea419bac/fixedwidth/pom.xml
----------------------------------------------------------------------
diff --git a/fixedwidth/pom.xml b/fixedwidth/pom.xml
index 3d38d58..ccae638 100644
--- a/fixedwidth/pom.xml
+++ b/fixedwidth/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating</version>
+ <version>4.0.1-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-fixedwidth</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/ea419bac/full/pom.xml
----------------------------------------------------------------------
diff --git a/full/pom.xml b/full/pom.xml
index 90c1547..97d299c 100644
--- a/full/pom.xml
+++ b/full/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating</version>
+ <version>4.0.1-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-full</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/ea419bac/jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
index dae74fd..348092f 100644
--- a/jdbc/pom.xml
+++ b/jdbc/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating</version>
+ <version>4.0.1-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-jdbc</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/ea419bac/mongodb/pom.xml
----------------------------------------------------------------------
diff --git a/mongodb/pom.xml b/mongodb/pom.xml
index be31432..f94a644 100644
--- a/mongodb/pom.xml
+++ b/mongodb/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating</version>
+ <version>4.0.1-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-mongodb</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/ea419bac/openoffice/pom.xml
----------------------------------------------------------------------
diff --git a/openoffice/pom.xml b/openoffice/pom.xml
index 63f5dcc..1220ad9 100644
--- a/openoffice/pom.xml
+++ b/openoffice/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating</version>
+ <version>4.0.1-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-openoffice</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/ea419bac/pojo/pom.xml
----------------------------------------------------------------------
diff --git a/pojo/pom.xml b/pojo/pom.xml
index 6f863c7..e0d6b95 100644
--- a/pojo/pom.xml
+++ b/pojo/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating</version>
+ <version>4.0.1-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-pojo</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/ea419bac/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 901d685..d9fc0ef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,11 +41,11 @@ under the License.
<url>https://git-wip-us.apache.org/repos/asf?p=incubator-metamodel.git</url>
<connection>scm:git:http://git-wip-us.apache.org/repos/asf/incubator-metamodel.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-metamodel.git</developerConnection>
- <tag>MetaModel-4.0.0-incubating</tag>
+ <tag>HEAD</tag>
</scm>
<groupId>org.apache.metamodel</groupId>
<artifactId>MetaModel</artifactId>
- <version>4.0.0-incubating</version>
+ <version>4.0.1-incubating-SNAPSHOT</version>
<name>MetaModel</name>
<description>MetaModel is a library that encapsulates the differences and enhances
the capabilities of different datastores. Rich querying abilities are
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/ea419bac/salesforce/pom.xml
----------------------------------------------------------------------
diff --git a/salesforce/pom.xml b/salesforce/pom.xml
index 8433e4c..faf4d3e 100644
--- a/salesforce/pom.xml
+++ b/salesforce/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating</version>
+ <version>4.0.1-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-salesforce</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/ea419bac/sugarcrm/pom.xml
----------------------------------------------------------------------
diff --git a/sugarcrm/pom.xml b/sugarcrm/pom.xml
index 07d1ad9..0162d98 100644
--- a/sugarcrm/pom.xml
+++ b/sugarcrm/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating</version>
+ <version>4.0.1-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-sugarcrm</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/ea419bac/xml/pom.xml
----------------------------------------------------------------------
diff --git a/xml/pom.xml b/xml/pom.xml
index ba762cb..99b07bb 100644
--- a/xml/pom.xml
+++ b/xml/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating</version>
+ <version>4.0.1-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-xml</artifactId>
[28/50] [abbrv] git commit: [maven-release-plugin] prepare release
MetaModel-4.0.0-incubating
Posted by ka...@apache.org.
[maven-release-plugin] prepare release MetaModel-4.0.0-incubating
Project: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/commit/ab4326a8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/tree/ab4326a8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/diff/ab4326a8
Branch: refs/heads/hbase-module
Commit: ab4326a8a329804ad9846de904ca0fb657e5736e
Parents: 37bd0d6
Author: ankitkumar2711 <ak...@gmail.com>
Authored: Tue Dec 3 15:33:59 2013 +0100
Committer: ankitkumar2711 <ak...@gmail.com>
Committed: Tue Dec 3 15:33:59 2013 +0100
----------------------------------------------------------------------
core/pom.xml | 2 +-
couchdb/pom.xml | 2 +-
csv/pom.xml | 2 +-
excel/pom.xml | 2 +-
fixedwidth/pom.xml | 2 +-
full/pom.xml | 2 +-
jdbc/pom.xml | 2 +-
mongodb/pom.xml | 2 +-
openoffice/pom.xml | 2 +-
pojo/pom.xml | 2 +-
pom.xml | 4 ++--
salesforce/pom.xml | 2 +-
sugarcrm/pom.xml | 2 +-
xml/pom.xml | 2 +-
14 files changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/ab4326a8/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index dd8fc8a..8a925a3 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.1-incubating-SNAPSHOT</version>
+ <version>4.0.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-core</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/ab4326a8/couchdb/pom.xml
----------------------------------------------------------------------
diff --git a/couchdb/pom.xml b/couchdb/pom.xml
index 2f0d35d..8cb1e77 100644
--- a/couchdb/pom.xml
+++ b/couchdb/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.1-incubating-SNAPSHOT</version>
+ <version>4.0.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-couchdb</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/ab4326a8/csv/pom.xml
----------------------------------------------------------------------
diff --git a/csv/pom.xml b/csv/pom.xml
index 99b55e0..b17af3b 100644
--- a/csv/pom.xml
+++ b/csv/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.1-incubating-SNAPSHOT</version>
+ <version>4.0.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-csv</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/ab4326a8/excel/pom.xml
----------------------------------------------------------------------
diff --git a/excel/pom.xml b/excel/pom.xml
index 3a9cdda..86a5e41 100644
--- a/excel/pom.xml
+++ b/excel/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.1-incubating-SNAPSHOT</version>
+ <version>4.0.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-excel</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/ab4326a8/fixedwidth/pom.xml
----------------------------------------------------------------------
diff --git a/fixedwidth/pom.xml b/fixedwidth/pom.xml
index ccae638..3d38d58 100644
--- a/fixedwidth/pom.xml
+++ b/fixedwidth/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.1-incubating-SNAPSHOT</version>
+ <version>4.0.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-fixedwidth</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/ab4326a8/full/pom.xml
----------------------------------------------------------------------
diff --git a/full/pom.xml b/full/pom.xml
index 97d299c..90c1547 100644
--- a/full/pom.xml
+++ b/full/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.1-incubating-SNAPSHOT</version>
+ <version>4.0.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-full</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/ab4326a8/jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
index 348092f..dae74fd 100644
--- a/jdbc/pom.xml
+++ b/jdbc/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.1-incubating-SNAPSHOT</version>
+ <version>4.0.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-jdbc</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/ab4326a8/mongodb/pom.xml
----------------------------------------------------------------------
diff --git a/mongodb/pom.xml b/mongodb/pom.xml
index f94a644..be31432 100644
--- a/mongodb/pom.xml
+++ b/mongodb/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.1-incubating-SNAPSHOT</version>
+ <version>4.0.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-mongodb</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/ab4326a8/openoffice/pom.xml
----------------------------------------------------------------------
diff --git a/openoffice/pom.xml b/openoffice/pom.xml
index 1220ad9..63f5dcc 100644
--- a/openoffice/pom.xml
+++ b/openoffice/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.1-incubating-SNAPSHOT</version>
+ <version>4.0.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-openoffice</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/ab4326a8/pojo/pom.xml
----------------------------------------------------------------------
diff --git a/pojo/pom.xml b/pojo/pom.xml
index e0d6b95..6f863c7 100644
--- a/pojo/pom.xml
+++ b/pojo/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.1-incubating-SNAPSHOT</version>
+ <version>4.0.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-pojo</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/ab4326a8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2112961..8289d9d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,11 +41,11 @@ under the License.
<url>https://git-wip-us.apache.org/repos/asf?p=incubator-metamodel.git</url>
<connection>scm:git:http://git-wip-us.apache.org/repos/asf/incubator-metamodel.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-metamodel.git</developerConnection>
- <tag>HEAD</tag>
+ <tag>MetaModel-4.0.0-incubating</tag>
</scm>
<groupId>org.apache.metamodel</groupId>
<artifactId>MetaModel</artifactId>
- <version>4.0.1-incubating-SNAPSHOT</version>
+ <version>4.0.0-incubating</version>
<name>MetaModel</name>
<description>MetaModel is a library that encapsulates the differences and enhances
the capabilities of different datastores. Rich querying abilities are
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/ab4326a8/salesforce/pom.xml
----------------------------------------------------------------------
diff --git a/salesforce/pom.xml b/salesforce/pom.xml
index faf4d3e..8433e4c 100644
--- a/salesforce/pom.xml
+++ b/salesforce/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.1-incubating-SNAPSHOT</version>
+ <version>4.0.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-salesforce</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/ab4326a8/sugarcrm/pom.xml
----------------------------------------------------------------------
diff --git a/sugarcrm/pom.xml b/sugarcrm/pom.xml
index 0162d98..07d1ad9 100644
--- a/sugarcrm/pom.xml
+++ b/sugarcrm/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.1-incubating-SNAPSHOT</version>
+ <version>4.0.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-sugarcrm</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/ab4326a8/xml/pom.xml
----------------------------------------------------------------------
diff --git a/xml/pom.xml b/xml/pom.xml
index 99b07bb..ba762cb 100644
--- a/xml/pom.xml
+++ b/xml/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.1-incubating-SNAPSHOT</version>
+ <version>4.0.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-xml</artifactId>
[31/50] [abbrv] git commit: METAMODEL-33: Limited the exclusion of
rat plugin. Added license headers to integrationtest classes.
Posted by ka...@apache.org.
METAMODEL-33: Limited the exclusion of rat plugin. Added license headers
to integrationtest classes.
Project: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/commit/4841d1b4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/tree/4841d1b4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/diff/4841d1b4
Branch: refs/heads/hbase-module
Commit: 4841d1b44d088fd3a09122d984b991b972912d23
Parents: c26a797
Author: Kasper Sørensen <i....@gmail.com>
Authored: Fri Dec 27 09:38:21 2013 +0100
Committer: Kasper Sørensen <i....@gmail.com>
Committed: Fri Dec 27 09:38:21 2013 +0100
----------------------------------------------------------------------
.../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 ++++
pom.xml | 93 +++++++++++---------
8 files changed, 176 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/4841d1b4/jdbc/src/test/integrationtests/org/apache/metamodel/DB2Test.java
----------------------------------------------------------------------
diff --git a/jdbc/src/test/integrationtests/org/apache/metamodel/DB2Test.java b/jdbc/src/test/integrationtests/org/apache/metamodel/DB2Test.java
index f32f016..f1f6a6d 100644
--- a/jdbc/src/test/integrationtests/org/apache/metamodel/DB2Test.java
+++ b/jdbc/src/test/integrationtests/org/apache/metamodel/DB2Test.java
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.metamodel;
import java.sql.Connection;
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/4841d1b4/jdbc/src/test/integrationtests/org/apache/metamodel/FirebirdTest.java
----------------------------------------------------------------------
diff --git a/jdbc/src/test/integrationtests/org/apache/metamodel/FirebirdTest.java b/jdbc/src/test/integrationtests/org/apache/metamodel/FirebirdTest.java
index b7a4467..0c7fdf5 100644
--- a/jdbc/src/test/integrationtests/org/apache/metamodel/FirebirdTest.java
+++ b/jdbc/src/test/integrationtests/org/apache/metamodel/FirebirdTest.java
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.metamodel;
import java.sql.Connection;
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/4841d1b4/jdbc/src/test/integrationtests/org/apache/metamodel/MysqlTest.java
----------------------------------------------------------------------
diff --git a/jdbc/src/test/integrationtests/org/apache/metamodel/MysqlTest.java b/jdbc/src/test/integrationtests/org/apache/metamodel/MysqlTest.java
index 95d97e5..2a3c730 100644
--- a/jdbc/src/test/integrationtests/org/apache/metamodel/MysqlTest.java
+++ b/jdbc/src/test/integrationtests/org/apache/metamodel/MysqlTest.java
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.metamodel;
import java.sql.Connection;
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/4841d1b4/jdbc/src/test/integrationtests/org/apache/metamodel/OracleTest.java
----------------------------------------------------------------------
diff --git a/jdbc/src/test/integrationtests/org/apache/metamodel/OracleTest.java b/jdbc/src/test/integrationtests/org/apache/metamodel/OracleTest.java
index 68efee2..0d15dbf 100644
--- a/jdbc/src/test/integrationtests/org/apache/metamodel/OracleTest.java
+++ b/jdbc/src/test/integrationtests/org/apache/metamodel/OracleTest.java
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.metamodel;
import java.sql.Connection;
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/4841d1b4/jdbc/src/test/integrationtests/org/apache/metamodel/PostgresqlTest.java
----------------------------------------------------------------------
diff --git a/jdbc/src/test/integrationtests/org/apache/metamodel/PostgresqlTest.java b/jdbc/src/test/integrationtests/org/apache/metamodel/PostgresqlTest.java
index 54b9e6c..7e7625c 100644
--- a/jdbc/src/test/integrationtests/org/apache/metamodel/PostgresqlTest.java
+++ b/jdbc/src/test/integrationtests/org/apache/metamodel/PostgresqlTest.java
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.metamodel;
import java.lang.reflect.Method;
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/4841d1b4/jdbc/src/test/integrationtests/org/apache/metamodel/SQLServerJtdsDriverTest.java
----------------------------------------------------------------------
diff --git a/jdbc/src/test/integrationtests/org/apache/metamodel/SQLServerJtdsDriverTest.java b/jdbc/src/test/integrationtests/org/apache/metamodel/SQLServerJtdsDriverTest.java
index b0df4bf..b365041 100644
--- a/jdbc/src/test/integrationtests/org/apache/metamodel/SQLServerJtdsDriverTest.java
+++ b/jdbc/src/test/integrationtests/org/apache/metamodel/SQLServerJtdsDriverTest.java
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.metamodel;
import java.sql.Connection;
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/4841d1b4/jdbc/src/test/integrationtests/org/apache/metamodel/SQLServerMicrosoftDriverTest.java
----------------------------------------------------------------------
diff --git a/jdbc/src/test/integrationtests/org/apache/metamodel/SQLServerMicrosoftDriverTest.java b/jdbc/src/test/integrationtests/org/apache/metamodel/SQLServerMicrosoftDriverTest.java
index 83ceeba..1afd798 100644
--- a/jdbc/src/test/integrationtests/org/apache/metamodel/SQLServerMicrosoftDriverTest.java
+++ b/jdbc/src/test/integrationtests/org/apache/metamodel/SQLServerMicrosoftDriverTest.java
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.metamodel;
import java.sql.Connection;
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/4841d1b4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2112961..3bbc418 100644
--- a/pom.xml
+++ b/pom.xml
@@ -164,49 +164,18 @@ under the License.
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <executions>
- <execution>
- <id>rat-verify</id>
- <phase>test</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <licenses>
- <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
- <licenseFamilyCategory>ASL20</licenseFamilyCategory>
- <licenseFamilyName>Apache Software License, 2.0</licenseFamilyName>
- <notes>Single licensed ASL v2.0</notes>
- <patterns>
- <pattern>Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.</pattern>
- </patterns>
- </license>
- </licenses>
- <excludeSubProjects>false</excludeSubProjects>
- <excludes>
- <exclude>CHANGES.txt</exclude>
- <exclude>README</exclude>
- <exclude>NOTICE.txt</exclude>
- <exclude>LICENSE.txt</exclude>
- <exclude>KEYS</exclude>
- <exclude>**/.gitignore/**</exclude>
- <exclude>.git/**</exclude>
- <exclude>**/src/test/**</exclude>
- <exclude>**/src/site/**</exclude>
- <exclude>**/.project</exclude>
- <exclude>**/.classpath</exclude>
- <exclude>**/.settings/**</exclude>
- <exclude>**/target/**</exclude>
- <exclude>DEPENDENCIES</exclude>
- <exclude>DISCLAIMER</exclude>
- </excludes>
- </configuration>
- </plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>rat-verify</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<!-- Ensure inclusion of license header in all main java files -->
<groupId>com.google.code.maven-license-plugin</groupId>
@@ -353,6 +322,44 @@ under the License.
</lifecycleMappingMetadata>
</configuration>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <licenses>
+ <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
+ <licenseFamilyCategory>ASL20</licenseFamilyCategory>
+ <licenseFamilyName>Apache Software License, 2.0</licenseFamilyName>
+ <notes>Single licensed ASL v2.0</notes>
+ <patterns>
+ <pattern>Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.</pattern>
+ </patterns>
+ </license>
+ </licenses>
+ <excludeSubProjects>false</excludeSubProjects>
+ <excludes>
+ <exclude>CHANGES.txt</exclude>
+ <exclude>README</exclude>
+ <exclude>NOTICE.txt</exclude>
+ <exclude>LICENSE.txt</exclude>
+ <exclude>KEYS</exclude>
+ <exclude>**/.gitignore/**</exclude>
+ <exclude>.git/**</exclude>
+ <exclude>**/src/test/resources/**</exclude>
+ <exclude>**/src/site/**</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.settings/**</exclude>
+ <exclude>**/target/**</exclude>
+ <exclude>DEPENDENCIES</exclude>
+ <exclude>DISCLAIMER</exclude>
+ </excludes>
+ </configuration>
+
+ </plugin>
+
</plugins>
</pluginManagement>
</build>
[36/50] [abbrv] git commit: Made the DataContextFactoryBean
extensible by making it possible to specify delegate classes as the "type"
parameter. This also avoids runtime dependencies on unwanted MetaModel
modules, since the factory class no longer direc
Posted by ka...@apache.org.
Made the DataContextFactoryBean extensible by making it possible to
specify delegate classes as the "type" parameter. This also avoids
runtime dependencies on unwanted MetaModel modules, since the factory
class no longer directly imports foreign module code.
Project: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/commit/3aff7ff4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/tree/3aff7ff4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/diff/3aff7ff4
Branch: refs/heads/hbase-module
Commit: 3aff7ff42976ec07210eedebfe047c47c4e5dc4a
Parents: 5ce666f
Author: Kasper Sørensen <i....@gmail.com>
Authored: Wed Jan 8 10:01:43 2014 +0100
Committer: Kasper Sørensen <i....@gmail.com>
Committed: Wed Jan 8 10:01:43 2014 +0100
----------------------------------------------------------------------
.../AbstractDataContextFactoryBeanDelegate.java | 95 +++++++++++
.../CsvDataContextFactoryBeanDelegate.java | 46 +++++
.../spring/DataContextFactoryBean.java | 166 +++++--------------
.../spring/DataContextFactoryBeanDelegate.java | 43 +++++
.../ExcelDataContextFactoryBeanDelegate.java | 42 +++++
.../JdbcDataContextFactoryBeanDelegate.java | 73 ++++++++
.../MockDataContextFactoryBeanDelegate.java | 40 +++++
.../spring/MockDataContextTypeTest.java | 26 +++
.../examples/mock-datacontext-type.xml | 11 ++
9 files changed, 415 insertions(+), 127 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/3aff7ff4/spring/src/main/java/org/apache/metamodel/spring/AbstractDataContextFactoryBeanDelegate.java
----------------------------------------------------------------------
diff --git a/spring/src/main/java/org/apache/metamodel/spring/AbstractDataContextFactoryBeanDelegate.java b/spring/src/main/java/org/apache/metamodel/spring/AbstractDataContextFactoryBeanDelegate.java
new file mode 100644
index 0000000..3e05824
--- /dev/null
+++ b/spring/src/main/java/org/apache/metamodel/spring/AbstractDataContextFactoryBeanDelegate.java
@@ -0,0 +1,95 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.metamodel.spring;
+
+import org.apache.metamodel.csv.CsvConfiguration;
+import org.apache.metamodel.util.BooleanComparator;
+import org.apache.metamodel.util.FileResource;
+import org.apache.metamodel.util.Resource;
+import org.apache.metamodel.util.UrlResource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Useful common superclass of {@link DataContextFactoryBeanDelegate}
+ * implementations.
+ */
+public abstract class AbstractDataContextFactoryBeanDelegate implements DataContextFactoryBeanDelegate {
+
+ protected final Logger logger = LoggerFactory.getLogger(getClass());
+
+ protected Resource getResource(DataContextFactoryBean bean) {
+ final org.springframework.core.io.Resource resource = bean.getResource();
+ if (resource != null) {
+ return new SpringResource(resource);
+ } else if (bean.getFilename() != null) {
+ return new FileResource(bean.getFilename());
+ } else if (bean.getUrl() != null) {
+ return new UrlResource(bean.getUrl());
+ }
+ return null;
+ }
+
+ protected int getInt(String value, int ifNull) {
+ if (value == null) {
+ return ifNull;
+ }
+ value = value.trim();
+ if (value.isEmpty()) {
+ return ifNull;
+ }
+ return Integer.parseInt(value);
+ }
+
+ protected String getString(String value, String ifNull) {
+ if (value == null) {
+ return ifNull;
+ }
+ value = value.trim();
+ if (value.isEmpty()) {
+ return ifNull;
+ }
+ return value;
+ }
+
+ protected char getChar(String value, char ifNull) {
+ if (value == null) {
+ return ifNull;
+ }
+ value = value.trim();
+ if (value.isEmpty()) {
+ return ifNull;
+ }
+ if ("none".equalsIgnoreCase(value)) {
+ return CsvConfiguration.NOT_A_CHAR;
+ }
+ return value.charAt(0);
+ }
+
+ protected boolean getBoolean(String value, boolean ifNull) {
+ if (value == null) {
+ return ifNull;
+ }
+ value = value.trim();
+ if (value.isEmpty()) {
+ return ifNull;
+ }
+ return BooleanComparator.parseBoolean(value);
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/3aff7ff4/spring/src/main/java/org/apache/metamodel/spring/CsvDataContextFactoryBeanDelegate.java
----------------------------------------------------------------------
diff --git a/spring/src/main/java/org/apache/metamodel/spring/CsvDataContextFactoryBeanDelegate.java b/spring/src/main/java/org/apache/metamodel/spring/CsvDataContextFactoryBeanDelegate.java
new file mode 100644
index 0000000..baab6d7
--- /dev/null
+++ b/spring/src/main/java/org/apache/metamodel/spring/CsvDataContextFactoryBeanDelegate.java
@@ -0,0 +1,46 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.metamodel.spring;
+
+import org.apache.metamodel.DataContext;
+import org.apache.metamodel.csv.CsvConfiguration;
+import org.apache.metamodel.csv.CsvDataContext;
+import org.apache.metamodel.util.FileHelper;
+import org.apache.metamodel.util.Resource;
+
+/**
+ * {@link DataContextFactoryBeanDelegate} for {@link CsvDataContext}.
+ */
+public class CsvDataContextFactoryBeanDelegate extends AbstractDataContextFactoryBeanDelegate {
+
+ @Override
+ public DataContext createDataContext(DataContextFactoryBean bean) {
+ final Resource resource = getResource(bean);
+ final int columnNameLineNumber = getInt(bean.getColumnNameLineNumber(), CsvConfiguration.DEFAULT_COLUMN_NAME_LINE);
+ final String encoding = getString(bean.getEncoding(), FileHelper.DEFAULT_ENCODING);
+ final char separatorChar = getChar(bean.getSeparatorChar(), CsvConfiguration.DEFAULT_SEPARATOR_CHAR);
+ final char quoteChar = getChar(bean.getQuoteChar(), CsvConfiguration.DEFAULT_QUOTE_CHAR);
+ final char escapeChar = getChar(bean.getEscapeChar(), CsvConfiguration.DEFAULT_ESCAPE_CHAR);
+ final boolean failOnInconsistentRowLength = getBoolean(bean.getFailOnInconsistentRowLength(), false);
+ final boolean multilineValues = getBoolean(bean.getMultilineValues(), true);
+ final CsvConfiguration configuration = new CsvConfiguration(columnNameLineNumber, encoding, separatorChar,
+ quoteChar, escapeChar, failOnInconsistentRowLength, multilineValues);
+ return new CsvDataContext(resource, configuration);
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/3aff7ff4/spring/src/main/java/org/apache/metamodel/spring/DataContextFactoryBean.java
----------------------------------------------------------------------
diff --git a/spring/src/main/java/org/apache/metamodel/spring/DataContextFactoryBean.java b/spring/src/main/java/org/apache/metamodel/spring/DataContextFactoryBean.java
index d1d376a..9d35d57 100644
--- a/spring/src/main/java/org/apache/metamodel/spring/DataContextFactoryBean.java
+++ b/spring/src/main/java/org/apache/metamodel/spring/DataContextFactoryBean.java
@@ -18,25 +18,12 @@
*/
package org.apache.metamodel.spring;
-import java.sql.Connection;
-import java.sql.DriverManager;
-
import javax.sql.DataSource;
import org.apache.metamodel.DataContext;
-import org.apache.metamodel.csv.CsvConfiguration;
-import org.apache.metamodel.csv.CsvDataContext;
-import org.apache.metamodel.excel.ExcelConfiguration;
-import org.apache.metamodel.excel.ExcelDataContext;
-import org.apache.metamodel.jdbc.JdbcDataContext;
import org.apache.metamodel.schema.TableType;
-import org.apache.metamodel.util.BooleanComparator;
-import org.apache.metamodel.util.FileHelper;
-import org.apache.metamodel.util.FileResource;
-import org.apache.metamodel.util.Resource;
-import org.apache.metamodel.util.UrlResource;
-import org.slf4j.LoggerFactory;
import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.FactoryBean;
/**
@@ -70,84 +57,56 @@ public class DataContextFactoryBean implements FactoryBean<DataContext> {
@Override
public DataContext getObject() throws Exception {
- String type = _type == null ? "" : _type.toLowerCase();
- if ("csv".equals(type)) {
- return createCsvDataContext();
+ final String type = _type == null ? "" : _type.toLowerCase();
+ final DataContextFactoryBeanDelegate delegate;
+
+ if (type.isEmpty()) {
+ throw new IllegalArgumentException("No DataContext 'type' property provided for DataContextFactoryBean");
+ } else if ("csv".equals(type)) {
+ delegate = new CsvDataContextFactoryBeanDelegate();
} else if ("excel".equals(type)) {
- return createExcelDataContext();
+ delegate = new ExcelDataContextFactoryBeanDelegate();
} else if ("jdbc".equals(type)) {
- return createJdbcDataContext();
+ delegate = new JdbcDataContextFactoryBeanDelegate();
+ } else {
+ delegate = createDelegateFromType();
+ }
+
+ if (delegate == null) {
+ throw new UnsupportedOperationException("Unsupported DataContext type: " + _type);
}
- // TODO Auto-generated method stub
- return null;
+ return delegate.createDataContext(this);
}
- private DataContext createJdbcDataContext() {
- TableType[] tableTypes = _tableTypes;
- if (tableTypes == null) {
- tableTypes = TableType.DEFAULT_TABLE_TYPES;
- }
-
- if (_dataSource == null) {
- final String driverClassName = getString(_driverClassName, null);
- if (driverClassName != null) {
- try {
- Class.forName(driverClassName);
- } catch (ClassNotFoundException e) {
- logger.error("Failed to initialize JDBC driver class '" + driverClassName + "'!", e);
- }
+ private DataContextFactoryBeanDelegate createDelegateFromType() {
+ final Class<?> cls;
+ try {
+ logger.debug("Attempting to interpret type '{}' as a delegate class name", _type);
+ cls = Class.forName(_type.trim());
+ } catch (Exception e) {
+ if (logger.isDebugEnabled()) {
+ logger.debug("Failed to load type '" + _type + "' as a class", e);
}
+ return null;
+ }
- final Connection connection;
- try {
- if (_username == null && _password == null) {
- connection = DriverManager.getConnection(_url);
- } else {
- connection = DriverManager.getConnection(_url, _username, _password);
- }
- } catch (Exception e) {
- logger.error("Failed to get JDBC connection using URL: " + _url, e);
- throw new IllegalStateException("Failed to get JDBC connection", e);
- }
+ if (cls == null) {
+ return null;
+ }
- return new JdbcDataContext(connection, tableTypes, _catalogName);
+ if (!DataContextFactoryBeanDelegate.class.isAssignableFrom(cls)) {
+ return null;
}
- return new JdbcDataContext(_dataSource, tableTypes, _catalogName);
- }
-
- private DataContext createExcelDataContext() {
- final int columnNameLineNumber = getInt(_columnNameLineNumber, ExcelConfiguration.DEFAULT_COLUMN_NAME_LINE);
- final boolean skipEmptyLines = getBoolean(_skipEmptyLines, true);
- final boolean skipEmptyColumns = getBoolean(_skipEmptyColumns, false);
- final ExcelConfiguration configuration = new ExcelConfiguration(columnNameLineNumber, skipEmptyLines,
- skipEmptyColumns);
- return new ExcelDataContext(getResourceInternal(), configuration);
- }
-
- private DataContext createCsvDataContext() {
- final int columnNameLineNumber = getInt(_columnNameLineNumber, CsvConfiguration.DEFAULT_COLUMN_NAME_LINE);
- final String encoding = getString(_encoding, FileHelper.DEFAULT_ENCODING);
- final char separatorChar = getChar(_separatorChar, CsvConfiguration.DEFAULT_SEPARATOR_CHAR);
- final char quoteChar = getChar(_quoteChar, CsvConfiguration.DEFAULT_QUOTE_CHAR);
- final char escapeChar = getChar(_escapeChar, CsvConfiguration.DEFAULT_ESCAPE_CHAR);
- final boolean failOnInconsistentRowLength = getBoolean(_failOnInconsistentRowLength, false);
- final boolean multilineValues = getBoolean(_multilineValues, true);
- final CsvConfiguration configuration = new CsvConfiguration(columnNameLineNumber, encoding, separatorChar,
- quoteChar, escapeChar, failOnInconsistentRowLength, multilineValues);
- return new CsvDataContext(getResourceInternal(), configuration);
- }
-
- private Resource getResourceInternal() {
- if (_resource != null) {
- return new SpringResource(_resource);
- } else if (_filename != null) {
- return new FileResource(_filename);
- } else if (_url != null) {
- return new UrlResource(_url);
+ try {
+ final DataContextFactoryBeanDelegate delegate = cls.asSubclass(DataContextFactoryBeanDelegate.class)
+ .newInstance();
+ return delegate;
+ } catch (Exception e) {
+ logger.warn("Failed to instantiate delegate " + cls, e);
+ return null;
}
- return null;
}
@Override
@@ -160,53 +119,6 @@ public class DataContextFactoryBean implements FactoryBean<DataContext> {
return false;
}
- private int getInt(String value, int ifNull) {
- if (value == null) {
- return ifNull;
- }
- value = value.trim();
- if (value.isEmpty()) {
- return ifNull;
- }
- return Integer.parseInt(value);
- }
-
- private String getString(String value, String ifNull) {
- if (value == null) {
- return ifNull;
- }
- value = value.trim();
- if (value.isEmpty()) {
- return ifNull;
- }
- return value;
- }
-
- private char getChar(String value, char ifNull) {
- if (value == null) {
- return ifNull;
- }
- value = value.trim();
- if (value.isEmpty()) {
- return ifNull;
- }
- if ("none".equalsIgnoreCase(value)) {
- return CsvConfiguration.NOT_A_CHAR;
- }
- return value.charAt(0);
- }
-
- private boolean getBoolean(String value, boolean ifNull) {
- if (value == null) {
- return ifNull;
- }
- value = value.trim();
- if (value.isEmpty()) {
- return ifNull;
- }
- return BooleanComparator.parseBoolean(value);
- }
-
public String getType() {
return _type;
}
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/3aff7ff4/spring/src/main/java/org/apache/metamodel/spring/DataContextFactoryBeanDelegate.java
----------------------------------------------------------------------
diff --git a/spring/src/main/java/org/apache/metamodel/spring/DataContextFactoryBeanDelegate.java b/spring/src/main/java/org/apache/metamodel/spring/DataContextFactoryBeanDelegate.java
new file mode 100644
index 0000000..dd98066
--- /dev/null
+++ b/spring/src/main/java/org/apache/metamodel/spring/DataContextFactoryBeanDelegate.java
@@ -0,0 +1,43 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.metamodel.spring;
+
+import org.apache.metamodel.DataContext;
+
+/**
+ * Component responsible for instantiating a {@link DataContext} given the
+ * properties of a {@link DataContextFactoryBean}.
+ *
+ * This component helps separate the configuration code (in
+ * {@link DataContextFactoryBean}) from the actual instantiation of objects.
+ * This is necesary to ensure that the {@link DataContextFactoryBean} is
+ * functional for only a subset of MetaModel's modules, since otherwise import
+ * statements would hinder use of the class when not all MetaModel modules are
+ * available.
+ */
+public interface DataContextFactoryBeanDelegate {
+
+ /**
+ * Creates the particular {@link DataContext} object.
+ *
+ * @param bean
+ * @return
+ */
+ public DataContext createDataContext(DataContextFactoryBean bean);
+}
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/3aff7ff4/spring/src/main/java/org/apache/metamodel/spring/ExcelDataContextFactoryBeanDelegate.java
----------------------------------------------------------------------
diff --git a/spring/src/main/java/org/apache/metamodel/spring/ExcelDataContextFactoryBeanDelegate.java b/spring/src/main/java/org/apache/metamodel/spring/ExcelDataContextFactoryBeanDelegate.java
new file mode 100644
index 0000000..f6d7d9b
--- /dev/null
+++ b/spring/src/main/java/org/apache/metamodel/spring/ExcelDataContextFactoryBeanDelegate.java
@@ -0,0 +1,42 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.metamodel.spring;
+
+import org.apache.metamodel.DataContext;
+import org.apache.metamodel.excel.ExcelConfiguration;
+import org.apache.metamodel.excel.ExcelDataContext;
+import org.apache.metamodel.util.Resource;
+
+/**
+ * {@link DataContextFactoryBeanDelegate} for {@link ExcelDataContext}.
+ */
+public class ExcelDataContextFactoryBeanDelegate extends AbstractDataContextFactoryBeanDelegate {
+
+ @Override
+ public DataContext createDataContext(DataContextFactoryBean bean) {
+ final Resource resource = getResource(bean);
+ final int columnNameLineNumber = getInt(bean.getColumnNameLineNumber(),
+ ExcelConfiguration.DEFAULT_COLUMN_NAME_LINE);
+ final boolean skipEmptyLines = getBoolean(bean.getSkipEmptyLines(), true);
+ final boolean skipEmptyColumns = getBoolean(bean.getSkipEmptyColumns(), false);
+ final ExcelConfiguration configuration = new ExcelConfiguration(columnNameLineNumber, skipEmptyLines,
+ skipEmptyColumns);
+ return new ExcelDataContext(resource, configuration);
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/3aff7ff4/spring/src/main/java/org/apache/metamodel/spring/JdbcDataContextFactoryBeanDelegate.java
----------------------------------------------------------------------
diff --git a/spring/src/main/java/org/apache/metamodel/spring/JdbcDataContextFactoryBeanDelegate.java b/spring/src/main/java/org/apache/metamodel/spring/JdbcDataContextFactoryBeanDelegate.java
new file mode 100644
index 0000000..e87700d
--- /dev/null
+++ b/spring/src/main/java/org/apache/metamodel/spring/JdbcDataContextFactoryBeanDelegate.java
@@ -0,0 +1,73 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.metamodel.spring;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+
+import javax.sql.DataSource;
+
+import org.apache.metamodel.DataContext;
+import org.apache.metamodel.jdbc.JdbcDataContext;
+import org.apache.metamodel.schema.TableType;
+
+/**
+ * {@link DataContextFactoryBeanDelegate} for {@link JdbcDataContext}.
+ */
+public class JdbcDataContextFactoryBeanDelegate extends AbstractDataContextFactoryBeanDelegate {
+
+ @Override
+ public DataContext createDataContext(DataContextFactoryBean bean) {
+ TableType[] tableTypes = bean.getTableTypes();
+ if (tableTypes == null) {
+ tableTypes = TableType.DEFAULT_TABLE_TYPES;
+ }
+
+ final DataSource dataSource = bean.getDataSource();
+
+ if (dataSource == null) {
+ final String driverClassName = getString(bean.getDriverClassName(), null);
+ if (driverClassName != null) {
+ try {
+ Class.forName(driverClassName);
+ } catch (ClassNotFoundException e) {
+ logger.error("Failed to initialize JDBC driver class '" + driverClassName + "'!", e);
+ }
+ }
+
+ final String url = bean.getUrl();
+ final Connection connection;
+ try {
+ if (bean.getUsername() == null && bean.getPassword() == null) {
+ connection = DriverManager.getConnection(url);
+ } else {
+ connection = DriverManager.getConnection(url, bean.getUsername(), bean.getPassword());
+ }
+ } catch (Exception e) {
+ logger.error("Failed to get JDBC connection using URL: " + url, e);
+ throw new IllegalStateException("Failed to get JDBC connection", e);
+ }
+
+ return new JdbcDataContext(connection, tableTypes, bean.getCatalogName());
+ }
+
+ return new JdbcDataContext(dataSource, tableTypes, bean.getCatalogName());
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/3aff7ff4/spring/src/test/java/org/apache/metamodel/spring/MockDataContextFactoryBeanDelegate.java
----------------------------------------------------------------------
diff --git a/spring/src/test/java/org/apache/metamodel/spring/MockDataContextFactoryBeanDelegate.java b/spring/src/test/java/org/apache/metamodel/spring/MockDataContextFactoryBeanDelegate.java
new file mode 100644
index 0000000..4d97be2
--- /dev/null
+++ b/spring/src/test/java/org/apache/metamodel/spring/MockDataContextFactoryBeanDelegate.java
@@ -0,0 +1,40 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.metamodel.spring;
+
+import java.util.ArrayList;
+
+import org.apache.metamodel.DataContext;
+import org.apache.metamodel.pojo.PojoDataContext;
+import org.apache.metamodel.pojo.TableDataProvider;
+
+/**
+ * Mock implementation of {@link DataContextFactoryBeanDelegate}. Used by test (
+ * {@link MockDataContextTypeTest}) to verify that we can pass data context type
+ * as a qualified class name of a factory delegate.
+ */
+public class MockDataContextFactoryBeanDelegate implements DataContextFactoryBeanDelegate {
+
+ @Override
+ public DataContext createDataContext(DataContextFactoryBean bean) {
+ String username = bean.getUsername();
+ return new PojoDataContext(username, new ArrayList<TableDataProvider<?>>());
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/3aff7ff4/spring/src/test/java/org/apache/metamodel/spring/MockDataContextTypeTest.java
----------------------------------------------------------------------
diff --git a/spring/src/test/java/org/apache/metamodel/spring/MockDataContextTypeTest.java b/spring/src/test/java/org/apache/metamodel/spring/MockDataContextTypeTest.java
new file mode 100644
index 0000000..e406756
--- /dev/null
+++ b/spring/src/test/java/org/apache/metamodel/spring/MockDataContextTypeTest.java
@@ -0,0 +1,26 @@
+package org.apache.metamodel.spring;
+
+import static org.junit.Assert.assertEquals;
+
+import org.apache.metamodel.DataContext;
+import org.apache.metamodel.pojo.PojoDataContext;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration("classpath:examples/mock-datacontext-type.xml")
+public class MockDataContextTypeTest {
+
+ @Autowired
+ private DataContext dataContext;
+
+ @Test
+ public void testReadDataContext() {
+ assertEquals(PojoDataContext.class, dataContext.getClass());
+
+ assertEquals("here's a value from springs XML file", dataContext.getDefaultSchema().getName());
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/3aff7ff4/spring/src/test/resources/examples/mock-datacontext-type.xml
----------------------------------------------------------------------
diff --git a/spring/src/test/resources/examples/mock-datacontext-type.xml b/spring/src/test/resources/examples/mock-datacontext-type.xml
new file mode 100644
index 0000000..b47a680
--- /dev/null
+++ b/spring/src/test/resources/examples/mock-datacontext-type.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+
+ <bean class="org.apache.metamodel.spring.DataContextFactoryBean">
+ <property name="type" value="org.apache.metamodel.spring.MockDataContextFactoryBeanDelegate" />
+ <property name="username" value="here's a value from springs XML file" />
+ </bean>
+
+</beans>
\ No newline at end of file
[45/50] [abbrv] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-metamodel.git
Posted by ka...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-metamodel.git
Project: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/commit/bae98b37
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/tree/bae98b37
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/diff/bae98b37
Branch: refs/heads/hbase-module
Commit: bae98b37e4a29ee3c90043082f601b49844660c9
Parents: 58bdfce bdef432
Author: Kasper Sørensen <i....@gmail.com>
Authored: Mon Jan 27 21:50:35 2014 +0100
Committer: Kasper Sørensen <i....@gmail.com>
Committed: Mon Jan 27 21:50:35 2014 +0100
----------------------------------------------------------------------
.../jdbc/dialects/DB2QueryRewriter.java | 5 ++-
.../dialects/DB2QueryRewriterTest.java | 36 ++++++++++++++++++++
2 files changed, 40 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[08/50] [abbrv] git commit: Setting the version to be
4.0.0-incubating-SNAPSHOT
Posted by ka...@apache.org.
Setting the version to be 4.0.0-incubating-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/commit/d5b1f549
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/tree/d5b1f549
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/diff/d5b1f549
Branch: refs/heads/hbase-module
Commit: d5b1f549c058d1b5af8f0f437bdd2facbfacff00
Parents: 8b2cd47
Author: ak.ankitkumar@gmail.com <ak...@gmail.com>
Authored: Mon Sep 30 14:50:09 2013 +0200
Committer: ak.ankitkumar@gmail.com <ak...@gmail.com>
Committed: Mon Sep 30 14:50:09 2013 +0200
----------------------------------------------------------------------
core/pom.xml | 2 +-
couchdb/pom.xml | 2 +-
csv/pom.xml | 2 +-
excel/pom.xml | 2 +-
fixedwidth/pom.xml | 2 +-
full/pom.xml | 2 +-
jdbc/pom.xml | 2 +-
mongodb/pom.xml | 2 +-
openoffice/pom.xml | 2 +-
pojo/pom.xml | 2 +-
pom.xml | 2 +-
salesforce/pom.xml | 2 +-
sugarcrm/pom.xml | 2 +-
xml/pom.xml | 2 +-
14 files changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/d5b1f549/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 52cfc16..b33280e 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0-SNAPSHOT</version>
+ <version>4.0.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-core</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/d5b1f549/couchdb/pom.xml
----------------------------------------------------------------------
diff --git a/couchdb/pom.xml b/couchdb/pom.xml
index 033f5ee..80b7f4c 100644
--- a/couchdb/pom.xml
+++ b/couchdb/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0-SNAPSHOT</version>
+ <version>4.0.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-couchdb</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/d5b1f549/csv/pom.xml
----------------------------------------------------------------------
diff --git a/csv/pom.xml b/csv/pom.xml
index 4bb054a..a246374 100644
--- a/csv/pom.xml
+++ b/csv/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0-SNAPSHOT</version>
+ <version>4.0.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-csv</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/d5b1f549/excel/pom.xml
----------------------------------------------------------------------
diff --git a/excel/pom.xml b/excel/pom.xml
index 67373f2..ecf3a8f 100644
--- a/excel/pom.xml
+++ b/excel/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0-SNAPSHOT</version>
+ <version>4.0.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-excel</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/d5b1f549/fixedwidth/pom.xml
----------------------------------------------------------------------
diff --git a/fixedwidth/pom.xml b/fixedwidth/pom.xml
index 5502fa2..527ad65 100644
--- a/fixedwidth/pom.xml
+++ b/fixedwidth/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0-SNAPSHOT</version>
+ <version>4.0.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-fixedwidth</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/d5b1f549/full/pom.xml
----------------------------------------------------------------------
diff --git a/full/pom.xml b/full/pom.xml
index ef4cb8f..973cbc7 100644
--- a/full/pom.xml
+++ b/full/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0-SNAPSHOT</version>
+ <version>4.0.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-full</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/d5b1f549/jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
index e574d62..16080b2 100644
--- a/jdbc/pom.xml
+++ b/jdbc/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0-SNAPSHOT</version>
+ <version>4.0.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-jdbc</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/d5b1f549/mongodb/pom.xml
----------------------------------------------------------------------
diff --git a/mongodb/pom.xml b/mongodb/pom.xml
index 71ac2ea..45776d0 100644
--- a/mongodb/pom.xml
+++ b/mongodb/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0-SNAPSHOT</version>
+ <version>4.0.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-mongodb</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/d5b1f549/openoffice/pom.xml
----------------------------------------------------------------------
diff --git a/openoffice/pom.xml b/openoffice/pom.xml
index 30c914e..47b14b8 100644
--- a/openoffice/pom.xml
+++ b/openoffice/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0-SNAPSHOT</version>
+ <version>4.0.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-openoffice</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/d5b1f549/pojo/pom.xml
----------------------------------------------------------------------
diff --git a/pojo/pom.xml b/pojo/pom.xml
index 0699e1a..51b75c3 100644
--- a/pojo/pom.xml
+++ b/pojo/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0-SNAPSHOT</version>
+ <version>4.0.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-pojo</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/d5b1f549/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9e1c59f..0e002b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@ under the License.
</scm>
<groupId>org.apache.metamodel</groupId>
<artifactId>MetaModel</artifactId>
- <version>4.0-SNAPSHOT</version>
+ <version>4.0.0-incubating-SNAPSHOT</version>
<name>MetaModel</name>
<description>MetaModel is a library that encapsulates the differences and enhances
the capabilities of different datastores. Rich querying abilities are
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/d5b1f549/salesforce/pom.xml
----------------------------------------------------------------------
diff --git a/salesforce/pom.xml b/salesforce/pom.xml
index e1c5dbd..bb043cb 100644
--- a/salesforce/pom.xml
+++ b/salesforce/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0-SNAPSHOT</version>
+ <version>4.0.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-salesforce</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/d5b1f549/sugarcrm/pom.xml
----------------------------------------------------------------------
diff --git a/sugarcrm/pom.xml b/sugarcrm/pom.xml
index 409dc38..0f88f71 100644
--- a/sugarcrm/pom.xml
+++ b/sugarcrm/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0-SNAPSHOT</version>
+ <version>4.0.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-sugarcrm</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/d5b1f549/xml/pom.xml
----------------------------------------------------------------------
diff --git a/xml/pom.xml b/xml/pom.xml
index 36c046f..a3fc371 100644
--- a/xml/pom.xml
+++ b/xml/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0-SNAPSHOT</version>
+ <version>4.0.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-xml</artifactId>
[26/50] [abbrv] git commit: [maven-release-plugin] prepare release
MetaModel-4.0.0-incubating
Posted by ka...@apache.org.
[maven-release-plugin] prepare release MetaModel-4.0.0-incubating
Project: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/commit/bbb4d69e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/tree/bbb4d69e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/diff/bbb4d69e
Branch: refs/heads/hbase-module
Commit: bbb4d69ed54e10062b73af225a2a604ce869a6ed
Parents: 409ee54
Author: ankitkumar2711 <ak...@gmail.com>
Authored: Tue Dec 3 14:08:22 2013 +0100
Committer: ankitkumar2711 <ak...@gmail.com>
Committed: Tue Dec 3 14:08:22 2013 +0100
----------------------------------------------------------------------
core/pom.xml | 2 +-
couchdb/pom.xml | 2 +-
csv/pom.xml | 2 +-
excel/pom.xml | 2 +-
fixedwidth/pom.xml | 2 +-
full/pom.xml | 2 +-
jdbc/pom.xml | 2 +-
mongodb/pom.xml | 2 +-
openoffice/pom.xml | 2 +-
pojo/pom.xml | 2 +-
pom.xml | 4 ++--
salesforce/pom.xml | 2 +-
sugarcrm/pom.xml | 2 +-
xml/pom.xml | 2 +-
14 files changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/bbb4d69e/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index dd8fc8a..8a925a3 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.1-incubating-SNAPSHOT</version>
+ <version>4.0.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-core</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/bbb4d69e/couchdb/pom.xml
----------------------------------------------------------------------
diff --git a/couchdb/pom.xml b/couchdb/pom.xml
index 2f0d35d..8cb1e77 100644
--- a/couchdb/pom.xml
+++ b/couchdb/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.1-incubating-SNAPSHOT</version>
+ <version>4.0.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-couchdb</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/bbb4d69e/csv/pom.xml
----------------------------------------------------------------------
diff --git a/csv/pom.xml b/csv/pom.xml
index 99b55e0..b17af3b 100644
--- a/csv/pom.xml
+++ b/csv/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.1-incubating-SNAPSHOT</version>
+ <version>4.0.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-csv</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/bbb4d69e/excel/pom.xml
----------------------------------------------------------------------
diff --git a/excel/pom.xml b/excel/pom.xml
index 3a9cdda..86a5e41 100644
--- a/excel/pom.xml
+++ b/excel/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.1-incubating-SNAPSHOT</version>
+ <version>4.0.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-excel</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/bbb4d69e/fixedwidth/pom.xml
----------------------------------------------------------------------
diff --git a/fixedwidth/pom.xml b/fixedwidth/pom.xml
index ccae638..3d38d58 100644
--- a/fixedwidth/pom.xml
+++ b/fixedwidth/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.1-incubating-SNAPSHOT</version>
+ <version>4.0.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-fixedwidth</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/bbb4d69e/full/pom.xml
----------------------------------------------------------------------
diff --git a/full/pom.xml b/full/pom.xml
index 97d299c..90c1547 100644
--- a/full/pom.xml
+++ b/full/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.1-incubating-SNAPSHOT</version>
+ <version>4.0.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-full</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/bbb4d69e/jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
index 348092f..dae74fd 100644
--- a/jdbc/pom.xml
+++ b/jdbc/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.1-incubating-SNAPSHOT</version>
+ <version>4.0.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-jdbc</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/bbb4d69e/mongodb/pom.xml
----------------------------------------------------------------------
diff --git a/mongodb/pom.xml b/mongodb/pom.xml
index f94a644..be31432 100644
--- a/mongodb/pom.xml
+++ b/mongodb/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.1-incubating-SNAPSHOT</version>
+ <version>4.0.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-mongodb</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/bbb4d69e/openoffice/pom.xml
----------------------------------------------------------------------
diff --git a/openoffice/pom.xml b/openoffice/pom.xml
index 1220ad9..63f5dcc 100644
--- a/openoffice/pom.xml
+++ b/openoffice/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.1-incubating-SNAPSHOT</version>
+ <version>4.0.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-openoffice</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/bbb4d69e/pojo/pom.xml
----------------------------------------------------------------------
diff --git a/pojo/pom.xml b/pojo/pom.xml
index e0d6b95..6f863c7 100644
--- a/pojo/pom.xml
+++ b/pojo/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.1-incubating-SNAPSHOT</version>
+ <version>4.0.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-pojo</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/bbb4d69e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2112961..8289d9d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,11 +41,11 @@ under the License.
<url>https://git-wip-us.apache.org/repos/asf?p=incubator-metamodel.git</url>
<connection>scm:git:http://git-wip-us.apache.org/repos/asf/incubator-metamodel.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-metamodel.git</developerConnection>
- <tag>HEAD</tag>
+ <tag>MetaModel-4.0.0-incubating</tag>
</scm>
<groupId>org.apache.metamodel</groupId>
<artifactId>MetaModel</artifactId>
- <version>4.0.1-incubating-SNAPSHOT</version>
+ <version>4.0.0-incubating</version>
<name>MetaModel</name>
<description>MetaModel is a library that encapsulates the differences and enhances
the capabilities of different datastores. Rich querying abilities are
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/bbb4d69e/salesforce/pom.xml
----------------------------------------------------------------------
diff --git a/salesforce/pom.xml b/salesforce/pom.xml
index faf4d3e..8433e4c 100644
--- a/salesforce/pom.xml
+++ b/salesforce/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.1-incubating-SNAPSHOT</version>
+ <version>4.0.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-salesforce</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/bbb4d69e/sugarcrm/pom.xml
----------------------------------------------------------------------
diff --git a/sugarcrm/pom.xml b/sugarcrm/pom.xml
index 0162d98..07d1ad9 100644
--- a/sugarcrm/pom.xml
+++ b/sugarcrm/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.1-incubating-SNAPSHOT</version>
+ <version>4.0.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-sugarcrm</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/bbb4d69e/xml/pom.xml
----------------------------------------------------------------------
diff --git a/xml/pom.xml b/xml/pom.xml
index 99b07bb..ba762cb 100644
--- a/xml/pom.xml
+++ b/xml/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.1-incubating-SNAPSHOT</version>
+ <version>4.0.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-xml</artifactId>
[30/50] [abbrv] git commit: METAMODEL-32: Fixed thread safety of
XlsxSpreadsheetReaderDelegate
Posted by ka...@apache.org.
METAMODEL-32: Fixed thread safety of XlsxSpreadsheetReaderDelegate
Project: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/commit/c26a7970
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/tree/c26a7970
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/diff/c26a7970
Branch: refs/heads/hbase-module
Commit: c26a7970d59d24c5b6a091e8689bfa801fc7919c
Parents: 30cc236
Author: Kasper Sørensen <i....@gmail.com>
Authored: Fri Dec 6 20:38:09 2013 +0100
Committer: Kasper Sørensen <i....@gmail.com>
Committed: Fri Dec 6 20:38:09 2013 +0100
----------------------------------------------------------------------
.../metamodel/excel/XlsxSpreadsheetReaderDelegate.java | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/c26a7970/excel/src/main/java/org/apache/metamodel/excel/XlsxSpreadsheetReaderDelegate.java
----------------------------------------------------------------------
diff --git a/excel/src/main/java/org/apache/metamodel/excel/XlsxSpreadsheetReaderDelegate.java b/excel/src/main/java/org/apache/metamodel/excel/XlsxSpreadsheetReaderDelegate.java
index 8f36847..d2e0e98 100644
--- a/excel/src/main/java/org/apache/metamodel/excel/XlsxSpreadsheetReaderDelegate.java
+++ b/excel/src/main/java/org/apache/metamodel/excel/XlsxSpreadsheetReaderDelegate.java
@@ -20,13 +20,11 @@ package org.apache.metamodel.excel;
import java.io.InputStream;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
+import java.util.concurrent.ConcurrentHashMap;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.xssf.eventusermodel.XSSFReader;
import org.apache.metamodel.data.DataSet;
import org.apache.metamodel.data.RowPublisherDataSet;
import org.apache.metamodel.data.Style;
@@ -41,6 +39,8 @@ import org.apache.metamodel.schema.Table;
import org.apache.metamodel.util.AlphabeticSequence;
import org.apache.metamodel.util.FileHelper;
import org.apache.metamodel.util.Ref;
+import org.apache.poi.openxml4j.opc.OPCPackage;
+import org.apache.poi.xssf.eventusermodel.XSSFReader;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.xml.sax.InputSource;
@@ -62,7 +62,7 @@ final class XlsxSpreadsheetReaderDelegate implements SpreadsheetReaderDelegate {
public XlsxSpreadsheetReaderDelegate(ExcelConfiguration configuration) {
_configuration = configuration;
- _tableNamesToInternalIds = new HashMap<String, String>();
+ _tableNamesToInternalIds = new ConcurrentHashMap<String, String>();
}
@Override
@@ -70,6 +70,10 @@ final class XlsxSpreadsheetReaderDelegate implements SpreadsheetReaderDelegate {
final OPCPackage pkg = OPCPackage.open(inputStream);
final XSSFReader xssfReader = new XSSFReader(pkg);
final String relationshipId = _tableNamesToInternalIds.get(table.getName());
+
+ if (relationshipId == null) {
+ throw new IllegalStateException("No internal relationshipId found for table: " + table);
+ }
return buildDataSet(columns, maxRows, relationshipId, xssfReader);
}
[21/50] [abbrv] git commit: Added the disclaimer file.
Posted by ka...@apache.org.
Added the disclaimer file.
Project: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/commit/65c6f9f2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/tree/65c6f9f2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/diff/65c6f9f2
Branch: refs/heads/hbase-module
Commit: 65c6f9f254d9244d9d25dc7564d67ac199ca0cfa
Parents: 0d3435d
Author: ankitkumar2711 <ak...@gmail.com>
Authored: Tue Nov 26 14:56:00 2013 +0100
Committer: ankitkumar2711 <ak...@gmail.com>
Committed: Tue Nov 26 14:56:00 2013 +0100
----------------------------------------------------------------------
DISCLAIMER | 15 +++++++++++++++
1 file changed, 15 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/65c6f9f2/DISCLAIMER
----------------------------------------------------------------------
diff --git a/DISCLAIMER b/DISCLAIMER
new file mode 100644
index 0000000..dbd2b12
--- /dev/null
+++ b/DISCLAIMER
@@ -0,0 +1,15 @@
+Apache Metamodel is an effort undergoing incubation at the Apache Software
+Foundation (ASF), sponsored by the Apache Incubator PMC.
+
+Incubation is required of all newly accepted projects until a further review
+indicates that the infrastructure, communications, and decision making process
+have stabilized in a manner consistent with other successful ASF projects.
+
+While incubation status is not necessarily a reflection of the completeness
+or stability of the code, it does indicate that the project has yet to be
+fully endorsed by the ASF.
+
+For more information about the incubation status of the Metamodel project you
+can go to the following page:
+
+http://incubator.apache.org/projects/metamodel.html
\ No newline at end of file
[20/50] [abbrv] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-metamodel
Posted by ka...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-metamodel
Project: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/commit/0d3435dc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/tree/0d3435dc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/diff/0d3435dc
Branch: refs/heads/hbase-module
Commit: 0d3435dc3fa80590324d5ea8fb73683ac9d92458
Parents: 69f7edc 3e395f6
Author: ankitkumar2711 <ak...@gmail.com>
Authored: Tue Nov 26 14:39:19 2013 +0100
Committer: ankitkumar2711 <ak...@gmail.com>
Committed: Tue Nov 26 14:39:19 2013 +0100
----------------------------------------------------------------------
CHANGES.txt | 3 ++-
.../java/org/apache/metamodel/csv/CsvDataContext.java | 14 +++++++++++---
2 files changed, 13 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[43/50] [abbrv] METAMODEL-37: Removing old site sources
Posted by ka...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/58bdfce5/src/site/fml/whats_new_1.5.fml
----------------------------------------------------------------------
diff --git a/src/site/fml/whats_new_1.5.fml b/src/site/fml/whats_new_1.5.fml
deleted file mode 100644
index 547b8cc..0000000
--- a/src/site/fml/whats_new_1.5.fml
+++ /dev/null
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faqs xmlns="http://maven.apache.org/FML/1.0.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/FML/1.0.1 http://maven.apache.org/xsd/fml-1.0.1.xsd"
- title="What's new in MetaModel 1.5" toplink="false">
-
- <part id="features">
- <title>New features</title>
-
- <faq id="excel_xlsx">
- <question>Fluent query builder API</question>
- <answer>
- <p>MetaModel always did a lot to improve the type-safety and correctness of your
- queries. With version 1.5 we're pushing the query API even further by introducing
- a query builder that uses a fluent interface, eg. an interface that reads and feels
- like a regular query expression - except that it's type-safe and compile-time checked.</p>
- <p>The API ensures and aids you in building a query by exposing only the currently
- meaningful methods for your particular query. Here is a simple example:</p>
- <div class="source">
- DataContext dc = ...;<br/>
- Query q = dc.query().<b>from</b>(projects).<b>selectCount</b>().<b>and</b>(community).<b>where</b>(license).<b>equals</b>("oss").<b>groupBy</b>(community).toQuery();
- </div>
- <p>You can see more examples of the query builder API in the query-related examples in the menu.</p>
- </answer>
- </faq>
-
- <faq id="excel_xlsx">
- <question>Support for Excel 2007+ spreadsheets</question>
- <answer>
- <p>MetaModel 1.5 supports the new Excel 2007+ file format (<b>.xlsx</b> extension).
- As a user you can use the same factory method as with the older Excel spreadsheets.</p>
- </answer>
- </faq>
-
- <faq id="bom_detect">
- <question>Detection and usage of byte order mark (BOM) in UTF-* files</question>
- <answer>
- <p>When reading UTF-8 and UTF-16 text-files (primarily for CSV DataContexts)
- MetaModel 1.5 will scan the file for a
- <a href="http://en.wikipedia.org/wiki/Byte_order_mark" target="_blank">byte order mark</a> (BOM)
- and adjust the character encoding accordingly, if a BOM is found.</p>
- </answer>
- </faq>
-
- <faq id="approx_functions">
- <question>Approximated aggregate functions</question>
- <answer>
- <p>Sometimes it can be costly to do aggregate functions and maybe you're not always interested
- in the exact measure it generates, but just an approximated value. In MetaModel 1.5 you can set
- a special <i>FunctionApproximationAllowed</i> flag on a select item and MetaModel will use this
- to apply optimizations if this is possible.</p>
- <p>An example of a situation where it makes sense to use approximation is counting rows in very
- large (millions of rows) CSV files. Some times you're only interested in getting an rough idea of the
- amount of rows and this can be generated by sampling the file and counting lines. In such cases
- approximated aggregates introduce a huge performance improvement, but are of course only applicable
- where such an approximation is acceptable.</p>
- </answer>
- </faq>
-
- <faq id="excel_formulas">
- <question>Support for Excel formulas</question>
- <answer>
- <p>Excel formulas are automatically being evaluated in MetaModel 1.5. This means that your spreadsheet
- data can contain calculated values expressed as formulas. This feature is automatic and transparent to
- the user but will prevent the formula string from popping up as a data value.</p>
- </answer>
- </faq>
- </part>
-
- <part id="api">
- <title>Changes to the existing API</title>
-
- <faq id="immutable">
- <question>Immutable schema structures</question>
- <answer>
- <p>Previously the schema structure in MetaModel was mutable, meaning that you
- could change it even though it was being generated based on your datastore.</p>
- <p>This was actually an unwanted consequence of a too naive schema structure type
- system so we changed it in MetaModel 1.5. Basically it should not create problems
- for any users who have used the API as intended.</p>
- <p>Users wanting to manipulate schema structures (eg. for test purposes etc.) will
- find that there are now special subtypes for this purpose: MutableSchema, MutableTable,
- MutableColumn etc.</p>
- </answer>
- </faq>
-
- <faq id="org_package">
- <question>Root package rename</question>
- <answer>
- <p>As of version 1.5 the root package of MetaModel has changed from the old
- <i>dk.eobjects.metamodel</i> to <b>org.eobjects.metamodel</b>. We're painfully
- aware that this will break backwards compatibility because the new version is
- no longer a "drop in replacement" but on the other hand, to fix it is extremely
- simple: Simply do a text-based search and replace, replacing "dk.eobjects.metamodel"
- with "org.eobjects.metamodel".</p>
- </answer>
- </faq>
-
- <faq id="interfaces">
- <question>Everything as an interface</question>
- <answer>
- <p>All the main types in MetaModel (Schema, Table, Column, Relationship, DataSet,
- Row etc.) are now interfaces. This means it is significantly easier to write test-code
- that uses mock objects with MetaModel.</p>
- </answer>
- </faq>
-
- <faq id="slf4j">
- <question>Switch from commons-logging to slf4j</question>
- <answer>
- <p>Logging in Java have unfortunately been a complicated matter for a long time. One
- of the projects that have been gathering a lot of support is
- <a href="http://www.slf4j.org/" target="_blank">slf4j</a> which delivers a
- way to support multiple logging frameworks without all the (or at least less) hazzle
- of multiple configurations, jar files etc. Slf4j is a facade for just about any other
- logging framework, giving you both a simple way to get started and the choice to
- fine-tune if you need it.</p>
- <p>MetaModel 1.5 is now logging completely based on slf4j.</p>
- </answer>
- </faq>
-
- <faq id="dependencies">
- <question>Fewer external dependencies</question>
- <answer>
- <p>MetaModel 1.5 has way less dependencies than earlier versions. This change was made to
- make it easier to adopt MetaModel without a lot of concequences for you classpath in big
- projects.</p>
- </answer>
- </faq>
-
- <faq id="tweaks_and_enhancements">
- <question>Enhancements and optimization of native query translation</question>
- <answer>
- <p>For databases there have been quite a lot of minor tweaks which help optimize
- queries and metadata retrieval for various databases. For example:</p>
- <ul>
- <li>Escaping of strings in WHERE and HAVING clauses was significantly
- improved and works across different SQL dialects.</li>
- <li>In Microsoft SQL Server, we are now using the schema name "dbo" as the
- default schema if no better candidates are found.</li>
- </ul>
- </answer>
- </faq>
- </part>
-
- <part id="bugfixes">
- <title>Bugfixes</title>
- <faq id="csv_inputstream">
- <question>Handling of InputStream with CSV content</question>
- <answer>A bug was fixed related to temporary storage of an InputStream CSV content.</answer>
- </faq>
- <faq id="qualified_label_dot">
- <question>Qualified labels with dots in table names</question>
- <answer>Some schema structure elements, such as tables, can in rare circumstances
- contain dots in their names. The parser for qualified labels of tables and columns
- was not aware of this and thus interpreted any dots as delimitors, which caused it
- to not resolve qualified labels correctly.</answer>
- </faq>
- <faq id="qualified_label_null">
- <question>Qualified labels for schemas without a name</question>
- <answer>In some circumstances a schema will have no name. Therefore the qualified
- label for an item within that schema will not have a prepended schema name. The
- qualified label parser was not aware of this, and that has been fixed.</answer>
- </faq>
- <faq id="subquery_filter_item">
- <question>Inclusion of columns in subquery filter items</question>
- <answer>A bug was fixed in MetaModel's internal query engine, which was related
- to evaluation of columns that are only referenced in subquery filter items
- (WHERE or HAVING clause).</answer>
- </faq>
- </part>
-</faqs>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/58bdfce5/src/site/fml/whats_new_1.6.fml
----------------------------------------------------------------------
diff --git a/src/site/fml/whats_new_1.6.fml b/src/site/fml/whats_new_1.6.fml
deleted file mode 100644
index 7be5b08..0000000
--- a/src/site/fml/whats_new_1.6.fml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faqs xmlns="http://maven.apache.org/FML/1.0.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/FML/1.0.1 http://maven.apache.org/xsd/fml-1.0.1.xsd"
- title="What's new in MetaModel 1.6" toplink="false">
-
- <part id="features">
- <title>New features</title>
-
- <faq id="fixed_width">
- <question>Fixed width value files</question>
- <answer>
- <p>In MetaModel 1.6 we've added support for Fixed width value files. Such files are common mostly in legacy systems but it still shows to be quite valuable to be able to read them.</p>
- <p>To create a DataContext based on a fixed width value file, use the corresponding factory method:</p>
- <div class="source">
-<pre>DataContext dc = DataContextFactory.createFixedWidthDataContext(...);</pre>
- </div>
- </answer>
- </faq>
-
- <faq id="db2_support">
- <question>Support for DB2</question>
- <answer>
- <p>We've been in contact with quite a few users using IBM's DB2 database and in close cooperation we've managed to make the nescesary changes to the SQL-generation that was needed to make DB2 work.</p>
- </answer>
- </faq>
-
- </part>
-
- <part id="api">
- <title>Changes to the existing API</title>
-
- <faq id="first_row">
- <question>First row (aka. offset) selection in queries</question>
- <answer>
- <p>We've added a feature to the Query API so that you can specify the first row (aka. query offset) that you want in your result. This allows for much better paging capabilities, in combination with the existing "max rows" property.</p>
- </answer>
- </faq>
-
-
- </part>
-</faqs>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/58bdfce5/src/site/fml/whats_new_1.7.fml
----------------------------------------------------------------------
diff --git a/src/site/fml/whats_new_1.7.fml b/src/site/fml/whats_new_1.7.fml
deleted file mode 100644
index 03d0413..0000000
--- a/src/site/fml/whats_new_1.7.fml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faqs xmlns="http://maven.apache.org/FML/1.0.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/FML/1.0.1 http://maven.apache.org/xsd/fml-1.0.1.xsd"
- title="What's new in MetaModel 1.7" toplink="false">
-
- <part id="features">
- <title>New features</title>
-
- <faq id="column_name_line_numbers">
- <question>Configuration of header (column name) line numbers</question>
- <answer>
- <p>When reading CSV files, fixed width files and Excel spreadsheets it is now possible to supply which line/row number to use for column headers.</p>
- <p>Alternatively you can also specify to NOT interpret any lines as the header - in such a case columns will be named using an alphabetical approach like the headers of a spreadsheet: A, B, C... Z, AA, AB etc.</p>
- </answer>
- </faq>
-
- <faq id="excel_skipping_lines_and_columns">
- <question>Configuration of line and column skipping in Excel</question>
- <answer>
- <p>In the Excel module configuration of automatic skipping of empty lines and columns have been made available. Previously the default strategy would always applied: Skip empty lines, not empty columns.</p>
- </answer>
- </faq>
-
- </part>
-
- <part id="api">
- <title>Changes to the existing API</title>
-
- <faq id="strategy_pattern">
- <question>Removal of IDataContextStrategy interface and strategy pattern</question>
- <answer>
- <p>From early on we've had a single DataContext implementation (the DefaultDataContext class) that took a strategy as a parameter. This led to design where it was very inconvenient to get access to datastore-specific features as well as to instantiate DataContexts without using the factory.</p>
- <p>While you could argue that both these concerns are not main goals of MetaModel (actually quite the opposite), they are still sometimes nescesary for the expert users. For this reason we decided to remove the IDataContextStrategy interface and let all strategy implementations be actual DataContext implementations instead. The result is a more straight-forward class hierarchy which we think will make life easier for people new to MetaModel.</p>
- </answer>
- </faq>
-
- <faq id="poi_upgrade">
- <question>Apache POI upgraded to 3.7</question>
- <answer>
- <p>Apache POI (used for Excel support in MetaModel) has been updated from version 3.6 to version 3.7.</p>
- </answer>
- </faq>
-
- <faq id="csv_line_inconsistency">
- <question>Option to disable graceful handling of CSV line inconsistencies</question>
- <answer>
- <p>MetaModel has always had a feature to gracefully handle differences in line lengths for CSV files. Sometimes you want to be notified of such inconsistencies if your application should instead crash.</p>
- <p>To accomodate this requirement we've added a "failOnInconsistentRowLength" property in the CsvConfiguration class. We've also supplied the special exception type "InconsistentRowLengthException" which will be thrown if the property is set to true and an inconsistency occurs.</p>
- </answer>
- </faq>
-
- <faq id="dataset_iterable">
- <question>DataSet extends Iterable<Row></question>
- <answer>
- <p>The DataSet interface now extends Iterable<Row>. Among other niceties this allows for usage of DataSets in for-each loops, like this:</p>
- <div class="source">
-<pre>DataSet dataSet = ...;
-
-for (Row row : dataSet) {
- ...
-}</pre>
- </div>
- </answer>
- </faq>
- </part>
-
- <part id="bugfixes">
- <title>Bugfixes</title>
-
- <faq id="excel_file_handling">
- <question>Unnescesary opening of file streams in Excel support</question>
- <answer>
- <p>In previous versions there was a minor bug pertaining to the file stream handing in the Excel module. For every read of an Excel spreadsheet there would be two open file input streams. Although not significant, this bug has been fixed.</p>
- </answer>
- </faq>
- </part>
-</faqs>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/58bdfce5/src/site/fml/whats_new_2.0.fml
----------------------------------------------------------------------
diff --git a/src/site/fml/whats_new_2.0.fml b/src/site/fml/whats_new_2.0.fml
deleted file mode 100644
index f974d89..0000000
--- a/src/site/fml/whats_new_2.0.fml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faqs xmlns="http://maven.apache.org/FML/1.0.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/FML/1.0.1 http://maven.apache.org/xsd/fml-1.0.1.xsd"
- title="What's new in MetaModel 2.0" toplink="false">
-
- <part id="features">
- <title>New features</title>
-
- <faq id="update_api">
- <question>API for performing updates (write operations) on data</question>
- <answer>
- <p>The major story for MetaModel 2.0 has been to enable writing of data to your
- datastores. To allow this we've designed an API for updating data that has high
- isolation properties, provides fluent update builders and works cross different
- datastore backends.</p>
- <ul>
- <li>There's an example of the new API on the
- <a href="example_inserting_data.html">Inserting data</a> example page.</li>
- <li>And the API documentation for the new <a href="apidocs/org/eobjects/metamodel/UpdateableDataContext.html">UpdateableDataContext</a> interface also describes the mechanism.</li>
- </ul>
- <p>The new update API supports creating tables and inserting records into tables.</p>
- </answer>
- </faq>
-
- <faq id="update_csv_excel_jdbc">
- <question>Create data in CSV files, Excel spreadsheets and JDBC databases</question>
- <answer>
- <p>The data updating API has been implemented for CSV files, Excel spreadsheets
- and JDBC databases. While we want to provide implementations for the remaining
- datastores also, these are our first set which
- covers the most popular datastore types.</p>
- </answer>
- </faq>
-
- <faq id="styling">
- <question>Support for visual styling of values</question>
- <answer>
- <p>Some datastores (Excel in particular) support visual styling of values. In MetaModel
- 2.0 we include the ability to get styling attributes of values in order to see eg. if
- values are colored, written in bold text or have other special visual representations.
- Styling in MetaModel is compatible with Cascading Style Sheets capabilities, so it allows
- for easy utilization in web applications and the like.</p>
- <p>The styling information is available in the Row interface, which now includes a number
- of getStyle(...) methods.</p>
- </answer>
- </faq>
- </part>
-
- <part id="api">
- <title>Changes to the existing API</title>
-
- <faq id="packages_structure">
- <question>Modularization of packages</question>
- <answer>
- <p>The packages in MetaModel have been slightly revised. Each datastore
- module now has it's own package, such as <i>org.eobjects.metamodel.jdbc</i>
- and <i>org.eobjects.metamodel.csv</i>.</p>
- <p>If you've used the DataContextFactory to retrieve your DataContexts,
- then there should be no need for changing consuming code.</p>
- </answer>
- </faq>
-
- <faq id="in_operator">
- <question>Use of IN operator</question>
- <answer>
- <p>For the first time in MetaModel's history, we've added an operator, namely IN.</p>
- <p>IN works in MetaModel like it works in SQL. It allows you to define an array or collection
- of values that you wish to use in a WHERE clause, and set a filter that includes any record
- where the value of the record match with either of the values in your IN set.</p>
- </answer>
- </faq>
-
- <faq id="core_and_querypostprocessor_merge">
- <question>Core and Querypostprocessor modules have been merged</question>
- <answer>
- <p>The two modules "MetaModel-core" and "MetaModel-querypostprocessor" have been merged,
- and are now just "MetaModel-core". The reason for this was that there was a common
- dependency for both modules by all other modules and also a strong interdependency
- between the two. For the sake of managability and ease for our contributors, the two
- modules are now merged.</p>
- </answer>
- </faq>
-
- </part>
-
-</faqs>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/58bdfce5/src/site/fml/whats_new_2.1.fml
----------------------------------------------------------------------
diff --git a/src/site/fml/whats_new_2.1.fml b/src/site/fml/whats_new_2.1.fml
deleted file mode 100644
index ec9acf4..0000000
--- a/src/site/fml/whats_new_2.1.fml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faqs xmlns="http://maven.apache.org/FML/1.0.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/FML/1.0.1 http://maven.apache.org/xsd/fml-1.0.1.xsd"
- title="What's new in MetaModel 2.1" toplink="false">
-
- <part id="features">
- <title>New features</title>
-
- <faq id="mongo_db_support">
- <question>MongoDB support</question>
- <answer>
- <p>MetaModel 2.1 ships with MongoDB support! This means that you can
- get a traditional table/column view on your schema-less MongoDB
- databases. The MongoDB implementation of MetaModel has a number of
- interesting features:
- </p>
- <ul>
- <li>Autodetection of schema structure. You can provide a MongoDB
- instance and let MetaModel autodetect an appropriate schema
- structure automatically (it will inspect the first 1000 documents
- of each document).
- </li>
- <li>Or you can specify your schema structure manually!</li>
- <li>
- You can even write data to MongoDB, since the MongoDB
- datacontext
- implements our
- <a href="/apidocs/org/eobjects/metamodel/UpdateableDataContext.html">UpdateableDataContext</a>
- interface.
- </li>
- </ul>
- <p>We think that the addition of MongoDB to the list of supported
- datastores is significant. Both because MongoDB is really rising in
- popularity, but also because it demonstrates how MetaModel can be
- applied and provide a consistent and typesafe querying interface,
- even to NoSQL databases.
- </p>
- <p>
- The new MongoDB support is provided through the
- <a
- href="/apidocs/org/eobjects/metamodel/mongodb/MongoDbDataContext.html">MongoDbDataContext</a>
- class.
- </p>
- </answer>
- </faq>
-
- <faq id="xml_sax_support">
- <question>Fast and memory effecient XML reading (SAX based)
- </question>
- <answer>
- <p>Previously the XML support in MetaModel was based on DOM parsing
- which means that eventually the whole XML tree will be loaded into
- memory. That is of course not so memory effecient and not so fast
- as desired.
- </p>
- <p>MetaModel 2.1 provides a new strategy for parsing XML documents,
- in addition to the old DOM based one. The new strategy uses SAX
- parsing, which is a streaming approach that has a low memory
- footprint and a very quick response time.
- </p>
- <p>
- The new XML support is provided through the
- <a href="/apidocs/org/eobjects/metamodel/xml/XmlSaxDataContext.html">XmlSaxDataContext</a>
- class.
- </p>
- </answer>
- </faq>
-
- </part>
-
- <part id="bugfixes">
- <title>Bugfixes</title>
-
- <faq id="csv_append_newline">
- <question>CSV append newline issue</question>
- <answer>
- <p>There was an issue when inserting rows into CSV files, that an
- existing newline was assumed. If the CSV file where the rows were
- being inserted did not end on a newline, then the values would be
- appended to the existing last line. This bug has been fixed.
- </p>
- </answer>
- </faq>
- <faq id="jdbc_explicit_null">
- <question>Explicit inserting NULL in databases</question>
- <answer>
- <p>When inserting records into a database there is a difference on
- whether you insert NULL or if you just don't specify a value to
- insert. In 2.1 this issue has been fixed so that you can both
- insert NULLs or omit inserting a value (which will typically rely
- on the database to insert a default or generated value).
- </p>
- </answer>
- </faq>
- <faq id="excel_empty_string_parsing">
- <question>Empty string parsing in Excel</question>
- <answer>
- <p>There was an issue in the Excel adapter that caused it to throw
- an exception in certain situations where it would try to parse an
- empty string as a number. This issue has now been fixed.
- </p>
- </answer>
- </faq>
- </part>
-
-</faqs>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/58bdfce5/src/site/fml/whats_new_2.2.fml
----------------------------------------------------------------------
diff --git a/src/site/fml/whats_new_2.2.fml b/src/site/fml/whats_new_2.2.fml
deleted file mode 100644
index 3da9388..0000000
--- a/src/site/fml/whats_new_2.2.fml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faqs xmlns="http://maven.apache.org/FML/1.0.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/FML/1.0.1 http://maven.apache.org/xsd/fml-1.0.1.xsd"
- title="What's new in MetaModel 2.2" toplink="false">
-
- <part id="features">
- <title>New features</title>
-
- <faq id="interceptors">
- <question>Interceptors</question>
- <answer>
- <p>We've added an interceptor layer to MetaModel, which makes it possible for you to
- intercept operations just before or just after they have been executed. Use-cases of
- interceptors are many, but you might need them for migration purposes, for query
- rewriting or for logging or security.</p>
- <p>Using interceptors you can intercept schemas before they are returned to the user,
- queries before they are executed, datasets before they are returned, or update operations
- before they are written.</p>
- <p>Read the <a href="./example_interceptors.html">Using interceptors</a> page for examples and more information on interceptors.</p>
- </answer>
- </faq>
-
- <faq id="type_conversion">
- <question>Revised type conversion layer</question>
- <answer>
- <p>We've used the new interceptor layer to implement a type conversion layer which allows you to transparently convert
- values of certain column before they are read and written. For instance, you might want to interpret a column in a CSV file
- as numbers, even though the column is inherently a string column. With the new type mechanism, that operation is as easy as:</p>
- <blockquote>
- DataContext dc = ...;<br/>
- dc = Converters.addTypeConverter(dc, column, new StringToIntegerConverter());
- </blockquote>
- <p>Other examples might be to automatically compress and decompress byte arrays, or even serializing and deserializing complete objects to BLOBs.</p>
- <p>Read the <a href="./example_type_conversion.html">Automatic type conversion</a> page for examples and more information on type conversion.</p>
- </answer>
- </faq>
-
- <faq id="jdbc_batch_update_performance">
- <question>Improved JDBC batch update performance</question>
- <answer>
- <p>The JDBC module's update performance has been greatly improved by using prepared statements as well as committing only once per update.
- Since this is completely in line with the semantics of the existing API, the improvement is not something that you will notice in actual
- code, but expect a very nice performance improvement (depending on the DB) on execution of large update batches.</p>
- </answer>
- </faq>
- </part>
-
- <part id="api">
- <title>Changes to the existing API</title>
-
- <faq id="sanitized_type_transformers">
- <question>Sanitized the column type transformers feature</question>
- <answer>
- <p>MetaModel has offered conversion of types for a pretty long while, by using the ColumnTypeTransformer class.
- But with version 2.2 we've rewritten this layer to be based on the new interceptor mechanism. This means that you
- can now do type conversion of any column type and you no longer have to worry about changing the source columns' type to
- have this feature.</p>
- <p>The ColumnTypeTransformer class has been removed to make place for this new and better implementation of the same concept!</p>
- </answer>
- </faq>
-
- <faq id="jdbc_failover_strategy_removed">
- <question>Removed JDBC "complex query" failover strategy</question>
- <answer>We've removed a failover strategy feature from the JDBC module that we did not think was vaiable. The strategy
- would handle failing complex queries by falling back to a simple query variant and then use the Query Postprocessor
- for further treatment in case of failing complex queries. But an important issue remained, that the "simple failover query"
- might be a full table scan, which in case of large tables can be very bad for performance of the whole system. Therefore it was
- decided to let these issues fail (since they either way represent a query style that the database will not allow) and not attempt
- the failover strategy.</answer>
- </faq>
- </part>
-
- <part id="bugfixes">
- <title>Bugfixes</title>
-
- <faq id="jdbc_escape_quotes">
- <question>Quote escaping in database INSERT statements</question>
- <answer>
- <p>A bug was fixed, which pertained to the generation of INSERT statements and having quotes in the inserted values.</p>
- </answer>
- </faq>
- <faq id="mongodb_in_metamodel_full">
- <question>MongoDB added in MetaModel-full module</question>
- <answer>
- <p>Although MongoDB was officially added in MetaModel 2.1, it was by mistake not included as a dependency in the
- MetaModel-full module. It has now been added, so the 'full' maven dependency is easily manageable.</p>
- </answer>
- </faq>
- </part>
-
-</faqs>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/58bdfce5/src/site/fml/whats_new_3.0.fml
----------------------------------------------------------------------
diff --git a/src/site/fml/whats_new_3.0.fml b/src/site/fml/whats_new_3.0.fml
deleted file mode 100644
index 1f47eb8..0000000
--- a/src/site/fml/whats_new_3.0.fml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faqs xmlns="http://maven.apache.org/FML/1.0.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/FML/1.0.1 http://maven.apache.org/xsd/fml-1.0.1.xsd"
- title="What's new in MetaModel 3.0" toplink="false">
-
- <part id="features">
- <title>New features</title>
-
- <faq id="update_and_delete">
- <question>Execute UPDATE and DELETE operations</question>
- <answer>
- <p>With MetaModel 3.0 we now offer a full set of CRUD operations on your datastores! This means that in addition to querying and inserting records, you can now also update records and delete them.</p>
- <p>The UPDATE and DELETE operations can be fired on all UpdateableDataContext implementations, which currently include:</p>
- <ul>
- <li>JDBC databases</li>
- <li>CSV files</li>
- <li>Excel spreadsheets</li>
- <li>MongoDB databases</li>
- <li>CouchDB databases</li>
- </ul>
- </answer>
- </faq>
-
- <faq id="create_table_and_drop_table">
- <question>Execute CREATE TABLE and DROP TABLE operations</question>
- <answer>
- <p>In MetaModel 3.0 you're also now able to create and drop tables at runtime. For instance, you can use it to create temporary, but persistent tables, or dynamically fit your data model at runtime. Doing so is done using the executeUpdate(...) method on any of the UpdateableDataContext implementations, which currently include:</p>
- <ul>
- <li>JDBC databases</li>
- <li>CSV files</li>
- <li>Excel spreadsheets</li>
- <li>MongoDB databases</li>
- <li>CouchDB databases</li>
- </ul>
- <p>The notion of a 'table' differs a bit in these datastores, so take a look at the <a href="schema_and_table_semantics.html">Schema and table semantics</a> page for a full overview.</p>
- </answer>
- </faq>
-
- <faq id="couchdb_datastore">
- <question>CouchDB support</question>
- <answer>
- <p>We have a brand new module in MetaModel 3.0 which offers CouchDB support! Now you can query and update your CouchDB database just like you would query any regular database.</p>
- </answer>
- </faq>
-
- <faq id="pojo_datastore">
- <question>A Java object based datastore</question>
- <answer>
- <p>Another new module in MetaModel 3.0: Java object support (aka. the POJO module). While this might not seem so impressive at first, it is actually quite useful. You can use for instance for unittesting purposes or to allow users to test-drive your data flows using simple in-memory data.</p>
- </answer>
- </faq>
-
- <faq id="primary_key_awareness">
- <question>Primary key awareness</question>
- <answer>
- <p>MetaModel is now aware of primary keys. Obviously this is extremely important when dealing with UPDATE and DELETE operations. Therefore you will find two new methods: <i>Table.getPrimaryKeys()</i> and <i>Column.isPrimaryKey()</i>.</p>
- </answer>
- </faq>
- </part>
-
- <part id="api">
- <title>Changes to the existing API</title>
-
- <faq id="map_and_list_data_types">
- <question>New column types: List and Map</question>
- <answer>
- <p>With the widening of the support for NoSQL datastores like MongoDB and CouchDB, we've seen a need for new column types. We've introduced <i>LIST</i> and <i>MAP</i> for this purpose. They map to <i>java.util.List</i> and <i>java.util.Map</i> and allow for these datastore types to represent the full documents contained within them.</p>
- </answer>
- </faq>
-
- <faq id="first_row_semantics">
- <question>Semantics of "row number" changed from 0-based to 1-based.</question>
- <answer>
- <p>An important API change for MetaModel in order to improve consistency with other similar libraries: We've changed the row number concept from a <b>0-based</b> index concept to being a <b>1-based</b> row number concept! This was done in order to comply with typical usage of row numbers in eg. SQL LIMIT clauses, Spreadsheet applications, the JPA specification and more.</p>
- <p>On the down-side, this means that the semantics have changed for a number of methods or classes:</p>
- <ul>
- <li>The <i>Query.setFirstRow(Integer)</i> and <i>Query.getFirstRow()</i> methods.</li>
- <li>The <i>CsvConfiguration</i> constructor parameter '<i>columnNameLineNumber</i>'. Note that the constants NO_COLUMN_NAME_LINE and DEFAULT_COLUMN_NAME_LINE have been adjusted, so when using these constants, no change is needed.</li>
- <li>The <i>FixedWidthConfiguration</i> constructor parameter '<i>columnNameLineNumber</i>'. Note that the constants NO_COLUMN_NAME_LINE and DEFAULT_COLUMN_NAME_LINE have been adjusted, so when using these constants, no change is needed.</li>
- <li>The <i>ExcelConfiguration</i> constructor parameter '<i>columnNameLineNumber</i>'. Note that the constants NO_COLUMN_NAME_LINE and DEFAULT_COLUMN_NAME_LINE have been adjusted, so when using these constants, no change is needed.</li>
- <li>The <i>FirstRowDataSet</i> constructor parameter '<i>firstRow</i>' (rarely used).</li>
- </ul>
- <p>We encourage you to check your usage of these methods or classes before upgrading to MetaModel 3.0. Make sure you switch from a 0-based to a 1-based approach when using them.</p>
- </answer>
- </faq>
-
- <faq id="higher_than_greater_than">
- <question>Operator 'Higher/lower than' renamed to 'Greater/less than'.</question>
- <answer>
- <p>The operator types <i>HIGHER_THAN</i> and <i>LOWER_THAN</i> have been deprecated. Use the new <i>GREATER_THAN</i> and <i>LESS_THAN</i> instead.</p>
- </answer>
- </faq>
-
- <faq id="query_select_item_in_subquery">
- <question>Allowed referencing a column in a specific aliased table</question>
- <answer>
- <p>We've made it possible to construct a <i>SelectItem</i> with a reference to a specific <i>FromItem</i> which means that in case you are referencing the same table multiple times in a query, you can then pinpoint which one a specific select item references.</p>
- </answer>
- </faq>
-
- <faq id="logging_level">
- <question>Logging level moderations</question>
- <answer>
- <p>The logging level (especially for the JDBC module) has been moderated to not include as much information in the INFO level as before. This means that you will no longer get eg. the full SQL query in the INFO level, which is an improvement for the security of INFO-logged applications.</p>
- </answer>
- </faq>
-
- <faq id="totablemodel_deprecation">
- <question>Deprecation of DataSet.toTableModel()</question>
- <answer>
- <p>The method <i>DataSet.toTableModel()</i> has been deprecated, and we plan on removing it entirely from version 3.1. This is to prevent any hick-ups in environments where the <i>javax.swing</i> package is prohibited (eg. in some OSGi environments) or even not existing (eg. in future Java 8 Jigsaw-based deployments). Users of the method are encouraged to use the class <i>DataSetTableModel</i> instead, which yields the same result.</p>
- </answer>
- </faq>
- </part>
-
- <part id="bugfixes">
- <title>Bugfixes</title>
-
- <faq id="jdbc_boolean">
- <question>Fixed index-issue in handling of boolean JDBC values</question>
- <answer>
- <p>An issue with retreiving JDBC boolean values was discovered and fixed.</p>
- </answer>
- </faq>
-
- </part>
-
-</faqs>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/58bdfce5/src/site/fml/whats_new_3.1.fml
----------------------------------------------------------------------
diff --git a/src/site/fml/whats_new_3.1.fml b/src/site/fml/whats_new_3.1.fml
deleted file mode 100644
index 448c9d0..0000000
--- a/src/site/fml/whats_new_3.1.fml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faqs xmlns="http://maven.apache.org/FML/1.0.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/FML/1.0.1 http://maven.apache.org/xsd/fml-1.0.1.xsd"
- title="What's new in MetaModel 3.1" toplink="false">
-
- <part id="features">
- <title>New features</title>
-
- <faq id="parse_execute_string_query">
- <question>Parse and execute String queries</question>
- <answer>
- <p>The main feature of MetaModel 3.1 is the ability to pass String-based queries to MetaModel.</p>
- <p>String-based queries is not something we encourage using, but for some purposes it is really useful or maybe even required. For instance, some applications might provide the user with an option to inspect and optionally modify a query before it is executed - and doing so using a String editor would do that trick.</p>
- <p>The consequence for MetaModel's API is that two new methods have been added to the DataContext interface. The <a href="http://metamodel.eobjects.org/apidocs/org/eobjects/metamodel/DataContext.html#parseQuery(java.lang.String)">parseQuery(String)</a> method which allows transforming a String query into a Query object:</p>
- <blockquote>
- DataContext dc = ...<br/>
- Query query = dc.parseQuery("SELECT * FROM persons");
- </blockquote>
- <p>And the <a href="http://metamodel.eobjects.org/apidocs/org/eobjects/metamodel/DataContext.html#executeQuery(java.lang.String)">executeQuery(String)</a> method which allows executing the query directly:</p>
- <blockquote>
- DataContext dc = ...<br/>
- DataSet dataSet = dc.executeQuery("SELECT * FROM persons");
- </blockquote>
- </answer>
- </faq>
- </part>
-
- <part id="api">
- <title>Changes to the existing API</title>
-
- <faq id="filterbuilder_shortcuts">
- <question>FilterBuilder shortcut methods</question>
- <answer>
- <p>The <a href="http://metamodel.eobjects.org/apidocs/org/eobjects/metamodel/query/builder/FilterBuilder.html">FilterBuilder</a> interface and it's implementations (used in query building as well as the WHERE-part of UPDATE statements) have been modified to introduce a series of 'shortcut' methods. These methods with names such as 'eq', 'ne', 'lt' and 'gt' provide a more convenient, short way of expressing the operator of your filters. Furthermore the equals(...) methods have been deprecated since the method name overlapped with <i>Object.equals(Object)</i>.</p>
- </answer>
- </faq>
- </part>
-
- <part id="bugfixes">
- <title>Bugfixes</title>
-
- <faq id="tempdir_system_property">
- <question>Ineffective temp dir resolver</question>
- <answer>
- <p>We discovered a bug pertaining to how the temporary directory was resolved and used for various purposes. This was a minor bug, but should marginally increase performance.</p>
- </answer>
- </faq>
-
- </part>
-
-</faqs>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/58bdfce5/src/site/fml/whats_new_3.2.fml
----------------------------------------------------------------------
diff --git a/src/site/fml/whats_new_3.2.fml b/src/site/fml/whats_new_3.2.fml
deleted file mode 100644
index 204eafc..0000000
--- a/src/site/fml/whats_new_3.2.fml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faqs xmlns="http://maven.apache.org/FML/1.0.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/FML/1.0.1 http://maven.apache.org/xsd/fml-1.0.1.xsd"
- title="What's new in MetaModel 3.2" toplink="false">
-
- <part id="features">
- <title>New features</title>
-
- <faq id="compiled_queries">
- <question>Compiled queries</question>
- <answer>
- <p>A new feature was added, making it possible to compile often used queries. This will provide a performance gain when queries are fired multiple times.</p>
- <p>For details and an example of using compiled queries, check out the new <a href="example_compiled_queries.html">Compiled queries</a> example page.</p>
- </answer>
- </faq>
-
- <faq id="dataset_index_caching">
- <question>DataSet index caching</question>
- <answer>
- <p>Another performance improvement has been added by adding caching of Column and SelectItem indexes in DataSets. This makes the resolving of values pertaining to particular Columns or SelectItems have near-constant access time, without having to know it's column index.</p>
- </answer>
- </faq>
- </part>
-
- <!--
- <part id="api">
- <title>Changes to the existing API</title>
-
- <faq id="TODO">
- <question>TODO</question>
- <answer>
- <p>TODO.</p>
- </answer>
- </faq>
- </part>
-
- <part id="bugfixes">
- <title>Bugfixes</title>
-
- <faq id="TODO">
- <question>TODO</question>
- <answer>
- <p>TODO.</p>
- </answer>
- </faq>
-
- </part>
- -->
-</faqs>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/58bdfce5/src/site/fml/whats_new_3.3.fml
----------------------------------------------------------------------
diff --git a/src/site/fml/whats_new_3.3.fml b/src/site/fml/whats_new_3.3.fml
deleted file mode 100644
index 6b076e7..0000000
--- a/src/site/fml/whats_new_3.3.fml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faqs xmlns="http://maven.apache.org/FML/1.0.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/FML/1.0.1 http://maven.apache.org/xsd/fml-1.0.1.xsd"
- title="What's new in MetaModel 3.3" toplink="false">
-
- <part id="features">
- <title>New features</title>
-
- <faq id="salesforce_module">
- <question>Salesforce.com connectivity</question>
- <answer>
- <p>
- We've added a new module in MetaModel which allows connecting to the Salesforce.com cloud based CRM system.
- Connectivity is done through their online web services. Using this module you can both explore the structure
- of the Salesforce objects ("SObjects") and you can query, update, delete and insert new records into Salesforce.
- </p>
- <p>
- To help you get started, there's a <a href="example_salesforce_setup.html">new help page available</a> to help setting up your Salesforce.com connecting and firing your first queries etc.
- </p>
- </answer>
- </faq>
-
- <faq id="sugarcrm_module">
- <question>SugarCRM connectivity</question>
- <answer>
- <p>We've also added another CRM system to the portfolio of supported MetaModel systems: SugarCRM, the most popular open source CRM system.</p>
- <p>
- Support for SugarCRM goes through the SOAP interfaces of your SugarCRM installation.
- The MetaModel module is read-only, which does allow for nice integration and analysis situations,
- but not for pushing data back to SugarCRM.
- </p>
- </answer>
- </faq>
-
- <faq id="db2_first_row_and_max_rows">
- <question>DB2 support for First-Row and Max-Rows clauses</question>
- <answer>
- <p>We've improved the DB2 query adaptor part of the JDBC module, so that queries which specify a "Max rows" (aka LIMIT) or a "First row" (aka OFFSET) will be properly propagated to the SQL generated for DB2.</p>
- </answer>
- </faq>
-
- </part>
-
- <!--
- <part id="api">
- <title>Changes to the existing API</title>
-
- <faq id="TODO">
- <question>TODO</question>
- <answer>
- <p>TODO.</p>
- </answer>
- </faq>
- </part>
-
- <part id="bugfixes">
- <title>Bugfixes</title>
-
- <faq id="TODO">
- <question>TODO</question>
- <answer>
- <p>TODO.</p>
- </answer>
- </faq>
-
- </part>
- -->
-</faqs>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/58bdfce5/src/site/fml/whats_new_3.4.fml
----------------------------------------------------------------------
diff --git a/src/site/fml/whats_new_3.4.fml b/src/site/fml/whats_new_3.4.fml
deleted file mode 100644
index 3f646c6..0000000
--- a/src/site/fml/whats_new_3.4.fml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faqs xmlns="http://maven.apache.org/FML/1.0.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/FML/1.0.1 http://maven.apache.org/xsd/fml-1.0.1.xsd"
- title="What's new in MetaModel 3.4" toplink="false">
-
- <part id="features">
- <title>New features</title>
-
- <faq id="null_interpretation">
- <question>Clear interpretation of NULL</question>
- <answer>
- <p>
- We've made the interpretation of NULL consistent across MetaModel modules, in spite the fact
- that it is not consistent across all backing datastores. This means that now you can safely
- rely on MetaModel to adapt queries so that NULL values are always interpreted like they are
- in Java and most other programming languages. This also means that the SQL way of interpreting
- NULL is being handled by MetaModel, allowing you to not have to cross paradigms or port different
- queries to different datastores.
- </p>
- </answer>
- </faq>
-
- <faq id="simple_update_api">
- <question>Simple update API</question>
- <answer>
- <p>
- To make it even easier to perform updates on MetaModel datastores, we've added a number of "simple update" classes that you can pass along directly to the executeUpdate method of an updateable DataContext.
- </p>
- <ul>
- <li>new InsertInto(..)</li>
- <li>new Update(..)</li>
- <li>new DeleteFrom(..)</li>
- <li>new CreateTable(..)</li>
- <li>new DropTable(..)</li>
- </ul>
- <p>
- Using these classes, you can avoid having to implement the UpdateScript interface yourself. Also some of the DataContext implementations use these classes to determine that only a single update is to be executed, and may optimize accordingly.
- </p>
- </answer>
- </faq>
-
- <faq id="mongodb_locking_levels">
- <question>Ability to specify MongoDB locking levels</question>
- <answer>
- <p>
- It is now possible to specify a locking level advisor for MongoDB connections.
- This way you can either select a constant locking level, or have a component
- specify the locking level for individual actions.
- </p>
- </answer>
- </faq>
-
- <faq id="virtual_filesystem">
- <question>Virtualization of file references for CSV files, Excel spreadsheets and fixed width value files</question>
- <answer>
- <p>
- We've introduced a simple <i>Resource</i> interface which makes it possible to feed the CSV, Excel and Fixed Width DataContexts with not just a physical file, but any source of binary data. This way you can use MetaModel to read such data e.g. from FTP servers, HTTP or through other data transports.
- </p>
- </answer>
- </faq>
- </part>
-
- <!--
- <part id="api">
- <title>Changes to the existing API</title>
-
- <faq id="TODO">
- <question>TODO</question>
- <answer>
- <p>TODO.</p>
- </answer>
- </faq>
- </part>
- -->
-
- <part id="bugfixes">
- <title>Bugfixes</title>
-
- <faq id="aggregates_on_single_row">
- <question>Some aggregate queries yielded more than a single row</question>
- <answer>
- <p>A bug was fixed, which caused MetaModel to yield not a single, but a variable amount of rows containing aggregates, when the query also contained WHERE items.</p>
- </answer>
- </faq>
-
- <faq id="salesforce_table_serialization">
- <question>Serialization of Salesforce.com table issue</question>
- <answer>
- <p>A bug was fixed, which caused tables from Salesforce.com to not be properly serializable because of connection references.</p>
- </answer>
- </faq>
-
- </part>
-</faqs>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/58bdfce5/src/site/resources/bg.png
----------------------------------------------------------------------
diff --git a/src/site/resources/bg.png b/src/site/resources/bg.png
deleted file mode 100644
index c6ab41a..0000000
Binary files a/src/site/resources/bg.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/58bdfce5/src/site/resources/border-radius.htc
----------------------------------------------------------------------
diff --git a/src/site/resources/border-radius.htc b/src/site/resources/border-radius.htc
deleted file mode 100644
index b39af01..0000000
--- a/src/site/resources/border-radius.htc
+++ /dev/null
@@ -1,81 +0,0 @@
-<!--
-PIE: CSS3 rendering for IE
-Version 1.0beta4
-http://css3pie.com
-Dual-licensed for use under the Apache License Version 2.0 or the General Public License (GPL) Version 2.
--->
-<PUBLIC:COMPONENT lightWeight="true">
-<PUBLIC:ATTACH EVENT="oncontentready" FOR="element" ONEVENT="init()" />
-<PUBLIC:ATTACH EVENT="ondocumentready" FOR="element" ONEVENT="init()" />
-<PUBLIC:ATTACH EVENT="ondetach" FOR="element" ONEVENT="cleanup()" />
-
-<script type="text/javascript">
-var doc = element.document;var g=window.PIE;
-if(!g){g=window.PIE={F:"-pie-",Sa:"Pie",Pa:"pie_",Jb:{TD:1,TH:1}};try{doc.execCommand("BackgroundImageCache",false,true)}catch(L){}g.J=function(){for(var a=4,b=doc.createElement("div"),c=b.getElementsByTagName("i");b.innerHTML="<!--[if gt IE "+ ++a+"]><i></i><![endif]--\>",c[0];);return a}();if(g.J===6)g.F=g.F.replace(/^-/,"");g.Ab=doc.documentMode||g.J;(function(){var a,b=0,c={};g.p={Ga:function(e){if(!a){a=doc.createDocumentFragment();a.namespaces.add("css3vml","urn:schemas-microsoft-com:vml")}return a.createElement("css3vml:"+e)},
-ta:function(e){return e&&e._pieId||(e._pieId=++b)},fb:function(e){var f,h,j,d,i=arguments;f=1;for(h=i.length;f<h;f++){d=i[f];for(j in d)if(d.hasOwnProperty(j))e[j]=d[j]}return e},Pb:function(e,f,h){var j=c[e],d,i;if(j)Object.prototype.toString.call(j)==="[object Array]"?j.push([f,h]):f.call(h,j);else{i=c[e]=[[f,h]];d=new Image;d.onload=function(){j=c[e]={i:d.width,f:d.height};for(var k=0,m=i.length;k<m;k++)i[k][0].call(i[k][1],j);d.onload=null};d.src=e}}}})();g.ia=function(){this.hb=[];this.Db={}};
-g.ia.prototype={aa:function(a){var b=g.p.ta(a),c=this.Db,e=this.hb;if(!(b in c)){c[b]=e.length;e.push(a)}},Ma:function(a){a=g.p.ta(a);var b=this.Db;if(a&&a in b){delete this.hb[b[a]];delete b[a]}},Ia:function(){for(var a=this.hb,b=a.length;b--;)a[b]&&a[b]()}};g.ya=new g.ia;g.ya.Tc=function(){var a=this;if(!a.Uc){setInterval(function(){a.Ia()},250);a.Uc=1}};g.G=new g.ia;window.attachEvent("onbeforeunload",function(){g.G.Ia()});g.G.Ea=function(a,b,c){a.attachEvent(b,c);this.aa(function(){a.detachEvent(b,
-c)})};(function(){function a(){g.za.Ia()}g.za=new g.ia;g.G.Ea(window,"onresize",a)})();(function(){function a(){g.Ra.Ia()}g.Ra=new g.ia;g.G.Ea(window,"onscroll",a);g.za.aa(a)})();(function(){function a(){c=g.Qa.wc()}function b(){if(c){for(var e=0,f=c.length;e<f;e++)g.attach(c[e]);c=0}}var c;g.G.Ea(window,"onbeforeprint",a);g.G.Ea(window,"onafterprint",b)})();g.hd=function(){function a(i){this.V=i}var b=doc.createElement("length-calc"),c=doc.documentElement,e=b.style,f={},h=["mm","cm","in","pt","pc"],
-j=h.length,d={};e.position="absolute";e.top=e.left="-9999px";for(c.appendChild(b);j--;){b.style.width="100"+h[j];f[h[j]]=b.offsetWidth/100}c.removeChild(b);a.prototype={ib:/(px|em|ex|mm|cm|in|pt|pc|%)$/,vb:function(){var i=this.Lc;if(i===void 0)i=this.Lc=parseFloat(this.V);return i},ab:function(){var i=this.ad;if(!i)i=this.ad=(i=this.V.match(this.ib))&&i[0]||"px";return i},a:function(i,k){var m=this.vb(),l=this.ab();switch(l){case "px":return m;case "%":return m*(typeof k==="function"?k():k)/100;
-case "em":return m*this.tb(i);case "ex":return m*this.tb(i)/2;default:return m*f[l]}},tb:function(i){var k=i.currentStyle.fontSize;if(k.indexOf("px")>0)return parseFloat(k);else{b.style.width="1em";i.appendChild(b);k=b.offsetWidth;b.parentNode===i&&i.removeChild(b);return k}}};g.k=function(i){return d[i]||(d[i]=new a(i))};return a}();g.Na=function(){function a(f){this.U=f}var b=g.k("50%"),c={top:1,center:1,bottom:1},e={left:1,center:1,right:1};a.prototype={Dc:function(){if(!this.sb){var f=this.U,
-h=f.length,j=g.u,d=j.ja,i=g.k("0");d=d.fa;i=["left",i,"top",i];if(h===1){f.push(new j.Ta(d,"center"));h++}if(h===2){d&(f[0].h|f[1].h)&&f[0].d in c&&f[1].d in e&&f.push(f.shift());if(f[0].h&d)if(f[0].d==="center")i[1]=b;else i[0]=f[0].d;else if(f[0].Y())i[1]=g.k(f[0].d);if(f[1].h&d)if(f[1].d==="center")i[3]=b;else i[2]=f[1].d;else if(f[1].Y())i[3]=g.k(f[1].d)}this.sb=i}return this.sb},coords:function(f,h,j){var d=this.Dc(),i=d[1].a(f,h);f=d[3].a(f,j);return{x:d[0]==="right"?h-i:i,y:d[2]==="bottom"?
-j-f:f}}};return a}();g.Rb=function(){function a(b){this.V=b}a.prototype={ib:/[a-z]+$/i,ab:function(){return this.lc||(this.lc=this.V.match(this.ib)[0].toLowerCase())},vc:function(){var b=this.fc,c;if(b===undefined){b=this.ab();c=parseFloat(this.V,10);b=this.fc=b==="deg"?c:b==="rad"?c/Math.PI*180:b==="grad"?c/400*360:b==="turn"?c*360:0}return b}};return a}();g.$b=function(){function a(c){this.V=c}var b={};a.Sc=/\s*rgba\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d+|\d*\.\d+)\s*\)\s*/;a.gb=
-{aliceblue:"F0F8FF",antiquewhite:"FAEBD7",aqua:"0FF",aquamarine:"7FFFD4",azure:"F0FFFF",beige:"F5F5DC",bisque:"FFE4C4",black:"000",blanchedalmond:"FFEBCD",blue:"00F",blueviolet:"8A2BE2",brown:"A52A2A",burlywood:"DEB887",cadetblue:"5F9EA0",chartreuse:"7FFF00",chocolate:"D2691E",coral:"FF7F50",cornflowerblue:"6495ED",cornsilk:"FFF8DC",crimson:"DC143C",cyan:"0FF",darkblue:"00008B",darkcyan:"008B8B",darkgoldenrod:"B8860B",darkgray:"A9A9A9",darkgreen:"006400",darkkhaki:"BDB76B",darkmagenta:"8B008B",darkolivegreen:"556B2F",
-darkorange:"FF8C00",darkorchid:"9932CC",darkred:"8B0000",darksalmon:"E9967A",darkseagreen:"8FBC8F",darkslateblue:"483D8B",darkslategray:"2F4F4F",darkturquoise:"00CED1",darkviolet:"9400D3",deeppink:"FF1493",deepskyblue:"00BFFF",dimgray:"696969",dodgerblue:"1E90FF",firebrick:"B22222",floralwhite:"FFFAF0",forestgreen:"228B22",fuchsia:"F0F",gainsboro:"DCDCDC",ghostwhite:"F8F8FF",gold:"FFD700",goldenrod:"DAA520",gray:"808080",green:"008000",greenyellow:"ADFF2F",honeydew:"F0FFF0",hotpink:"FF69B4",indianred:"CD5C5C",
-indigo:"4B0082",ivory:"FFFFF0",khaki:"F0E68C",lavender:"E6E6FA",lavenderblush:"FFF0F5",lawngreen:"7CFC00",lemonchiffon:"FFFACD",lightblue:"ADD8E6",lightcoral:"F08080",lightcyan:"E0FFFF",lightgoldenrodyellow:"FAFAD2",lightgreen:"90EE90",lightgrey:"D3D3D3",lightpink:"FFB6C1",lightsalmon:"FFA07A",lightseagreen:"20B2AA",lightskyblue:"87CEFA",lightslategray:"789",lightsteelblue:"B0C4DE",lightyellow:"FFFFE0",lime:"0F0",limegreen:"32CD32",linen:"FAF0E6",magenta:"F0F",maroon:"800000",mediumauqamarine:"66CDAA",
-mediumblue:"0000CD",mediumorchid:"BA55D3",mediumpurple:"9370D8",mediumseagreen:"3CB371",mediumslateblue:"7B68EE",mediumspringgreen:"00FA9A",mediumturquoise:"48D1CC",mediumvioletred:"C71585",midnightblue:"191970",mintcream:"F5FFFA",mistyrose:"FFE4E1",moccasin:"FFE4B5",navajowhite:"FFDEAD",navy:"000080",oldlace:"FDF5E6",olive:"808000",olivedrab:"688E23",orange:"FFA500",orangered:"FF4500",orchid:"DA70D6",palegoldenrod:"EEE8AA",palegreen:"98FB98",paleturquoise:"AFEEEE",palevioletred:"D87093",papayawhip:"FFEFD5",
-peachpuff:"FFDAB9",peru:"CD853F",pink:"FFC0CB",plum:"DDA0DD",powderblue:"B0E0E6",purple:"800080",red:"F00",rosybrown:"BC8F8F",royalblue:"4169E1",saddlebrown:"8B4513",salmon:"FA8072",sandybrown:"F4A460",seagreen:"2E8B57",seashell:"FFF5EE",sienna:"A0522D",silver:"C0C0C0",skyblue:"87CEEB",slateblue:"6A5ACD",slategray:"708090",snow:"FFFAFA",springgreen:"00FF7F",steelblue:"4682B4",tan:"D2B48C",teal:"008080",thistle:"D8BFD8",tomato:"FF6347",turquoise:"40E0D0",violet:"EE82EE",wheat:"F5DEB3",white:"FFF",
-whitesmoke:"F5F5F5",yellow:"FF0",yellowgreen:"9ACD32"};a.prototype={parse:function(){if(!this.Ca){var c=this.V,e;if(e=c.match(a.Sc)){this.Ca="rgb("+e[1]+","+e[2]+","+e[3]+")";this.qb=parseFloat(e[4])}else{if((e=c.toLowerCase())in a.gb)c="#"+a.gb[e];this.Ca=c;this.qb=c==="transparent"?0:1}}},O:function(c){this.parse();return this.Ca==="currentColor"?c.currentStyle.color:this.Ca},la:function(){this.parse();return this.qb}};g.pa=function(c){return b[c]||(b[c]=new a(c))};return a}();g.u=function(){function a(c){this.Ha=
-c;this.ch=0;this.U=[];this.wa=0}var b=a.ja={xa:1,ob:2,ea:4,ac:8,pb:16,fa:32,A:64,ga:128,ha:256,Aa:512,dc:1024,URL:2048};a.Ta=function(c,e){this.h=c;this.d=e};a.Ta.prototype={db:function(){return this.h&b.A||this.h&b.ga&&this.d==="0"},Y:function(){return this.db()||this.h&b.Aa}};a.prototype={dd:/\s/,Mc:/^[\+\-]?(\d*\.)?\d+/,url:/^url\(\s*("([^"]*)"|'([^']*)'|([!#$%&*-~]*))\s*\)/i,zb:/^\-?[_a-z][\w-]*/i,Yc:/^("([^"]*)"|'([^']*)')/,Fc:/^#([\da-f]{6}|[\da-f]{3})/i,bd:{px:b.A,em:b.A,ex:b.A,mm:b.A,cm:b.A,
-"in":b.A,pt:b.A,pc:b.A,deg:b.xa,rad:b.xa,grad:b.xa},sc:{rgb:1,rgba:1,hsl:1,hsla:1},next:function(c){function e(t,n){t=new a.Ta(t,n);if(!c){k.U.push(t);k.wa++}return t}function f(){k.wa++;return null}var h,j,d,i,k=this;if(this.wa<this.U.length)return this.U[this.wa++];for(;this.dd.test(this.Ha.charAt(this.ch));)this.ch++;if(this.ch>=this.Ha.length)return f();j=this.ch;h=this.Ha.substring(this.ch);d=h.charAt(0);switch(d){case "#":if(i=h.match(this.Fc)){this.ch+=i[0].length;return e(b.ea,i[0])}break;
-case '"':case "'":if(i=h.match(this.Yc)){this.ch+=i[0].length;return e(b.dc,i[2]||i[3]||"")}break;case "/":case ",":this.ch++;return e(b.ha,d);case "u":if(i=h.match(this.url)){this.ch+=i[0].length;return e(b.URL,i[2]||i[3]||i[4]||"")}}if(i=h.match(this.Mc)){d=i[0];this.ch+=d.length;if(h.charAt(d.length)==="%"){this.ch++;return e(b.Aa,d+"%")}if(i=h.substring(d.length).match(this.zb)){d+=i[0];this.ch+=i[0].length;return e(this.bd[i[0].toLowerCase()]||b.ac,d)}return e(b.ga,d)}if(i=h.match(this.zb)){d=
-i[0];this.ch+=d.length;if(d.toLowerCase()in g.$b.gb||d==="currentColor")return e(b.ea,d);if(h.charAt(d.length)==="("){this.ch++;if(d.toLowerCase()in this.sc){h=function(t){return t&&t.h&b.ga};i=function(t){return t&&t.h&(b.ga|b.Aa)};var m=function(t,n){return t&&t.d===n},l=function(){return k.next(1)};if((d.charAt(0)==="r"?i(l()):h(l()))&&m(l(),",")&&i(l())&&m(l(),",")&&i(l())&&(d==="rgb"||d==="hsa"||m(l(),",")&&h(l()))&&m(l(),")"))return e(b.ea,this.Ha.substring(j,this.ch));return f()}return e(b.pb,
-d)}return e(b.fa,d)}this.ch++;return e(b.ob,d)},z:function(){return this.U[this.wa-- -2]},all:function(){for(;this.next(););return this.U},da:function(c,e){for(var f=[],h,j;h=this.next();){if(c(h)){j=true;this.z();break}f.push(h)}return e&&!j?null:f}};return a}();var M=function(a){this.e=a};M.prototype={K:0,Qc:function(){var a=this.Ua,b;return!a||(b=this.o())&&(a.x!==b.x||a.y!==b.y)},Vc:function(){var a=this.Ua,b;return!a||(b=this.o())&&(a.i!==b.i||a.f!==b.f)},ub:function(){var a=this.e.getBoundingClientRect();
-return{x:a.left,y:a.top,i:a.right-a.left,f:a.bottom-a.top}},o:function(){return this.K?this.Da||(this.Da=this.ub()):this.ub()},Ec:function(){return!!this.Ua},Ja:function(){++this.K},La:function(){if(!--this.K){if(this.Da)this.Ua=this.Da;this.Da=null}}};(function(){function a(b){var c=g.p.ta(b);return function(){if(this.K){var e=this.rb||(this.rb={});return c in e?e[c]:(e[c]=b.call(this))}else return b.call(this)}}g.s={K:0,$:function(b){function c(e){this.e=e}g.p.fb(c.prototype,g.s,b);c.kc={};return c},
-m:function(){var b=this.qa(),c=this.constructor.kc;return b?b in c?c[b]:(c[b]=this.ba(b)):null},qa:a(function(){var b=this.e,c=this.constructor,e=b.style;b=b.currentStyle;var f=this.na,h=this.va,j=c.ic||(c.ic=g.F+f);c=c.jc||(c.jc=g.Sa+h.charAt(0).toUpperCase()+h.substring(1));return e[c]||b.getAttribute(j)||e[h]||b.getAttribute(f)}),g:a(function(){return!!this.m()}),D:a(function(){var b=this.qa(),c=b!==this.gc;this.gc=b;return c}),ma:a,Ja:function(){++this.K},La:function(){--this.K||delete this.rb}}})();
-g.Tb=g.s.$({na:g.F+"background",va:g.Sa+"Background",nc:{scroll:1,fixed:1,local:1},Ka:{"repeat-x":1,"repeat-y":1,repeat:1,"no-repeat":1},Nc:{"padding-box":1,"border-box":1,"content-box":1},rc:{"padding-box":1,"border-box":1},Rc:{top:1,right:1,bottom:1,left:1,center:1},Wc:{contain:1,cover:1},ba:function(a){function b(u){return u.Y()||u.h&i&&u.d in t}function c(u){return u.Y()&&g.k(u.d)||u.d==="auto"&&"auto"}var e=this.e.currentStyle,f,h,j=g.u.ja,d=j.ha,i=j.fa,k=j.ea,m,l,t=this.Rc,n,p,s=null;if(this.$a()){a=
-new g.u(a);s={M:[]};for(h={};f=a.next();){m=f.h;l=f.d;if(!h.P&&m&j.pb&&l==="linear-gradient"){n={ca:[],P:l};for(p={};f=a.next();){m=f.h;l=f.d;if(m&j.ob&&l===")"){p.color&&n.ca.push(p);n.ca.length>1&&g.p.fb(h,n);break}if(m&k){if(n.Xa||n.bb){f=a.z();if(f.h!==d)break;a.next()}p={color:g.pa(l)};f=a.next();if(f.Y())p.Fb=g.k(f.d);else a.z()}else if(m&j.xa&&!n.Xa&&!p.color&&!n.ca.length)n.Xa=new g.Rb(f.d);else if(b(f)&&!n.bb&&!p.color&&!n.ca.length){a.z();n.bb=new g.Na(a.da(function(u){return!b(u)},false))}else if(m&
-d&&l===","){if(p.color){n.ca.push(p);p={}}}else break}}else if(!h.P&&m&j.URL){h.Cb=l;h.P="image"}else if(b(f)&&!h.size){a.z();h.Ya=new g.Na(a.da(function(u){return!b(u)},false))}else if(m&i)if(l in this.Ka)h.Bb=l;else if(l in this.Nc){h.kd=l;if(l in this.rc)h.clip=l}else{if(l in this.nc)h.jd=l}else if(m&k&&!s.color)s.color=g.pa(l);else if(m&d)if(l==="/"){f=a.next();m=f.h;l=f.d;if(m&i&&l in this.Wc)h.size=l;else if(l=c(f))h.size={i:l,f:c(a.next())||a.z()&&l}}else{if(l===","&&h.P){s.M.push(h);h={}}}else return null}h.P&&
-s.M.push(h)}else this.Nb(function(){var u=e.backgroundPositionX,w=e.backgroundPositionY,r=e.backgroundImage,o=e.backgroundColor;s={};if(o!=="transparent")s.color=g.pa(o);if(r!=="none")s.M=[{P:"image",Cb:(new g.u(r)).next().d,Bb:e.backgroundRepeat,Ya:new g.Na((new g.u(u+" "+w)).all())}]});return s&&(s.color||s.M&&s.M[0])?s:null},Nb:function(a){var b=this.e.runtimeStyle,c=b.backgroundImage,e=b.backgroundColor;if(c)b.backgroundImage="";if(e)b.backgroundColor="";a=a.call(this);if(c)b.backgroundImage=
-c;if(e)b.backgroundColor=e;return a},qa:g.s.ma(function(){return this.$a()||this.Nb(function(){var a=this.e.currentStyle;return a.backgroundColor+" "+a.backgroundImage+" "+a.backgroundRepeat+" "+a.backgroundPositionX+" "+a.backgroundPositionY})}),$a:g.s.ma(function(){var a=this.e;return a.style[this.va]||a.currentStyle.getAttribute(this.na)}),Eb:function(){var a=0;if(g.J<7){a=this.e;a=""+(a.style[g.Sa+"PngFix"]||a.currentStyle.getAttribute(g.F+"png-fix"))==="true"}return a},g:g.s.ma(function(){return(this.$a()||
-this.Eb())&&!!this.m()})});g.Xb=g.s.$({Ib:["Top","Right","Bottom","Left"],Kc:{thin:"1px",medium:"3px",thick:"5px"},ba:function(){var a={},b={},c={},e=false,f=true,h=true,j=true;this.Ob(function(){for(var d=this.e.currentStyle,i=0,k,m,l,t,n,p,s;i<4;i++){l=this.Ib[i];s=l.charAt(0).toLowerCase();k=b[s]=d["border"+l+"Style"];m=d["border"+l+"Color"];l=d["border"+l+"Width"];if(i>0){if(k!==t)h=false;if(m!==n)f=false;if(l!==p)j=false}t=k;n=m;p=l;c[s]=g.pa(m);l=a[s]=g.k(b[s]==="none"?"0":this.Kc[l]||l);if(l.a(this.e)>
-0)e=true}});return e?{nb:a,Zc:b,tc:c,ed:j,uc:f,$c:h}:null},qa:g.s.ma(function(){var a=this.e,b=a.currentStyle,c;a.tagName in g.Jb&&a.offsetParent.currentStyle.borderCollapse==="collapse"||this.Ob(function(){c=b.borderWidth+"|"+b.borderStyle+"|"+b.borderColor});return c}),Ob:function(a){var b=this.e.runtimeStyle,c=b.borderWidth,e=b.borderColor;if(c)b.borderWidth="";if(e)b.borderColor="";a=a.call(this);if(c)b.borderWidth=c;if(e)b.borderColor=e;return a}});(function(){g.Oa=g.s.$({na:"border-radius",
-va:"borderRadius",ba:function(b){var c=null,e,f,h,j,d=false;if(b){f=new g.u(b);var i=function(){for(var k=[],m;(h=f.next())&&h.Y();){j=g.k(h.d);m=j.vb();if(m<0)return null;if(m>0)d=true;k.push(j)}return k.length>0&&k.length<5?{tl:k[0],tr:k[1]||k[0],br:k[2]||k[0],bl:k[3]||k[1]||k[0]}:null};if(b=i()){if(h){if(h.h&g.u.ja.ha&&h.d==="/")e=i()}else e=b;if(d&&b&&e)c={x:b,y:e}}}return c}});var a=g.k("0");a={tl:a,tr:a,br:a,bl:a};g.Oa.Qb={x:a,y:a}})();g.Vb=g.s.$({na:"border-image",va:"borderImage",Ka:{stretch:1,
-round:1,repeat:1,space:1},ba:function(a){var b=null,c,e,f,h,j,d,i=0,k,m=g.u.ja,l=m.fa,t=m.ga,n=m.A,p=m.Aa;if(a){c=new g.u(a);b={};for(var s=function(r){return r&&r.h&m.ha&&r.d==="/"},u=function(r){return r&&r.h&l&&r.d==="fill"},w=function(){h=c.da(function(r){return!(r.h&(t|p))});if(u(c.next())&&!b.fill)b.fill=true;else c.z();if(s(c.next())){i++;j=c.da(function(){return!(e.h&(t|p|n))&&!(e.h&l&&e.d==="auto")});if(s(c.next())){i++;d=c.da(function(){return!(e.h&(t|n))})}}else c.z()};e=c.next();){a=e.h;
-f=e.d;if(a&(t|p)&&!h){c.z();w()}else if(u(e)&&!b.fill){b.fill=true;w()}else if(a&l&&this.Ka[f]&&!b.repeat){b.repeat={f:f};if(e=c.next())if(e.h&l&&this.Ka[e.d])b.repeat.kb=e.d;else c.z()}else if(a&m.URL&&!b.src)b.src=f;else return null}if(!b.src||!h||h.length<1||h.length>4||j&&j.length>4||i===1&&j.length<1||d&&d.length>4||i===2&&d.length<1)return null;if(!b.repeat)b.repeat={f:"stretch"};if(!b.repeat.kb)b.repeat.kb=b.repeat.f;a=function(r,o){return{T:o(r[0]),S:o(r[1]||r[0]),L:o(r[2]||r[0]),Q:o(r[3]||
-r[1]||r[0])}};b.slice=a(h,function(r){return g.k(r.h&t?r.d+"px":r.d)});b.width=j&&j.length>0?a(j,function(r){return r.h&(n|p)?g.k(r.d):r.d}):(k=this.e.currentStyle)&&{T:g.k(k.borderTopWidth),S:g.k(k.borderRightWidth),L:g.k(k.borderBottomWidth),Q:g.k(k.borderLeftWidth)};b.ua=a(d||[0],function(r){return r.h&n?g.k(r.d):r.d})}return b}});g.Zb=g.s.$({na:"box-shadow",va:"boxShadow",ba:function(a){var b,c=g.k,e=g.u.ja,f;if(a){f=new g.u(a);b={ua:[],cb:[]};for(a=function(){for(var h,j,d,i,k,m;h=f.next();){d=
-h.d;j=h.h;if(j&e.ha&&d===",")break;else if(h.db()&&!k){f.z();k=f.da(function(l){return!l.db()})}else if(j&e.ea&&!i)i=d;else if(j&e.fa&&d==="inset"&&!m)m=true;else return false}h=k&&k.length;if(h>1&&h<5){(m?b.cb:b.ua).push({fd:c(k[0].d),gd:c(k[1].d),blur:c(k[2]?k[2].d:"0"),Xc:c(k[3]?k[3].d:"0"),color:g.pa(i||"currentColor")});return true}return false};a(););}return b&&(b.cb.length||b.ua.length)?b:null}});g.ec=g.s.$({qa:g.s.ma(function(){var a=this.e.currentStyle;return a.visibility+"|"+a.display}),
-ba:function(){var a=this.e,b=a.runtimeStyle;a=a.currentStyle;var c=b.visibility,e;b.visibility="";e=a.visibility;b.visibility=c;return{cd:e!=="hidden",xc:a.display!=="none"}},g:function(){return false}});g.B={Z:function(a){function b(c,e,f,h){this.e=c;this.q=e;this.j=f;this.parent=h}g.p.fb(b.prototype,g.B,a);return b},eb:false,R:function(){return false},Kb:function(){this.n();this.g()&&this.X()},jb:function(){this.eb=true},Lb:function(){this.g()?this.X():this.n()},Wa:function(a,b){this.Hb(a);for(var c=
-this.ka||(this.ka=[]),e=a+1,f=c.length,h;e<f;e++)if(h=c[e])break;c[a]=b;this.w().insertBefore(b,h||null)},ra:function(a){var b=this.ka;return b&&b[a]||null},Hb:function(a){var b=this.ra(a),c=this.Ba;if(b&&c){c.removeChild(b);this.ka[a]=null}},sa:function(a,b,c,e){var f=this.Va||(this.Va={}),h=f[a];if(!h){h=f[a]=g.p.Ga("shape");if(b)h.appendChild(h[b]=g.p.Ga(b));if(e){c=this.ra(e);if(!c){this.Wa(e,doc.createElement("group"+e));c=this.ra(e)}}c.appendChild(h);a=h.style;a.position="absolute";a.left=a.top=
-0;a.behavior="url(#default#VML)"}return h},Za:function(a){var b=this.Va,c=b&&b[a];if(c){c.parentNode.removeChild(c);delete b[a]}return!!c},xb:function(a){var b=this.e,c=this.q.o(),e=c.i,f=c.f,h,j,d,i,k,m;c=a.x.tl.a(b,e);h=a.y.tl.a(b,f);j=a.x.tr.a(b,e);d=a.y.tr.a(b,f);i=a.x.br.a(b,e);k=a.y.br.a(b,f);m=a.x.bl.a(b,e);a=a.y.bl.a(b,f);e=Math.min(e/(c+j),f/(d+k),e/(m+i),f/(h+a));if(e<1){c*=e;h*=e;j*=e;d*=e;i*=e;k*=e;m*=e;a*=e}return{x:{tl:c,tr:j,br:i,bl:m},y:{tl:h,tr:d,br:k,bl:a}}},oa:function(a,b,c){b=
-b||1;var e,f,h=this.q.o();f=h.i*b;h=h.f*b;var j=this.j.v,d=Math.floor,i=Math.ceil,k=a?a.T*b:0,m=a?a.S*b:0,l=a?a.L*b:0;a=a?a.Q*b:0;var t,n,p,s,u;if(c||j.g()){e=this.xb(c||j.m());c=e.x.tl*b;j=e.y.tl*b;t=e.x.tr*b;n=e.y.tr*b;p=e.x.br*b;s=e.y.br*b;u=e.x.bl*b;b=e.y.bl*b;f="m"+d(a)+","+d(j)+"qy"+d(c)+","+d(k)+"l"+i(f-t)+","+d(k)+"qx"+i(f-m)+","+d(n)+"l"+i(f-m)+","+i(h-s)+"qy"+i(f-p)+","+i(h-l)+"l"+d(u)+","+i(h-l)+"qx"+d(a)+","+i(h-b)+" x e"}else f="m"+d(a)+","+d(k)+"l"+i(f-m)+","+d(k)+"l"+i(f-m)+","+i(h-
-l)+"l"+d(a)+","+i(h-l)+"xe";return f},w:function(){var a=this.parent.ra(this.C),b;if(!a){a=doc.createElement(this.Fa);b=a.style;b.position="absolute";b.top=b.left=0;this.parent.Wa(this.C,a)}return a},n:function(){this.parent.Hb(this.C);delete this.Va;delete this.ka}};g.cc=g.B.Z({g:function(){var a=this.oc;for(var b in a)if(a.hasOwnProperty(b)&&a[b].g())return true;return false},R:function(){return this.j.lb.D()},jb:function(){if(this.g()){var a=this.wb(),b=a,c;a=a.currentStyle;var e=a.position,f=
-this.w().style,h=0,j=0;j=this.q.o();if(e==="fixed"&&g.J>6){h=j.x;j=j.y;b=e}else{do b=b.offsetParent;while(b&&b.currentStyle.position==="static");if(b){c=b.getBoundingClientRect();b=b.currentStyle;h=j.x-c.left-(parseFloat(b.borderLeftWidth)||0);j=j.y-c.top-(parseFloat(b.borderTopWidth)||0)}else{b=doc.documentElement;h=j.x+b.scrollLeft-b.clientLeft;j=j.y+b.scrollTop-b.clientTop}b="absolute"}f.position=b;f.left=h;f.top=j;f.zIndex=e==="static"?-1:a.zIndex;this.eb=true}},Lb:function(){},Mb:function(){var a=
-this.j.lb.m();this.w().style.display=a.cd&&a.xc?"":"none"},Kb:function(){this.g()?this.Mb():this.n()},wb:function(){var a=this.e;return a.tagName in g.Jb?a.offsetParent:a},w:function(){var a=this.Ba,b;if(!a){b=this.wb();a=this.Ba=doc.createElement("css3-container");a.style.direction="ltr";this.Mb();b.parentNode.insertBefore(a,b)}return a},n:function(){var a=this.Ba,b;if(a&&(b=a.parentNode))b.removeChild(a);delete this.Ba;delete this.ka}});g.Sb=g.B.Z({C:2,Fa:"background",R:function(){var a=this.j;
-return a.H.D()||a.v.D()},g:function(){var a=this.j;return a.N.g()||a.v.g()||a.H.g()||a.W.g()&&a.W.m().cb},X:function(){var a=this.q.o();if(a.i&&a.f){this.yc();this.zc()}},yc:function(){var a=this.j.H.m(),b=this.q.o(),c=this.e,e=a&&a.color,f,h;if(e&&e.la()>0){this.yb();a=this.sa("bgColor","fill",this.w(),1);f=b.i;b=b.f;a.stroked=false;a.coordsize=f*2+","+b*2;a.coordorigin="1,1";a.path=this.oa(null,2);h=a.style;h.width=f;h.height=b;a.fill.color=e.O(c);c=e.la();if(c<1)a.fill.opacity=c}else this.Za("bgColor")},
-zc:function(){var a=this.j.H.m(),b=this.q.o();a=a&&a.M;var c,e,f,h,j;if(a){this.yb();e=b.i;f=b.f;for(j=a.length;j--;){b=a[j];c=this.sa("bgImage"+j,"fill",this.w(),2);c.stroked=false;c.fill.type="tile";c.fillcolor="none";c.coordsize=e*2+","+f*2;c.coordorigin="1,1";c.path=this.oa(0,2);h=c.style;h.width=e;h.height=f;if(b.P==="linear-gradient")this.mc(c,b);else{c.fill.src=b.Cb;this.Pc(c,j)}}}for(j=a?a.length:0;this.Za("bgImage"+j++););},Pc:function(a,b){g.p.Pb(a.fill.src,function(c){var e=a.fill,f=this.e,
-h=this.q.o(),j=h.i;h=h.f;var d=this.j,i=d.I.m(),k=i&&i.nb;i=k?k.t.a(f):0;var m=k?k.r.a(f):0,l=k?k.b.a(f):0;k=k?k.l.a(f):0;d=d.H.m().M[b];f=d.Ya?d.Ya.coords(f,j-c.i-k-m,h-c.f-i-l):{x:0,y:0};d=d.Bb;l=m=0;var t=j+1,n=h+1,p=g.J===8?0:1;k=Math.round(f.x)+k+0.5;i=Math.round(f.y)+i+0.5;e.position=k/j+","+i/h;if(d&&d!=="repeat"){if(d==="repeat-x"||d==="no-repeat"){m=i+1;n=i+c.f+p}if(d==="repeat-y"||d==="no-repeat"){l=k+1;t=k+c.i+p}a.style.clip="rect("+m+"px,"+t+"px,"+n+"px,"+l+"px)"}},this)},mc:function(a,
-b){function c(B,C,z,F,H){if(z===0||z===180)return[F,C];else if(z===90||z===270)return[B,H];else{z=Math.tan(-z*t/180);B=z*B-C;C=-1/z;F=C*F-H;H=C-z;return[(F-B)/H,(z*F-C*B)/H]}}function e(){w=m>=90&&m<270?i:0;r=m<180?k:0;o=i-w;x=k-r}function f(){for(;m<0;)m+=360;m%=360}function h(B,C){var z=C[0]-B[0];B=C[1]-B[1];return Math.abs(z===0?B:B===0?z:Math.sqrt(z*z+B*B))}var j=this.e,d=this.q.o(),i=d.i,k=d.f;a=a.fill;var m=b.Xa,l=b.bb;b=b.ca;d=b.length;var t=Math.PI,n,p,s,u,w,r,o,x,q,y,A,D;if(l){l=l.coords(j,
-i,k);n=l.x;p=l.y}if(m){m=m.vc();f();e();if(!l){n=w;p=r}l=c(n,p,m,o,x);s=l[0];u=l[1]}else if(l){s=i-n;u=k-p}else{n=p=s=0;u=k}l=s-n;q=u-p;if(m===void 0){m=!l?q<0?90:270:!q?l<0?180:0:-Math.atan2(q,l)/t*180;f();e()}l=m%90?Math.atan2(l*i/k,q)/t*180:m+90;l+=180;l%=360;y=h([n,p],[s,u]);s=h([w,r],c(w,r,m,o,x));u=[];p=h([n,p],c(n,p,m,w,r))/s*100;n=[];for(q=0;q<d;q++)n.push(b[q].Fb?b[q].Fb.a(j,y):q===0?0:q===d-1?y:null);for(q=1;q<d;q++){if(n[q]===null){A=n[q-1];y=q;do D=n[++y];while(D===null);n[q]=A+(D-A)/
-(y-q+1)}n[q]=Math.max(n[q],n[q-1])}for(q=0;q<d;q++)u.push(p+n[q]/s*100+"% "+b[q].color.O(j));a.angle=l;a.type="gradient";a.method="sigma";a.color=b[0].color.O(j);a.color2=b[d-1].color.O(j);a.colors.value=u.join(",")},yb:function(){var a=this.e.runtimeStyle;a.backgroundImage="url(about:blank)";a.backgroundColor="transparent"},n:function(){g.B.n.call(this);var a=this.e.runtimeStyle;a.backgroundImage=a.backgroundColor=""}});g.Wb=g.B.Z({C:4,Fa:"border",qc:{TABLE:1,INPUT:1,TEXTAREA:1,SELECT:1,OPTION:1,
-IMG:1,HR:1,FIELDSET:1},Jc:{submit:1,button:1,reset:1},R:function(){var a=this.j;return a.I.D()||a.v.D()},g:function(){var a=this.j;return(a.N.g()||a.v.g()||a.H.g())&&a.I.g()},X:function(){var a=this.e,b=this.j.I.m(),c=this.q.o(),e=c.i;c=c.f;var f,h,j,d,i;if(b){this.Hc();b=this.Bc(2);d=0;for(i=b.length;d<i;d++){j=b[d];f=this.sa("borderPiece"+d,j.stroke?"stroke":"fill",this.w());f.coordsize=e*2+","+c*2;f.coordorigin="1,1";f.path=j.path;h=f.style;h.width=e;h.height=c;f.filled=!!j.fill;f.stroked=!!j.stroke;
-if(j.stroke){f=f.stroke;f.weight=j.mb+"px";f.color=j.color.O(a);f.dashstyle=j.stroke==="dashed"?"2 2":j.stroke==="dotted"?"1 1":"solid";f.linestyle=j.stroke==="double"&&j.mb>2?"ThinThin":"Single"}else f.fill.color=j.fill.O(a)}for(;this.Za("borderPiece"+d++););}},Hc:function(){var a=this.e,b=a.currentStyle,c=a.runtimeStyle,e=a.tagName,f=g.J===6,h;if(f&&e in this.qc||e==="BUTTON"||e==="INPUT"&&a.type in this.Jc){c.borderWidth="";e=this.j.I.Ib;for(h=e.length;h--;){f=e[h];c["padding"+f]="";c["padding"+
-f]=g.k(b["padding"+f]).a(a)+g.k(b["border"+f+"Width"]).a(a)+(!g.J===8&&h%2?1:0)}c.borderWidth=0}else if(f){if(a.childNodes.length!==1||a.firstChild.tagName!=="ie6-mask"){b=doc.createElement("ie6-mask");e=b.style;e.visibility="visible";for(e.zoom=1;e=a.firstChild;)b.appendChild(e);a.appendChild(b);c.visibility="hidden"}}else c.borderColor="transparent"},Bc:function(a){var b=this.e,c,e,f,h=this.j.I,j=[],d,i,k,m,l=Math.round,t,n,p;if(h.g()){c=h.m();h=c.nb;n=c.Zc;p=c.tc;if(c.ed&&c.$c&&c.uc){if(p.t.la()>
-0){c=h.t.a(b);k=c/2;j.push({path:this.oa({T:k,S:k,L:k,Q:k},a),stroke:n.t,color:p.t,mb:c})}}else{a=a||1;c=this.q.o();e=c.i;f=c.f;c=l(h.t.a(b));k=l(h.r.a(b));m=l(h.b.a(b));b=l(h.l.a(b));var s={t:c,r:k,b:m,l:b};b=this.j.v;if(b.g())t=this.xb(b.m());d=Math.floor;i=Math.ceil;var u=function(o,x){return t?t[o][x]:0},w=function(o,x,q,y,A,D){var B=u("x",o),C=u("y",o),z=o.charAt(1)==="r";o=o.charAt(0)==="b";return B>0&&C>0?(D?"al":"ae")+(z?i(e-B):d(B))*a+","+(o?i(f-C):d(C))*a+","+(d(B)-x)*a+","+(d(C)-q)*a+","+
-y*65535+","+2949075*(A?1:-1):(D?"m":"l")+(z?e-x:x)*a+","+(o?f-q:q)*a},r=function(o,x,q,y){var A=o==="t"?d(u("x","tl"))*a+","+i(x)*a:o==="r"?i(e-x)*a+","+d(u("y","tr"))*a:o==="b"?i(e-u("x","br"))*a+","+d(f-x)*a:d(x)*a+","+i(f-u("y","bl"))*a;o=o==="t"?i(e-u("x","tr"))*a+","+i(x)*a:o==="r"?i(e-x)*a+","+i(f-u("y","br"))*a:o==="b"?d(u("x","bl"))*a+","+d(f-x)*a:d(x)*a+","+d(u("y","tl"))*a;return q?(y?"m"+o:"")+"l"+A:(y?"m"+A:"")+"l"+o};b=function(o,x,q,y,A,D){var B=o==="l"||o==="r",C=s[o],z,F;if(C>0&&n[o]!==
-"none"&&p[o].la()>0){z=s[B?o:x];x=s[B?x:o];F=s[B?o:q];q=s[B?q:o];if(n[o]==="dashed"||n[o]==="dotted"){j.push({path:w(y,z,x,D+45,0,1)+w(y,0,0,D,1,0),fill:p[o]});j.push({path:r(o,C/2,0,1),stroke:n[o],mb:C,color:p[o]});j.push({path:w(A,F,q,D,0,1)+w(A,0,0,D-45,1,0),fill:p[o]})}else j.push({path:w(y,z,x,D+45,0,1)+r(o,C,0,0)+w(A,F,q,D,0,0)+(n[o]==="double"&&C>2?w(A,F-d(F/3),q-d(q/3),D-45,1,0)+r(o,i(C/3*2),1,0)+w(y,z-d(z/3),x-d(x/3),D,1,0)+"x "+w(y,d(z/3),d(x/3),D+45,0,1)+r(o,d(C/3),1,0)+w(A,d(F/3),d(q/
-3),D,0,0):"")+w(A,0,0,D-45,1,0)+r(o,0,1,0)+w(y,0,0,D,1,0),fill:p[o]})}};b("t","l","r","tl","tr",90);b("r","t","b","tr","br",0);b("b","r","l","br","bl",-90);b("l","b","t","bl","tl",-180)}}return j},n:function(){g.B.n.call(this);this.e.runtimeStyle.borderColor=""}});g.Ub=g.B.Z({C:5,Oc:["t","tr","r","br","b","bl","l","tl","c"],R:function(){return this.j.N.D()},g:function(){return this.j.N.g()},X:function(){this.w();var a=this.j.N.m(),b=this.q.o(),c=this.e,e=this.Gb;g.p.Pb(a.src,function(f){function h(w,
-r,o,x,q){w=e[w].style;var y=Math.max;w.width=y(r,0);w.height=y(o,0);w.left=x;w.top=q}function j(w,r,o){for(var x=0,q=w.length;x<q;x++)e[w[x]].imagedata[r]=o}var d=b.i,i=b.f,k=a.width,m=k.T.a(c),l=k.S.a(c),t=k.L.a(c);k=k.Q.a(c);var n=a.slice,p=n.T.a(c),s=n.S.a(c),u=n.L.a(c);n=n.Q.a(c);h("tl",k,m,0,0);h("t",d-k-l,m,k,0);h("tr",l,m,d-l,0);h("r",l,i-m-t,d-l,m);h("br",l,t,d-l,i-t);h("b",d-k-l,t,k,i-t);h("bl",k,t,0,i-t);h("l",k,i-m-t,0,m);h("c",d-k-l,i-m-t,k,m);j(["tl","t","tr"],"cropBottom",(f.f-p)/f.f);
-j(["tl","l","bl"],"cropRight",(f.i-n)/f.i);j(["bl","b","br"],"cropTop",(f.f-u)/f.f);j(["tr","r","br"],"cropLeft",(f.i-s)/f.i);if(a.repeat.kb==="stretch"){j(["l","r","c"],"cropTop",p/f.f);j(["l","r","c"],"cropBottom",u/f.f)}if(a.repeat.f==="stretch"){j(["t","b","c"],"cropLeft",n/f.i);j(["t","b","c"],"cropRight",s/f.i)}e.c.style.display=a.fill?"":"none"},this)},w:function(){var a=this.parent.ra(this.C),b,c,e,f=this.Oc,h=f.length;if(!a){a=doc.createElement("border-image");b=a.style;b.position="absolute";
-this.Gb={};for(e=0;e<h;e++){c=this.Gb[f[e]]=g.p.Ga("rect");c.appendChild(g.p.Ga("imagedata"));b=c.style;b.behavior="url(#default#VML)";b.position="absolute";b.top=b.left=0;c.imagedata.src=this.j.N.m().src;c.stroked=false;c.filled=false;a.appendChild(c)}this.parent.Wa(this.C,a)}return a}});g.Yb=g.B.Z({C:1,Fa:"outset-box-shadow",R:function(){var a=this.j;return a.W.D()||a.v.D()},g:function(){var a=this.j.W;return a.g()&&a.m().ua[0]},X:function(){function a(z,F,H,K,J,v,E){z=b.sa("shadow"+z+F,"fill",
-e,j-z);F=z.fill;z.coordsize=m*2+","+l*2;z.coordorigin="1,1";z.stroked=false;z.filled=true;F.color=J.O(c);if(v){F.type="gradienttitle";F.color2=F.color;F.opacity=0}z.path=E;u=z.style;u.left=H;u.top=K;u.width=m;u.height=l;return z}var b=this,c=this.e,e=this.w(),f=this.j,h=f.W.m().ua;f=f.v.m();var j=h.length,d=j,i,k=this.q.o(),m=k.i,l=k.f;k=g.J===8?1:0;for(var t=["tl","tr","br","bl"],n,p,s,u,w,r,o,x,q,y,A,D,B,C;d--;){p=h[d];w=p.fd.a(c);r=p.gd.a(c);i=p.Xc.a(c);o=p.blur.a(c);p=p.color;x=-i-o;if(!f&&o)f=
-g.Oa.Qb;x=this.oa({T:x,S:x,L:x,Q:x},2,f);if(o){q=(i+o)*2+m;y=(i+o)*2+l;A=o*2/q;D=o*2/y;if(o-i>m/2||o-i>l/2)for(i=4;i--;){n=t[i];B=n.charAt(0)==="b";C=n.charAt(1)==="r";n=a(d,n,w,r,p,o,x);s=n.fill;s.focusposition=(C?1-A:A)+","+(B?1-D:D);s.focussize="0,0";n.style.clip="rect("+((B?y/2:0)+k)+"px,"+(C?q:q/2)+"px,"+(B?y:y/2)+"px,"+((C?q/2:0)+k)+"px)"}else{n=a(d,"",w,r,p,o,x);s=n.fill;s.focusposition=A+","+D;s.focussize=1-A*2+","+(1-D*2)}}else{n=a(d,"",w,r,p,o,x);w=p.la();if(w<1)n.fill.opacity=w}}}});g.bc=
-g.B.Z({C:6,Fa:"imgEl",R:function(){var a=this.j;return this.e.src!==this.hc||a.v.D()},g:function(){var a=this.j;return a.v.g()||a.H.Eb()},X:function(){this.hc=j;this.Gc();var a=this.sa("img","fill",this.w()),b=a.fill,c=this.q.o(),e=c.i;c=c.f;var f=this.j.I.m();f=f&&f.nb;var h=this.e,j=h.src,d=Math.round;a.stroked=false;b.type="frame";b.src=j;b.position=(e?0.5/e:0)+","+(c?0.5/c:0);a.coordsize=e*2+","+c*2;a.coordorigin="1,1";a.path=this.oa(f?{T:d(f.t.a(h)),S:d(f.r.a(h)),L:d(f.b.a(h)),Q:d(f.l.a(h))}:
-0,2);a=a.style;a.width=e;a.height=c},Gc:function(){this.e.runtimeStyle.filter="alpha(opacity=0)"},n:function(){g.B.n.call(this);this.e.runtimeStyle.filter=""}});g.Qa=function(){function a(d){function i(){if(!z){var v,E,G=d.currentStyle,I=G.getAttribute(c)==="true";J=G.getAttribute(e);J=g.Ab===8?J!=="false":J==="true";if(!C){C=1;d.runtimeStyle.zoom=1;G=d;for(var O=1;G=G.previousSibling;)if(G.nodeType===1){O=0;break}if(O)d.className+=" "+g.Pa+"first-child"}y.Ja();if(I&&(E=y.o())&&(v=doc.documentElement||
-doc.body)&&(E.y>v.clientHeight||E.x>v.clientWidth||E.y+E.f<0||E.x+E.i<0)){if(!H){H=1;g.Ra.aa(i)}}else{z=1;H=C=0;g.Ra.Ma(i);A={H:new g.Tb(d),I:new g.Xb(d),N:new g.Vb(d),v:new g.Oa(d),W:new g.Zb(d),lb:new g.ec(d)};D=[A.H,A.I,A.N,A.v,A.W,A.lb];v=new g.cc(d,y,A);E=[new g.Yb(d,y,A,v),new g.Sb(d,y,A,v),new g.Wb(d,y,A,v),new g.Ub(d,y,A,v)];d.tagName==="IMG"&&E.push(new g.bc(d,y,A,v));v.oc=E;q=[v].concat(E);if(v=d.currentStyle.getAttribute(g.F+"watch-ancestors")){B=[];v=parseInt(v,10);E=0;for(I=d.parentNode;I&&
-(v==="NaN"||E++<v);){B.push(I);I.attachEvent("onpropertychange",u);I.attachEvent("onmouseenter",p);I.attachEvent("onmouseleave",s);I=I.parentNode}}if(J){g.ya.aa(m);g.ya.Tc()}m(1)}if(!F){F=1;d.attachEvent("onmove",k);d.attachEvent("onresize",k);d.attachEvent("onpropertychange",l);d.attachEvent("onmouseenter",p);d.attachEvent("onmouseleave",s);g.za.aa(k);g.G.aa(o)}y.La()}}function k(){y&&y.Ec()&&m()}function m(v){if(!K)if(z){var E,G;w();if(v||y.Qc()){E=0;for(G=q.length;E<G;E++)q[E].jb()}if(v||y.Vc()){E=
-0;for(G=q.length;E<G;E++)q[E].Lb()}r()}else C||i()}function l(){var v,E,G;v=event;if(!K&&!(v&&v.propertyName in j))if(z){w();v=0;for(E=q.length;v<E;v++){G=q[v];G.eb||G.jb();G.R()&&G.Kb()}r()}else C||i()}function t(){if(d)d.className+=f}function n(){if(d)d.className=d.className.replace(h,"")}function p(){setTimeout(t,0)}function s(){setTimeout(n,0)}function u(){var v=event.propertyName;if(v==="className"||v==="id")l()}function w(){y.Ja();for(var v=D.length;v--;)D[v].Ja()}function r(){for(var v=D.length;v--;)D[v].La();
-y.La()}function o(){if(F){if(B)for(var v=0,E=B.length,G;v<E;v++){G=B[v];G.detachEvent("onpropertychange",u);G.detachEvent("onmouseenter",p);G.detachEvent("onmouseleave",s)}d.detachEvent("onmove",m);d.detachEvent("onresize",m);d.detachEvent("onpropertychange",l);d.detachEvent("onmouseenter",p);d.detachEvent("onmouseleave",s);g.G.Ma(o);F=0}}function x(){if(!K){var v,E;o();K=1;if(q){v=0;for(E=q.length;v<E;v++)q[v].n()}J&&g.ya.Ma(m);g.za.Ma(m);q=y=A=D=B=d=null}}var q,y=new M(d),A,D,B,C,z,F,H,K,J;this.Ic=
-i;this.update=m;this.n=x;this.Ac=d}var b={},c=g.F+"lazy-init",e=g.F+"poll",f=" "+g.Pa+"hover",h=new RegExp("\\b"+g.Pa+"hover\\b","g"),j={background:1,bgColor:1,display:1};a.Cc=function(d){var i=g.p.ta(d);return b[i]||(b[i]=new a(d))};a.n=function(d){d=g.p.ta(d);var i=b[d];if(i){i.n();delete b[d]}};a.wc=function(){var d=[],i;if(b){for(var k in b)if(b.hasOwnProperty(k)){i=b[k];d.push(i.Ac);i.n()}b={}}return d};return a}();g.attach=function(a){g.Ab<9&&g.Qa.Cc(a).Ic()};g.detach=function(a){g.Qa.n(a)}};
-var N=window.PIE,P=element;function init(){N&&doc.media!=="print"&&N.attach(P)}function cleanup(){if(N){N.detach(P);N=P=0}}P.readyState==="complete"&&init();
-</script>
-</PUBLIC:COMPONENT>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/58bdfce5/src/site/resources/interceptors.png
----------------------------------------------------------------------
diff --git a/src/site/resources/interceptors.png b/src/site/resources/interceptors.png
deleted file mode 100644
index f28e2df..0000000
Binary files a/src/site/resources/interceptors.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/58bdfce5/src/site/resources/logo.png
----------------------------------------------------------------------
diff --git a/src/site/resources/logo.png b/src/site/resources/logo.png
deleted file mode 100644
index f06aca6..0000000
Binary files a/src/site/resources/logo.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/58bdfce5/src/site/resources/modules.png
----------------------------------------------------------------------
diff --git a/src/site/resources/modules.png b/src/site/resources/modules.png
deleted file mode 100644
index aa8302e..0000000
Binary files a/src/site/resources/modules.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/58bdfce5/src/site/resources/salesforce_security_token_menu.png
----------------------------------------------------------------------
diff --git a/src/site/resources/salesforce_security_token_menu.png b/src/site/resources/salesforce_security_token_menu.png
deleted file mode 100644
index 0752a0a..0000000
Binary files a/src/site/resources/salesforce_security_token_menu.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/58bdfce5/src/site/resources/styles.css
----------------------------------------------------------------------
diff --git a/src/site/resources/styles.css b/src/site/resources/styles.css
deleted file mode 100644
index d060211..0000000
--- a/src/site/resources/styles.css
+++ /dev/null
@@ -1,161 +0,0 @@
-@import url(http://fonts.googleapis.com/css?family=Ubuntu);
-
-body {
- background-color: #f6f6f6;
- background-image: url("bg.png");
- background-repeat: repeat-x;
-}
-
-body,p,div,span,table,dl,ul,li,td,th {
- font-family: 'Ubuntu', sans-serif;
-}
-
-a,a:visited,a:hover {
- color: #36A;
-}
-
-#banner,#bannerLeft,#bannerRight,h1,h2,h3,h4,h5 {
- font-family: 'Ubuntu', sans-serif;
- font-weight: normal;
-}
-
-h1,h2,h4,h5 {
- color: #36A;
- border: none;
- background-color: transparent;
- padding-left: 0px;
- margin-left: 0px;
-}
-
-h3 {
- color: #e46c0a;
- border: none;
- background-color: transparent;
- padding-left: 0px;
- margin-left: 0px;
-}
-
-#banner {
- padding-top: 0;
- padding-left: 85px;
- height: 70px;
- line-height: 70px;
- background-color: transparent;
- background-image: url("logo.png");
- background-repeat: no-repeat;
- background-position: 3px 3px;
- border: none;
-}
-
-#banner, #banner a {
- color: #36A;
- font-size: 30px;
- font-weight: normal;
-}
-
-#breadcrumbs {
- background-color: transparent;
- border: none;
- color: #666;
-}
-
-#publishDate {
- color: #666;
-}
-
-#leftColumn {
- width: 230px;
- border: 1px solid #999;
- background-color: white;
- -moz-border-radius: 10px;
- -webkit-border-radius: 10px;
- behavior: url("/border-radius.htc");
- border-radius: 10px;
-}
-
-#bodyColumn {
- margin-left: 240px;
-}
-
-#navcolumn {
- font-size: 1.2em;
-}
-
-#navcolumn li {
- margin-top: 2px;
- margin-bottom: 4px;
- font-size: 0.9em;
-}
-
-#navcolumn li strong {
- font-weight: normal;
-}
-
-.section {
- border: none;
- background-color: transparent;
-}
-
-.section img {
- border: 1px solid #999;
- -moz-border-radius: 10px;
- -webkit-border-radius: 10px;
- behavior: url("/border-radius.htc");
- border-radius: 4px;
- margin-left: 14px;
-}
-
-.section dl {
- border: 1px solid #999;
- background-color: white;
- -moz-border-radius: 10px;
- -webkit-border-radius: 10px;
- behavior: url("/border-radius.htc");
- border-radius: 10px;
- margin-left: 10px;
-}
-
-.section dl dt a {
- color: black;
- font-weight: bold;
-}
-
-.source {
- border: 1px dashed #ddd;
- background-color: white;
- -moz-border-radius: 10px;
- -webkit-border-radius: 10px;
- behavior: url("/border-radius.htc");
- border-radius: 10px;
- margin-left: 10px;
-}
-
-.source, .source pre, .section pre {
- color: #e46c0a;
- font-family: 'Ubuntu', sans-serif;
- font-size: 1.15em;
-}
-
-.bodyTable {
- border-spacing: 0;
- border: 1px solid #ddd;
-}
-
-.bodyTable td {
- border-width: 0;
- padding: 4px;
-}
-
-.bodyTable tr.a td b {
- color: #e46c0a;
- font-weight: normal;
- font-size: 1.2em;
-}
-
-.bodyTable tr.a td {
- background-color: #f3f3f3;
-}
-
-.bodyTable tr.b td {
- background-color: #ffffff;
-}
\ No newline at end of file
[12/50] [abbrv] git commit: [maven-release-plugin] prepare release
MetaModel-4.0.0-incubating
Posted by ka...@apache.org.
[maven-release-plugin] prepare release MetaModel-4.0.0-incubating
Project: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/commit/23238606
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/tree/23238606
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/diff/23238606
Branch: refs/heads/hbase-module
Commit: 2323860656abd4a833761ff8dac72ab03c736a71
Parents: 05dce3f
Author: ak.ankitkumar@gmail.com <ak...@gmail.com>
Authored: Fri Nov 15 12:29:59 2013 +0100
Committer: ak.ankitkumar@gmail.com <ak...@gmail.com>
Committed: Fri Nov 15 12:29:59 2013 +0100
----------------------------------------------------------------------
core/pom.xml | 2 +-
couchdb/pom.xml | 2 +-
csv/pom.xml | 2 +-
excel/pom.xml | 2 +-
fixedwidth/pom.xml | 2 +-
full/pom.xml | 2 +-
jdbc/pom.xml | 2 +-
mongodb/pom.xml | 2 +-
openoffice/pom.xml | 2 +-
pojo/pom.xml | 2 +-
pom.xml | 8 ++++----
salesforce/pom.xml | 2 +-
sugarcrm/pom.xml | 2 +-
xml/pom.xml | 2 +-
14 files changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/23238606/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index b33280e..8a925a3 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating-SNAPSHOT</version>
+ <version>4.0.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-core</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/23238606/couchdb/pom.xml
----------------------------------------------------------------------
diff --git a/couchdb/pom.xml b/couchdb/pom.xml
index 80b7f4c..8cb1e77 100644
--- a/couchdb/pom.xml
+++ b/couchdb/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating-SNAPSHOT</version>
+ <version>4.0.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-couchdb</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/23238606/csv/pom.xml
----------------------------------------------------------------------
diff --git a/csv/pom.xml b/csv/pom.xml
index a246374..b17af3b 100644
--- a/csv/pom.xml
+++ b/csv/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating-SNAPSHOT</version>
+ <version>4.0.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-csv</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/23238606/excel/pom.xml
----------------------------------------------------------------------
diff --git a/excel/pom.xml b/excel/pom.xml
index ecf3a8f..86a5e41 100644
--- a/excel/pom.xml
+++ b/excel/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating-SNAPSHOT</version>
+ <version>4.0.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-excel</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/23238606/fixedwidth/pom.xml
----------------------------------------------------------------------
diff --git a/fixedwidth/pom.xml b/fixedwidth/pom.xml
index 527ad65..3d38d58 100644
--- a/fixedwidth/pom.xml
+++ b/fixedwidth/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating-SNAPSHOT</version>
+ <version>4.0.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-fixedwidth</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/23238606/full/pom.xml
----------------------------------------------------------------------
diff --git a/full/pom.xml b/full/pom.xml
index 973cbc7..90c1547 100644
--- a/full/pom.xml
+++ b/full/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating-SNAPSHOT</version>
+ <version>4.0.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-full</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/23238606/jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
index 16080b2..dae74fd 100644
--- a/jdbc/pom.xml
+++ b/jdbc/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating-SNAPSHOT</version>
+ <version>4.0.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-jdbc</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/23238606/mongodb/pom.xml
----------------------------------------------------------------------
diff --git a/mongodb/pom.xml b/mongodb/pom.xml
index 45776d0..be31432 100644
--- a/mongodb/pom.xml
+++ b/mongodb/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating-SNAPSHOT</version>
+ <version>4.0.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-mongodb</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/23238606/openoffice/pom.xml
----------------------------------------------------------------------
diff --git a/openoffice/pom.xml b/openoffice/pom.xml
index 47b14b8..63f5dcc 100644
--- a/openoffice/pom.xml
+++ b/openoffice/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating-SNAPSHOT</version>
+ <version>4.0.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-openoffice</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/23238606/pojo/pom.xml
----------------------------------------------------------------------
diff --git a/pojo/pom.xml b/pojo/pom.xml
index 51b75c3..6f863c7 100644
--- a/pojo/pom.xml
+++ b/pojo/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating-SNAPSHOT</version>
+ <version>4.0.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-pojo</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/23238606/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index af08c22..901d685 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,8 +17,7 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -42,10 +41,11 @@ under the License.
<url>https://git-wip-us.apache.org/repos/asf?p=incubator-metamodel.git</url>
<connection>scm:git:http://git-wip-us.apache.org/repos/asf/incubator-metamodel.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-metamodel.git</developerConnection>
- </scm>
+ <tag>MetaModel-4.0.0-incubating</tag>
+ </scm>
<groupId>org.apache.metamodel</groupId>
<artifactId>MetaModel</artifactId>
- <version>4.0.0-incubating-SNAPSHOT</version>
+ <version>4.0.0-incubating</version>
<name>MetaModel</name>
<description>MetaModel is a library that encapsulates the differences and enhances
the capabilities of different datastores. Rich querying abilities are
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/23238606/salesforce/pom.xml
----------------------------------------------------------------------
diff --git a/salesforce/pom.xml b/salesforce/pom.xml
index bb043cb..8433e4c 100644
--- a/salesforce/pom.xml
+++ b/salesforce/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating-SNAPSHOT</version>
+ <version>4.0.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-salesforce</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/23238606/sugarcrm/pom.xml
----------------------------------------------------------------------
diff --git a/sugarcrm/pom.xml b/sugarcrm/pom.xml
index 0f88f71..07d1ad9 100644
--- a/sugarcrm/pom.xml
+++ b/sugarcrm/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating-SNAPSHOT</version>
+ <version>4.0.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-sugarcrm</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/23238606/xml/pom.xml
----------------------------------------------------------------------
diff --git a/xml/pom.xml b/xml/pom.xml
index a3fc371..ba762cb 100644
--- a/xml/pom.xml
+++ b/xml/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating-SNAPSHOT</version>
+ <version>4.0.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-xml</artifactId>
[37/50] [abbrv] git commit: Minor changes to fit in with rat and
enforcer rules.
Posted by ka...@apache.org.
Minor changes to fit in with rat and enforcer rules.
Project: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/commit/9eb49ab1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/tree/9eb49ab1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/diff/9eb49ab1
Branch: refs/heads/hbase-module
Commit: 9eb49ab1db89262e50ac6c44d2f68c7d129d3a99
Parents: 3aff7ff
Author: Kasper Sørensen <i....@gmail.com>
Authored: Wed Jan 8 10:09:55 2014 +0100
Committer: Kasper Sørensen <i....@gmail.com>
Committed: Wed Jan 8 10:09:55 2014 +0100
----------------------------------------------------------------------
spring/pom.xml | 6 ++++++
.../apache/metamodel/spring/SpringResource.java | 18 ++++++++++++++++++
.../CsvDefaultConfigurationFromResourceTest.java | 18 ++++++++++++++++++
...CsvSpecifiedConfigurationFromFilenameTest.java | 18 ++++++++++++++++++
...celSpecifiedConfigurationFromFilenameTest.java | 18 ++++++++++++++++++
.../metamodel/spring/MockDataContextTypeTest.java | 18 ++++++++++++++++++
6 files changed, 96 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/9eb49ab1/spring/pom.xml
----------------------------------------------------------------------
diff --git a/spring/pom.xml b/spring/pom.xml
index d6051dc..4bd1dc7 100644
--- a/spring/pom.xml
+++ b/spring/pom.xml
@@ -48,6 +48,12 @@ under the License.
<artifactId>spring-context</artifactId>
<version>${spring.version}</version>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- test -->
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/9eb49ab1/spring/src/main/java/org/apache/metamodel/spring/SpringResource.java
----------------------------------------------------------------------
diff --git a/spring/src/main/java/org/apache/metamodel/spring/SpringResource.java b/spring/src/main/java/org/apache/metamodel/spring/SpringResource.java
index 536694c..4400859 100644
--- a/spring/src/main/java/org/apache/metamodel/spring/SpringResource.java
+++ b/spring/src/main/java/org/apache/metamodel/spring/SpringResource.java
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.metamodel.spring;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/9eb49ab1/spring/src/test/java/org/apache/metamodel/spring/CsvDefaultConfigurationFromResourceTest.java
----------------------------------------------------------------------
diff --git a/spring/src/test/java/org/apache/metamodel/spring/CsvDefaultConfigurationFromResourceTest.java b/spring/src/test/java/org/apache/metamodel/spring/CsvDefaultConfigurationFromResourceTest.java
index f6e4ad5..87ffef0 100644
--- a/spring/src/test/java/org/apache/metamodel/spring/CsvDefaultConfigurationFromResourceTest.java
+++ b/spring/src/test/java/org/apache/metamodel/spring/CsvDefaultConfigurationFromResourceTest.java
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.metamodel.spring;
import static org.junit.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/9eb49ab1/spring/src/test/java/org/apache/metamodel/spring/CsvSpecifiedConfigurationFromFilenameTest.java
----------------------------------------------------------------------
diff --git a/spring/src/test/java/org/apache/metamodel/spring/CsvSpecifiedConfigurationFromFilenameTest.java b/spring/src/test/java/org/apache/metamodel/spring/CsvSpecifiedConfigurationFromFilenameTest.java
index a2ba1fd..01b6120 100644
--- a/spring/src/test/java/org/apache/metamodel/spring/CsvSpecifiedConfigurationFromFilenameTest.java
+++ b/spring/src/test/java/org/apache/metamodel/spring/CsvSpecifiedConfigurationFromFilenameTest.java
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.metamodel.spring;
import static org.junit.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/9eb49ab1/spring/src/test/java/org/apache/metamodel/spring/ExcelSpecifiedConfigurationFromFilenameTest.java
----------------------------------------------------------------------
diff --git a/spring/src/test/java/org/apache/metamodel/spring/ExcelSpecifiedConfigurationFromFilenameTest.java b/spring/src/test/java/org/apache/metamodel/spring/ExcelSpecifiedConfigurationFromFilenameTest.java
index 86b80c5..58a9317 100644
--- a/spring/src/test/java/org/apache/metamodel/spring/ExcelSpecifiedConfigurationFromFilenameTest.java
+++ b/spring/src/test/java/org/apache/metamodel/spring/ExcelSpecifiedConfigurationFromFilenameTest.java
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.metamodel.spring;
import static org.junit.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/9eb49ab1/spring/src/test/java/org/apache/metamodel/spring/MockDataContextTypeTest.java
----------------------------------------------------------------------
diff --git a/spring/src/test/java/org/apache/metamodel/spring/MockDataContextTypeTest.java b/spring/src/test/java/org/apache/metamodel/spring/MockDataContextTypeTest.java
index e406756..afe6dd7 100644
--- a/spring/src/test/java/org/apache/metamodel/spring/MockDataContextTypeTest.java
+++ b/spring/src/test/java/org/apache/metamodel/spring/MockDataContextTypeTest.java
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.metamodel.spring;
import static org.junit.Assert.assertEquals;
[34/50] [abbrv] git commit: Added testcases for CSV datacontext
factory
Posted by ka...@apache.org.
Added testcases for CSV datacontext factory
Project: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/commit/5bc3d1b2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/tree/5bc3d1b2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/diff/5bc3d1b2
Branch: refs/heads/hbase-module
Commit: 5bc3d1b2357f99998c33c6b2813fd6346d067c48
Parents: f387893
Author: Kasper Sørensen <i....@gmail.com>
Authored: Sun Jan 5 20:14:03 2014 +0100
Committer: Kasper Sørensen <i....@gmail.com>
Committed: Sun Jan 5 20:14:03 2014 +0100
----------------------------------------------------------------------
spring/pom.xml | 12 +-
.../spring/DataContextFactoryBean.java | 157 ++++++++++++++++++-
.../apache/metamodel/spring/SpringResource.java | 9 ++
...CsvDefaultConfigurationFromResourceTest.java | 40 +++++
...vSpecifiedConfigurationFromFilenameTest.java | 37 +++++
spring/src/test/resources/data/example.csv | 2 +
.../resources/examples/csv-using-filename.xml | 13 ++
.../examples/csv-using-spring-resource.xml | 11 ++
8 files changed, 279 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/5bc3d1b2/spring/pom.xml
----------------------------------------------------------------------
diff --git a/spring/pom.xml b/spring/pom.xml
index bb1e6ec..d6051dc 100644
--- a/spring/pom.xml
+++ b/spring/pom.xml
@@ -26,6 +26,10 @@ under the License.
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-spring</artifactId>
<name>MetaModel module for Spring enabled configuration</name>
+
+ <properties>
+ <spring.version>3.0.7.RELEASE</spring.version>
+ </properties>
<dependencies>
<dependency>
@@ -42,7 +46,7 @@ under the License.
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <version>3.0.7.RELEASE</version>
+ <version>${spring.version}</version>
<scope>provided</scope>
</dependency>
@@ -57,5 +61,11 @@ under the License.
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <version>${spring.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/5bc3d1b2/spring/src/main/java/org/apache/metamodel/spring/DataContextFactoryBean.java
----------------------------------------------------------------------
diff --git a/spring/src/main/java/org/apache/metamodel/spring/DataContextFactoryBean.java b/spring/src/main/java/org/apache/metamodel/spring/DataContextFactoryBean.java
index c231126..d1d376a 100644
--- a/spring/src/main/java/org/apache/metamodel/spring/DataContextFactoryBean.java
+++ b/spring/src/main/java/org/apache/metamodel/spring/DataContextFactoryBean.java
@@ -190,7 +190,9 @@ public class DataContextFactoryBean implements FactoryBean<DataContext> {
if (value.isEmpty()) {
return ifNull;
}
- // TODO: Check special strings like "
+ if ("none".equalsIgnoreCase(value)) {
+ return CsvConfiguration.NOT_A_CHAR;
+ }
return value.charAt(0);
}
@@ -204,4 +206,157 @@ public class DataContextFactoryBean implements FactoryBean<DataContext> {
}
return BooleanComparator.parseBoolean(value);
}
+
+ public String getType() {
+ return _type;
+ }
+
+ public void setType(String type) {
+ _type = type;
+ }
+
+ public org.springframework.core.io.Resource getResource() {
+ return _resource;
+ }
+
+ public void setResource(org.springframework.core.io.Resource resource) {
+ _resource = resource;
+ }
+
+ public String getFilename() {
+ return _filename;
+ }
+
+ public void setFilename(String filename) {
+ _filename = filename;
+ }
+
+ public String getUrl() {
+ return _url;
+ }
+
+ public void setUrl(String url) {
+ _url = url;
+ }
+
+ public String getColumnNameLineNumber() {
+ return _columnNameLineNumber;
+ }
+
+ public void setColumnNameLineNumber(String columnNameLineNumber) {
+ _columnNameLineNumber = columnNameLineNumber;
+ }
+
+ public String getSkipEmptyLines() {
+ return _skipEmptyLines;
+ }
+
+ public void setSkipEmptyLines(String skipEmptyLines) {
+ _skipEmptyLines = skipEmptyLines;
+ }
+
+ public String getSkipEmptyColumns() {
+ return _skipEmptyColumns;
+ }
+
+ public void setSkipEmptyColumns(String skipEmptyColumns) {
+ _skipEmptyColumns = skipEmptyColumns;
+ }
+
+ public String getEncoding() {
+ return _encoding;
+ }
+
+ public void setEncoding(String encoding) {
+ _encoding = encoding;
+ }
+
+ public String getSeparatorChar() {
+ return _separatorChar;
+ }
+
+ public void setSeparatorChar(String separatorChar) {
+ _separatorChar = separatorChar;
+ }
+
+ public String getQuoteChar() {
+ return _quoteChar;
+ }
+
+ public void setQuoteChar(String quoteChar) {
+ _quoteChar = quoteChar;
+ }
+
+ public String getEscapeChar() {
+ return _escapeChar;
+ }
+
+ public void setEscapeChar(String escapeChar) {
+ _escapeChar = escapeChar;
+ }
+
+ public String getFailOnInconsistentRowLength() {
+ return _failOnInconsistentRowLength;
+ }
+
+ public void setFailOnInconsistentRowLength(String failOnInconsistentRowLength) {
+ _failOnInconsistentRowLength = failOnInconsistentRowLength;
+ }
+
+ public String getMultilineValues() {
+ return _multilineValues;
+ }
+
+ public void setMultilineValues(String multilineValues) {
+ _multilineValues = multilineValues;
+ }
+
+ public TableType[] getTableTypes() {
+ return _tableTypes;
+ }
+
+ public void setTableTypes(TableType[] tableTypes) {
+ _tableTypes = tableTypes;
+ }
+
+ public String getCatalogName() {
+ return _catalogName;
+ }
+
+ public void setCatalogName(String catalogName) {
+ _catalogName = catalogName;
+ }
+
+ public DataSource getDataSource() {
+ return _dataSource;
+ }
+
+ public void setDataSource(DataSource dataSource) {
+ _dataSource = dataSource;
+ }
+
+ public String getUsername() {
+ return _username;
+ }
+
+ public void setUsername(String username) {
+ _username = username;
+ }
+
+ public String getPassword() {
+ return _password;
+ }
+
+ public void setPassword(String password) {
+ _password = password;
+ }
+
+ public String getDriverClassName() {
+ return _driverClassName;
+ }
+
+ public void setDriverClassName(String driverClassName) {
+ _driverClassName = driverClassName;
+ }
+
}
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/5bc3d1b2/spring/src/main/java/org/apache/metamodel/spring/SpringResource.java
----------------------------------------------------------------------
diff --git a/spring/src/main/java/org/apache/metamodel/spring/SpringResource.java b/spring/src/main/java/org/apache/metamodel/spring/SpringResource.java
index 2b0f532..536694c 100644
--- a/spring/src/main/java/org/apache/metamodel/spring/SpringResource.java
+++ b/spring/src/main/java/org/apache/metamodel/spring/SpringResource.java
@@ -112,4 +112,13 @@ public class SpringResource implements Resource {
throw new UnsupportedOperationException();
}
+ /**
+ * Gets the underlying spring {@link org.springframework.core.io.Resource}
+ * object.
+ *
+ * @return
+ */
+ public org.springframework.core.io.Resource getResource() {
+ return _resource;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/5bc3d1b2/spring/src/test/java/org/apache/metamodel/spring/CsvDefaultConfigurationFromResourceTest.java
----------------------------------------------------------------------
diff --git a/spring/src/test/java/org/apache/metamodel/spring/CsvDefaultConfigurationFromResourceTest.java b/spring/src/test/java/org/apache/metamodel/spring/CsvDefaultConfigurationFromResourceTest.java
new file mode 100644
index 0000000..f6e4ad5
--- /dev/null
+++ b/spring/src/test/java/org/apache/metamodel/spring/CsvDefaultConfigurationFromResourceTest.java
@@ -0,0 +1,40 @@
+package org.apache.metamodel.spring;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Arrays;
+
+import org.apache.metamodel.DataContext;
+import org.apache.metamodel.csv.CsvDataContext;
+import org.apache.metamodel.util.Resource;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration("classpath:examples/csv-using-spring-resource.xml")
+public class CsvDefaultConfigurationFromResourceTest {
+
+ @Autowired
+ private DataContext dataContext;
+
+ @Test
+ public void testReadDataContext() {
+ assertEquals(CsvDataContext.class, dataContext.getClass());
+
+ CsvDataContext csv = (CsvDataContext) dataContext;
+ Resource resource = csv.getResource();
+
+ assertEquals(SpringResource.class, resource.getClass());
+
+ SpringResource springResource = (SpringResource) resource;
+ Assert.assertTrue(springResource.isExists());
+
+ assertEquals("example.csv", resource.getName());
+
+ assertEquals("[foo, bar]", Arrays.toString(csv.getDefaultSchema().getTable(0).getColumnNames()));
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/5bc3d1b2/spring/src/test/java/org/apache/metamodel/spring/CsvSpecifiedConfigurationFromFilenameTest.java
----------------------------------------------------------------------
diff --git a/spring/src/test/java/org/apache/metamodel/spring/CsvSpecifiedConfigurationFromFilenameTest.java b/spring/src/test/java/org/apache/metamodel/spring/CsvSpecifiedConfigurationFromFilenameTest.java
new file mode 100644
index 0000000..6867fbf
--- /dev/null
+++ b/spring/src/test/java/org/apache/metamodel/spring/CsvSpecifiedConfigurationFromFilenameTest.java
@@ -0,0 +1,37 @@
+package org.apache.metamodel.spring;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Arrays;
+
+import org.apache.metamodel.DataContext;
+import org.apache.metamodel.csv.CsvDataContext;
+import org.apache.metamodel.util.FileResource;
+import org.apache.metamodel.util.Resource;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration("classpath:examples/csv-using-filename.xml")
+public class CsvSpecifiedConfigurationFromFilenameTest {
+
+ @Autowired
+ private DataContext dataContext;
+
+ @Test
+ public void testReadDataContext() {
+ assertEquals(CsvDataContext.class, dataContext.getClass());
+
+ CsvDataContext csv = (CsvDataContext) dataContext;
+ Resource resource = csv.getResource();
+
+ assertEquals(FileResource.class, resource.getClass());
+
+ assertEquals("example.csv", resource.getName());
+
+ assertEquals("[\"foo\", bar]", Arrays.toString(csv.getDefaultSchema().getTable(0).getColumnNames()));
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/5bc3d1b2/spring/src/test/resources/data/example.csv
----------------------------------------------------------------------
diff --git a/spring/src/test/resources/data/example.csv b/spring/src/test/resources/data/example.csv
new file mode 100644
index 0000000..97c314a
--- /dev/null
+++ b/spring/src/test/resources/data/example.csv
@@ -0,0 +1,2 @@
+"foo",bar
+hello,"world"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/5bc3d1b2/spring/src/test/resources/examples/csv-using-filename.xml
----------------------------------------------------------------------
diff --git a/spring/src/test/resources/examples/csv-using-filename.xml b/spring/src/test/resources/examples/csv-using-filename.xml
new file mode 100644
index 0000000..df6320e
--- /dev/null
+++ b/spring/src/test/resources/examples/csv-using-filename.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+
+ <bean class="org.apache.metamodel.spring.DataContextFactoryBean">
+ <property name="type" value="csv" />
+ <property name="filename" value="src/test/resources/data/example.csv" />
+ <property name="quoteChar" value="none" />
+ <property name="separatorChar" value="," />
+ </bean>
+
+</beans>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/5bc3d1b2/spring/src/test/resources/examples/csv-using-spring-resource.xml
----------------------------------------------------------------------
diff --git a/spring/src/test/resources/examples/csv-using-spring-resource.xml b/spring/src/test/resources/examples/csv-using-spring-resource.xml
new file mode 100644
index 0000000..0f2612a
--- /dev/null
+++ b/spring/src/test/resources/examples/csv-using-spring-resource.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+
+ <bean class="org.apache.metamodel.spring.DataContextFactoryBean">
+ <property name="type" value="CSV" />
+ <property name="resource" value="classpath:data/example.csv" />
+ </bean>
+
+</beans>
\ No newline at end of file
[44/50] [abbrv] git commit: METAMODEL-37: Removing old site sources
Posted by ka...@apache.org.
METAMODEL-37: Removing old site sources
Project: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/commit/58bdfce5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/tree/58bdfce5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/diff/58bdfce5
Branch: refs/heads/hbase-module
Commit: 58bdfce58460089e20be05340e6d54617c479ebd
Parents: d05da0c
Author: Kasper Sørensen <i....@gmail.com>
Authored: Mon Jan 27 21:50:24 2014 +0100
Committer: Kasper Sørensen <i....@gmail.com>
Committed: Mon Jan 27 21:50:24 2014 +0100
----------------------------------------------------------------------
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 -------
37 files changed, 2653 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/58bdfce5/src/site/apt/database_compliancy.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/database_compliancy.apt b/src/site/apt/database_compliancy.apt
deleted file mode 100644
index b0b334e..0000000
--- a/src/site/apt/database_compliancy.apt
+++ /dev/null
@@ -1,98 +0,0 @@
- ------
- Database compliancy
- ------
-
-Database compliancy
-
- It is one of the important goals of MetaModel to be compliant with as many databases and datastores as possible! We ensure a broad compliance by several initiatives:
-
- * A broad integration test suite.
-
- * Extensive but fault-tolerant use of the Java DataBase Connectivity (JDBC) specification.
-
- * Use of uniform SQL-99 compliant queries.
-
-Relational databases known to be working with MetaModel
-
-*----------------------+--------------------------+-------------------------------------------------------------------------------------------+-----------------+
-| <<Database>> | <<Version>> | <<JDBC driver>> | <<Compliancy>> |
-*----------------------+--------------------------+-------------------------------------------------------------------------------------------+-----------------+
-| MySQL | 5+ | {{{http://www.mysql.com/products/connector/j/}Connector/J}} | Fully compliant |
-*----------------------+--------------------------+-------------------------------------------------------------------------------------------+-----------------+
-| PostgreSQL | 8+ | {{{http://jdbc.postgresql.org/}PostgreSQL JDBC driver}} | Fully compliant |
-*----------------------+--------------------------+-------------------------------------------------------------------------------------------+-----------------+
-| Oracle | 10g | {{{http://www.oracle.com/technetwork/indexes/downloads/index.html}SQLJ/JDBC}} | Fully compliant |
-*----------------------+--------------------------+-------------------------------------------------------------------------------------------+-----------------+
-| Apache Derby | 10+ | {{{http://db.apache.org/derby/derby_downloads.html#Latest+Official+Release}Derby driver}} | Fully compliant |
-*----------------------+--------------------------+-------------------------------------------------------------------------------------------+-----------------+
-| Firebird SQL | 2.0+ | {{{http://www.firebirdsql.org/index.php?op=files&id=jaybird}Jaybird driver}} | Fully compliant |
-*----------------------+--------------------------+-------------------------------------------------------------------------------------------+-----------------+
-| Hsqldb/HyperSQL | 1.8+ | {{{http://sourceforge.net/project/showfiles.php?group_id=23316}Hsqldb driver}} | Fully compliant |
-*----------------------+--------------------------+-------------------------------------------------------------------------------------------+-----------------+
-| H2 | 1.2+ | {{{http://www.h2database.com/html/download.html}H2 driver}} | Fully compliant |
-*----------------------+--------------------------+-------------------------------------------------------------------------------------------+-----------------+
-| SQLite | 3.6.0+ | {{{http://www.xerial.org/trac/Xerial/wiki/SQLiteJDBC}Xerial driver}} | Fully compliant |
-*----------------------+--------------------------+-------------------------------------------------------------------------------------------+-----------------+
-| Microsoft SQL Server | 2005 (+ possibly others) | {{{http://jtds.sourceforge.net/}JTDS driver}} | Fully compliant |
-*----------------------+--------------------------+-------------------------------------------------------------------------------------------+-----------------+
-| Ingres | - | {{{http://community.ingres.com/wiki/JDBC_Driver}Ingres JDBC driver}} | Fully compliant |
-*----------------------+--------------------------+-------------------------------------------------------------------------------------------+-----------------+
-
-Non-relational / NoSQL databases supported by MetaModel
-
-*----------------------+-----------------+
-| <<Database>> | <<Compliancy>> |
-*----------------------+-----------------+
-| MongoDB | Fully compliant |
-*----------------------+-----------------+
-| CouchDB | Fully compliant |
-*----------------------+-----------------+
-
-Business application supported (through system services) by MetaModel
-
-*----------------------+-----------------+
-| <<System>> | <<Compliancy>> |
-*----------------------+-----------------+
-| Salesforce.com | Fully compliant |
-*----------------------+-----------------+
-| SugarCRM | Fully compliant |
-*----------------------+-----------------+
-
-File data formats supported by MetaModel
-
-*-----------------------------+--------------------+-------------------+-----------------+
-| <<File format>> | <<File extension>> | <<Version>> | <<Compliancy>> |
-*-----------------------------+--------------------+-------------------+-----------------+
-| Comma separated file | .csv | - | Fully compliant |
-*-----------------------------+--------------------+-------------------+-----------------+
-| Microsoft Excel spreadsheet | .xls | Excel '97-2003 | Fully compliant |
-*-----------------------------+--------------------+-------------------+-----------------+
-| | .xlsx | Excel 2007+ | Fully compliant |
-*-----------------------------+--------------------+-------------------+-----------------+
-| OpenOffice.org database | .odb | OpenOffice 2.0+ | Fully compliant |
-*-----------------------------+--------------------+-------------------+-----------------+
-| XML file (SAX based) | .xml | - | Fully compliant |
-*-----------------------------+--------------------+-------------------+-----------------+
-| XML file (DOM based) | .xml | - | Experimental |
-*-----------------------------+--------------------+-------------------+-----------------+
-| Microsoft Access database | .mdb | Access '97-2003 | Fully compliant |
-*-----------------------------+--------------------+-------------------+-----------------+
-| | .accdb | Access 2007+ | Fully compliant |
-*-----------------------------+--------------------+-------------------+-----------------+
-| dBase database | .dbf | - | Fully compliant |
-*-----------------------------+--------------------+-------------------+-----------------+
-
-Java object datastores (aka POJO datastores)
-
- MetaModel also supports creating datastores built on top of plain Java objects. Either by
- using a collection of Java bean objects (with getters and setters) or by using
- collections of Maps or arrays. In the case of using collections of arrays, you will need
- to manually appoint column names to each index in the arrays.
-
-Composite datastores
-
- MetaModel supports an advanced feature called composite datastores. In short it means that it's
- possible to access and query several datastores as if they where one. This involves transparent
- client-side joining, filtering, grouping etc. Composite datastores are typically not as performant
- in terms of querying but provides for a convenient way to combine data that is otherwise inherently
- separated from each other.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/58bdfce5/src/site/apt/download.apt.vm
----------------------------------------------------------------------
diff --git a/src/site/apt/download.apt.vm b/src/site/apt/download.apt.vm
deleted file mode 100644
index 8a0e3ab..0000000
--- a/src/site/apt/download.apt.vm
+++ /dev/null
@@ -1,39 +0,0 @@
- ------
- Downloads
- ------
-
-Downloads
-
-Distributable JAR files
-
- MetaModel is distributed as a set of JAR files. You can obtain the latest version at our Google Code download site:
-
- {{http://code.google.com/p/metamodel/downloads/list}}
-
-Use in Maven
-
- If you use Maven, Ivy, Grape or similar build tools you can include MetaModel as a dependency by using this snippet:
-
- Apache Maven 2+:
-
-+-------------------------------+
-<dependency>
- <groupId>org.apache.metamodel</groupId>
- <artifactId>MetaModel-full</artifactId>
- <version>${siteDownloadVersion}</version>
-</dependency>
-+-------------------------------+
-
- Apache Ivy:
-
-+-------------------------------+
-<dependency org="org.apache.metamodel" name="MetaModel-full" rev="${siteDownloadVersion}"/>
-+-------------------------------+
-
- Groovy Grape:
-
-+-------------------------------+
-@Grapes(
- @Grab(group='org.apache.metamodel', module='MetaModel-full', version='${siteDownloadVersion}')
-)
-+-------------------------------+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/58bdfce5/src/site/apt/example_compiled_queries.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/example_compiled_queries.apt b/src/site/apt/example_compiled_queries.apt
deleted file mode 100644
index d3b8e35..0000000
--- a/src/site/apt/example_compiled_queries.apt
+++ /dev/null
@@ -1,35 +0,0 @@
- ------
- Compiled queries
- ------
-
-Compiled queries
-
- MetaModel supports 'compiling' queries which means preparing them for reuse multiple times, ahead of execution time. This mechanism resembles what is in JDBC terms 'Prepared Statements', and is in deed implemented this way for the JDBC adapter.
-
- Compiled queries are abstract, meaning they can have parameters which are provided at execution time. The advantage of this is that the same query can be reused for many (but similar) purposes. If your application needs to perform a lookup of records with slightly varying features (eg. different keys or different attributes), a compiled query can greatly improve performance, since many database backends can optimize the server-side query planning.
-
- Compiled queries have life-cycles that can span small jobs, large batch jobs or entire application lifetimes. We recommend treating them like other compileable resources, eg. regular expressions or input streams - create them when needed for a particular job, use and reuse them for the duration of this job, and then close them. This will ensure that your application has an elastic behaviour and that it does not needlessly take up resources on the (database) server for longer than needed.
-
- Below is an example of compiling a query:
-
-+-------------------------------+
-DataContext dataContext = ...
-Query query = dataContext.query().from("persons").select("name")
- .where("id").eq(new QueryParameter()).toQuery();
-
-CompiledQuery compiledQuery = dataContext.compileQuery(query);
-+-------------------------------+
-
- To use the compiled query, fire it with the executeQuery along with a parameter list that matches the QueryParameters in the original query object.
-
- Here's an example of (re)using the compiled query with 3 different parameter values. Notice also the try-finally construct which ensures closing the compiled queries after use.
-
-+-------------------------------+
-try {
- DataSet dataSet1 = dataContext.executeQuery(compiledQuery, 123);
- DataSet dataSet2 = dataContext.executeQuery(compiledQuery, 124);
- DataSet dataSet3 = dataContext.executeQuery(compiledQuery, 125);
-} finally {
- compiledQuery.close();
-}
-+-------------------------------+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/58bdfce5/src/site/apt/example_composite_datacontext.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/example_composite_datacontext.apt b/src/site/apt/example_composite_datacontext.apt
deleted file mode 100644
index 8ae82e1..0000000
--- a/src/site/apt/example_composite_datacontext.apt
+++ /dev/null
@@ -1,68 +0,0 @@
- ------
- Composite DataContext | Example
- ------
-
-Composite DataContext
-
- A composite DataContext is a DataContext that allows you to access several datastores
- as if they where one. It makes it easy to do queries that span several physical sources
- without having to deal with the complexity this usually involves.
-
- A note of warning when dealing with composite DataContexts though: Queries will usually
- take up quite a lot of memory if you try to join tables from separate sources. Some may
- critisize the fact that MetaModel allows this somewhat "dangerous" behaviour but on the
- other hand we feel that any powerful tool can be used the wrong way and composite DataContexts
- are no exception.
-
-Show me the code
-
- Say you have two datastores, a CSV file and a database. Let's first create the composite
- DataContext from which we access them in a united fashion:
-
-+-------------------------------+
-DataContext csvDataContext = ...
-DataContext databaseDataContext = ...
-
-DataContext compositeDataContext = DataContextFactory.createCompositeDataContext(csvDataContext, databaseDataContext);
-+-------------------------------+
-
- Because we might encounter name-clashes in table and column names, it is still possible to create
- our queries using the originial DataContext's schema structures. It is also possible to retrieve
- the schema structure from the composite.
-
-+-------------------------------+
-Table csvTable1 = csvDataContext.getDefaultSchema().getTableByName("customers");
-Table csvTable2 = compositeDataContext.getDefaultSchema().getTableByName("customers");
-
-// these should be the same!
-assert csvTable1 == csvTable2;
-+-------------------------------+
-
- We can now create a query using structures from both of the contained DataContexts:
-
-+-------------------------------+
-Column csvNameColumn = csvTable1.getColumnByName("name");
-Table dbTable = databaseDataContext.getDefaultSchema().getTableByName("customers");
-
-Query q = compositeDataContext.query().from(csvTable1).leftJoin(dbTable)
- .on(csvNameColumn, dbTable.getColumnByName("name"))
- .select(csvNameColumn, dbTable.getColumnByName("id")).toQuery();
-+-------------------------------+
-
- This query will correspond to (if it was possible to execute something like this in SQL):
-
-+-------------------------------+
-SELECT customers.name, "CUSTOMERS"."ID" FROM customers.csv.customers LEFT JOIN PUBLIC."CUSTOMERS" ON customers.name = "CUSTOMERS"."NAME"
-+-------------------------------+
-
- And ... executing it will print out a list of customer names (from the CSV file) and their id's in the database. In our test suite we have an example of this, it prints out:
-
-*------------------------------+--------+
-| Diecast Collectables | 495 |
-*------------------------------+--------+
-| Lego (not in DB) | <null> |
-*------------------------------+--------+
-| Motor Mint Distributors Inc. | 486 |
-*------------------------------+--------+
-| ... | ... |
-*------------------------------+--------+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/58bdfce5/src/site/apt/example_inserting_data.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/example_inserting_data.apt b/src/site/apt/example_inserting_data.apt
deleted file mode 100644
index 6e5c73b..0000000
--- a/src/site/apt/example_inserting_data.apt
+++ /dev/null
@@ -1,63 +0,0 @@
- ------
- Inserting data
- ------
-
-Inserting data
-
- Since MetaModel 2.0 it is possible to create tables and insert data into several of the supported datastores, eg. JDBC databases, CSV files and Excel spreadsheets.
-
- Modifying data is done by means of implementing your own update scripts that are then submitted to the DataContext's executeUpdate(...) method. This approach guarantees isolation and coherence in all update operations. Here is a simple example:
-
-+-------------------------------+
-File myFile = new File("unexisting_file.csv");
-
-UpdateableDataContext dataContext = DataContextFactory.createCsvDataContext(myFile);
-final Schema schema = dataContext.getDefaultSchema();
-dataContext.executeUpdate(new UpdateScript() {
-
- public void run(UpdateCallback callback) {
-
- // CREATING A TABLE
-
- Table table = callback.createTable(schema, "my_table")
- .withColumn("name").ofType(VARCHAR)
- .withColumn("gender").ofType(CHAR)
- .withColumn("age").ofType(INTEGER)
- .execute();
-
- // INSERTING SOME ROWS
-
- callback.insertInto(table).value("name","John Doe").value("gender",'M').value("age",42).execute();
- callback.insertInto(table).value("name","Jane Doe").value("gender",'F').value("age",42).execute();
- }
-
-});
-+-------------------------------+
-
- If you just want to insert or update a single record, you can skip the UpdateScript implementation and use the pre-built InsertInto, Update or DeleteFrom classes. But beware though that then you don't have any transaction boundaries or isolation inbetween those calls:
-
-+-------------------------------+
-Table table = schema.getTableByName("my_table");
-dataContext.executeUpdate(new InsertInto(table).value("name", "Polly the Sheep").value("age", -1));
-dataContext.executeUpdate(new Update(table).where("name").eq("Polly the Sheep").value("age", 10));
-dataContext.executeUpdate(new DeleteFrom(table).where("name").eq("Polly the Sheep"));
-+-------------------------------+
-
- ... And just to go full circle, here's how you can continue to explore the data:
-
-+-------------------------------+
-System.out.println("Columns: " + Arrays.toString(table.getColumnNames()));
-
-DataSet ds = dc.query().from(table).select(table.getColumns()).orderBy(table.getColumnByName("name")).execute();
-while (ds.next()) {
- System.out.println("Row: " + Arrays.toString(ds.getRow().getValues()));
-}
-+-------------------------------+
-
- This snippet will print out:
-
-+-------------------------------+
-Columns: [name, gender, age]
-Row: [Jane Doe,F,42]
-Row: [John Doe,M,42]
-+-------------------------------+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/58bdfce5/src/site/apt/example_interceptors.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/example_interceptors.apt b/src/site/apt/example_interceptors.apt
deleted file mode 100644
index 0a48496..0000000
--- a/src/site/apt/example_interceptors.apt
+++ /dev/null
@@ -1,42 +0,0 @@
- ------
- Using interceptors
- ------
-
-Using interceptors
-
- As of version 2.2, MetaModel has introduced an interceptor mechanism which allows you to add code to
- your DataContext that will be invoked before or after certain operations.
-
- The interceptors are implemented as a decorating, logical DataContext around your physical DataContext.
- In the graph below the 5 types of interceptors are depicted:
-
-[interceptors.png] Modules in MetaModel
-
- To get a handle for an interceptable DataContext, use
- the {{{./apidocs/org/eobjects/metamodel/intercept/Interceptors.html} Interceptors}}.intercept(...) method.
-
- To apply an interceptor, implement one of the five interfaces:
-
- * QueryInterceptor: To intercept queries before they are executed.
-
- * DataSetInterceptor: To intercept datasets before they are returned.
-
- * TableCreationInterceptor: To intercept "create table" operations before they are executed.
-
- * RowInsertionInterceptor: To intercept "insert into" operations before they are executed.
-
- * SchemaInterceptor: To intercept schemas before they are returned.
-
- Once you've implemented your interceptor, for instance a QueryInterceptor, add it to an InterceptableDataContext, like this:
-
-+-------------------------------+
-public DataContext addMyInterceptor(DataContext dc) {
- InterceptableDataContext interceptableDataContext = Interceptors.intercept(dc);
- interceptableDataContext.addQueryInterceptor(new MyQueryInterceptor());
- return interceptableDataContext;
-}
-+-------------------------------+
-
- The important part about this code snippet is, that it returns the InterceptableDataContext instance.
- Since this is itself also an implementation of the DataContext interface, you should be able to use this
- throughout your code without modifications.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/58bdfce5/src/site/apt/example_pojo_datastores.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/example_pojo_datastores.apt b/src/site/apt/example_pojo_datastores.apt
deleted file mode 100644
index 98a1265..0000000
--- a/src/site/apt/example_pojo_datastores.apt
+++ /dev/null
@@ -1,39 +0,0 @@
- ------
- POJO datastores - Query your Java objects
- ------
-
-POJO datastores - Query your Java objects!
-
- With the <<MetaModel-pojo>> module of MetaModel you can use MetaModel's query engine to fire queries on a collection of regular Java objects (Java beans, Maps or arrays).
-
- Assume we have a Person class:
-
-+-------------------------------+
-public class Person {
- private String name;
- private int age;
-
- // getters and setters
-}
-+-------------------------------+
-
- And some list of persons:
-
-+-------------------------------+
-List<Person> persons = ...
-+-------------------------------+
-
- You can easily wrap this collection in a PojoDataContext and query it like a database, for instance to get all the adult names:
-
-+-------------------------------+
-TableDataProvider<Person> provider = new ObjectTableDataProvider<Person>("persons",Person.class,persons);
-DataContext dc = new PojoDataContext(provider);
-
-DataSet ds = dc.query().from("persons").select("name").where("age").greaterThan(18).execute();
-while (ds.next()) {
- Row row = ds.getRow();
- String name = (String) row.getValue(0);
- System.out.println(name);
-}
-ds.close();
-+-------------------------------+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/58bdfce5/src/site/apt/example_salesforce_setup.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/example_salesforce_setup.apt b/src/site/apt/example_salesforce_setup.apt
deleted file mode 100644
index 7150dcc..0000000
--- a/src/site/apt/example_salesforce_setup.apt
+++ /dev/null
@@ -1,39 +0,0 @@
- ------
- Setting up MetaModel with Salesforce.com
- ------
-
-Setting up MetaModel with Salesforce.com
-
- To connect to Salesforce.com with MetaModel you need to have:
-
- * A Salesforce.com username
-
- * The password that goes with the username
-
- * A security token for that user to access Salesforce.com remotely
-
- The Salesforce.com security token can be retrieved by accessing the setup page in the upper right corner of the Salesforce layout (click [your name] -> Setup).
-
- On the Setup page you'll find a menu item called 'Reset My Security Token'. Navigate to this menu item and have it send you the token in an email.
-
-[salesforce_security_token_menu.png] Location of 'Reset My Security Token' menu item in Salesforce.com
-
- Let's assume your username is 'foo', your password is 'bar' and your security token is 'baz'. Here's then your Java code needed to connect to Salesforce (and a small example query):
-
-+-------------------------------+
-UpdateableDataContext dataContext = new SalesforceDataContext("foo", "bar", "baz");
-
-Table accountTable = dataContext.getDefaultSchema().getTableByName("Account");
-
-DataSet dataSet = dataContext.query().from(accountTable).select("Id", "Name").where("BillingCity").eq("New York").execute();
-
-while (dataSet.next()) {
- Row row = dataSet.getRow();
- Object id = row.getValue(0);
- Object name = row.getValue(1);
- System.out.println("Account '" + name + "' from New York has id: " + row.getValue(0);
-}
-dataSet.close();
-+-------------------------------+
-
- Connecting to Salesforce.com via MetaModel allows you to treat your Salesforce data just as if it was any other database or data file. Obviously you should be aware that you access remote web services, so there's network latency involved. Therefore we encourage you to spend time figuring out proper queries etc. that will fetch all the data you need in as few roundtrips as possible. That's obviously a rule to apply to any database, but it's even a bit more relevant in the case of remote web services.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/58bdfce5/src/site/apt/example_schema_traversal.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/example_schema_traversal.apt b/src/site/apt/example_schema_traversal.apt
deleted file mode 100644
index 217ee77..0000000
--- a/src/site/apt/example_schema_traversal.apt
+++ /dev/null
@@ -1,56 +0,0 @@
- ------
- Traverse schema model | Example
- ------
-
-Traverse schema model
-
- This example demonstrates traversing the <<schema>> model of a JDBC database connection:
-
-+-------------------------------+
-Connection con = ...
-
-DataContext dataContext = DataContextFactory.createJdbcDataContext(con);
-Schema[] schemas = dataContext.getSchemas();
-
-// iterate through schemas
-for (Schema schema : schemas) {
-
- System.out.println(schema.getName());
- Table[] tables = schema.getTables();
-
- // iterate through tables
- for (Table table : tables) {
-
- System.out.println(" " + table.getName() + " (" + table.getType() + ")");
- Column[] columns = table.getColumns();
-
- // iterate through columns
- for (Column column : columns) {
-
- System.out.println(" " + column.getName() + " (" + column.getType() + "|" + column.getNativeType() + ")");
- }
- }
-
-}
-+-------------------------------+
-
-Run on an example PostgreSQL database this will print out:
-
-+-------------------------------+
-information_schema
-pg_catalog
-pg_toast_temp_1
-public
- person (TABLE)
- id (INTEGER|serial)
- name (VARCHAR|text)
- age (INTEGER|integer)
- company_id (INTEGER|int4)
- company (TABLE)
- id (INTEGER|serial)
- name (VARCHAR|text)
- employments (VIEW)
- employee_name (VARCHAR|text)
- company_name (VARCHAR|text)
-
-+-------------------------------+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/58bdfce5/src/site/apt/example_simple_queries.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/example_simple_queries.apt b/src/site/apt/example_simple_queries.apt
deleted file mode 100644
index d953bce..0000000
--- a/src/site/apt/example_simple_queries.apt
+++ /dev/null
@@ -1,83 +0,0 @@
- ------
- Simple queries to get started
- ------
-
-Simple queries to get started
-
- In this example we will demonstrate a few simple queries that should get you started with the fluent Querying API in MetaModel.
-
- We will assume you have a CSV file with the two colums first_name and last_name.
-
-+-------------------------------+
-File myFile = new File("persons.csv");
-
-DataContext dataContext = DataContextFactory.createCsvDataContext(myFile);
-Schema schema = dataContext.getDefaultSchema();
-Table[] tables = schema.getTables();
-
-// CSV files only has a single table in the default schema
-assert tables.length == 1;
-
-Table table = tables[0];
-
-// there are several ways to get columns - here we simply get them by name
-Column firstNameColumn = table.getColumnByName("first_name");
-Column lastNameColumn = table.getColumnByName("last_name");
-
-// use the table and column types in the query
-Query q = dataContext.query().from(table).select(firstNameColumn).toQuery();
-System.out.println(q.toString());
-
-+-------------------------------+
-
- This will print out:
-
-+-------------------------------+
-SELECT first_name FROM persons.csv.persons
-+-------------------------------+
-
- Now let's say we want to add a where clause for the lastname. We simple do like this in stead:
-
-+-------------------------------+
-Query q = dataContext.query().from(table).select(firstNameColumn).where(lastNameColumn).equals("Doe").toQuery();
-System.out.println(q.toString());
-+-------------------------------+
-
- This will print out:
-
-+-------------------------------+
-SELECT first_name FROM persons.csv.persons WHERE last_name = 'Doe';
-+-------------------------------+
-
- Finally let's do some aggregation by adding a GROUP BY clause and COUNT(*) to the select clause:
-
-+-------------------------------+
-Query q = dataContext.query().from(table).select(lastNameColumn).selectCount().groupBy(lastNameColumn).orderBy(lastNameColumn).asc().toQuery();
-System.out.println(q.toString());
-+-------------------------------+
-
- This will print out:
-
-+-------------------------------+
-SELECT last_name, COUNT(*) FROM persons.csv.persons GROUP BY last_name ORDER BY last_name ASC;
-+-------------------------------+
-
- And the beauty of it is that it will work even on a flat datastore like a CSV file. Here's the query execution code:
-
-+-------------------------------+
-DataSet ds = dataContext.executeQuery(q)
-while (ds.next()) {
- Row row = ds.getRow();
- String lastName = (String) row.getValue(lastNameColumn);
- Number count = (Number) row.getValue(1);
- System.out.println("row: " + lastName + " occurs " + count + " times");
-}
-+-------------------------------+
-
- Given an example CSV file this will print out:
-
-+-------------------------------+
-row: Elison occurs 2 times
-row: Gates occurs 5 times
-row: Jobs occurs 3 times
-+-------------------------------+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/58bdfce5/src/site/apt/example_type_conversion.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/example_type_conversion.apt b/src/site/apt/example_type_conversion.apt
deleted file mode 100644
index a056789..0000000
--- a/src/site/apt/example_type_conversion.apt
+++ /dev/null
@@ -1,34 +0,0 @@
- ------
- Automatic type conversion
- ------
-
-Automatic type conversion
-
- Some datastores have less expressive data types than what you need - and certainly less expressive than Java's type system. Therefore MetaModel provides an API for automatic conversion of
- data types between their physical values and their logical values.
-
- An obvious example is CSV files, which only host String values, since their storage is plain text files. But often times there are columns within a CSV file that should be interpreted eg. as
- numbers, dates or booleans. To overcome this issue, you can apply MetaModel's type converters. It will look like this:
-
-+-------------------------------+
-UpdateableDataContext dc = DataContextFactory.createCsvDataContext(...);
-Column numberCol = dc.getColumnByQualifiedLabel("my_number");
-Column booleanCol = dc.getColumnByQualifiedLabel("my_boolean");
-dc = Converters.addTypeConverter(dc, numberCol, new StringToIntegerConverter());
-dc = Converters.addTypeConverter(dc, booleanCol, new StringToBooleanConverter());
-+-------------------------------+
-
- Afterwards, all queries and updates on these columns will automatically get their types converted, so that your view of the data can use the proper Java types.
-
- You can also ask MetaModel to auto-detect the converters to apply. For doing that MetaModel will inspect the result of a query and assert if any of the columns are plausible candidates for conversion:
-
-+-------------------------------+
-UpdateableDataContext dc = DataContextFactory.createCsvDataContext(...);
-Table table = dc.getDefaultSchema().getTables()[0];
-Map<Column, TypeConverter<?,?>> converters =
- Converters.autoDetectConverters(dc, table, 1000); // query at max 1000 rows
-dc = Converters.addTypeConverters(dc, converters);
-+-------------------------------+
-
- For more information, take a look at the {{{./apidocs/org/eobjects/metamodel/convert/Converters.html} Converters}}
- class which has useful static methods for applying converters easily.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/58bdfce5/src/site/apt/example_xml_mapping.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/example_xml_mapping.apt b/src/site/apt/example_xml_mapping.apt
deleted file mode 100644
index ad7998a..0000000
--- a/src/site/apt/example_xml_mapping.apt
+++ /dev/null
@@ -1,158 +0,0 @@
- ------
- XML table mapping
- ------
-
-XML table mapping
-
- Since XML files are hierarical and MetaModel tables are tabular, you need
- to do some mapping. MetaModel provides a mapping model that is XPath based,
- with a few slight modifications.
-
- Assume we have the following XML document:
-
-+-------------------------------+
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
- <organization type="governmental">
- <name>Company A</name>
- <employees>
- <employee>
- <name>John Doe</name>
- <gender>M</gender>
- </employee>
- <employee>
- <name>Jane Doe</name>
- <gender>F</gender>
- </employee>
- </employees>
- </organization>
-
- <organization type="company">
- <name>Company B</name>
- <employees>
- <employee>
- <name>Peter</name>
- <gender>M</gender>
- </employee>
- <employee>
- <name>Bob</name>
- <gender>M</gender>
- </employee>
- </employees>
- </organization>
-</root>
-+-------------------------------+
-
- Now imagine that you want to have a table of employee names and gender information,
- and another table with company name and type information. We define our DataContext and
- those tables like this:
-
-+-------------------------------+
-XmlSaxTableDef employeeTableDef = new XmlSaxTableDef(
- "/root/organization/employees/employee",
- new String[] {
- "/root/organization/employees/employee/name",
- "/root/organization/employees/employee/gender"
- }
-);
-
-XmlSaxTableDef organizationTableDef = new XmlSaxTableDef(
- "/root/organization",
- new String[] {
- "/root/organization/name",
- "/root/organization@type"
- }
-);
-
-DataContext dc = new XmlSaxDataContext(
- new File("my_file.xml"), employeeTableDef, organizationTableDef);
-+-------------------------------+
-
- As you see, we simply provide some XPath expressions to 1) define the record scope and 2) define
- paths of individual values (or rather - the column definitions). If you query those tables,
- you will get datasets like these:
-
- Table: /employee
-
-*--------------------+-----------------+-----------------+
-| <<row_id>> | <</name>> | <</gender>> |
-*--------------------+-----------------+-----------------+
-| 0 | John Doe | M |
-*--------------------+-----------------+-----------------+
-| 1 | Jane Doe | F |
-*--------------------+-----------------+-----------------+
-| 2 | Peter | M |
-*--------------------+-----------------+-----------------+
-| 3 | Bob | M |
-*--------------------+-----------------+-----------------+
-
- Table: /organization
-
-*--------------------+-----------------+-----------------+
-| <<row_id>> | <</name>> | <<...@type>> |
-*--------------------+-----------------+-----------------+
-| 0 | Company A | governmental |
-*--------------------+-----------------+-----------------+
-| 1 | Company B | company |
-*--------------------+-----------------+-----------------+
-
- This is nice, but you might be thinking: How can I then join these tables? There doesn't seem
- to be any cross-reference value that we can join or perform lookups by.
-
- To solve this issue, MetaModel provides a modification for XPath, the index(...) function. Say
- we want to add the organization's id to the employee table (as a foreign key). To archieve that,
- we will need this modified employee table definition (notice the third value XPath expression):
-
-+-------------------------------+
-XmlSaxTableDef employeeTableDef = new XmlSaxTableDef(
- "/root/organization/employees/employee",
- new String[] {
- "/root/organization/employees/employee/name",
- "/root/organization/employees/employee/gender",
- "index(/root/organization)"
- }
-);
-+-------------------------------+
-
- Now if you query the employees table, this will be your result:
-
-*--------------------+-----------------+-----------------+-------------------------------+
-| <<row_id>> | <</name>> | <</gender>> | <<index(/root/organization)>> |
-*--------------------+-----------------+-----------------+-------------------------------+
-| 0 | John Doe | M | 0 |
-*--------------------+-----------------+-----------------+-------------------------------+
-| 1 | Jane Doe | F | 0 |
-*--------------------+-----------------+-----------------+-------------------------------+
-| 2 | Peter | M | 1 |
-*--------------------+-----------------+-----------------+-------------------------------+
-| 3 | Bob | M | 1 |
-*--------------------+-----------------+-----------------+-------------------------------+
-
- Moving on, you will be able to define both joins and lookups using this foreign key. For example:
-
-+-------------------------------+
-Column fk = employeeTable.getColumnByName("index(/root/organization)");
-Column empName = employeeTable.getColumnByName("/name");
-Column orgId = organizationTable.getColumnByName("row_id");
-Column orgName = organizationTable.getColumnByName("/name");
-
-Query q = dc.query().from(employeeTable)
- .innerJoin(organizationTable).on(fk, orgId)
- .select(empName).as("employee")
- .select(orgName).as("company").toQuery();
-DataSet ds = dc.executeQuery(q);
-+-------------------------------+
-
- The contents of this queried dataset will now be:
-
-*-----------------+-----------------+
-| <<employee>> | <<company>> |
-*-----------------+-----------------+
-| John Doe | Company A |
-*-----------------+-----------------+
-| Jane Doe | Company A |
-*-----------------+-----------------+
-| Peter | Company B |
-*-----------------+-----------------+
-| Bob | Company B |
-*-----------------+-----------------+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/58bdfce5/src/site/apt/goals.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/goals.apt b/src/site/apt/goals.apt
deleted file mode 100644
index 5747980..0000000
--- a/src/site/apt/goals.apt
+++ /dev/null
@@ -1,33 +0,0 @@
- ------
- Project goals
- ------
-
-Project goals
-
- The goal of MetaModel is to provide an API for:
-
- * Traversing and building the <<structure>> of datastores.
-
- * Executing datastore-neutral <<queries>> in a SQL-like manner.
-
- * Provide those datastores that do not already support queries with the MetaModel streaming <<query engine>> (aka. the Query Postprocessor).
-
- * Implement this system for JDBC databases, Comma-separated files, XML files, Excel spreadsheets and more.
-
- * Allow <<querying across>> datastores in a way that is similar to querying a single datastore. This involves transparent client-side joining, filtering, grouping etc.
-
-Design rationale
-
- We are designing the API of MetaModel to be:
-
- * <<Comprehensive>> - MetaModel should contain all the functionality that is required to model the datastore domain.
-
- * <<Easy to use>> - We focus on simple design and fluent interfaces to make the most commonly used functionality easy and fun to use.
-
- * <<Consistent>> - With MetaModel you will not experience all the ambiguities that exist in other frameworks like JDBC. Instead of diversity and hacks we focus on standardization and a common datastore infrastructure - all nescesary hacks have been hidden from you, the user.
-
- * <<Performant>> - MetaModel strives to implement all the tweaks and hacks that you need to do, but implement them behind the covers of our interfaces. This means you don't need to worry as much about about e.g. low-level query optimization, but just concentrate on what you need to archieve.
-
- * <<Extensible>> - We provide extension-points to make it possible to use MetaModel for your own legacy systems, for example to query datastores that may not be supported.
-
- * <<Lightweight>> - Deliberate use of POJOs make it easy to understand what is going on inside MetaModel.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/58bdfce5/src/site/apt/index.apt.vm
----------------------------------------------------------------------
diff --git a/src/site/apt/index.apt.vm b/src/site/apt/index.apt.vm
deleted file mode 100644
index af24eae..0000000
--- a/src/site/apt/index.apt.vm
+++ /dev/null
@@ -1,72 +0,0 @@
- ------
- Home
- ------
-
-eobjects.org MetaModel
-
- MetaModel is a library that <<encapsulates>> the <differences> and <<enhances>>
- the <capabilities> of different datastores. Rich <<querying>> abilities are
- offered to datastores that do not otherwise support advanced querying
- and a <<unified view>> of the datastore structure is offered through a
- single model of the schemas, tables, columns and relationships.
-
-[modules.png] Modules in MetaModel
-
-
-
-* Sounds interesting? Read on for a few quick steps to get you started!
-
-Query with MetaModel
-
- With MetaModel you use a type-safe SQL-like API for querying any datastore:
-
-+-------------------------------+
-DataContext dataContext = DataContextFactory.create[Type-of-DataContext](...);
-DataSet dataSet = dataContext.query()
- .from("libraries")
- .select("name")
- .where("language").equals("Java")
- .and("enhances_data_access").equals(true)
- .execute();
-+-------------------------------+
-
- The MetaModel query API allows you to use the power of SQL, even on data formats such as CSV files, Excel spreadsheets, NoSQL databases and more.
-
-Update with MetaModel
-
- MetaModel lets you do CRUD operations on arbitrary datamodels, also in a type-safe manner. Batch updates and transactions are logically modelled as UpdateScript closures.
-
-+-------------------------------+
-dataContext.executeUpdate(new UpdateScript() {
- public void run(UpdateCallback callback) {
- // CREATE a table
- Table table = callback.createTable("foo").withColumn("bar").ofType(INTEGER)
- .withColumn("baz").ofType(VARCHAR).execute();
-
- // INSERT INTO table
- callback.insertInto(table).value("bar", 1).value("baz", "hello").execute();
- callback.insertInto(table).value("bar", 2).value("baz", "world").execute();
-
- // UPDATE table
- callback.update(table).value("baz","universe").where("bar").equals(2).execute();
-
- // DELETE FROM table
- callback.deleteFrom(table).where("bar").equals(1).execute();
- }
-});
-+-------------------------------+
-
- The rest of the API should reveal itself through using the DataContext (but don't be affraid to check out the
- {{{./example_simple_queries.html} examples}} and the {{{./apidocs} Javadoc API documentation}})!
-
-Install MetaModel
-
- Include MetaModel as a dependency in your project (if you're not using Maven, refer to the {{{./download.html}download page}} for alternatives):
-
-+-------------------------------+
-<dependency>
- <groupId>org.apache.metamodel</groupId>
- <artifactId>MetaModel-full</artifactId>
- <version>${siteDownloadVersion}</version>
-</dependency>
-+-------------------------------+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/58bdfce5/src/site/apt/license.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/license.apt b/src/site/apt/license.apt
deleted file mode 100644
index c7aae6f..0000000
--- a/src/site/apt/license.apt
+++ /dev/null
@@ -1,185 +0,0 @@
- ------
- License
- ------
-
-Free, as in free speech
-
- MetaModel and all MetaModel modules are Copyright (c) of eobjects.org and it's contributors,
- and is being distributed under the GNU Lesser General Public License (LGPL), version 3.
-
- The LGPL gives you the permission to use MetaModel as a library in any (open source, closed
- or commercial) software project.
-
- If you modify MetaModel and redistribute your modifications, the LGPL applies. You must submit
- any modifications back to the community for review and possible inclusion in the upstream MetaModel
- project.
-
-The LGPL license
-
-+-------------------------------+
- GNU LESSER GENERAL PUBLIC LICENSE
- Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
- This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
- 0. Additional Definitions.
-
- As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
- "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
- An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
- A "Combined Work" is a work produced by combining or linking an
-Application with the Library. The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
- The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
- The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
- 1. Exception to Section 3 of the GNU GPL.
-
- You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
- 2. Conveying Modified Versions.
-
- If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
- a) under this License, provided that you make a good faith effort to
- ensure that, in the event an Application does not supply the
- function or data, the facility still operates, and performs
- whatever part of its purpose remains meaningful, or
-
- b) under the GNU GPL, with none of the additional permissions of
- this License applicable to that copy.
-
- 3. Object Code Incorporating Material from Library Header Files.
-
- The object code form of an Application may incorporate material from
-a header file that is part of the Library. You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
- a) Give prominent notice with each copy of the object code that the
- Library is used in it and that the Library and its use are
- covered by this License.
-
- b) Accompany the object code with a copy of the GNU GPL and this license
- document.
-
- 4. Combined Works.
-
- You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
- a) Give prominent notice with each copy of the Combined Work that
- the Library is used in it and that the Library and its use are
- covered by this License.
-
- b) Accompany the Combined Work with a copy of the GNU GPL and this license
- document.
-
- c) For a Combined Work that displays copyright notices during
- execution, include the copyright notice for the Library among
- these notices, as well as a reference directing the user to the
- copies of the GNU GPL and this license document.
-
- d) Do one of the following:
-
- 0) Convey the Minimal Corresponding Source under the terms of this
- License, and the Corresponding Application Code in a form
- suitable for, and under terms that permit, the user to
- recombine or relink the Application with a modified version of
- the Linked Version to produce a modified Combined Work, in the
- manner specified by section 6 of the GNU GPL for conveying
- Corresponding Source.
-
- 1) Use a suitable shared library mechanism for linking with the
- Library. A suitable mechanism is one that (a) uses at run time
- a copy of the Library already present on the user's computer
- system, and (b) will operate properly with a modified version
- of the Library that is interface-compatible with the Linked
- Version.
-
- e) Provide Installation Information, but only if you would otherwise
- be required to provide such information under section 6 of the
- GNU GPL, and only to the extent that such information is
- necessary to install and execute a modified version of the
- Combined Work produced by recombining or relinking the
- Application with a modified version of the Linked Version. (If
- you use option 4d0, the Installation Information must accompany
- the Minimal Corresponding Source and Corresponding Application
- Code. If you use option 4d1, you must provide the Installation
- Information in the manner specified by section 6 of the GNU GPL
- for conveying Corresponding Source.)
-
- 5. Combined Libraries.
-
- You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
- a) Accompany the combined library with a copy of the same work based
- on the Library, uncombined with any other library facilities,
- conveyed under the terms of this License.
-
- b) Give prominent notice with the combined library that part of it
- is a work based on the Library, and explaining where to find the
- accompanying uncombined form of the same work.
-
- 6. Revised Versions of the GNU Lesser General Public License.
-
- The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
- Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
- If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.
-+-------------------------------+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/58bdfce5/src/site/apt/project_cases.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/project_cases.apt b/src/site/apt/project_cases.apt
deleted file mode 100644
index 10ae3c5..0000000
--- a/src/site/apt/project_cases.apt
+++ /dev/null
@@ -1,45 +0,0 @@
- ------
- Projects that use MetaModel
- ------
-
-Projects that use MetaModel
-
- Here are a few examples of projects that use MetaModel. If you're working on or know of a project that uses MetaModel, please let us know and we will consider it for this page.
-
-* DataCleaner
-
- DataCleaner is one of the most popular open source data quality applications. DataCleaner has powerful
- profiling features that enable you to go beyond the "tip of the iceberg" when you explore you datastore.
- Besides offering advanced analysis functionality the application is focused on easy of use and flexibility.
- This also propagates to the datastore-technology. In the DataCleaner project MetaModel is a vital
- component making the application possible of applying the same data profiling and analysis mechanisms
- on any datastore that you wish to investigate.
-
- {{{http://datacleaner.eobjects.org}Visit DataCleaner's website}}
-
-* HIquality Data Improver
-
- The HIquality Data Improver delivers data quality directly to your browser. The HIquality Data Improver
- offers initial and regular data cleansing by simply pressing a button. Deduplication, matching, standardisation
- and merging based on Human Inference's acclaimed DQ services are integrated in one solution available online
- or on premise.
-
- {{{http://www.humaninference.com/solutions/hiquality-data-improver}Visit HIquality Data Improver's website}}
-
-* Quipu
-
- Quipu is an open source data warehouse generation system that creates and monitors data warehouses.
- With Quipu you can implement a data warehouse much quicker and easier.
-
- Quipu automates the data warehouse data model design and generates the load code (ETL) to fill the
- data warehouse from source systems.
-
- {{{http://www.datawarehousemanagement.org}Visit Quipu's website}}
-
-* AnalyzerBeans
-
- AnalyzerBeans is a framework for data analysis. It provides a data flow engine for processing data
- originating from any MetaModel datastore. AnalyzerBeans supports transforming data, filtering data,
- analyzing data and merging flows.
-
- {{{http://analyzerbeans.eobjects.org}Visit AnalyzerBeans' website}}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/58bdfce5/src/site/apt/schema_and_table_semantics.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/schema_and_table_semantics.apt b/src/site/apt/schema_and_table_semantics.apt
deleted file mode 100644
index 7101d71..0000000
--- a/src/site/apt/schema_and_table_semantics.apt
+++ /dev/null
@@ -1,83 +0,0 @@
- ------
- Schema and table semantics
- ------
-
-Schema and table semantics
-
- Since the datastore types that MetaModel support are widely different, one might question "what does a schema or a table mean?" for eg. Excel spreadsheets, CSV files etc.
-
- On this page we will answer such questions. In the table below there's a list of MetaModel modules and an explanation of the semantics of schemas and tables.
-
-*----------------------+----------------------------------------+----------------------------------------------------------------+
-| <<Module>> | <<Schema>> | <<Table>> |
-*----------------------+----------------------------------------+----------------------------------------------------------------+
-| JDBC | A database schema, as defined by JDBC. | A database TABLE, VIEW or other tabular structure in a schema. |
-*----------------------+----------------------------------------+----------------------------------------------------------------+
-| OpenOffice | A database schema, as defined by JDBC. | A database TABLE, VIEW or other tabular structure in a schema. |
-*----------------------+----------------------------------------+----------------------------------------------------------------+
-| CSV | A handle to the CSV file. If the file | The actual file structure, based on the column name line. |
-| | does not exist, schema will be empty. | |
-| | Always has default schema and virtual | |
-| | information schema. | |
-*----------------------+----------------------------------------+----------------------------------------------------------------+
-| Excel | A handle to the Excel spreadsheet. If | A sheet in the spreadsheet |
-| | the file does not exist, schema will | |
-| | be empty. | |
-| | Always has default schema and virtual | |
-| | information schema. | |
-*----------------------+----------------------------------------+----------------------------------------------------------------+
-| Fixed width | A handle to the Fixed value width | The actual file structure, based on the column name line. |
-| | file. | |
-| | Always has default schema and virtual | |
-| | information schema. | |
-*----------------------+----------------------------------------+----------------------------------------------------------------+
-| Access | A handle to the Access file. | The tables in the Access database file. |
-| | Always has default schema and virtual | |
-| | information schema. | |
-*----------------------+----------------------------------------+----------------------------------------------------------------+
-| dBase | A handle to the dBase file. | The tables in the dBase database file. |
-| | Always has default schema and virtual | |
-| | information schema. | |
-*----------------------+----------------------------------------+----------------------------------------------------------------+
-| XML (SAX) | A handle to the XML file. | A certain position in the XML tree, defined by a user's xpath |
-| | Always has default schema and virtual | expression. Each table also has xpath expressions for each |
-| | information schema. | column, which define the values of the rows in a table. |
-*----------------------+----------------------------------------+----------------------------------------------------------------+
-| XML (DOM) | A handle to the XML file. | All tables are virtual representations of recurring |
-| | Always has default schema and virtual | combinations of XML elements. The actual generation of tables |
-| | information schema. | depend on whether you perform manual or automatic "flattening" |
-| | | (denormalization) of tables |
-*----------------------+----------------------------------------+----------------------------------------------------------------+
-| MongoDB | A MongoDB database. | A MongoDB collection with a virtual table model, which |
-| | | represent the properties of the documents in the collection. |
-*----------------------+----------------------------------------+----------------------------------------------------------------+
-| Salesforce.com | A handle to the web services | A type of Salesforce.com SObject. |
-| | of Salesforce | |
-*----------------------+----------------------------------------+----------------------------------------------------------------+
-| SugarCRM | A handle to the web services | A SugarCRM 'module'. |
-| | of SugarCRM | |
-*----------------------+----------------------------------------+----------------------------------------------------------------+
-
-Semantics of "Create table"
-
- In addition to understanding "what is a table?" it is also useful to know what it
- means to "create" a table, as it is facilitated by MetaModel 2.0 and onwards.
-
-*----------------------+-------------------------------------------------------+
-| <<Module>> | <<Create table semantics>> |
-*----------------------+-------------------------------------------------------+
-| JDBC | Issue a CREATE TABLE statement to the database. |
-*----------------------+-------------------------------------------------------+
-| CSV | Create or overwrite the CSV file with a (new) table |
-| | structure. If multiple files should be created, then |
-| | create a new CsvDataContext and issue the createTable |
-| | operation there. |
-*----------------------+-------------------------------------------------------+
-| Excel | Creates a new sheet in the Excel spreadsheet. |
-*----------------------+-------------------------------------------------------+
-| MongoDB | Creates a new collection in the MongoDB database. |
-*----------------------+-------------------------------------------------------+
-| CouchDB | Creates a new CouchDB database. |
-*----------------------+-------------------------------------------------------+
-| POJO (Java objects) | Creates a new collection of Java objects (Map based). |
-*----------------------+-------------------------------------------------------+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/58bdfce5/src/site/fml/faq.fml
----------------------------------------------------------------------
diff --git a/src/site/fml/faq.fml b/src/site/fml/faq.fml
deleted file mode 100644
index fc6d9e8..0000000
--- a/src/site/fml/faq.fml
+++ /dev/null
@@ -1,207 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faqs xmlns="http://maven.apache.org/FML/1.0.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/FML/1.0.1 http://maven.apache.org/xsd/fml-1.0.1.xsd"
- title="Frequently Asked Questions" toplink="false">
-
- <part id="general">
- <title>General information</title>
- <faq id="whatis">
- <question>What is MetaModel?</question>
- <answer>
- <p>MetaModel is a Java based library for accessing, exploring and querying datastores.
- Datastores may be relational databases, flat files, spreadsheet documents or single file
- based databases such as MS Access and dBase.</p>
- <p>MetaModel provides a uniform API for all these datastores. With the MetaModel API you
- can explore the structure of the datastore (ie. Schemas, Tables, Columns, Relationships) and
- you can query the datastore using a fluent Java API for querying in a manner that will feel
- natural to anyone who's ever tried SQL, the industry standard for database querying.</p>
- </answer>
- </faq>
-
- <faq id="why">
- <question>Why should I care about MetaModel?</question>
- <answer>
- <p>Because MetaModel is the most versatile Java library for accessing different datastores.
- No other library provides the same ability to access just about any datastore and MetaModel
- even does this in a way that is intuitive, type-safe and supports advanced querying options.</p>
- </answer>
- </faq>
- </part>
-
- <part id="how_it_works">
- <title>How it works</title>
- <faq id="supported_datastores">
- <question>Which data formats does MetaModel support?
- </question>
- <answer>
- <p>Please refer to the <a href="database_compliancy.html">database compliancy</a> page.</p>
- </answer>
- </faq>
-
- <faq id="unsupported_datastores">
- <question>Which types of datastores does MetaModel not support?
- </question>
- <answer>
- <p>For now MetaModel is limited to a tabular view on data, so any datastore that cannot be accessed in such a way will not be supported.</p>
- <p>The upside is however that by far most datastore types are in fact tabular or can
- be interpreted as tabular. To make a point of this you can even use MetaModel with
- XML-files as a datastore, even though XML-files are inherently hierarical and not
- tabular, but MetaModel provides an abstraction layer that allows you to access an
- XML files as if it was made up of schemas, tables and columns.</p>
- </answer>
- </faq>
-
- <faq id="how_querying">
- <question>How do you support querying of non-queryable datastores like CSV files or spreadsheets?</question>
- <answer>
- <p>MetaModel includes it's own query interpretation engine, called <b>Query Postprocessor</b>.
- If a datastore has it's own native query engine MetaModel will rewrite the query to fit to that
- engine. If the datastore does not have a query engine then MetaModel will find out what data it needs
- to execute the query and perform the data manipulation required by the query in memory.</p>
- </answer>
- </faq>
-
- <faq id="how_null_semantics">
- <question>How are NULL values interpreted by MetaModel?</question>
- <answer>
- <p>MetaModel's end users are typically Java developers, so we interpret NULL in a similar way as Java does.</p>
- <p>Why is this interesting? Because in ANSI SQL, the semantics around NULL values are different. In SQL the following statement is false, whereas it is true in Java:</p>
- <pre>NULL = NULL</pre>
- <p>The distinction becomes very important when dealing with queries that specify a filter where some field is not equal to some operand. For instance:</p>
- <pre>SELECT * FROM persons WHERE gender <> 'M'</pre>
- <p>Traditional SQL engines will not include records where gender is NULL in the result set of the above query. But MetaModel will, since we believe this is the most natural way of working with queries for developers!</p>
- </answer>
- </faq>
-
- <faq id="scalability">
- <question>What are the performance characteristics of MetaModel?</question>
- <answer>
- <p>MetaModel was designed to keep memory down whenever possible, but not at the expense of providing a rich API for exploring and querying your datastores. Of course there are going to be a lot of added objects to express your queries as objects in stead of a single String but in the big picture this is never a problem. The same argument applies to the schema model - you could potentially build an application without storing metadata about your tables, columns etc. as Java objects but we believe the added expressiveness of the API far overshadows the added memory footprint. If you do however have datastores with tens of thousands of columns then it may begin to present a disadvantage of using MetaModel but we propose simply configuring your JVM with a larger heap space then, because given your datastore structure you're going to need it anyway :)</p>
- <p>In terms of query execution speed we also do a lot to keep the memory consumption down. When possible results are streamed from their original datastore so buffer sizes will not outgrow the available memory. There are however some situations where it is not possible to apply a streaming approach. For example if you issue an ORDER BY statement or a GROUP BY statement on a datastore that does not support native querying (such as a CSV file), then MetaModel will have to load the full contents of the datastore into memory in order to process the query. So make sure you only do these kinds of queries when the contents is not expected to outgrow your total amount of memory (typical JVM configurations can hold several (tens of) thousands rows of data though, depending on the amount of columns).</p>
- </answer>
- </faq>
- </part>
-
- <part id="dependencies">
- <title>Which third-party libraries are used for...</title>
- <faq id="csv">
- <question>... CSV files</question>
- <answer>
- <p>The <b>MetaModel-csv</b> module depends on the <a href="http://opencsv.sourceforge.net/" target="_blank">opencsv</a>
- library for parsing of CSV files. The query and update layer is implemented using MetaModel's Query Postprocessor engine.</p>
- </answer>
- </faq>
- <faq id="excel">
- <question>... Excel spreadsheets</question>
- <answer>
- <p>The <b>MetaModel-excel</b> module depends on the <a href="http://poi.apache.org/" target="_blank">Apache POI</a>
- library for reading Excel spreadsheets. The query and update layer is implemented using MetaModel's Query Postprocessor engine.</p>
- </answer>
- </faq>
- <faq id="odb">
- <question>... OpenOffice.org database files</question>
- <answer>
- <p>The <b>MetaModel-openoffice</b> module depends on the <a href="http://hsqldb.org/" target="_blank">Hsqldb 1.8</a>
- database which is already the underlying database used by OpenOffice.org. The query layer is implemented in the
- <b>MetaModel-jdbc</b> module as the database connection is established using JDBC.</p>
- </answer>
- </faq>
- <faq id="access">
- <question>... Microsoft Access database files</question>
- <answer>
- <p>The <b>MetaModel-access</b> module depends on the <a href="http://jackcess.sourceforge.net/" target="_blank">Jackcess</a>
- library for reading Microsoft Access database-files. The query layer is implemented using MetaModel's Query Postprocessor engine.</p>
- </answer>
- </faq>
- <faq id="dbase">
- <question>... dBase files</question>
- <answer>
- <p>The <b>MetaModel-dbase</b> module depends on the <a href="http://xbasej.sourceforge.net/" target="_blank">xBaseJ</a>
- library for reading dBase files. xBaseJ has been especially re-licensed and incorporated into MetaModel under the LGPL
- license (originally it is GPL licensed). The query layer is implemented using MetaModel's Query Postprocessor engine.</p>
- </answer>
- </faq>
- <faq id="couchdb">
- <question>... CouchDB databases</question>
- <answer>
- <p>The <b>MetaModel-couchdb</b> module depends on the <a href="https://github.com/helun/Ektorp" target="_blank">ektorp</a>
- library for connecting to CouchDB databases. The query and update layer is implemented using MetaModel's Query Postprocessor engine.</p>
- </answer>
- </faq>
- <faq id="mongodb">
- <question>... MongoDB databases</question>
- <answer>
- <p>The <b>MetaModel-mongodb</b> module depends on the <a href="https://github.com/mongodb/mongo-java-driver" target="_blank">MongoDB Java driver</a>
- library for connecting to MongoDB databases. The query and update layer is implemented using MetaModel's Query Postprocessor engine.</p>
- </answer>
- </faq>
- </part>
-
- <part id="comparison">
- <title>How does MetaModel compare to ...</title>
- <faq id="compare_hibernate_jpa">
- <question>Hibernate and Java Persistence API (JPA)?</question>
- <answer>
- <p>Hibernate and JPA are object-relational mappers (ORMs), which MetaModel is <i>not</i>.
- The main difference lies in the fact that with Hibernate or JPA you need to have a fixed
- domain model on which your application works. This is the case for most business applications
- and MetaModel is no contestant in this arena.</p>
- <p>MetaModel on the other hand does not have a fixed domain model - it works on the metadata
- level where there are just arbitrary structures of data. You can also say that MetaModel's domain
- model is data. So MetaModel would be a good starting point if you are building an application that
- is datastore-agnostic or maybe even if you are building an ORM yourself.</p>
- <p>Some distinguishing differences:</p>
- <ul>
- <li>Hibernate/JPA only supports relational JDBC-databases. MetaModel supports JDBC-databases in addition to CSV files, Excel spreadsheets <a href="database_compliancy.html">and much more</a>.</li>
- <li>A JPA-based domain model is bound at compile time, while MetaModel represents the model of the datastore at runtime.</li>
- <li>MetaModel can be used to explore and query any given datastore whereas Hibernate/JPA provides a way to bridge the gap of concrete domain modelling and a concrete database.</li>
- <li>MetaModel supports type-safe, runtime generated, queries and datastore-exploration whereas Hibernate/JPA advocates hardcoded string literal binding and querying.</li>
- </ul>
- </answer>
- </faq>
-
- <faq id="compare_jdbc">
- <question>Java Database Connectivity (JDBC)?</question>
- <answer>
- <p>JDBC is the most common way of accessing a relational database in Java and thus it is heavily used
- by MetaModel when working with relational databases. Database vendors (and in some cases complimentary
- open source communities) typically provide a JDBC driver which allows for the connectivity to the database.</p>
- <p>MetaModel uses and enhances JDBC in a variety of ways:</p>
- <ul>
- <li>Although the JDBC specification is pretty straight forward, not all vendors implement it correctly
- or entirely. MetaModel encapsulates the differences of varying JDBC implementations.</li>
- <li>While there is a metadata API in JDBC it is quite ackward to work with. It requires you to traverse
- ResultSets describing the database structure in stead of first-class metadata objects like MetaModel's
- Schema, Table, Column and Relationship objects.</li>
- <li>JDBC querying is based on string literal queries, whereas MetaModel's Query API encapsulates this
- complexity in a type-safe query building API which eradicates errors and provides compile time safety.</li>
- </ul>
- </answer>
- </faq>
-
- <faq id="compare_linq">
- <question>Language Integrated Query (LINQ) for .NET?</question>
- <answer>
- <p>MetaModel was greatly inspired by the ideas of LINQ for .NET. The two technologies
- share a lot of similarities, but also some substantial differences. LINQ supports
- querying as a part of the language, which we of course cannot introduce into Java
- as a third party library.</p>
- <p>Like LINQ...</p>
- <ul>
- <li>MetaModel can be used to query not only for relational databases but also other datastores.</li>
- <li>MetaModel defines a DSL for querying (the Query Builder API) which aids the user to write correct and meaningful queries.</li>
- <li>MetaModel is inspired by SQL to make querying feel natural to the developer.</li>
- <li>MetaModel provides a compile time check for your queries.</li>
- <li>MetaModel makes it possibble to compose and manipulate your query programmatically and in a type-safe manner.</li>
- </ul>
- <p>Unlike LINQ...</p>
- <ul>
- <li>MetaModel is a Java library.</li>
- <li>MetaModel provides support for datastores such as CSV files, Excel spreadsheets and more.</li>
- <li>MetaModel has a slightly different set of built-in functions and query clauses.</li>
- <li>MetaModel is not a language feature, but simply a library.</li>
- </ul>
- </answer>
- </faq>
- </part>
-</faqs>
[24/50] [abbrv] git commit: Fixing test failure on MacOS due to time
difference.
Posted by ka...@apache.org.
Fixing test failure on MacOS due to time difference.
Project: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/commit/c549ef0d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/tree/c549ef0d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/diff/c549ef0d
Branch: refs/heads/hbase-module
Commit: c549ef0dac69469a8506457d258d30733c03b893
Parents: 39b8c77
Author: ankitk <an...@ankitk-think.humaninference.com>
Authored: Thu Nov 28 21:03:05 2013 +0100
Committer: ankitk <an...@ankitk-think.humaninference.com>
Committed: Thu Nov 28 21:03:05 2013 +0100
----------------------------------------------------------------------
.../org/apache/metamodel/salesforce/SalesforceDataContextTest.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/c549ef0d/salesforce/src/test/java/org/apache/metamodel/salesforce/SalesforceDataContextTest.java
----------------------------------------------------------------------
diff --git a/salesforce/src/test/java/org/apache/metamodel/salesforce/SalesforceDataContextTest.java b/salesforce/src/test/java/org/apache/metamodel/salesforce/SalesforceDataContextTest.java
index 7ff0ac8..8d4da09 100644
--- a/salesforce/src/test/java/org/apache/metamodel/salesforce/SalesforceDataContextTest.java
+++ b/salesforce/src/test/java/org/apache/metamodel/salesforce/SalesforceDataContextTest.java
@@ -363,6 +363,7 @@ public class SalesforceDataContextTest extends SalesforceTestCase {
cal.set(Calendar.YEAR, 2013);
cal.set(Calendar.MONTH, Calendar.JANUARY);
cal.set(Calendar.DAY_OF_MONTH, 23);
+ cal.set(Calendar.AM_PM, 0);
final Date date = cal.getTime();
final Timestamp dateTime = new Timestamp(date.getTime());
[09/50] [abbrv] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-metamodel
Posted by ka...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-metamodel
Project: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/commit/c54a1704
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/tree/c54a1704
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/diff/c54a1704
Branch: refs/heads/hbase-module
Commit: c54a170449d7b9d9cf9db57485f43bbc5a035789
Parents: d5b1f54 136d446
Author: ak.ankitkumar@gmail.com <ak...@gmail.com>
Authored: Mon Sep 30 14:55:34 2013 +0200
Committer: ak.ankitkumar@gmail.com <ak...@gmail.com>
Committed: Mon Sep 30 14:55:34 2013 +0200
----------------------------------------------------------------------
CHANGES.txt | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
[46/50] [abbrv] git commit: Updated CHANGES file with recent changes
made to master branch
Posted by ka...@apache.org.
Updated CHANGES file with recent changes made to master branch
Project: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/commit/b12c771b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/tree/b12c771b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/diff/b12c771b
Branch: refs/heads/hbase-module
Commit: b12c771bb601bcf1fb1cc59e6a6d875c87256afb
Parents: bae98b3
Author: Kasper Sørensen <i....@gmail.com>
Authored: Mon Jan 27 22:10:19 2014 +0100
Committer: Kasper Sørensen <i....@gmail.com>
Committed: Mon Jan 27 22:10:19 2014 +0100
----------------------------------------------------------------------
CHANGES.txt | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/b12c771b/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 78cb3ef..a4fce8f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,13 @@
-4.0
+(work in progress)
+
+ * [METAMODEL-11] - New module "MetaModel-spring" which adds a convenient FactoryBean to produce various types of DataContext objects based on externalizable parameters, for Spring framework users.
+ * [METAMODEL-32] - Fixed thread-safety issue in Excel module when tables (sheets) metadata is updated.
+ * [METAMODEL-35] - Improved query rewriting for DB2 when paged queries contain ORDER BY clause.
+ * [METAMODEL-34] - Updated LICENSE file to not include bundled dependencies' licenses.
+ * [METAMODEL-33] - Ensured that Apache Rat plugin for Maven is properly activated.
+ * [METAMODEL-37] - Removed old site sources from project.
+
+Apache MetaModel 4.0.0-incubating
* [METAMODEL-9] - SalesforceDataSet is throwing exception for insert sql of record having date/time.
* [METAMODEL-4] - Use folder name as schema name for file based DataContexts
[05/50] [abbrv] git commit: Fixing licenses for 3rd party libraries,
fixed the pom.xml files for apache header.
Posted by ka...@apache.org.
Fixing licenses for 3rd party libraries, fixed the pom.xml files for
apache header.
Project: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/commit/280ed985
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/tree/280ed985
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/diff/280ed985
Branch: refs/heads/hbase-module
Commit: 280ed98585d173a8367e016212526a1024adf553
Parents: 53ee770
Author: ak.ankitkumar@gmail.com <ak...@gmail.com>
Authored: Mon Sep 23 13:04:45 2013 +0200
Committer: ak.ankitkumar@gmail.com <ak...@gmail.com>
Committed: Mon Sep 23 13:04:45 2013 +0200
----------------------------------------------------------------------
LICENSE | 179 ++++++++++++++++++-
core/pom.xml | 19 ++
couchdb/pom.xml | 19 ++
csv/pom.xml | 19 ++
excel/pom.xml | 19 ++
fixedwidth/pom.xml | 19 ++
full/pom.xml | 19 ++
jdbc/pom.xml | 19 ++
mongodb/pom.xml | 19 ++
openoffice/pom.xml | 19 ++
pojo/pom.xml | 19 ++
pom.xml | 29 ++-
salesforce/pom.xml | 19 ++
sugarcrm/pom.xml | 19 ++
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 | 19 ++
20 files changed, 538 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/280ed985/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 7a4a3ea..4363154 100644
--- a/LICENSE
+++ b/LICENSE
@@ -199,4 +199,181 @@
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
- limitations under the License.
\ No newline at end of file
+ limitations under the License.
+
+ For the library dom4j-1.6.1.jar
+
+ Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved.
+
+Redistribution and use of this software and associated documentation
+("Software"), with or without modification, are permitted provided
+that the following conditions are met:
+
+1. Redistributions of source code must retain copyright
+ statements and notices. Redistributions must also contain a
+ copy of this document.
+
+2. Redistributions in binary form must reproduce the
+ above copyright notice, this list of conditions and the
+ following disclaimer in the documentation and/or other
+ materials provided with the distribution.
+
+3. The name "DOM4J" must not be used to endorse or promote
+ products derived from this Software without prior written
+ permission of MetaStuff, Ltd. For written permission,
+ please contact dom4j-info@metastuff.com.
+
+4. Products derived from this Software may not be called "DOM4J"
+ nor may "DOM4J" appear in their names without prior written
+ permission of MetaStuff, Ltd. DOM4J is a registered
+ trademark of MetaStuff, Ltd.
+
+5. Due credit should be given to the DOM4J Project -
+ http://www.dom4j.org
+
+THIS SOFTWARE IS PROVIDED BY METASTUFF, LTD. AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
+NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+METASTUFF, LTD. OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+ For force-wsc-24.0.0.jar & force-partner-api-24.0.0.jar
+
+Copyright (c) 2013, salesforce.com, inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided
+that the following conditions are met:
+
+ Redistributions of source code must retain the above copyright notice, this list of conditions and the
+ following disclaimer.
+
+ Redistributions in binary form must reproduce the above copyright notice, this list of conditions and
+ the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+ Neither the name of salesforce.com, inc. nor the names of its contributors may be used to endorse or
+ promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+ For hsqldb-1.8.0.10.jar component
+
+ COPYRIGHTS AND LICENSES (based on BSD License)
+
+For work developed by the HSQL Development Group:
+
+Copyright (c) 2001-2010, The HSQL Development Group
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
+
+Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+
+Neither the name of the HSQL Development Group nor the names of its
+contributors may be used to endorse or promote products derived from this
+software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL HSQL DEVELOPMENT GROUP, HSQLDB.ORG,
+OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+For work originally developed by the Hypersonic SQL Group:
+
+Copyright (c) 1995-2000 by the Hypersonic SQL Group.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
+
+Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+
+Neither the name of the Hypersonic SQL Group nor the names of its
+contributors may be used to endorse or promote products derived from this
+software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE HYPERSONIC SQL GROUP,
+OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+This software consists of voluntary contributions made by many individuals on behalf of the
+Hypersonic SQL Group.
+
+For slf4j-api-1.7.4.jar component
+Copyright (c) 2004-2013 QOS.ch All rights reserved. Permission is hereby granted, free of charge,
+to any person obtaining a copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation the rights to use, copy,
+modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit
+persons to whom the Software is furnished to do so, subject to the following conditions: The above
+copyright notice and this permission notice shall be included in all copies or substantial portions
+of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES
+OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+For jcl-over-slf4j-1.7.4.jar
+
+The MIT License (MIT)
+
+Copyright (c) <year> <copyright holders>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/280ed985/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index a143638..52cfc16 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1,3 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>MetaModel</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/280ed985/couchdb/pom.xml
----------------------------------------------------------------------
diff --git a/couchdb/pom.xml b/couchdb/pom.xml
index 12deed2..033f5ee 100644
--- a/couchdb/pom.xml
+++ b/couchdb/pom.xml
@@ -1,3 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>MetaModel</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/280ed985/csv/pom.xml
----------------------------------------------------------------------
diff --git a/csv/pom.xml b/csv/pom.xml
index b482779..4bb054a 100644
--- a/csv/pom.xml
+++ b/csv/pom.xml
@@ -1,3 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>MetaModel</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/280ed985/excel/pom.xml
----------------------------------------------------------------------
diff --git a/excel/pom.xml b/excel/pom.xml
index 8df1818..67373f2 100644
--- a/excel/pom.xml
+++ b/excel/pom.xml
@@ -1,3 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>MetaModel</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/280ed985/fixedwidth/pom.xml
----------------------------------------------------------------------
diff --git a/fixedwidth/pom.xml b/fixedwidth/pom.xml
index 98979ec..5502fa2 100644
--- a/fixedwidth/pom.xml
+++ b/fixedwidth/pom.xml
@@ -1,3 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>MetaModel</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/280ed985/full/pom.xml
----------------------------------------------------------------------
diff --git a/full/pom.xml b/full/pom.xml
index 62a2ce8..ef4cb8f 100644
--- a/full/pom.xml
+++ b/full/pom.xml
@@ -1,3 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>MetaModel</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/280ed985/jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
index 4fcc7c8..e574d62 100644
--- a/jdbc/pom.xml
+++ b/jdbc/pom.xml
@@ -1,3 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>MetaModel</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/280ed985/mongodb/pom.xml
----------------------------------------------------------------------
diff --git a/mongodb/pom.xml b/mongodb/pom.xml
index 23baa17..71ac2ea 100644
--- a/mongodb/pom.xml
+++ b/mongodb/pom.xml
@@ -1,3 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>MetaModel</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/280ed985/openoffice/pom.xml
----------------------------------------------------------------------
diff --git a/openoffice/pom.xml b/openoffice/pom.xml
index 8af07cb..30c914e 100644
--- a/openoffice/pom.xml
+++ b/openoffice/pom.xml
@@ -1,3 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>MetaModel</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/280ed985/pojo/pom.xml
----------------------------------------------------------------------
diff --git a/pojo/pom.xml b/pojo/pom.xml
index 402162c..0699e1a 100644
--- a/pojo/pom.xml
+++ b/pojo/pom.xml
@@ -1,3 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>MetaModel</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/280ed985/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 78ac8fb..9e1c59f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,3 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -177,15 +196,13 @@
<exclude>KEYS</exclude>
<exclude>**/.gitignore/**</exclude>
<exclude>.git/**</exclude>
- <exclude>.project</exclude>
- <exclude>*/.settings/*</exclude>
<exclude>**/src/test/**</exclude>
<exclude>**/src/site/**</exclude>
- <exclude>**/*.xml/**</exclude>
- <exclude>**/*.xml*/**</exclude>
- <exclude>**/*.wsdl/**</exclude>
- <exclude>**/*.xsd/**</exclude>
+<!-- <exclude>**/*.xml/**</exclude>
+ <exclude>**/*.xml*/**</exclude>-->
<exclude>**/.project</exclude>
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.settings/**</exclude>
<exclude>**/target/**</exclude>
</excludes>
</configuration>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/280ed985/salesforce/pom.xml
----------------------------------------------------------------------
diff --git a/salesforce/pom.xml b/salesforce/pom.xml
index 2beb47f..e1c5dbd 100644
--- a/salesforce/pom.xml
+++ b/salesforce/pom.xml
@@ -1,3 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>MetaModel</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/280ed985/sugarcrm/pom.xml
----------------------------------------------------------------------
diff --git a/sugarcrm/pom.xml b/sugarcrm/pom.xml
index 4f21e7e..409dc38 100644
--- a/sugarcrm/pom.xml
+++ b/sugarcrm/pom.xml
@@ -1,3 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>MetaModel</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/280ed985/sugarcrm/src/jaxws/binding/bindings.xml
----------------------------------------------------------------------
diff --git a/sugarcrm/src/jaxws/binding/bindings.xml b/sugarcrm/src/jaxws/binding/bindings.xml
index 88cbd33..7cef178 100644
--- a/sugarcrm/src/jaxws/binding/bindings.xml
+++ b/sugarcrm/src/jaxws/binding/bindings.xml
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
<jaxws:bindings version="2.0"
xmlns:jaxws="http://java.sun.com/xml/ns/jaxws" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:jxb="http://java.sun.com/xml/ns/jaxb">
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/280ed985/sugarcrm/src/main/resources/com/sugarcrm/ws/soap/Sugarsoap_handler.xml
----------------------------------------------------------------------
diff --git a/sugarcrm/src/main/resources/com/sugarcrm/ws/soap/Sugarsoap_handler.xml b/sugarcrm/src/main/resources/com/sugarcrm/ws/soap/Sugarsoap_handler.xml
index fc05131..832650f 100644
--- a/sugarcrm/src/main/resources/com/sugarcrm/ws/soap/Sugarsoap_handler.xml
+++ b/sugarcrm/src/main/resources/com/sugarcrm/ws/soap/Sugarsoap_handler.xml
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
<javaee:handler-chains
xmlns:javaee="http://java.sun.com/xml/ns/javaee"
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/280ed985/sugarcrm/src/wsdl/soap-encoding.xsd
----------------------------------------------------------------------
diff --git a/sugarcrm/src/wsdl/soap-encoding.xsd b/sugarcrm/src/wsdl/soap-encoding.xsd
index e5558f5..20c159b 100644
--- a/sugarcrm/src/wsdl/soap-encoding.xsd
+++ b/sugarcrm/src/wsdl/soap-encoding.xsd
@@ -1,5 +1,22 @@
<?xml version='1.0' encoding='UTF-8' ?>
-
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
<!-- Schema for the SOAP/1.1 encoding
Portions © 2001 DevelopMentor.
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/280ed985/sugarcrm/src/wsdl/soap-wsdl.xsd
----------------------------------------------------------------------
diff --git a/sugarcrm/src/wsdl/soap-wsdl.xsd b/sugarcrm/src/wsdl/soap-wsdl.xsd
index 14b5bef..b30825d 100644
--- a/sugarcrm/src/wsdl/soap-wsdl.xsd
+++ b/sugarcrm/src/wsdl/soap-wsdl.xsd
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
<!--
Copyright 2001 - 2005, International Business Machines Corporation and Microsoft Corporation
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/280ed985/sugarcrm/src/wsdl/sugarcrm.wsdl
----------------------------------------------------------------------
diff --git a/sugarcrm/src/wsdl/sugarcrm.wsdl b/sugarcrm/src/wsdl/sugarcrm.wsdl
index e60129f..954bfab 100644
--- a/sugarcrm/src/wsdl/sugarcrm.wsdl
+++ b/sugarcrm/src/wsdl/sugarcrm.wsdl
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
<definitions xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:tns="http://www.sugarcrm.com/sugarcrm" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns="http://schemas.xmlsoap.org/wsdl/" targetNamespace="http://www.sugarcrm.com/sugarcrm">
<types>
<xsd:schema targetNamespace="http://www.sugarcrm.com/sugarcrm">
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/280ed985/xml/pom.xml
----------------------------------------------------------------------
diff --git a/xml/pom.xml b/xml/pom.xml
index f0f0ea5..36c046f 100644
--- a/xml/pom.xml
+++ b/xml/pom.xml
@@ -1,3 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>MetaModel</artifactId>
[22/50] [abbrv] git commit: Fixing test failures due to time
differences in DateUtils seen on MacOS.
Posted by ka...@apache.org.
Fixing test failures due to time differences in DateUtils seen on MacOS.
Project: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/commit/f9092d69
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/tree/f9092d69
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/diff/f9092d69
Branch: refs/heads/hbase-module
Commit: f9092d6911fe4e27e676777cfeb32fe10e26fcb5
Parents: 65c6f9f
Author: ankitkumar2711 <ak...@gmail.com>
Authored: Thu Nov 28 14:44:52 2013 +0100
Committer: ankitkumar2711 <ak...@gmail.com>
Committed: Thu Nov 28 14:44:52 2013 +0100
----------------------------------------------------------------------
core/src/main/java/org/apache/metamodel/util/DateUtils.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/f9092d69/core/src/main/java/org/apache/metamodel/util/DateUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/metamodel/util/DateUtils.java b/core/src/main/java/org/apache/metamodel/util/DateUtils.java
index 31af2f9..382848a 100644
--- a/core/src/main/java/org/apache/metamodel/util/DateUtils.java
+++ b/core/src/main/java/org/apache/metamodel/util/DateUtils.java
@@ -48,6 +48,7 @@ public final class DateUtils {
c.set(Calendar.MINUTE, 0);
c.set(Calendar.SECOND, 0);
c.set(Calendar.MILLISECOND, 0);
+ c.set(Calendar.AM_PM, 0);
return c.getTime();
}
@@ -58,7 +59,7 @@ public final class DateUtils {
c.set(Calendar.MINUTE, 0);
c.set(Calendar.SECOND, 0);
c.set(Calendar.MILLISECOND, 0);
-
+ c.set(Calendar.AM_PM, 0);
return c.getTime();
}
[15/50] [abbrv] git commit: [maven-release-plugin] rollback the
release of MetaModel-4.0.0-incubating
Posted by ka...@apache.org.
[maven-release-plugin] rollback the release of MetaModel-4.0.0-incubating
Project: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/commit/1887b207
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/tree/1887b207
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/diff/1887b207
Branch: refs/heads/hbase-module
Commit: 1887b207841e42558986ee50baa1f77b589fec3c
Parents: e08389d
Author: ak.ankitkumar@gmail.com <ak...@gmail.com>
Authored: Fri Nov 15 13:25:08 2013 +0100
Committer: ak.ankitkumar@gmail.com <ak...@gmail.com>
Committed: Fri Nov 15 13:25:08 2013 +0100
----------------------------------------------------------------------
core/pom.xml | 2 +-
couchdb/pom.xml | 2 +-
csv/pom.xml | 2 +-
excel/pom.xml | 2 +-
fixedwidth/pom.xml | 2 +-
full/pom.xml | 2 +-
jdbc/pom.xml | 2 +-
mongodb/pom.xml | 2 +-
openoffice/pom.xml | 2 +-
pojo/pom.xml | 2 +-
pom.xml | 8 ++++----
salesforce/pom.xml | 2 +-
sugarcrm/pom.xml | 2 +-
xml/pom.xml | 2 +-
14 files changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/1887b207/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 8a925a3..b33280e 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating</version>
+ <version>4.0.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-core</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/1887b207/couchdb/pom.xml
----------------------------------------------------------------------
diff --git a/couchdb/pom.xml b/couchdb/pom.xml
index 8cb1e77..80b7f4c 100644
--- a/couchdb/pom.xml
+++ b/couchdb/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating</version>
+ <version>4.0.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-couchdb</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/1887b207/csv/pom.xml
----------------------------------------------------------------------
diff --git a/csv/pom.xml b/csv/pom.xml
index b17af3b..a246374 100644
--- a/csv/pom.xml
+++ b/csv/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating</version>
+ <version>4.0.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-csv</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/1887b207/excel/pom.xml
----------------------------------------------------------------------
diff --git a/excel/pom.xml b/excel/pom.xml
index 86a5e41..ecf3a8f 100644
--- a/excel/pom.xml
+++ b/excel/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating</version>
+ <version>4.0.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-excel</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/1887b207/fixedwidth/pom.xml
----------------------------------------------------------------------
diff --git a/fixedwidth/pom.xml b/fixedwidth/pom.xml
index 3d38d58..527ad65 100644
--- a/fixedwidth/pom.xml
+++ b/fixedwidth/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating</version>
+ <version>4.0.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-fixedwidth</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/1887b207/full/pom.xml
----------------------------------------------------------------------
diff --git a/full/pom.xml b/full/pom.xml
index 90c1547..973cbc7 100644
--- a/full/pom.xml
+++ b/full/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating</version>
+ <version>4.0.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-full</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/1887b207/jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
index dae74fd..16080b2 100644
--- a/jdbc/pom.xml
+++ b/jdbc/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating</version>
+ <version>4.0.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-jdbc</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/1887b207/mongodb/pom.xml
----------------------------------------------------------------------
diff --git a/mongodb/pom.xml b/mongodb/pom.xml
index be31432..45776d0 100644
--- a/mongodb/pom.xml
+++ b/mongodb/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating</version>
+ <version>4.0.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-mongodb</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/1887b207/openoffice/pom.xml
----------------------------------------------------------------------
diff --git a/openoffice/pom.xml b/openoffice/pom.xml
index 63f5dcc..47b14b8 100644
--- a/openoffice/pom.xml
+++ b/openoffice/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating</version>
+ <version>4.0.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-openoffice</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/1887b207/pojo/pom.xml
----------------------------------------------------------------------
diff --git a/pojo/pom.xml b/pojo/pom.xml
index 6f863c7..51b75c3 100644
--- a/pojo/pom.xml
+++ b/pojo/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating</version>
+ <version>4.0.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-pojo</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/1887b207/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 901d685..af08c22 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,8 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -41,11 +42,10 @@ under the License.
<url>https://git-wip-us.apache.org/repos/asf?p=incubator-metamodel.git</url>
<connection>scm:git:http://git-wip-us.apache.org/repos/asf/incubator-metamodel.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-metamodel.git</developerConnection>
- <tag>MetaModel-4.0.0-incubating</tag>
- </scm>
+ </scm>
<groupId>org.apache.metamodel</groupId>
<artifactId>MetaModel</artifactId>
- <version>4.0.0-incubating</version>
+ <version>4.0.0-incubating-SNAPSHOT</version>
<name>MetaModel</name>
<description>MetaModel is a library that encapsulates the differences and enhances
the capabilities of different datastores. Rich querying abilities are
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/1887b207/salesforce/pom.xml
----------------------------------------------------------------------
diff --git a/salesforce/pom.xml b/salesforce/pom.xml
index 8433e4c..bb043cb 100644
--- a/salesforce/pom.xml
+++ b/salesforce/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating</version>
+ <version>4.0.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-salesforce</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/1887b207/sugarcrm/pom.xml
----------------------------------------------------------------------
diff --git a/sugarcrm/pom.xml b/sugarcrm/pom.xml
index 07d1ad9..0f88f71 100644
--- a/sugarcrm/pom.xml
+++ b/sugarcrm/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating</version>
+ <version>4.0.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-sugarcrm</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/1887b207/xml/pom.xml
----------------------------------------------------------------------
diff --git a/xml/pom.xml b/xml/pom.xml
index ba762cb..a3fc371 100644
--- a/xml/pom.xml
+++ b/xml/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating</version>
+ <version>4.0.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-xml</artifactId>
[29/50] [abbrv] git commit: [maven-release-plugin] prepare for next
development iteration
Posted by ka...@apache.org.
[maven-release-plugin] prepare for next development iteration
Project: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/commit/30cc2368
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/tree/30cc2368
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/diff/30cc2368
Branch: refs/heads/hbase-module
Commit: 30cc236883295f14708017325a18362fe0ed7858
Parents: ab4326a
Author: ankitkumar2711 <ak...@gmail.com>
Authored: Tue Dec 3 15:34:07 2013 +0100
Committer: ankitkumar2711 <ak...@gmail.com>
Committed: Tue Dec 3 15:34:07 2013 +0100
----------------------------------------------------------------------
core/pom.xml | 2 +-
couchdb/pom.xml | 2 +-
csv/pom.xml | 2 +-
excel/pom.xml | 2 +-
fixedwidth/pom.xml | 2 +-
full/pom.xml | 2 +-
jdbc/pom.xml | 2 +-
mongodb/pom.xml | 2 +-
openoffice/pom.xml | 2 +-
pojo/pom.xml | 2 +-
pom.xml | 4 ++--
salesforce/pom.xml | 2 +-
sugarcrm/pom.xml | 2 +-
xml/pom.xml | 2 +-
14 files changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/30cc2368/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 8a925a3..dd8fc8a 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating</version>
+ <version>4.0.1-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-core</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/30cc2368/couchdb/pom.xml
----------------------------------------------------------------------
diff --git a/couchdb/pom.xml b/couchdb/pom.xml
index 8cb1e77..2f0d35d 100644
--- a/couchdb/pom.xml
+++ b/couchdb/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating</version>
+ <version>4.0.1-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-couchdb</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/30cc2368/csv/pom.xml
----------------------------------------------------------------------
diff --git a/csv/pom.xml b/csv/pom.xml
index b17af3b..99b55e0 100644
--- a/csv/pom.xml
+++ b/csv/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating</version>
+ <version>4.0.1-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-csv</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/30cc2368/excel/pom.xml
----------------------------------------------------------------------
diff --git a/excel/pom.xml b/excel/pom.xml
index 86a5e41..3a9cdda 100644
--- a/excel/pom.xml
+++ b/excel/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating</version>
+ <version>4.0.1-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-excel</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/30cc2368/fixedwidth/pom.xml
----------------------------------------------------------------------
diff --git a/fixedwidth/pom.xml b/fixedwidth/pom.xml
index 3d38d58..ccae638 100644
--- a/fixedwidth/pom.xml
+++ b/fixedwidth/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating</version>
+ <version>4.0.1-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-fixedwidth</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/30cc2368/full/pom.xml
----------------------------------------------------------------------
diff --git a/full/pom.xml b/full/pom.xml
index 90c1547..97d299c 100644
--- a/full/pom.xml
+++ b/full/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating</version>
+ <version>4.0.1-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-full</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/30cc2368/jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
index dae74fd..348092f 100644
--- a/jdbc/pom.xml
+++ b/jdbc/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating</version>
+ <version>4.0.1-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-jdbc</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/30cc2368/mongodb/pom.xml
----------------------------------------------------------------------
diff --git a/mongodb/pom.xml b/mongodb/pom.xml
index be31432..f94a644 100644
--- a/mongodb/pom.xml
+++ b/mongodb/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating</version>
+ <version>4.0.1-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-mongodb</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/30cc2368/openoffice/pom.xml
----------------------------------------------------------------------
diff --git a/openoffice/pom.xml b/openoffice/pom.xml
index 63f5dcc..1220ad9 100644
--- a/openoffice/pom.xml
+++ b/openoffice/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating</version>
+ <version>4.0.1-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-openoffice</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/30cc2368/pojo/pom.xml
----------------------------------------------------------------------
diff --git a/pojo/pom.xml b/pojo/pom.xml
index 6f863c7..e0d6b95 100644
--- a/pojo/pom.xml
+++ b/pojo/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating</version>
+ <version>4.0.1-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-pojo</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/30cc2368/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8289d9d..2112961 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,11 +41,11 @@ under the License.
<url>https://git-wip-us.apache.org/repos/asf?p=incubator-metamodel.git</url>
<connection>scm:git:http://git-wip-us.apache.org/repos/asf/incubator-metamodel.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-metamodel.git</developerConnection>
- <tag>MetaModel-4.0.0-incubating</tag>
+ <tag>HEAD</tag>
</scm>
<groupId>org.apache.metamodel</groupId>
<artifactId>MetaModel</artifactId>
- <version>4.0.0-incubating</version>
+ <version>4.0.1-incubating-SNAPSHOT</version>
<name>MetaModel</name>
<description>MetaModel is a library that encapsulates the differences and enhances
the capabilities of different datastores. Rich querying abilities are
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/30cc2368/salesforce/pom.xml
----------------------------------------------------------------------
diff --git a/salesforce/pom.xml b/salesforce/pom.xml
index 8433e4c..faf4d3e 100644
--- a/salesforce/pom.xml
+++ b/salesforce/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating</version>
+ <version>4.0.1-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-salesforce</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/30cc2368/sugarcrm/pom.xml
----------------------------------------------------------------------
diff --git a/sugarcrm/pom.xml b/sugarcrm/pom.xml
index 07d1ad9..0162d98 100644
--- a/sugarcrm/pom.xml
+++ b/sugarcrm/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating</version>
+ <version>4.0.1-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-sugarcrm</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/30cc2368/xml/pom.xml
----------------------------------------------------------------------
diff --git a/xml/pom.xml b/xml/pom.xml
index ba762cb..99b07bb 100644
--- a/xml/pom.xml
+++ b/xml/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating</version>
+ <version>4.0.1-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-xml</artifactId>
[40/50] [abbrv] git commit: Merge branch 'spring-module' into master
Posted by ka...@apache.org.
Merge branch 'spring-module' into master
Project: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/commit/d05da0c3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/tree/d05da0c3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/diff/d05da0c3
Branch: refs/heads/hbase-module
Commit: d05da0c37bd498b6a99e26e217fcb03de76ef5a6
Parents: f8f5736 fccac56
Author: Kasper Sørensen <i....@gmail.com>
Authored: Sun Jan 19 20:09:48 2014 +0100
Committer: Kasper Sørensen <i....@gmail.com>
Committed: Sun Jan 19 20:10:50 2014 +0100
----------------------------------------------------------------------
HEADER.txt | 16 -----
LICENSE | 179 +-------------------------------------------------------
pom.xml | 23 --------
3 files changed, 1 insertion(+), 217 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/d05da0c3/pom.xml
----------------------------------------------------------------------
[32/50] [abbrv] git commit: Added module folder and POM
Posted by ka...@apache.org.
Added module folder and POM
Project: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/commit/f8a4e8fa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/tree/f8a4e8fa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/diff/f8a4e8fa
Branch: refs/heads/hbase-module
Commit: f8a4e8faacb2537e1e0b50d2c8f80b96483af513
Parents: 4841d1b
Author: Kasper Sørensen <i....@gmail.com>
Authored: Sun Jan 5 18:45:18 2014 +0100
Committer: Kasper Sørensen <i....@gmail.com>
Committed: Sun Jan 5 18:45:18 2014 +0100
----------------------------------------------------------------------
pom.xml | 1 +
spring/pom.xml | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 56 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/f8a4e8fa/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3bbc418..40b871c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,6 +69,7 @@ under the License.
<module>salesforce</module>
<module>sugarcrm</module>
<module>full</module>
+ <module>spring</module>
</modules>
<issueManagement>
<system>Jira</system>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/f8a4e8fa/spring/pom.xml
----------------------------------------------------------------------
diff --git a/spring/pom.xml b/spring/pom.xml
new file mode 100644
index 0000000..6c8c355
--- /dev/null
+++ b/spring/pom.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>MetaModel</artifactId>
+ <groupId>org.apache.metamodel</groupId>
+ <version>4.0.1-incubating-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>MetaModel-spring</artifactId>
+ <name>MetaModel module for Spring enabled configuration</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.metamodel</groupId>
+ <artifactId>MetaModel-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.metamodel</groupId>
+ <artifactId>MetaModel-full</artifactId>
+ <version>${project.version}</version>
+ <optional>true</optional>
+ </dependency>
+
+ <!-- test -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
[27/50] [abbrv] git commit: [maven-release-plugin] prepare for next
development iteration
Posted by ka...@apache.org.
[maven-release-plugin] prepare for next development iteration
Project: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/commit/37bd0d67
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/tree/37bd0d67
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/diff/37bd0d67
Branch: refs/heads/hbase-module
Commit: 37bd0d67f52ba0069828387e60cea31e5e2e09b6
Parents: bbb4d69
Author: ankitkumar2711 <ak...@gmail.com>
Authored: Tue Dec 3 14:08:31 2013 +0100
Committer: ankitkumar2711 <ak...@gmail.com>
Committed: Tue Dec 3 14:08:31 2013 +0100
----------------------------------------------------------------------
core/pom.xml | 2 +-
couchdb/pom.xml | 2 +-
csv/pom.xml | 2 +-
excel/pom.xml | 2 +-
fixedwidth/pom.xml | 2 +-
full/pom.xml | 2 +-
jdbc/pom.xml | 2 +-
mongodb/pom.xml | 2 +-
openoffice/pom.xml | 2 +-
pojo/pom.xml | 2 +-
pom.xml | 4 ++--
salesforce/pom.xml | 2 +-
sugarcrm/pom.xml | 2 +-
xml/pom.xml | 2 +-
14 files changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/37bd0d67/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 8a925a3..dd8fc8a 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating</version>
+ <version>4.0.1-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-core</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/37bd0d67/couchdb/pom.xml
----------------------------------------------------------------------
diff --git a/couchdb/pom.xml b/couchdb/pom.xml
index 8cb1e77..2f0d35d 100644
--- a/couchdb/pom.xml
+++ b/couchdb/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating</version>
+ <version>4.0.1-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-couchdb</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/37bd0d67/csv/pom.xml
----------------------------------------------------------------------
diff --git a/csv/pom.xml b/csv/pom.xml
index b17af3b..99b55e0 100644
--- a/csv/pom.xml
+++ b/csv/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating</version>
+ <version>4.0.1-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-csv</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/37bd0d67/excel/pom.xml
----------------------------------------------------------------------
diff --git a/excel/pom.xml b/excel/pom.xml
index 86a5e41..3a9cdda 100644
--- a/excel/pom.xml
+++ b/excel/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating</version>
+ <version>4.0.1-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-excel</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/37bd0d67/fixedwidth/pom.xml
----------------------------------------------------------------------
diff --git a/fixedwidth/pom.xml b/fixedwidth/pom.xml
index 3d38d58..ccae638 100644
--- a/fixedwidth/pom.xml
+++ b/fixedwidth/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating</version>
+ <version>4.0.1-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-fixedwidth</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/37bd0d67/full/pom.xml
----------------------------------------------------------------------
diff --git a/full/pom.xml b/full/pom.xml
index 90c1547..97d299c 100644
--- a/full/pom.xml
+++ b/full/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating</version>
+ <version>4.0.1-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-full</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/37bd0d67/jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
index dae74fd..348092f 100644
--- a/jdbc/pom.xml
+++ b/jdbc/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating</version>
+ <version>4.0.1-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-jdbc</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/37bd0d67/mongodb/pom.xml
----------------------------------------------------------------------
diff --git a/mongodb/pom.xml b/mongodb/pom.xml
index be31432..f94a644 100644
--- a/mongodb/pom.xml
+++ b/mongodb/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating</version>
+ <version>4.0.1-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-mongodb</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/37bd0d67/openoffice/pom.xml
----------------------------------------------------------------------
diff --git a/openoffice/pom.xml b/openoffice/pom.xml
index 63f5dcc..1220ad9 100644
--- a/openoffice/pom.xml
+++ b/openoffice/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating</version>
+ <version>4.0.1-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-openoffice</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/37bd0d67/pojo/pom.xml
----------------------------------------------------------------------
diff --git a/pojo/pom.xml b/pojo/pom.xml
index 6f863c7..e0d6b95 100644
--- a/pojo/pom.xml
+++ b/pojo/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating</version>
+ <version>4.0.1-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-pojo</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/37bd0d67/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8289d9d..2112961 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,11 +41,11 @@ under the License.
<url>https://git-wip-us.apache.org/repos/asf?p=incubator-metamodel.git</url>
<connection>scm:git:http://git-wip-us.apache.org/repos/asf/incubator-metamodel.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-metamodel.git</developerConnection>
- <tag>MetaModel-4.0.0-incubating</tag>
+ <tag>HEAD</tag>
</scm>
<groupId>org.apache.metamodel</groupId>
<artifactId>MetaModel</artifactId>
- <version>4.0.0-incubating</version>
+ <version>4.0.1-incubating-SNAPSHOT</version>
<name>MetaModel</name>
<description>MetaModel is a library that encapsulates the differences and enhances
the capabilities of different datastores. Rich querying abilities are
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/37bd0d67/salesforce/pom.xml
----------------------------------------------------------------------
diff --git a/salesforce/pom.xml b/salesforce/pom.xml
index 8433e4c..faf4d3e 100644
--- a/salesforce/pom.xml
+++ b/salesforce/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating</version>
+ <version>4.0.1-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-salesforce</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/37bd0d67/sugarcrm/pom.xml
----------------------------------------------------------------------
diff --git a/sugarcrm/pom.xml b/sugarcrm/pom.xml
index 07d1ad9..0162d98 100644
--- a/sugarcrm/pom.xml
+++ b/sugarcrm/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating</version>
+ <version>4.0.1-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-sugarcrm</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/37bd0d67/xml/pom.xml
----------------------------------------------------------------------
diff --git a/xml/pom.xml b/xml/pom.xml
index ba762cb..99b07bb 100644
--- a/xml/pom.xml
+++ b/xml/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
- <version>4.0.0-incubating</version>
+ <version>4.0.1-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MetaModel-xml</artifactId>