cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ntimof...@apache.org
Subject cayenne git commit: Remove deprecated plugin version
Date Sat, 22 Dec 2018 08:24:16 GMT
Repository: cayenne
Updated Branches:
  refs/heads/master 38e556586 -> 7d88ac545


Remove deprecated plugin version


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/7d88ac54
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/7d88ac54
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/7d88ac54

Branch: refs/heads/master
Commit: 7d88ac5458b7fe9d2f5256f2317337e890012ef5
Parents: 38e5565
Author: Nikita Timofeev <stariy95@gmail.com>
Authored: Sat Dec 22 11:24:05 2018 +0300
Committer: Nikita Timofeev <stariy95@gmail.com>
Committed: Sat Dec 22 11:24:05 2018 +0300

----------------------------------------------------------------------
 maven-plugins/maven-cayenne-plugin/pom.xml      | 142 -------------------
 .../cayenne/tools/CayenneGeneratorOldMojo.java  |  49 -------
 .../cayenne/tools/DbGeneratorOldMojo.java       |  49 -------
 .../apache/cayenne/tools/DbImporterOldMojo.java |  50 -------
 .../META-INF/m2e/lifecycle-mapping-metadata.xml |  32 -----
 .../tools/CayenneGeneratorOldMojoTest.java      |  77 ----------
 .../DbImporterOldMojoConfigurationTest.java     | 109 --------------
 .../src/test/resources/cdbimport/pom-01.xml     |  99 -------------
 .../cdbimport/pom-catalog-and-schema.xml        |  84 -----------
 .../test/resources/cdbimport/pom-catalog.xml    |  87 ------------
 .../resources/cdbimport/pom-default-package.xml |  38 -----
 .../src/test/resources/cdbimport/pom-flat.xml   |  78 ----------
 .../test/resources/cdbimport/pom-mapping.xml    |  67 ---------
 .../test/resources/cdbimport/pom-schema-2.xml   |  41 ------
 .../src/test/resources/cdbimport/pom-schema.xml |  87 ------------
 .../cdbimport/pom-skip-primary-key-loading.xml  |  39 -----
 .../pom-skip-relationships-loading.xml          |  39 -----
 .../resources/cdbimport/pom-table-types.xml     |  41 ------
 .../test/resources/cgen/cayenne-testDomain.xml  |   5 -
 .../test/resources/cgen/project-to-test/pom.xml |  56 --------
 .../resources/cgen/testAdditionalMap.map.xml    |  18 ---
 .../test/resources/cgen/testDomainMap.map.xml   |  45 ------
 maven-plugins/pom.xml                           |   1 -
 23 files changed, 1333 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne/blob/7d88ac54/maven-plugins/maven-cayenne-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven-plugins/maven-cayenne-plugin/pom.xml b/maven-plugins/maven-cayenne-plugin/pom.xml
deleted file mode 100644
index 107269c..0000000
--- a/maven-plugins/maven-cayenne-plugin/pom.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?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/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>cayenne-maven-plugins-parent</artifactId>
-        <groupId>org.apache.cayenne.plugins</groupId>
-        <version>4.1.M3-SNAPSHOT</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>maven-cayenne-plugin</artifactId>
-    <packaging>maven-plugin</packaging>
-    <name>maven-cayenne-plugin: Deprecated Cayenne Maven Plugin</name>
-
-    <dependencies>
-        
-        <dependency>
-            <groupId>org.apache.cayenne.plugins</groupId>
-            <artifactId>cayenne-maven-plugin</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.maven.plugin-tools</groupId>
-            <artifactId>maven-plugin-annotations</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-plugin-api</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-core</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-artifact</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-compat</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.codehaus.plexus</groupId>
-            <artifactId>plexus-interpolation</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.codehaus.plexus</groupId>
-            <artifactId>plexus-container-default</artifactId>
-        </dependency>
-
-        <!-- Test deps -->
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.maven.plugin-testing</groupId>
-            <artifactId>maven-plugin-testing-harness</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derby</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>xmlunit</groupId>
-            <artifactId>xmlunit</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.cayenne</groupId>
-            <artifactId>cayenne-server</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-            <type>test-jar</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.cayenne</groupId>
-            <artifactId>cayenne-dbsync</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-            <type>test-jar</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.cayenne.build-tools</groupId>
-            <artifactId>cayenne-test-utilities</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <reporting>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-plugin-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </reporting>
-
-</project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cayenne/blob/7d88ac54/maven-plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/CayenneGeneratorOldMojo.java
----------------------------------------------------------------------
diff --git a/maven-plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/CayenneGeneratorOldMojo.java b/maven-plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/CayenneGeneratorOldMojo.java
deleted file mode 100644
index 38e30ec..0000000
--- a/maven-plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/CayenneGeneratorOldMojo.java
+++ /dev/null
@@ -1,49 +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.
- ****************************************************************/
-
-package org.apache.cayenne.tools;
-
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugins.annotations.LifecyclePhase;
-import org.apache.maven.plugins.annotations.Mojo;
-
-/**
- * Maven mojo to perform class generation from data map. This class is an Maven
- * adapter to DefaultClassGenerator class.
- *
- * @deprecated use "cayenne-maven-plugin"
- * @since 4.0
- */
-@Mojo(name = "cgen", defaultPhase = LifecyclePhase.GENERATE_SOURCES)
-public class CayenneGeneratorOldMojo extends CayenneGeneratorMojo {
-
-    @Override
-    public void execute() throws MojoExecutionException, MojoFailureException {
-        getLog().warn("Plugin \"maven-cayenne-plugin\" has been deprecated.\n" +
-                "Please use \"cayenne-maven-plugin\":\n" +
-                "<plugin>\n" +
-                "   <groupId>org.apache.cayenne.plugins</groupId>\n" +
-                "   <artifactId>cayenne-maven-plugin</artifactId>\n" +
-                "   <version>LATEST</version>\n" +
-                "</plugin>\n");
-
-        super.execute();
-    }
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/7d88ac54/maven-plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbGeneratorOldMojo.java
----------------------------------------------------------------------
diff --git a/maven-plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbGeneratorOldMojo.java b/maven-plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbGeneratorOldMojo.java
deleted file mode 100644
index d296969..0000000
--- a/maven-plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbGeneratorOldMojo.java
+++ /dev/null
@@ -1,49 +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.
- ****************************************************************/
-
-package org.apache.cayenne.tools;
-
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugins.annotations.LifecyclePhase;
-import org.apache.maven.plugins.annotations.Mojo;
-
-/**
- * Maven mojo to perform class generation from data map. This class is a Maven
- * adapter to DefaultClassGenerator class.
- *
- * @deprecated use "cayenne-maven-plugin"
- * @since 4.0
- */
-@Mojo(name = "cdbgen", defaultPhase = LifecyclePhase.PRE_INTEGRATION_TEST)
-public class DbGeneratorOldMojo extends DbGeneratorMojo {
-
-    @Override
-    public void execute() throws MojoExecutionException, MojoFailureException {
-        getLog().warn("Plugin \"maven-cayenne-plugin\" has been deprecated.\n" +
-                "Please use \"cayenne-maven-plugin\":\n" +
-                "<plugin>\n" +
-                "   <groupId>org.apache.cayenne.plugins</groupId>\n" +
-                "   <artifactId>cayenne-maven-plugin</artifactId>\n" +
-                "   <version>LATEST</version>\n" +
-                "</plugin>\n");
-
-        super.execute();
-    }
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/7d88ac54/maven-plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbImporterOldMojo.java
----------------------------------------------------------------------
diff --git a/maven-plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbImporterOldMojo.java b/maven-plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbImporterOldMojo.java
deleted file mode 100644
index 0bded58..0000000
--- a/maven-plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbImporterOldMojo.java
+++ /dev/null
@@ -1,50 +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.
- ****************************************************************/
-
-package org.apache.cayenne.tools;
-
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugins.annotations.LifecyclePhase;
-import org.apache.maven.plugins.annotations.Mojo;
-
-/**
- * Maven Mojo to import data model from DB into DataMap.
- *
- * @deprecated use "cayenne-maven-plugin"
- * @since 4.0
- */
-@Mojo(name = "cdbimport", defaultPhase = LifecyclePhase.GENERATE_SOURCES)
-public class DbImporterOldMojo extends DbImporterMojo {
-
-    @Override
-    public void execute() throws MojoExecutionException, MojoFailureException {
-        getLog().warn("Plugin \"maven-cayenne-plugin\" has been deprecated.\n" +
-                "Please use \"cayenne-maven-plugin\":\n" +
-                "<plugin>\n" +
-                "   <groupId>org.apache.cayenne.plugins</groupId>\n" +
-                "   <artifactId>cayenne-maven-plugin</artifactId>\n" +
-                "   <version>LATEST</version>\n" +
-                "</plugin>\n");
-
-        super.execute();
-    }
-}
-
-

http://git-wip-us.apache.org/repos/asf/cayenne/blob/7d88ac54/maven-plugins/maven-cayenne-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml
----------------------------------------------------------------------
diff --git a/maven-plugins/maven-cayenne-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml b/maven-plugins/maven-cayenne-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml
deleted file mode 100644
index e5de2d0..0000000
--- a/maven-plugins/maven-cayenne-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml
+++ /dev/null
@@ -1,32 +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.
--->
-<lifecycleMappingMetadata>
-    <pluginExecutions>
-        <pluginExecution>
-            <pluginExecutionFilter>
-                <goals>
-                    <goal>cgen</goal>
-                </goals>
-            </pluginExecutionFilter>
-            <action>
-                <execute>
-                    <runOnIncremental>true</runOnIncremental>
-                    <runOnConfiguration>true</runOnConfiguration>
-                </execute>
-            </action>
-        </pluginExecution>
-    </pluginExecutions>
-</lifecycleMappingMetadata>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cayenne/blob/7d88ac54/maven-plugins/maven-cayenne-plugin/src/test/java/org/apache/cayenne/tools/CayenneGeneratorOldMojoTest.java
----------------------------------------------------------------------
diff --git a/maven-plugins/maven-cayenne-plugin/src/test/java/org/apache/cayenne/tools/CayenneGeneratorOldMojoTest.java b/maven-plugins/maven-cayenne-plugin/src/test/java/org/apache/cayenne/tools/CayenneGeneratorOldMojoTest.java
deleted file mode 100644
index e91bc49..0000000
--- a/maven-plugins/maven-cayenne-plugin/src/test/java/org/apache/cayenne/tools/CayenneGeneratorOldMojoTest.java
+++ /dev/null
@@ -1,77 +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.
- ****************************************************************/
-package org.apache.cayenne.tools;
-
-import org.apache.commons.io.FileUtils;
-import org.apache.maven.plugin.testing.AbstractMojoTestCase;
-
-import java.io.File;
-
-public class CayenneGeneratorOldMojoTest extends AbstractMojoTestCase {
-
-    public void testCgenExecution() throws Exception {
-
-        File pom = getTestFile("src/test/resources/cgen/project-to-test/pom.xml");
-        assertNotNull(pom);
-        assertTrue(pom.exists());
-
-        CayenneGeneratorMojo myMojo = (CayenneGeneratorMojo) lookupMojo("cgen", pom);
-        assertNotNull(myMojo);
-        myMojo.execute();
-
-        File superTestEntity = new File(
-                "target/cayenneGeneratedClasses/superPkg/_TestEntity.txt");
-        File testEntity = new File(
-                "target/cayenneGeneratedClasses/pack/TestEntity.txt");
-
-        File superEmbeddable = new File(
-                "target/cayenneGeneratedClasses/superPkg/_Embeddable.txt");
-        File embeddable = new File(
-                "target/cayenneGeneratedClasses/pack/Embeddable.txt");
-
-        File superNotIncludedEntity = new File(
-                "target/cayenneGeneratedClasses/pack/_NotIncludedEntity.txt");
-
-        File notIncludedEntity = new File(
-                "target/cayenneGeneratedClasses/pack/NotIncludedEntity.txt");
-
-        File superExcludedEntity = new File(
-                "target/cayenneGeneratedClasses/pack/_TestExcludedEntity.txt");
-        File excludedEntity = new File(
-                "target/cayenneGeneratedClasses/pack/TestExcludedEntity.txt");
-
-        assertTrue(superTestEntity.exists());
-        assertTrue(testEntity.exists());
-
-        assertTrue(superEmbeddable.exists());
-        assertTrue(embeddable.exists());
-
-        assertFalse(superNotIncludedEntity.exists());
-        assertFalse(notIncludedEntity.exists());
-
-        assertFalse(superExcludedEntity.exists());
-        assertFalse(excludedEntity.exists());
-
-        String content = FileUtils.readFileToString(superTestEntity);
-        assertTrue(content.contains("public static final Property<List<TestRelEntity>> ADDITIONAL_REL = Property.create(\"additionalRel\", List.class);"));
-        assertTrue(content.contains("public void addToAdditionalRel(TestRelEntity obj)"));
-        assertTrue(content.contains("public void removeFromAdditionalRel(TestRelEntity obj)"));
-
-    }
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/7d88ac54/maven-plugins/maven-cayenne-plugin/src/test/java/org/apache/cayenne/tools/DbImporterOldMojoConfigurationTest.java
----------------------------------------------------------------------
diff --git a/maven-plugins/maven-cayenne-plugin/src/test/java/org/apache/cayenne/tools/DbImporterOldMojoConfigurationTest.java b/maven-plugins/maven-cayenne-plugin/src/test/java/org/apache/cayenne/tools/DbImporterOldMojoConfigurationTest.java
deleted file mode 100644
index 17f06b1..0000000
--- a/maven-plugins/maven-cayenne-plugin/src/test/java/org/apache/cayenne/tools/DbImporterOldMojoConfigurationTest.java
+++ /dev/null
@@ -1,109 +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.
- ****************************************************************/
-
-package org.apache.cayenne.tools;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.TreeSet;
-import java.util.regex.Pattern;
-
-import org.apache.cayenne.dbsync.reverse.dbimport.Catalog;
-import org.apache.cayenne.dbsync.reverse.dbimport.DbImportConfiguration;
-import org.apache.cayenne.dbsync.reverse.dbimport.Schema;
-import org.apache.cayenne.dbsync.reverse.filters.FiltersConfig;
-import org.apache.cayenne.dbsync.reverse.filters.IncludeTableFilter;
-import org.apache.cayenne.dbsync.reverse.filters.PatternFilter;
-import org.apache.cayenne.dbsync.reverse.filters.TableFilter;
-import org.slf4j.Logger;
-import org.apache.maven.plugin.testing.AbstractMojoTestCase;
-
-import static org.apache.cayenne.dbsync.reverse.dbimport.ReverseEngineeringUtils.*;
-import static org.mockito.Mockito.mock;
-
-public class DbImporterOldMojoConfigurationTest extends AbstractMojoTestCase {
-
-    public void testLoadCatalog() throws Exception {
-        Map<String, Catalog> catalogs = new HashMap<>();
-        for (Catalog c : getCdbImport("pom-catalog.xml").getReverseEngineering().getCatalogs()) {
-            catalogs.put(c.getName(), c);
-        }
-
-        assertEquals(3, catalogs.size());
-        Catalog c3 = catalogs.get("catalog-name-03");
-        assertNotNull(c3);
-        assertCatalog(c3);
-    }
-
-    public void testLoadSchema() throws Exception {
-        Map<String, Schema> schemas = new HashMap<>();
-        for (Schema s : getCdbImport("pom-schema.xml").getReverseEngineering().getSchemas()) {
-            schemas.put(s.getName(), s);
-        }
-
-        assertEquals(3, schemas.size());
-        Schema s3 = schemas.get("schema-name-03");
-        assertNotNull(s3);
-        assertSchemaContent(s3);
-    }
-
-    public void testLoadSchema2() throws Exception {
-        FiltersConfig filters = getCdbImport("pom-schema-2.xml").createConfig(mock(Logger.class))
-                .getDbLoaderConfig().getFiltersConfig();
-
-        TreeSet<IncludeTableFilter> includes = new TreeSet<>();
-        includes.add(new IncludeTableFilter(null, new PatternFilter().exclude("^ETL_.*")));
-
-        TreeSet<Pattern> excludes = new TreeSet<>(PatternFilter.PATTERN_COMPARATOR);
-        excludes.add(PatternFilter.pattern("^ETL_.*"));
-
-        assertEquals(filters.tableFilter(null, "NHL_STATS"),
-                new TableFilter(includes, excludes));
-    }
-
-    public void testLoadCatalogAndSchema() throws Exception {
-        assertCatalogAndSchema(getCdbImport("pom-catalog-and-schema.xml").getReverseEngineering());
-    }
-
-    public void testDefaultPackage() throws Exception {
-        DbImportConfiguration config = getCdbImport("pom-default-package.xml").createConfig(mock(Logger.class));
-        assertEquals("com.example.test", config.getDefaultPackage());
-    }
-
-    public void testLoadFlat() throws Exception {
-        assertFlat(getCdbImport("pom-flat.xml").getReverseEngineering());
-    }
-
-    public void testSkipRelationshipsLoading() throws Exception {
-        assertSkipRelationshipsLoading(getCdbImport("pom-skip-relationships-loading.xml").getReverseEngineering());
-    }
-
-    public void testSkipPrimaryKeyLoading() throws Exception {
-        assertSkipPrimaryKeyLoading(getCdbImport("pom-skip-primary-key-loading.xml").getReverseEngineering());
-    }
-
-    public void testTableTypes() throws Exception {
-        assertTableTypes(getCdbImport("pom-table-types.xml").getReverseEngineering());
-    }
-
-    private DbImporterMojo getCdbImport(String pomFileName) throws Exception {
-        return (DbImporterMojo) lookupMojo("cdbimport",
-                getTestFile("src/test/resources/cdbimport/" + pomFileName));
-    }
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/7d88ac54/maven-plugins/maven-cayenne-plugin/src/test/resources/cdbimport/pom-01.xml
----------------------------------------------------------------------
diff --git a/maven-plugins/maven-cayenne-plugin/src/test/resources/cdbimport/pom-01.xml b/maven-plugins/maven-cayenne-plugin/src/test/resources/cdbimport/pom-01.xml
deleted file mode 100644
index a4a6955..0000000
--- a/maven-plugins/maven-cayenne-plugin/src/test/resources/cdbimport/pom-01.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?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/xsd/maven-4.0.0.xsd">
-
-    <name>DbImporterMojo Test1</name>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-cayenne-plugin</artifactId>
-                <configuration>
-                    <map>target/test/org/apache/cayenne/tools/dbimporter-map1.map.xml</map>
-
-                    <dbimport>
-                        <catalog>catalog-name-01</catalog>
-
-                        <catalog>
-                            <name>catalog-name-02</name>
-
-                            <schema>schema-name-01</schema>
-
-                            <schema>
-                                <name>schema-name-02</name>
-
-                                <includeTable>incTable-01</includeTable>
-                                <excludeTable>excTable-01</excludeTable>
-
-                                <includeTable>
-                                    <pattern>incTable-02</pattern>
-
-                                    <includeColumn>includeColumn-01</includeColumn>
-                                    <excludeColumn>excludeColumn-01</excludeColumn>
-                                </includeTable>
-
-                                <includeColumn>includeColumn-02</includeColumn>
-                                <excludeColumn>excludeColumn-02</excludeColumn>
-                            </schema>
-
-                            <includeColumn>includeColumn-03</includeColumn>
-                            <excludeColumn>excludeColumn-03</excludeColumn>
-                        </catalog>
-
-                        <schema>schema-name-03</schema>
-
-                        <schema>
-                            <name>schema-name-04</name>
-
-                            <includeTable>incTable-04</includeTable>
-                            <excludeTable>excTable-04</excludeTable>
-
-                            <includeTable>
-                                <pattern>incTable-05</pattern>
-
-                                <includeColumn>includeColumn-04</includeColumn>
-                                <excludeColumn>excludeColumn-04</excludeColumn>
-                            </includeTable>
-
-                            <includeColumn>includeColumn-04</includeColumn>
-                            <excludeColumn>excludeColumn-04</excludeColumn>
-                        </schema>
-
-                        <includeTable>incTable-06</includeTable>
-                        <excludeTable>excTable-06</excludeTable>
-
-                        <includeTable>
-                            <pattern>incTable-07</pattern>
-
-                            <includeColumn>includeColumn-06</includeColumn>
-                            <excludeColumn>excludeColumn-06</excludeColumn>
-                        </includeTable>
-
-                        <includeColumn>includeColumn-05</includeColumn>
-                        <excludeColumn>excludeColumn-05</excludeColumn>
-                    </dbimport>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/7d88ac54/maven-plugins/maven-cayenne-plugin/src/test/resources/cdbimport/pom-catalog-and-schema.xml
----------------------------------------------------------------------
diff --git a/maven-plugins/maven-cayenne-plugin/src/test/resources/cdbimport/pom-catalog-and-schema.xml b/maven-plugins/maven-cayenne-plugin/src/test/resources/cdbimport/pom-catalog-and-schema.xml
deleted file mode 100644
index d3828ce..0000000
--- a/maven-plugins/maven-cayenne-plugin/src/test/resources/cdbimport/pom-catalog-and-schema.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?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/xsd/maven-4.0.0.xsd">
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-cayenne-plugin</artifactId>
-                <configuration>
-                    <map>target/test/org/apache/cayenne/tools/dbimporter-map1.map.xml</map>
-
-                    <dbimport>
-                        <catalog>
-                            <name>catalog-name</name>
-                            <schema>
-                                <name>schema-name</name>
-                                <includeTable>includeTable-01</includeTable>
-
-                                <includeTable>
-                                    <pattern>includeTable-02</pattern>
-                                </includeTable>
-
-                                <includeTable>
-                                    <pattern>includeTable-03</pattern>
-
-                                    <includeColumn>includeColumn-01</includeColumn>
-                                    <excludeColumn>excludeColumn-01</excludeColumn>
-                                </includeTable>
-
-                                <excludeTable>excludeTable-01</excludeTable>
-                                <excludeTable>
-                                    <pattern>excludeTable-02</pattern>
-                                </excludeTable>
-                                <excludeTable>excludeTable-03</excludeTable>
-
-                                <includeColumn>includeColumn-01</includeColumn>
-                                <includeColumn>
-                                    <pattern>includeColumn-02</pattern>
-                                </includeColumn>
-                                <includeColumn>includeColumn-03</includeColumn>
-                                <excludeColumn>excludeColumn-01</excludeColumn>
-                                <excludeColumn>
-                                    <pattern>excludeColumn-02</pattern>
-                                </excludeColumn>
-                                <excludeColumn>excludeColumn-03</excludeColumn>
-
-                                <includeProcedure>includeProcedure-01</includeProcedure>
-                                <includeProcedure>
-                                    <pattern>includeProcedure-02</pattern>
-                                </includeProcedure>
-                                <includeProcedure>includeProcedure-03</includeProcedure>
-                                <excludeProcedure>excludeProcedure-01</excludeProcedure>
-                                <excludeProcedure>
-                                    <pattern>excludeProcedure-02</pattern>
-                                </excludeProcedure>
-                                <excludeProcedure>excludeProcedure-03</excludeProcedure>
-                            </schema>
-                        </catalog>
-                    </dbimport>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/7d88ac54/maven-plugins/maven-cayenne-plugin/src/test/resources/cdbimport/pom-catalog.xml
----------------------------------------------------------------------
diff --git a/maven-plugins/maven-cayenne-plugin/src/test/resources/cdbimport/pom-catalog.xml b/maven-plugins/maven-cayenne-plugin/src/test/resources/cdbimport/pom-catalog.xml
deleted file mode 100644
index 9c919e8..0000000
--- a/maven-plugins/maven-cayenne-plugin/src/test/resources/cdbimport/pom-catalog.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?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/xsd/maven-4.0.0.xsd">
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-cayenne-plugin</artifactId>
-                <configuration>
-                    <map>target/test/org/apache/cayenne/tools/dbimporter-map1.map.xml</map>
-
-                    <dbimport>
-                        <catalog>catalog-name-01</catalog>
-
-                        <catalog>
-                            <name>catalog-name-02</name>
-                        </catalog>
-
-                        <catalog>
-                            <name>catalog-name-03</name>
-                            <includeTable>includeTable-01</includeTable>
-
-                            <includeTable>
-                                <pattern>includeTable-02</pattern>
-                            </includeTable>
-
-                            <includeTable>
-                                <pattern>includeTable-03</pattern>
-
-                                <includeColumn>includeColumn-01</includeColumn>
-                                <excludeColumn>excludeColumn-01</excludeColumn>
-                            </includeTable>
-
-                            <excludeTable>excludeTable-01</excludeTable>
-                            <excludeTable>
-                                <pattern>excludeTable-02</pattern>
-                            </excludeTable>
-                            <excludeTable>excludeTable-03</excludeTable>
-
-                            <includeColumn>includeColumn-01</includeColumn>
-                            <includeColumn>
-                                <pattern>includeColumn-02</pattern>
-                            </includeColumn>
-                            <includeColumn>includeColumn-03</includeColumn>
-                            <excludeColumn>excludeColumn-01</excludeColumn>
-                            <excludeColumn>
-                                <pattern>excludeColumn-02</pattern>
-                            </excludeColumn>
-                            <excludeColumn>excludeColumn-03</excludeColumn>
-
-                            <includeProcedure>includeProcedure-01</includeProcedure>
-                            <includeProcedure>
-                                <pattern>includeProcedure-02</pattern>
-                            </includeProcedure>
-                            <includeProcedure>includeProcedure-03</includeProcedure>
-                            <excludeProcedure>excludeProcedure-01</excludeProcedure>
-                            <excludeProcedure>
-                                <pattern>excludeProcedure-02</pattern>
-                            </excludeProcedure>
-                            <excludeProcedure>excludeProcedure-03</excludeProcedure>
-                        </catalog>
-                    </dbimport>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/7d88ac54/maven-plugins/maven-cayenne-plugin/src/test/resources/cdbimport/pom-default-package.xml
----------------------------------------------------------------------
diff --git a/maven-plugins/maven-cayenne-plugin/src/test/resources/cdbimport/pom-default-package.xml b/maven-plugins/maven-cayenne-plugin/src/test/resources/cdbimport/pom-default-package.xml
deleted file mode 100644
index 7f09b88..0000000
--- a/maven-plugins/maven-cayenne-plugin/src/test/resources/cdbimport/pom-default-package.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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/xsd/maven-4.0.0.xsd">
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-cayenne-plugin</artifactId>
-                <configuration>
-                    <map>target/test/org/apache/cayenne/tools/dbimporter-map1.map.xml</map>
-                    <dbimport>
-                        <defaultPackage>com.example.test</defaultPackage>
-                    </dbimport>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/7d88ac54/maven-plugins/maven-cayenne-plugin/src/test/resources/cdbimport/pom-flat.xml
----------------------------------------------------------------------
diff --git a/maven-plugins/maven-cayenne-plugin/src/test/resources/cdbimport/pom-flat.xml b/maven-plugins/maven-cayenne-plugin/src/test/resources/cdbimport/pom-flat.xml
deleted file mode 100644
index 6987454..0000000
--- a/maven-plugins/maven-cayenne-plugin/src/test/resources/cdbimport/pom-flat.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?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/xsd/maven-4.0.0.xsd">
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-cayenne-plugin</artifactId>
-                <configuration>
-                    <map>target/test/org/apache/cayenne/tools/dbimporter-map1.map.xml</map>
-
-                    <dbimport>
-                        <includeTable>includeTable-01</includeTable>
-
-                        <includeTable>
-                            <pattern>includeTable-02</pattern>
-                        </includeTable>
-
-                        <includeTable>
-                            <pattern>includeTable-03</pattern>
-
-                            <includeColumn>includeColumn-01</includeColumn>
-                            <excludeColumn>excludeColumn-01</excludeColumn>
-                        </includeTable>
-
-                        <excludeTable>excludeTable-01</excludeTable>
-                        <excludeTable>
-                            <pattern>excludeTable-02</pattern>
-                        </excludeTable>
-                        <excludeTable>excludeTable-03</excludeTable>
-
-                        <includeColumn>includeColumn-01</includeColumn>
-                        <includeColumn>
-                            <pattern>includeColumn-02</pattern>
-                        </includeColumn>
-                        <includeColumn>includeColumn-03</includeColumn>
-                        <excludeColumn>excludeColumn-01</excludeColumn>
-                        <excludeColumn>
-                            <pattern>excludeColumn-02</pattern>
-                        </excludeColumn>
-                        <excludeColumn>excludeColumn-03</excludeColumn>
-
-                        <includeProcedure>includeProcedure-01</includeProcedure>
-                        <includeProcedure>
-                            <pattern>includeProcedure-02</pattern>
-                        </includeProcedure>
-                        <includeProcedure>includeProcedure-03</includeProcedure>
-                        <excludeProcedure>excludeProcedure-01</excludeProcedure>
-                        <excludeProcedure>
-                            <pattern>excludeProcedure-02</pattern>
-                        </excludeProcedure>
-                        <excludeProcedure>excludeProcedure-03</excludeProcedure>
-                    </dbimport>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/7d88ac54/maven-plugins/maven-cayenne-plugin/src/test/resources/cdbimport/pom-mapping.xml
----------------------------------------------------------------------
diff --git a/maven-plugins/maven-cayenne-plugin/src/test/resources/cdbimport/pom-mapping.xml b/maven-plugins/maven-cayenne-plugin/src/test/resources/cdbimport/pom-mapping.xml
deleted file mode 100644
index 10c99da..0000000
--- a/maven-plugins/maven-cayenne-plugin/src/test/resources/cdbimport/pom-mapping.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?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/xsd/maven-4.0.0.xsd">
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-cayenne-plugin</artifactId>
-                <configuration>
-                    <map>target/test/org/apache/cayenne/tools/dbimporter-map1.map.xml</map>
-
-                    <typeMapper >
-                        <mapperClassName>class</mapperClassName>
-                        <usePrimitives>false</usePrimitives>
-
-                        <type>
-                            <java>my.personal.type</java>
-                            <jdbc>varchar</jdbc>
-                        </type>
-                        <type>
-                            <java>java-01</java>
-                            <jdbc>jdbc-01</jdbc>
-                        </type>
-                        <type>
-                            <java>java-02</java>
-                            <jdbc>jdbc-02</jdbc>
-                            <length>21</length>
-                            <notNull>true</notNull>
-                        </type>
-                        <type>
-                            <java>java-03</java>
-                            <jdbc>jdbc-03</jdbc>
-                            <precision>5</precision>
-                            <scale>2</scale>
-                        </type>
-                        <type>
-                            <java>java-03</java>
-                            <jdbc>jdbc-03</jdbc>
-                            <precision>7</precision>
-                            <notNull>true</notNull>
-                        </type>
-                    </typeMapper>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/7d88ac54/maven-plugins/maven-cayenne-plugin/src/test/resources/cdbimport/pom-schema-2.xml
----------------------------------------------------------------------
diff --git a/maven-plugins/maven-cayenne-plugin/src/test/resources/cdbimport/pom-schema-2.xml b/maven-plugins/maven-cayenne-plugin/src/test/resources/cdbimport/pom-schema-2.xml
deleted file mode 100644
index 05342fd..0000000
--- a/maven-plugins/maven-cayenne-plugin/src/test/resources/cdbimport/pom-schema-2.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?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/xsd/maven-4.0.0.xsd">
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-cayenne-plugin</artifactId>
-                <configuration>
-                    <dbimport>
-                        <schema>
-                            <name>NHL_STATS</name>
-                            <excludeTable>^ETL_.*</excludeTable>
-                            <excludeColumn>^ETL_.*</excludeColumn>
-                        </schema>
-                    </dbimport>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/7d88ac54/maven-plugins/maven-cayenne-plugin/src/test/resources/cdbimport/pom-schema.xml
----------------------------------------------------------------------
diff --git a/maven-plugins/maven-cayenne-plugin/src/test/resources/cdbimport/pom-schema.xml b/maven-plugins/maven-cayenne-plugin/src/test/resources/cdbimport/pom-schema.xml
deleted file mode 100644
index 11804fc..0000000
--- a/maven-plugins/maven-cayenne-plugin/src/test/resources/cdbimport/pom-schema.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?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/xsd/maven-4.0.0.xsd">
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-cayenne-plugin</artifactId>
-                <configuration>
-                    <map>target/test/org/apache/cayenne/tools/dbimporter-map1.map.xml</map>
-
-                    <dbimport>
-                        <schema>schema-name-01</schema>
-
-                        <schema>
-                            <name>schema-name-02</name>
-                        </schema>
-
-                        <schema>
-                            <name>schema-name-03</name>
-                            <includeTable>includeTable-01</includeTable>
-
-                            <includeTable>
-                                <pattern>includeTable-02</pattern>
-                            </includeTable>
-
-                            <includeTable>
-                                <pattern>includeTable-03</pattern>
-
-                                <includeColumn>includeColumn-01</includeColumn>
-                                <excludeColumn>excludeColumn-01</excludeColumn>
-                            </includeTable>
-
-                            <excludeTable>excludeTable-01</excludeTable>
-                            <excludeTable>
-                                <pattern>excludeTable-02</pattern>
-                            </excludeTable>
-                            <excludeTable>excludeTable-03</excludeTable>
-
-                            <includeColumn>includeColumn-01</includeColumn>
-                            <includeColumn>
-                                <pattern>includeColumn-02</pattern>
-                            </includeColumn>
-                            <includeColumn>includeColumn-03</includeColumn>
-                            <excludeColumn>excludeColumn-01</excludeColumn>
-                            <excludeColumn>
-                                <pattern>excludeColumn-02</pattern>
-                            </excludeColumn>
-                            <excludeColumn>excludeColumn-03</excludeColumn>
-
-                            <includeProcedure>includeProcedure-01</includeProcedure>
-                            <includeProcedure>
-                                <pattern>includeProcedure-02</pattern>
-                            </includeProcedure>
-                            <includeProcedure>includeProcedure-03</includeProcedure>
-                            <excludeProcedure>excludeProcedure-01</excludeProcedure>
-                            <excludeProcedure>
-                                <pattern>excludeProcedure-02</pattern>
-                            </excludeProcedure>
-                            <excludeProcedure>excludeProcedure-03</excludeProcedure>
-                        </schema>
-                    </dbimport>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/7d88ac54/maven-plugins/maven-cayenne-plugin/src/test/resources/cdbimport/pom-skip-primary-key-loading.xml
----------------------------------------------------------------------
diff --git a/maven-plugins/maven-cayenne-plugin/src/test/resources/cdbimport/pom-skip-primary-key-loading.xml b/maven-plugins/maven-cayenne-plugin/src/test/resources/cdbimport/pom-skip-primary-key-loading.xml
deleted file mode 100644
index 2c3e6c5..0000000
--- a/maven-plugins/maven-cayenne-plugin/src/test/resources/cdbimport/pom-skip-primary-key-loading.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?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/xsd/maven-4.0.0.xsd">
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-cayenne-plugin</artifactId>
-                <configuration>
-                    <map>target/test/org/apache/cayenne/tools/dbimporter-map1.map.xml</map>
-
-                    <dbimport>
-                        <skipPrimaryKeyLoading>true</skipPrimaryKeyLoading>
-                    </dbimport>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/7d88ac54/maven-plugins/maven-cayenne-plugin/src/test/resources/cdbimport/pom-skip-relationships-loading.xml
----------------------------------------------------------------------
diff --git a/maven-plugins/maven-cayenne-plugin/src/test/resources/cdbimport/pom-skip-relationships-loading.xml b/maven-plugins/maven-cayenne-plugin/src/test/resources/cdbimport/pom-skip-relationships-loading.xml
deleted file mode 100644
index 9291871..0000000
--- a/maven-plugins/maven-cayenne-plugin/src/test/resources/cdbimport/pom-skip-relationships-loading.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?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/xsd/maven-4.0.0.xsd">
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-cayenne-plugin</artifactId>
-                <configuration>
-                    <map>target/test/org/apache/cayenne/tools/dbimporter-map1.map.xml</map>
-
-                    <dbimport>
-                        <skipRelationshipsLoading>true</skipRelationshipsLoading>
-                    </dbimport>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/7d88ac54/maven-plugins/maven-cayenne-plugin/src/test/resources/cdbimport/pom-table-types.xml
----------------------------------------------------------------------
diff --git a/maven-plugins/maven-cayenne-plugin/src/test/resources/cdbimport/pom-table-types.xml b/maven-plugins/maven-cayenne-plugin/src/test/resources/cdbimport/pom-table-types.xml
deleted file mode 100644
index b8d3ad3..0000000
--- a/maven-plugins/maven-cayenne-plugin/src/test/resources/cdbimport/pom-table-types.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?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/xsd/maven-4.0.0.xsd">
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-cayenne-plugin</artifactId>
-                <configuration>
-                    <map>target/test/org/apache/cayenne/tools/dbimporter-map1.map.xml</map>
-
-                    <dbimport>
-                        <tableType>type1</tableType>
-                        <tableType>type2</tableType>
-                        <tableType>type3</tableType>
-                    </dbimport>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/7d88ac54/maven-plugins/maven-cayenne-plugin/src/test/resources/cgen/cayenne-testDomain.xml
----------------------------------------------------------------------
diff --git a/maven-plugins/maven-cayenne-plugin/src/test/resources/cgen/cayenne-testDomain.xml b/maven-plugins/maven-cayenne-plugin/src/test/resources/cgen/cayenne-testDomain.xml
deleted file mode 100644
index 2acb92b..0000000
--- a/maven-plugins/maven-cayenne-plugin/src/test/resources/cgen/cayenne-testDomain.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="10">
-	<map name="testDomainMap"/>
-    <map name="testAdditionalMap"/>
-</domain>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/7d88ac54/maven-plugins/maven-cayenne-plugin/src/test/resources/cgen/project-to-test/pom.xml
----------------------------------------------------------------------
diff --git a/maven-plugins/maven-cayenne-plugin/src/test/resources/cgen/project-to-test/pom.xml b/maven-plugins/maven-cayenne-plugin/src/test/resources/cgen/project-to-test/pom.xml
deleted file mode 100644
index 44db499..0000000
--- a/maven-plugins/maven-cayenne-plugin/src/test/resources/cgen/project-to-test/pom.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?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/xsd/maven-4.0.0.xsd">
-
-	<name>Test CayenneGeneratorMojo</name>
-
-	<dependencies>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
-
-	<build>
-		<plugins>
-			<plugin>
-				<artifactId>maven-cayenne-plugin</artifactId>
-				<configuration>
-					<map>src/test/resources/cgen/testDomainMap.map.xml</map>
-					<destDir>target/cayenneGeneratedClasses</destDir>
-                    <additionalMaps>src/test/resources/cgen/</additionalMaps>
-					<outputPattern>*.txt</outputPattern>
-					<makePairs>true</makePairs>
-					<usePkgPath>true</usePkgPath>
-					<superPkg>superPkg</superPkg>
-					<encoding>UTF-8</encoding>
-					<includeEntities>Test*</includeEntities>
-					<excludeEntities>TestExcludedEntity</excludeEntities>
-					<mode>all</mode>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-
-</project>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/7d88ac54/maven-plugins/maven-cayenne-plugin/src/test/resources/cgen/testAdditionalMap.map.xml
----------------------------------------------------------------------
diff --git a/maven-plugins/maven-cayenne-plugin/src/test/resources/cgen/testAdditionalMap.map.xml b/maven-plugins/maven-cayenne-plugin/src/test/resources/cgen/testAdditionalMap.map.xml
deleted file mode 100644
index ca2a724..0000000
--- a/maven-plugins/maven-cayenne-plugin/src/test/resources/cgen/testAdditionalMap.map.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/10/modelMap"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap http://cayenne.apache.org/schema/10/modelMap.xsd"
-          project-version="10">
-    <property name="defaultPackage" value="pack"/>
-    <db-entity name="TestRelEntity">
-        <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
-        <db-attribute name="NAME" type="VARCHAR" length="200"/>
-    </db-entity>
-    <obj-entity name="TestRelEntity" className="pack.TestRelEntity" dbEntityName="TestRelEntity">
-        <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/>
-    </obj-entity>
-    <db-relationship name="additionalRel" source="TestRelEntity" target="TestEntity" toMany="false">
-        <db-attribute-pair source="ID" target="TestRelEntity_ID"/>
-    </db-relationship>
-    <obj-relationship name="additionalRel" source="TestRelEntity" target="TestEntity" deleteRule="Nullify" db-relationship-path="additionalRel"/>
-</data-map>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cayenne/blob/7d88ac54/maven-plugins/maven-cayenne-plugin/src/test/resources/cgen/testDomainMap.map.xml
----------------------------------------------------------------------
diff --git a/maven-plugins/maven-cayenne-plugin/src/test/resources/cgen/testDomainMap.map.xml b/maven-plugins/maven-cayenne-plugin/src/test/resources/cgen/testDomainMap.map.xml
deleted file mode 100644
index 2abab83..0000000
--- a/maven-plugins/maven-cayenne-plugin/src/test/resources/cgen/testDomainMap.map.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/10/modelMap"
-	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap http://cayenne.apache.org/schema/10/modelMap.xsd"
-	 project-version="10">
-	<property name="defaultPackage" value="pack"/>
-	<embeddable className="pack.Embeddable">
-		<embeddable-attribute name="embAttr" type="java.lang.String" db-attribute-name="EMB_ATTR"/>
-	</embeddable>
-	<db-entity name="NotIncludedEntity">
-		<db-attribute name="id" type="BIGINT" isPrimaryKey="true" isMandatory="true"/>
-		<db-attribute name="name" type="VARCHAR" length="255"/>
-	</db-entity>
-	<db-entity name="TestEntity">
-		<db-attribute name="id" type="BIGINT" isPrimaryKey="true" isMandatory="true"/>
-		<db-attribute name="testAttr" type="VARCHAR" length="255"/>
-        <db-attribute name="TestRelEntity_ID" type="INTEGER"/>
-	</db-entity>
-	<db-entity name="TestExcludedEntity">
-		<db-attribute name="id" type="BIGINT" isPrimaryKey="true" isMandatory="true"/>
-		<db-attribute name="name" type="VARCHAR" length="255"/>
-	</db-entity>
-	<obj-entity name="NotIncludedEntity" className="pack.NotIncludedEntity" dbEntityName="NotIncludedEntity">
-		<obj-attribute name="name" type="java.lang.String" db-attribute-path="name"/>
-	</obj-entity>
-	<obj-entity name="TestEntity" className="pack.TestEntity" dbEntityName="TestEntity">
-		<embedded-attribute name="embeddedAtr" type="pack.Embeddable"/>
-		<obj-attribute name="testAttr" type="java.lang.String" db-attribute-path="testAttr"/>
-	</obj-entity>
-	<obj-entity name="TestExcludedEntity" className="pack.TestExcludedEntity" dbEntityName="TestExcludedEntity">
-		<obj-attribute name="name" type="java.lang.String" db-attribute-path="name"/>
-	</obj-entity>
-	<db-relationship name="childrenRel" source="TestEntity" target="TestEntity" toMany="true">
-		<db-attribute-pair source="id" target="id"/>
-	</db-relationship>
-	<db-relationship name="parentRel" source="TestEntity" target="TestEntity" toMany="false">
-		<db-attribute-pair source="id" target="id"/>
-	</db-relationship>
-    <db-relationship name="additionalRel" source="TestEntity" target="TestRelEntity" toMany="true">
-        <db-attribute-pair source="TestRelEntity_ID" target="ID"/>
-    </db-relationship>
-	<obj-relationship name="childrenRel" source="TestEntity" target="TestEntity" deleteRule="Deny" db-relationship-path="childrenRel"/>
-	<obj-relationship name="parentRel" source="TestEntity" target="TestEntity" deleteRule="Nullify" db-relationship-path="parentRel"/>
-    <obj-relationship name="additionalRel" source="TestEntity" target="TestRelEntity" deleteRule="Deny" db-relationship-path="additionalRel"/>
-</data-map>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/7d88ac54/maven-plugins/pom.xml
----------------------------------------------------------------------
diff --git a/maven-plugins/pom.xml b/maven-plugins/pom.xml
index 87d6a00..ca01f47 100644
--- a/maven-plugins/pom.xml
+++ b/maven-plugins/pom.xml
@@ -23,7 +23,6 @@
 
 	<modules>
 		<module>cayenne-maven-plugin</module>
-		<module>maven-cayenne-plugin</module>
 		<module>cayenne-modeler-maven-plugin</module>
 		<module>cayenne-tools-itest</module>
 	</modules>


Mime
View raw message