http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/ToManyRoot2.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/ToManyRoot2.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/ToManyRoot2.java
deleted file mode 100644
index 970a25a..0000000
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/ToManyRoot2.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._ToManyRoot2;
-
-public class ToManyRoot2 extends _ToManyRoot2 {
-
-}
-
-
-

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/ToOneFK1.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/ToOneFK1.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/ToOneFK1.java
deleted file mode 100644
index f2e3324..0000000
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/ToOneFK1.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 ToOneFK1 extends 
org.apache.cayenne.testdo.relationship.auto._ToOneFK1 {
-
-}
-
-
-

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/ToOneFK2.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/ToOneFK2.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/ToOneFK2.java
deleted file mode 100644
index dc774b0..0000000
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/ToOneFK2.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 ToOneFK2 extends 
org.apache.cayenne.testdo.relationship.auto._ToOneFK2 {
-
-}
-
-
-

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_Child.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_Child.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_Child.java
deleted file mode 100644
index 77192c0..0000000
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_Child.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.apache.cayenne.testdo.relationship.auto;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.testdo.relationship.Master;
-
-/**
- * Class _Child 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 _Child extends CayenneDataObject {
-
-    public static final String MASTER_PROPERTY = "master";
-
-    public static final String ID_PK_COLUMN = "ID";
-
-    public void setMaster(Master master) {
-        setToOneTarget(MASTER_PROPERTY, master, true);
-    }
-
-    public Master getMaster() {
-        return (Master)readProperty(MASTER_PROPERTY);
-    }
-
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ClobDetail.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ClobDetail.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ClobDetail.java
deleted file mode 100644
index 5090c54..0000000
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ClobDetail.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.apache.cayenne.testdo.relationship.auto;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.testdo.relationship.ClobMaster;
-
-/**
- * Class _ClobDetail 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 _ClobDetail extends CayenneDataObject {
-
-    public static final String NAME_PROPERTY = "name";
-    public static final String MASTER_PROPERTY = "master";
-
-    public static final String CLOB_DETAIL_ID_PK_COLUMN = "CLOB_DETAIL_ID";
-
-    public void setName(String name) {
-        writeProperty(NAME_PROPERTY, name);
-    }
-    public String getName() {
-        return (String)readProperty(NAME_PROPERTY);
-    }
-
-    public void setMaster(ClobMaster master) {
-        setToOneTarget(MASTER_PROPERTY, master, true);
-    }
-
-    public ClobMaster getMaster() {
-        return (ClobMaster)readProperty(MASTER_PROPERTY);
-    }
-
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ClobMaster.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ClobMaster.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ClobMaster.java
deleted file mode 100644
index 85f1374..0000000
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ClobMaster.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.apache.cayenne.testdo.relationship.auto;
-
-import java.util.List;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.testdo.relationship.ClobDetail;
-
-/**
- * Class _ClobMaster 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 _ClobMaster extends CayenneDataObject {
-
-    public static final String CLOB_COLUMN_PROPERTY = "clobColumn";
-    public static final String NAME_PROPERTY = "name";
-    public static final String DETAILS_PROPERTY = "details";
-
-    public static final String CLOB_MASTER_ID_PK_COLUMN = "CLOB_MASTER_ID";
-
-    public void setClobColumn(String clobColumn) {
-        writeProperty(CLOB_COLUMN_PROPERTY, clobColumn);
-    }
-    public String getClobColumn() {
-        return (String)readProperty(CLOB_COLUMN_PROPERTY);
-    }
-
-    public void setName(String name) {
-        writeProperty(NAME_PROPERTY, name);
-    }
-    public String getName() {
-        return (String)readProperty(NAME_PROPERTY);
-    }
-
-    public void addToDetails(ClobDetail obj) {
-        addToManyTarget(DETAILS_PROPERTY, obj, true);
-    }
-    public void removeFromDetails(ClobDetail obj) {
-        removeToManyTarget(DETAILS_PROPERTY, obj, true);
-    }
-    @SuppressWarnings("unchecked")
-    public List<ClobDetail> getDetails() {
-        return (List<ClobDetail>)readProperty(DETAILS_PROPERTY);
-    }
-
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_CollectionToMany.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_CollectionToMany.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_CollectionToMany.java
deleted file mode 100644
index 438ec94..0000000
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_CollectionToMany.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.apache.cayenne.testdo.relationship.auto;
-
-import java.util.Collection;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.testdo.relationship.CollectionToManyTarget;
-
-/**
- * Class _CollectionToMany 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 _CollectionToMany extends CayenneDataObject {
-
-    public static final String TARGETS_PROPERTY = "targets";
-
-    public static final String ID_PK_COLUMN = "ID";
-
-    public void addToTargets(CollectionToManyTarget obj) {
-        addToManyTarget(TARGETS_PROPERTY, obj, true);
-    }
-    public void removeFromTargets(CollectionToManyTarget obj) {
-        removeToManyTarget(TARGETS_PROPERTY, obj, true);
-    }
-    @SuppressWarnings("unchecked")
-    public Collection<CollectionToManyTarget> getTargets() {
-        return 
(Collection<CollectionToManyTarget>)readProperty(TARGETS_PROPERTY);
-    }
-
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_CollectionToManyTarget.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_CollectionToManyTarget.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_CollectionToManyTarget.java
deleted file mode 100644
index 309985a..0000000
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_CollectionToManyTarget.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.apache.cayenne.testdo.relationship.auto;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.testdo.relationship.CollectionToMany;
-
-/**
- * Class _CollectionToManyTarget 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 _CollectionToManyTarget extends CayenneDataObject {
-
-    public static final String COLLECTION_TO_MANY_PROPERTY = 
"collectionToMany";
-
-    public static final String ID_PK_COLUMN = "ID";
-
-    public void setCollectionToMany(CollectionToMany collectionToMany) {
-        setToOneTarget(COLLECTION_TO_MANY_PROPERTY, collectionToMany, true);
-    }
-
-    public CollectionToMany getCollectionToMany() {
-        return (CollectionToMany)readProperty(COLLECTION_TO_MANY_PROPERTY);
-    }
-
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_CyclicChild.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_CyclicChild.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_CyclicChild.java
deleted file mode 100644
index 7504371..0000000
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_CyclicChild.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.apache.cayenne.testdo.relationship.auto;
-
-import java.util.List;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.testdo.relationship.CyclicParent;
-
-/**
- * Class _CyclicChild 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 _CyclicChild extends CayenneDataObject {
-
-    public static final String NAME_PROPERTY = "name";
-    public static final String PARENT_PROPERTY = "parent";
-    public static final String UNTITLED_REL_PROPERTY = "untitledRel";
-
-    public static final String ID_PK_COLUMN = "ID";
-
-    public void setName(String name) {
-        writeProperty("name", name);
-    }
-    public String getName() {
-        return (String)readProperty("name");
-    }
-
-    public void setParent(CyclicParent parent) {
-        setToOneTarget("parent", parent, true);
-    }
-
-    public CyclicParent getParent() {
-        return (CyclicParent)readProperty("parent");
-    }
-
-
-    public void addToUntitledRel(CyclicParent obj) {
-        addToManyTarget("untitledRel", obj, true);
-    }
-    public void removeFromUntitledRel(CyclicParent obj) {
-        removeToManyTarget("untitledRel", obj, true);
-    }
-    @SuppressWarnings("unchecked")
-    public List<CyclicParent> getUntitledRel() {
-        return (List<CyclicParent>)readProperty("untitledRel");
-    }
-
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_CyclicParent.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_CyclicParent.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_CyclicParent.java
deleted file mode 100644
index bb14f37..0000000
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_CyclicParent.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.apache.cayenne.testdo.relationship.auto;
-
-import java.util.List;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.testdo.relationship.CyclicChild;
-
-/**
- * Class _CyclicParent 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 _CyclicParent extends CayenneDataObject {
-
-    public static final String NAME_PROPERTY = "name";
-    public static final String CHILDREN_PROPERTY = "children";
-    public static final String DEFAULT_CHILD_PROPERTY = "defaultChild";
-
-    public static final String ID_PK_COLUMN = "ID";
-
-    public void setName(String name) {
-        writeProperty("name", name);
-    }
-    public String getName() {
-        return (String)readProperty("name");
-    }
-
-    public void addToChildren(CyclicChild obj) {
-        addToManyTarget("children", obj, true);
-    }
-    public void removeFromChildren(CyclicChild obj) {
-        removeToManyTarget("children", obj, true);
-    }
-    @SuppressWarnings("unchecked")
-    public List<CyclicChild> getChildren() {
-        return (List<CyclicChild>)readProperty("children");
-    }
-
-
-    public void setDefaultChild(CyclicChild defaultChild) {
-        setToOneTarget("defaultChild", defaultChild, true);
-    }
-
-    public CyclicChild getDefaultChild() {
-        return (CyclicChild)readProperty("defaultChild");
-    }
-
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_DeleteRuleFlatA.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_DeleteRuleFlatA.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_DeleteRuleFlatA.java
deleted file mode 100644
index 0223b44..0000000
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_DeleteRuleFlatA.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.apache.cayenne.testdo.relationship.auto;
-
-import java.util.List;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.testdo.relationship.DeleteRuleFlatB;
-
-/**
- * Class _DeleteRuleFlatA 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 _DeleteRuleFlatA extends CayenneDataObject {
-
-    public static final String FLAT_B_PROPERTY = "flatB";
-
-    public static final String FLATA_ID_PK_COLUMN = "FLATA_ID";
-
-    public void addToFlatB(DeleteRuleFlatB obj) {
-        addToManyTarget(FLAT_B_PROPERTY, obj, true);
-    }
-    public void removeFromFlatB(DeleteRuleFlatB obj) {
-        removeToManyTarget(FLAT_B_PROPERTY, obj, true);
-    }
-    @SuppressWarnings("unchecked")
-    public List<DeleteRuleFlatB> getFlatB() {
-        return (List<DeleteRuleFlatB>)readProperty(FLAT_B_PROPERTY);
-    }
-
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_DeleteRuleFlatB.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_DeleteRuleFlatB.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_DeleteRuleFlatB.java
deleted file mode 100644
index 65706d2..0000000
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_DeleteRuleFlatB.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.apache.cayenne.testdo.relationship.auto;
-
-import java.util.List;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.testdo.relationship.DeleteRuleFlatA;
-
-/**
- * Class _DeleteRuleFlatB 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 _DeleteRuleFlatB extends CayenneDataObject {
-
-    public static final String UNTITLED_REL_PROPERTY = "untitledRel";
-
-    public static final String FLATB_ID_PK_COLUMN = "FLATB_ID";
-
-    public void addToUntitledRel(DeleteRuleFlatA obj) {
-        addToManyTarget(UNTITLED_REL_PROPERTY, obj, true);
-    }
-    public void removeFromUntitledRel(DeleteRuleFlatA obj) {
-        removeToManyTarget(UNTITLED_REL_PROPERTY, obj, true);
-    }
-    @SuppressWarnings("unchecked")
-    public List<DeleteRuleFlatA> getUntitledRel() {
-        return (List<DeleteRuleFlatA>)readProperty(UNTITLED_REL_PROPERTY);
-    }
-
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_DeleteRuleTest1.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_DeleteRuleTest1.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_DeleteRuleTest1.java
deleted file mode 100644
index ad05119..0000000
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_DeleteRuleTest1.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.apache.cayenne.testdo.relationship.auto;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.testdo.relationship.DeleteRuleTest2;
-
-/**
- * Class _DeleteRuleTest1 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 _DeleteRuleTest1 extends CayenneDataObject {
-
-    public static final String TEST2_PROPERTY = "test2";
-
-    public static final String DEL_RULE_TEST1_ID_PK_COLUMN = 
"DEL_RULE_TEST1_ID";
-
-    public void setTest2(DeleteRuleTest2 test2) {
-        setToOneTarget(TEST2_PROPERTY, test2, true);
-    }
-
-    public DeleteRuleTest2 getTest2() {
-        return (DeleteRuleTest2)readProperty(TEST2_PROPERTY);
-    }
-
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_DeleteRuleTest2.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_DeleteRuleTest2.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_DeleteRuleTest2.java
deleted file mode 100644
index 1114cef..0000000
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_DeleteRuleTest2.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.apache.cayenne.testdo.relationship.auto;
-
-import java.util.List;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.testdo.relationship.DeleteRuleTest1;
-import org.apache.cayenne.testdo.relationship.DeleteRuleTest3;
-
-/**
- * Class _DeleteRuleTest2 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 _DeleteRuleTest2 extends CayenneDataObject {
-
-    public static final String DELETE_RULE_TEST3ARRAY_PROPERTY = 
"deleteRuleTest3Array";
-    public static final String TEST1ARRAY_PROPERTY = "test1Array";
-
-    public static final String DEL_RULE_TEST2_ID_PK_COLUMN = 
"DEL_RULE_TEST2_ID";
-
-    public void addToDeleteRuleTest3Array(DeleteRuleTest3 obj) {
-        addToManyTarget(DELETE_RULE_TEST3ARRAY_PROPERTY, obj, true);
-    }
-    public void removeFromDeleteRuleTest3Array(DeleteRuleTest3 obj) {
-        removeToManyTarget(DELETE_RULE_TEST3ARRAY_PROPERTY, obj, true);
-    }
-    @SuppressWarnings("unchecked")
-    public List<DeleteRuleTest3> getDeleteRuleTest3Array() {
-        return 
(List<DeleteRuleTest3>)readProperty(DELETE_RULE_TEST3ARRAY_PROPERTY);
-    }
-
-
-    public void addToTest1Array(DeleteRuleTest1 obj) {
-        addToManyTarget(TEST1ARRAY_PROPERTY, obj, true);
-    }
-    public void removeFromTest1Array(DeleteRuleTest1 obj) {
-        removeToManyTarget(TEST1ARRAY_PROPERTY, obj, true);
-    }
-    @SuppressWarnings("unchecked")
-    public List<DeleteRuleTest1> getTest1Array() {
-        return (List<DeleteRuleTest1>)readProperty(TEST1ARRAY_PROPERTY);
-    }
-
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_DeleteRuleTest3.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_DeleteRuleTest3.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_DeleteRuleTest3.java
deleted file mode 100644
index 7f04e9b..0000000
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_DeleteRuleTest3.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.apache.cayenne.testdo.relationship.auto;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.testdo.relationship.DeleteRuleTest2;
-
-/**
- * Class _DeleteRuleTest3 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 _DeleteRuleTest3 extends CayenneDataObject {
-
-    public static final String TO_DELETE_RULE_TEST2_PROPERTY = 
"toDeleteRuleTest2";
-
-    public static final String DELETE_RULE_TEST_3_ID_PK_COLUMN = 
"DELETE_RULE_TEST_3_ID";
-
-    public void setToDeleteRuleTest2(DeleteRuleTest2 toDeleteRuleTest2) {
-        setToOneTarget(TO_DELETE_RULE_TEST2_PROPERTY, toDeleteRuleTest2, true);
-    }
-
-    public DeleteRuleTest2 getToDeleteRuleTest2() {
-        return (DeleteRuleTest2)readProperty(TO_DELETE_RULE_TEST2_PROPERTY);
-    }
-
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_FkOfDifferentType.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_FkOfDifferentType.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_FkOfDifferentType.java
deleted file mode 100644
index eb0c95f..0000000
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_FkOfDifferentType.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.apache.cayenne.testdo.relationship.auto;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.testdo.relationship.RelationshipHelper;
-
-/**
- * Class _FkOfDifferentType 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 _FkOfDifferentType extends CayenneDataObject {
-
-    public static final String RELATIONSHIP_HELPER_PROPERTY = 
"relationshipHelper";
-
-    public static final String ID_PK_COLUMN = "ID";
-
-    public void setRelationshipHelper(RelationshipHelper relationshipHelper) {
-        setToOneTarget(RELATIONSHIP_HELPER_PROPERTY, relationshipHelper, true);
-    }
-
-    public RelationshipHelper getRelationshipHelper() {
-        return (RelationshipHelper)readProperty(RELATIONSHIP_HELPER_PROPERTY);
-    }
-
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_FlattenedCircular.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_FlattenedCircular.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_FlattenedCircular.java
deleted file mode 100644
index f9f913c..0000000
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_FlattenedCircular.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.apache.cayenne.testdo.relationship.auto;
-
-import java.util.List;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.testdo.relationship.FlattenedCircular;
-
-/**
- * Class _FlattenedCircular 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 _FlattenedCircular extends CayenneDataObject {
-
-    public static final String SIDE1S_PROPERTY = "side1s";
-    public static final String SIDE2S_PROPERTY = "side2s";
-
-    public static final String ID_PK_COLUMN = "ID";
-
-    public void addToSide1s(FlattenedCircular obj) {
-        addToManyTarget(SIDE1S_PROPERTY, obj, true);
-    }
-    public void removeFromSide1s(FlattenedCircular obj) {
-        removeToManyTarget(SIDE1S_PROPERTY, obj, true);
-    }
-    @SuppressWarnings("unchecked")
-    public List<FlattenedCircular> getSide1s() {
-        return (List<FlattenedCircular>)readProperty(SIDE1S_PROPERTY);
-    }
-
-
-    public void addToSide2s(FlattenedCircular obj) {
-        addToManyTarget(SIDE2S_PROPERTY, obj, true);
-    }
-    public void removeFromSide2s(FlattenedCircular obj) {
-        removeToManyTarget(SIDE2S_PROPERTY, obj, true);
-    }
-    @SuppressWarnings("unchecked")
-    public List<FlattenedCircular> getSide2s() {
-        return (List<FlattenedCircular>)readProperty(SIDE2S_PROPERTY);
-    }
-
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_FlattenedTest1.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_FlattenedTest1.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_FlattenedTest1.java
deleted file mode 100644
index 484487d..0000000
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_FlattenedTest1.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package org.apache.cayenne.testdo.relationship.auto;
-
-import java.util.List;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.testdo.relationship.FlattenedTest2;
-import org.apache.cayenne.testdo.relationship.FlattenedTest3;
-import org.apache.cayenne.testdo.relationship.FlattenedTest4;
-
-/**
- * Class _FlattenedTest1 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 _FlattenedTest1 extends CayenneDataObject {
-
-    public static final String NAME_PROPERTY = "name";
-    public static final String FT2ARRAY_PROPERTY = "ft2Array";
-    public static final String FT3ARRAY_PROPERTY = "ft3Array";
-    public static final String FT3OVER_COMPLEX_PROPERTY = "ft3OverComplex";
-    public static final String FT4ARRAY_FOR1_PROPERTY = "ft4ArrayFor1";
-
-    public static final String FT1_ID_PK_COLUMN = "FT1_ID";
-
-    public void setName(String name) {
-        writeProperty(NAME_PROPERTY, name);
-    }
-    public String getName() {
-        return (String)readProperty(NAME_PROPERTY);
-    }
-
-    public void addToFt2Array(FlattenedTest2 obj) {
-        addToManyTarget(FT2ARRAY_PROPERTY, obj, true);
-    }
-    public void removeFromFt2Array(FlattenedTest2 obj) {
-        removeToManyTarget(FT2ARRAY_PROPERTY, obj, true);
-    }
-    @SuppressWarnings("unchecked")
-    public List<FlattenedTest2> getFt2Array() {
-        return (List<FlattenedTest2>)readProperty(FT2ARRAY_PROPERTY);
-    }
-
-
-    @SuppressWarnings("unchecked")
-    public List<FlattenedTest3> getFt3Array() {
-        return (List<FlattenedTest3>)readProperty(FT3ARRAY_PROPERTY);
-    }
-
-
-    public void addToFt3OverComplex(FlattenedTest3 obj) {
-        addToManyTarget(FT3OVER_COMPLEX_PROPERTY, obj, true);
-    }
-    public void removeFromFt3OverComplex(FlattenedTest3 obj) {
-        removeToManyTarget(FT3OVER_COMPLEX_PROPERTY, obj, true);
-    }
-    @SuppressWarnings("unchecked")
-    public List<FlattenedTest3> getFt3OverComplex() {
-        return (List<FlattenedTest3>)readProperty(FT3OVER_COMPLEX_PROPERTY);
-    }
-
-
-    @SuppressWarnings("unchecked")
-    public List<FlattenedTest4> getFt4ArrayFor1() {
-        return (List<FlattenedTest4>)readProperty(FT4ARRAY_FOR1_PROPERTY);
-    }
-
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_FlattenedTest2.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_FlattenedTest2.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_FlattenedTest2.java
deleted file mode 100644
index 0a44c22..0000000
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_FlattenedTest2.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.apache.cayenne.testdo.relationship.auto;
-
-import java.util.List;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.testdo.relationship.FlattenedTest1;
-import org.apache.cayenne.testdo.relationship.FlattenedTest3;
-
-/**
- * Class _FlattenedTest2 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 _FlattenedTest2 extends CayenneDataObject {
-
-    public static final String NAME_PROPERTY = "name";
-    public static final String FT3ARRAY_PROPERTY = "ft3Array";
-    public static final String TO_FT1_PROPERTY = "toFT1";
-
-    public static final String FT2_ID_PK_COLUMN = "FT2_ID";
-
-    public void setName(String name) {
-        writeProperty(NAME_PROPERTY, name);
-    }
-    public String getName() {
-        return (String)readProperty(NAME_PROPERTY);
-    }
-
-    public void addToFt3Array(FlattenedTest3 obj) {
-        addToManyTarget(FT3ARRAY_PROPERTY, obj, true);
-    }
-    public void removeFromFt3Array(FlattenedTest3 obj) {
-        removeToManyTarget(FT3ARRAY_PROPERTY, obj, true);
-    }
-    @SuppressWarnings("unchecked")
-    public List<FlattenedTest3> getFt3Array() {
-        return (List<FlattenedTest3>)readProperty(FT3ARRAY_PROPERTY);
-    }
-
-
-    public void setToFT1(FlattenedTest1 toFT1) {
-        setToOneTarget(TO_FT1_PROPERTY, toFT1, true);
-    }
-
-    public FlattenedTest1 getToFT1() {
-        return (FlattenedTest1)readProperty(TO_FT1_PROPERTY);
-    }
-
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_FlattenedTest3.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_FlattenedTest3.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_FlattenedTest3.java
deleted file mode 100644
index d6dfc80..0000000
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_FlattenedTest3.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.apache.cayenne.testdo.relationship.auto;
-
-import java.util.List;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.testdo.relationship.FlattenedTest1;
-import org.apache.cayenne.testdo.relationship.FlattenedTest2;
-import org.apache.cayenne.testdo.relationship.FlattenedTest4;
-
-/**
- * Class _FlattenedTest3 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 _FlattenedTest3 extends CayenneDataObject {
-
-    public static final String NAME_PROPERTY = "name";
-    public static final String FT4ARRAY_PROPERTY = "ft4Array";
-    public static final String TO_FT1_PROPERTY = "toFT1";
-    public static final String TO_FT2_PROPERTY = "toFT2";
-
-    public static final String FT3_ID_PK_COLUMN = "FT3_ID";
-
-    public void setName(String name) {
-        writeProperty(NAME_PROPERTY, name);
-    }
-    public String getName() {
-        return (String)readProperty(NAME_PROPERTY);
-    }
-
-    public void addToFt4Array(FlattenedTest4 obj) {
-        addToManyTarget(FT4ARRAY_PROPERTY, obj, true);
-    }
-    public void removeFromFt4Array(FlattenedTest4 obj) {
-        removeToManyTarget(FT4ARRAY_PROPERTY, obj, true);
-    }
-    @SuppressWarnings("unchecked")
-    public List<FlattenedTest4> getFt4Array() {
-        return (List<FlattenedTest4>)readProperty(FT4ARRAY_PROPERTY);
-    }
-
-
-
-    public FlattenedTest1 getToFT1() {
-        return (FlattenedTest1)readProperty(TO_FT1_PROPERTY);
-    }
-
-
-    public void setToFT2(FlattenedTest2 toFT2) {
-        setToOneTarget(TO_FT2_PROPERTY, toFT2, true);
-    }
-
-    public FlattenedTest2 getToFT2() {
-        return (FlattenedTest2)readProperty(TO_FT2_PROPERTY);
-    }
-
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_FlattenedTest4.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_FlattenedTest4.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_FlattenedTest4.java
deleted file mode 100644
index 3a37622..0000000
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_FlattenedTest4.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.apache.cayenne.testdo.relationship.auto;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.testdo.relationship.FlattenedTest3;
-
-/**
- * Class _FlattenedTest4 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 _FlattenedTest4 extends CayenneDataObject {
-
-    public static final String NAME_PROPERTY = "name";
-    public static final String TO_FT3_PROPERTY = "toFT3";
-
-    public static final String FT4_ID_PK_COLUMN = "FT4_ID";
-
-    public void setName(String name) {
-        writeProperty(NAME_PROPERTY, name);
-    }
-    public String getName() {
-        return (String)readProperty(NAME_PROPERTY);
-    }
-
-    public void setToFT3(FlattenedTest3 toFT3) {
-        setToOneTarget(TO_FT3_PROPERTY, toFT3, true);
-    }
-
-    public FlattenedTest3 getToFT3() {
-        return (FlattenedTest3)readProperty(TO_FT3_PROPERTY);
-    }
-
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_Master.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_Master.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_Master.java
deleted file mode 100644
index eaf4d6e..0000000
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_Master.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.apache.cayenne.testdo.relationship.auto;
-
-import java.util.List;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.testdo.relationship.Child;
-
-/**
- * Class _Master 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 _Master extends CayenneDataObject {
-
-    public static final String NAME_PROPERTY = "name";
-    public static final String CHILDREN_PROPERTY = "children";
-
-    public static final String ID_PK_COLUMN = "ID";
-
-    public void setName(String name) {
-        writeProperty(NAME_PROPERTY, name);
-    }
-    public String getName() {
-        return (String)readProperty(NAME_PROPERTY);
-    }
-
-    public void addToChildren(Child obj) {
-        addToManyTarget(CHILDREN_PROPERTY, obj, true);
-    }
-    public void removeFromChildren(Child obj) {
-        removeToManyTarget(CHILDREN_PROPERTY, obj, true);
-    }
-    @SuppressWarnings("unchecked")
-    public List<Child> getChildren() {
-        return (List<Child>)readProperty(CHILDREN_PROPERTY);
-    }
-
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_MeaningfulFK.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_MeaningfulFK.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_MeaningfulFK.java
deleted file mode 100644
index e7771ea..0000000
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_MeaningfulFK.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.apache.cayenne.testdo.relationship.auto;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.testdo.relationship.RelationshipHelper;
-
-/**
- * Class _MeaningfulFK 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 _MeaningfulFK extends CayenneDataObject {
-
-    public static final String RELATIONSHIP_HELPER_ID_PROPERTY = 
"relationshipHelperID";
-    public static final String TO_RELATIONSHIP_HELPER_PROPERTY = 
"toRelationshipHelper";
-
-    public static final String MEANIGNFUL_FK_ID_PK_COLUMN = "MEANIGNFUL_FK_ID";
-
-    public void setRelationshipHelperID(Integer relationshipHelperID) {
-        writeProperty(RELATIONSHIP_HELPER_ID_PROPERTY, relationshipHelperID);
-    }
-    public Integer getRelationshipHelperID() {
-        return (Integer)readProperty(RELATIONSHIP_HELPER_ID_PROPERTY);
-    }
-
-    public void setToRelationshipHelper(RelationshipHelper 
toRelationshipHelper) {
-        setToOneTarget(TO_RELATIONSHIP_HELPER_PROPERTY, toRelationshipHelper, 
true);
-    }
-
-    public RelationshipHelper getToRelationshipHelper() {
-        return 
(RelationshipHelper)readProperty(TO_RELATIONSHIP_HELPER_PROPERTY);
-    }
-
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ReflexiveAndToOne.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ReflexiveAndToOne.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ReflexiveAndToOne.java
deleted file mode 100644
index 4f8508e..0000000
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ReflexiveAndToOne.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package org.apache.cayenne.testdo.relationship.auto;
-
-import java.util.List;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.testdo.relationship.ReflexiveAndToOne;
-import org.apache.cayenne.testdo.relationship.RelationshipHelper;
-
-/**
- * Class _ReflexiveAndToOne 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 _ReflexiveAndToOne extends CayenneDataObject {
-
-    public static final String NAME_PROPERTY = "name";
-    public static final String CHILDREN_PROPERTY = "children";
-    public static final String TO_HELPER_PROPERTY = "toHelper";
-    public static final String TO_PARENT_PROPERTY = "toParent";
-
-    public static final String REFLEXIVE_AND_TO_ONE_ID_PK_COLUMN = 
"REFLEXIVE_AND_TO_ONE_ID";
-
-    public void setName(String name) {
-        writeProperty(NAME_PROPERTY, name);
-    }
-    public String getName() {
-        return (String)readProperty(NAME_PROPERTY);
-    }
-
-    public void addToChildren(ReflexiveAndToOne obj) {
-        addToManyTarget(CHILDREN_PROPERTY, obj, true);
-    }
-    public void removeFromChildren(ReflexiveAndToOne obj) {
-        removeToManyTarget(CHILDREN_PROPERTY, obj, true);
-    }
-    @SuppressWarnings("unchecked")
-    public List<ReflexiveAndToOne> getChildren() {
-        return (List<ReflexiveAndToOne>)readProperty(CHILDREN_PROPERTY);
-    }
-
-
-    public void setToHelper(RelationshipHelper toHelper) {
-        setToOneTarget(TO_HELPER_PROPERTY, toHelper, true);
-    }
-
-    public RelationshipHelper getToHelper() {
-        return (RelationshipHelper)readProperty(TO_HELPER_PROPERTY);
-    }
-
-
-    public void setToParent(ReflexiveAndToOne toParent) {
-        setToOneTarget(TO_PARENT_PROPERTY, toParent, true);
-    }
-
-    public ReflexiveAndToOne getToParent() {
-        return (ReflexiveAndToOne)readProperty(TO_PARENT_PROPERTY);
-    }
-
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_RelationshipHelper.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_RelationshipHelper.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_RelationshipHelper.java
deleted file mode 100644
index d681baf..0000000
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_RelationshipHelper.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package org.apache.cayenne.testdo.relationship.auto;
-
-import java.util.List;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.testdo.relationship.FkOfDifferentType;
-import org.apache.cayenne.testdo.relationship.MeaningfulFK;
-import org.apache.cayenne.testdo.relationship.ReflexiveAndToOne;
-
-/**
- * Class _RelationshipHelper 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 _RelationshipHelper extends CayenneDataObject {
-
-    public static final String NAME_PROPERTY = "name";
-    public static final String FKS_OF_DIFFERENT_TYPE_PROPERTY = 
"fksOfDifferentType";
-    public static final String MEANIGFUL_FKS_PROPERTY = "meanigfulFKs";
-    public static final String REFLEXIVE_AND_TO_ONE_ARRAY_PROPERTY = 
"reflexiveAndToOneArray";
-
-    public static final String RELATIONSHIP_HELPER_ID_PK_COLUMN = 
"RELATIONSHIP_HELPER_ID";
-
-    public void setName(String name) {
-        writeProperty(NAME_PROPERTY, name);
-    }
-    public String getName() {
-        return (String)readProperty(NAME_PROPERTY);
-    }
-
-    public void addToFksOfDifferentType(FkOfDifferentType obj) {
-        addToManyTarget(FKS_OF_DIFFERENT_TYPE_PROPERTY, obj, true);
-    }
-    public void removeFromFksOfDifferentType(FkOfDifferentType obj) {
-        removeToManyTarget(FKS_OF_DIFFERENT_TYPE_PROPERTY, obj, true);
-    }
-    @SuppressWarnings("unchecked")
-    public List<FkOfDifferentType> getFksOfDifferentType() {
-        return 
(List<FkOfDifferentType>)readProperty(FKS_OF_DIFFERENT_TYPE_PROPERTY);
-    }
-
-
-    public void addToMeanigfulFKs(MeaningfulFK obj) {
-        addToManyTarget(MEANIGFUL_FKS_PROPERTY, obj, true);
-    }
-    public void removeFromMeanigfulFKs(MeaningfulFK obj) {
-        removeToManyTarget(MEANIGFUL_FKS_PROPERTY, obj, true);
-    }
-    @SuppressWarnings("unchecked")
-    public List<MeaningfulFK> getMeanigfulFKs() {
-        return (List<MeaningfulFK>)readProperty(MEANIGFUL_FKS_PROPERTY);
-    }
-
-
-    public void addToReflexiveAndToOneArray(ReflexiveAndToOne obj) {
-        addToManyTarget(REFLEXIVE_AND_TO_ONE_ARRAY_PROPERTY, obj, true);
-    }
-    public void removeFromReflexiveAndToOneArray(ReflexiveAndToOne obj) {
-        removeToManyTarget(REFLEXIVE_AND_TO_ONE_ARRAY_PROPERTY, obj, true);
-    }
-    @SuppressWarnings("unchecked")
-    public List<ReflexiveAndToOne> getReflexiveAndToOneArray() {
-        return 
(List<ReflexiveAndToOne>)readProperty(REFLEXIVE_AND_TO_ONE_ARRAY_PROPERTY);
-    }
-
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_Relationships.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_Relationships.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_Relationships.java
deleted file mode 100644
index ef061da..0000000
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_Relationships.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.apache.cayenne.testdo.relationship.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 _Relationships {
-}
\ 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/auto/_SetToMany.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_SetToMany.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_SetToMany.java
deleted file mode 100644
index 46af567..0000000
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_SetToMany.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.apache.cayenne.testdo.relationship.auto;
-
-import java.util.Set;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.testdo.relationship.SetToManyTarget;
-
-/**
- * Class _SetToMany 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 _SetToMany extends CayenneDataObject {
-
-    public static final String TARGETS_PROPERTY = "targets";
-
-    public static final String ID_PK_COLUMN = "ID";
-
-    public void addToTargets(SetToManyTarget obj) {
-        addToManyTarget(TARGETS_PROPERTY, obj, true);
-    }
-    public void removeFromTargets(SetToManyTarget obj) {
-        removeToManyTarget(TARGETS_PROPERTY, obj, true);
-    }
-    @SuppressWarnings("unchecked")
-    public Set<SetToManyTarget> getTargets() {
-        return (Set<SetToManyTarget>)readProperty(TARGETS_PROPERTY);
-    }
-
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_SetToManyTarget.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_SetToManyTarget.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_SetToManyTarget.java
deleted file mode 100644
index 46f4901..0000000
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_SetToManyTarget.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.apache.cayenne.testdo.relationship.auto;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.testdo.relationship.SetToMany;
-
-/**
- * Class _SetToManyTarget 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 _SetToManyTarget extends CayenneDataObject {
-
-    public static final String SET_TO_MANY_PROPERTY = "setToMany";
-
-    public static final String ID_PK_COLUMN = "ID";
-
-    public void setSetToMany(SetToMany setToMany) {
-        setToOneTarget(SET_TO_MANY_PROPERTY, setToMany, true);
-    }
-
-    public SetToMany getSetToMany() {
-        return (SetToMany)readProperty(SET_TO_MANY_PROPERTY);
-    }
-
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ToManyFkDep.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ToManyFkDep.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ToManyFkDep.java
deleted file mode 100644
index c9a85c0..0000000
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ToManyFkDep.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package org.apache.cayenne.testdo.relationship.auto;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.testdo.relationship.ToManyFkRoot;
-import org.apache.cayenne.testdo.relationship.ToManyRoot2;
-
-/**
- * Class _ToManyFkDep 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 _ToManyFkDep extends CayenneDataObject {
-
-    public static final String DEP_ID_PROPERTY = "depId";
-    public static final String NAME_PROPERTY = "name";
-    public static final String ROOT_PROPERTY = "root";
-    public static final String ROOT2_PROPERTY = "root2";
-
-    public static final String DEP_ID_PK_COLUMN = "DEP_ID";
-    public static final String OTHER_ID_PK_COLUMN = "OTHER_ID";
-
-    public void setDepId(Integer depId) {
-        writeProperty(DEP_ID_PROPERTY, depId);
-    }
-    public Integer getDepId() {
-        return (Integer)readProperty(DEP_ID_PROPERTY);
-    }
-
-    public void setName(String name) {
-        writeProperty(NAME_PROPERTY, name);
-    }
-    public String getName() {
-        return (String)readProperty(NAME_PROPERTY);
-    }
-
-    public void setRoot(ToManyFkRoot root) {
-        setToOneTarget(ROOT_PROPERTY, root, true);
-    }
-
-    public ToManyFkRoot getRoot() {
-        return (ToManyFkRoot)readProperty(ROOT_PROPERTY);
-    }
-
-
-    public void setRoot2(ToManyRoot2 root2) {
-        setToOneTarget(ROOT2_PROPERTY, root2, true);
-    }
-
-    public ToManyRoot2 getRoot2() {
-        return (ToManyRoot2)readProperty(ROOT2_PROPERTY);
-    }
-
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ToManyFkRoot.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ToManyFkRoot.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ToManyFkRoot.java
deleted file mode 100644
index d7b000d..0000000
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ToManyFkRoot.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.apache.cayenne.testdo.relationship.auto;
-
-import java.util.List;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.testdo.relationship.ToManyFkDep;
-
-/**
- * Class _ToManyFkRoot 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 _ToManyFkRoot extends CayenneDataObject {
-
-    public static final String DEP_ID_PROPERTY = "depId";
-    public static final String NAME_PROPERTY = "name";
-    public static final String DEPS_PROPERTY = "deps";
-
-    public static final String ID_PK_COLUMN = "ID";
-
-    public void setDepId(Integer depId) {
-        writeProperty(DEP_ID_PROPERTY, depId);
-    }
-    public Integer getDepId() {
-        return (Integer)readProperty(DEP_ID_PROPERTY);
-    }
-
-    public void setName(String name) {
-        writeProperty(NAME_PROPERTY, name);
-    }
-    public String getName() {
-        return (String)readProperty(NAME_PROPERTY);
-    }
-
-    public void addToDeps(ToManyFkDep obj) {
-        addToManyTarget(DEPS_PROPERTY, obj, true);
-    }
-    public void removeFromDeps(ToManyFkDep obj) {
-        removeToManyTarget(DEPS_PROPERTY, obj, true);
-    }
-    @SuppressWarnings("unchecked")
-    public List<ToManyFkDep> getDeps() {
-        return (List<ToManyFkDep>)readProperty(DEPS_PROPERTY);
-    }
-
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ToManyRoot2.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ToManyRoot2.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ToManyRoot2.java
deleted file mode 100644
index e415ad1..0000000
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ToManyRoot2.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.apache.cayenne.testdo.relationship.auto;
-
-import java.util.List;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.testdo.relationship.ToManyFkDep;
-
-/**
- * Class _ToManyRoot2 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 _ToManyRoot2 extends CayenneDataObject {
-
-    public static final String NAME_PROPERTY = "name";
-    public static final String DEPS_PROPERTY = "deps";
-
-    public static final String ID_PK_COLUMN = "ID";
-
-    public void setName(String name) {
-        writeProperty(NAME_PROPERTY, name);
-    }
-    public String getName() {
-        return (String)readProperty(NAME_PROPERTY);
-    }
-
-    public void addToDeps(ToManyFkDep obj) {
-        addToManyTarget(DEPS_PROPERTY, obj, true);
-    }
-    public void removeFromDeps(ToManyFkDep obj) {
-        removeToManyTarget(DEPS_PROPERTY, obj, true);
-    }
-    @SuppressWarnings("unchecked")
-    public List<ToManyFkDep> getDeps() {
-        return (List<ToManyFkDep>)readProperty(DEPS_PROPERTY);
-    }
-
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ToOneFK1.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ToOneFK1.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ToOneFK1.java
deleted file mode 100644
index ee61258..0000000
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ToOneFK1.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.apache.cayenne.testdo.relationship.auto;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.testdo.relationship.ToOneFK2;
-
-/**
- * Class _ToOneFK1 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 _ToOneFK1 extends CayenneDataObject {
-
-    public static final String TO_PK_PROPERTY = "toPK";
-
-    public static final String TO_ONEFK1_PK_PK_COLUMN = "TO_ONEFK1_PK";
-
-    public void setToPK(ToOneFK2 toPK) {
-        setToOneTarget(TO_PK_PROPERTY, toPK, true);
-    }
-
-    public ToOneFK2 getToPK() {
-        return (ToOneFK2)readProperty(TO_PK_PROPERTY);
-    }
-
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ToOneFK2.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ToOneFK2.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ToOneFK2.java
deleted file mode 100644
index b536f6e..0000000
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ToOneFK2.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.apache.cayenne.testdo.relationship.auto;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.testdo.relationship.ToOneFK1;
-
-/**
- * Class _ToOneFK2 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 _ToOneFK2 extends CayenneDataObject {
-
-    public static final String TO_ONE_TO_FK_PROPERTY = "toOneToFK";
-
-    public static final String TO_ONEFK2_PK_PK_COLUMN = "TO_ONEFK2_PK";
-
-    public void setToOneToFK(ToOneFK1 toOneToFK) {
-        setToOneTarget(TO_ONE_TO_FK_PROPERTY, toOneToFK, true);
-    }
-
-    public ToOneFK1 getToOneToFK() {
-        return (ToOneFK1)readProperty(TO_ONE_TO_FK_PROPERTY);
-    }
-
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships/FkOfDifferentType.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships/FkOfDifferentType.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships/FkOfDifferentType.java
new file mode 100644
index 0000000..1d36537
--- /dev/null
+++ 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships/FkOfDifferentType.java
@@ -0,0 +1,28 @@
+/*****************************************************************
+ *   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.relationships;
+
+import org.apache.cayenne.testdo.relationships.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/relationships/MeaningfulFK.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships/MeaningfulFK.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships/MeaningfulFK.java
new file mode 100644
index 0000000..52c25ce
--- /dev/null
+++ 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships/MeaningfulFK.java
@@ -0,0 +1,28 @@
+/*****************************************************************
+ *   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.relationships;
+
+import org.apache.cayenne.testdo.relationships.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/relationships/ReflexiveAndToOne.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships/ReflexiveAndToOne.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships/ReflexiveAndToOne.java
new file mode 100644
index 0000000..a550c0f
--- /dev/null
+++ 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships/ReflexiveAndToOne.java
@@ -0,0 +1,26 @@
+/*****************************************************************
+ *   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.relationships;
+
+public class ReflexiveAndToOne extends 
org.apache.cayenne.testdo.relationships.auto._ReflexiveAndToOne {
+
+}
+
+
+

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

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships/Relationships.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships/Relationships.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships/Relationships.java
new file mode 100644
index 0000000..d7ccf94
--- /dev/null
+++ 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships/Relationships.java
@@ -0,0 +1,36 @@
+/*****************************************************************
+ *   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.relationships;
+
+import org.apache.cayenne.testdo.relationships.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/relationships/auto/_FkOfDifferentType.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships/auto/_FkOfDifferentType.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships/auto/_FkOfDifferentType.java
new file mode 100644
index 0000000..63b1138
--- /dev/null
+++ 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships/auto/_FkOfDifferentType.java
@@ -0,0 +1,27 @@
+package org.apache.cayenne.testdo.relationships.auto;
+
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.testdo.relationships.RelationshipHelper;
+
+/**
+ * Class _FkOfDifferentType 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 _FkOfDifferentType extends CayenneDataObject {
+
+    public static final String RELATIONSHIP_HELPER_PROPERTY = 
"relationshipHelper";
+
+    public static final String ID_PK_COLUMN = "ID";
+
+    public void setRelationshipHelper(RelationshipHelper relationshipHelper) {
+        setToOneTarget(RELATIONSHIP_HELPER_PROPERTY, relationshipHelper, true);
+    }
+
+    public RelationshipHelper getRelationshipHelper() {
+        return (RelationshipHelper)readProperty(RELATIONSHIP_HELPER_PROPERTY);
+    }
+
+
+}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships/auto/_MeaningfulFK.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships/auto/_MeaningfulFK.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships/auto/_MeaningfulFK.java
new file mode 100644
index 0000000..65e855c
--- /dev/null
+++ 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships/auto/_MeaningfulFK.java
@@ -0,0 +1,35 @@
+package org.apache.cayenne.testdo.relationships.auto;
+
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.testdo.relationships.RelationshipHelper;
+
+/**
+ * Class _MeaningfulFK 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 _MeaningfulFK extends CayenneDataObject {
+
+    public static final String RELATIONSHIP_HELPER_ID_PROPERTY = 
"relationshipHelperID";
+    public static final String TO_RELATIONSHIP_HELPER_PROPERTY = 
"toRelationshipHelper";
+
+    public static final String MEANIGNFUL_FK_ID_PK_COLUMN = "MEANIGNFUL_FK_ID";
+
+    public void setRelationshipHelperID(Integer relationshipHelperID) {
+        writeProperty(RELATIONSHIP_HELPER_ID_PROPERTY, relationshipHelperID);
+    }
+    public Integer getRelationshipHelperID() {
+        return (Integer)readProperty(RELATIONSHIP_HELPER_ID_PROPERTY);
+    }
+
+    public void setToRelationshipHelper(RelationshipHelper 
toRelationshipHelper) {
+        setToOneTarget(TO_RELATIONSHIP_HELPER_PROPERTY, toRelationshipHelper, 
true);
+    }
+
+    public RelationshipHelper getToRelationshipHelper() {
+        return 
(RelationshipHelper)readProperty(TO_RELATIONSHIP_HELPER_PROPERTY);
+    }
+
+
+}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships/auto/_ReflexiveAndToOne.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships/auto/_ReflexiveAndToOne.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships/auto/_ReflexiveAndToOne.java
new file mode 100644
index 0000000..01f17c7
--- /dev/null
+++ 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships/auto/_ReflexiveAndToOne.java
@@ -0,0 +1,61 @@
+package org.apache.cayenne.testdo.relationships.auto;
+
+import java.util.List;
+
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.testdo.relationships.ReflexiveAndToOne;
+import org.apache.cayenne.testdo.relationships.RelationshipHelper;
+
+/**
+ * Class _ReflexiveAndToOne 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 _ReflexiveAndToOne extends CayenneDataObject {
+
+    public static final String NAME_PROPERTY = "name";
+    public static final String CHILDREN_PROPERTY = "children";
+    public static final String TO_HELPER_PROPERTY = "toHelper";
+    public static final String TO_PARENT_PROPERTY = "toParent";
+
+    public static final String REFLEXIVE_AND_TO_ONE_ID_PK_COLUMN = 
"REFLEXIVE_AND_TO_ONE_ID";
+
+    public void setName(String name) {
+        writeProperty(NAME_PROPERTY, name);
+    }
+    public String getName() {
+        return (String)readProperty(NAME_PROPERTY);
+    }
+
+    public void addToChildren(ReflexiveAndToOne obj) {
+        addToManyTarget(CHILDREN_PROPERTY, obj, true);
+    }
+    public void removeFromChildren(ReflexiveAndToOne obj) {
+        removeToManyTarget(CHILDREN_PROPERTY, obj, true);
+    }
+    @SuppressWarnings("unchecked")
+    public List<ReflexiveAndToOne> getChildren() {
+        return (List<ReflexiveAndToOne>)readProperty(CHILDREN_PROPERTY);
+    }
+
+
+    public void setToHelper(RelationshipHelper toHelper) {
+        setToOneTarget(TO_HELPER_PROPERTY, toHelper, true);
+    }
+
+    public RelationshipHelper getToHelper() {
+        return (RelationshipHelper)readProperty(TO_HELPER_PROPERTY);
+    }
+
+
+    public void setToParent(ReflexiveAndToOne toParent) {
+        setToOneTarget(TO_PARENT_PROPERTY, toParent, true);
+    }
+
+    public ReflexiveAndToOne getToParent() {
+        return (ReflexiveAndToOne)readProperty(TO_PARENT_PROPERTY);
+    }
+
+
+}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships/auto/_RelationshipHelper.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships/auto/_RelationshipHelper.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships/auto/_RelationshipHelper.java
new file mode 100644
index 0000000..9cdff59
--- /dev/null
+++ 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships/auto/_RelationshipHelper.java
@@ -0,0 +1,68 @@
+package org.apache.cayenne.testdo.relationships.auto;
+
+import java.util.List;
+
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.testdo.relationships.FkOfDifferentType;
+import org.apache.cayenne.testdo.relationships.MeaningfulFK;
+import org.apache.cayenne.testdo.relationships.ReflexiveAndToOne;
+
+/**
+ * Class _RelationshipHelper 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 _RelationshipHelper extends CayenneDataObject {
+
+    public static final String NAME_PROPERTY = "name";
+    public static final String FKS_OF_DIFFERENT_TYPE_PROPERTY = 
"fksOfDifferentType";
+    public static final String MEANIGFUL_FKS_PROPERTY = "meanigfulFKs";
+    public static final String REFLEXIVE_AND_TO_ONE_ARRAY_PROPERTY = 
"reflexiveAndToOneArray";
+
+    public static final String RELATIONSHIP_HELPER_ID_PK_COLUMN = 
"RELATIONSHIP_HELPER_ID";
+
+    public void setName(String name) {
+        writeProperty(NAME_PROPERTY, name);
+    }
+    public String getName() {
+        return (String)readProperty(NAME_PROPERTY);
+    }
+
+    public void addToFksOfDifferentType(FkOfDifferentType obj) {
+        addToManyTarget(FKS_OF_DIFFERENT_TYPE_PROPERTY, obj, true);
+    }
+    public void removeFromFksOfDifferentType(FkOfDifferentType obj) {
+        removeToManyTarget(FKS_OF_DIFFERENT_TYPE_PROPERTY, obj, true);
+    }
+    @SuppressWarnings("unchecked")
+    public List<FkOfDifferentType> getFksOfDifferentType() {
+        return 
(List<FkOfDifferentType>)readProperty(FKS_OF_DIFFERENT_TYPE_PROPERTY);
+    }
+
+
+    public void addToMeanigfulFKs(MeaningfulFK obj) {
+        addToManyTarget(MEANIGFUL_FKS_PROPERTY, obj, true);
+    }
+    public void removeFromMeanigfulFKs(MeaningfulFK obj) {
+        removeToManyTarget(MEANIGFUL_FKS_PROPERTY, obj, true);
+    }
+    @SuppressWarnings("unchecked")
+    public List<MeaningfulFK> getMeanigfulFKs() {
+        return (List<MeaningfulFK>)readProperty(MEANIGFUL_FKS_PROPERTY);
+    }
+
+
+    public void addToReflexiveAndToOneArray(ReflexiveAndToOne obj) {
+        addToManyTarget(REFLEXIVE_AND_TO_ONE_ARRAY_PROPERTY, obj, true);
+    }
+    public void removeFromReflexiveAndToOneArray(ReflexiveAndToOne obj) {
+        removeToManyTarget(REFLEXIVE_AND_TO_ONE_ARRAY_PROPERTY, obj, true);
+    }
+    @SuppressWarnings("unchecked")
+    public List<ReflexiveAndToOne> getReflexiveAndToOneArray() {
+        return 
(List<ReflexiveAndToOne>)readProperty(REFLEXIVE_AND_TO_ONE_ARRAY_PROPERTY);
+    }
+
+
+}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7178a8b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships/auto/_Relationships.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships/auto/_Relationships.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships/auto/_Relationships.java
new file mode 100644
index 0000000..ef1d872
--- /dev/null
+++ 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships/auto/_Relationships.java
@@ -0,0 +1,12 @@
+package org.apache.cayenne.testdo.relationships.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 _Relationships {
+}
\ 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/relationships_activity/Activity.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_activity/Activity.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_activity/Activity.java
new file mode 100644
index 0000000..9308ec1
--- /dev/null
+++ 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_activity/Activity.java
@@ -0,0 +1,25 @@
+/*****************************************************************
+ *   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.relationships_activity;
+
+import org.apache.cayenne.testdo.relationships_activity.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/relationships_activity/ActivityResult.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_activity/ActivityResult.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_activity/ActivityResult.java
new file mode 100644
index 0000000..04edc9a
--- /dev/null
+++ 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_activity/ActivityResult.java
@@ -0,0 +1,25 @@
+/*****************************************************************
+ *   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.relationships_activity;
+
+import org.apache.cayenne.testdo.relationships_activity.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/relationships_activity/Relationships1.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_activity/Relationships1.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_activity/Relationships1.java
new file mode 100644
index 0000000..aab368a
--- /dev/null
+++ 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_activity/Relationships1.java
@@ -0,0 +1,36 @@
+/*****************************************************************
+ *   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.relationships_activity;
+
+import org.apache.cayenne.testdo.relationships_activity.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;
+    }
+}

Reply via email to