You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2017/02/01 14:46:49 UTC

[02/10] cayenne git commit: CAY-2215 rename "plugins" folder and "cayenne-plugins-parent" module New names are "maven-plugins" and "cayenne-maven-plugins-parent"

http://git-wip-us.apache.org/repos/asf/cayenne/blob/a0cd93d6/plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testUnFlattensManyToMany-pom.xml
----------------------------------------------------------------------
diff --git a/plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testUnFlattensManyToMany-pom.xml b/plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testUnFlattensManyToMany-pom.xml
deleted file mode 100644
index 0c80294..0000000
--- a/plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testUnFlattensManyToMany-pom.xml
+++ /dev/null
@@ -1,44 +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>cayenne-maven-plugin</artifactId>
-				<configuration>
-					<map>target/test-classes/org/apache/cayenne/tools/dbimport/testUnFlattensManyToMany.map.xml</map>
-					<dataSource>
-						<driver>org.apache.derby.jdbc.EmbeddedDriver</driver>
-						<url>jdbc:derby:memory:DbImporterMojoTest;create=true</url>
-					</dataSource>
-					<dbimport>
-                    	<defaultPackage>org.not.my.home</defaultPackage>
-					</dbimport>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-
-</project>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/a0cd93d6/plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testUnFlattensManyToMany.map.xml
----------------------------------------------------------------------
diff --git a/plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testUnFlattensManyToMany.map.xml b/plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testUnFlattensManyToMany.map.xml
deleted file mode 100644
index 689a94a..0000000
--- a/plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testUnFlattensManyToMany.map.xml
+++ /dev/null
@@ -1,55 +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.
-  -->
-<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"
-	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"
-	 project-version="9">
-    <property name="defaultPackage" value="com.my.home"/>
-    <db-entity name="A" schema="APP">
-        <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
-    </db-entity>
-    <db-entity name="A_B" schema="APP">
-        <db-attribute name="A_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
-        <db-attribute name="B_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
-    </db-entity>
-    <db-entity name="B" schema="APP">
-        <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
-    </db-entity>
-    <obj-entity name="A" className="A" dbEntityName="A">
-    </obj-entity>
-    <obj-entity name="AB" className="AB" dbEntityName="A_B">
-    </obj-entity>
-    <obj-entity name="B" className="B" dbEntityName="B">
-    </obj-entity>
-    <db-relationship name="aBs" source="A" target="A_B" toDependentPK="true" toMany="true">
-        <db-attribute-pair source="ID" target="A_ID"/>
-    </db-relationship>
-    <db-relationship name="toA" source="A_B" target="A" toMany="false">
-        <db-attribute-pair source="A_ID" target="ID"/>
-    </db-relationship>
-    <db-relationship name="toB" source="A_B" target="B" toMany="false">
-        <db-attribute-pair source="B_ID" target="ID"/>
-    </db-relationship>
-    <db-relationship name="aBs" source="B" target="A_B" toDependentPK="true" toMany="true">
-        <db-attribute-pair source="ID" target="B_ID"/>
-    </db-relationship>
-    <obj-relationship name="toA" source="AB" target="A" deleteRule="Nullify" db-relationship-path="toA"/>
-    <obj-relationship name="aBs" source="B" target="AB" deleteRule="Deny" db-relationship-path="aBs"/>
-</data-map>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/a0cd93d6/plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testUnFlattensManyToMany.map.xml-result
----------------------------------------------------------------------
diff --git a/plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testUnFlattensManyToMany.map.xml-result b/plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testUnFlattensManyToMany.map.xml-result
deleted file mode 100644
index 46d6a84..0000000
--- a/plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testUnFlattensManyToMany.map.xml-result
+++ /dev/null
@@ -1,88 +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.
--->
-<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"
-          project-version="9">
-    <property name="defaultPackage" value="org.not.my.home"/>
-    <db-entity name="A" schema="APP">
-        <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
-    </db-entity>
-    <db-entity name="A_B" schema="APP">
-        <db-attribute name="A_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
-        <db-attribute name="B_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
-    </db-entity>
-    <db-entity name="B" schema="APP">
-        <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
-    </db-entity>
-    <db-entity name="C" schema="APP">
-        <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
-    </db-entity>
-    <db-entity name="X" schema="APP">
-        <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
-    </db-entity>
-    <db-entity name="X_Y" schema="APP">
-        <db-attribute name="X_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
-        <db-attribute name="Y_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
-    </db-entity>
-    <db-entity name="Y" schema="APP">
-        <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
-    </db-entity>
-    <obj-entity name="A" className="A" dbEntityName="A">
-    </obj-entity>
-    <obj-entity name="AB" className="AB" dbEntityName="A_B">
-    </obj-entity>
-    <obj-entity name="B" className="B" dbEntityName="B">
-    </obj-entity>
-    <obj-entity name="C" className="org.not.my.home.C" dbEntityName="C">
-    </obj-entity>
-    <obj-entity name="X" className="org.not.my.home.X" dbEntityName="X">
-    </obj-entity>
-    <obj-entity name="Y" className="org.not.my.home.Y" dbEntityName="Y">
-    </obj-entity>
-    <db-relationship name="aBs" source="A" target="A_B" toDependentPK="true" toMany="true">
-        <db-attribute-pair source="ID" target="A_ID"/>
-    </db-relationship>
-    <db-relationship name="toA" source="A_B" target="A" toMany="false">
-        <db-attribute-pair source="A_ID" target="ID"/>
-    </db-relationship>
-    <db-relationship name="toB" source="A_B" target="B" toMany="false">
-        <db-attribute-pair source="B_ID" target="ID"/>
-    </db-relationship>
-    <db-relationship name="aBs" source="B" target="A_B" toDependentPK="true" toMany="true">
-        <db-attribute-pair source="ID" target="B_ID"/>
-    </db-relationship>
-    <db-relationship name="xIes" source="X" target="X_Y" toDependentPK="true" toMany="true">
-        <db-attribute-pair source="ID" target="X_ID"/>
-    </db-relationship>
-    <db-relationship name="x" source="X_Y" target="X" toMany="false">
-        <db-attribute-pair source="X_ID" target="ID"/>
-    </db-relationship>
-    <db-relationship name="y" source="X_Y" target="Y" toMany="false">
-        <db-attribute-pair source="Y_ID" target="ID"/>
-    </db-relationship>
-    <db-relationship name="xIes" source="Y" target="X_Y" toDependentPK="true" toMany="true">
-        <db-attribute-pair source="ID" target="Y_ID"/>
-    </db-relationship>
-    <obj-relationship name="toA" source="AB" target="A" deleteRule="Nullify" db-relationship-path="toA"/>
-    <obj-relationship name="aBs" source="B" target="AB" deleteRule="Deny" db-relationship-path="aBs"/>
-    <obj-relationship name="ies" source="X" target="Y" db-relationship-path="xIes.y"/>
-    <obj-relationship name="xes" source="Y" target="X" db-relationship-path="xIes.x"/>
-</data-map>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/a0cd93d6/plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testUnFlattensManyToMany.sql
----------------------------------------------------------------------
diff --git a/plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testUnFlattensManyToMany.sql b/plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testUnFlattensManyToMany.sql
deleted file mode 100644
index b6f4eac..0000000
--- a/plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testUnFlattensManyToMany.sql
+++ /dev/null
@@ -1,64 +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.
-
-CREATE TABLE APP.A (
-  id INTEGER NOT NULL,
-
-  PRIMARY KEY (id)
-);
-
-CREATE TABLE APP.B (
-  id INTEGER NOT NULL,
-
-  PRIMARY KEY (id)
-);
-
-CREATE TABLE APP.A_B (
-  A_ID INTEGER NOT NULL,
-  B_ID INTEGER NOT NULL,
-
-  PRIMARY KEY (A_ID, B_ID),
-  CONSTRAINT A_B_A FOREIGN KEY (A_ID) REFERENCES APP.A (ID),
-  CONSTRAINT A_B_B FOREIGN KEY (B_ID) REFERENCES APP.B (ID)
-);
-
-CREATE TABLE APP.C (
-  id INTEGER NOT NULL,
-
-  PRIMARY KEY (id)
-);
-
-CREATE TABLE APP.X (
-  id INTEGER NOT NULL,
-
-  PRIMARY KEY (id)
-);
-
-CREATE TABLE APP.Y (
-  id INTEGER NOT NULL,
-
-  PRIMARY KEY (id)
-);
-
-CREATE TABLE APP.X_Y (
-  X_ID INTEGER NOT NULL,
-  Y_ID INTEGER NOT NULL,
-
-  PRIMARY KEY (X_ID, Y_ID),
-  CONSTRAINT X_Y_X FOREIGN KEY (X_ID) REFERENCES APP.X (ID),
-  CONSTRAINT X_Y_Y FOREIGN KEY (Y_ID) REFERENCES APP.Y (ID)
-);
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cayenne/blob/a0cd93d6/plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testViewsExclude-pom.xml
----------------------------------------------------------------------
diff --git a/plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testViewsExclude-pom.xml b/plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testViewsExclude-pom.xml
deleted file mode 100644
index 1d5f4c0..0000000
--- a/plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testViewsExclude-pom.xml
+++ /dev/null
@@ -1,45 +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>cayenne-maven-plugin</artifactId>
-                <configuration>
-                    <map>target/test-classes/org/apache/cayenne/tools/dbimport/testViewsExclude.map.xml</map>
-                    <dataSource>
-                        <driver>org.apache.derby.jdbc.EmbeddedDriver</driver>
-                        <url>jdbc:derby:memory:DbImporterMojoTest;create=true</url>
-                    </dataSource>
-
-                    <dbimport>
-                        <excludeTable>^V_.*</excludeTable>
-                    </dbimport>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/a0cd93d6/plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testViewsExclude.map.xml-result
----------------------------------------------------------------------
diff --git a/plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testViewsExclude.map.xml-result b/plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testViewsExclude.map.xml-result
deleted file mode 100644
index d24df6e..0000000
--- a/plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testViewsExclude.map.xml-result
+++ /dev/null
@@ -1,43 +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.
--->
-<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"
-          project-version="9">
-    <db-entity name="GIRL" schema="APP">
-        <db-attribute name="ID" type="INTEGER" isMandatory="true" length="10"/>
-    </db-entity>
-    <db-entity name="PERSON" schema="APP">
-        <db-attribute name="COL2" type="CHAR" length="25"/>
-        <db-attribute name="COL3" type="DECIMAL" length="10" scale="2"/>
-        <db-attribute name="COL4" type="VARCHAR" length="25"/>
-        <db-attribute name="COL5" type="DATE" length="10"/>
-        <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
-    </db-entity>
-    <obj-entity name="Girl" className="Girl" dbEntityName="GIRL">
-        <obj-attribute name="id" type="int" db-attribute-path="ID"/>
-    </obj-entity>
-    <obj-entity name="Person" className="Person" dbEntityName="PERSON">
-        <obj-attribute name="col2" type="java.lang.String" db-attribute-path="COL2"/>
-        <obj-attribute name="col3" type="java.math.BigDecimal" db-attribute-path="COL3"/>
-        <obj-attribute name="col4" type="java.lang.String" db-attribute-path="COL4"/>
-        <obj-attribute name="col5" type="java.util.Date" db-attribute-path="COL5"/>
-    </obj-entity>
-</data-map>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/a0cd93d6/plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testViewsExclude.sql
----------------------------------------------------------------------
diff --git a/plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testViewsExclude.sql b/plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testViewsExclude.sql
deleted file mode 100644
index 1af3f84..0000000
--- a/plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testViewsExclude.sql
+++ /dev/null
@@ -1,30 +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.
-
-CREATE TABLE Person (
-  id INTEGER NOT NULL,
-  COL2 CHAR(25),
-  COL3 DECIMAL(10,2),
-  COL4 VARCHAR(25),
-  COL5 DATE,
-
-  PRIMARY KEY (id),
-  UNIQUE (COL3)
-);
-
-CREATE VIEW girl (id) AS SELECT id FROM Person;
-CREATE VIEW v_vview (id) AS SELECT id FROM Person;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cayenne/blob/a0cd93d6/plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimporter-pom1.xml
----------------------------------------------------------------------
diff --git a/plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimporter-pom1.xml b/plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimporter-pom1.xml
deleted file mode 100644
index 3bb6207..0000000
--- a/plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimporter-pom1.xml
+++ /dev/null
@@ -1,37 +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>cayenne-maven-plugin</artifactId>
-				<configuration>
-					<map>target/test/org/apache/cayenne/tools/dbimporter-map1.map.xml</map>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-
-</project>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/a0cd93d6/plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimporter-pom2.xml
----------------------------------------------------------------------
diff --git a/plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimporter-pom2.xml b/plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimporter-pom2.xml
deleted file mode 100644
index 4ea460c..0000000
--- a/plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimporter-pom2.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">
-
-	<name>DbImporterMojo Test2</name>
-
-	<build>
-		<plugins>
-			<plugin>
-				<artifactId>cayenne-maven-plugin</artifactId>
-				<configuration>
-					<dbimport>
-						<meaningfulPkTables>x,b*</meaningfulPkTables>
-					</dbimport>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-
-</project>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/a0cd93d6/plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimporter-pom3.xml
----------------------------------------------------------------------
diff --git a/plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimporter-pom3.xml b/plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimporter-pom3.xml
deleted file mode 100644
index be64020..0000000
--- a/plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimporter-pom3.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">
-
-	<name>DbImporterMojo Test1</name>	
-
-	<build>
-		<plugins>
-			<plugin>
-				<artifactId>cayenne-maven-plugin</artifactId>
-				<configuration>
-					<dbimport>
-						<meaningfulPkTables>*</meaningfulPkTables>
-					</dbimport>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-
-</project>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/a0cd93d6/plugins/maven-cayenne-modeler-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/maven-cayenne-modeler-plugin/pom.xml b/plugins/maven-cayenne-modeler-plugin/pom.xml
deleted file mode 100644
index f3b05d1..0000000
--- a/plugins/maven-cayenne-modeler-plugin/pom.xml
+++ /dev/null
@@ -1,111 +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/maven-v4_0_0.xsd">
-
-	<parent>
-		<artifactId>cayenne-plugins-parent</artifactId>
-		<groupId>org.apache.cayenne.plugins</groupId>
-		<version>4.0.M5-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>maven-cayenne-modeler-plugin</artifactId>
-	<packaging>maven-plugin</packaging>
-	<name>maven-cayenne-modeler-plugin: Cayenne Modeler Maven Plugin</name>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.maven</groupId>
-			<artifactId>maven-plugin-api</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.maven</groupId>
-			<artifactId>maven-artifact</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.maven</groupId>
-			<artifactId>maven-project</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.maven.plugin-tools</groupId>
-			<artifactId>maven-plugin-tools-api</artifactId>
-		</dependency>
-
-        <dependency>
-			<groupId>org.apache.cayenne.modeler</groupId>
-			<artifactId>cayenne-modeler</artifactId>
-			<version>${project.version}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>foundrylogic.vpp</groupId>
-					<artifactId>vpp</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-
-        <dependency>
-			<groupId>org.apache.cayenne</groupId>
-			<artifactId>cayenne-server</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-
-	</dependencies>
-
-    <build>
-        <plugins>
-			<plugin>
-				<artifactId>maven-plugin-plugin</artifactId>
-				<configuration>
-					<goalPrefix>cayenne-modeler</goalPrefix>
-				</configuration>
-			</plugin>
-        </plugins>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>code-quality</id>
-
-            <activation>
-                <property>
-                    <name>!fast-and-dirty</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-checkstyle-plugin</artifactId>
-                        <!--<configuration>
-                            <suppressionsLocation>${project.basedir}/cayenne-checkstyle-suppression.xml</suppressionsLocation>
-                        </configuration>-->
-                    </plugin>
-                    <plugin>
-                        <artifactId>maven-pmd-plugin</artifactId>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-</project>
-

http://git-wip-us.apache.org/repos/asf/cayenne/blob/a0cd93d6/plugins/maven-cayenne-modeler-plugin/src/main/java/org/apache/cayenne/tools/CayenneModelerMojo.java
----------------------------------------------------------------------
diff --git a/plugins/maven-cayenne-modeler-plugin/src/main/java/org/apache/cayenne/tools/CayenneModelerMojo.java b/plugins/maven-cayenne-modeler-plugin/src/main/java/org/apache/cayenne/tools/CayenneModelerMojo.java
deleted file mode 100644
index 75e08b8..0000000
--- a/plugins/maven-cayenne-modeler-plugin/src/main/java/org/apache/cayenne/tools/CayenneModelerMojo.java
+++ /dev/null
@@ -1,85 +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.io.File;
-
-import org.apache.cayenne.modeler.Main;
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.project.MavenProject;
-
-/**
- * Maven mojo to start up the Cayenne modeler from the command-line.
- * 
- * @since 3.0
- * 
- * @prefix cayenne-modeler
- * @goal run
- */
-public class CayenneModelerMojo extends AbstractMojo {
-
-	/**
-	 * Name of the model file to open.
-	 * 
-	 * @parameter expression="${modeler.modelFile}
-	 */
-	private File modelFile;
-
-	/**
-	 * Project instance.
-	 * 
-	 * @parameter default-value="${project}"
-	 * @required
-	 * @readonly
-	 */
-	private MavenProject project;
-
-	private File lookupModelFile() {
-		if (modelFile != null && modelFile.isFile()) {
-			return modelFile;
-		}
-
-		return null;
-	}
-
-	public void execute() throws MojoExecutionException, MojoFailureException {
-		// setup the system property to tell the modeler where to generate the
-		// java source files.
-		System.setProperty("cayenne.cgen.destdir", project.getBuild()
-				.getSourceDirectory());
-
-		// start the modeler with the provided model file, if it exists.
-		File f = lookupModelFile();
-		if (f != null && f.exists() && !f.isDirectory()) {
-			Main.main(new String[] { f.getAbsolutePath() });
-		} else {
-			Main.main(new String[] {});
-		}
-
-		// Block until the modeler finishes executing.
-		try {
-			Thread.currentThread().join();
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/a0cd93d6/plugins/maven-cayenne-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/maven-cayenne-plugin/pom.xml b/plugins/maven-cayenne-plugin/pom.xml
deleted file mode 100644
index cfd365c..0000000
--- a/plugins/maven-cayenne-plugin/pom.xml
+++ /dev/null
@@ -1,144 +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-plugins-parent</artifactId>
-        <groupId>org.apache.cayenne.plugins</groupId>
-        <version>4.0.M5-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-all</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/a0cd93d6/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/CayenneGeneratorOldMojo.java
----------------------------------------------------------------------
diff --git a/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/CayenneGeneratorOldMojo.java b/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/CayenneGeneratorOldMojo.java
deleted file mode 100644
index 38e30ec..0000000
--- a/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/a0cd93d6/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbGeneratorOldMojo.java
----------------------------------------------------------------------
diff --git a/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbGeneratorOldMojo.java b/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbGeneratorOldMojo.java
deleted file mode 100644
index d296969..0000000
--- a/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/a0cd93d6/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbImporterOldMojo.java
----------------------------------------------------------------------
diff --git a/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbImporterOldMojo.java b/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbImporterOldMojo.java
deleted file mode 100644
index 0bded58..0000000
--- a/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/a0cd93d6/plugins/maven-cayenne-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml
----------------------------------------------------------------------
diff --git a/plugins/maven-cayenne-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml b/plugins/maven-cayenne-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml
deleted file mode 100644
index e5de2d0..0000000
--- a/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/a0cd93d6/plugins/maven-cayenne-plugin/src/test/java/org/apache/cayenne/tools/CayenneGeneratorOldMojoTest.java
----------------------------------------------------------------------
diff --git a/plugins/maven-cayenne-plugin/src/test/java/org/apache/cayenne/tools/CayenneGeneratorOldMojoTest.java b/plugins/maven-cayenne-plugin/src/test/java/org/apache/cayenne/tools/CayenneGeneratorOldMojoTest.java
deleted file mode 100644
index e91bc49..0000000
--- a/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/a0cd93d6/plugins/maven-cayenne-plugin/src/test/java/org/apache/cayenne/tools/DbImporterOldMojoConfigurationTest.java
----------------------------------------------------------------------
diff --git a/plugins/maven-cayenne-plugin/src/test/java/org/apache/cayenne/tools/DbImporterOldMojoConfigurationTest.java b/plugins/maven-cayenne-plugin/src/test/java/org/apache/cayenne/tools/DbImporterOldMojoConfigurationTest.java
deleted file mode 100644
index a14a6b3..0000000
--- a/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.apache.commons.logging.Log;
-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(Log.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(Log.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/a0cd93d6/plugins/maven-cayenne-plugin/src/test/resources/cdbimport/pom-01.xml
----------------------------------------------------------------------
diff --git a/plugins/maven-cayenne-plugin/src/test/resources/cdbimport/pom-01.xml b/plugins/maven-cayenne-plugin/src/test/resources/cdbimport/pom-01.xml
deleted file mode 100644
index a4a6955..0000000
--- a/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/a0cd93d6/plugins/maven-cayenne-plugin/src/test/resources/cdbimport/pom-catalog-and-schema.xml
----------------------------------------------------------------------
diff --git a/plugins/maven-cayenne-plugin/src/test/resources/cdbimport/pom-catalog-and-schema.xml b/plugins/maven-cayenne-plugin/src/test/resources/cdbimport/pom-catalog-and-schema.xml
deleted file mode 100644
index d3828ce..0000000
--- a/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/a0cd93d6/plugins/maven-cayenne-plugin/src/test/resources/cdbimport/pom-catalog.xml
----------------------------------------------------------------------
diff --git a/plugins/maven-cayenne-plugin/src/test/resources/cdbimport/pom-catalog.xml b/plugins/maven-cayenne-plugin/src/test/resources/cdbimport/pom-catalog.xml
deleted file mode 100644
index 9c919e8..0000000
--- a/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/a0cd93d6/plugins/maven-cayenne-plugin/src/test/resources/cdbimport/pom-default-package.xml
----------------------------------------------------------------------
diff --git a/plugins/maven-cayenne-plugin/src/test/resources/cdbimport/pom-default-package.xml b/plugins/maven-cayenne-plugin/src/test/resources/cdbimport/pom-default-package.xml
deleted file mode 100644
index 7f09b88..0000000
--- a/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/a0cd93d6/plugins/maven-cayenne-plugin/src/test/resources/cdbimport/pom-flat.xml
----------------------------------------------------------------------
diff --git a/plugins/maven-cayenne-plugin/src/test/resources/cdbimport/pom-flat.xml b/plugins/maven-cayenne-plugin/src/test/resources/cdbimport/pom-flat.xml
deleted file mode 100644
index 6987454..0000000
--- a/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/a0cd93d6/plugins/maven-cayenne-plugin/src/test/resources/cdbimport/pom-mapping.xml
----------------------------------------------------------------------
diff --git a/plugins/maven-cayenne-plugin/src/test/resources/cdbimport/pom-mapping.xml b/plugins/maven-cayenne-plugin/src/test/resources/cdbimport/pom-mapping.xml
deleted file mode 100644
index 10c99da..0000000
--- a/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/a0cd93d6/plugins/maven-cayenne-plugin/src/test/resources/cdbimport/pom-schema-2.xml
----------------------------------------------------------------------
diff --git a/plugins/maven-cayenne-plugin/src/test/resources/cdbimport/pom-schema-2.xml b/plugins/maven-cayenne-plugin/src/test/resources/cdbimport/pom-schema-2.xml
deleted file mode 100644
index 05342fd..0000000
--- a/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/a0cd93d6/plugins/maven-cayenne-plugin/src/test/resources/cdbimport/pom-schema.xml
----------------------------------------------------------------------
diff --git a/plugins/maven-cayenne-plugin/src/test/resources/cdbimport/pom-schema.xml b/plugins/maven-cayenne-plugin/src/test/resources/cdbimport/pom-schema.xml
deleted file mode 100644
index 11804fc..0000000
--- a/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>