cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r1425936 [1/3] - /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/
Date Wed, 26 Dec 2012 15:00:04 GMT
Author: aadamchik
Date: Wed Dec 26 15:00:02 2012
New Revision: 1425936

URL: http://svn.apache.org/viewvc?rev=1425936&view=rev
Log:
regenerated test classes in one of the DataMaps so that we can test Property API

Modified:
    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/_ArtistCallbackTest.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/_Bag.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Ball.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BigDecimalEntity.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BigIntegerEntity.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BinaryPKTest1.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BinaryPKTest2.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BitNumberTestEntity.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BitTestEntity.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BlobTestEntity.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BooleanTestEntity.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Box.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BoxInfo.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CalendarEntity.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CharFkTestEntity.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CharPkTestEntity.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/_ClobTestEntity.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ClobTestRelation.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CompoundFkTestEntity.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CompoundPainting.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CompoundPaintingLongNames.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CompoundPkTestEntity.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/_DecimalPKTest1.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_DecimalPKTestEntity.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/_ExtendedTypeEntity.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/_GeneratedColumnCompKey.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_GeneratedColumnCompMaster.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_GeneratedColumnDep.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_GeneratedColumnTest2.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_GeneratedColumnTestEntity.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_GeneratedF1.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_GeneratedF2.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_LongEntity.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_MeaningfulGeneratedColumnTestEntity.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_MeaningfulPKDep.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_MeaningfulPKTest1.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_MixedPersistenceStrategy.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_MixedPersistenceStrategy2.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_NoPkTestEntity.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_NullTestEntity.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/_PrimitivesTestEntity.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ROArtist.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ROPainting.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_RWCompoundPainting.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ReturnTypesMap1.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ReturnTypesMap2.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ReturnTypesMapLobs1.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_SerializableEntity.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_SmallintTestEntity.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_SubPainting.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Thing.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_TinyintTestEntity.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_UuidPkEntity.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_UuidTestEntity.java

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=1425936&r1=1425935&r2=1425936&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 Wed Dec 26 15:00:02 2012
@@ -1,6 +1,7 @@
 package org.apache.cayenne.testdo.testmap.auto;
 
 import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
 
 /**
  * Class _ArraysEntity was generated by Cayenne.
@@ -10,39 +11,48 @@ import org.apache.cayenne.CayenneDataObj
  */
 public abstract class _ArraysEntity extends CayenneDataObject {
 
+    @Deprecated
     public static final String BYTE_ARRAY_PROPERTY = "byteArray";
+    @Deprecated
     public static final String BYTE_WRAPPER_ARRAY_PROPERTY = "byteWrapperArray";
+    @Deprecated
     public static final String CHAR_ARRAY_PROPERTY = "charArray";
+    @Deprecated
     public static final String CHAR_WRAPPER_ARRAY_PROPERTY = "charWrapperArray";
 
     public static final String ID_PK_COLUMN = "ID";
 
+    public static final Property<byte[]> BYTE_ARRAY = new Property<byte[]>("byteArray");
+    public static final Property<Byte[]> BYTE_WRAPPER_ARRAY = new Property<Byte[]>("byteWrapperArray");
+    public static final Property<char[]> CHAR_ARRAY = new Property<char[]>("charArray");
+    public static final Property<Character[]> CHAR_WRAPPER_ARRAY = new Property<Character[]>("charWrapperArray");
+
     public void setByteArray(byte[] byteArray) {
-        writeProperty(BYTE_ARRAY_PROPERTY, byteArray);
+        writeProperty("byteArray", byteArray);
     }
     public byte[] getByteArray() {
-        return (byte[])readProperty(BYTE_ARRAY_PROPERTY);
+        return (byte[])readProperty("byteArray");
     }
 
     public void setByteWrapperArray(Byte[] byteWrapperArray) {
-        writeProperty(BYTE_WRAPPER_ARRAY_PROPERTY, byteWrapperArray);
+        writeProperty("byteWrapperArray", byteWrapperArray);
     }
     public Byte[] getByteWrapperArray() {
-        return (Byte[])readProperty(BYTE_WRAPPER_ARRAY_PROPERTY);
+        return (Byte[])readProperty("byteWrapperArray");
     }
 
     public void setCharArray(char[] charArray) {
-        writeProperty(CHAR_ARRAY_PROPERTY, charArray);
+        writeProperty("charArray", charArray);
     }
     public char[] getCharArray() {
-        return (char[])readProperty(CHAR_ARRAY_PROPERTY);
+        return (char[])readProperty("charArray");
     }
 
     public void setCharWrapperArray(Character[] charWrapperArray) {
-        writeProperty(CHAR_WRAPPER_ARRAY_PROPERTY, charWrapperArray);
+        writeProperty("charWrapperArray", charWrapperArray);
     }
     public Character[] getCharWrapperArray() {
-        return (Character[])readProperty(CHAR_WRAPPER_ARRAY_PROPERTY);
+        return (Character[])readProperty("charWrapperArray");
     }
 
 }

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=1425936&r1=1425935&r2=1425936&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 Wed Dec 26 15:00:02 2012
@@ -3,6 +3,7 @@ package org.apache.cayenne.testdo.testma
 import java.util.List;
 
 import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
 import org.apache.cayenne.testdo.testmap.ArtGroup;
 import org.apache.cayenne.testdo.testmap.Artist;
 
@@ -14,50 +15,59 @@ import org.apache.cayenne.testdo.testmap
  */
 public abstract class _ArtGroup extends CayenneDataObject {
 
+    @Deprecated
     public static final String NAME_PROPERTY = "name";
+    @Deprecated
     public static final String ARTIST_ARRAY_PROPERTY = "artistArray";
+    @Deprecated
     public static final String CHILD_GROUPS_ARRAY_PROPERTY = "childGroupsArray";
+    @Deprecated
     public static final String TO_PARENT_GROUP_PROPERTY = "toParentGroup";
 
     public static final String GROUP_ID_PK_COLUMN = "GROUP_ID";
 
+    public static final Property<String> NAME = new Property<String>("name");
+    public static final Property<List<Artist>> ARTIST_ARRAY = new Property<List<Artist>>("artistArray");
+    public static final Property<List<ArtGroup>> CHILD_GROUPS_ARRAY = new Property<List<ArtGroup>>("childGroupsArray");
+    public static final Property<ArtGroup> TO_PARENT_GROUP = new Property<ArtGroup>("toParentGroup");
+
     public void setName(String name) {
-        writeProperty(NAME_PROPERTY, name);
+        writeProperty("name", name);
     }
     public String getName() {
-        return (String)readProperty(NAME_PROPERTY);
+        return (String)readProperty("name");
     }
 
     public void addToArtistArray(Artist obj) {
-        addToManyTarget(ARTIST_ARRAY_PROPERTY, obj, true);
+        addToManyTarget("artistArray", obj, true);
     }
     public void removeFromArtistArray(Artist obj) {
-        removeToManyTarget(ARTIST_ARRAY_PROPERTY, obj, true);
+        removeToManyTarget("artistArray", obj, true);
     }
     @SuppressWarnings("unchecked")
     public List<Artist> getArtistArray() {
-        return (List<Artist>)readProperty(ARTIST_ARRAY_PROPERTY);
+        return (List<Artist>)readProperty("artistArray");
     }
 
 
     public void addToChildGroupsArray(ArtGroup obj) {
-        addToManyTarget(CHILD_GROUPS_ARRAY_PROPERTY, obj, true);
+        addToManyTarget("childGroupsArray", obj, true);
     }
     public void removeFromChildGroupsArray(ArtGroup obj) {
-        removeToManyTarget(CHILD_GROUPS_ARRAY_PROPERTY, obj, true);
+        removeToManyTarget("childGroupsArray", obj, true);
     }
     @SuppressWarnings("unchecked")
     public List<ArtGroup> getChildGroupsArray() {
-        return (List<ArtGroup>)readProperty(CHILD_GROUPS_ARRAY_PROPERTY);
+        return (List<ArtGroup>)readProperty("childGroupsArray");
     }
 
 
     public void setToParentGroup(ArtGroup toParentGroup) {
-        setToOneTarget(TO_PARENT_GROUP_PROPERTY, toParentGroup, true);
+        setToOneTarget("toParentGroup", toParentGroup, true);
     }
 
     public ArtGroup getToParentGroup() {
-        return (ArtGroup)readProperty(TO_PARENT_GROUP_PROPERTY);
+        return (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=1425936&r1=1425935&r2=1425936&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 Wed Dec 26 15:00:02 2012
@@ -4,6 +4,7 @@ import java.util.Date;
 import java.util.List;
 
 import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
 import org.apache.cayenne.testdo.testmap.ArtGroup;
 import org.apache.cayenne.testdo.testmap.ArtistExhibit;
 import org.apache.cayenne.testdo.testmap.Painting;
@@ -16,61 +17,72 @@ import org.apache.cayenne.testdo.testmap
  */
 public abstract class _Artist extends CayenneDataObject {
 
+    @Deprecated
     public static final String ARTIST_NAME_PROPERTY = "artistName";
+    @Deprecated
     public static final String DATE_OF_BIRTH_PROPERTY = "dateOfBirth";
+    @Deprecated
     public static final String ARTIST_EXHIBIT_ARRAY_PROPERTY = "artistExhibitArray";
+    @Deprecated
     public static final String GROUP_ARRAY_PROPERTY = "groupArray";
+    @Deprecated
     public static final String PAINTING_ARRAY_PROPERTY = "paintingArray";
 
     public static final String ARTIST_ID_PK_COLUMN = "ARTIST_ID";
 
+    public static final Property<String> ARTIST_NAME = new Property<String>("artistName");
+    public static final Property<Date> DATE_OF_BIRTH = new Property<Date>("dateOfBirth");
+    public static final Property<List<ArtistExhibit>> ARTIST_EXHIBIT_ARRAY = new Property<List<ArtistExhibit>>("artistExhibitArray");
+    public static final Property<List<ArtGroup>> GROUP_ARRAY = new Property<List<ArtGroup>>("groupArray");
+    public static final Property<List<Painting>> PAINTING_ARRAY = new Property<List<Painting>>("paintingArray");
+
     public void setArtistName(String artistName) {
-        writeProperty(ARTIST_NAME_PROPERTY, artistName);
+        writeProperty("artistName", artistName);
     }
     public String getArtistName() {
-        return (String)readProperty(ARTIST_NAME_PROPERTY);
+        return (String)readProperty("artistName");
     }
 
     public void setDateOfBirth(Date dateOfBirth) {
-        writeProperty(DATE_OF_BIRTH_PROPERTY, dateOfBirth);
+        writeProperty("dateOfBirth", dateOfBirth);
     }
     public Date getDateOfBirth() {
-        return (Date)readProperty(DATE_OF_BIRTH_PROPERTY);
+        return (Date)readProperty("dateOfBirth");
     }
 
     public void addToArtistExhibitArray(ArtistExhibit obj) {
-        addToManyTarget(ARTIST_EXHIBIT_ARRAY_PROPERTY, obj, true);
+        addToManyTarget("artistExhibitArray", obj, true);
     }
     public void removeFromArtistExhibitArray(ArtistExhibit obj) {
-        removeToManyTarget(ARTIST_EXHIBIT_ARRAY_PROPERTY, obj, true);
+        removeToManyTarget("artistExhibitArray", obj, true);
     }
     @SuppressWarnings("unchecked")
     public List<ArtistExhibit> getArtistExhibitArray() {
-        return (List<ArtistExhibit>)readProperty(ARTIST_EXHIBIT_ARRAY_PROPERTY);
+        return (List<ArtistExhibit>)readProperty("artistExhibitArray");
     }
 
 
     public void addToGroupArray(ArtGroup obj) {
-        addToManyTarget(GROUP_ARRAY_PROPERTY, obj, true);
+        addToManyTarget("groupArray", obj, true);
     }
     public void removeFromGroupArray(ArtGroup obj) {
-        removeToManyTarget(GROUP_ARRAY_PROPERTY, obj, true);
+        removeToManyTarget("groupArray", obj, true);
     }
     @SuppressWarnings("unchecked")
     public List<ArtGroup> getGroupArray() {
-        return (List<ArtGroup>)readProperty(GROUP_ARRAY_PROPERTY);
+        return (List<ArtGroup>)readProperty("groupArray");
     }
 
 
     public void addToPaintingArray(Painting obj) {
-        addToManyTarget(PAINTING_ARRAY_PROPERTY, obj, true);
+        addToManyTarget("paintingArray", obj, true);
     }
     public void removeFromPaintingArray(Painting obj) {
-        removeToManyTarget(PAINTING_ARRAY_PROPERTY, obj, true);
+        removeToManyTarget("paintingArray", obj, true);
     }
     @SuppressWarnings("unchecked")
     public List<Painting> getPaintingArray() {
-        return (List<Painting>)readProperty(PAINTING_ARRAY_PROPERTY);
+        return (List<Painting>)readProperty("paintingArray");
     }
 
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ArtistCallbackTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ArtistCallbackTest.java?rev=1425936&r1=1425935&r2=1425936&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ArtistCallbackTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ArtistCallbackTest.java Wed Dec 26 15:00:02 2012
@@ -1,15 +1,27 @@
 package org.apache.cayenne.testdo.testmap.auto;
 
-/** Class _ArtistCallbackTest 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 _ArtistCallbackTest extends org.apache.cayenne.CayenneDataObject {
+import java.util.Date;
 
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
+
+/**
+ * Class _ArtistCallbackTest 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 _ArtistCallbackTest extends CayenneDataObject {
+
+    @Deprecated
     public static final String ARTIST_NAME_PROPERTY = "artistName";
+    @Deprecated
     public static final String DATE_OF_BIRTH_PROPERTY = "dateOfBirth";
 
+    public static final String ARTIST_ID_PK_COLUMN = "ARTIST_ID";
+
+    public static final Property<String> ARTIST_NAME = new Property<String>("artistName");
+    public static final Property<Date> DATE_OF_BIRTH = new Property<Date>("dateOfBirth");
 
     public void setArtistName(String artistName) {
         writeProperty("artistName", artistName);
@@ -17,14 +29,26 @@ public abstract class _ArtistCallbackTes
     public String getArtistName() {
         return (String)readProperty("artistName");
     }
-    
-    
-    public void setDateOfBirth(java.util.Date dateOfBirth) {
+
+    public void setDateOfBirth(Date dateOfBirth) {
         writeProperty("dateOfBirth", dateOfBirth);
     }
-    public java.util.Date getDateOfBirth() {
-        return (java.util.Date)readProperty("dateOfBirth");
+    public Date getDateOfBirth() {
+        return (Date)readProperty("dateOfBirth");
     }
-    
-    
+
+    protected abstract void prePersistEntityObjEntity();
+
+    protected abstract void preRemoveEntityObjEntity();
+
+    protected abstract void preUpdateEntityObjEntity();
+
+    protected abstract void postPersistEntityObjEntity();
+
+    protected abstract void postRemoveEntityObjEntity();
+
+    protected abstract void postUpdateEntityObjEntity();
+
+    protected abstract void postLoadEntityObjEntity();
+
 }

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=1425936&r1=1425935&r2=1425936&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 Wed Dec 26 15:00:02 2012
@@ -1,6 +1,7 @@
 package org.apache.cayenne.testdo.testmap.auto;
 
 import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
 import org.apache.cayenne.testdo.testmap.Artist;
 import org.apache.cayenne.testdo.testmap.Exhibit;
 
@@ -12,27 +13,32 @@ import org.apache.cayenne.testdo.testmap
  */
 public abstract class _ArtistExhibit extends CayenneDataObject {
 
+    @Deprecated
     public static final String TO_ARTIST_PROPERTY = "toArtist";
+    @Deprecated
     public static final String TO_EXHIBIT_PROPERTY = "toExhibit";
 
     public static final String ARTIST_ID_PK_COLUMN = "ARTIST_ID";
     public static final String EXHIBIT_ID_PK_COLUMN = "EXHIBIT_ID";
 
+    public static final Property<Artist> TO_ARTIST = new Property<Artist>("toArtist");
+    public static final Property<Exhibit> TO_EXHIBIT = new Property<Exhibit>("toExhibit");
+
     public void setToArtist(Artist toArtist) {
-        setToOneTarget(TO_ARTIST_PROPERTY, toArtist, true);
+        setToOneTarget("toArtist", toArtist, true);
     }
 
     public Artist getToArtist() {
-        return (Artist)readProperty(TO_ARTIST_PROPERTY);
+        return (Artist)readProperty("toArtist");
     }
 
 
     public void setToExhibit(Exhibit toExhibit) {
-        setToOneTarget(TO_EXHIBIT_PROPERTY, toExhibit, true);
+        setToOneTarget("toExhibit", toExhibit, true);
     }
 
     public Exhibit getToExhibit() {
-        return (Exhibit)readProperty(TO_EXHIBIT_PROPERTY);
+        return (Exhibit)readProperty("toExhibit");
     }
 
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Bag.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Bag.java?rev=1425936&r1=1425935&r2=1425936&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Bag.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Bag.java Wed Dec 26 15:00:02 2012
@@ -3,6 +3,7 @@ package org.apache.cayenne.testdo.testma
 import java.util.List;
 
 import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
 import org.apache.cayenne.testdo.testmap.Ball;
 import org.apache.cayenne.testdo.testmap.Box;
 import org.apache.cayenne.testdo.testmap.Thing;
@@ -15,13 +16,22 @@ import org.apache.cayenne.testdo.testmap
  */
 public abstract class _Bag extends CayenneDataObject {
 
+    @Deprecated
     public static final String NAME_PROPERTY = "name";
+    @Deprecated
     public static final String BALLS_PROPERTY = "balls";
+    @Deprecated
     public static final String BOXES_PROPERTY = "boxes";
+    @Deprecated
     public static final String THINGS_PROPERTY = "things";
 
     public static final String ID_PK_COLUMN = "ID";
 
+    public static final Property<String> NAME = new Property<String>("name");
+    public static final Property<List<Ball>> BALLS = new Property<List<Ball>>("balls");
+    public static final Property<List<Box>> BOXES = new Property<List<Box>>("boxes");
+    public static final Property<List<Thing>> THINGS = new Property<List<Thing>>("things");
+
     public void setName(String name) {
         writeProperty("name", name);
     }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Ball.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Ball.java?rev=1425936&r1=1425935&r2=1425936&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Ball.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Ball.java Wed Dec 26 15:00:02 2012
@@ -1,6 +1,7 @@
 package org.apache.cayenne.testdo.testmap.auto;
 
 import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
 import org.apache.cayenne.testdo.testmap.Box;
 import org.apache.cayenne.testdo.testmap.Thing;
 
@@ -12,13 +13,22 @@ import org.apache.cayenne.testdo.testmap
  */
 public abstract class _Ball extends CayenneDataObject {
 
+    @Deprecated
     public static final String THING_VOLUME_PROPERTY = "thingVolume";
+    @Deprecated
     public static final String THING_WEIGHT_PROPERTY = "thingWeight";
+    @Deprecated
     public static final String BOX_PROPERTY = "box";
+    @Deprecated
     public static final String THING_PROPERTY = "thing";
 
     public static final String ID_PK_COLUMN = "ID";
 
+    public static final Property<Integer> THING_VOLUME = new Property<Integer>("thingVolume");
+    public static final Property<Integer> THING_WEIGHT = new Property<Integer>("thingWeight");
+    public static final Property<Box> BOX = new Property<Box>("box");
+    public static final Property<Thing> THING = new Property<Thing>("thing");
+
     public void setThingVolume(Integer thingVolume) {
         writeProperty("thingVolume", thingVolume);
     }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BigDecimalEntity.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BigDecimalEntity.java?rev=1425936&r1=1425935&r2=1425936&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BigDecimalEntity.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BigDecimalEntity.java Wed Dec 26 15:00:02 2012
@@ -1,22 +1,30 @@
 package org.apache.cayenne.testdo.testmap.auto;
 
-/** Class _BigDecimalEntity 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 _BigDecimalEntity extends org.apache.cayenne.CayenneDataObject {
+import java.math.BigDecimal;
 
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
+
+/**
+ * Class _BigDecimalEntity 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 _BigDecimalEntity extends CayenneDataObject {
+
+    @Deprecated
     public static final String BIG_DECIMAL_FIELD_PROPERTY = "bigDecimalField";
 
     public static final String ID_PK_COLUMN = "ID";
 
-    public void setBigDecimalField(java.math.BigDecimal bigDecimalField) {
+    public static final Property<BigDecimal> BIG_DECIMAL_FIELD = new Property<BigDecimal>("bigDecimalField");
+
+    public void setBigDecimalField(BigDecimal bigDecimalField) {
         writeProperty("bigDecimalField", bigDecimalField);
     }
-    public java.math.BigDecimal getBigDecimalField() {
-        return (java.math.BigDecimal)readProperty("bigDecimalField");
+    public BigDecimal getBigDecimalField() {
+        return (BigDecimal)readProperty("bigDecimalField");
     }
-    
-    
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BigIntegerEntity.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BigIntegerEntity.java?rev=1425936&r1=1425935&r2=1425936&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BigIntegerEntity.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BigIntegerEntity.java Wed Dec 26 15:00:02 2012
@@ -1,22 +1,30 @@
 package org.apache.cayenne.testdo.testmap.auto;
 
-/** Class _BigIntegerEntity 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 _BigIntegerEntity extends org.apache.cayenne.CayenneDataObject {
+import java.math.BigInteger;
 
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
+
+/**
+ * Class _BigIntegerEntity 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 _BigIntegerEntity extends CayenneDataObject {
+
+    @Deprecated
     public static final String BIG_INTEGER_FIELD_PROPERTY = "bigIntegerField";
 
     public static final String ID_PK_COLUMN = "ID";
 
-    public void setBigIntegerField(java.math.BigInteger bigIntegerField) {
+    public static final Property<BigInteger> BIG_INTEGER_FIELD = new Property<BigInteger>("bigIntegerField");
+
+    public void setBigIntegerField(BigInteger bigIntegerField) {
         writeProperty("bigIntegerField", bigIntegerField);
     }
-    public java.math.BigInteger getBigIntegerField() {
-        return (java.math.BigInteger)readProperty("bigIntegerField");
+    public BigInteger getBigIntegerField() {
+        return (BigInteger)readProperty("bigIntegerField");
     }
-    
-    
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BinaryPKTest1.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BinaryPKTest1.java?rev=1425936&r1=1425935&r2=1425936&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BinaryPKTest1.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BinaryPKTest1.java Wed Dec 26 15:00:02 2012
@@ -1,34 +1,46 @@
 package org.apache.cayenne.testdo.testmap.auto;
 
-/** Class _BinaryPKTest1 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 _BinaryPKTest1 extends org.apache.cayenne.CayenneDataObject {
+import java.util.List;
 
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
+import org.apache.cayenne.testdo.testmap.BinaryPKTest2;
+
+/**
+ * Class _BinaryPKTest1 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 _BinaryPKTest1 extends CayenneDataObject {
+
+    @Deprecated
     public static final String NAME_PROPERTY = "name";
+    @Deprecated
     public static final String BINARY_PKDETAILS_PROPERTY = "binaryPKDetails";
 
     public static final String BIN_ID_PK_COLUMN = "BIN_ID";
 
+    public static final Property<String> NAME = new Property<String>("name");
+    public static final Property<List<BinaryPKTest2>> BINARY_PKDETAILS = new Property<List<BinaryPKTest2>>("binaryPKDetails");
+
     public void setName(String name) {
         writeProperty("name", name);
     }
     public String getName() {
         return (String)readProperty("name");
     }
-    
-    
-    public void addToBinaryPKDetails(org.apache.cayenne.testdo.testmap.BinaryPKTest2 obj) {
+
+    public void addToBinaryPKDetails(BinaryPKTest2 obj) {
         addToManyTarget("binaryPKDetails", obj, true);
     }
-    public void removeFromBinaryPKDetails(org.apache.cayenne.testdo.testmap.BinaryPKTest2 obj) {
+    public void removeFromBinaryPKDetails(BinaryPKTest2 obj) {
         removeToManyTarget("binaryPKDetails", obj, true);
     }
-    public java.util.List getBinaryPKDetails() {
-        return (java.util.List)readProperty("binaryPKDetails");
+    @SuppressWarnings("unchecked")
+    public List<BinaryPKTest2> getBinaryPKDetails() {
+        return (List<BinaryPKTest2>)readProperty("binaryPKDetails");
     }
-    
-    
+
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BinaryPKTest2.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BinaryPKTest2.java?rev=1425936&r1=1425935&r2=1425936&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BinaryPKTest2.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BinaryPKTest2.java Wed Dec 26 15:00:02 2012
@@ -1,32 +1,41 @@
 package org.apache.cayenne.testdo.testmap.auto;
 
-/** Class _BinaryPKTest2 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 _BinaryPKTest2 extends org.apache.cayenne.CayenneDataObject {
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
+import org.apache.cayenne.testdo.testmap.BinaryPKTest1;
 
+/**
+ * Class _BinaryPKTest2 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 _BinaryPKTest2 extends CayenneDataObject {
+
+    @Deprecated
     public static final String DETAIL_NAME_PROPERTY = "detailName";
+    @Deprecated
     public static final String TO_BINARY_PKMASTER_PROPERTY = "toBinaryPKMaster";
 
     public static final String ID_PK_COLUMN = "ID";
 
+    public static final Property<String> DETAIL_NAME = new Property<String>("detailName");
+    public static final Property<BinaryPKTest1> TO_BINARY_PKMASTER = new Property<BinaryPKTest1>("toBinaryPKMaster");
+
     public void setDetailName(String detailName) {
         writeProperty("detailName", detailName);
     }
     public String getDetailName() {
         return (String)readProperty("detailName");
     }
-    
-    
-    public void setToBinaryPKMaster(org.apache.cayenne.testdo.testmap.BinaryPKTest1 toBinaryPKMaster) {
+
+    public void setToBinaryPKMaster(BinaryPKTest1 toBinaryPKMaster) {
         setToOneTarget("toBinaryPKMaster", toBinaryPKMaster, true);
     }
 
-    public org.apache.cayenne.testdo.testmap.BinaryPKTest1 getToBinaryPKMaster() {
-        return (org.apache.cayenne.testdo.testmap.BinaryPKTest1)readProperty("toBinaryPKMaster");
-    } 
-    
-    
+    public BinaryPKTest1 getToBinaryPKMaster() {
+        return (BinaryPKTest1)readProperty("toBinaryPKMaster");
+    }
+
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BitNumberTestEntity.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BitNumberTestEntity.java?rev=1425936&r1=1425935&r2=1425936&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BitNumberTestEntity.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BitNumberTestEntity.java Wed Dec 26 15:00:02 2012
@@ -1,22 +1,28 @@
 package org.apache.cayenne.testdo.testmap.auto;
 
-/** Class _BitNumberTestEntity 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 _BitNumberTestEntity extends org.apache.cayenne.CayenneDataObject {
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
 
+/**
+ * Class _BitNumberTestEntity 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 _BitNumberTestEntity extends CayenneDataObject {
+
+    @Deprecated
     public static final String BIT_COLUMN_PROPERTY = "bitColumn";
 
     public static final String ID_PK_COLUMN = "ID";
 
+    public static final Property<Integer> BIT_COLUMN = new Property<Integer>("bitColumn");
+
     public void setBitColumn(Integer bitColumn) {
         writeProperty("bitColumn", bitColumn);
     }
     public Integer getBitColumn() {
         return (Integer)readProperty("bitColumn");
     }
-    
-    
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BitTestEntity.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BitTestEntity.java?rev=1425936&r1=1425935&r2=1425936&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BitTestEntity.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BitTestEntity.java Wed Dec 26 15:00:02 2012
@@ -1,22 +1,28 @@
 package org.apache.cayenne.testdo.testmap.auto;
 
-/** Class _BitTestEntity 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 _BitTestEntity extends org.apache.cayenne.CayenneDataObject {
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
 
+/**
+ * Class _BitTestEntity 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 _BitTestEntity extends CayenneDataObject {
+
+    @Deprecated
     public static final String BIT_COLUMN_PROPERTY = "bitColumn";
 
     public static final String ID_PK_COLUMN = "ID";
 
+    public static final Property<Boolean> BIT_COLUMN = new Property<Boolean>("bitColumn");
+
     public void setBitColumn(Boolean bitColumn) {
         writeProperty("bitColumn", bitColumn);
     }
     public Boolean getBitColumn() {
         return (Boolean)readProperty("bitColumn");
     }
-    
-    
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BlobTestEntity.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BlobTestEntity.java?rev=1425936&r1=1425935&r2=1425936&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BlobTestEntity.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BlobTestEntity.java Wed Dec 26 15:00:02 2012
@@ -1,22 +1,28 @@
 package org.apache.cayenne.testdo.testmap.auto;
 
-/** Class _BlobTestEntity 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 _BlobTestEntity extends org.apache.cayenne.CayenneDataObject {
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
 
+/**
+ * Class _BlobTestEntity 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 _BlobTestEntity extends CayenneDataObject {
+
+    @Deprecated
     public static final String BLOB_COL_PROPERTY = "blobCol";
 
     public static final String BLOB_TEST_ID_PK_COLUMN = "BLOB_TEST_ID";
 
+    public static final Property<byte[]> BLOB_COL = new Property<byte[]>("blobCol");
+
     public void setBlobCol(byte[] blobCol) {
         writeProperty("blobCol", blobCol);
     }
     public byte[] getBlobCol() {
         return (byte[])readProperty("blobCol");
     }
-    
-    
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BooleanTestEntity.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BooleanTestEntity.java?rev=1425936&r1=1425935&r2=1425936&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BooleanTestEntity.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BooleanTestEntity.java Wed Dec 26 15:00:02 2012
@@ -1,22 +1,28 @@
 package org.apache.cayenne.testdo.testmap.auto;
 
-/** Class _BooleanTestEntity 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 _BooleanTestEntity extends org.apache.cayenne.CayenneDataObject {
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
 
+/**
+ * Class _BooleanTestEntity 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 _BooleanTestEntity extends CayenneDataObject {
+
+    @Deprecated
     public static final String BOOLEAN_COLUMN_PROPERTY = "booleanColumn";
 
     public static final String ID_PK_COLUMN = "ID";
 
+    public static final Property<Boolean> BOOLEAN_COLUMN = new Property<Boolean>("booleanColumn");
+
     public void setBooleanColumn(Boolean booleanColumn) {
         writeProperty("booleanColumn", booleanColumn);
     }
     public Boolean getBooleanColumn() {
         return (Boolean)readProperty("booleanColumn");
     }
-    
-    
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Box.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Box.java?rev=1425936&r1=1425935&r2=1425936&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Box.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Box.java Wed Dec 26 15:00:02 2012
@@ -3,6 +3,7 @@ package org.apache.cayenne.testdo.testma
 import java.util.List;
 
 import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
 import org.apache.cayenne.testdo.testmap.Bag;
 import org.apache.cayenne.testdo.testmap.Ball;
 import org.apache.cayenne.testdo.testmap.BoxInfo;
@@ -16,54 +17,65 @@ import org.apache.cayenne.testdo.testmap
  */
 public abstract class _Box extends CayenneDataObject {
 
+    @Deprecated
     public static final String NAME_PROPERTY = "name";
+    @Deprecated
     public static final String BAG_PROPERTY = "bag";
+    @Deprecated
     public static final String BALLS_PROPERTY = "balls";
+    @Deprecated
     public static final String BOX_INFO_PROPERTY = "boxInfo";
+    @Deprecated
     public static final String THINGS_PROPERTY = "things";
 
     public static final String ID_PK_COLUMN = "ID";
 
+    public static final Property<String> NAME = new Property<String>("name");
+    public static final Property<Bag> BAG = new Property<Bag>("bag");
+    public static final Property<List<Ball>> BALLS = new Property<List<Ball>>("balls");
+    public static final Property<BoxInfo> BOX_INFO = new Property<BoxInfo>("boxInfo");
+    public static final Property<List<Thing>> THINGS = new Property<List<Thing>>("things");
+
     public void setName(String name) {
-        writeProperty(NAME_PROPERTY, name);
+        writeProperty("name", name);
     }
     public String getName() {
-        return (String)readProperty(NAME_PROPERTY);
+        return (String)readProperty("name");
     }
 
     public void setBag(Bag bag) {
-        setToOneTarget(BAG_PROPERTY, bag, true);
+        setToOneTarget("bag", bag, true);
     }
 
     public Bag getBag() {
-        return (Bag)readProperty(BAG_PROPERTY);
+        return (Bag)readProperty("bag");
     }
 
 
     public void addToBalls(Ball obj) {
-        addToManyTarget(BALLS_PROPERTY, obj, true);
+        addToManyTarget("balls", obj, true);
     }
     public void removeFromBalls(Ball obj) {
-        removeToManyTarget(BALLS_PROPERTY, obj, true);
+        removeToManyTarget("balls", obj, true);
     }
     @SuppressWarnings("unchecked")
     public List<Ball> getBalls() {
-        return (List<Ball>)readProperty(BALLS_PROPERTY);
+        return (List<Ball>)readProperty("balls");
     }
 
 
     public void setBoxInfo(BoxInfo boxInfo) {
-        setToOneTarget(BOX_INFO_PROPERTY, boxInfo, true);
+        setToOneTarget("boxInfo", boxInfo, true);
     }
 
     public BoxInfo getBoxInfo() {
-        return (BoxInfo)readProperty(BOX_INFO_PROPERTY);
+        return (BoxInfo)readProperty("boxInfo");
     }
 
 
     @SuppressWarnings("unchecked")
     public List<Thing> getThings() {
-        return (List<Thing>)readProperty(THINGS_PROPERTY);
+        return (List<Thing>)readProperty("things");
     }
 
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BoxInfo.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BoxInfo.java?rev=1425936&r1=1425935&r2=1425936&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BoxInfo.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_BoxInfo.java Wed Dec 26 15:00:02 2012
@@ -1,6 +1,7 @@
 package org.apache.cayenne.testdo.testmap.auto;
 
 import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
 import org.apache.cayenne.testdo.testmap.Box;
 
 /**
@@ -11,11 +12,16 @@ import org.apache.cayenne.testdo.testmap
  */
 public abstract class _BoxInfo extends CayenneDataObject {
 
+    @Deprecated
     public static final String COLOR_PROPERTY = "color";
+    @Deprecated
     public static final String BOX_PROPERTY = "box";
 
     public static final String ID_PK_COLUMN = "ID";
 
+    public static final Property<String> COLOR = new Property<String>("color");
+    public static final Property<Box> BOX = new Property<Box>("box");
+
     public void setColor(String color) {
         writeProperty("color", color);
     }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CalendarEntity.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CalendarEntity.java?rev=1425936&r1=1425935&r2=1425936&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CalendarEntity.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CalendarEntity.java Wed Dec 26 15:00:02 2012
@@ -1,22 +1,30 @@
 package org.apache.cayenne.testdo.testmap.auto;
 
-/** Class _CalendarEntity 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 _CalendarEntity extends org.apache.cayenne.CayenneDataObject {
+import java.util.Calendar;
 
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
+
+/**
+ * Class _CalendarEntity 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 _CalendarEntity extends CayenneDataObject {
+
+    @Deprecated
     public static final String CALENDAR_FIELD_PROPERTY = "calendarField";
 
     public static final String ID_PK_COLUMN = "ID";
 
-    public void setCalendarField(java.util.Calendar calendarField) {
+    public static final Property<Calendar> CALENDAR_FIELD = new Property<Calendar>("calendarField");
+
+    public void setCalendarField(Calendar calendarField) {
         writeProperty("calendarField", calendarField);
     }
-    public java.util.Calendar getCalendarField() {
-        return (java.util.Calendar)readProperty("calendarField");
+    public Calendar getCalendarField() {
+        return (Calendar)readProperty("calendarField");
     }
-    
-    
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CharFkTestEntity.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CharFkTestEntity.java?rev=1425936&r1=1425935&r2=1425936&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CharFkTestEntity.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CharFkTestEntity.java Wed Dec 26 15:00:02 2012
@@ -1,32 +1,41 @@
 package org.apache.cayenne.testdo.testmap.auto;
 
-/** Class _CharFkTestEntity 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 _CharFkTestEntity extends org.apache.cayenne.CayenneDataObject {
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
+import org.apache.cayenne.testdo.testmap.CharPkTestEntity;
 
+/**
+ * Class _CharFkTestEntity 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 _CharFkTestEntity extends CayenneDataObject {
+
+    @Deprecated
     public static final String NAME_PROPERTY = "name";
+    @Deprecated
     public static final String TO_CHAR_PK_PROPERTY = "toCharPK";
 
     public static final String PK_PK_COLUMN = "PK";
 
+    public static final Property<String> NAME = new Property<String>("name");
+    public static final Property<CharPkTestEntity> TO_CHAR_PK = new Property<CharPkTestEntity>("toCharPK");
+
     public void setName(String name) {
         writeProperty("name", name);
     }
     public String getName() {
         return (String)readProperty("name");
     }
-    
-    
-    public void setToCharPK(org.apache.cayenne.testdo.testmap.CharPkTestEntity toCharPK) {
+
+    public void setToCharPK(CharPkTestEntity toCharPK) {
         setToOneTarget("toCharPK", toCharPK, true);
     }
 
-    public org.apache.cayenne.testdo.testmap.CharPkTestEntity getToCharPK() {
-        return (org.apache.cayenne.testdo.testmap.CharPkTestEntity)readProperty("toCharPK");
-    } 
-    
-    
+    public CharPkTestEntity getToCharPK() {
+        return (CharPkTestEntity)readProperty("toCharPK");
+    }
+
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CharPkTestEntity.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CharPkTestEntity.java?rev=1425936&r1=1425935&r2=1425936&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CharPkTestEntity.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CharPkTestEntity.java Wed Dec 26 15:00:02 2012
@@ -1,43 +1,56 @@
 package org.apache.cayenne.testdo.testmap.auto;
 
-/** Class _CharPkTestEntity 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 _CharPkTestEntity extends org.apache.cayenne.CayenneDataObject {
+import java.util.List;
 
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
+import org.apache.cayenne.testdo.testmap.CharFkTestEntity;
+
+/**
+ * Class _CharPkTestEntity 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 _CharPkTestEntity extends CayenneDataObject {
+
+    @Deprecated
     public static final String OTHER_COL_PROPERTY = "otherCol";
+    @Deprecated
     public static final String PK_COL_PROPERTY = "pkCol";
+    @Deprecated
     public static final String CHAR_FKS_PROPERTY = "charFKs";
 
     public static final String PK_COL_PK_COLUMN = "PK_COL";
 
+    public static final Property<String> OTHER_COL = new Property<String>("otherCol");
+    public static final Property<String> PK_COL = new Property<String>("pkCol");
+    public static final Property<List<CharFkTestEntity>> CHAR_FKS = new Property<List<CharFkTestEntity>>("charFKs");
+
     public void setOtherCol(String otherCol) {
         writeProperty("otherCol", otherCol);
     }
     public String getOtherCol() {
         return (String)readProperty("otherCol");
     }
-    
-    
+
     public void setPkCol(String pkCol) {
         writeProperty("pkCol", pkCol);
     }
     public String getPkCol() {
         return (String)readProperty("pkCol");
     }
-    
-    
-    public void addToCharFKs(org.apache.cayenne.testdo.testmap.CharFkTestEntity obj) {
+
+    public void addToCharFKs(CharFkTestEntity obj) {
         addToManyTarget("charFKs", obj, true);
     }
-    public void removeFromCharFKs(org.apache.cayenne.testdo.testmap.CharFkTestEntity obj) {
+    public void removeFromCharFKs(CharFkTestEntity obj) {
         removeToManyTarget("charFKs", obj, true);
     }
-    public java.util.List getCharFKs() {
-        return (java.util.List)readProperty("charFKs");
+    @SuppressWarnings("unchecked")
+    public List<CharFkTestEntity> getCharFKs() {
+        return (List<CharFkTestEntity>)readProperty("charFKs");
     }
-    
-    
+
+
 }

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=1425936&r1=1425935&r2=1425936&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 Wed Dec 26 15:00:02 2012
@@ -1,6 +1,7 @@
 package org.apache.cayenne.testdo.testmap.auto;
 
 import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
 
 /**
  * Class _CharacterEntity was generated by Cayenne.
@@ -10,15 +11,18 @@ import org.apache.cayenne.CayenneDataObj
  */
 public abstract class _CharacterEntity extends CayenneDataObject {
 
+    @Deprecated
     public static final String CHARACTER_FIELD_PROPERTY = "characterField";
 
     public static final String ID_PK_COLUMN = "ID";
 
+    public static final Property<Character> CHARACTER_FIELD = new Property<Character>("characterField");
+
     public void setCharacterField(Character characterField) {
-        writeProperty(CHARACTER_FIELD_PROPERTY, characterField);
+        writeProperty("characterField", characterField);
     }
     public Character getCharacterField() {
-        return (Character)readProperty(CHARACTER_FIELD_PROPERTY);
+        return (Character)readProperty("characterField");
     }
 
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ClobTestEntity.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ClobTestEntity.java?rev=1425936&r1=1425935&r2=1425936&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ClobTestEntity.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ClobTestEntity.java Wed Dec 26 15:00:02 2012
@@ -3,6 +3,7 @@ package org.apache.cayenne.testdo.testma
 import java.util.List;
 
 import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
 import org.apache.cayenne.testdo.testmap.ClobTestRelation;
 
 /**
@@ -13,11 +14,16 @@ import org.apache.cayenne.testdo.testmap
  */
 public abstract class _ClobTestEntity extends CayenneDataObject {
 
+    @Deprecated
     public static final String CLOB_COL_PROPERTY = "clobCol";
+    @Deprecated
     public static final String CLOB_VALUE_PROPERTY = "clobValue";
 
     public static final String CLOB_TEST_ID_PK_COLUMN = "CLOB_TEST_ID";
 
+    public static final Property<String> CLOB_COL = new Property<String>("clobCol");
+    public static final Property<List<ClobTestRelation>> CLOB_VALUE = new Property<List<ClobTestRelation>>("clobValue");
+
     public void setClobCol(String clobCol) {
         writeProperty("clobCol", clobCol);
     }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ClobTestRelation.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ClobTestRelation.java?rev=1425936&r1=1425935&r2=1425936&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ClobTestRelation.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ClobTestRelation.java Wed Dec 26 15:00:02 2012
@@ -1,6 +1,7 @@
 package org.apache.cayenne.testdo.testmap.auto;
 
 import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
 import org.apache.cayenne.testdo.testmap.ClobTestEntity;
 
 /**
@@ -11,12 +12,19 @@ import org.apache.cayenne.testdo.testmap
  */
 public abstract class _ClobTestRelation extends CayenneDataObject {
 
+    @Deprecated
     public static final String ID_PROPERTY = "id";
+    @Deprecated
     public static final String VALUE_PROPERTY = "value";
+    @Deprecated
     public static final String CLOB_ID_PROPERTY = "clobId";
 
     public static final String ID_PK_COLUMN = "ID";
 
+    public static final Property<Integer> ID = new Property<Integer>("id");
+    public static final Property<Integer> VALUE = new Property<Integer>("value");
+    public static final Property<ClobTestEntity> CLOB_ID = new Property<ClobTestEntity>("clobId");
+
     public void setId(Integer id) {
         writeProperty("id", id);
     }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CompoundFkTestEntity.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CompoundFkTestEntity.java?rev=1425936&r1=1425935&r2=1425936&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CompoundFkTestEntity.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CompoundFkTestEntity.java Wed Dec 26 15:00:02 2012
@@ -1,32 +1,41 @@
 package org.apache.cayenne.testdo.testmap.auto;
 
-/** Class _CompoundFkTestEntity 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 _CompoundFkTestEntity extends org.apache.cayenne.CayenneDataObject {
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
+import org.apache.cayenne.testdo.testmap.CompoundPkTestEntity;
 
+/**
+ * Class _CompoundFkTestEntity 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 _CompoundFkTestEntity extends CayenneDataObject {
+
+    @Deprecated
     public static final String NAME_PROPERTY = "name";
+    @Deprecated
     public static final String TO_COMPOUND_PK_PROPERTY = "toCompoundPk";
 
     public static final String PKEY_PK_COLUMN = "PKEY";
 
+    public static final Property<String> NAME = new Property<String>("name");
+    public static final Property<CompoundPkTestEntity> TO_COMPOUND_PK = new Property<CompoundPkTestEntity>("toCompoundPk");
+
     public void setName(String name) {
         writeProperty("name", name);
     }
     public String getName() {
         return (String)readProperty("name");
     }
-    
-    
-    public void setToCompoundPk(org.apache.cayenne.testdo.testmap.CompoundPkTestEntity toCompoundPk) {
+
+    public void setToCompoundPk(CompoundPkTestEntity toCompoundPk) {
         setToOneTarget("toCompoundPk", toCompoundPk, true);
     }
 
-    public org.apache.cayenne.testdo.testmap.CompoundPkTestEntity getToCompoundPk() {
-        return (org.apache.cayenne.testdo.testmap.CompoundPkTestEntity)readProperty("toCompoundPk");
-    } 
-    
-    
+    public CompoundPkTestEntity getToCompoundPk() {
+        return (CompoundPkTestEntity)readProperty("toCompoundPk");
+    }
+
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CompoundPainting.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CompoundPainting.java?rev=1425936&r1=1425935&r2=1425936&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CompoundPainting.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CompoundPainting.java Wed Dec 26 15:00:02 2012
@@ -3,6 +3,7 @@ package org.apache.cayenne.testdo.testma
 import java.math.BigDecimal;
 
 import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
 import org.apache.cayenne.testdo.testmap.Artist;
 import org.apache.cayenne.testdo.testmap.Gallery;
 import org.apache.cayenne.testdo.testmap.PaintingInfo;
@@ -15,17 +16,34 @@ import org.apache.cayenne.testdo.testmap
  */
 public abstract class _CompoundPainting extends CayenneDataObject {
 
+    @Deprecated
     public static final String ARTIST_NAME_PROPERTY = "artistName";
+    @Deprecated
     public static final String ESTIMATED_PRICE_PROPERTY = "estimatedPrice";
+    @Deprecated
     public static final String GALLERY_NAME_PROPERTY = "galleryName";
+    @Deprecated
     public static final String PAINTING_TITLE_PROPERTY = "paintingTitle";
+    @Deprecated
     public static final String TEXT_REVIEW_PROPERTY = "textReview";
+    @Deprecated
     public static final String TO_ARTIST_PROPERTY = "toArtist";
+    @Deprecated
     public static final String TO_GALLERY_PROPERTY = "toGallery";
+    @Deprecated
     public static final String TO_PAINTING_INFO_PROPERTY = "toPaintingInfo";
 
     public static final String PAINTING_ID_PK_COLUMN = "PAINTING_ID";
 
+    public static final Property<String> ARTIST_NAME = new Property<String>("artistName");
+    public static final Property<BigDecimal> ESTIMATED_PRICE = new Property<BigDecimal>("estimatedPrice");
+    public static final Property<String> GALLERY_NAME = new Property<String>("galleryName");
+    public static final Property<String> PAINTING_TITLE = new Property<String>("paintingTitle");
+    public static final Property<String> TEXT_REVIEW = new Property<String>("textReview");
+    public static final Property<Artist> TO_ARTIST = new Property<Artist>("toArtist");
+    public static final Property<Gallery> TO_GALLERY = new Property<Gallery>("toGallery");
+    public static final Property<PaintingInfo> TO_PAINTING_INFO = new Property<PaintingInfo>("toPaintingInfo");
+
     public void setArtistName(String artistName) {
         writeProperty("artistName", artistName);
     }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CompoundPaintingLongNames.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CompoundPaintingLongNames.java?rev=1425936&r1=1425935&r2=1425936&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CompoundPaintingLongNames.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CompoundPaintingLongNames.java Wed Dec 26 15:00:02 2012
@@ -3,6 +3,7 @@ package org.apache.cayenne.testdo.testma
 import java.math.BigDecimal;
 
 import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
 import org.apache.cayenne.testdo.testmap.Artist;
 import org.apache.cayenne.testdo.testmap.Gallery;
 import org.apache.cayenne.testdo.testmap.PaintingInfo;
@@ -16,19 +17,40 @@ import org.apache.cayenne.testdo.testmap
  */
 public abstract class _CompoundPaintingLongNames extends CayenneDataObject {
 
+    @Deprecated
     public static final String ARTIST_LONG_NAME_PROPERTY = "artistLongName";
+    @Deprecated
     public static final String ESTIMATED_PRICE_PROPERTY = "estimatedPrice";
+    @Deprecated
     public static final String GALLERY_LONG_NAME_PROPERTY = "galleryLongName";
+    @Deprecated
     public static final String PAINTING_DESCRIPTION_PROPERTY = "paintingDescription";
+    @Deprecated
     public static final String PAINTING_TITLE_PROPERTY = "paintingTitle";
+    @Deprecated
     public static final String TEXT_LONG_REVIEW_PROPERTY = "textLongReview";
+    @Deprecated
     public static final String TO_ARTIST_PROPERTY = "toArtist";
+    @Deprecated
     public static final String TO_ARTIST1_PROPERTY = "toArtist1";
+    @Deprecated
     public static final String TO_GALLERY_PROPERTY = "toGallery";
+    @Deprecated
     public static final String TO_PAINTING_INFO_PROPERTY = "toPaintingInfo";
 
     public static final String PAINTING_ID_PK_COLUMN = "PAINTING_ID";
 
+    public static final Property<String> ARTIST_LONG_NAME = new Property<String>("artistLongName");
+    public static final Property<BigDecimal> ESTIMATED_PRICE = new Property<BigDecimal>("estimatedPrice");
+    public static final Property<String> GALLERY_LONG_NAME = new Property<String>("galleryLongName");
+    public static final Property<String> PAINTING_DESCRIPTION = new Property<String>("paintingDescription");
+    public static final Property<String> PAINTING_TITLE = new Property<String>("paintingTitle");
+    public static final Property<String> TEXT_LONG_REVIEW = new Property<String>("textLongReview");
+    public static final Property<Artist> TO_ARTIST = new Property<Artist>("toArtist");
+    public static final Property<ROArtist> TO_ARTIST1 = new Property<ROArtist>("toArtist1");
+    public static final Property<Gallery> TO_GALLERY = new Property<Gallery>("toGallery");
+    public static final Property<PaintingInfo> TO_PAINTING_INFO = new Property<PaintingInfo>("toPaintingInfo");
+
     public void setArtistLongName(String artistLongName) {
         writeProperty("artistLongName", artistLongName);
     }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CompoundPkTestEntity.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CompoundPkTestEntity.java?rev=1425936&r1=1425935&r2=1425936&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CompoundPkTestEntity.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CompoundPkTestEntity.java Wed Dec 26 15:00:02 2012
@@ -1,53 +1,67 @@
 package org.apache.cayenne.testdo.testmap.auto;
 
-/** Class _CompoundPkTestEntity 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 _CompoundPkTestEntity extends org.apache.cayenne.CayenneDataObject {
+import java.util.List;
 
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
+import org.apache.cayenne.testdo.testmap.CompoundFkTestEntity;
+
+/**
+ * Class _CompoundPkTestEntity 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 _CompoundPkTestEntity extends CayenneDataObject {
+
+    @Deprecated
     public static final String KEY1_PROPERTY = "key1";
+    @Deprecated
     public static final String KEY2_PROPERTY = "key2";
+    @Deprecated
     public static final String NAME_PROPERTY = "name";
+    @Deprecated
     public static final String COMPOUND_FK_ARRAY_PROPERTY = "compoundFkArray";
 
     public static final String KEY1_PK_COLUMN = "KEY1";
     public static final String KEY2_PK_COLUMN = "KEY2";
 
+    public static final Property<String> KEY1 = new Property<String>("key1");
+    public static final Property<String> KEY2 = new Property<String>("key2");
+    public static final Property<String> NAME = new Property<String>("name");
+    public static final Property<List<CompoundFkTestEntity>> COMPOUND_FK_ARRAY = new Property<List<CompoundFkTestEntity>>("compoundFkArray");
+
     public void setKey1(String key1) {
         writeProperty("key1", key1);
     }
     public String getKey1() {
         return (String)readProperty("key1");
     }
-    
-    
+
     public void setKey2(String key2) {
         writeProperty("key2", key2);
     }
     public String getKey2() {
         return (String)readProperty("key2");
     }
-    
-    
+
     public void setName(String name) {
         writeProperty("name", name);
     }
     public String getName() {
         return (String)readProperty("name");
     }
-    
-    
-    public void addToCompoundFkArray(org.apache.cayenne.testdo.testmap.CompoundFkTestEntity obj) {
+
+    public void addToCompoundFkArray(CompoundFkTestEntity obj) {
         addToManyTarget("compoundFkArray", obj, true);
     }
-    public void removeFromCompoundFkArray(org.apache.cayenne.testdo.testmap.CompoundFkTestEntity obj) {
+    public void removeFromCompoundFkArray(CompoundFkTestEntity obj) {
         removeToManyTarget("compoundFkArray", obj, true);
     }
-    public java.util.List getCompoundFkArray() {
-        return (java.util.List)readProperty("compoundFkArray");
+    @SuppressWarnings("unchecked")
+    public List<CompoundFkTestEntity> getCompoundFkArray() {
+        return (List<CompoundFkTestEntity>)readProperty("compoundFkArray");
     }
-    
-    
+
+
 }

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=1425936&r1=1425935&r2=1425936&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 Wed Dec 26 15:00:02 2012
@@ -3,6 +3,7 @@ package org.apache.cayenne.testdo.testma
 import java.util.Date;
 
 import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
 
 /**
  * Class _DateTestEntity was generated by Cayenne.
@@ -12,31 +13,38 @@ import org.apache.cayenne.CayenneDataObj
  */
 public abstract class _DateTestEntity extends CayenneDataObject {
 
+    @Deprecated
     public static final String DATE_COLUMN_PROPERTY = "dateColumn";
+    @Deprecated
     public static final String TIME_COLUMN_PROPERTY = "timeColumn";
+    @Deprecated
     public static final String TIMESTAMP_COLUMN_PROPERTY = "timestampColumn";
 
     public static final String DATE_TEST_ID_PK_COLUMN = "DATE_TEST_ID";
 
+    public static final Property<Date> DATE_COLUMN = new Property<Date>("dateColumn");
+    public static final Property<Date> TIME_COLUMN = new Property<Date>("timeColumn");
+    public static final Property<Date> TIMESTAMP_COLUMN = new Property<Date>("timestampColumn");
+
     public void setDateColumn(Date dateColumn) {
-        writeProperty(DATE_COLUMN_PROPERTY, dateColumn);
+        writeProperty("dateColumn", dateColumn);
     }
     public Date getDateColumn() {
-        return (Date)readProperty(DATE_COLUMN_PROPERTY);
+        return (Date)readProperty("dateColumn");
     }
 
     public void setTimeColumn(Date timeColumn) {
-        writeProperty(TIME_COLUMN_PROPERTY, timeColumn);
+        writeProperty("timeColumn", timeColumn);
     }
     public Date getTimeColumn() {
-        return (Date)readProperty(TIME_COLUMN_PROPERTY);
+        return (Date)readProperty("timeColumn");
     }
 
     public void setTimestampColumn(Date timestampColumn) {
-        writeProperty(TIMESTAMP_COLUMN_PROPERTY, timestampColumn);
+        writeProperty("timestampColumn", timestampColumn);
     }
     public Date getTimestampColumn() {
-        return (Date)readProperty(TIMESTAMP_COLUMN_PROPERTY);
+        return (Date)readProperty("timestampColumn");
     }
 
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_DecimalPKTest1.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_DecimalPKTest1.java?rev=1425936&r1=1425935&r2=1425936&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_DecimalPKTest1.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_DecimalPKTest1.java Wed Dec 26 15:00:02 2012
@@ -1,31 +1,38 @@
 package org.apache.cayenne.testdo.testmap.auto;
 
-/** Class _DecimalPKTest1 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 _DecimalPKTest1 extends org.apache.cayenne.CayenneDataObject {
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
 
+/**
+ * Class _DecimalPKTest1 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 _DecimalPKTest1 extends CayenneDataObject {
+
+    @Deprecated
     public static final String DECIMAL_PK_PROPERTY = "decimalPK";
+    @Deprecated
     public static final String NAME_PROPERTY = "name";
 
     public static final String DECIMAL_PK_PK_COLUMN = "DECIMAL_PK";
 
+    public static final Property<Double> DECIMAL_PK = new Property<Double>("decimalPK");
+    public static final Property<String> NAME = new Property<String>("name");
+
     public void setDecimalPK(Double decimalPK) {
         writeProperty("decimalPK", decimalPK);
     }
     public Double getDecimalPK() {
         return (Double)readProperty("decimalPK");
     }
-    
-    
+
     public void setName(String name) {
         writeProperty("name", name);
     }
     public String getName() {
         return (String)readProperty("name");
     }
-    
-    
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_DecimalPKTestEntity.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_DecimalPKTestEntity.java?rev=1425936&r1=1425935&r2=1425936&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_DecimalPKTestEntity.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_DecimalPKTestEntity.java Wed Dec 26 15:00:02 2012
@@ -1,31 +1,40 @@
 package org.apache.cayenne.testdo.testmap.auto;
 
-/** Class _DecimalPKTestEntity 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 _DecimalPKTestEntity extends org.apache.cayenne.CayenneDataObject {
+import java.math.BigDecimal;
 
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
+
+/**
+ * Class _DecimalPKTestEntity 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 _DecimalPKTestEntity extends CayenneDataObject {
+
+    @Deprecated
     public static final String DECIMAL_PK_PROPERTY = "decimalPK";
+    @Deprecated
     public static final String NAME_PROPERTY = "name";
 
     public static final String DECIMAL_PK_PK_COLUMN = "DECIMAL_PK";
 
-    public void setDecimalPK(java.math.BigDecimal decimalPK) {
+    public static final Property<BigDecimal> DECIMAL_PK = new Property<BigDecimal>("decimalPK");
+    public static final Property<String> NAME = new Property<String>("name");
+
+    public void setDecimalPK(BigDecimal decimalPK) {
         writeProperty("decimalPK", decimalPK);
     }
-    public java.math.BigDecimal getDecimalPK() {
-        return (java.math.BigDecimal)readProperty("decimalPK");
+    public BigDecimal getDecimalPK() {
+        return (BigDecimal)readProperty("decimalPK");
     }
-    
-    
+
     public void setName(String name) {
         writeProperty("name", name);
     }
     public String getName() {
         return (String)readProperty("name");
     }
-    
-    
+
 }

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=1425936&r1=1425935&r2=1425936&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 Wed Dec 26 15:00:02 2012
@@ -1,6 +1,7 @@
 package org.apache.cayenne.testdo.testmap.auto;
 
 import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
 import org.apache.cayenne.testdo.testmap.Enum1;
 
 /**
@@ -11,15 +12,18 @@ import org.apache.cayenne.testdo.testmap
  */
 public abstract class _EnumEntity extends CayenneDataObject {
 
+    @Deprecated
     public static final String ENUM_ATTRIBUTE_PROPERTY = "enumAttribute";
 
     public static final String ID_PK_COLUMN = "ID";
 
+    public static final Property<Enum1> ENUM_ATTRIBUTE = new Property<Enum1>("enumAttribute");
+
     public void setEnumAttribute(Enum1 enumAttribute) {
-        writeProperty(ENUM_ATTRIBUTE_PROPERTY, enumAttribute);
+        writeProperty("enumAttribute", enumAttribute);
     }
     public Enum1 getEnumAttribute() {
-        return (Enum1)readProperty(ENUM_ATTRIBUTE_PROPERTY);
+        return (Enum1)readProperty("enumAttribute");
     }
 
 }



Mime
View raw message