cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject [35/50] [abbrv] cayenne git commit: Refactor Relationships Project
Date Fri, 14 Nov 2014 17:47:36 GMT
Refactor Relationships Project


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

Branch: refs/heads/CAY-1946
Commit: d7178a8b45629cec8a360374e7ba04b2c03e9e81
Parents: 0b6a424
Author: Savva Kolbechev <s.kolbachev@gmail.com>
Authored: Mon Nov 10 17:39:00 2014 +0300
Committer: Savva Kolbechev <s.kolbachev@gmail.com>
Committed: Mon Nov 10 17:39:00 2014 +0300

----------------------------------------------------------------------
 .../cayenne/CDOCollectionRelationshipIT.java    |   6 +-
 .../org/apache/cayenne/CDOOneToManyFKIT.java    |  13 +-
 .../org/apache/cayenne/CDOOneToOneFKIT.java     |  10 +-
 .../apache/cayenne/CDOSetRelationshipIT.java    |   6 +-
 .../cayenne/FlattenedRelationshipsIT.java       |  10 +-
 .../org/apache/cayenne/ManyToManyNoJoinIT.java  |   6 +-
 .../java/org/apache/cayenne/MeaningfulFKIT.java |   4 +-
 ...ataContextEJBQLFlattenedRelationshipsIT.java |   4 +-
 .../apache/cayenne/access/DeleteRulesIT.java    |  12 +-
 .../cayenne/access/FlattenedArcKeyIT.java       |   6 +-
 .../FlattenedRelationshipInContextIT.java       |   4 +-
 .../NestedDataContextParentPeerEventsIT.java    |   6 +-
 .../cayenne/ashwood/AshwoodEntitySorterIT.java  |   2 +-
 .../org/apache/cayenne/testdo/r1/Activity.java  |  25 --
 .../cayenne/testdo/r1/ActivityResult.java       |  25 --
 .../cayenne/testdo/r1/Relationships1.java       |  36 ---
 .../cayenne/testdo/r1/auto/_Activity.java       |  58 ----
 .../cayenne/testdo/r1/auto/_ActivityResult.java |  53 ----
 .../cayenne/testdo/r1/auto/_Relationships1.java |  12 -
 .../cayenne/testdo/relationship/Child.java      |  25 --
 .../cayenne/testdo/relationship/ClobDetail.java |  28 --
 .../cayenne/testdo/relationship/ClobMaster.java |  28 --
 .../testdo/relationship/CollectionToMany.java   |  28 --
 .../relationship/CollectionToManyTarget.java    |  28 --
 .../testdo/relationship/CyclicChild.java        |  26 --
 .../testdo/relationship/CyclicParent.java       |  26 --
 .../testdo/relationship/DeleteRuleFlatA.java    |  28 --
 .../testdo/relationship/DeleteRuleFlatB.java    |  28 --
 .../testdo/relationship/DeleteRuleTest1.java    |  26 --
 .../testdo/relationship/DeleteRuleTest2.java    |  26 --
 .../testdo/relationship/DeleteRuleTest3.java    |  26 --
 .../testdo/relationship/FkOfDifferentType.java  |  28 --
 .../testdo/relationship/FlattenedCircular.java  |  25 --
 .../testdo/relationship/FlattenedTest1.java     |  26 --
 .../testdo/relationship/FlattenedTest2.java     |  26 --
 .../testdo/relationship/FlattenedTest3.java     |  26 --
 .../testdo/relationship/FlattenedTest4.java     |  25 --
 .../cayenne/testdo/relationship/Master.java     |  25 --
 .../testdo/relationship/MeaningfulFK.java       |  28 --
 .../testdo/relationship/ReflexiveAndToOne.java  |  26 --
 .../testdo/relationship/RelationshipHelper.java |  26 --
 .../testdo/relationship/Relationships.java      |  36 ---
 .../cayenne/testdo/relationship/SetToMany.java  |  28 --
 .../testdo/relationship/SetToManyTarget.java    |  28 --
 .../testdo/relationship/ToManyFkDep.java        |  28 --
 .../testdo/relationship/ToManyFkRoot.java       |  28 --
 .../testdo/relationship/ToManyRoot2.java        |  28 --
 .../cayenne/testdo/relationship/ToOneFK1.java   |  26 --
 .../cayenne/testdo/relationship/ToOneFK2.java   |  26 --
 .../testdo/relationship/auto/_Child.java        |  27 --
 .../testdo/relationship/auto/_ClobDetail.java   |  35 --
 .../testdo/relationship/auto/_ClobMaster.java   |  48 ---
 .../relationship/auto/_CollectionToMany.java    |  32 --
 .../auto/_CollectionToManyTarget.java           |  27 --
 .../testdo/relationship/auto/_CyclicChild.java  |  50 ---
 .../testdo/relationship/auto/_CyclicParent.java |  50 ---
 .../relationship/auto/_DeleteRuleFlatA.java     |  32 --
 .../relationship/auto/_DeleteRuleFlatB.java     |  32 --
 .../relationship/auto/_DeleteRuleTest1.java     |  27 --
 .../relationship/auto/_DeleteRuleTest2.java     |  46 ---
 .../relationship/auto/_DeleteRuleTest3.java     |  27 --
 .../relationship/auto/_FkOfDifferentType.java   |  27 --
 .../relationship/auto/_FlattenedCircular.java   |  45 ---
 .../relationship/auto/_FlattenedTest1.java      |  69 ----
 .../relationship/auto/_FlattenedTest2.java      |  51 ---
 .../relationship/auto/_FlattenedTest3.java      |  59 ----
 .../relationship/auto/_FlattenedTest4.java      |  35 --
 .../testdo/relationship/auto/_Master.java       |  40 ---
 .../testdo/relationship/auto/_MeaningfulFK.java |  35 --
 .../relationship/auto/_ReflexiveAndToOne.java   |  61 ----
 .../relationship/auto/_RelationshipHelper.java  |  68 ----
 .../relationship/auto/_Relationships.java       |  12 -
 .../testdo/relationship/auto/_SetToMany.java    |  32 --
 .../relationship/auto/_SetToManyTarget.java     |  27 --
 .../testdo/relationship/auto/_ToManyFkDep.java  |  55 ----
 .../testdo/relationship/auto/_ToManyFkRoot.java |  48 ---
 .../testdo/relationship/auto/_ToManyRoot2.java  |  40 ---
 .../testdo/relationship/auto/_ToOneFK1.java     |  27 --
 .../testdo/relationship/auto/_ToOneFK2.java     |  27 --
 .../testdo/relationships/FkOfDifferentType.java |  28 ++
 .../testdo/relationships/MeaningfulFK.java      |  28 ++
 .../testdo/relationships/ReflexiveAndToOne.java |  26 ++
 .../relationships/RelationshipHelper.java       |  26 ++
 .../testdo/relationships/Relationships.java     |  36 +++
 .../relationships/auto/_FkOfDifferentType.java  |  27 ++
 .../relationships/auto/_MeaningfulFK.java       |  35 ++
 .../relationships/auto/_ReflexiveAndToOne.java  |  61 ++++
 .../relationships/auto/_RelationshipHelper.java |  68 ++++
 .../relationships/auto/_Relationships.java      |  12 +
 .../testdo/relationships_activity/Activity.java |  25 ++
 .../relationships_activity/ActivityResult.java  |  25 ++
 .../relationships_activity/Relationships1.java  |  36 +++
 .../relationships_activity/auto/_Activity.java  |  58 ++++
 .../auto/_ActivityResult.java                   |  53 ++++
 .../auto/_Relationships1.java                   |  12 +
 .../relationships_child_master/Child.java       |  25 ++
 .../relationships_child_master/Master.java      |  25 ++
 .../relationships_child_master/auto/_Child.java |  27 ++
 .../auto/_Master.java                           |  40 +++
 .../testdo/relationships_clob/ClobDetail.java   |  28 ++
 .../testdo/relationships_clob/ClobMaster.java   |  28 ++
 .../relationships_clob/auto/_ClobDetail.java    |  35 ++
 .../relationships_clob/auto/_ClobMaster.java    |  48 +++
 .../CollectionToMany.java                       |  28 ++
 .../CollectionToManyTarget.java                 |  28 ++
 .../auto/_CollectionToMany.java                 |  32 ++
 .../auto/_CollectionToManyTarget.java           |  27 ++
 .../DeleteRuleFlatA.java                        |  28 ++
 .../DeleteRuleFlatB.java                        |  28 ++
 .../DeleteRuleTest1.java                        |  28 ++
 .../DeleteRuleTest2.java                        |  28 ++
 .../DeleteRuleTest3.java                        |  28 ++
 .../auto/_DeleteRuleFlatA.java                  |  32 ++
 .../auto/_DeleteRuleFlatB.java                  |  32 ++
 .../auto/_DeleteRuleTest1.java                  |  27 ++
 .../auto/_DeleteRuleTest2.java                  |  46 +++
 .../auto/_DeleteRuleTest3.java                  |  27 ++
 .../FlattenedCircular.java                      |  25 ++
 .../relationships_flattened/FlattenedTest1.java |  28 ++
 .../relationships_flattened/FlattenedTest2.java |  28 ++
 .../relationships_flattened/FlattenedTest3.java |  28 ++
 .../relationships_flattened/FlattenedTest4.java |  25 ++
 .../auto/_FlattenedCircular.java                |  45 +++
 .../auto/_FlattenedTest1.java                   |  69 ++++
 .../auto/_FlattenedTest2.java                   |  51 +++
 .../auto/_FlattenedTest3.java                   |  59 ++++
 .../auto/_FlattenedTest4.java                   |  35 ++
 .../relationships_set_to_many/SetToMany.java    |  28 ++
 .../SetToManyTarget.java                        |  28 ++
 .../auto/_SetToMany.java                        |  32 ++
 .../auto/_SetToManyTarget.java                  |  27 ++
 .../relationships_to_many_fk/ToManyFkDep.java   |  28 ++
 .../relationships_to_many_fk/ToManyFkRoot.java  |  28 ++
 .../relationships_to_many_fk/ToManyRoot2.java   |  28 ++
 .../auto/_ToManyFkDep.java                      |  55 ++++
 .../auto/_ToManyFkRoot.java                     |  48 +++
 .../auto/_ToManyRoot2.java                      |  40 +++
 .../relationships_to_one_fk/ToOneFK1.java       |  28 ++
 .../relationships_to_one_fk/ToOneFK2.java       |  28 ++
 .../relationships_to_one_fk/auto/_ToOneFK1.java |  27 ++
 .../relationships_to_one_fk/auto/_ToOneFK2.java |  27 ++
 .../cayenne/unit/di/server/SchemaBuilder.java   |   6 +-
 .../cayenne/unit/di/server/ServerCase.java      |   9 +
 .../org/apache/cayenne/unit/jira/CAY_115IT.java |   4 +-
 .../org/apache/cayenne/unit/jira/CAY_191IT.java |   2 +-
 .../org/apache/cayenne/unit/jira/CAY_194IT.java |   3 +-
 .../cayenne-relationships-activity.xml          |   4 +
 .../cayenne-relationships-child-master.xml      |   4 +
 .../resources/cayenne-relationships-clob.xml    |   4 +
 ...cayenne-relationships-collection-to-many.xml |   4 +
 .../cayenne-relationships-delete-rules.xml      |   4 +
 .../cayenne-relationships-flattened.xml         |   4 +
 .../cayenne-relationships-set-to-many.xml       |   4 +
 .../cayenne-relationships-to-many-fk.xml        |   4 +
 .../cayenne-relationships-to-one-fk.xml         |   4 +
 .../test/resources/cayenne-relationships.xml    |   1 -
 .../resources/relationships-activity.map.xml    |  35 ++
 .../relationships-child-master.map.xml          |  29 ++
 .../test/resources/relationships-clob.map.xml   |  32 ++
 .../relationships-collection-to-many.map.xml    |  26 ++
 .../relationships-delete-rules.map.xml          |  71 +++++
 .../resources/relationships-flattened.map.xml   | 107 +++++++
 .../resources/relationships-set-to-many.map.xml |  26 ++
 .../resources/relationships-to-many-fk.map.xml  |  48 +++
 .../resources/relationships-to-one-fk.map.xml   |  26 ++
 .../src/test/resources/relationships.map.xml    | 318 +------------------
 .../src/test/resources/relationships1.map.xml   |  35 --
 167 files changed, 2579 insertions(+), 2612 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/CDOCollectionRelationshipIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/CDOCollectionRelationshipIT.java b/cayenne-server/src/test/java/org/apache/cayenne/CDOCollectionRelationshipIT.java
index 8983e01..cdb5ff9 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/CDOCollectionRelationshipIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/CDOCollectionRelationshipIT.java
@@ -24,8 +24,8 @@ import org.apache.cayenne.query.RefreshQuery;
 import org.apache.cayenne.query.SelectQuery;
 import org.apache.cayenne.test.jdbc.DBHelper;
 import org.apache.cayenne.test.jdbc.TableHelper;
-import org.apache.cayenne.testdo.relationship.CollectionToMany;
-import org.apache.cayenne.testdo.relationship.CollectionToManyTarget;
+import org.apache.cayenne.testdo.relationships_collection_to_many.CollectionToMany;
+import org.apache.cayenne.testdo.relationships_collection_to_many.CollectionToManyTarget;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
 import org.junit.Test;
@@ -39,7 +39,7 @@ import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
-@UseServerRuntime(ServerCase.RELATIONSHIPS_PROJECT)
+@UseServerRuntime(ServerCase.RELATIONSHIPS_COLLECTION_TO_MANY_PROJECT)
 public class CDOCollectionRelationshipIT extends ServerCase {
 
     @Inject

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/CDOOneToManyFKIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/CDOOneToManyFKIT.java b/cayenne-server/src/test/java/org/apache/cayenne/CDOOneToManyFKIT.java
index a3270bf..6d85e10 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/CDOOneToManyFKIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/CDOOneToManyFKIT.java
@@ -22,9 +22,9 @@ package org.apache.cayenne;
 import org.apache.cayenne.access.DataContext;
 import org.apache.cayenne.di.Inject;
 import org.apache.cayenne.test.jdbc.DBHelper;
-import org.apache.cayenne.testdo.relationship.ToManyFkDep;
-import org.apache.cayenne.testdo.relationship.ToManyFkRoot;
-import org.apache.cayenne.testdo.relationship.ToManyRoot2;
+import org.apache.cayenne.testdo.relationships_to_many_fk.ToManyFkDep;
+import org.apache.cayenne.testdo.relationships_to_many_fk.ToManyFkRoot;
+import org.apache.cayenne.testdo.relationships_to_many_fk.ToManyRoot2;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
 import org.junit.Test;
@@ -35,7 +35,7 @@ import static org.junit.Assert.assertSame;
 
 // TODO: this mapping scenario is really unsupported ... this is just an attempt at
 // partial solution
-@UseServerRuntime(ServerCase.RELATIONSHIPS_PROJECT)
+@UseServerRuntime(ServerCase.RELATIONSHIPS_TO_MANY_FK_PROJECT)
 public class CDOOneToManyFKIT extends ServerCase {
 
     @Inject
@@ -46,8 +46,9 @@ public class CDOOneToManyFKIT extends ServerCase {
 
     @Override
     protected void setUpAfterInjection() throws Exception {
-        dbHelper.deleteAll("TO_ONEFK2");
-        dbHelper.deleteAll("TO_ONEFK1");
+        dbHelper.deleteAll("TO_MANY_FKDEP");
+        dbHelper.deleteAll("TO_MANY_FKROOT");
+        dbHelper.deleteAll("TO_MANY_ROOT2");
     }
 
     @Test

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/CDOOneToOneFKIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/CDOOneToOneFKIT.java b/cayenne-server/src/test/java/org/apache/cayenne/CDOOneToOneFKIT.java
index ff61bab..371b523 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/CDOOneToOneFKIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/CDOOneToOneFKIT.java
@@ -23,8 +23,8 @@ import org.apache.cayenne.access.DataContext;
 import org.apache.cayenne.di.Inject;
 import org.apache.cayenne.query.ObjectIdQuery;
 import org.apache.cayenne.test.jdbc.DBHelper;
-import org.apache.cayenne.testdo.relationship.ToOneFK1;
-import org.apache.cayenne.testdo.relationship.ToOneFK2;
+import org.apache.cayenne.testdo.relationships_to_one_fk.ToOneFK1;
+import org.apache.cayenne.testdo.relationships_to_one_fk.ToOneFK2;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
 import org.junit.Test;
@@ -38,7 +38,7 @@ import static org.junit.Assert.assertTrue;
 /**
  * Tests the behavior of one-to-one relationship where to-one is pointing to an FK.
  */
-@UseServerRuntime(ServerCase.RELATIONSHIPS_PROJECT)
+@UseServerRuntime(ServerCase.RELATIONSHIPS_TO_ONE_FK_PROJECT)
 public class CDOOneToOneFKIT extends ServerCase {
 
     @Inject
@@ -52,8 +52,8 @@ public class CDOOneToOneFKIT extends ServerCase {
 
     @Override
     protected void setUpAfterInjection() throws Exception {
-        dbHelper.deleteAll("TO_ONEFK1");
-        dbHelper.deleteAll("TO_ONEFK2");
+        dbHelper.deleteAll("TO_ONE_FK1");
+        dbHelper.deleteAll("TO_ONE_FK2");
     }
 
     @Test

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/CDOSetRelationshipIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/CDOSetRelationshipIT.java b/cayenne-server/src/test/java/org/apache/cayenne/CDOSetRelationshipIT.java
index ed688e7..97d643b 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/CDOSetRelationshipIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/CDOSetRelationshipIT.java
@@ -24,8 +24,8 @@ import org.apache.cayenne.query.RefreshQuery;
 import org.apache.cayenne.query.SelectQuery;
 import org.apache.cayenne.test.jdbc.DBHelper;
 import org.apache.cayenne.test.jdbc.TableHelper;
-import org.apache.cayenne.testdo.relationship.SetToMany;
-import org.apache.cayenne.testdo.relationship.SetToManyTarget;
+import org.apache.cayenne.testdo.relationships_set_to_many.SetToMany;
+import org.apache.cayenne.testdo.relationships_set_to_many.SetToManyTarget;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
 import org.junit.Test;
@@ -39,7 +39,7 @@ import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
-@UseServerRuntime(ServerCase.RELATIONSHIPS_PROJECT)
+@UseServerRuntime(ServerCase.RELATIONSHIPS_SET_TO_MANY_PROJECT)
 public class CDOSetRelationshipIT extends ServerCase {
 
     @Inject

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/FlattenedRelationshipsIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/FlattenedRelationshipsIT.java b/cayenne-server/src/test/java/org/apache/cayenne/FlattenedRelationshipsIT.java
index b6af41a..e285420 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/FlattenedRelationshipsIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/FlattenedRelationshipsIT.java
@@ -27,10 +27,10 @@ import org.apache.cayenne.query.SQLTemplate;
 import org.apache.cayenne.query.SelectQuery;
 import org.apache.cayenne.test.jdbc.DBHelper;
 import org.apache.cayenne.test.jdbc.TableHelper;
-import org.apache.cayenne.testdo.relationship.FlattenedCircular;
-import org.apache.cayenne.testdo.relationship.FlattenedTest1;
-import org.apache.cayenne.testdo.relationship.FlattenedTest2;
-import org.apache.cayenne.testdo.relationship.FlattenedTest3;
+import org.apache.cayenne.testdo.relationships_flattened.FlattenedCircular;
+import org.apache.cayenne.testdo.relationships_flattened.FlattenedTest1;
+import org.apache.cayenne.testdo.relationships_flattened.FlattenedTest2;
+import org.apache.cayenne.testdo.relationships_flattened.FlattenedTest3;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
 import org.junit.Test;
@@ -46,7 +46,7 @@ import static org.junit.Assert.assertTrue;
 /**
  * Test case for objects with flattened relationships.
  */
-@UseServerRuntime(ServerCase.RELATIONSHIPS_PROJECT)
+@UseServerRuntime(ServerCase.RELATIONSHIPS_FLATTENED_PROJECT)
 public class FlattenedRelationshipsIT extends ServerCase {
 
     @Inject

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/ManyToManyNoJoinIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/ManyToManyNoJoinIT.java b/cayenne-server/src/test/java/org/apache/cayenne/ManyToManyNoJoinIT.java
index 9703962..50e0c3f 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/ManyToManyNoJoinIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/ManyToManyNoJoinIT.java
@@ -20,15 +20,15 @@ package org.apache.cayenne;
 
 import org.apache.cayenne.di.Inject;
 import org.apache.cayenne.test.jdbc.DBHelper;
-import org.apache.cayenne.testdo.r1.Activity;
-import org.apache.cayenne.testdo.r1.ActivityResult;
+import org.apache.cayenne.testdo.relationships_activity.Activity;
+import org.apache.cayenne.testdo.relationships_activity.ActivityResult;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
 import org.junit.Test;
 
 import java.sql.Date;
 
-@UseServerRuntime(ServerCase.RELATIONSHIPS_PROJECT)
+@UseServerRuntime(ServerCase.RELATIONSHIPS_ACTIVITY_PROJECT)
 public class ManyToManyNoJoinIT extends ServerCase {
 
     @Inject

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/MeaningfulFKIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/MeaningfulFKIT.java b/cayenne-server/src/test/java/org/apache/cayenne/MeaningfulFKIT.java
index 2cc7ef9..4e31c2c 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/MeaningfulFKIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/MeaningfulFKIT.java
@@ -21,8 +21,8 @@ package org.apache.cayenne;
 
 import org.apache.cayenne.di.Inject;
 import org.apache.cayenne.test.jdbc.DBHelper;
-import org.apache.cayenne.testdo.relationship.MeaningfulFK;
-import org.apache.cayenne.testdo.relationship.RelationshipHelper;
+import org.apache.cayenne.testdo.relationships.MeaningfulFK;
+import org.apache.cayenne.testdo.relationships.RelationshipHelper;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
 import org.apache.cayenne.validation.ValidationResult;

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLFlattenedRelationshipsIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLFlattenedRelationshipsIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLFlattenedRelationshipsIT.java
index 7260cf1..bac7b4b 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLFlattenedRelationshipsIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLFlattenedRelationshipsIT.java
@@ -25,7 +25,7 @@ import org.apache.cayenne.di.Inject;
 import org.apache.cayenne.query.EJBQLQuery;
 import org.apache.cayenne.test.jdbc.DBHelper;
 import org.apache.cayenne.test.jdbc.TableHelper;
-import org.apache.cayenne.testdo.relationship.FlattenedTest1;
+import org.apache.cayenne.testdo.relationships_flattened.FlattenedTest1;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
 import org.junit.Test;
@@ -40,7 +40,7 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-@UseServerRuntime(ServerCase.RELATIONSHIPS_PROJECT)
+@UseServerRuntime(ServerCase.RELATIONSHIPS_FLATTENED_PROJECT)
 public class DataContextEJBQLFlattenedRelationshipsIT extends ServerCase {
 
     @Inject

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/access/DeleteRulesIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DeleteRulesIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DeleteRulesIT.java
index 3b27c80..6fbd8da 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DeleteRulesIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DeleteRulesIT.java
@@ -28,11 +28,11 @@ import org.apache.cayenne.map.DeleteRule;
 import org.apache.cayenne.map.ObjEntity;
 import org.apache.cayenne.map.ObjRelationship;
 import org.apache.cayenne.test.jdbc.DBHelper;
-import org.apache.cayenne.testdo.relationship.DeleteRuleFlatA;
-import org.apache.cayenne.testdo.relationship.DeleteRuleFlatB;
-import org.apache.cayenne.testdo.relationship.DeleteRuleTest1;
-import org.apache.cayenne.testdo.relationship.DeleteRuleTest2;
-import org.apache.cayenne.testdo.relationship.DeleteRuleTest3;
+import org.apache.cayenne.testdo.relationships_delete_rules.DeleteRuleFlatA;
+import org.apache.cayenne.testdo.relationships_delete_rules.DeleteRuleFlatB;
+import org.apache.cayenne.testdo.relationships_delete_rules.DeleteRuleTest1;
+import org.apache.cayenne.testdo.relationships_delete_rules.DeleteRuleTest2;
+import org.apache.cayenne.testdo.relationships_delete_rules.DeleteRuleTest3;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
 import org.junit.Test;
@@ -47,7 +47,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-@UseServerRuntime(ServerCase.RELATIONSHIPS_PROJECT)
+@UseServerRuntime(ServerCase.RELATIONSHIPS_DELETE_RULES_PROJECT)
 public class DeleteRulesIT extends ServerCase {
 
     @Inject

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/access/FlattenedArcKeyIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/FlattenedArcKeyIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/FlattenedArcKeyIT.java
index 9b655f2..397c8ac 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/FlattenedArcKeyIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/FlattenedArcKeyIT.java
@@ -23,8 +23,8 @@ import org.apache.cayenne.ObjectId;
 import org.apache.cayenne.di.Inject;
 import org.apache.cayenne.map.EntityResolver;
 import org.apache.cayenne.map.ObjRelationship;
-import org.apache.cayenne.testdo.relationship.FlattenedTest1;
-import org.apache.cayenne.testdo.relationship.FlattenedTest3;
+import org.apache.cayenne.testdo.relationships_flattened.FlattenedTest1;
+import org.apache.cayenne.testdo.relationships_flattened.FlattenedTest3;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
 import org.junit.Test;
@@ -33,7 +33,7 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
-@UseServerRuntime(ServerCase.RELATIONSHIPS_PROJECT)
+@UseServerRuntime(ServerCase.RELATIONSHIPS_FLATTENED_PROJECT)
 public class FlattenedArcKeyIT extends ServerCase {
 
     @Inject

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/access/FlattenedRelationshipInContextIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/FlattenedRelationshipInContextIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/FlattenedRelationshipInContextIT.java
index 9745581..9f4e7b0 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/FlattenedRelationshipInContextIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/FlattenedRelationshipInContextIT.java
@@ -27,7 +27,7 @@ import org.apache.cayenne.reflect.ArcProperty;
 import org.apache.cayenne.reflect.ClassDescriptor;
 import org.apache.cayenne.test.jdbc.DBHelper;
 import org.apache.cayenne.test.jdbc.TableHelper;
-import org.apache.cayenne.testdo.relationship.FlattenedTest3;
+import org.apache.cayenne.testdo.relationships_flattened.FlattenedTest3;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
 import org.junit.Test;
@@ -38,7 +38,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-@UseServerRuntime(ServerCase.RELATIONSHIPS_PROJECT)
+@UseServerRuntime(ServerCase.RELATIONSHIPS_FLATTENED_PROJECT)
 public class FlattenedRelationshipInContextIT extends ServerCase {
 
     @Inject

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextParentPeerEventsIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextParentPeerEventsIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextParentPeerEventsIT.java
index 9f8a866..e653f68 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextParentPeerEventsIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextParentPeerEventsIT.java
@@ -23,8 +23,8 @@ import org.apache.cayenne.ObjectContext;
 import org.apache.cayenne.configuration.server.ServerRuntime;
 import org.apache.cayenne.di.Inject;
 import org.apache.cayenne.test.parallel.ParallelTestContainer;
-import org.apache.cayenne.testdo.relationship.Child;
-import org.apache.cayenne.testdo.relationship.Master;
+import org.apache.cayenne.testdo.relationships_child_master.Child;
+import org.apache.cayenne.testdo.relationships_child_master.Master;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
 import org.junit.Test;
@@ -35,7 +35,7 @@ import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
-@UseServerRuntime(ServerCase.RELATIONSHIPS_PROJECT)
+@UseServerRuntime(ServerCase.RELATIONSHIPS_CHILD_MASTER_PROJECT)
 public class NestedDataContextParentPeerEventsIT extends ServerCase {
 
     @Inject

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/ashwood/AshwoodEntitySorterIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/ashwood/AshwoodEntitySorterIT.java b/cayenne-server/src/test/java/org/apache/cayenne/ashwood/AshwoodEntitySorterIT.java
index e7eff63..1443c4b 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/ashwood/AshwoodEntitySorterIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/ashwood/AshwoodEntitySorterIT.java
@@ -25,7 +25,7 @@ import org.apache.cayenne.map.ObjEntity;
 import org.apache.cayenne.query.SelectQuery;
 import org.apache.cayenne.test.jdbc.DBHelper;
 import org.apache.cayenne.test.jdbc.TableHelper;
-import org.apache.cayenne.testdo.relationship.ReflexiveAndToOne;
+import org.apache.cayenne.testdo.relationships.ReflexiveAndToOne;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
 import org.junit.Test;

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/r1/Activity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/r1/Activity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/r1/Activity.java
deleted file mode 100644
index 326dc8c..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/r1/Activity.java
+++ /dev/null
@@ -1,25 +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.testdo.r1;
-
-import org.apache.cayenne.testdo.r1.auto._Activity;
-
-public class Activity extends _Activity {
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/r1/ActivityResult.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/r1/ActivityResult.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/r1/ActivityResult.java
deleted file mode 100644
index 825989d..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/r1/ActivityResult.java
+++ /dev/null
@@ -1,25 +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.testdo.r1;
-
-import org.apache.cayenne.testdo.r1.auto._ActivityResult;
-
-public class ActivityResult extends _ActivityResult {
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/r1/Relationships1.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/r1/Relationships1.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/r1/Relationships1.java
deleted file mode 100644
index 1a98fc6..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/r1/Relationships1.java
+++ /dev/null
@@ -1,36 +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.testdo.r1;
-
-import org.apache.cayenne.testdo.r1.auto._Relationships1;
-
-public class Relationships1 extends _Relationships1 {
-
-    private static Relationships1 instance;
-
-    private Relationships1() {}
-
-    public static Relationships1 getInstance() {
-        if(instance == null) {
-            instance = new Relationships1();
-        }
-
-        return instance;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/r1/auto/_Activity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/r1/auto/_Activity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/r1/auto/_Activity.java
deleted file mode 100644
index 52484f4..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/r1/auto/_Activity.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.apache.cayenne.testdo.r1.auto;
-
-import java.sql.Date;
-import java.util.Map;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.exp.Property;
-import org.apache.cayenne.testdo.r1.ActivityResult;
-
-/**
- * Class _Activity was generated by Cayenne.
- * It is probably a good idea to avoid changing this class manually,
- * since it may be overwritten next time code is regenerated.
- * If you need to make any customizations, please use subclass.
- */
-public abstract class _Activity extends CayenneDataObject {
-
-    @Deprecated
-    public static final String APPOINTMENT_DATE_PROPERTY = "appointmentDate";
-    @Deprecated
-    public static final String APPOINTMENT_NO_PROPERTY = "appointmentNo";
-    @Deprecated
-    public static final String RESULTS_PROPERTY = "results";
-
-    public static final String ACTIVITY_ID_PK_COLUMN = "ACTIVITY_ID";
-
-    public static final Property<Date> APPOINTMENT_DATE = new Property<Date>("appointmentDate");
-    public static final Property<Integer> APPOINTMENT_NO = new Property<Integer>("appointmentNo");
-    public static final Property<Map<String, ActivityResult>> RESULTS = new Property<Map<String, ActivityResult>>("results");
-
-    public void setAppointmentDate(Date appointmentDate) {
-        writeProperty("appointmentDate", appointmentDate);
-    }
-    public Date getAppointmentDate() {
-        return (Date)readProperty("appointmentDate");
-    }
-
-    public void setAppointmentNo(int appointmentNo) {
-        writeProperty("appointmentNo", appointmentNo);
-    }
-    public int getAppointmentNo() {
-        Object value = readProperty("appointmentNo");
-        return (value != null) ? (Integer) value : 0;
-    }
-
-    public void addToResults(ActivityResult obj) {
-        addToManyTarget("results", obj, true);
-    }
-    public void removeFromResults(ActivityResult obj) {
-        removeToManyTarget("results", obj, true);
-    }
-    @SuppressWarnings("unchecked")
-    public Map<String, ActivityResult> getResults() {
-        return (Map<String, ActivityResult>)readProperty("results");
-    }
-
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/r1/auto/_ActivityResult.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/r1/auto/_ActivityResult.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/r1/auto/_ActivityResult.java
deleted file mode 100644
index 01c2f1b..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/r1/auto/_ActivityResult.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package org.apache.cayenne.testdo.r1.auto;
-
-import java.sql.Date;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.exp.Property;
-
-/**
- * Class _ActivityResult was generated by Cayenne.
- * It is probably a good idea to avoid changing this class manually,
- * since it may be overwritten next time code is regenerated.
- * If you need to make any customizations, please use subclass.
- */
-public abstract class _ActivityResult extends CayenneDataObject {
-
-    @Deprecated
-    public static final String APPOINT_DATE_PROPERTY = "appointDate";
-    @Deprecated
-    public static final String APPOINT_NO_PROPERTY = "appointNo";
-    @Deprecated
-    public static final String FIELD_PROPERTY = "field";
-
-    public static final String APPOINT_DATE_PK_COLUMN = "APPOINT_DATE";
-    public static final String APPOINT_NO_PK_COLUMN = "APPOINT_NO";
-    public static final String RESULTNAME_PK_COLUMN = "RESULTNAME";
-
-    public static final Property<Date> APPOINT_DATE = new Property<Date>("appointDate");
-    public static final Property<Integer> APPOINT_NO = new Property<Integer>("appointNo");
-    public static final Property<String> FIELD = new Property<String>("field");
-
-    public void setAppointDate(Date appointDate) {
-        writeProperty("appointDate", appointDate);
-    }
-    public Date getAppointDate() {
-        return (Date)readProperty("appointDate");
-    }
-
-    public void setAppointNo(int appointNo) {
-        writeProperty("appointNo", appointNo);
-    }
-    public int getAppointNo() {
-        Object value = readProperty("appointNo");
-        return (value != null) ? (Integer) value : 0;
-    }
-
-    public void setField(String field) {
-        writeProperty("field", field);
-    }
-    public String getField() {
-        return (String)readProperty("field");
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/r1/auto/_Relationships1.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/r1/auto/_Relationships1.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/r1/auto/_Relationships1.java
deleted file mode 100644
index 1a718b5..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/r1/auto/_Relationships1.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.apache.cayenne.testdo.r1.auto;
-
-
-
-/**
- * This class was generated by Cayenne.
- * It is probably a good idea to avoid changing this class manually,
- * since it may be overwritten next time code is regenerated.
- * If you need to make any customizations, please use subclass.
- */
-public class _Relationships1 {
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/Child.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/Child.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/Child.java
deleted file mode 100644
index 9212f4b..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/Child.java
+++ /dev/null
@@ -1,25 +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.testdo.relationship;
-
-import org.apache.cayenne.testdo.relationship.auto._Child;
-
-public class Child extends _Child {
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/ClobDetail.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/ClobDetail.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/ClobDetail.java
deleted file mode 100644
index 2432e67..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/ClobDetail.java
+++ /dev/null
@@ -1,28 +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.testdo.relationship;
-
-import org.apache.cayenne.testdo.relationship.auto._ClobDetail;
-
-public class ClobDetail extends _ClobDetail {
-
-}
-
-
-

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/ClobMaster.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/ClobMaster.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/ClobMaster.java
deleted file mode 100644
index 8a3ea28..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/ClobMaster.java
+++ /dev/null
@@ -1,28 +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.testdo.relationship;
-
-import org.apache.cayenne.testdo.relationship.auto._ClobMaster;
-
-public class ClobMaster extends _ClobMaster {
-
-}
-
-
-

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/CollectionToMany.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/CollectionToMany.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/CollectionToMany.java
deleted file mode 100644
index f7abc62..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/CollectionToMany.java
+++ /dev/null
@@ -1,28 +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.testdo.relationship;
-
-import org.apache.cayenne.testdo.relationship.auto._CollectionToMany;
-
-public class CollectionToMany extends _CollectionToMany {
-
-}
-
-
-

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/CollectionToManyTarget.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/CollectionToManyTarget.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/CollectionToManyTarget.java
deleted file mode 100644
index bee72d4..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/CollectionToManyTarget.java
+++ /dev/null
@@ -1,28 +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.testdo.relationship;
-
-import org.apache.cayenne.testdo.relationship.auto._CollectionToManyTarget;
-
-public class CollectionToManyTarget extends _CollectionToManyTarget {
-
-}
-
-
-

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/CyclicChild.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/CyclicChild.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/CyclicChild.java
deleted file mode 100644
index c7665e2..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/CyclicChild.java
+++ /dev/null
@@ -1,26 +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.testdo.relationship;
-
-import org.apache.cayenne.testdo.relationship.auto._CyclicChild;
-
-public class CyclicChild extends _CyclicChild {
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/CyclicParent.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/CyclicParent.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/CyclicParent.java
deleted file mode 100644
index ebe61e1..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/CyclicParent.java
+++ /dev/null
@@ -1,26 +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.testdo.relationship;
-
-import org.apache.cayenne.testdo.relationship.auto._CyclicParent;
-
-public class CyclicParent extends _CyclicParent {
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/DeleteRuleFlatA.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/DeleteRuleFlatA.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/DeleteRuleFlatA.java
deleted file mode 100644
index 3bd8bbd..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/DeleteRuleFlatA.java
+++ /dev/null
@@ -1,28 +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.testdo.relationship;
-
-import org.apache.cayenne.testdo.relationship.auto._DeleteRuleFlatA;
-
-public class DeleteRuleFlatA extends _DeleteRuleFlatA {
-
-}
-
-
-

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/DeleteRuleFlatB.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/DeleteRuleFlatB.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/DeleteRuleFlatB.java
deleted file mode 100644
index 3564b24..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/DeleteRuleFlatB.java
+++ /dev/null
@@ -1,28 +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.testdo.relationship;
-
-import org.apache.cayenne.testdo.relationship.auto._DeleteRuleFlatB;
-
-public class DeleteRuleFlatB extends _DeleteRuleFlatB {
-
-}
-
-
-

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/DeleteRuleTest1.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/DeleteRuleTest1.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/DeleteRuleTest1.java
deleted file mode 100644
index d8d8759..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/DeleteRuleTest1.java
+++ /dev/null
@@ -1,26 +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.testdo.relationship;
-
-public class DeleteRuleTest1 extends org.apache.cayenne.testdo.relationship.auto._DeleteRuleTest1 {
-
-}
-
-
-

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/DeleteRuleTest2.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/DeleteRuleTest2.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/DeleteRuleTest2.java
deleted file mode 100644
index 7f9d8f4..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/DeleteRuleTest2.java
+++ /dev/null
@@ -1,26 +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.testdo.relationship;
-
-public class DeleteRuleTest2 extends org.apache.cayenne.testdo.relationship.auto._DeleteRuleTest2 {
-
-}
-
-
-

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/DeleteRuleTest3.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/DeleteRuleTest3.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/DeleteRuleTest3.java
deleted file mode 100644
index 688e54a..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/DeleteRuleTest3.java
+++ /dev/null
@@ -1,26 +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.testdo.relationship;
-
-public class DeleteRuleTest3 extends org.apache.cayenne.testdo.relationship.auto._DeleteRuleTest3 {
-
-}
-
-
-

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/FkOfDifferentType.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/FkOfDifferentType.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/FkOfDifferentType.java
deleted file mode 100644
index 822836c..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/FkOfDifferentType.java
+++ /dev/null
@@ -1,28 +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.testdo.relationship;
-
-import org.apache.cayenne.testdo.relationship.auto._FkOfDifferentType;
-
-public class FkOfDifferentType extends _FkOfDifferentType {
-
-}
-
-
-

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/FlattenedCircular.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/FlattenedCircular.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/FlattenedCircular.java
deleted file mode 100644
index 6eab2bf..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/FlattenedCircular.java
+++ /dev/null
@@ -1,25 +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.testdo.relationship;
-
-import org.apache.cayenne.testdo.relationship.auto._FlattenedCircular;
-
-public class FlattenedCircular extends _FlattenedCircular {
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/FlattenedTest1.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/FlattenedTest1.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/FlattenedTest1.java
deleted file mode 100644
index 44c4041..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/FlattenedTest1.java
+++ /dev/null
@@ -1,26 +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.testdo.relationship;
-
-public class FlattenedTest1 extends org.apache.cayenne.testdo.relationship.auto._FlattenedTest1 {
-
-}
-
-
-

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/FlattenedTest2.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/FlattenedTest2.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/FlattenedTest2.java
deleted file mode 100644
index ddbb2e1..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/FlattenedTest2.java
+++ /dev/null
@@ -1,26 +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.testdo.relationship;
-
-public class FlattenedTest2 extends org.apache.cayenne.testdo.relationship.auto._FlattenedTest2 {
-
-}
-
-
-

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/FlattenedTest3.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/FlattenedTest3.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/FlattenedTest3.java
deleted file mode 100644
index 2216499..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/FlattenedTest3.java
+++ /dev/null
@@ -1,26 +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.testdo.relationship;
-
-public class FlattenedTest3 extends org.apache.cayenne.testdo.relationship.auto._FlattenedTest3 {
-
-}
-
-
-

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/FlattenedTest4.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/FlattenedTest4.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/FlattenedTest4.java
deleted file mode 100644
index 4cbc505..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/FlattenedTest4.java
+++ /dev/null
@@ -1,25 +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.testdo.relationship;
-
-import org.apache.cayenne.testdo.relationship.auto._FlattenedTest4;
-
-public class FlattenedTest4 extends _FlattenedTest4 {
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/Master.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/Master.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/Master.java
deleted file mode 100644
index d731261..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/Master.java
+++ /dev/null
@@ -1,25 +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.testdo.relationship;
-
-import org.apache.cayenne.testdo.relationship.auto._Master;
-
-public class Master extends _Master {
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/MeaningfulFK.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/MeaningfulFK.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/MeaningfulFK.java
deleted file mode 100644
index bce8274..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/MeaningfulFK.java
+++ /dev/null
@@ -1,28 +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.testdo.relationship;
-
-import org.apache.cayenne.testdo.relationship.auto._MeaningfulFK;
-
-public class MeaningfulFK extends _MeaningfulFK {
-
-}
-
-
-

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/ReflexiveAndToOne.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/ReflexiveAndToOne.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/ReflexiveAndToOne.java
deleted file mode 100644
index dc4a5df..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/ReflexiveAndToOne.java
+++ /dev/null
@@ -1,26 +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.testdo.relationship;
-
-public class ReflexiveAndToOne extends org.apache.cayenne.testdo.relationship.auto._ReflexiveAndToOne {
-
-}
-
-
-

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/RelationshipHelper.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/RelationshipHelper.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/RelationshipHelper.java
deleted file mode 100644
index f9d1348..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/RelationshipHelper.java
+++ /dev/null
@@ -1,26 +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.testdo.relationship;
-
-public class RelationshipHelper extends org.apache.cayenne.testdo.relationship.auto._RelationshipHelper {
-
-}
-
-
-

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/Relationships.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/Relationships.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/Relationships.java
deleted file mode 100644
index d2ee3f7..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/Relationships.java
+++ /dev/null
@@ -1,36 +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.testdo.relationship;
-
-import org.apache.cayenne.testdo.relationship.auto._Relationships;
-
-public class Relationships extends _Relationships {
-
-    private static Relationships instance;
-
-    private Relationships() {}
-
-    public static Relationships getInstance() {
-        if(instance == null) {
-            instance = new Relationships();
-        }
-
-        return instance;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/SetToMany.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/SetToMany.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/SetToMany.java
deleted file mode 100644
index fd250a8..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/SetToMany.java
+++ /dev/null
@@ -1,28 +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.testdo.relationship;
-
-import org.apache.cayenne.testdo.relationship.auto._SetToMany;
-
-public class SetToMany extends _SetToMany {
-
-}
-
-
-

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/SetToManyTarget.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/SetToManyTarget.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/SetToManyTarget.java
deleted file mode 100644
index 288a2d5..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/SetToManyTarget.java
+++ /dev/null
@@ -1,28 +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.testdo.relationship;
-
-import org.apache.cayenne.testdo.relationship.auto._SetToManyTarget;
-
-public class SetToManyTarget extends _SetToManyTarget {
-
-}
-
-
-

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/ToManyFkDep.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/ToManyFkDep.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/ToManyFkDep.java
deleted file mode 100644
index 0720945..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/ToManyFkDep.java
+++ /dev/null
@@ -1,28 +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.testdo.relationship;
-
-import org.apache.cayenne.testdo.relationship.auto._ToManyFkDep;
-
-public class ToManyFkDep extends _ToManyFkDep {
-
-}
-
-
-

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/ToManyFkRoot.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/ToManyFkRoot.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/ToManyFkRoot.java
deleted file mode 100644
index 57914d9..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/ToManyFkRoot.java
+++ /dev/null
@@ -1,28 +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.testdo.relationship;
-
-import org.apache.cayenne.testdo.relationship.auto._ToManyFkRoot;
-
-public class ToManyFkRoot extends _ToManyFkRoot {
-
-}
-
-
-


Mime
View raw message