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 [1/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...

Author: oltka
Date: Mon Dec 19 13:44:27 2011
New Revision: 1220741

URL: http://svn.apache.org/viewvc?rev=1220741&view=rev
Log:
CAY-1625 regenerate all client classes in cayenne-jdk1.5-unpublished

Modified:
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/db1/auto/_CrossdbM1E1.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/db2/auto/_CrossdbM2E1.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/db2/auto/_CrossdbM2E2.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/embeddable/auto/_EmbedEntity1.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/generic/auto/_Generic.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inherit/auto/_AbstractPerson.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inherit/auto/_Address.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inherit/auto/_BaseEntity.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inherit/auto/_ClientCompany.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inherit/auto/_CustomerRepresentative.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inherit/auto/_Department.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inherit/auto/_DirectToSubEntity.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inherit/auto/_Employee.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inherit/auto/_Manager.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inherit/auto/_PersonNotes.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inherit/auto/_RelatedEntity.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inheritance/vertical/auto/_Iv1Root.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inheritance/vertical/auto/_Iv1Sub1.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inheritance/vertical/auto/_IvRoot.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inheritance/vertical/auto/_IvSub1.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inheritance/vertical/auto/_IvSub1Sub1.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inheritance/vertical/auto/_IvSub2.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_Group.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_GroupProperties.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_Role.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_User.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_UserProperties.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/locking/auto/_DateLockingTestEntity.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/locking/auto/_LockingHelper.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/locking/auto/_RelLockingTestEntity.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/locking/auto/_SimpleLockingTestEntity.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/locking/auto/_SoftTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/locking/auto/_TimeLockingTestEntity.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtDeleteCascade.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtDeleteDeny.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtDeleteNullify.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtDeleteRule.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtLifecycles.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtMapToMany.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtMapToManyTarget.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtMeaningfulPk.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtReflexive.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable1.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable1Subclass.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable2.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable3.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable4.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable5.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTablePrimitives.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTooneDep.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTooneMaster.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/qualified/auto/_Qualified1.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/qualified/auto/_Qualified2.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/quotemap/auto/_QuoteAdress.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/quotemap/auto/_Quote_Person.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_Child.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ClobDetail.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ClobMaster.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_CollectionToMany.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_CollectionToManyTarget.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_DeleteRuleFlatA.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_DeleteRuleFlatB.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_DeleteRuleTest1.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_DeleteRuleTest2.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_DeleteRuleTest3.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_FkOfDifferentType.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_FlattenedCircular.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_FlattenedTest1.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_FlattenedTest2.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_FlattenedTest3.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_FlattenedTest4.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_IdMapToMany.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_IdMapToManyTarget.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_MapToMany.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_MapToManyTarget.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_Master.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_MeaningfulFK.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ReflexiveAndToOne.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_RelationshipHelper.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_SetToMany.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_SetToManyTarget.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ToManyFkDep.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ToManyFkRoot.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ToManyRoot2.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ToOneFK1.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/relationship/auto/_ToOneFK2.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ArraysEntity.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ArtGroup.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Artist.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ArtistExhibit.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CharacterEntity.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_DateTestEntity.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_EnumEntity.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Exhibit.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Gallery.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Painting.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Painting1.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_PaintingInfo.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_SubPainting.java

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/db1/auto/_CrossdbM1E1.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/db1/auto/_CrossdbM1E1.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/db1/auto/_CrossdbM1E1.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/db1/auto/_CrossdbM1E1.java Mon Dec 19 13:44:27 2011
@@ -21,33 +21,33 @@ public abstract class _CrossdbM1E1 exten
     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 addToFlattened(CrossdbM2E1 obj) {
-        addToManyTarget("flattened", obj, true);
+        addToManyTarget(FLATTENED_PROPERTY, obj, true);
     }
     public void removeFromFlattened(CrossdbM2E1 obj) {
-        removeToManyTarget("flattened", obj, true);
+        removeToManyTarget(FLATTENED_PROPERTY, obj, true);
     }
     @SuppressWarnings("unchecked")
     public List<CrossdbM2E1> getFlattened() {
-        return (List<CrossdbM2E1>)readProperty("flattened");
+        return (List<CrossdbM2E1>)readProperty(FLATTENED_PROPERTY);
     }
 
 
     public void addToListOfM2E2(CrossdbM2E2 obj) {
-        addToManyTarget("listOfM2E2", obj, true);
+        addToManyTarget(LIST_OF_M2E2_PROPERTY, obj, true);
     }
     public void removeFromListOfM2E2(CrossdbM2E2 obj) {
-        removeToManyTarget("listOfM2E2", obj, true);
+        removeToManyTarget(LIST_OF_M2E2_PROPERTY, obj, true);
     }
     @SuppressWarnings("unchecked")
     public List<CrossdbM2E2> getListOfM2E2() {
-        return (List<CrossdbM2E2>)readProperty("listOfM2E2");
+        return (List<CrossdbM2E2>)readProperty(LIST_OF_M2E2_PROPERTY);
     }
 
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/db2/auto/_CrossdbM2E1.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/db2/auto/_CrossdbM2E1.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/db2/auto/_CrossdbM2E1.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/db2/auto/_CrossdbM2E1.java Mon Dec 19 13:44:27 2011
@@ -2,12 +2,16 @@ package org.apache.cayenne.testdo.db2.au
 
 import java.util.List;
 
-/** Class _CrossdbM2E1 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 _CrossdbM2E1 extends org.apache.cayenne.CayenneDataObject {
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.testdo.db2.CrossdbM2E2;
+
+/**
+ * Class _CrossdbM2E1 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 _CrossdbM2E1 extends CayenneDataObject {
 
     public static final String NAME_PROPERTY = "name";
     public static final String LIST_OF_M2E2_PROPERTY = "listOfM2E2";
@@ -15,22 +19,22 @@ public class _CrossdbM2E1 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 addToListOfM2E2(org.apache.cayenne.testdo.db2.CrossdbM2E2 obj) {
-        addToManyTarget("listOfM2E2", obj, true);
+
+    public void addToListOfM2E2(CrossdbM2E2 obj) {
+        addToManyTarget(LIST_OF_M2E2_PROPERTY, obj, true);
     }
-    public void removeFromListOfM2E2(org.apache.cayenne.testdo.db2.CrossdbM2E2 obj) {
-        removeToManyTarget("listOfM2E2", obj, true);
+    public void removeFromListOfM2E2(CrossdbM2E2 obj) {
+        removeToManyTarget(LIST_OF_M2E2_PROPERTY, obj, true);
     }
-    public List getListOfM2E2() {
-        return (List)readProperty("listOfM2E2");
+    @SuppressWarnings("unchecked")
+    public List<CrossdbM2E2> getListOfM2E2() {
+        return (List<CrossdbM2E2>)readProperty(LIST_OF_M2E2_PROPERTY);
     }
-    
-    
+
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/db2/auto/_CrossdbM2E2.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/db2/auto/_CrossdbM2E2.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/db2/auto/_CrossdbM2E2.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/db2/auto/_CrossdbM2E2.java Mon Dec 19 13:44:27 2011
@@ -1,11 +1,16 @@
 package org.apache.cayenne.testdo.db2.auto;
 
-/** Class _CrossdbM2E2 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 _CrossdbM2E2 extends org.apache.cayenne.CayenneDataObject {
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.testdo.db1.CrossdbM1E1;
+import org.apache.cayenne.testdo.db2.CrossdbM2E1;
+
+/**
+ * Class _CrossdbM2E2 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 _CrossdbM2E2 extends CayenneDataObject {
 
     public static final String NAME_PROPERTY = "name";
     public static final String TO_M1E1_PROPERTY = "toM1E1";
@@ -14,29 +19,28 @@ public class _CrossdbM2E2 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 setToM1E1(org.apache.cayenne.testdo.db1.CrossdbM1E1 toM1E1) {
-        setToOneTarget("toM1E1", toM1E1, true);
-    }
-
-    public org.apache.cayenne.testdo.db1.CrossdbM1E1 getToM1E1() {
-        return (org.apache.cayenne.testdo.db1.CrossdbM1E1)readProperty("toM1E1");
-    } 
-    
-    
-    public void setToM2E1(org.apache.cayenne.testdo.db2.CrossdbM2E1 toM2E1) {
-        setToOneTarget("toM2E1", toM2E1, true);
-    }
-
-    public org.apache.cayenne.testdo.db2.CrossdbM2E1 getToM2E1() {
-        return (org.apache.cayenne.testdo.db2.CrossdbM2E1)readProperty("toM2E1");
-    } 
-    
-    
+
+    public void setToM1E1(CrossdbM1E1 toM1E1) {
+        setToOneTarget(TO_M1E1_PROPERTY, toM1E1, true);
+    }
+
+    public CrossdbM1E1 getToM1E1() {
+        return (CrossdbM1E1)readProperty(TO_M1E1_PROPERTY);
+    }
+
+
+    public void setToM2E1(CrossdbM2E1 toM2E1) {
+        setToOneTarget(TO_M2E1_PROPERTY, toM2E1, true);
+    }
+
+    public CrossdbM2E1 getToM2E1() {
+        return (CrossdbM2E1)readProperty(TO_M2E1_PROPERTY);
+    }
+
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/embeddable/auto/_EmbedEntity1.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/embeddable/auto/_EmbedEntity1.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/embeddable/auto/_EmbedEntity1.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/embeddable/auto/_EmbedEntity1.java Mon Dec 19 13:44:27 2011
@@ -3,11 +3,11 @@ package org.apache.cayenne.testdo.embedd
 import org.apache.cayenne.CayenneDataObject;
 import org.apache.cayenne.testdo.embeddable.Embeddable1;
 
-/** 
+/**
  * Class _EmbedEntity1 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. 
+ * 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 _EmbedEntity1 extends CayenneDataObject {
 
@@ -18,24 +18,24 @@ public abstract class _EmbedEntity1 exte
     public static final String ID_PK_COLUMN = "ID";
 
     public void setEmbedded1(Embeddable1 embedded1) {
-        writeProperty("embedded1", embedded1);
+        writeProperty(EMBEDDED1_PROPERTY, embedded1);
     }
     public Embeddable1 getEmbedded1() {
-        return (Embeddable1)readProperty("embedded1");
+        return (Embeddable1)readProperty(EMBEDDED1_PROPERTY);
     }
 
     public void setEmbedded2(Embeddable1 embedded2) {
-        writeProperty("embedded2", embedded2);
+        writeProperty(EMBEDDED2_PROPERTY, embedded2);
     }
     public Embeddable1 getEmbedded2() {
-        return (Embeddable1)readProperty("embedded2");
+        return (Embeddable1)readProperty(EMBEDDED2_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);
     }
 
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/generic/auto/_Generic.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/generic/auto/_Generic.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/generic/auto/_Generic.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/generic/auto/_Generic.java Mon Dec 19 13:44:27 2011
@@ -9,4 +9,4 @@ package org.apache.cayenne.testdo.generi
  * If you need to make any customizations, please use subclass.
  */
 public class _Generic {
-}
+}
\ No newline at end of file

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inherit/auto/_AbstractPerson.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inherit/auto/_AbstractPerson.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inherit/auto/_AbstractPerson.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inherit/auto/_AbstractPerson.java Mon Dec 19 13:44:27 2011
@@ -20,28 +20,28 @@ public abstract class _AbstractPerson ex
     public static final String PERSON_ID_PK_COLUMN = "PERSON_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 setPersonType(String personType) {
-        writeProperty("personType", personType);
+        writeProperty(PERSON_TYPE_PROPERTY, personType);
     }
     public String getPersonType() {
-        return (String)readProperty("personType");
+        return (String)readProperty(PERSON_TYPE_PROPERTY);
     }
 
     public void addToNotes(PersonNotes obj) {
-        addToManyTarget("notes", obj, true);
+        addToManyTarget(NOTES_PROPERTY, obj, true);
     }
     public void removeFromNotes(PersonNotes obj) {
-        removeToManyTarget("notes", obj, true);
+        removeToManyTarget(NOTES_PROPERTY, obj, true);
     }
     @SuppressWarnings("unchecked")
     public List<PersonNotes> getNotes() {
-        return (List<PersonNotes>)readProperty("notes");
+        return (List<PersonNotes>)readProperty(NOTES_PROPERTY);
     }
 
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inherit/auto/_Address.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inherit/auto/_Address.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inherit/auto/_Address.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inherit/auto/_Address.java Mon Dec 19 13:44:27 2011
@@ -17,18 +17,18 @@ public abstract class _Address extends C
     public static final String ADDRESS_ID_PK_COLUMN = "ADDRESS_ID";
 
     public void setCity(String city) {
-        writeProperty("city", city);
+        writeProperty(CITY_PROPERTY, city);
     }
     public String getCity() {
-        return (String)readProperty("city");
+        return (String)readProperty(CITY_PROPERTY);
     }
 
     public void setToEmployee(Employee toEmployee) {
-        setToOneTarget("toEmployee", toEmployee, true);
+        setToOneTarget(TO_EMPLOYEE_PROPERTY, toEmployee, true);
     }
 
     public Employee getToEmployee() {
-        return (Employee)readProperty("toEmployee");
+        return (Employee)readProperty(TO_EMPLOYEE_PROPERTY);
     }
 
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inherit/auto/_BaseEntity.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inherit/auto/_BaseEntity.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inherit/auto/_BaseEntity.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inherit/auto/_BaseEntity.java Mon Dec 19 13:44:27 2011
@@ -19,27 +19,27 @@ public abstract class _BaseEntity extend
     public static final String BASE_ENTITY_ID_PK_COLUMN = "BASE_ENTITY_ID";
 
     public void setEntityType(String entityType) {
-        writeProperty("entityType", entityType);
+        writeProperty(ENTITY_TYPE_PROPERTY, entityType);
     }
     public String getEntityType() {
-        return (String)readProperty("entityType");
+        return (String)readProperty(ENTITY_TYPE_PROPERTY);
     }
 
     public void setToDirectToSubEntity(DirectToSubEntity toDirectToSubEntity) {
-        setToOneTarget("toDirectToSubEntity", toDirectToSubEntity, true);
+        setToOneTarget(TO_DIRECT_TO_SUB_ENTITY_PROPERTY, toDirectToSubEntity, true);
     }
 
     public DirectToSubEntity getToDirectToSubEntity() {
-        return (DirectToSubEntity)readProperty("toDirectToSubEntity");
+        return (DirectToSubEntity)readProperty(TO_DIRECT_TO_SUB_ENTITY_PROPERTY);
     }
 
 
     public void setToRelatedEntity(RelatedEntity toRelatedEntity) {
-        setToOneTarget("toRelatedEntity", toRelatedEntity, true);
+        setToOneTarget(TO_RELATED_ENTITY_PROPERTY, toRelatedEntity, true);
     }
 
     public RelatedEntity getToRelatedEntity() {
-        return (RelatedEntity)readProperty("toRelatedEntity");
+        return (RelatedEntity)readProperty(TO_RELATED_ENTITY_PROPERTY);
     }
 
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inherit/auto/_ClientCompany.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inherit/auto/_ClientCompany.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inherit/auto/_ClientCompany.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inherit/auto/_ClientCompany.java Mon Dec 19 13:44:27 2011
@@ -19,21 +19,21 @@ public abstract class _ClientCompany ext
     public static final String CLIENT_COMPANY_ID_PK_COLUMN = "CLIENT_COMPANY_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 addToRepresentatives(CustomerRepresentative obj) {
-        addToManyTarget("representatives", obj, true);
+        addToManyTarget(REPRESENTATIVES_PROPERTY, obj, true);
     }
     public void removeFromRepresentatives(CustomerRepresentative obj) {
-        removeToManyTarget("representatives", obj, true);
+        removeToManyTarget(REPRESENTATIVES_PROPERTY, obj, true);
     }
     @SuppressWarnings("unchecked")
     public List<CustomerRepresentative> getRepresentatives() {
-        return (List<CustomerRepresentative>)readProperty("representatives");
+        return (List<CustomerRepresentative>)readProperty(REPRESENTATIVES_PROPERTY);
     }
 
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inherit/auto/_CustomerRepresentative.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inherit/auto/_CustomerRepresentative.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inherit/auto/_CustomerRepresentative.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inherit/auto/_CustomerRepresentative.java Mon Dec 19 13:44:27 2011
@@ -17,18 +17,18 @@ public abstract class _CustomerRepresent
     public static final String PERSON_ID_PK_COLUMN = "PERSON_ID";
 
     public void setClientContactType(String clientContactType) {
-        writeProperty("clientContactType", clientContactType);
+        writeProperty(CLIENT_CONTACT_TYPE_PROPERTY, clientContactType);
     }
     public String getClientContactType() {
-        return (String)readProperty("clientContactType");
+        return (String)readProperty(CLIENT_CONTACT_TYPE_PROPERTY);
     }
 
     public void setToClientCompany(ClientCompany toClientCompany) {
-        setToOneTarget("toClientCompany", toClientCompany, true);
+        setToOneTarget(TO_CLIENT_COMPANY_PROPERTY, toClientCompany, true);
     }
 
     public ClientCompany getToClientCompany() {
-        return (ClientCompany)readProperty("toClientCompany");
+        return (ClientCompany)readProperty(TO_CLIENT_COMPANY_PROPERTY);
     }
 
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inherit/auto/_Department.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inherit/auto/_Department.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inherit/auto/_Department.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inherit/auto/_Department.java Mon Dec 19 13:44:27 2011
@@ -21,30 +21,30 @@ public abstract class _Department extend
     public static final String DEPARTMENT_ID_PK_COLUMN = "DEPARTMENT_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 addToEmployees(Employee obj) {
-        addToManyTarget("employees", obj, true);
+        addToManyTarget(EMPLOYEES_PROPERTY, obj, true);
     }
     public void removeFromEmployees(Employee obj) {
-        removeToManyTarget("employees", obj, true);
+        removeToManyTarget(EMPLOYEES_PROPERTY, obj, true);
     }
     @SuppressWarnings("unchecked")
     public List<Employee> getEmployees() {
-        return (List<Employee>)readProperty("employees");
+        return (List<Employee>)readProperty(EMPLOYEES_PROPERTY);
     }
 
 
     public void setToManager(Manager toManager) {
-        setToOneTarget("toManager", toManager, true);
+        setToOneTarget(TO_MANAGER_PROPERTY, toManager, true);
     }
 
     public Manager getToManager() {
-        return (Manager)readProperty("toManager");
+        return (Manager)readProperty(TO_MANAGER_PROPERTY);
     }
 
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inherit/auto/_DirectToSubEntity.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inherit/auto/_DirectToSubEntity.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inherit/auto/_DirectToSubEntity.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inherit/auto/_DirectToSubEntity.java Mon Dec 19 13:44:27 2011
@@ -18,14 +18,14 @@ public abstract class _DirectToSubEntity
     public static final String ID_PK_COLUMN = "ID";
 
     public void addToSubEntities(SubEntity obj) {
-        addToManyTarget("subEntities", obj, true);
+        addToManyTarget(SUB_ENTITIES_PROPERTY, obj, true);
     }
     public void removeFromSubEntities(SubEntity obj) {
-        removeToManyTarget("subEntities", obj, true);
+        removeToManyTarget(SUB_ENTITIES_PROPERTY, obj, true);
     }
     @SuppressWarnings("unchecked")
     public List<SubEntity> getSubEntities() {
-        return (List<SubEntity>)readProperty("subEntities");
+        return (List<SubEntity>)readProperty(SUB_ENTITIES_PROPERTY);
     }
 
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inherit/auto/_Employee.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inherit/auto/_Employee.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inherit/auto/_Employee.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inherit/auto/_Employee.java Mon Dec 19 13:44:27 2011
@@ -21,30 +21,30 @@ public abstract class _Employee extends 
     public static final String PERSON_ID_PK_COLUMN = "PERSON_ID";
 
     public void setSalary(Float salary) {
-        writeProperty("salary", salary);
+        writeProperty(SALARY_PROPERTY, salary);
     }
     public Float getSalary() {
-        return (Float)readProperty("salary");
+        return (Float)readProperty(SALARY_PROPERTY);
     }
 
     public void addToAddresses(Address obj) {
-        addToManyTarget("addresses", obj, true);
+        addToManyTarget(ADDRESSES_PROPERTY, obj, true);
     }
     public void removeFromAddresses(Address obj) {
-        removeToManyTarget("addresses", obj, true);
+        removeToManyTarget(ADDRESSES_PROPERTY, obj, true);
     }
     @SuppressWarnings("unchecked")
     public List<Address> getAddresses() {
-        return (List<Address>)readProperty("addresses");
+        return (List<Address>)readProperty(ADDRESSES_PROPERTY);
     }
 
 
     public void setToDepartment(Department toDepartment) {
-        setToOneTarget("toDepartment", toDepartment, true);
+        setToOneTarget(TO_DEPARTMENT_PROPERTY, toDepartment, true);
     }
 
     public Department getToDepartment() {
-        return (Department)readProperty("toDepartment");
+        return (Department)readProperty(TO_DEPARTMENT_PROPERTY);
     }
 
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inherit/auto/_Manager.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inherit/auto/_Manager.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inherit/auto/_Manager.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inherit/auto/_Manager.java Mon Dec 19 13:44:27 2011
@@ -18,14 +18,14 @@ public abstract class _Manager extends E
     public static final String PERSON_ID_PK_COLUMN = "PERSON_ID";
 
     public void addToManagedDepartments(Department obj) {
-        addToManyTarget("managedDepartments", obj, true);
+        addToManyTarget(MANAGED_DEPARTMENTS_PROPERTY, obj, true);
     }
     public void removeFromManagedDepartments(Department obj) {
-        removeToManyTarget("managedDepartments", obj, true);
+        removeToManyTarget(MANAGED_DEPARTMENTS_PROPERTY, obj, true);
     }
     @SuppressWarnings("unchecked")
     public List<Department> getManagedDepartments() {
-        return (List<Department>)readProperty("managedDepartments");
+        return (List<Department>)readProperty(MANAGED_DEPARTMENTS_PROPERTY);
     }
 
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inherit/auto/_PersonNotes.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inherit/auto/_PersonNotes.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inherit/auto/_PersonNotes.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inherit/auto/_PersonNotes.java Mon Dec 19 13:44:27 2011
@@ -17,18 +17,18 @@ public abstract class _PersonNotes exten
     public static final String ID_PK_COLUMN = "ID";
 
     public void setNotes(String notes) {
-        writeProperty("notes", notes);
+        writeProperty(NOTES_PROPERTY, notes);
     }
     public String getNotes() {
-        return (String)readProperty("notes");
+        return (String)readProperty(NOTES_PROPERTY);
     }
 
     public void setPerson(AbstractPerson person) {
-        setToOneTarget("person", person, true);
+        setToOneTarget(PERSON_PROPERTY, person, true);
     }
 
     public AbstractPerson getPerson() {
-        return (AbstractPerson)readProperty("person");
+        return (AbstractPerson)readProperty(PERSON_PROPERTY);
     }
 
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inherit/auto/_RelatedEntity.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inherit/auto/_RelatedEntity.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inherit/auto/_RelatedEntity.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inherit/auto/_RelatedEntity.java Mon Dec 19 13:44:27 2011
@@ -20,26 +20,26 @@ public abstract class _RelatedEntity ext
     public static final String RELATED_ENTITY_ID_PK_COLUMN = "RELATED_ENTITY_ID";
 
     public void addToBaseEntities(BaseEntity obj) {
-        addToManyTarget("baseEntities", obj, true);
+        addToManyTarget(BASE_ENTITIES_PROPERTY, obj, true);
     }
     public void removeFromBaseEntities(BaseEntity obj) {
-        removeToManyTarget("baseEntities", obj, true);
+        removeToManyTarget(BASE_ENTITIES_PROPERTY, obj, true);
     }
     @SuppressWarnings("unchecked")
     public List<BaseEntity> getBaseEntities() {
-        return (List<BaseEntity>)readProperty("baseEntities");
+        return (List<BaseEntity>)readProperty(BASE_ENTITIES_PROPERTY);
     }
 
 
     public void addToSubEntities(SubEntity obj) {
-        addToManyTarget("subEntities", obj, true);
+        addToManyTarget(SUB_ENTITIES_PROPERTY, obj, true);
     }
     public void removeFromSubEntities(SubEntity obj) {
-        removeToManyTarget("subEntities", obj, true);
+        removeToManyTarget(SUB_ENTITIES_PROPERTY, obj, true);
     }
     @SuppressWarnings("unchecked")
     public List<SubEntity> getSubEntities() {
-        return (List<SubEntity>)readProperty("subEntities");
+        return (List<SubEntity>)readProperty(SUB_ENTITIES_PROPERTY);
     }
 
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inheritance/vertical/auto/_Iv1Root.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inheritance/vertical/auto/_Iv1Root.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inheritance/vertical/auto/_Iv1Root.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inheritance/vertical/auto/_Iv1Root.java Mon Dec 19 13:44:27 2011
@@ -16,17 +16,17 @@ public abstract class _Iv1Root extends C
     public static final String ID_PK_COLUMN = "ID";
 
     public void setDiscriminator(String discriminator) {
-        writeProperty("discriminator", discriminator);
+        writeProperty(DISCRIMINATOR_PROPERTY, discriminator);
     }
     public String getDiscriminator() {
-        return (String)readProperty("discriminator");
+        return (String)readProperty(DISCRIMINATOR_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);
     }
 
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inheritance/vertical/auto/_Iv1Sub1.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inheritance/vertical/auto/_Iv1Sub1.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inheritance/vertical/auto/_Iv1Sub1.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inheritance/vertical/auto/_Iv1Sub1.java Mon Dec 19 13:44:27 2011
@@ -15,10 +15,10 @@ public abstract class _Iv1Sub1 extends I
     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);
     }
 
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inheritance/vertical/auto/_IvRoot.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inheritance/vertical/auto/_IvRoot.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inheritance/vertical/auto/_IvRoot.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inheritance/vertical/auto/_IvRoot.java Mon Dec 19 13:44:27 2011
@@ -16,17 +16,17 @@ public abstract class _IvRoot extends Ca
     public static final String ID_PK_COLUMN = "ID";
 
     public void setDiscriminator(String discriminator) {
-        writeProperty("discriminator", discriminator);
+        writeProperty(DISCRIMINATOR_PROPERTY, discriminator);
     }
     public String getDiscriminator() {
-        return (String)readProperty("discriminator");
+        return (String)readProperty(DISCRIMINATOR_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);
     }
 
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inheritance/vertical/auto/_IvSub1.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inheritance/vertical/auto/_IvSub1.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inheritance/vertical/auto/_IvSub1.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inheritance/vertical/auto/_IvSub1.java Mon Dec 19 13:44:27 2011
@@ -15,10 +15,10 @@ public abstract class _IvSub1 extends Iv
     public static final String ID_PK_COLUMN = "ID";
 
     public void setSub1Name(String sub1Name) {
-        writeProperty("sub1Name", sub1Name);
+        writeProperty(SUB1NAME_PROPERTY, sub1Name);
     }
     public String getSub1Name() {
-        return (String)readProperty("sub1Name");
+        return (String)readProperty(SUB1NAME_PROPERTY);
     }
 
 }

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

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inheritance/vertical/auto/_IvSub2.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inheritance/vertical/auto/_IvSub2.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inheritance/vertical/auto/_IvSub2.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inheritance/vertical/auto/_IvSub2.java Mon Dec 19 13:44:27 2011
@@ -10,22 +10,23 @@ import org.apache.cayenne.testdo.inherit
  */
 public abstract class _IvSub2 extends IvRoot {
 
+    public static final String SUB2ATTR_PROPERTY = "sub2Attr";
     public static final String SUB2NAME_PROPERTY = "sub2Name";
 
     public static final String ID_PK_COLUMN = "ID";
 
-    public void setSub2Name(String sub2Name) {
-        writeProperty("sub2Name", sub2Name);
+    public void setSub2Attr(String sub2Attr) {
+        writeProperty(SUB2ATTR_PROPERTY, sub2Attr);
     }
-    public String getSub2Name() {
-        return (String)readProperty("sub2Name");
+    public String getSub2Attr() {
+        return (String)readProperty(SUB2ATTR_PROPERTY);
     }
 
-    public void setSub2Attr(String sub2Attr) {
-        writeProperty("sub2Attr", sub2Attr);
+    public void setSub2Name(String sub2Name) {
+        writeProperty(SUB2NAME_PROPERTY, sub2Name);
     }
-    public String getSub2Attr() {
-        return (String)readProperty("sub2Attr");
+    public String getSub2Name() {
+        return (String)readProperty(SUB2NAME_PROPERTY);
     }
 
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_Group.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_Group.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_Group.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_Group.java Mon Dec 19 13:44:27 2011
@@ -20,23 +20,23 @@ public abstract class _Group extends Use
     public static final String ID_PK_COLUMN = "id";
 
     public void addToGroupMembers(Role obj) {
-        addToManyTarget("groupMembers", obj, true);
+        addToManyTarget(GROUP_MEMBERS_PROPERTY, obj, true);
     }
     public void removeFromGroupMembers(Role obj) {
-        removeToManyTarget("groupMembers", obj, true);
+        removeToManyTarget(GROUP_MEMBERS_PROPERTY, obj, true);
     }
     @SuppressWarnings("unchecked")
     public List<Role> getGroupMembers() {
-        return (List<Role>)readProperty("groupMembers");
+        return (List<Role>)readProperty(GROUP_MEMBERS_PROPERTY);
     }
 
 
     public void setGroupProperties(GroupProperties groupProperties) {
-        setToOneTarget("groupProperties", groupProperties, true);
+        setToOneTarget(GROUP_PROPERTIES_PROPERTY, groupProperties, true);
     }
 
     public GroupProperties getGroupProperties() {
-        return (GroupProperties)readProperty("groupProperties");
+        return (GroupProperties)readProperty(GROUP_PROPERTIES_PROPERTY);
     }
 
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_GroupProperties.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_GroupProperties.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_GroupProperties.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_GroupProperties.java Mon Dec 19 13:44:27 2011
@@ -18,25 +18,25 @@ public abstract class _GroupProperties e
     public static final String ID_PK_COLUMN = "id";
 
     public void setDescription(String description) {
-        writeProperty("description", description);
+        writeProperty(DESCRIPTION_PROPERTY, description);
     }
     public String getDescription() {
-        return (String)readProperty("description");
+        return (String)readProperty(DESCRIPTION_PROPERTY);
     }
 
     public void setId(Long id) {
-        writeProperty("id", id);
+        writeProperty(ID_PROPERTY, id);
     }
     public Long getId() {
-        return (Long)readProperty("id");
+        return (Long)readProperty(ID_PROPERTY);
     }
 
     public void setGroup(Group group) {
-        setToOneTarget("group", group, true);
+        setToOneTarget(GROUP_PROPERTY, group, true);
     }
 
     public Group getGroup() {
-        return (Group)readProperty("group");
+        return (Group)readProperty(GROUP_PROPERTY);
     }
 
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_Role.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_Role.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_Role.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_Role.java Mon Dec 19 13:44:27 2011
@@ -21,37 +21,37 @@ public abstract class _Role extends Caye
     public static final String ID_PK_COLUMN = "id";
 
     public void setId(long id) {
-        writeProperty("id", id);
+        writeProperty(ID_PROPERTY, id);
     }
     public long getId() {
-        Object value = readProperty("id");
+        Object value = readProperty(ID_PROPERTY);
         return (value != null) ? (Long) value : 0;
     }
 
     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 setType(int type) {
-        writeProperty("type", type);
+        writeProperty(TYPE_PROPERTY, type);
     }
     public int getType() {
-        Object value = readProperty("type");
+        Object value = readProperty(TYPE_PROPERTY);
         return (value != null) ? (Integer) value : 0;
     }
 
     public void addToRoleGroups(Group obj) {
-        addToManyTarget("roleGroups", obj, true);
+        addToManyTarget(ROLE_GROUPS_PROPERTY, obj, true);
     }
     public void removeFromRoleGroups(Group obj) {
-        removeToManyTarget("roleGroups", obj, true);
+        removeToManyTarget(ROLE_GROUPS_PROPERTY, obj, true);
     }
     @SuppressWarnings("unchecked")
     public List<Group> getRoleGroups() {
-        return (List<Group>)readProperty("roleGroups");
+        return (List<Group>)readProperty(ROLE_GROUPS_PROPERTY);
     }
 
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_User.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_User.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_User.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_User.java Mon Dec 19 13:44:27 2011
@@ -16,11 +16,11 @@ public abstract class _User extends Role
     public static final String ID_PK_COLUMN = "id";
 
     public void setUserProperties(UserProperties userProperties) {
-        setToOneTarget("userProperties", userProperties, true);
+        setToOneTarget(USER_PROPERTIES_PROPERTY, userProperties, true);
     }
 
     public UserProperties getUserProperties() {
-        return (UserProperties)readProperty("userProperties");
+        return (UserProperties)readProperty(USER_PROPERTIES_PROPERTY);
     }
 
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_UserProperties.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_UserProperties.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_UserProperties.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_UserProperties.java Mon Dec 19 13:44:27 2011
@@ -18,25 +18,25 @@ public abstract class _UserProperties ex
     public static final String ID_PK_COLUMN = "id";
 
     public void setId(Long id) {
-        writeProperty("id", id);
+        writeProperty(ID_PROPERTY, id);
     }
     public Long getId() {
-        return (Long)readProperty("id");
+        return (Long)readProperty(ID_PROPERTY);
     }
 
     public void setNickname(String nickname) {
-        writeProperty("nickname", nickname);
+        writeProperty(NICKNAME_PROPERTY, nickname);
     }
     public String getNickname() {
-        return (String)readProperty("nickname");
+        return (String)readProperty(NICKNAME_PROPERTY);
     }
 
     public void setUser(User user) {
-        setToOneTarget("user", user, true);
+        setToOneTarget(USER_PROPERTY, user, true);
     }
 
     public User getUser() {
-        return (User)readProperty("user");
+        return (User)readProperty(USER_PROPERTY);
     }
 
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/locking/auto/_DateLockingTestEntity.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/locking/auto/_DateLockingTestEntity.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/locking/auto/_DateLockingTestEntity.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/locking/auto/_DateLockingTestEntity.java Mon Dec 19 13:44:27 2011
@@ -1,31 +1,34 @@
 package org.apache.cayenne.testdo.locking.auto;
 
-/** Class _DateLockingTestEntity 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 _DateLockingTestEntity extends org.apache.cayenne.CayenneDataObject {
+import java.util.Date;
+
+import org.apache.cayenne.CayenneDataObject;
+
+/**
+ * Class _DateLockingTestEntity 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 _DateLockingTestEntity extends CayenneDataObject {
 
     public static final String DATE_LOCK_PROPERTY = "dateLock";
     public static final String NAME_PROPERTY = "name";
 
     public static final String DATE_LOCKING_TEST_ID_PK_COLUMN = "DATE_LOCKING_TEST_ID";
 
-    public void setDateLock(java.util.Date dateLock) {
-        writeProperty("dateLock", dateLock);
+    public void setDateLock(Date dateLock) {
+        writeProperty(DATE_LOCK_PROPERTY, dateLock);
     }
-    public java.util.Date getDateLock() {
-        return (java.util.Date)readProperty("dateLock");
+    public Date getDateLock() {
+        return (Date)readProperty(DATE_LOCK_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);
     }
-    
-    
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/locking/auto/_LockingHelper.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/locking/auto/_LockingHelper.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/locking/auto/_LockingHelper.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/locking/auto/_LockingHelper.java Mon Dec 19 13:44:27 2011
@@ -1,11 +1,15 @@
 package org.apache.cayenne.testdo.locking.auto;
 
-/** Class _LockingHelper 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 _LockingHelper extends org.apache.cayenne.CayenneDataObject {
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.testdo.locking.RelLockingTestEntity;
+
+/**
+ * Class _LockingHelper 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 _LockingHelper extends CayenneDataObject {
 
     public static final String NAME_PROPERTY = "name";
     public static final String TO_REL_LOCKING_TEST_PROPERTY = "toRelLockingTest";
@@ -13,20 +17,19 @@ public class _LockingHelper extends org.
     public static final String LOCKING_HELPER_ID_PK_COLUMN = "LOCKING_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 setToRelLockingTest(org.apache.cayenne.testdo.locking.RelLockingTestEntity toRelLockingTest) {
-        setToOneTarget("toRelLockingTest", toRelLockingTest, true);
+
+    public void setToRelLockingTest(RelLockingTestEntity toRelLockingTest) {
+        setToOneTarget(TO_REL_LOCKING_TEST_PROPERTY, toRelLockingTest, true);
     }
 
-    public org.apache.cayenne.testdo.locking.RelLockingTestEntity getToRelLockingTest() {
-        return (org.apache.cayenne.testdo.locking.RelLockingTestEntity)readProperty("toRelLockingTest");
-    } 
-    
-    
+    public RelLockingTestEntity getToRelLockingTest() {
+        return (RelLockingTestEntity)readProperty(TO_REL_LOCKING_TEST_PROPERTY);
+    }
+
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/locking/auto/_RelLockingTestEntity.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/locking/auto/_RelLockingTestEntity.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/locking/auto/_RelLockingTestEntity.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/locking/auto/_RelLockingTestEntity.java Mon Dec 19 13:44:27 2011
@@ -2,12 +2,17 @@ package org.apache.cayenne.testdo.lockin
 
 import java.util.List;
 
-/** Class _RelLockingTestEntity 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 _RelLockingTestEntity extends org.apache.cayenne.CayenneDataObject {
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.testdo.locking.LockingHelper;
+import org.apache.cayenne.testdo.locking.SimpleLockingTestEntity;
+
+/**
+ * Class _RelLockingTestEntity 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 _RelLockingTestEntity extends CayenneDataObject {
 
     public static final String NAME_PROPERTY = "name";
     public static final String LOCKING_HELPERS_PROPERTY = "lockingHelpers";
@@ -16,31 +21,31 @@ public class _RelLockingTestEntity exten
     public static final String REL_LOCKING_TEST_ID_PK_COLUMN = "REL_LOCKING_TEST_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 addToLockingHelpers(org.apache.cayenne.testdo.locking.LockingHelper obj) {
-        addToManyTarget("lockingHelpers", obj, true);
-    }
-    public void removeFromLockingHelpers(org.apache.cayenne.testdo.locking.LockingHelper obj) {
-        removeToManyTarget("lockingHelpers", obj, true);
-    }
-    public List getLockingHelpers() {
-        return (List)readProperty("lockingHelpers");
-    }
-    
-    
-    public void setToSimpleLockingTest(org.apache.cayenne.testdo.locking.SimpleLockingTestEntity toSimpleLockingTest) {
-        setToOneTarget("toSimpleLockingTest", toSimpleLockingTest, true);
-    }
-
-    public org.apache.cayenne.testdo.locking.SimpleLockingTestEntity getToSimpleLockingTest() {
-        return (org.apache.cayenne.testdo.locking.SimpleLockingTestEntity)readProperty("toSimpleLockingTest");
-    } 
-    
-    
+
+    public void addToLockingHelpers(LockingHelper obj) {
+        addToManyTarget(LOCKING_HELPERS_PROPERTY, obj, true);
+    }
+    public void removeFromLockingHelpers(LockingHelper obj) {
+        removeToManyTarget(LOCKING_HELPERS_PROPERTY, obj, true);
+    }
+    @SuppressWarnings("unchecked")
+    public List<LockingHelper> getLockingHelpers() {
+        return (List<LockingHelper>)readProperty(LOCKING_HELPERS_PROPERTY);
+    }
+
+
+    public void setToSimpleLockingTest(SimpleLockingTestEntity toSimpleLockingTest) {
+        setToOneTarget(TO_SIMPLE_LOCKING_TEST_PROPERTY, toSimpleLockingTest, true);
+    }
+
+    public SimpleLockingTestEntity getToSimpleLockingTest() {
+        return (SimpleLockingTestEntity)readProperty(TO_SIMPLE_LOCKING_TEST_PROPERTY);
+    }
+
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/locking/auto/_SimpleLockingTestEntity.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/locking/auto/_SimpleLockingTestEntity.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/locking/auto/_SimpleLockingTestEntity.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/locking/auto/_SimpleLockingTestEntity.java Mon Dec 19 13:44:27 2011
@@ -1,11 +1,14 @@
 package org.apache.cayenne.testdo.locking.auto;
 
-/** Class _SimpleLockingTestEntity 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 _SimpleLockingTestEntity extends org.apache.cayenne.CayenneDataObject {
+import org.apache.cayenne.CayenneDataObject;
+
+/**
+ * Class _SimpleLockingTestEntity 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 _SimpleLockingTestEntity extends CayenneDataObject {
 
     public static final String DESCRIPTION_PROPERTY = "description";
     public static final String NAME_PROPERTY = "name";
@@ -13,19 +16,17 @@ public class _SimpleLockingTestEntity ex
     public static final String LOCKING_TEST_ID_PK_COLUMN = "LOCKING_TEST_ID";
 
     public void setDescription(String description) {
-        writeProperty("description", description);
+        writeProperty(DESCRIPTION_PROPERTY, description);
     }
     public String getDescription() {
-        return (String)readProperty("description");
+        return (String)readProperty(DESCRIPTION_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);
     }
-    
-    
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/locking/auto/_SoftTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/locking/auto/_SoftTest.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/locking/auto/_SoftTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/locking/auto/_SoftTest.java Mon Dec 19 13:44:27 2011
@@ -1,34 +1,34 @@
 package org.apache.cayenne.testdo.locking.auto;
 
-import org.apache.cayenne.CayenneDataObject;
-
-/**
- * Class _SoftTest 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 _SoftTest extends CayenneDataObject {
-
-    public static final String DELETED_PROPERTY = "deleted";
-    public static final String NAME_PROPERTY = "name";
-
-    public static final String SOFT_TEST_ID_PK_COLUMN = "SOFT_TEST_ID";
-
-    public void setDeleted(Boolean deleted) {
-        writeProperty("deleted", deleted);
-    }
-    public Boolean getDeleted() {
-        return (Boolean)readProperty("deleted");
-    }
-
-    public void setName(String name) {
-        writeProperty("name", name);
-    }
-    public String getName() {
-        return (String)readProperty("name");
-    }
-
-    protected abstract void onPrePersist();
-
-}
+import org.apache.cayenne.CayenneDataObject;
+
+/**
+ * Class _SoftTest 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 _SoftTest extends CayenneDataObject {
+
+    public static final String DELETED_PROPERTY = "deleted";
+    public static final String NAME_PROPERTY = "name";
+
+    public static final String SOFT_TEST_ID_PK_COLUMN = "SOFT_TEST_ID";
+
+    public void setDeleted(Boolean deleted) {
+        writeProperty(DELETED_PROPERTY, deleted);
+    }
+    public Boolean getDeleted() {
+        return (Boolean)readProperty(DELETED_PROPERTY);
+    }
+
+    public void setName(String name) {
+        writeProperty(NAME_PROPERTY, name);
+    }
+    public String getName() {
+        return (String)readProperty(NAME_PROPERTY);
+    }
+
+    protected abstract void onPrePersist();
+
+}

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/locking/auto/_TimeLockingTestEntity.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/locking/auto/_TimeLockingTestEntity.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/locking/auto/_TimeLockingTestEntity.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/locking/auto/_TimeLockingTestEntity.java Mon Dec 19 13:44:27 2011
@@ -1,11 +1,16 @@
 package org.apache.cayenne.testdo.locking.auto;
 
-/** Class _TimeLockingTestEntity 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 _TimeLockingTestEntity extends org.apache.cayenne.CayenneDataObject {
+import java.util.Date;
+
+import org.apache.cayenne.CayenneDataObject;
+
+/**
+ * Class _TimeLockingTestEntity 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 _TimeLockingTestEntity extends CayenneDataObject {
 
     public static final String NAME_PROPERTY = "name";
     public static final String TIME_LOCK_PROPERTY = "timeLock";
@@ -13,19 +18,17 @@ public class _TimeLockingTestEntity exte
     public static final String TIME_LOCKING_TEST_ID_PK_COLUMN = "TIME_LOCKING_TEST_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 setTimeLock(java.util.Date timeLock) {
-        writeProperty("timeLock", timeLock);
+
+    public void setTimeLock(Date timeLock) {
+        writeProperty(TIME_LOCK_PROPERTY, timeLock);
     }
-    public java.util.Date getTimeLock() {
-        return (java.util.Date)readProperty("timeLock");
+    public Date getTimeLock() {
+        return (Date)readProperty(TIME_LOCK_PROPERTY);
     }
-    
-    
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtDeleteCascade.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtDeleteCascade.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtDeleteCascade.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtDeleteCascade.java Mon Dec 19 13:44:27 2011
@@ -17,18 +17,18 @@ public abstract class _MtDeleteCascade e
     public static final String DELETE_CASCADE_ID_PK_COLUMN = "DELETE_CASCADE_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 setCascade(MtDeleteRule cascade) {
-        setToOneTarget("cascade", cascade, true);
+        setToOneTarget(CASCADE_PROPERTY, cascade, true);
     }
 
     public MtDeleteRule getCascade() {
-        return (MtDeleteRule)readProperty("cascade");
+        return (MtDeleteRule)readProperty(CASCADE_PROPERTY);
     }
 
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtDeleteDeny.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtDeleteDeny.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtDeleteDeny.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtDeleteDeny.java Mon Dec 19 13:44:27 2011
@@ -17,18 +17,18 @@ public abstract class _MtDeleteDeny exte
     public static final String DELETE_DENY_ID_PK_COLUMN = "DELETE_DENY_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 setDeny(MtDeleteRule deny) {
-        setToOneTarget("deny", deny, true);
+        setToOneTarget(DENY_PROPERTY, deny, true);
     }
 
     public MtDeleteRule getDeny() {
-        return (MtDeleteRule)readProperty("deny");
+        return (MtDeleteRule)readProperty(DENY_PROPERTY);
     }
 
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtDeleteNullify.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtDeleteNullify.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtDeleteNullify.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtDeleteNullify.java Mon Dec 19 13:44:27 2011
@@ -17,18 +17,18 @@ public abstract class _MtDeleteNullify e
     public static final String DELETE_NULLIFY_ID_PK_COLUMN = "DELETE_NULLIFY_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 setNullify(MtDeleteRule nullify) {
-        setToOneTarget("nullify", nullify, true);
+        setToOneTarget(NULLIFY_PROPERTY, nullify, true);
     }
 
     public MtDeleteRule getNullify() {
-        return (MtDeleteRule)readProperty("nullify");
+        return (MtDeleteRule)readProperty(NULLIFY_PROPERTY);
     }
 
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtDeleteRule.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtDeleteRule.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtDeleteRule.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtDeleteRule.java Mon Dec 19 13:44:27 2011
@@ -23,45 +23,45 @@ public abstract class _MtDeleteRule exte
     public static final String DELETE_RULE_ID_PK_COLUMN = "DELETE_RULE_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 addToFromCascade(MtDeleteCascade obj) {
-        addToManyTarget("fromCascade", obj, true);
+        addToManyTarget(FROM_CASCADE_PROPERTY, obj, true);
     }
     public void removeFromFromCascade(MtDeleteCascade obj) {
-        removeToManyTarget("fromCascade", obj, true);
+        removeToManyTarget(FROM_CASCADE_PROPERTY, obj, true);
     }
     @SuppressWarnings("unchecked")
     public List<MtDeleteCascade> getFromCascade() {
-        return (List<MtDeleteCascade>)readProperty("fromCascade");
+        return (List<MtDeleteCascade>)readProperty(FROM_CASCADE_PROPERTY);
     }
 
 
     public void addToFromDeny(MtDeleteDeny obj) {
-        addToManyTarget("fromDeny", obj, true);
+        addToManyTarget(FROM_DENY_PROPERTY, obj, true);
     }
     public void removeFromFromDeny(MtDeleteDeny obj) {
-        removeToManyTarget("fromDeny", obj, true);
+        removeToManyTarget(FROM_DENY_PROPERTY, obj, true);
     }
     @SuppressWarnings("unchecked")
     public List<MtDeleteDeny> getFromDeny() {
-        return (List<MtDeleteDeny>)readProperty("fromDeny");
+        return (List<MtDeleteDeny>)readProperty(FROM_DENY_PROPERTY);
     }
 
 
     public void addToFromNullify(MtDeleteNullify obj) {
-        addToManyTarget("fromNullify", obj, true);
+        addToManyTarget(FROM_NULLIFY_PROPERTY, obj, true);
     }
     public void removeFromFromNullify(MtDeleteNullify obj) {
-        removeToManyTarget("fromNullify", obj, true);
+        removeToManyTarget(FROM_NULLIFY_PROPERTY, obj, true);
     }
     @SuppressWarnings("unchecked")
     public List<MtDeleteNullify> getFromNullify() {
-        return (List<MtDeleteNullify>)readProperty("fromNullify");
+        return (List<MtDeleteNullify>)readProperty(FROM_NULLIFY_PROPERTY);
     }
 
 

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

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtMapToMany.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtMapToMany.java?rev=1220741&r1=1220740&r2=1220741&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtMapToMany.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtMapToMany.java Mon Dec 19 13:44:27 2011
@@ -18,14 +18,14 @@ public abstract class _MtMapToMany exten
     public static final String ID_PK_COLUMN = "ID";
 
     public void addToTargets(MtMapToManyTarget obj) {
-        addToManyTarget("targets", obj, true);
+        addToManyTarget(TARGETS_PROPERTY, obj, true);
     }
     public void removeFromTargets(MtMapToManyTarget obj) {
-        removeToManyTarget("targets", obj, true);
+        removeToManyTarget(TARGETS_PROPERTY, obj, true);
     }
     @SuppressWarnings("unchecked")
     public Map<Object, MtMapToManyTarget> getTargets() {
-        return (Map<Object, MtMapToManyTarget>)readProperty("targets");
+        return (Map<Object, MtMapToManyTarget>)readProperty(TARGETS_PROPERTY);
     }