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 2013/07/22 10:11:14 UTC
[61/64] git commit: Fixed usage of 'org.eobjects' namespace to
'org.apache' in xml files and site content.
Fixed usage of 'org.eobjects' namespace to 'org.apache' in xml files and
site content.
Project: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/commit/660e6936
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/tree/660e6936
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/diff/660e6936
Branch: refs/heads/master
Commit: 660e69368bd04d10bd3b6c3513e47f0d2b97a532
Parents: 69ad6cd
Author: kaspers <ka...@kaspers-think.humaninference.com>
Authored: Fri Jul 19 11:09:50 2013 +0200
Committer: kaspers <ka...@kaspers-think.humaninference.com>
Committed: Fri Jul 19 11:09:50 2013 +0200
----------------------------------------------------------------------
.../metamodel/jdbc/SplitQueriesDataSet.java | 2 +-
jdbc/src/test/resources/log4j.xml | 40 +-
jdbc/src/test/resources/logconfig.txt | 8 +-
pom.xml | 770 +++++++++----------
src/site/apt/download.apt.vm | 6 +-
src/site/apt/index.apt.vm | 142 ++--
sugarcrm/src/jaxws/binding/bindings.xml | 32 +-
.../com/sugarcrm/ws/soap/Sugarsoap_handler.xml | 18 +-
8 files changed, 509 insertions(+), 509 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/660e6936/jdbc/src/main/java/org/apache/metamodel/jdbc/SplitQueriesDataSet.java
----------------------------------------------------------------------
diff --git a/jdbc/src/main/java/org/apache/metamodel/jdbc/SplitQueriesDataSet.java b/jdbc/src/main/java/org/apache/metamodel/jdbc/SplitQueriesDataSet.java
index b019b35..f9c3697 100644
--- a/jdbc/src/main/java/org/apache/metamodel/jdbc/SplitQueriesDataSet.java
+++ b/jdbc/src/main/java/org/apache/metamodel/jdbc/SplitQueriesDataSet.java
@@ -36,7 +36,7 @@ import org.apache.metamodel.query.SelectItem;
/**
* DataSet for split queries. Queries will be executed as needed, not at once.
*
- * @see org.eobjects.metamodel.jdbc.QuerySplitter
+ * @see org.apache.metamodel.jdbc.QuerySplitter
*/
final class SplitQueriesDataSet extends AbstractDataSet {
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/660e6936/jdbc/src/test/resources/log4j.xml
----------------------------------------------------------------------
diff --git a/jdbc/src/test/resources/log4j.xml b/jdbc/src/test/resources/log4j.xml
index e7d7360..79b98a6 100644
--- a/jdbc/src/test/resources/log4j.xml
+++ b/jdbc/src/test/resources/log4j.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-
- <appender name="consoleAppender" class="org.apache.log4j.ConsoleAppender">
- <param name="Target" value="System.out" />
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%-5p %d{HH:mm:ss} %c{1} - %m%n" />
- </layout>
- </appender>
-
- <logger name="org.eobjects">
- <level value="debug" />
- </logger>
-
- <root>
- <priority value="warn" />
- <appender-ref ref="consoleAppender" />
- </root>
-
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+
+ <appender name="consoleAppender" class="org.apache.log4j.ConsoleAppender">
+ <param name="Target" value="System.out" />
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%-5p %d{HH:mm:ss} %c{1} - %m%n" />
+ </layout>
+ </appender>
+
+ <logger name="org.apache.metamodel">
+ <level value="debug" />
+ </logger>
+
+ <root>
+ <priority value="warn" />
+ <appender-ref ref="consoleAppender" />
+ </root>
+
</log4j:configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/660e6936/jdbc/src/test/resources/logconfig.txt
----------------------------------------------------------------------
diff --git a/jdbc/src/test/resources/logconfig.txt b/jdbc/src/test/resources/logconfig.txt
index 8f0b0c8..89424cb 100644
--- a/jdbc/src/test/resources/logconfig.txt
+++ b/jdbc/src/test/resources/logconfig.txt
@@ -1,4 +1,4 @@
-handlers = java.util.logging.ConsoleHandler
-.level = WARN
-org.eobjects.ConsoleHandler.level = WARN
-org.eobjects.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
\ No newline at end of file
+handlers = java.util.logging.ConsoleHandler
+.level = WARN
+org.apache.ConsoleHandler.level = WARN
+org.apache.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/660e6936/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 875ad2f..e47fa69 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,385 +1,385 @@
-<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>
- </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>
- </scm>
- <groupId>org.apache.metamodel</groupId>
- <artifactId>MetaModel</artifactId>
- <version>3.4.4-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>access</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>
- <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>
- <!-- 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.xBaseJ:org.xBaseJ.*:org.eobjects.metamodel.jdbc.dialects:org.eobjects.metamodel.detect</excludePackageNames>
- </configuration>
- </execution>
- </executions>
- </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>
+<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>
+ </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>
+ </scm>
+ <groupId>org.apache.metamodel</groupId>
+ <artifactId>MetaModel</artifactId>
+ <version>3.4.4-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>access</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>
+ <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>
+ <!-- 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>
+ <!-- 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>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/660e6936/src/site/apt/download.apt.vm
----------------------------------------------------------------------
diff --git a/src/site/apt/download.apt.vm b/src/site/apt/download.apt.vm
index abfd348..8a0e3ab 100644
--- a/src/site/apt/download.apt.vm
+++ b/src/site/apt/download.apt.vm
@@ -18,7 +18,7 @@ Use in Maven
+-------------------------------+
<dependency>
- <groupId>org.eobjects.metamodel</groupId>
+ <groupId>org.apache.metamodel</groupId>
<artifactId>MetaModel-full</artifactId>
<version>${siteDownloadVersion}</version>
</dependency>
@@ -27,13 +27,13 @@ Use in Maven
Apache Ivy:
+-------------------------------+
-<dependency org="org.eobjects.metamodel" name="MetaModel-full" rev="${siteDownloadVersion}"/>
+<dependency org="org.apache.metamodel" name="MetaModel-full" rev="${siteDownloadVersion}"/>
+-------------------------------+
Groovy Grape:
+-------------------------------+
@Grapes(
- @Grab(group='org.eobjects.metamodel', module='MetaModel-full', version='${siteDownloadVersion}')
+ @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/660e6936/src/site/apt/index.apt.vm
----------------------------------------------------------------------
diff --git a/src/site/apt/index.apt.vm b/src/site/apt/index.apt.vm
index ace1e63..af24eae 100644
--- a/src/site/apt/index.apt.vm
+++ b/src/site/apt/index.apt.vm
@@ -1,72 +1,72 @@
- ------
- 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.eobjects.metamodel</groupId>
- <artifactId>MetaModel-full</artifactId>
- <version>${siteDownloadVersion}</version>
-</dependency>
+ ------
+ 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/660e6936/sugarcrm/src/jaxws/binding/bindings.xml
----------------------------------------------------------------------
diff --git a/sugarcrm/src/jaxws/binding/bindings.xml b/sugarcrm/src/jaxws/binding/bindings.xml
index 22ce63d..88cbd33 100644
--- a/sugarcrm/src/jaxws/binding/bindings.xml
+++ b/sugarcrm/src/jaxws/binding/bindings.xml
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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">
-
- <jaxws:bindings>
- <handler-chains xmlns="http://java.sun.com/xml/ns/javaee">
- <handler-chain>
- <handler>
- <handler-name>LoggingMessageHandler</handler-name>
- <handler-class>org.eobjects.metamodel.sugarcrm.LoggingMessageHandler</handler-class>
- </handler>
- </handler-chain>
- </handler-chains>
- </jaxws:bindings>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+
+ <jaxws:bindings>
+ <handler-chains xmlns="http://java.sun.com/xml/ns/javaee">
+ <handler-chain>
+ <handler>
+ <handler-name>LoggingMessageHandler</handler-name>
+ <handler-class>org.apache.metamodel.sugarcrm.LoggingMessageHandler</handler-class>
+ </handler>
+ </handler-chain>
+ </handler-chains>
+ </jaxws:bindings>
+
</jaxws:bindings>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/660e6936/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 3982ee7..fc05131 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,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<javaee:handler-chains
- xmlns:javaee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema">
- <javaee:handler-chain>
- <javaee:handler>
- <javaee:handler-class>org.eobjects.metamodel.sugarcrm.LoggingMessageHandler</javaee:handler-class>
- </javaee:handler>
- </javaee:handler-chain>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<javaee:handler-chains
+ xmlns:javaee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+ <javaee:handler-chain>
+ <javaee:handler>
+ <javaee:handler-class>org.apache.metamodel.sugarcrm.LoggingMessageHandler</javaee:handler-class>
+ </javaee:handler>
+ </javaee:handler-chain>
</javaee:handler-chains>
\ No newline at end of file