You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by ol...@apache.org on 2011/12/19 14:44:30 UTC

svn commit: r1220741 [3/3] - in /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo: db1/auto/ db2/auto/ embeddable/auto/ generic/auto/ inherit/auto/ inheritance/vertical/auto/ inheritance_flat/auto/ locking...

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_RelationshipHelper.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_RelationshipHelper.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_RelationshipHelper.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_RelationshipHelper.java Mon Dec 19 13:44:27 2011
@@ -2,12 +2,18 @@ package org.apache.cayenne.testdo.relati
 
 import java.util.List;
 
-/** 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 class _RelationshipHelper extends org.apache.cayenne.CayenneDataObject {
+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";
@@ -17,44 +23,46 @@ public class _RelationshipHelper extends
     public static final String RELATIONSHIP_HELPER_ID_PK_COLUMN = "RELATIONSHIP_HELPER_ID";
 
     public void setName(String name) {
-        writeProperty("name", name);
+        writeProperty(NAME_PROPERTY, name);
     }
     public String getName() {
-        return (String)readProperty("name");
+        return (String)readProperty(NAME_PROPERTY);
     }
-    
-    
-    public void addToFksOfDifferentType(org.apache.cayenne.testdo.relationship.FkOfDifferentType obj) {
-        addToManyTarget("fksOfDifferentType", obj, true);
+
+    public void addToFksOfDifferentType(FkOfDifferentType obj) {
+        addToManyTarget(FKS_OF_DIFFERENT_TYPE_PROPERTY, obj, true);
     }
-    public void removeFromFksOfDifferentType(org.apache.cayenne.testdo.relationship.FkOfDifferentType obj) {
-        removeToManyTarget("fksOfDifferentType", obj, true);
+    public void removeFromFksOfDifferentType(FkOfDifferentType obj) {
+        removeToManyTarget(FKS_OF_DIFFERENT_TYPE_PROPERTY, obj, true);
     }
-    public List getFksOfDifferentType() {
-        return (List)readProperty("fksOfDifferentType");
+    @SuppressWarnings("unchecked")
+    public List<FkOfDifferentType> getFksOfDifferentType() {
+        return (List<FkOfDifferentType>)readProperty(FKS_OF_DIFFERENT_TYPE_PROPERTY);
     }
-    
-    
-    public void addToMeanigfulFKs(org.apache.cayenne.testdo.relationship.MeaningfulFK obj) {
-        addToManyTarget("meanigfulFKs", obj, true);
+
+
+    public void addToMeanigfulFKs(MeaningfulFK obj) {
+        addToManyTarget(MEANIGFUL_FKS_PROPERTY, obj, true);
     }
-    public void removeFromMeanigfulFKs(org.apache.cayenne.testdo.relationship.MeaningfulFK obj) {
-        removeToManyTarget("meanigfulFKs", obj, true);
+    public void removeFromMeanigfulFKs(MeaningfulFK obj) {
+        removeToManyTarget(MEANIGFUL_FKS_PROPERTY, obj, true);
     }
-    public List getMeanigfulFKs() {
-        return (List)readProperty("meanigfulFKs");
+    @SuppressWarnings("unchecked")
+    public List<MeaningfulFK> getMeanigfulFKs() {
+        return (List<MeaningfulFK>)readProperty(MEANIGFUL_FKS_PROPERTY);
     }
-    
-    
-    public void addToReflexiveAndToOneArray(org.apache.cayenne.testdo.relationship.ReflexiveAndToOne obj) {
-        addToManyTarget("reflexiveAndToOneArray", obj, true);
+
+
+    public void addToReflexiveAndToOneArray(ReflexiveAndToOne obj) {
+        addToManyTarget(REFLEXIVE_AND_TO_ONE_ARRAY_PROPERTY, obj, true);
     }
-    public void removeFromReflexiveAndToOneArray(org.apache.cayenne.testdo.relationship.ReflexiveAndToOne obj) {
-        removeToManyTarget("reflexiveAndToOneArray", obj, true);
+    public void removeFromReflexiveAndToOneArray(ReflexiveAndToOne obj) {
+        removeToManyTarget(REFLEXIVE_AND_TO_ONE_ARRAY_PROPERTY, obj, true);
     }
-    public List getReflexiveAndToOneArray() {
-        return (List)readProperty("reflexiveAndToOneArray");
+    @SuppressWarnings("unchecked")
+    public List<ReflexiveAndToOne> getReflexiveAndToOneArray() {
+        return (List<ReflexiveAndToOne>)readProperty(REFLEXIVE_AND_TO_ONE_ARRAY_PROPERTY);
     }
-    
-    
+
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_SetToMany.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_SetToMany.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_SetToMany.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_SetToMany.java Mon Dec 19 13:44:27 2011
@@ -1,25 +1,32 @@
 package org.apache.cayenne.testdo.relationship.auto;
 
-/** 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 class _SetToMany extends org.apache.cayenne.CayenneDataObject {
+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(org.apache.cayenne.testdo.relationship.SetToManyTarget obj) {
-        addToManyTarget("targets", obj, true);
+    public void addToTargets(SetToManyTarget obj) {
+        addToManyTarget(TARGETS_PROPERTY, obj, true);
     }
-    public void removeFromTargets(org.apache.cayenne.testdo.relationship.SetToManyTarget obj) {
-        removeToManyTarget("targets", obj, true);
+    public void removeFromTargets(SetToManyTarget obj) {
+        removeToManyTarget(TARGETS_PROPERTY, obj, true);
     }
-    public java.util.Set getTargets() {
-        return (java.util.Set)readProperty("targets");
+    @SuppressWarnings("unchecked")
+    public Set<SetToManyTarget> getTargets() {
+        return (Set<SetToManyTarget>)readProperty(TARGETS_PROPERTY);
     }
-    
-    
+
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_SetToManyTarget.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_SetToManyTarget.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_SetToManyTarget.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_SetToManyTarget.java Mon Dec 19 13:44:27 2011
@@ -1,23 +1,27 @@
 package org.apache.cayenne.testdo.relationship.auto;
 
-/** 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 class _SetToManyTarget extends org.apache.cayenne.CayenneDataObject {
+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(org.apache.cayenne.testdo.relationship.SetToMany setToMany) {
-        setToOneTarget("setToMany", setToMany, true);
+    public void setSetToMany(SetToMany setToMany) {
+        setToOneTarget(SET_TO_MANY_PROPERTY, setToMany, true);
+    }
+
+    public SetToMany getSetToMany() {
+        return (SetToMany)readProperty(SET_TO_MANY_PROPERTY);
     }
 
-    public org.apache.cayenne.testdo.relationship.SetToMany getSetToMany() {
-        return (org.apache.cayenne.testdo.relationship.SetToMany)readProperty("setToMany");
-    } 
-    
-    
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ToManyFkDep.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ToManyFkDep.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ToManyFkDep.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ToManyFkDep.java Mon Dec 19 13:44:27 2011
@@ -1,11 +1,16 @@
 package org.apache.cayenne.testdo.relationship.auto;
 
-/** 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 class _ToManyFkDep extends org.apache.cayenne.CayenneDataObject {
+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";
@@ -16,37 +21,35 @@ public class _ToManyFkDep extends org.ap
     public static final String OTHER_ID_PK_COLUMN = "OTHER_ID";
 
     public void setDepId(Integer depId) {
-        writeProperty("depId", depId);
+        writeProperty(DEP_ID_PROPERTY, depId);
     }
     public Integer getDepId() {
-        return (Integer)readProperty("depId");
+        return (Integer)readProperty(DEP_ID_PROPERTY);
     }
-    
-    
+
     public void setName(String name) {
-        writeProperty("name", name);
+        writeProperty(NAME_PROPERTY, name);
     }
     public String getName() {
-        return (String)readProperty("name");
+        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);
     }
-    
-    
-    public void setRoot(org.apache.cayenne.testdo.relationship.ToManyFkRoot root) {
-        setToOneTarget("root", root, true);
-    }
-
-    public org.apache.cayenne.testdo.relationship.ToManyFkRoot getRoot() {
-        return (org.apache.cayenne.testdo.relationship.ToManyFkRoot)readProperty("root");
-    } 
-    
-    
-    public void setRoot2(org.apache.cayenne.testdo.relationship.ToManyRoot2 root2) {
-        setToOneTarget("root2", root2, true);
-    }
-
-    public org.apache.cayenne.testdo.relationship.ToManyRoot2 getRoot2() {
-        return (org.apache.cayenne.testdo.relationship.ToManyRoot2)readProperty("root2");
-    } 
-    
-    
+
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ToManyFkRoot.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ToManyFkRoot.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ToManyFkRoot.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ToManyFkRoot.java Mon Dec 19 13:44:27 2011
@@ -2,12 +2,16 @@ package org.apache.cayenne.testdo.relati
 
 import java.util.List;
 
-/** 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 class _ToManyFkRoot extends org.apache.cayenne.CayenneDataObject {
+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";
@@ -16,30 +20,29 @@ public class _ToManyFkRoot extends org.a
     public static final String ID_PK_COLUMN = "ID";
 
     public void setDepId(Integer depId) {
-        writeProperty("depId", depId);
+        writeProperty(DEP_ID_PROPERTY, depId);
     }
     public Integer getDepId() {
-        return (Integer)readProperty("depId");
+        return (Integer)readProperty(DEP_ID_PROPERTY);
     }
-    
-    
+
     public void setName(String name) {
-        writeProperty("name", name);
+        writeProperty(NAME_PROPERTY, name);
     }
     public String getName() {
-        return (String)readProperty("name");
+        return (String)readProperty(NAME_PROPERTY);
     }
-    
-    
-    public void addToDeps(org.apache.cayenne.testdo.relationship.ToManyFkDep obj) {
-        addToManyTarget("deps", obj, true);
+
+    public void addToDeps(ToManyFkDep obj) {
+        addToManyTarget(DEPS_PROPERTY, obj, true);
     }
-    public void removeFromDeps(org.apache.cayenne.testdo.relationship.ToManyFkDep obj) {
-        removeToManyTarget("deps", obj, true);
+    public void removeFromDeps(ToManyFkDep obj) {
+        removeToManyTarget(DEPS_PROPERTY, obj, true);
     }
-    public List getDeps() {
-        return (List)readProperty("deps");
+    @SuppressWarnings("unchecked")
+    public List<ToManyFkDep> getDeps() {
+        return (List<ToManyFkDep>)readProperty(DEPS_PROPERTY);
     }
-    
-    
+
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ToManyRoot2.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ToManyRoot2.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ToManyRoot2.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ToManyRoot2.java Mon Dec 19 13:44:27 2011
@@ -2,12 +2,16 @@ package org.apache.cayenne.testdo.relati
 
 import java.util.List;
 
-/** 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 class _ToManyRoot2 extends org.apache.cayenne.CayenneDataObject {
+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";
@@ -15,22 +19,22 @@ public class _ToManyRoot2 extends org.ap
     public static final String ID_PK_COLUMN = "ID";
 
     public void setName(String name) {
-        writeProperty("name", name);
+        writeProperty(NAME_PROPERTY, name);
     }
     public String getName() {
-        return (String)readProperty("name");
+        return (String)readProperty(NAME_PROPERTY);
     }
-    
-    
-    public void addToDeps(org.apache.cayenne.testdo.relationship.ToManyFkDep obj) {
-        addToManyTarget("deps", obj, true);
+
+    public void addToDeps(ToManyFkDep obj) {
+        addToManyTarget(DEPS_PROPERTY, obj, true);
     }
-    public void removeFromDeps(org.apache.cayenne.testdo.relationship.ToManyFkDep obj) {
-        removeToManyTarget("deps", obj, true);
+    public void removeFromDeps(ToManyFkDep obj) {
+        removeToManyTarget(DEPS_PROPERTY, obj, true);
     }
-    public List getDeps() {
-        return (List)readProperty("deps");
+    @SuppressWarnings("unchecked")
+    public List<ToManyFkDep> getDeps() {
+        return (List<ToManyFkDep>)readProperty(DEPS_PROPERTY);
     }
-    
-    
+
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ToOneFK1.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ToOneFK1.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ToOneFK1.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ToOneFK1.java Mon Dec 19 13:44:27 2011
@@ -1,23 +1,27 @@
 package org.apache.cayenne.testdo.relationship.auto;
 
-/** 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 class _ToOneFK1 extends org.apache.cayenne.CayenneDataObject {
+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(org.apache.cayenne.testdo.relationship.ToOneFK2 toPK) {
-        setToOneTarget("toPK", toPK, true);
+    public void setToPK(ToOneFK2 toPK) {
+        setToOneTarget(TO_PK_PROPERTY, toPK, true);
+    }
+
+    public ToOneFK2 getToPK() {
+        return (ToOneFK2)readProperty(TO_PK_PROPERTY);
     }
 
-    public org.apache.cayenne.testdo.relationship.ToOneFK2 getToPK() {
-        return (org.apache.cayenne.testdo.relationship.ToOneFK2)readProperty("toPK");
-    } 
-    
-    
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ToOneFK2.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ToOneFK2.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ToOneFK2.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ToOneFK2.java Mon Dec 19 13:44:27 2011
@@ -1,23 +1,27 @@
 package org.apache.cayenne.testdo.relationship.auto;
 
-/** 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 class _ToOneFK2 extends org.apache.cayenne.CayenneDataObject {
+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(org.apache.cayenne.testdo.relationship.ToOneFK1 toOneToFK) {
-        setToOneTarget("toOneToFK", toOneToFK, true);
+    public void setToOneToFK(ToOneFK1 toOneToFK) {
+        setToOneTarget(TO_ONE_TO_FK_PROPERTY, toOneToFK, true);
+    }
+
+    public ToOneFK1 getToOneToFK() {
+        return (ToOneFK1)readProperty(TO_ONE_TO_FK_PROPERTY);
     }
 
-    public org.apache.cayenne.testdo.relationship.ToOneFK1 getToOneToFK() {
-        return (org.apache.cayenne.testdo.relationship.ToOneFK1)readProperty("toOneToFK");
-    } 
-    
-    
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ArraysEntity.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ArraysEntity.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ArraysEntity.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ArraysEntity.java Mon Dec 19 13:44:27 2011
@@ -1,11 +1,14 @@
 package org.apache.cayenne.testdo.testmap.auto;
 
-/** Class _ArraysEntity 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 _ArraysEntity extends org.apache.cayenne.CayenneDataObject {
+import org.apache.cayenne.CayenneDataObject;
+
+/**
+ * Class _ArraysEntity 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 _ArraysEntity extends CayenneDataObject {
 
     public static final String BYTE_ARRAY_PROPERTY = "byteArray";
     public static final String BYTE_WRAPPER_ARRAY_PROPERTY = "byteWrapperArray";
@@ -15,35 +18,31 @@ public abstract class _ArraysEntity exte
     public static final String ID_PK_COLUMN = "ID";
 
     public void setByteArray(byte[] byteArray) {
-        writeProperty("byteArray", byteArray);
+        writeProperty(BYTE_ARRAY_PROPERTY, byteArray);
     }
     public byte[] getByteArray() {
-        return (byte[])readProperty("byteArray");
+        return (byte[])readProperty(BYTE_ARRAY_PROPERTY);
     }
-    
-    
+
     public void setByteWrapperArray(Byte[] byteWrapperArray) {
-        writeProperty("byteWrapperArray", byteWrapperArray);
+        writeProperty(BYTE_WRAPPER_ARRAY_PROPERTY, byteWrapperArray);
     }
     public Byte[] getByteWrapperArray() {
-        return (Byte[])readProperty("byteWrapperArray");
+        return (Byte[])readProperty(BYTE_WRAPPER_ARRAY_PROPERTY);
     }
-    
-    
+
     public void setCharArray(char[] charArray) {
-        writeProperty("charArray", charArray);
+        writeProperty(CHAR_ARRAY_PROPERTY, charArray);
     }
     public char[] getCharArray() {
-        return (char[])readProperty("charArray");
+        return (char[])readProperty(CHAR_ARRAY_PROPERTY);
     }
-    
-    
+
     public void setCharWrapperArray(Character[] charWrapperArray) {
-        writeProperty("charWrapperArray", charWrapperArray);
+        writeProperty(CHAR_WRAPPER_ARRAY_PROPERTY, charWrapperArray);
     }
     public Character[] getCharWrapperArray() {
-        return (Character[])readProperty("charWrapperArray");
+        return (Character[])readProperty(CHAR_WRAPPER_ARRAY_PROPERTY);
     }
-    
-    
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ArtGroup.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ArtGroup.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ArtGroup.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ArtGroup.java Mon Dec 19 13:44:27 2011
@@ -1,11 +1,18 @@
 package org.apache.cayenne.testdo.testmap.auto;
 
-/** Class _ArtGroup 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 _ArtGroup extends org.apache.cayenne.CayenneDataObject {
+import java.util.List;
+
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.testdo.testmap.ArtGroup;
+import org.apache.cayenne.testdo.testmap.Artist;
+
+/**
+ * Class _ArtGroup 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 _ArtGroup extends CayenneDataObject {
 
     public static final String NAME_PROPERTY = "name";
     public static final String ARTIST_ARRAY_PROPERTY = "artistArray";
@@ -15,42 +22,43 @@ public abstract class _ArtGroup extends 
     public static final String GROUP_ID_PK_COLUMN = "GROUP_ID";
 
     public void setName(String name) {
-        writeProperty("name", name);
+        writeProperty(NAME_PROPERTY, name);
     }
     public String getName() {
-        return (String)readProperty("name");
+        return (String)readProperty(NAME_PROPERTY);
     }
-    
-    
-    public void addToArtistArray(org.apache.cayenne.testdo.testmap.Artist obj) {
-        addToManyTarget("artistArray", obj, true);
+
+    public void addToArtistArray(Artist obj) {
+        addToManyTarget(ARTIST_ARRAY_PROPERTY, obj, true);
     }
-    public void removeFromArtistArray(org.apache.cayenne.testdo.testmap.Artist obj) {
-        removeToManyTarget("artistArray", obj, true);
+    public void removeFromArtistArray(Artist obj) {
+        removeToManyTarget(ARTIST_ARRAY_PROPERTY, obj, true);
     }
-    public java.util.List getArtistArray() {
-        return (java.util.List)readProperty("artistArray");
+    @SuppressWarnings("unchecked")
+    public List<Artist> getArtistArray() {
+        return (List<Artist>)readProperty(ARTIST_ARRAY_PROPERTY);
+    }
+
+
+    public void addToChildGroupsArray(ArtGroup obj) {
+        addToManyTarget(CHILD_GROUPS_ARRAY_PROPERTY, obj, true);
     }
-    
-    
-    public void addToChildGroupsArray(org.apache.cayenne.testdo.testmap.ArtGroup obj) {
-        addToManyTarget("childGroupsArray", obj, true);
+    public void removeFromChildGroupsArray(ArtGroup obj) {
+        removeToManyTarget(CHILD_GROUPS_ARRAY_PROPERTY, obj, true);
     }
-    public void removeFromChildGroupsArray(org.apache.cayenne.testdo.testmap.ArtGroup obj) {
-        removeToManyTarget("childGroupsArray", obj, true);
+    @SuppressWarnings("unchecked")
+    public List<ArtGroup> getChildGroupsArray() {
+        return (List<ArtGroup>)readProperty(CHILD_GROUPS_ARRAY_PROPERTY);
     }
-    public java.util.List getChildGroupsArray() {
-        return (java.util.List)readProperty("childGroupsArray");
+
+
+    public void setToParentGroup(ArtGroup toParentGroup) {
+        setToOneTarget(TO_PARENT_GROUP_PROPERTY, toParentGroup, true);
     }
-    
-    
-    public void setToParentGroup(org.apache.cayenne.testdo.testmap.ArtGroup toParentGroup) {
-        setToOneTarget("toParentGroup", toParentGroup, true);
+
+    public ArtGroup getToParentGroup() {
+        return (ArtGroup)readProperty(TO_PARENT_GROUP_PROPERTY);
     }
 
-    public org.apache.cayenne.testdo.testmap.ArtGroup getToParentGroup() {
-        return (org.apache.cayenne.testdo.testmap.ArtGroup)readProperty("toParentGroup");
-    } 
-    
-    
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Artist.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Artist.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Artist.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Artist.java Mon Dec 19 13:44:27 2011
@@ -25,52 +25,52 @@ public abstract class _Artist extends Ca
     public static final String ARTIST_ID_PK_COLUMN = "ARTIST_ID";
 
     public void setArtistName(String artistName) {
-        writeProperty("artistName", artistName);
+        writeProperty(ARTIST_NAME_PROPERTY, artistName);
     }
     public String getArtistName() {
-        return (String)readProperty("artistName");
+        return (String)readProperty(ARTIST_NAME_PROPERTY);
     }
 
     public void setDateOfBirth(Date dateOfBirth) {
-        writeProperty("dateOfBirth", dateOfBirth);
+        writeProperty(DATE_OF_BIRTH_PROPERTY, dateOfBirth);
     }
     public Date getDateOfBirth() {
-        return (Date)readProperty("dateOfBirth");
+        return (Date)readProperty(DATE_OF_BIRTH_PROPERTY);
     }
 
     public void addToArtistExhibitArray(ArtistExhibit obj) {
-        addToManyTarget("artistExhibitArray", obj, true);
+        addToManyTarget(ARTIST_EXHIBIT_ARRAY_PROPERTY, obj, true);
     }
     public void removeFromArtistExhibitArray(ArtistExhibit obj) {
-        removeToManyTarget("artistExhibitArray", obj, true);
+        removeToManyTarget(ARTIST_EXHIBIT_ARRAY_PROPERTY, obj, true);
     }
     @SuppressWarnings("unchecked")
     public List<ArtistExhibit> getArtistExhibitArray() {
-        return (List<ArtistExhibit>)readProperty("artistExhibitArray");
+        return (List<ArtistExhibit>)readProperty(ARTIST_EXHIBIT_ARRAY_PROPERTY);
     }
 
 
     public void addToGroupArray(ArtGroup obj) {
-        addToManyTarget("groupArray", obj, true);
+        addToManyTarget(GROUP_ARRAY_PROPERTY, obj, true);
     }
     public void removeFromGroupArray(ArtGroup obj) {
-        removeToManyTarget("groupArray", obj, true);
+        removeToManyTarget(GROUP_ARRAY_PROPERTY, obj, true);
     }
     @SuppressWarnings("unchecked")
     public List<ArtGroup> getGroupArray() {
-        return (List<ArtGroup>)readProperty("groupArray");
+        return (List<ArtGroup>)readProperty(GROUP_ARRAY_PROPERTY);
     }
 
 
     public void addToPaintingArray(Painting obj) {
-        addToManyTarget("paintingArray", obj, true);
+        addToManyTarget(PAINTING_ARRAY_PROPERTY, obj, true);
     }
     public void removeFromPaintingArray(Painting obj) {
-        removeToManyTarget("paintingArray", obj, true);
+        removeToManyTarget(PAINTING_ARRAY_PROPERTY, obj, true);
     }
     @SuppressWarnings("unchecked")
     public List<Painting> getPaintingArray() {
-        return (List<Painting>)readProperty("paintingArray");
+        return (List<Painting>)readProperty(PAINTING_ARRAY_PROPERTY);
     }
 
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ArtistExhibit.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ArtistExhibit.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ArtistExhibit.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ArtistExhibit.java Mon Dec 19 13:44:27 2011
@@ -1,11 +1,16 @@
 package org.apache.cayenne.testdo.testmap.auto;
 
-/** Class _ArtistExhibit 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 _ArtistExhibit extends org.apache.cayenne.CayenneDataObject {
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.testdo.testmap.Artist;
+import org.apache.cayenne.testdo.testmap.Exhibit;
+
+/**
+ * Class _ArtistExhibit 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 _ArtistExhibit extends CayenneDataObject {
 
     public static final String TO_ARTIST_PROPERTY = "toArtist";
     public static final String TO_EXHIBIT_PROPERTY = "toExhibit";
@@ -13,22 +18,22 @@ public abstract class _ArtistExhibit ext
     public static final String ARTIST_ID_PK_COLUMN = "ARTIST_ID";
     public static final String EXHIBIT_ID_PK_COLUMN = "EXHIBIT_ID";
 
-    public void setToArtist(org.apache.cayenne.testdo.testmap.Artist toArtist) {
-        setToOneTarget("toArtist", toArtist, true);
+    public void setToArtist(Artist toArtist) {
+        setToOneTarget(TO_ARTIST_PROPERTY, toArtist, true);
     }
 
-    public org.apache.cayenne.testdo.testmap.Artist getToArtist() {
-        return (org.apache.cayenne.testdo.testmap.Artist)readProperty("toArtist");
-    } 
-    
-    
-    public void setToExhibit(org.apache.cayenne.testdo.testmap.Exhibit toExhibit) {
-        setToOneTarget("toExhibit", toExhibit, true);
+    public Artist getToArtist() {
+        return (Artist)readProperty(TO_ARTIST_PROPERTY);
     }
 
-    public org.apache.cayenne.testdo.testmap.Exhibit getToExhibit() {
-        return (org.apache.cayenne.testdo.testmap.Exhibit)readProperty("toExhibit");
-    } 
-    
-    
+
+    public void setToExhibit(Exhibit toExhibit) {
+        setToOneTarget(TO_EXHIBIT_PROPERTY, toExhibit, true);
+    }
+
+    public Exhibit getToExhibit() {
+        return (Exhibit)readProperty(TO_EXHIBIT_PROPERTY);
+    }
+
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CharacterEntity.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CharacterEntity.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CharacterEntity.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CharacterEntity.java Mon Dec 19 13:44:27 2011
@@ -1,22 +1,24 @@
 package org.apache.cayenne.testdo.testmap.auto;
 
-/** Class _CharacterEntity 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 _CharacterEntity extends org.apache.cayenne.CayenneDataObject {
+import org.apache.cayenne.CayenneDataObject;
+
+/**
+ * Class _CharacterEntity 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 _CharacterEntity extends CayenneDataObject {
 
     public static final String CHARACTER_FIELD_PROPERTY = "characterField";
 
     public static final String ID_PK_COLUMN = "ID";
 
     public void setCharacterField(Character characterField) {
-        writeProperty("characterField", characterField);
+        writeProperty(CHARACTER_FIELD_PROPERTY, characterField);
     }
     public Character getCharacterField() {
-        return (Character)readProperty("characterField");
+        return (Character)readProperty(CHARACTER_FIELD_PROPERTY);
     }
-    
-    
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_DateTestEntity.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_DateTestEntity.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_DateTestEntity.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_DateTestEntity.java Mon Dec 19 13:44:27 2011
@@ -1,11 +1,16 @@
 package org.apache.cayenne.testdo.testmap.auto;
 
-/** Class _DateTestEntity 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 _DateTestEntity extends org.apache.cayenne.CayenneDataObject {
+import java.util.Date;
+
+import org.apache.cayenne.CayenneDataObject;
+
+/**
+ * Class _DateTestEntity 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 _DateTestEntity extends CayenneDataObject {
 
     public static final String DATE_COLUMN_PROPERTY = "dateColumn";
     public static final String TIME_COLUMN_PROPERTY = "timeColumn";
@@ -13,28 +18,25 @@ public abstract class _DateTestEntity ex
 
     public static final String DATE_TEST_ID_PK_COLUMN = "DATE_TEST_ID";
 
-    public void setDateColumn(java.util.Date dateColumn) {
-        writeProperty("dateColumn", dateColumn);
+    public void setDateColumn(Date dateColumn) {
+        writeProperty(DATE_COLUMN_PROPERTY, dateColumn);
     }
-    public java.util.Date getDateColumn() {
-        return (java.util.Date)readProperty("dateColumn");
+    public Date getDateColumn() {
+        return (Date)readProperty(DATE_COLUMN_PROPERTY);
     }
-    
-    
-    public void setTimeColumn(java.util.Date timeColumn) {
-        writeProperty("timeColumn", timeColumn);
-    }
-    public java.util.Date getTimeColumn() {
-        return (java.util.Date)readProperty("timeColumn");
-    }
-    
-    
-    public void setTimestampColumn(java.util.Date timestampColumn) {
-        writeProperty("timestampColumn", timestampColumn);
+
+    public void setTimeColumn(Date timeColumn) {
+        writeProperty(TIME_COLUMN_PROPERTY, timeColumn);
     }
-    public java.util.Date getTimestampColumn() {
-        return (java.util.Date)readProperty("timestampColumn");
+    public Date getTimeColumn() {
+        return (Date)readProperty(TIME_COLUMN_PROPERTY);
     }
-    
-    
+
+    public void setTimestampColumn(Date timestampColumn) {
+        writeProperty(TIMESTAMP_COLUMN_PROPERTY, timestampColumn);
+    }
+    public Date getTimestampColumn() {
+        return (Date)readProperty(TIMESTAMP_COLUMN_PROPERTY);
+    }
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_EnumEntity.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_EnumEntity.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_EnumEntity.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_EnumEntity.java Mon Dec 19 13:44:27 2011
@@ -16,10 +16,10 @@ public abstract class _EnumEntity extend
     public static final String ID_PK_COLUMN = "ID";
 
     public void setEnumAttribute(Enum1 enumAttribute) {
-        writeProperty("enumAttribute", enumAttribute);
+        writeProperty(ENUM_ATTRIBUTE_PROPERTY, enumAttribute);
     }
     public Enum1 getEnumAttribute() {
-        return (Enum1)readProperty("enumAttribute");
+        return (Enum1)readProperty(ENUM_ATTRIBUTE_PROPERTY);
     }
 
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Exhibit.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Exhibit.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Exhibit.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Exhibit.java Mon Dec 19 13:44:27 2011
@@ -1,11 +1,19 @@
 package org.apache.cayenne.testdo.testmap.auto;
 
-/** Class _Exhibit 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 _Exhibit extends org.apache.cayenne.CayenneDataObject {
+import java.util.Date;
+import java.util.List;
+
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.testdo.testmap.ArtistExhibit;
+import org.apache.cayenne.testdo.testmap.Gallery;
+
+/**
+ * Class _Exhibit 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 _Exhibit extends CayenneDataObject {
 
     public static final String CLOSING_DATE_PROPERTY = "closingDate";
     public static final String OPENING_DATE_PROPERTY = "openingDate";
@@ -14,40 +22,39 @@ public abstract class _Exhibit extends o
 
     public static final String EXHIBIT_ID_PK_COLUMN = "EXHIBIT_ID";
 
-    public void setClosingDate(java.util.Date closingDate) {
-        writeProperty("closingDate", closingDate);
+    public void setClosingDate(Date closingDate) {
+        writeProperty(CLOSING_DATE_PROPERTY, closingDate);
+    }
+    public Date getClosingDate() {
+        return (Date)readProperty(CLOSING_DATE_PROPERTY);
+    }
+
+    public void setOpeningDate(Date openingDate) {
+        writeProperty(OPENING_DATE_PROPERTY, openingDate);
+    }
+    public Date getOpeningDate() {
+        return (Date)readProperty(OPENING_DATE_PROPERTY);
+    }
+
+    public void addToArtistExhibitArray(ArtistExhibit obj) {
+        addToManyTarget(ARTIST_EXHIBIT_ARRAY_PROPERTY, obj, true);
     }
-    public java.util.Date getClosingDate() {
-        return (java.util.Date)readProperty("closingDate");
+    public void removeFromArtistExhibitArray(ArtistExhibit obj) {
+        removeToManyTarget(ARTIST_EXHIBIT_ARRAY_PROPERTY, obj, true);
     }
-    
-    
-    public void setOpeningDate(java.util.Date openingDate) {
-        writeProperty("openingDate", openingDate);
-    }
-    public java.util.Date getOpeningDate() {
-        return (java.util.Date)readProperty("openingDate");
-    }
-    
-    
-    public void addToArtistExhibitArray(org.apache.cayenne.testdo.testmap.ArtistExhibit obj) {
-        addToManyTarget("artistExhibitArray", obj, true);
-    }
-    public void removeFromArtistExhibitArray(org.apache.cayenne.testdo.testmap.ArtistExhibit obj) {
-        removeToManyTarget("artistExhibitArray", obj, true);
-    }
-    public java.util.List getArtistExhibitArray() {
-        return (java.util.List)readProperty("artistExhibitArray");
-    }
-    
-    
-    public void setToGallery(org.apache.cayenne.testdo.testmap.Gallery toGallery) {
-        setToOneTarget("toGallery", toGallery, true);
-    }
-
-    public org.apache.cayenne.testdo.testmap.Gallery getToGallery() {
-        return (org.apache.cayenne.testdo.testmap.Gallery)readProperty("toGallery");
-    } 
-    
-    
+    @SuppressWarnings("unchecked")
+    public List<ArtistExhibit> getArtistExhibitArray() {
+        return (List<ArtistExhibit>)readProperty(ARTIST_EXHIBIT_ARRAY_PROPERTY);
+    }
+
+
+    public void setToGallery(Gallery toGallery) {
+        setToOneTarget(TO_GALLERY_PROPERTY, toGallery, true);
+    }
+
+    public Gallery getToGallery() {
+        return (Gallery)readProperty(TO_GALLERY_PROPERTY);
+    }
+
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Gallery.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Gallery.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Gallery.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Gallery.java Mon Dec 19 13:44:27 2011
@@ -1,11 +1,18 @@
 package org.apache.cayenne.testdo.testmap.auto;
 
-/** Class _Gallery 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 _Gallery extends org.apache.cayenne.CayenneDataObject {
+import java.util.List;
+
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.testdo.testmap.Exhibit;
+import org.apache.cayenne.testdo.testmap.Painting;
+
+/**
+ * Class _Gallery 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 _Gallery extends CayenneDataObject {
 
     public static final String GALLERY_NAME_PROPERTY = "galleryName";
     public static final String EXHIBIT_ARRAY_PROPERTY = "exhibitArray";
@@ -14,33 +21,34 @@ public abstract class _Gallery extends o
     public static final String GALLERY_ID_PK_COLUMN = "GALLERY_ID";
 
     public void setGalleryName(String galleryName) {
-        writeProperty("galleryName", galleryName);
+        writeProperty(GALLERY_NAME_PROPERTY, galleryName);
     }
     public String getGalleryName() {
-        return (String)readProperty("galleryName");
+        return (String)readProperty(GALLERY_NAME_PROPERTY);
     }
-    
-    
-    public void addToExhibitArray(org.apache.cayenne.testdo.testmap.Exhibit obj) {
-        addToManyTarget("exhibitArray", obj, true);
+
+    public void addToExhibitArray(Exhibit obj) {
+        addToManyTarget(EXHIBIT_ARRAY_PROPERTY, obj, true);
     }
-    public void removeFromExhibitArray(org.apache.cayenne.testdo.testmap.Exhibit obj) {
-        removeToManyTarget("exhibitArray", obj, true);
+    public void removeFromExhibitArray(Exhibit obj) {
+        removeToManyTarget(EXHIBIT_ARRAY_PROPERTY, obj, true);
     }
-    public java.util.List getExhibitArray() {
-        return (java.util.List)readProperty("exhibitArray");
+    @SuppressWarnings("unchecked")
+    public List<Exhibit> getExhibitArray() {
+        return (List<Exhibit>)readProperty(EXHIBIT_ARRAY_PROPERTY);
     }
-    
-    
-    public void addToPaintingArray(org.apache.cayenne.testdo.testmap.Painting obj) {
-        addToManyTarget("paintingArray", obj, true);
+
+
+    public void addToPaintingArray(Painting obj) {
+        addToManyTarget(PAINTING_ARRAY_PROPERTY, obj, true);
     }
-    public void removeFromPaintingArray(org.apache.cayenne.testdo.testmap.Painting obj) {
-        removeToManyTarget("paintingArray", obj, true);
+    public void removeFromPaintingArray(Painting obj) {
+        removeToManyTarget(PAINTING_ARRAY_PROPERTY, obj, true);
     }
-    public java.util.List getPaintingArray() {
-        return (java.util.List)readProperty("paintingArray");
+    @SuppressWarnings("unchecked")
+    public List<Painting> getPaintingArray() {
+        return (List<Painting>)readProperty(PAINTING_ARRAY_PROPERTY);
     }
-    
-    
+
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Painting.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Painting.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Painting.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Painting.java Mon Dec 19 13:44:27 2011
@@ -1,11 +1,19 @@
 package org.apache.cayenne.testdo.testmap.auto;
 
-/** Class _Painting 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 _Painting extends org.apache.cayenne.testdo.testmap.ArtDataObject {
+import java.math.BigDecimal;
+
+import org.apache.cayenne.testdo.testmap.ArtDataObject;
+import org.apache.cayenne.testdo.testmap.Artist;
+import org.apache.cayenne.testdo.testmap.Gallery;
+import org.apache.cayenne.testdo.testmap.PaintingInfo;
+
+/**
+ * Class _Painting 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 _Painting extends ArtDataObject {
 
     public static final String ESTIMATED_PRICE_PROPERTY = "estimatedPrice";
     public static final String PAINTING_DESCRIPTION_PROPERTY = "paintingDescription";
@@ -16,55 +24,52 @@ public abstract class _Painting extends 
 
     public static final String PAINTING_ID_PK_COLUMN = "PAINTING_ID";
 
-    public void setEstimatedPrice(java.math.BigDecimal estimatedPrice) {
-        writeProperty("estimatedPrice", estimatedPrice);
+    public void setEstimatedPrice(BigDecimal estimatedPrice) {
+        writeProperty(ESTIMATED_PRICE_PROPERTY, estimatedPrice);
     }
-    public java.math.BigDecimal getEstimatedPrice() {
-        return (java.math.BigDecimal)readProperty("estimatedPrice");
+    public BigDecimal getEstimatedPrice() {
+        return (BigDecimal)readProperty(ESTIMATED_PRICE_PROPERTY);
     }
-    
-    
+
     public void setPaintingDescription(String paintingDescription) {
-        writeProperty("paintingDescription", paintingDescription);
+        writeProperty(PAINTING_DESCRIPTION_PROPERTY, paintingDescription);
     }
     public String getPaintingDescription() {
-        return (String)readProperty("paintingDescription");
+        return (String)readProperty(PAINTING_DESCRIPTION_PROPERTY);
     }
-    
-    
+
     public void setPaintingTitle(String paintingTitle) {
-        writeProperty("paintingTitle", paintingTitle);
+        writeProperty(PAINTING_TITLE_PROPERTY, paintingTitle);
     }
     public String getPaintingTitle() {
-        return (String)readProperty("paintingTitle");
+        return (String)readProperty(PAINTING_TITLE_PROPERTY);
+    }
+
+    public void setToArtist(Artist toArtist) {
+        setToOneTarget(TO_ARTIST_PROPERTY, toArtist, true);
+    }
+
+    public Artist getToArtist() {
+        return (Artist)readProperty(TO_ARTIST_PROPERTY);
+    }
+
+
+    public void setToGallery(Gallery toGallery) {
+        setToOneTarget(TO_GALLERY_PROPERTY, toGallery, true);
     }
-    
-    
-    public void setToArtist(org.apache.cayenne.testdo.testmap.Artist toArtist) {
-        setToOneTarget("toArtist", toArtist, true);
-    }
-
-    public org.apache.cayenne.testdo.testmap.Artist getToArtist() {
-        return (org.apache.cayenne.testdo.testmap.Artist)readProperty("toArtist");
-    } 
-    
-    
-    public void setToGallery(org.apache.cayenne.testdo.testmap.Gallery toGallery) {
-        setToOneTarget("toGallery", toGallery, true);
-    }
-
-    public org.apache.cayenne.testdo.testmap.Gallery getToGallery() {
-        return (org.apache.cayenne.testdo.testmap.Gallery)readProperty("toGallery");
-    } 
-    
-    
-    public void setToPaintingInfo(org.apache.cayenne.testdo.testmap.PaintingInfo toPaintingInfo) {
-        setToOneTarget("toPaintingInfo", toPaintingInfo, true);
-    }
-
-    public org.apache.cayenne.testdo.testmap.PaintingInfo getToPaintingInfo() {
-        return (org.apache.cayenne.testdo.testmap.PaintingInfo)readProperty("toPaintingInfo");
-    } 
-    
-    
+
+    public Gallery getToGallery() {
+        return (Gallery)readProperty(TO_GALLERY_PROPERTY);
+    }
+
+
+    public void setToPaintingInfo(PaintingInfo toPaintingInfo) {
+        setToOneTarget(TO_PAINTING_INFO_PROPERTY, toPaintingInfo, true);
+    }
+
+    public PaintingInfo getToPaintingInfo() {
+        return (PaintingInfo)readProperty(TO_PAINTING_INFO_PROPERTY);
+    }
+
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Painting1.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Painting1.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Painting1.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Painting1.java Mon Dec 19 13:44:27 2011
@@ -1,11 +1,17 @@
 package org.apache.cayenne.testdo.testmap.auto;
 
-/** Class _Painting1 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 _Painting1 extends org.apache.cayenne.CayenneDataObject {
+import java.math.BigDecimal;
+
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.testdo.testmap.Artist;
+
+/**
+ * Class _Painting1 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 _Painting1 extends CayenneDataObject {
 
     public static final String ESTIMATED_PRICE_PROPERTY = "estimatedPrice";
     public static final String PAINTING_TITLE_PROPERTY = "paintingTitle";
@@ -13,29 +19,27 @@ public abstract class _Painting1 extends
 
     public static final String PAINTING_ID_PK_COLUMN = "PAINTING_ID";
 
-    public void setEstimatedPrice(java.math.BigDecimal estimatedPrice) {
-        writeProperty("estimatedPrice", estimatedPrice);
+    public void setEstimatedPrice(BigDecimal estimatedPrice) {
+        writeProperty(ESTIMATED_PRICE_PROPERTY, estimatedPrice);
     }
-    public java.math.BigDecimal getEstimatedPrice() {
-        return (java.math.BigDecimal)readProperty("estimatedPrice");
+    public BigDecimal getEstimatedPrice() {
+        return (BigDecimal)readProperty(ESTIMATED_PRICE_PROPERTY);
     }
-    
-    
+
     public void setPaintingTitle(String paintingTitle) {
-        writeProperty("paintingTitle", paintingTitle);
+        writeProperty(PAINTING_TITLE_PROPERTY, paintingTitle);
     }
     public String getPaintingTitle() {
-        return (String)readProperty("paintingTitle");
+        return (String)readProperty(PAINTING_TITLE_PROPERTY);
     }
-    
-    
-    public void setToArtist(org.apache.cayenne.testdo.testmap.Artist toArtist) {
-        setToOneTarget("toArtist", toArtist, true);
+
+    public void setToArtist(Artist toArtist) {
+        setToOneTarget(TO_ARTIST_PROPERTY, toArtist, true);
     }
 
-    public org.apache.cayenne.testdo.testmap.Artist getToArtist() {
-        return (org.apache.cayenne.testdo.testmap.Artist)readProperty("toArtist");
-    } 
-    
-    
+    public Artist getToArtist() {
+        return (Artist)readProperty(TO_ARTIST_PROPERTY);
+    }
+
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_PaintingInfo.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_PaintingInfo.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_PaintingInfo.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_PaintingInfo.java Mon Dec 19 13:44:27 2011
@@ -1,11 +1,15 @@
 package org.apache.cayenne.testdo.testmap.auto;
 
-/** Class _PaintingInfo 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 _PaintingInfo extends org.apache.cayenne.CayenneDataObject {
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.testdo.testmap.Painting;
+
+/**
+ * Class _PaintingInfo 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 _PaintingInfo extends CayenneDataObject {
 
     public static final String IMAGE_BLOB_PROPERTY = "imageBlob";
     public static final String TEXT_REVIEW_PROPERTY = "textReview";
@@ -14,28 +18,26 @@ public abstract class _PaintingInfo exte
     public static final String PAINTING_ID_PK_COLUMN = "PAINTING_ID";
 
     public void setImageBlob(byte[] imageBlob) {
-        writeProperty("imageBlob", imageBlob);
+        writeProperty(IMAGE_BLOB_PROPERTY, imageBlob);
     }
     public byte[] getImageBlob() {
-        return (byte[])readProperty("imageBlob");
+        return (byte[])readProperty(IMAGE_BLOB_PROPERTY);
     }
-    
-    
+
     public void setTextReview(String textReview) {
-        writeProperty("textReview", textReview);
+        writeProperty(TEXT_REVIEW_PROPERTY, textReview);
     }
     public String getTextReview() {
-        return (String)readProperty("textReview");
+        return (String)readProperty(TEXT_REVIEW_PROPERTY);
+    }
+
+    public void setPainting(Painting painting) {
+        setToOneTarget(PAINTING_PROPERTY, painting, true);
     }
-    
-    
-    public void setPainting(org.apache.cayenne.testdo.testmap.Painting painting) {
-        setToOneTarget("painting", painting, true);
+
+    public Painting getPainting() {
+        return (Painting)readProperty(PAINTING_PROPERTY);
     }
 
-    public org.apache.cayenne.testdo.testmap.Painting getPainting() {
-        return (org.apache.cayenne.testdo.testmap.Painting)readProperty("painting");
-    } 
-    
-    
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_SubPainting.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_SubPainting.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_SubPainting.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_SubPainting.java Mon Dec 19 13:44:27 2011
@@ -1,22 +1,24 @@
 package org.apache.cayenne.testdo.testmap.auto;
 
-/** Class _SubPainting 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 _SubPainting extends org.apache.cayenne.CayenneDataObject {
+import org.apache.cayenne.CayenneDataObject;
+
+/**
+ * Class _SubPainting 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 _SubPainting extends CayenneDataObject {
 
     public static final String PAINTING_TITLE_PROPERTY = "paintingTitle";
 
     public static final String PAINTING_ID_PK_COLUMN = "PAINTING_ID";
 
     public void setPaintingTitle(String paintingTitle) {
-        writeProperty("paintingTitle", paintingTitle);
+        writeProperty(PAINTING_TITLE_PROPERTY, paintingTitle);
     }
     public String getPaintingTitle() {
-        return (String)readProperty("paintingTitle");
+        return (String)readProperty(PAINTING_TITLE_PROPERTY);
     }
-    
-    
+
 }