cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject [05/11] cayenne git commit: Refactor TestMap Project
Date Wed, 12 Nov 2014 17:07:16 GMT
http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_EnumEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_EnumEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_EnumEntity.java
deleted file mode 100644
index fdd25ce..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_EnumEntity.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.apache.cayenne.testdo.testmap.auto;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.exp.Property;
-import org.apache.cayenne.testdo.testmap.Enum1;
-
-/**
- * Class _EnumEntity 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 _EnumEntity extends CayenneDataObject {
-
-    private static final long serialVersionUID = 1L; 
-
-    @Deprecated
-    public static final String ENUM_ATTRIBUTE_PROPERTY = "enumAttribute";
-
-    public static final String ID_PK_COLUMN = "ID";
-
-    public static final Property<Enum1> ENUM_ATTRIBUTE = new Property<Enum1>("enumAttribute");
-
-    public void setEnumAttribute(Enum1 enumAttribute) {
-        writeProperty("enumAttribute", enumAttribute);
-    }
-    public Enum1 getEnumAttribute() {
-        return (Enum1)readProperty("enumAttribute");
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ExtendedTypeEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ExtendedTypeEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ExtendedTypeEntity.java
deleted file mode 100644
index dbf2d1f..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ExtendedTypeEntity.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.apache.cayenne.testdo.testmap.auto;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.exp.Property;
-import org.apache.cayenne.testdo.testmap.StringET1;
-
-/**
- * Class _ExtendedTypeEntity 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 _ExtendedTypeEntity extends CayenneDataObject {
-
-    private static final long serialVersionUID = 1L; 
-
-    @Deprecated
-    public static final String NAME_PROPERTY = "name";
-
-    public static final String ID_PK_COLUMN = "ID";
-
-    public static final Property<StringET1> NAME = new Property<StringET1>("name");
-
-    public void setName(StringET1 name) {
-        writeProperty("name", name);
-    }
-    public StringET1 getName() {
-        return (StringET1)readProperty("name");
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_GeneratedColumnCompKey.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_GeneratedColumnCompKey.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_GeneratedColumnCompKey.java
deleted file mode 100644
index cf31fef..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_GeneratedColumnCompKey.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.apache.cayenne.testdo.testmap.auto;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.exp.Property;
-import org.apache.cayenne.testdo.testmap.GeneratedColumnCompMaster;
-
-/**
- * Class _GeneratedColumnCompKey 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 _GeneratedColumnCompKey extends CayenneDataObject {
-
-    private static final long serialVersionUID = 1L; 
-
-    @Deprecated
-    public static final String NAME_PROPERTY = "name";
-    @Deprecated
-    public static final String TO_MASTER_PROPERTY = "toMaster";
-
-    public static final String AUTO_PK_PK_COLUMN = "AUTO_PK";
-    public static final String GENERATED_COLUMN_PK_COLUMN = "GENERATED_COLUMN";
-    public static final String PROPAGATED_PK_PK_COLUMN = "PROPAGATED_PK";
-
-    public static final Property<String> NAME = new Property<String>("name");
-    public static final Property<GeneratedColumnCompMaster> TO_MASTER = new Property<GeneratedColumnCompMaster>("toMaster");
-
-    public void setName(String name) {
-        writeProperty("name", name);
-    }
-    public String getName() {
-        return (String)readProperty("name");
-    }
-
-    public void setToMaster(GeneratedColumnCompMaster toMaster) {
-        setToOneTarget("toMaster", toMaster, true);
-    }
-
-    public GeneratedColumnCompMaster getToMaster() {
-        return (GeneratedColumnCompMaster)readProperty("toMaster");
-    }
-
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_GeneratedColumnCompMaster.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_GeneratedColumnCompMaster.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_GeneratedColumnCompMaster.java
deleted file mode 100644
index 752748f..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_GeneratedColumnCompMaster.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.apache.cayenne.testdo.testmap.auto;
-
-import java.util.List;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.exp.Property;
-import org.apache.cayenne.testdo.testmap.GeneratedColumnCompKey;
-
-/**
- * Class _GeneratedColumnCompMaster 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 _GeneratedColumnCompMaster extends CayenneDataObject {
-
-    private static final long serialVersionUID = 1L; 
-
-    @Deprecated
-    public static final String NAME_PROPERTY = "name";
-    @Deprecated
-    public static final String TO_DETAIL_PROPERTY = "toDetail";
-
-    public static final String ID_PK_COLUMN = "ID";
-
-    public static final Property<String> NAME = new Property<String>("name");
-    public static final Property<List<GeneratedColumnCompKey>> TO_DETAIL = new Property<List<GeneratedColumnCompKey>>("toDetail");
-
-    public void setName(String name) {
-        writeProperty("name", name);
-    }
-    public String getName() {
-        return (String)readProperty("name");
-    }
-
-    public void addToToDetail(GeneratedColumnCompKey obj) {
-        addToManyTarget("toDetail", obj, true);
-    }
-    public void removeFromToDetail(GeneratedColumnCompKey obj) {
-        removeToManyTarget("toDetail", obj, true);
-    }
-    @SuppressWarnings("unchecked")
-    public List<GeneratedColumnCompKey> getToDetail() {
-        return (List<GeneratedColumnCompKey>)readProperty("toDetail");
-    }
-
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_GeneratedColumnDep.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_GeneratedColumnDep.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_GeneratedColumnDep.java
deleted file mode 100644
index e89294c..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_GeneratedColumnDep.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.apache.cayenne.testdo.testmap.auto;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.exp.Property;
-import org.apache.cayenne.testdo.testmap.GeneratedColumnTestEntity;
-
-/**
- * Class _GeneratedColumnDep 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 _GeneratedColumnDep extends CayenneDataObject {
-
-    private static final long serialVersionUID = 1L; 
-
-    @Deprecated
-    public static final String NAME_PROPERTY = "name";
-    @Deprecated
-    public static final String TO_MASTER_PROPERTY = "toMaster";
-
-    public static final String GENERATED_COLUMN_FK_PK_COLUMN = "GENERATED_COLUMN_FK";
-
-    public static final Property<String> NAME = new Property<String>("name");
-    public static final Property<GeneratedColumnTestEntity> TO_MASTER = new Property<GeneratedColumnTestEntity>("toMaster");
-
-    public void setName(String name) {
-        writeProperty("name", name);
-    }
-    public String getName() {
-        return (String)readProperty("name");
-    }
-
-    public void setToMaster(GeneratedColumnTestEntity toMaster) {
-        setToOneTarget("toMaster", toMaster, true);
-    }
-
-    public GeneratedColumnTestEntity getToMaster() {
-        return (GeneratedColumnTestEntity)readProperty("toMaster");
-    }
-
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_GeneratedColumnTest2.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_GeneratedColumnTest2.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_GeneratedColumnTest2.java
deleted file mode 100644
index 1bc191b..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_GeneratedColumnTest2.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.apache.cayenne.testdo.testmap.auto;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.exp.Property;
-
-/**
- * Class _GeneratedColumnTest2 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 _GeneratedColumnTest2 extends CayenneDataObject {
-
-    private static final long serialVersionUID = 1L; 
-
-    @Deprecated
-    public static final String NAME_PROPERTY = "name";
-
-    public static final String GENERATED_COLUMN_PK_COLUMN = "GENERATED_COLUMN";
-
-    public static final Property<String> NAME = new Property<String>("name");
-
-    public void setName(String name) {
-        writeProperty("name", name);
-    }
-    public String getName() {
-        return (String)readProperty("name");
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_GeneratedColumnTestEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_GeneratedColumnTestEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_GeneratedColumnTestEntity.java
deleted file mode 100644
index 4c132c3..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_GeneratedColumnTestEntity.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.apache.cayenne.testdo.testmap.auto;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.exp.Property;
-import org.apache.cayenne.testdo.testmap.GeneratedColumnDep;
-
-/**
- * Class _GeneratedColumnTestEntity 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 _GeneratedColumnTestEntity extends CayenneDataObject {
-
-    private static final long serialVersionUID = 1L; 
-
-    @Deprecated
-    public static final String NAME_PROPERTY = "name";
-    @Deprecated
-    public static final String TO_DEP_PROPERTY = "toDep";
-
-    public static final String GENERATED_COLUMN_PK_COLUMN = "GENERATED_COLUMN";
-
-    public static final Property<String> NAME = new Property<String>("name");
-    public static final Property<GeneratedColumnDep> TO_DEP = new Property<GeneratedColumnDep>("toDep");
-
-    public void setName(String name) {
-        writeProperty("name", name);
-    }
-    public String getName() {
-        return (String)readProperty("name");
-    }
-
-    public void setToDep(GeneratedColumnDep toDep) {
-        setToOneTarget("toDep", toDep, true);
-    }
-
-    public GeneratedColumnDep getToDep() {
-        return (GeneratedColumnDep)readProperty("toDep");
-    }
-
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_GeneratedF1.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_GeneratedF1.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_GeneratedF1.java
deleted file mode 100644
index bf75642..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_GeneratedF1.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.apache.cayenne.testdo.testmap.auto;
-
-import java.util.List;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.exp.Property;
-import org.apache.cayenne.testdo.testmap.GeneratedF2;
-
-/**
- * Class _GeneratedF1 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 _GeneratedF1 extends CayenneDataObject {
-
-    private static final long serialVersionUID = 1L; 
-
-    @Deprecated
-    public static final String F2_PROPERTY = "f2";
-
-    public static final String ID_PK_COLUMN = "ID";
-
-    public static final Property<List<GeneratedF2>> F2 = new Property<List<GeneratedF2>>("f2");
-
-    public void addToF2(GeneratedF2 obj) {
-        addToManyTarget("f2", obj, true);
-    }
-    public void removeFromF2(GeneratedF2 obj) {
-        removeToManyTarget("f2", obj, true);
-    }
-    @SuppressWarnings("unchecked")
-    public List<GeneratedF2> getF2() {
-        return (List<GeneratedF2>)readProperty("f2");
-    }
-
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_GeneratedF2.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_GeneratedF2.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_GeneratedF2.java
deleted file mode 100644
index 908789b..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_GeneratedF2.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.apache.cayenne.testdo.testmap.auto;
-
-import java.util.List;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.exp.Property;
-import org.apache.cayenne.testdo.testmap.GeneratedF1;
-
-/**
- * Class _GeneratedF2 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 _GeneratedF2 extends CayenneDataObject {
-
-    private static final long serialVersionUID = 1L; 
-
-    @Deprecated
-    public static final String F1_PROPERTY = "f1";
-
-    public static final String ID_PK_COLUMN = "ID";
-
-    public static final Property<List<GeneratedF1>> F1 = new Property<List<GeneratedF1>>("f1");
-
-    public void addToF1(GeneratedF1 obj) {
-        addToManyTarget("f1", obj, true);
-    }
-    public void removeFromF1(GeneratedF1 obj) {
-        removeToManyTarget("f1", obj, true);
-    }
-    @SuppressWarnings("unchecked")
-    public List<GeneratedF1> getF1() {
-        return (List<GeneratedF1>)readProperty("f1");
-    }
-
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_LongEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_LongEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_LongEntity.java
deleted file mode 100644
index 7b75465..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_LongEntity.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.apache.cayenne.testdo.testmap.auto;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.exp.Property;
-
-/**
- * Class _LongEntity 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 _LongEntity extends CayenneDataObject {
-
-    private static final long serialVersionUID = 1L; 
-
-    @Deprecated
-    public static final String LONG_FIELD_PROPERTY = "longField";
-
-    public static final String ID_PK_COLUMN = "ID";
-
-    public static final Property<Long> LONG_FIELD = new Property<Long>("longField");
-
-    public void setLongField(Long longField) {
-        writeProperty("longField", longField);
-    }
-    public Long getLongField() {
-        return (Long)readProperty("longField");
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_MeaningfulPKDep.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_MeaningfulPKDep.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_MeaningfulPKDep.java
deleted file mode 100644
index 797422d..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_MeaningfulPKDep.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.apache.cayenne.testdo.testmap.auto;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.exp.Property;
-import org.apache.cayenne.testdo.testmap.MeaningfulPKTest1;
-
-/**
- * Class _MeaningfulPKDep 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 _MeaningfulPKDep extends CayenneDataObject {
-
-    private static final long serialVersionUID = 1L; 
-
-    @Deprecated
-    public static final String DESCR_PROPERTY = "descr";
-    @Deprecated
-    public static final String TO_MEANINGFUL_PK_PROPERTY = "toMeaningfulPK";
-
-    public static final String PK_ATTRIBUTE_PK_COLUMN = "PK_ATTRIBUTE";
-
-    public static final Property<String> DESCR = new Property<String>("descr");
-    public static final Property<MeaningfulPKTest1> TO_MEANINGFUL_PK = new Property<MeaningfulPKTest1>("toMeaningfulPK");
-
-    public void setDescr(String descr) {
-        writeProperty("descr", descr);
-    }
-    public String getDescr() {
-        return (String)readProperty("descr");
-    }
-
-    public void setToMeaningfulPK(MeaningfulPKTest1 toMeaningfulPK) {
-        setToOneTarget("toMeaningfulPK", toMeaningfulPK, true);
-    }
-
-    public MeaningfulPKTest1 getToMeaningfulPK() {
-        return (MeaningfulPKTest1)readProperty("toMeaningfulPK");
-    }
-
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_MeaningfulPKTest1.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_MeaningfulPKTest1.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_MeaningfulPKTest1.java
deleted file mode 100644
index 3b55387..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_MeaningfulPKTest1.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.apache.cayenne.testdo.testmap.auto;
-
-import java.util.List;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.exp.Property;
-import org.apache.cayenne.testdo.testmap.MeaningfulPKDep;
-
-/**
- * Class _MeaningfulPKTest1 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 _MeaningfulPKTest1 extends CayenneDataObject {
-
-    private static final long serialVersionUID = 1L; 
-
-    @Deprecated
-    public static final String DESCR_PROPERTY = "descr";
-    @Deprecated
-    public static final String PK_ATTRIBUTE_PROPERTY = "pkAttribute";
-    @Deprecated
-    public static final String MEANINGFUL_PKDEP_ARRAY_PROPERTY = "meaningfulPKDepArray";
-
-    public static final String PK_ATTRIBUTE_PK_COLUMN = "PK_ATTRIBUTE";
-
-    public static final Property<String> DESCR = new Property<String>("descr");
-    public static final Property<Integer> PK_ATTRIBUTE = new Property<Integer>("pkAttribute");
-    public static final Property<List<MeaningfulPKDep>> MEANINGFUL_PKDEP_ARRAY = new Property<List<MeaningfulPKDep>>("meaningfulPKDepArray");
-
-    public void setDescr(String descr) {
-        writeProperty("descr", descr);
-    }
-    public String getDescr() {
-        return (String)readProperty("descr");
-    }
-
-    public void setPkAttribute(Integer pkAttribute) {
-        writeProperty("pkAttribute", pkAttribute);
-    }
-    public Integer getPkAttribute() {
-        return (Integer)readProperty("pkAttribute");
-    }
-
-    public void addToMeaningfulPKDepArray(MeaningfulPKDep obj) {
-        addToManyTarget("meaningfulPKDepArray", obj, true);
-    }
-    public void removeFromMeaningfulPKDepArray(MeaningfulPKDep obj) {
-        removeToManyTarget("meaningfulPKDepArray", obj, true);
-    }
-    @SuppressWarnings("unchecked")
-    public List<MeaningfulPKDep> getMeaningfulPKDepArray() {
-        return (List<MeaningfulPKDep>)readProperty("meaningfulPKDepArray");
-    }
-
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_MixedPersistenceStrategy.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_MixedPersistenceStrategy.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_MixedPersistenceStrategy.java
deleted file mode 100644
index a9696b1..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_MixedPersistenceStrategy.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.apache.cayenne.testdo.testmap.auto;
-
-import java.util.List;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.exp.Property;
-import org.apache.cayenne.testdo.testmap.MixedPersistenceStrategy2;
-
-/**
- * Class _MixedPersistenceStrategy 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 _MixedPersistenceStrategy extends CayenneDataObject {
-
-    private static final long serialVersionUID = 1L; 
-
-    @Deprecated
-    public static final String DESCRIPTION_PROPERTY = "description";
-    @Deprecated
-    public static final String NAME_PROPERTY = "name";
-    @Deprecated
-    public static final String DETAILS_PROPERTY = "details";
-
-    public static final String ID_PK_COLUMN = "ID";
-
-    public static final Property<String> DESCRIPTION = new Property<String>("description");
-    public static final Property<String> NAME = new Property<String>("name");
-    public static final Property<List<MixedPersistenceStrategy2>> DETAILS = new Property<List<MixedPersistenceStrategy2>>("details");
-
-    public void setDescription(String description) {
-        writeProperty("description", description);
-    }
-    public String getDescription() {
-        return (String)readProperty("description");
-    }
-
-    public void setName(String name) {
-        writeProperty("name", name);
-    }
-    public String getName() {
-        return (String)readProperty("name");
-    }
-
-    public void addToDetails(MixedPersistenceStrategy2 obj) {
-        addToManyTarget("details", obj, true);
-    }
-    public void removeFromDetails(MixedPersistenceStrategy2 obj) {
-        removeToManyTarget("details", obj, true);
-    }
-    @SuppressWarnings("unchecked")
-    public List<MixedPersistenceStrategy2> getDetails() {
-        return (List<MixedPersistenceStrategy2>)readProperty("details");
-    }
-
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_MixedPersistenceStrategy2.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_MixedPersistenceStrategy2.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_MixedPersistenceStrategy2.java
deleted file mode 100644
index f1e70a0..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_MixedPersistenceStrategy2.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.apache.cayenne.testdo.testmap.auto;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.exp.Property;
-import org.apache.cayenne.testdo.testmap.MixedPersistenceStrategy;
-
-/**
- * Class _MixedPersistenceStrategy2 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 _MixedPersistenceStrategy2 extends CayenneDataObject {
-
-    private static final long serialVersionUID = 1L; 
-
-    @Deprecated
-    public static final String NAME_PROPERTY = "name";
-    @Deprecated
-    public static final String MASTER_PROPERTY = "master";
-
-    public static final String ID_PK_COLUMN = "ID";
-
-    public static final Property<String> NAME = new Property<String>("name");
-    public static final Property<MixedPersistenceStrategy> MASTER = new Property<MixedPersistenceStrategy>("master");
-
-    public void setName(String name) {
-        writeProperty("name", name);
-    }
-    public String getName() {
-        return (String)readProperty("name");
-    }
-
-    public void setMaster(MixedPersistenceStrategy master) {
-        setToOneTarget("master", master, true);
-    }
-
-    public MixedPersistenceStrategy getMaster() {
-        return (MixedPersistenceStrategy)readProperty("master");
-    }
-
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_NoPkTestEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_NoPkTestEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_NoPkTestEntity.java
deleted file mode 100644
index 954f63d..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_NoPkTestEntity.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.apache.cayenne.testdo.testmap.auto;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.exp.Property;
-
-/**
- * Class _NoPkTestEntity 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 _NoPkTestEntity extends CayenneDataObject {
-
-    private static final long serialVersionUID = 1L; 
-
-    @Deprecated
-    public static final String ATTRIBUTE1_PROPERTY = "attribute1";
-
-
-    public static final Property<Integer> ATTRIBUTE1 = new Property<Integer>("attribute1");
-
-    public void setAttribute1(Integer attribute1) {
-        writeProperty("attribute1", attribute1);
-    }
-    public Integer getAttribute1() {
-        return (Integer)readProperty("attribute1");
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_PrimitivesTestEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_PrimitivesTestEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_PrimitivesTestEntity.java
deleted file mode 100644
index b67a1d9..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_PrimitivesTestEntity.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.apache.cayenne.testdo.testmap.auto;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.exp.Property;
-
-/**
- * Class _PrimitivesTestEntity 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 _PrimitivesTestEntity extends CayenneDataObject {
-
-    private static final long serialVersionUID = 1L; 
-
-    @Deprecated
-    public static final String BOOLEAN_COLUMN_PROPERTY = "booleanColumn";
-    @Deprecated
-    public static final String INT_COLUMN_PROPERTY = "intColumn";
-
-    public static final String ID_PK_COLUMN = "ID";
-
-    public static final Property<Boolean> BOOLEAN_COLUMN = new Property<Boolean>("booleanColumn");
-    public static final Property<Integer> INT_COLUMN = new Property<Integer>("intColumn");
-
-    public void setBooleanColumn(boolean booleanColumn) {
-        writeProperty("booleanColumn", booleanColumn);
-    }
-	public boolean isBooleanColumn() {
-        Boolean value = (Boolean)readProperty("booleanColumn");
-        return (value != null) ? value.booleanValue() : false;
-    }
-
-    public void setIntColumn(int intColumn) {
-        writeProperty("intColumn", intColumn);
-    }
-    public int getIntColumn() {
-        Object value = readProperty("intColumn");
-        return (value != null) ? (Integer) value : 0;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ReturnTypesMap1.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ReturnTypesMap1.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ReturnTypesMap1.java
deleted file mode 100644
index c9ea7ad..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ReturnTypesMap1.java
+++ /dev/null
@@ -1,193 +0,0 @@
-package org.apache.cayenne.testdo.testmap.auto;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.exp.Property;
-
-/**
- * Class _ReturnTypesMap1 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 _ReturnTypesMap1 extends CayenneDataObject {
-
-    private static final long serialVersionUID = 1L; 
-
-    @Deprecated
-    public static final String BIGINT_COLUMN_PROPERTY = "bigintColumn";
-    @Deprecated
-    public static final String BIT_COLUMN_PROPERTY = "bitColumn";
-    @Deprecated
-    public static final String BOOLEAN_COLUMN_PROPERTY = "booleanColumn";
-    @Deprecated
-    public static final String CHAR_COLUMN_PROPERTY = "charColumn";
-    @Deprecated
-    public static final String DATE_COLUMN_PROPERTY = "dateColumn";
-    @Deprecated
-    public static final String DECIMAL_COLUMN_PROPERTY = "decimalColumn";
-    @Deprecated
-    public static final String DOUBLE_COLUMN_PROPERTY = "doubleColumn";
-    @Deprecated
-    public static final String FLOAT_COLUMN_PROPERTY = "floatColumn";
-    @Deprecated
-    public static final String INTEGER_COLUMN_PROPERTY = "integerColumn";
-    @Deprecated
-    public static final String LONGVARCHAR_COLUMN_PROPERTY = "longvarcharColumn";
-    @Deprecated
-    public static final String NUMERIC_COLUMN_PROPERTY = "numericColumn";
-    @Deprecated
-    public static final String REAL_COLUMN_PROPERTY = "realColumn";
-    @Deprecated
-    public static final String SMALLINT_COLUMN_PROPERTY = "smallintColumn";
-    @Deprecated
-    public static final String TIME_COLUMN_PROPERTY = "timeColumn";
-    @Deprecated
-    public static final String TIMESTAMP_COLUMN_PROPERTY = "timestampColumn";
-    @Deprecated
-    public static final String TINYINT_COLUMN_PROPERTY = "tinyintColumn";
-    @Deprecated
-    public static final String VARCHAR_COLUMN_PROPERTY = "varcharColumn";
-
-    public static final String AAAID_PK_COLUMN = "AAAID";
-
-    public static final Property<Long> BIGINT_COLUMN = new Property<Long>("bigintColumn");
-    public static final Property<Boolean> BIT_COLUMN = new Property<Boolean>("bitColumn");
-    public static final Property<Boolean> BOOLEAN_COLUMN = new Property<Boolean>("booleanColumn");
-    public static final Property<String> CHAR_COLUMN = new Property<String>("charColumn");
-    public static final Property<Date> DATE_COLUMN = new Property<Date>("dateColumn");
-    public static final Property<BigDecimal> DECIMAL_COLUMN = new Property<BigDecimal>("decimalColumn");
-    public static final Property<Double> DOUBLE_COLUMN = new Property<Double>("doubleColumn");
-    public static final Property<Float> FLOAT_COLUMN = new Property<Float>("floatColumn");
-    public static final Property<Integer> INTEGER_COLUMN = new Property<Integer>("integerColumn");
-    public static final Property<String> LONGVARCHAR_COLUMN = new Property<String>("longvarcharColumn");
-    public static final Property<BigDecimal> NUMERIC_COLUMN = new Property<BigDecimal>("numericColumn");
-    public static final Property<Float> REAL_COLUMN = new Property<Float>("realColumn");
-    public static final Property<Short> SMALLINT_COLUMN = new Property<Short>("smallintColumn");
-    public static final Property<Date> TIME_COLUMN = new Property<Date>("timeColumn");
-    public static final Property<Date> TIMESTAMP_COLUMN = new Property<Date>("timestampColumn");
-    public static final Property<Byte> TINYINT_COLUMN = new Property<Byte>("tinyintColumn");
-    public static final Property<String> VARCHAR_COLUMN = new Property<String>("varcharColumn");
-
-    public void setBigintColumn(Long bigintColumn) {
-        writeProperty("bigintColumn", bigintColumn);
-    }
-    public Long getBigintColumn() {
-        return (Long)readProperty("bigintColumn");
-    }
-
-    public void setBitColumn(Boolean bitColumn) {
-        writeProperty("bitColumn", bitColumn);
-    }
-    public Boolean getBitColumn() {
-        return (Boolean)readProperty("bitColumn");
-    }
-
-    public void setBooleanColumn(Boolean booleanColumn) {
-        writeProperty("booleanColumn", booleanColumn);
-    }
-    public Boolean getBooleanColumn() {
-        return (Boolean)readProperty("booleanColumn");
-    }
-
-    public void setCharColumn(String charColumn) {
-        writeProperty("charColumn", charColumn);
-    }
-    public String getCharColumn() {
-        return (String)readProperty("charColumn");
-    }
-
-    public void setDateColumn(Date dateColumn) {
-        writeProperty("dateColumn", dateColumn);
-    }
-    public Date getDateColumn() {
-        return (Date)readProperty("dateColumn");
-    }
-
-    public void setDecimalColumn(BigDecimal decimalColumn) {
-        writeProperty("decimalColumn", decimalColumn);
-    }
-    public BigDecimal getDecimalColumn() {
-        return (BigDecimal)readProperty("decimalColumn");
-    }
-
-    public void setDoubleColumn(Double doubleColumn) {
-        writeProperty("doubleColumn", doubleColumn);
-    }
-    public Double getDoubleColumn() {
-        return (Double)readProperty("doubleColumn");
-    }
-
-    public void setFloatColumn(Float floatColumn) {
-        writeProperty("floatColumn", floatColumn);
-    }
-    public Float getFloatColumn() {
-        return (Float)readProperty("floatColumn");
-    }
-
-    public void setIntegerColumn(Integer integerColumn) {
-        writeProperty("integerColumn", integerColumn);
-    }
-    public Integer getIntegerColumn() {
-        return (Integer)readProperty("integerColumn");
-    }
-
-    public void setLongvarcharColumn(String longvarcharColumn) {
-        writeProperty("longvarcharColumn", longvarcharColumn);
-    }
-    public String getLongvarcharColumn() {
-        return (String)readProperty("longvarcharColumn");
-    }
-
-    public void setNumericColumn(BigDecimal numericColumn) {
-        writeProperty("numericColumn", numericColumn);
-    }
-    public BigDecimal getNumericColumn() {
-        return (BigDecimal)readProperty("numericColumn");
-    }
-
-    public void setRealColumn(Float realColumn) {
-        writeProperty("realColumn", realColumn);
-    }
-    public Float getRealColumn() {
-        return (Float)readProperty("realColumn");
-    }
-
-    public void setSmallintColumn(Short smallintColumn) {
-        writeProperty("smallintColumn", smallintColumn);
-    }
-    public Short getSmallintColumn() {
-        return (Short)readProperty("smallintColumn");
-    }
-
-    public void setTimeColumn(Date timeColumn) {
-        writeProperty("timeColumn", timeColumn);
-    }
-    public Date getTimeColumn() {
-        return (Date)readProperty("timeColumn");
-    }
-
-    public void setTimestampColumn(Date timestampColumn) {
-        writeProperty("timestampColumn", timestampColumn);
-    }
-    public Date getTimestampColumn() {
-        return (Date)readProperty("timestampColumn");
-    }
-
-    public void setTinyintColumn(Byte tinyintColumn) {
-        writeProperty("tinyintColumn", tinyintColumn);
-    }
-    public Byte getTinyintColumn() {
-        return (Byte)readProperty("tinyintColumn");
-    }
-
-    public void setVarcharColumn(String varcharColumn) {
-        writeProperty("varcharColumn", varcharColumn);
-    }
-    public String getVarcharColumn() {
-        return (String)readProperty("varcharColumn");
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ReturnTypesMap2.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ReturnTypesMap2.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ReturnTypesMap2.java
deleted file mode 100644
index a05b775..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ReturnTypesMap2.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package org.apache.cayenne.testdo.testmap.auto;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.exp.Property;
-
-/**
- * Class _ReturnTypesMap2 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 _ReturnTypesMap2 extends CayenneDataObject {
-
-    private static final long serialVersionUID = 1L; 
-
-    @Deprecated
-    public static final String BINARY_COLUMN_PROPERTY = "binaryColumn";
-    @Deprecated
-    public static final String BLOB_COLUMN_PROPERTY = "blobColumn";
-    @Deprecated
-    public static final String LONGVARBINARY_COLUMN_PROPERTY = "longvarbinaryColumn";
-    @Deprecated
-    public static final String VARBINARY_COLUMN_PROPERTY = "varbinaryColumn";
-
-    public static final String AAAID_PK_COLUMN = "AAAID";
-
-    public static final Property<byte[]> BINARY_COLUMN = new Property<byte[]>("binaryColumn");
-    public static final Property<byte[]> BLOB_COLUMN = new Property<byte[]>("blobColumn");
-    public static final Property<byte[]> LONGVARBINARY_COLUMN = new Property<byte[]>("longvarbinaryColumn");
-    public static final Property<byte[]> VARBINARY_COLUMN = new Property<byte[]>("varbinaryColumn");
-
-    public void setBinaryColumn(byte[] binaryColumn) {
-        writeProperty("binaryColumn", binaryColumn);
-    }
-    public byte[] getBinaryColumn() {
-        return (byte[])readProperty("binaryColumn");
-    }
-
-    public void setBlobColumn(byte[] blobColumn) {
-        writeProperty("blobColumn", blobColumn);
-    }
-    public byte[] getBlobColumn() {
-        return (byte[])readProperty("blobColumn");
-    }
-
-    public void setLongvarbinaryColumn(byte[] longvarbinaryColumn) {
-        writeProperty("longvarbinaryColumn", longvarbinaryColumn);
-    }
-    public byte[] getLongvarbinaryColumn() {
-        return (byte[])readProperty("longvarbinaryColumn");
-    }
-
-    public void setVarbinaryColumn(byte[] varbinaryColumn) {
-        writeProperty("varbinaryColumn", varbinaryColumn);
-    }
-    public byte[] getVarbinaryColumn() {
-        return (byte[])readProperty("varbinaryColumn");
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ReturnTypesMapLobs1.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ReturnTypesMapLobs1.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ReturnTypesMapLobs1.java
deleted file mode 100644
index 2baa1ca..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ReturnTypesMapLobs1.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.apache.cayenne.testdo.testmap.auto;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.exp.Property;
-
-/**
- * Class _ReturnTypesMapLobs1 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 _ReturnTypesMapLobs1 extends CayenneDataObject {
-
-    private static final long serialVersionUID = 1L; 
-
-    @Deprecated
-    public static final String CLOB_COLUMN_PROPERTY = "clobColumn";
-
-    public static final String AAAID_PK_COLUMN = "AAAID";
-
-    public static final Property<String> CLOB_COLUMN = new Property<String>("clobColumn");
-
-    public void setClobColumn(String clobColumn) {
-        writeProperty("clobColumn", clobColumn);
-    }
-    public String getClobColumn() {
-        return (String)readProperty("clobColumn");
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_SerializableEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_SerializableEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_SerializableEntity.java
deleted file mode 100644
index 8196250..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_SerializableEntity.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.apache.cayenne.testdo.testmap.auto;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.MockSerializable;
-import org.apache.cayenne.exp.Property;
-
-/**
- * Class _SerializableEntity 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 _SerializableEntity extends CayenneDataObject {
-
-    private static final long serialVersionUID = 1L; 
-
-    @Deprecated
-    public static final String SERIALIZABLE_FIELD_PROPERTY = "serializableField";
-
-    public static final String ID_PK_COLUMN = "ID";
-
-    public static final Property<MockSerializable> SERIALIZABLE_FIELD = new Property<MockSerializable>("serializableField");
-
-    public void setSerializableField(MockSerializable serializableField) {
-        writeProperty("serializableField", serializableField);
-    }
-    public MockSerializable getSerializableField() {
-        return (MockSerializable)readProperty("serializableField");
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_SmallintTestEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_SmallintTestEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_SmallintTestEntity.java
deleted file mode 100644
index f4c38d7..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_SmallintTestEntity.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.apache.cayenne.testdo.testmap.auto;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.exp.Property;
-
-/**
- * Class _SmallintTestEntity 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 _SmallintTestEntity extends CayenneDataObject {
-
-    private static final long serialVersionUID = 1L; 
-
-    @Deprecated
-    public static final String SMALLINT_COL_PROPERTY = "smallintCol";
-
-    public static final String ID_PK_COLUMN = "ID";
-
-    public static final Property<Short> SMALLINT_COL = new Property<Short>("smallintCol");
-
-    public void setSmallintCol(Short smallintCol) {
-        writeProperty("smallintCol", smallintCol);
-    }
-    public Short getSmallintCol() {
-        return (Short)readProperty("smallintCol");
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Thing.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Thing.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Thing.java
deleted file mode 100644
index 67365db..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Thing.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package org.apache.cayenne.testdo.testmap.auto;
-
-import java.util.List;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.exp.Property;
-import org.apache.cayenne.testdo.testmap.Ball;
-import org.apache.cayenne.testdo.testmap.Box;
-
-/**
- * Class _Thing 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 _Thing extends CayenneDataObject {
-
-    private static final long serialVersionUID = 1L; 
-
-    @Deprecated
-    public static final String VOLUME_PROPERTY = "volume";
-    @Deprecated
-    public static final String WEIGHT_PROPERTY = "weight";
-    @Deprecated
-    public static final String BALL_PROPERTY = "ball";
-    @Deprecated
-    public static final String BOX_PROPERTY = "box";
-
-    public static final String ID_PK_COLUMN = "ID";
-
-    public static final Property<Integer> VOLUME = new Property<Integer>("volume");
-    public static final Property<Integer> WEIGHT = new Property<Integer>("weight");
-    public static final Property<Ball> BALL = new Property<Ball>("ball");
-    public static final Property<List<Box>> BOX = new Property<List<Box>>("box");
-
-    public void setVolume(Integer volume) {
-        writeProperty("volume", volume);
-    }
-    public Integer getVolume() {
-        return (Integer)readProperty("volume");
-    }
-
-    public void setWeight(Integer weight) {
-        writeProperty("weight", weight);
-    }
-    public Integer getWeight() {
-        return (Integer)readProperty("weight");
-    }
-
-    public void setBall(Ball ball) {
-        setToOneTarget("ball", ball, true);
-    }
-
-    public Ball getBall() {
-        return (Ball)readProperty("ball");
-    }
-
-
-    @SuppressWarnings("unchecked")
-    public List<Box> getBox() {
-        return (List<Box>)readProperty("box");
-    }
-
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_TinyintTestEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_TinyintTestEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_TinyintTestEntity.java
deleted file mode 100644
index 544b1d8..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_TinyintTestEntity.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.apache.cayenne.testdo.testmap.auto;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.exp.Property;
-
-/**
- * Class _TinyintTestEntity 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 _TinyintTestEntity extends CayenneDataObject {
-
-    private static final long serialVersionUID = 1L; 
-
-    @Deprecated
-    public static final String TINYINT_COL_PROPERTY = "tinyintCol";
-
-    public static final String ID_PK_COLUMN = "ID";
-
-    public static final Property<Byte> TINYINT_COL = new Property<Byte>("tinyintCol");
-
-    public void setTinyintCol(Byte tinyintCol) {
-        writeProperty("tinyintCol", tinyintCol);
-    }
-    public Byte getTinyintCol() {
-        return (Byte)readProperty("tinyintCol");
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_UuidPkEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_UuidPkEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_UuidPkEntity.java
deleted file mode 100644
index c217b3c..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_UuidPkEntity.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.apache.cayenne.testdo.testmap.auto;
-
-import java.util.UUID;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.exp.Property;
-
-/**
- * Class _UuidPkEntity 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 _UuidPkEntity extends CayenneDataObject {
-
-    private static final long serialVersionUID = 1L; 
-
-    @Deprecated
-    public static final String ID_PROPERTY = "id";
-
-    public static final String ID_PK_COLUMN = "ID";
-
-    public static final Property<UUID> ID = new Property<UUID>("id");
-
-    public void setId(UUID id) {
-        writeProperty("id", id);
-    }
-    public UUID getId() {
-        return (UUID)readProperty("id");
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_UuidTestEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_UuidTestEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_UuidTestEntity.java
deleted file mode 100644
index a82fd3c..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_UuidTestEntity.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.apache.cayenne.testdo.testmap.auto;
-
-import java.util.UUID;
-
-import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.exp.Property;
-
-/**
- * Class _UuidTestEntity 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 _UuidTestEntity extends CayenneDataObject {
-
-    private static final long serialVersionUID = 1L; 
-
-    @Deprecated
-    public static final String UUID_PROPERTY = "uuid";
-
-    public static final String ID_PK_COLUMN = "ID";
-
-    public static final Property<UUID> UUID = new Property<UUID>("uuid");
-
-    public void setUuid(UUID uuid) {
-        writeProperty("uuid", uuid);
-    }
-    public UUID getUuid() {
-        return (UUID)readProperty("uuid");
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/Bag.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/Bag.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/Bag.java
new file mode 100644
index 0000000..9fac0db
--- /dev/null
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/Bag.java
@@ -0,0 +1,27 @@
+/*****************************************************************
+ *   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.things;
+
+import org.apache.cayenne.testdo.things.auto._Bag;
+
+public class Bag extends _Bag {
+
+    private static final long serialVersionUID = 1L; 
+
+}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/Ball.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/Ball.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/Ball.java
new file mode 100644
index 0000000..304399c
--- /dev/null
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/Ball.java
@@ -0,0 +1,27 @@
+/*****************************************************************
+ *   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.things;
+
+import org.apache.cayenne.testdo.things.auto._Ball;
+
+public class Ball extends _Ball {
+
+    private static final long serialVersionUID = 1L; 
+
+}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/Box.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/Box.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/Box.java
new file mode 100644
index 0000000..1157583
--- /dev/null
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/Box.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.things;
+
+import org.apache.cayenne.testdo.things.auto._Box;
+
+public class Box extends _Box {
+
+}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/BoxInfo.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/BoxInfo.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/BoxInfo.java
new file mode 100644
index 0000000..d49472d
--- /dev/null
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/BoxInfo.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.things;
+
+import org.apache.cayenne.testdo.things.auto._BoxInfo;
+
+public class BoxInfo extends _BoxInfo {
+
+}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/Thing.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/Thing.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/Thing.java
new file mode 100644
index 0000000..cf016e9
--- /dev/null
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/Thing.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.things;
+
+import org.apache.cayenne.testdo.things.auto._Thing;
+
+public class Thing extends _Thing {
+
+}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/auto/_Bag.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/auto/_Bag.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/auto/_Bag.java
new file mode 100644
index 0000000..88b7319
--- /dev/null
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/auto/_Bag.java
@@ -0,0 +1,68 @@
+package org.apache.cayenne.testdo.things.auto;
+
+import java.util.List;
+
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
+import org.apache.cayenne.testdo.things.Ball;
+import org.apache.cayenne.testdo.things.Box;
+import org.apache.cayenne.testdo.things.Thing;
+
+/**
+ * Class _Bag 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 _Bag extends CayenneDataObject {
+
+    private static final long serialVersionUID = 1L; 
+
+    @Deprecated
+    public static final String NAME_PROPERTY = "name";
+    @Deprecated
+    public static final String BALLS_PROPERTY = "balls";
+    @Deprecated
+    public static final String BOXES_PROPERTY = "boxes";
+    @Deprecated
+    public static final String THINGS_PROPERTY = "things";
+
+    public static final String ID_PK_COLUMN = "ID";
+
+    public static final Property<String> NAME = new Property<String>("name");
+    public static final Property<List<Ball>> BALLS = new Property<List<Ball>>("balls");
+    public static final Property<List<Box>> BOXES = new Property<List<Box>>("boxes");
+    public static final Property<List<Thing>> THINGS = new Property<List<Thing>>("things");
+
+    public void setName(String name) {
+        writeProperty("name", name);
+    }
+    public String getName() {
+        return (String)readProperty("name");
+    }
+
+    @SuppressWarnings("unchecked")
+    public List<Ball> getBalls() {
+        return (List<Ball>)readProperty("balls");
+    }
+
+
+    public void addToBoxes(Box obj) {
+        addToManyTarget("boxes", obj, true);
+    }
+    public void removeFromBoxes(Box obj) {
+        removeToManyTarget("boxes", obj, true);
+    }
+    @SuppressWarnings("unchecked")
+    public List<Box> getBoxes() {
+        return (List<Box>)readProperty("boxes");
+    }
+
+
+    @SuppressWarnings("unchecked")
+    public List<Thing> getThings() {
+        return (List<Thing>)readProperty("things");
+    }
+
+
+}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/auto/_Ball.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/auto/_Ball.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/auto/_Ball.java
new file mode 100644
index 0000000..61321b2
--- /dev/null
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/auto/_Ball.java
@@ -0,0 +1,66 @@
+package org.apache.cayenne.testdo.things.auto;
+
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
+import org.apache.cayenne.testdo.things.Box;
+import org.apache.cayenne.testdo.things.Thing;
+
+/**
+ * Class _Ball 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 _Ball extends CayenneDataObject {
+
+    private static final long serialVersionUID = 1L; 
+
+    @Deprecated
+    public static final String THING_VOLUME_PROPERTY = "thingVolume";
+    @Deprecated
+    public static final String THING_WEIGHT_PROPERTY = "thingWeight";
+    @Deprecated
+    public static final String BOX_PROPERTY = "box";
+    @Deprecated
+    public static final String THING_PROPERTY = "thing";
+
+    public static final String ID_PK_COLUMN = "ID";
+
+    public static final Property<Integer> THING_VOLUME = new Property<Integer>("thingVolume");
+    public static final Property<Integer> THING_WEIGHT = new Property<Integer>("thingWeight");
+    public static final Property<Box> BOX = new Property<Box>("box");
+    public static final Property<Thing> THING = new Property<Thing>("thing");
+
+    public void setThingVolume(Integer thingVolume) {
+        writeProperty("thingVolume", thingVolume);
+    }
+    public Integer getThingVolume() {
+        return (Integer)readProperty("thingVolume");
+    }
+
+    public void setThingWeight(Integer thingWeight) {
+        writeProperty("thingWeight", thingWeight);
+    }
+    public Integer getThingWeight() {
+        return (Integer)readProperty("thingWeight");
+    }
+
+    public void setBox(Box box) {
+        setToOneTarget("box", box, true);
+    }
+
+    public Box getBox() {
+        return (Box)readProperty("box");
+    }
+
+
+    public void setThing(Thing thing) {
+        setToOneTarget("thing", thing, true);
+    }
+
+    public Thing getThing() {
+        return (Thing)readProperty("thing");
+    }
+
+
+}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/auto/_Box.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/auto/_Box.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/auto/_Box.java
new file mode 100644
index 0000000..8da6b32
--- /dev/null
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/auto/_Box.java
@@ -0,0 +1,84 @@
+package org.apache.cayenne.testdo.things.auto;
+
+import java.util.List;
+
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
+import org.apache.cayenne.testdo.things.Bag;
+import org.apache.cayenne.testdo.things.Ball;
+import org.apache.cayenne.testdo.things.BoxInfo;
+import org.apache.cayenne.testdo.things.Thing;
+
+/**
+ * Class _Box 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 _Box extends CayenneDataObject {
+
+    private static final long serialVersionUID = 1L; 
+
+    @Deprecated
+    public static final String NAME_PROPERTY = "name";
+    @Deprecated
+    public static final String BAG_PROPERTY = "bag";
+    @Deprecated
+    public static final String BALLS_PROPERTY = "balls";
+    @Deprecated
+    public static final String BOX_INFO_PROPERTY = "boxInfo";
+    @Deprecated
+    public static final String THINGS_PROPERTY = "things";
+
+    public static final String ID_PK_COLUMN = "ID";
+
+    public static final Property<String> NAME = new Property<String>("name");
+    public static final Property<Bag> BAG = new Property<Bag>("bag");
+    public static final Property<List<Ball>> BALLS = new Property<List<Ball>>("balls");
+    public static final Property<BoxInfo> BOX_INFO = new Property<BoxInfo>("boxInfo");
+    public static final Property<List<Thing>> THINGS = new Property<List<Thing>>("things");
+
+    public void setName(String name) {
+        writeProperty("name", name);
+    }
+    public String getName() {
+        return (String)readProperty("name");
+    }
+
+    public void setBag(Bag bag) {
+        setToOneTarget("bag", bag, true);
+    }
+
+    public Bag getBag() {
+        return (Bag)readProperty("bag");
+    }
+
+
+    public void addToBalls(Ball obj) {
+        addToManyTarget("balls", obj, true);
+    }
+    public void removeFromBalls(Ball obj) {
+        removeToManyTarget("balls", obj, true);
+    }
+    @SuppressWarnings("unchecked")
+    public List<Ball> getBalls() {
+        return (List<Ball>)readProperty("balls");
+    }
+
+
+    public void setBoxInfo(BoxInfo boxInfo) {
+        setToOneTarget("boxInfo", boxInfo, true);
+    }
+
+    public BoxInfo getBoxInfo() {
+        return (BoxInfo)readProperty("boxInfo");
+    }
+
+
+    @SuppressWarnings("unchecked")
+    public List<Thing> getThings() {
+        return (List<Thing>)readProperty("things");
+    }
+
+
+}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/auto/_BoxInfo.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/auto/_BoxInfo.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/auto/_BoxInfo.java
new file mode 100644
index 0000000..8d37e3b
--- /dev/null
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/auto/_BoxInfo.java
@@ -0,0 +1,43 @@
+package org.apache.cayenne.testdo.things.auto;
+
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
+import org.apache.cayenne.testdo.things.Box;
+
+/**
+ * Class _BoxInfo 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 _BoxInfo extends CayenneDataObject {
+
+    private static final long serialVersionUID = 1L; 
+
+    @Deprecated
+    public static final String COLOR_PROPERTY = "color";
+    @Deprecated
+    public static final String BOX_PROPERTY = "box";
+
+    public static final String ID_PK_COLUMN = "ID";
+
+    public static final Property<String> COLOR = new Property<String>("color");
+    public static final Property<Box> BOX = new Property<Box>("box");
+
+    public void setColor(String color) {
+        writeProperty("color", color);
+    }
+    public String getColor() {
+        return (String)readProperty("color");
+    }
+
+    public void setBox(Box box) {
+        setToOneTarget("box", box, true);
+    }
+
+    public Box getBox() {
+        return (Box)readProperty("box");
+    }
+
+
+}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/auto/_Thing.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/auto/_Thing.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/auto/_Thing.java
new file mode 100644
index 0000000..5b604b8
--- /dev/null
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/auto/_Thing.java
@@ -0,0 +1,65 @@
+package org.apache.cayenne.testdo.things.auto;
+
+import java.util.List;
+
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
+import org.apache.cayenne.testdo.things.Ball;
+import org.apache.cayenne.testdo.things.Box;
+
+/**
+ * Class _Thing 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 _Thing extends CayenneDataObject {
+
+    private static final long serialVersionUID = 1L; 
+
+    @Deprecated
+    public static final String VOLUME_PROPERTY = "volume";
+    @Deprecated
+    public static final String WEIGHT_PROPERTY = "weight";
+    @Deprecated
+    public static final String BALL_PROPERTY = "ball";
+    @Deprecated
+    public static final String BOX_PROPERTY = "box";
+
+    public static final String ID_PK_COLUMN = "ID";
+
+    public static final Property<Integer> VOLUME = new Property<Integer>("volume");
+    public static final Property<Integer> WEIGHT = new Property<Integer>("weight");
+    public static final Property<Ball> BALL = new Property<Ball>("ball");
+    public static final Property<List<Box>> BOX = new Property<List<Box>>("box");
+
+    public void setVolume(Integer volume) {
+        writeProperty("volume", volume);
+    }
+    public Integer getVolume() {
+        return (Integer)readProperty("volume");
+    }
+
+    public void setWeight(Integer weight) {
+        writeProperty("weight", weight);
+    }
+    public Integer getWeight() {
+        return (Integer)readProperty("weight");
+    }
+
+    public void setBall(Ball ball) {
+        setToOneTarget("ball", ball, true);
+    }
+
+    public Ball getBall() {
+        return (Ball)readProperty("ball");
+    }
+
+
+    @SuppressWarnings("unchecked")
+    public List<Box> getBox() {
+        return (List<Box>)readProperty("box");
+    }
+
+
+}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/uuid/UuidPkEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/uuid/UuidPkEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/uuid/UuidPkEntity.java
new file mode 100644
index 0000000..79c2fe7
--- /dev/null
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/uuid/UuidPkEntity.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.uuid;
+
+import org.apache.cayenne.testdo.uuid.auto._UuidPkEntity;
+
+public class UuidPkEntity extends _UuidPkEntity {
+
+}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/uuid/UuidTestEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/uuid/UuidTestEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/uuid/UuidTestEntity.java
new file mode 100644
index 0000000..929df68
--- /dev/null
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/uuid/UuidTestEntity.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.uuid;
+
+import org.apache.cayenne.testdo.uuid.auto._UuidTestEntity;
+
+public class UuidTestEntity extends _UuidTestEntity {
+
+}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/uuid/auto/_UuidPkEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/uuid/auto/_UuidPkEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/uuid/auto/_UuidPkEntity.java
new file mode 100644
index 0000000..492c380
--- /dev/null
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/uuid/auto/_UuidPkEntity.java
@@ -0,0 +1,32 @@
+package org.apache.cayenne.testdo.uuid.auto;
+
+import java.util.UUID;
+
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
+
+/**
+ * Class _UuidPkEntity 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 _UuidPkEntity extends CayenneDataObject {
+
+    private static final long serialVersionUID = 1L; 
+
+    @Deprecated
+    public static final String ID_PROPERTY = "id";
+
+    public static final String ID_PK_COLUMN = "ID";
+
+    public static final Property<UUID> ID = new Property<UUID>("id");
+
+    public void setId(UUID id) {
+        writeProperty("id", id);
+    }
+    public UUID getId() {
+        return (UUID)readProperty("id");
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/testdo/uuid/auto/_UuidTestEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/uuid/auto/_UuidTestEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/uuid/auto/_UuidTestEntity.java
new file mode 100644
index 0000000..82315b4
--- /dev/null
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/uuid/auto/_UuidTestEntity.java
@@ -0,0 +1,32 @@
+package org.apache.cayenne.testdo.uuid.auto;
+
+import java.util.UUID;
+
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
+
+/**
+ * Class _UuidTestEntity 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 _UuidTestEntity extends CayenneDataObject {
+
+    private static final long serialVersionUID = 1L; 
+
+    @Deprecated
+    public static final String UUID_PROPERTY = "uuid";
+
+    public static final String ID_PK_COLUMN = "ID";
+
+    public static final Property<UUID> UUID = new Property<UUID>("uuid");
+
+    public void setUuid(UUID uuid) {
+        writeProperty("uuid", uuid);
+    }
+    public UUID getUuid() {
+        return (UUID)readProperty("uuid");
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/unit/HSQLDBUnitDbAdapter.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/unit/HSQLDBUnitDbAdapter.java b/cayenne-server/src/test/java/org/apache/cayenne/unit/HSQLDBUnitDbAdapter.java
index d99e602..10ae06c 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/unit/HSQLDBUnitDbAdapter.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/unit/HSQLDBUnitDbAdapter.java
@@ -19,11 +19,11 @@
 
 package org.apache.cayenne.unit;
 
-import java.sql.Connection;
-
 import org.apache.cayenne.dba.DbAdapter;
 import org.apache.cayenne.map.DataMap;
 
+import java.sql.Connection;
+
 public class HSQLDBUnitDbAdapter extends UnitDbAdapter {
 
     public HSQLDBUnitDbAdapter(DbAdapter adapter) {
@@ -52,7 +52,7 @@ public class HSQLDBUnitDbAdapter extends UnitDbAdapter {
 
     @Override
     public void createdTables(Connection con, DataMap map) throws Exception {
-        if (map.getProcedureMap().containsKey("cayenne_tst_select_proc")) {
+        if (map.getProcedureMap().containsKey("cayenne_test_select_proc")) {
             executeDDL(con, "hsqldb", "create-sp-aliases.sql");
         }
     }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/unit/MySQLUnitDbAdapter.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/unit/MySQLUnitDbAdapter.java b/cayenne-server/src/test/java/org/apache/cayenne/unit/MySQLUnitDbAdapter.java
index 7308c01..61d7cbb 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/unit/MySQLUnitDbAdapter.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/unit/MySQLUnitDbAdapter.java
@@ -19,15 +19,15 @@
 
 package org.apache.cayenne.unit;
 
-import java.sql.Connection;
-import java.util.Arrays;
-import java.util.Collection;
-
 import org.apache.cayenne.dba.DbAdapter;
 import org.apache.cayenne.map.DataMap;
 import org.apache.cayenne.map.DbEntity;
 import org.apache.cayenne.map.Procedure;
 
+import java.sql.Connection;
+import java.util.Arrays;
+import java.util.Collection;
+
 /**
  */
 public class MySQLUnitDbAdapter extends UnitDbAdapter {
@@ -91,7 +91,7 @@ public class MySQLUnitDbAdapter extends UnitDbAdapter {
     @Override
     public void createdTables(Connection con, DataMap map) throws Exception {
 
-        if (map.getProcedureMap().containsKey("cayenne_tst_select_proc")) {
+        if (map.getProcedureMap().containsKey("cayenne_test_select_proc")) {
             executeDDL(con, "mysql", "create-select-sp.sql");
             executeDDL(con, "mysql", "create-update-sp.sql");
             executeDDL(con, "mysql", "create-update-sp2.sql");
@@ -105,7 +105,7 @@ public class MySQLUnitDbAdapter extends UnitDbAdapter {
             DataMap map,
             Collection<String> tablesToDrop) throws Exception {
 
-        Procedure proc = map.getProcedure("cayenne_tst_select_proc");
+        Procedure proc = map.getProcedure("cayenne_test_select_proc");
         if (proc != null && proc.getDataMap() == map) {
             executeDDL(conn, "mysql", "drop-select-sp.sql");
             executeDDL(conn, "mysql", "drop-update-sp.sql");

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/unit/OracleUnitDbAdapter.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/unit/OracleUnitDbAdapter.java b/cayenne-server/src/test/java/org/apache/cayenne/unit/OracleUnitDbAdapter.java
index f0ebb94..38dcee2 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/unit/OracleUnitDbAdapter.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/unit/OracleUnitDbAdapter.java
@@ -80,7 +80,7 @@ public class OracleUnitDbAdapter extends UnitDbAdapter {
 
     @Override
     public void createdTables(Connection con, DataMap map) throws Exception {
-        if (map.getProcedureMap().containsKey("cayenne_tst_select_proc")) {
+        if (map.getProcedureMap().containsKey("cayenne_test_select_proc")) {
             executeDDL(con, "oracle", "create-types-pkg.sql");
             executeDDL(con, "oracle", "create-select-sp.sql");
             executeDDL(con, "oracle", "create-update-sp.sql");

http://git-wip-us.apache.org/repos/asf/cayenne/blob/535ecb88/cayenne-server/src/test/java/org/apache/cayenne/unit/PostgresUnitDbAdapter.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/unit/PostgresUnitDbAdapter.java b/cayenne-server/src/test/java/org/apache/cayenne/unit/PostgresUnitDbAdapter.java
index c6a14ae..794f799 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/unit/PostgresUnitDbAdapter.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/unit/PostgresUnitDbAdapter.java
@@ -19,12 +19,12 @@
 
 package org.apache.cayenne.unit;
 
-import java.sql.Connection;
-import java.util.Collection;
-
 import org.apache.cayenne.dba.DbAdapter;
 import org.apache.cayenne.map.DataMap;
 
+import java.sql.Connection;
+import java.util.Collection;
+
 public class PostgresUnitDbAdapter extends UnitDbAdapter {
 
     public PostgresUnitDbAdapter(DbAdapter adapter) {
@@ -54,7 +54,7 @@ public class PostgresUnitDbAdapter extends UnitDbAdapter {
 
     @Override
     public void createdTables(Connection con, DataMap map) throws Exception {
-        if (map.getProcedureMap().containsKey("cayenne_tst_select_proc")) {
+        if (map.getProcedureMap().containsKey("cayenne_test_select_proc")) {
             executeDDL(con, "postgresql", "create-select-sp.sql");
             executeDDL(con, "postgresql", "create-update-sp.sql");
             executeDDL(con, "postgresql", "create-update-sp2.sql");


Mime
View raw message