cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r1425936 [2/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
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Exhibit.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Exhibit.java?rev=1425936&r1=1425935&r2=1425936&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Exhibit.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Exhibit.java 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.ArtistExhibit;
 import org.apache.cayenne.testdo.testmap.Gallery;
 
@@ -15,45 +16,54 @@ import org.apache.cayenne.testdo.testmap
  */
 public abstract class _Exhibit extends CayenneDataObject {
 
+    @Deprecated
     public static final String CLOSING_DATE_PROPERTY = "closingDate";
+    @Deprecated
     public static final String OPENING_DATE_PROPERTY = "openingDate";
+    @Deprecated
     public static final String ARTIST_EXHIBIT_ARRAY_PROPERTY = "artistExhibitArray";
+    @Deprecated
     public static final String TO_GALLERY_PROPERTY = "toGallery";
 
     public static final String EXHIBIT_ID_PK_COLUMN = "EXHIBIT_ID";
 
+    public static final Property<Date> CLOSING_DATE = new Property<Date>("closingDate");
+    public static final Property<Date> OPENING_DATE = new Property<Date>("openingDate");
+    public static final Property<List<ArtistExhibit>> ARTIST_EXHIBIT_ARRAY = new Property<List<ArtistExhibit>>("artistExhibitArray");
+    public static final Property<Gallery> TO_GALLERY = new Property<Gallery>("toGallery");
+
     public void setClosingDate(Date closingDate) {
-        writeProperty(CLOSING_DATE_PROPERTY, closingDate);
+        writeProperty("closingDate", closingDate);
     }
     public Date getClosingDate() {
-        return (Date)readProperty(CLOSING_DATE_PROPERTY);
+        return (Date)readProperty("closingDate");
     }
 
     public void setOpeningDate(Date openingDate) {
-        writeProperty(OPENING_DATE_PROPERTY, openingDate);
+        writeProperty("openingDate", openingDate);
     }
     public Date getOpeningDate() {
-        return (Date)readProperty(OPENING_DATE_PROPERTY);
+        return (Date)readProperty("openingDate");
     }
 
     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 setToGallery(Gallery toGallery) {
-        setToOneTarget(TO_GALLERY_PROPERTY, toGallery, true);
+        setToOneTarget("toGallery", toGallery, true);
     }
 
     public Gallery getToGallery() {
-        return (Gallery)readProperty(TO_GALLERY_PROPERTY);
+        return (Gallery)readProperty("toGallery");
     }
 
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ExtendedTypeEntity.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ExtendedTypeEntity.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/_ExtendedTypeEntity.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ExtendedTypeEntity.java Wed Dec 26 15:00:02 2012
@@ -1,20 +1,24 @@
 package org.apache.cayenne.testdo.testmap.auto;
 
 import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
 import org.apache.cayenne.testdo.testmap.StringET1;
 
-/** 
+/**
  * Class _ExtendedTypeEntity was generated by Cayenne.
- * It is probably a good idea to avoid changing this class manually, 
- * since it may be overwritten next time code is regenerated. 
- * If you need to make any customizations, please use subclass. 
+ * It is probably a good idea to avoid changing this class manually,
+ * since it may be overwritten next time code is regenerated.
+ * If you need to make any customizations, please use subclass.
  */
 public abstract class _ExtendedTypeEntity extends CayenneDataObject {
 
+    @Deprecated
     public static final String NAME_PROPERTY = "name";
 
     public static final String ID_PK_COLUMN = "ID";
 
+    public static final Property<StringET1> NAME = new Property<StringET1>("name");
+
     public void setName(StringET1 name) {
         writeProperty("name", name);
     }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Gallery.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Gallery.java?rev=1425936&r1=1425935&r2=1425936&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Gallery.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Gallery.java 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.Exhibit;
 import org.apache.cayenne.testdo.testmap.Painting;
 
@@ -14,40 +15,47 @@ import org.apache.cayenne.testdo.testmap
  */
 public abstract class _Gallery extends CayenneDataObject {
 
+    @Deprecated
     public static final String GALLERY_NAME_PROPERTY = "galleryName";
+    @Deprecated
     public static final String EXHIBIT_ARRAY_PROPERTY = "exhibitArray";
+    @Deprecated
     public static final String PAINTING_ARRAY_PROPERTY = "paintingArray";
 
     public static final String GALLERY_ID_PK_COLUMN = "GALLERY_ID";
 
+    public static final Property<String> GALLERY_NAME = new Property<String>("galleryName");
+    public static final Property<List<Exhibit>> EXHIBIT_ARRAY = new Property<List<Exhibit>>("exhibitArray");
+    public static final Property<List<Painting>> PAINTING_ARRAY = new Property<List<Painting>>("paintingArray");
+
     public void setGalleryName(String galleryName) {
-        writeProperty(GALLERY_NAME_PROPERTY, galleryName);
+        writeProperty("galleryName", galleryName);
     }
     public String getGalleryName() {
-        return (String)readProperty(GALLERY_NAME_PROPERTY);
+        return (String)readProperty("galleryName");
     }
 
     public void addToExhibitArray(Exhibit obj) {
-        addToManyTarget(EXHIBIT_ARRAY_PROPERTY, obj, true);
+        addToManyTarget("exhibitArray", obj, true);
     }
     public void removeFromExhibitArray(Exhibit obj) {
-        removeToManyTarget(EXHIBIT_ARRAY_PROPERTY, obj, true);
+        removeToManyTarget("exhibitArray", obj, true);
     }
     @SuppressWarnings("unchecked")
     public List<Exhibit> getExhibitArray() {
-        return (List<Exhibit>)readProperty(EXHIBIT_ARRAY_PROPERTY);
+        return (List<Exhibit>)readProperty("exhibitArray");
     }
 
 
     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/_GeneratedColumnCompKey.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_GeneratedColumnCompKey.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/_GeneratedColumnCompKey.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_GeneratedColumnCompKey.java Wed Dec 26 15:00:02 2012
@@ -1,34 +1,43 @@
 package org.apache.cayenne.testdo.testmap.auto;
 
-/** Class _GeneratedColumnCompKey was generated by Cayenne.
-  * It is probably a good idea to avoid changing this class manually, 
-  * since it may be overwritten next time code is regenerated. 
-  * If you need to make any customizations, please use subclass. 
-  */
-public abstract class _GeneratedColumnCompKey extends org.apache.cayenne.CayenneDataObject {
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
+import org.apache.cayenne.testdo.testmap.GeneratedColumnCompMaster;
 
+/**
+ * Class _GeneratedColumnCompKey was generated by Cayenne.
+ * It is probably a good idea to avoid changing this class manually,
+ * since it may be overwritten next time code is regenerated.
+ * If you need to make any customizations, please use subclass.
+ */
+public abstract class _GeneratedColumnCompKey extends CayenneDataObject {
+
+    @Deprecated
     public static final String NAME_PROPERTY = "name";
+    @Deprecated
     public static final String TO_MASTER_PROPERTY = "toMaster";
 
     public static final String AUTO_PK_PK_COLUMN = "AUTO_PK";
     public static final String GENERATED_COLUMN_PK_COLUMN = "GENERATED_COLUMN";
     public static final String PROPAGATED_PK_PK_COLUMN = "PROPAGATED_PK";
 
+    public static final Property<String> NAME = new Property<String>("name");
+    public static final Property<GeneratedColumnCompMaster> TO_MASTER = new Property<GeneratedColumnCompMaster>("toMaster");
+
     public void setName(String name) {
         writeProperty("name", name);
     }
     public String getName() {
         return (String)readProperty("name");
     }
-    
-    
-    public void setToMaster(org.apache.cayenne.testdo.testmap.GeneratedColumnCompMaster toMaster) {
+
+    public void setToMaster(GeneratedColumnCompMaster toMaster) {
         setToOneTarget("toMaster", toMaster, true);
     }
 
-    public org.apache.cayenne.testdo.testmap.GeneratedColumnCompMaster getToMaster() {
-        return (org.apache.cayenne.testdo.testmap.GeneratedColumnCompMaster)readProperty("toMaster");
-    } 
-    
-    
+    public GeneratedColumnCompMaster getToMaster() {
+        return (GeneratedColumnCompMaster)readProperty("toMaster");
+    }
+
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_GeneratedColumnCompMaster.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_GeneratedColumnCompMaster.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/_GeneratedColumnCompMaster.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_GeneratedColumnCompMaster.java Wed Dec 26 15:00:02 2012
@@ -1,34 +1,46 @@
 package org.apache.cayenne.testdo.testmap.auto;
 
-/** Class _GeneratedColumnCompMaster was generated by Cayenne.
-  * It is probably a good idea to avoid changing this class manually, 
-  * since it may be overwritten next time code is regenerated. 
-  * If you need to make any customizations, please use subclass. 
-  */
-public abstract class _GeneratedColumnCompMaster extends 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.GeneratedColumnCompKey;
+
+/**
+ * Class _GeneratedColumnCompMaster was generated by Cayenne.
+ * It is probably a good idea to avoid changing this class manually,
+ * since it may be overwritten next time code is regenerated.
+ * If you need to make any customizations, please use subclass.
+ */
+public abstract class _GeneratedColumnCompMaster extends CayenneDataObject {
+
+    @Deprecated
     public static final String NAME_PROPERTY = "name";
+    @Deprecated
     public static final String TO_DETAIL_PROPERTY = "toDetail";
 
     public static final String ID_PK_COLUMN = "ID";
 
+    public static final Property<String> NAME = new Property<String>("name");
+    public static final Property<List<GeneratedColumnCompKey>> TO_DETAIL = new Property<List<GeneratedColumnCompKey>>("toDetail");
+
     public void setName(String name) {
         writeProperty("name", name);
     }
     public String getName() {
         return (String)readProperty("name");
     }
-    
-    
-    public void addToToDetail(org.apache.cayenne.testdo.testmap.GeneratedColumnCompKey obj) {
+
+    public void addToToDetail(GeneratedColumnCompKey obj) {
         addToManyTarget("toDetail", obj, true);
     }
-    public void removeFromToDetail(org.apache.cayenne.testdo.testmap.GeneratedColumnCompKey obj) {
+    public void removeFromToDetail(GeneratedColumnCompKey obj) {
         removeToManyTarget("toDetail", obj, true);
     }
-    public java.util.List getToDetail() {
-        return (java.util.List)readProperty("toDetail");
+    @SuppressWarnings("unchecked")
+    public List<GeneratedColumnCompKey> getToDetail() {
+        return (List<GeneratedColumnCompKey>)readProperty("toDetail");
     }
-    
-    
+
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_GeneratedColumnDep.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_GeneratedColumnDep.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/_GeneratedColumnDep.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_GeneratedColumnDep.java Wed Dec 26 15:00:02 2012
@@ -1,32 +1,41 @@
 package org.apache.cayenne.testdo.testmap.auto;
 
-/** Class _GeneratedColumnDep was generated by Cayenne.
-  * It is probably a good idea to avoid changing this class manually, 
-  * since it may be overwritten next time code is regenerated. 
-  * If you need to make any customizations, please use subclass. 
-  */
-public abstract class _GeneratedColumnDep extends org.apache.cayenne.CayenneDataObject {
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
+import org.apache.cayenne.testdo.testmap.GeneratedColumnTestEntity;
 
+/**
+ * Class _GeneratedColumnDep was generated by Cayenne.
+ * It is probably a good idea to avoid changing this class manually,
+ * since it may be overwritten next time code is regenerated.
+ * If you need to make any customizations, please use subclass.
+ */
+public abstract class _GeneratedColumnDep extends CayenneDataObject {
+
+    @Deprecated
     public static final String NAME_PROPERTY = "name";
+    @Deprecated
     public static final String TO_MASTER_PROPERTY = "toMaster";
 
     public static final String GENERATED_COLUMN_FK_PK_COLUMN = "GENERATED_COLUMN_FK";
 
+    public static final Property<String> NAME = new Property<String>("name");
+    public static final Property<GeneratedColumnTestEntity> TO_MASTER = new Property<GeneratedColumnTestEntity>("toMaster");
+
     public void setName(String name) {
         writeProperty("name", name);
     }
     public String getName() {
         return (String)readProperty("name");
     }
-    
-    
-    public void setToMaster(org.apache.cayenne.testdo.testmap.GeneratedColumnTestEntity toMaster) {
+
+    public void setToMaster(GeneratedColumnTestEntity toMaster) {
         setToOneTarget("toMaster", toMaster, true);
     }
 
-    public org.apache.cayenne.testdo.testmap.GeneratedColumnTestEntity getToMaster() {
-        return (org.apache.cayenne.testdo.testmap.GeneratedColumnTestEntity)readProperty("toMaster");
-    } 
-    
-    
+    public GeneratedColumnTestEntity getToMaster() {
+        return (GeneratedColumnTestEntity)readProperty("toMaster");
+    }
+
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_GeneratedColumnTest2.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_GeneratedColumnTest2.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/_GeneratedColumnTest2.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_GeneratedColumnTest2.java Wed Dec 26 15:00:02 2012
@@ -1,22 +1,28 @@
 package org.apache.cayenne.testdo.testmap.auto;
 
-/** Class _GeneratedColumnTest2 was generated by Cayenne.
-  * It is probably a good idea to avoid changing this class manually, 
-  * since it may be overwritten next time code is regenerated. 
-  * If you need to make any customizations, please use subclass. 
-  */
-public abstract class _GeneratedColumnTest2 extends org.apache.cayenne.CayenneDataObject {
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
 
+/**
+ * Class _GeneratedColumnTest2 was generated by Cayenne.
+ * It is probably a good idea to avoid changing this class manually,
+ * since it may be overwritten next time code is regenerated.
+ * If you need to make any customizations, please use subclass.
+ */
+public abstract class _GeneratedColumnTest2 extends CayenneDataObject {
+
+    @Deprecated
     public static final String NAME_PROPERTY = "name";
 
     public static final String GENERATED_COLUMN_PK_COLUMN = "GENERATED_COLUMN";
 
+    public static final Property<String> NAME = new Property<String>("name");
+
     public void setName(String name) {
         writeProperty("name", name);
     }
     public String getName() {
         return (String)readProperty("name");
     }
-    
-    
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_GeneratedColumnTestEntity.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_GeneratedColumnTestEntity.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/_GeneratedColumnTestEntity.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_GeneratedColumnTestEntity.java Wed Dec 26 15:00:02 2012
@@ -1,32 +1,41 @@
 package org.apache.cayenne.testdo.testmap.auto;
 
-/** Class _GeneratedColumnTestEntity was generated by Cayenne.
-  * It is probably a good idea to avoid changing this class manually, 
-  * since it may be overwritten next time code is regenerated. 
-  * If you need to make any customizations, please use subclass. 
-  */
-public abstract class _GeneratedColumnTestEntity extends org.apache.cayenne.CayenneDataObject {
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
+import org.apache.cayenne.testdo.testmap.GeneratedColumnDep;
 
+/**
+ * Class _GeneratedColumnTestEntity was generated by Cayenne.
+ * It is probably a good idea to avoid changing this class manually,
+ * since it may be overwritten next time code is regenerated.
+ * If you need to make any customizations, please use subclass.
+ */
+public abstract class _GeneratedColumnTestEntity extends CayenneDataObject {
+
+    @Deprecated
     public static final String NAME_PROPERTY = "name";
+    @Deprecated
     public static final String TO_DEP_PROPERTY = "toDep";
 
     public static final String GENERATED_COLUMN_PK_COLUMN = "GENERATED_COLUMN";
 
+    public static final Property<String> NAME = new Property<String>("name");
+    public static final Property<GeneratedColumnDep> TO_DEP = new Property<GeneratedColumnDep>("toDep");
+
     public void setName(String name) {
         writeProperty("name", name);
     }
     public String getName() {
         return (String)readProperty("name");
     }
-    
-    
-    public void setToDep(org.apache.cayenne.testdo.testmap.GeneratedColumnDep toDep) {
+
+    public void setToDep(GeneratedColumnDep toDep) {
         setToOneTarget("toDep", toDep, true);
     }
 
-    public org.apache.cayenne.testdo.testmap.GeneratedColumnDep getToDep() {
-        return (org.apache.cayenne.testdo.testmap.GeneratedColumnDep)readProperty("toDep");
-    } 
-    
-    
+    public GeneratedColumnDep getToDep() {
+        return (GeneratedColumnDep)readProperty("toDep");
+    }
+
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_GeneratedF1.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_GeneratedF1.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/_GeneratedF1.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_GeneratedF1.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.GeneratedF2;
 
 /**
@@ -13,10 +14,13 @@ import org.apache.cayenne.testdo.testmap
  */
 public abstract class _GeneratedF1 extends CayenneDataObject {
 
+    @Deprecated
     public static final String F2_PROPERTY = "f2";
 
     public static final String ID_PK_COLUMN = "ID";
 
+    public static final Property<List<GeneratedF2>> F2 = new Property<List<GeneratedF2>>("f2");
+
     public void addToF2(GeneratedF2 obj) {
         addToManyTarget("f2", obj, true);
     }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_GeneratedF2.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_GeneratedF2.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/_GeneratedF2.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_GeneratedF2.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.GeneratedF1;
 
 /**
@@ -13,10 +14,13 @@ import org.apache.cayenne.testdo.testmap
  */
 public abstract class _GeneratedF2 extends CayenneDataObject {
 
+    @Deprecated
     public static final String F1_PROPERTY = "f1";
 
     public static final String ID_PK_COLUMN = "ID";
 
+    public static final Property<List<GeneratedF1>> F1 = new Property<List<GeneratedF1>>("f1");
+
     public void addToF1(GeneratedF1 obj) {
         addToManyTarget("f1", obj, true);
     }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_LongEntity.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_LongEntity.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/_LongEntity.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_LongEntity.java Wed Dec 26 15:00:02 2012
@@ -1,22 +1,28 @@
 package org.apache.cayenne.testdo.testmap.auto;
 
-/** Class _LongEntity was generated by Cayenne.
-  * It is probably a good idea to avoid changing this class manually, 
-  * since it may be overwritten next time code is regenerated. 
-  * If you need to make any customizations, please use subclass. 
-  */
-public abstract class _LongEntity extends org.apache.cayenne.CayenneDataObject {
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
 
+/**
+ * Class _LongEntity was generated by Cayenne.
+ * It is probably a good idea to avoid changing this class manually,
+ * since it may be overwritten next time code is regenerated.
+ * If you need to make any customizations, please use subclass.
+ */
+public abstract class _LongEntity extends CayenneDataObject {
+
+    @Deprecated
     public static final String LONG_FIELD_PROPERTY = "longField";
 
     public static final String ID_PK_COLUMN = "ID";
 
+    public static final Property<Long> LONG_FIELD = new Property<Long>("longField");
+
     public void setLongField(Long longField) {
         writeProperty("longField", longField);
     }
     public Long getLongField() {
         return (Long)readProperty("longField");
     }
-    
-    
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_MeaningfulGeneratedColumnTestEntity.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_MeaningfulGeneratedColumnTestEntity.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/_MeaningfulGeneratedColumnTestEntity.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_MeaningfulGeneratedColumnTestEntity.java Wed Dec 26 15:00:02 2012
@@ -1,31 +1,38 @@
 package org.apache.cayenne.testdo.testmap.auto;
 
-/** Class _MeaningfulGeneratedColumnTestEntity 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 _MeaningfulGeneratedColumnTestEntity extends org.apache.cayenne.CayenneDataObject {
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
 
+/**
+ * Class _MeaningfulGeneratedColumnTestEntity 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 _MeaningfulGeneratedColumnTestEntity extends CayenneDataObject {
+
+    @Deprecated
     public static final String GENERATED_COLUMN_PROPERTY = "generatedColumn";
+    @Deprecated
     public static final String NAME_PROPERTY = "name";
 
     public static final String GENERATED_COLUMN_PK_COLUMN = "GENERATED_COLUMN";
 
+    public static final Property<Integer> GENERATED_COLUMN = new Property<Integer>("generatedColumn");
+    public static final Property<String> NAME = new Property<String>("name");
+
     public void setGeneratedColumn(Integer generatedColumn) {
         writeProperty("generatedColumn", generatedColumn);
     }
     public Integer getGeneratedColumn() {
         return (Integer)readProperty("generatedColumn");
     }
-    
-    
+
     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/_MeaningfulPKDep.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_MeaningfulPKDep.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/_MeaningfulPKDep.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_MeaningfulPKDep.java Wed Dec 26 15:00:02 2012
@@ -1,32 +1,41 @@
 package org.apache.cayenne.testdo.testmap.auto;
 
-/** Class _MeaningfulPKDep was generated by Cayenne.
-  * It is probably a good idea to avoid changing this class manually, 
-  * since it may be overwritten next time code is regenerated. 
-  * If you need to make any customizations, please use subclass. 
-  */
-public abstract class _MeaningfulPKDep extends org.apache.cayenne.CayenneDataObject {
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
+import org.apache.cayenne.testdo.testmap.MeaningfulPKTest1;
 
+/**
+ * Class _MeaningfulPKDep was generated by Cayenne.
+ * It is probably a good idea to avoid changing this class manually,
+ * since it may be overwritten next time code is regenerated.
+ * If you need to make any customizations, please use subclass.
+ */
+public abstract class _MeaningfulPKDep extends CayenneDataObject {
+
+    @Deprecated
     public static final String DESCR_PROPERTY = "descr";
+    @Deprecated
     public static final String TO_MEANINGFUL_PK_PROPERTY = "toMeaningfulPK";
 
     public static final String PK_ATTRIBUTE_PK_COLUMN = "PK_ATTRIBUTE";
 
+    public static final Property<String> DESCR = new Property<String>("descr");
+    public static final Property<MeaningfulPKTest1> TO_MEANINGFUL_PK = new Property<MeaningfulPKTest1>("toMeaningfulPK");
+
     public void setDescr(String descr) {
         writeProperty("descr", descr);
     }
     public String getDescr() {
         return (String)readProperty("descr");
     }
-    
-    
-    public void setToMeaningfulPK(org.apache.cayenne.testdo.testmap.MeaningfulPKTest1 toMeaningfulPK) {
+
+    public void setToMeaningfulPK(MeaningfulPKTest1 toMeaningfulPK) {
         setToOneTarget("toMeaningfulPK", toMeaningfulPK, true);
     }
 
-    public org.apache.cayenne.testdo.testmap.MeaningfulPKTest1 getToMeaningfulPK() {
-        return (org.apache.cayenne.testdo.testmap.MeaningfulPKTest1)readProperty("toMeaningfulPK");
-    } 
-    
-    
+    public MeaningfulPKTest1 getToMeaningfulPK() {
+        return (MeaningfulPKTest1)readProperty("toMeaningfulPK");
+    }
+
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_MeaningfulPKTest1.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_MeaningfulPKTest1.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/_MeaningfulPKTest1.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_MeaningfulPKTest1.java Wed Dec 26 15:00:02 2012
@@ -1,43 +1,56 @@
 package org.apache.cayenne.testdo.testmap.auto;
 
-/** Class _MeaningfulPKTest1 was generated by Cayenne.
-  * It is probably a good idea to avoid changing this class manually, 
-  * since it may be overwritten next time code is regenerated. 
-  * If you need to make any customizations, please use subclass. 
-  */
-public abstract class _MeaningfulPKTest1 extends 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.MeaningfulPKDep;
+
+/**
+ * Class _MeaningfulPKTest1 was generated by Cayenne.
+ * It is probably a good idea to avoid changing this class manually,
+ * since it may be overwritten next time code is regenerated.
+ * If you need to make any customizations, please use subclass.
+ */
+public abstract class _MeaningfulPKTest1 extends CayenneDataObject {
+
+    @Deprecated
     public static final String DESCR_PROPERTY = "descr";
+    @Deprecated
     public static final String PK_ATTRIBUTE_PROPERTY = "pkAttribute";
+    @Deprecated
     public static final String MEANINGFUL_PKDEP_ARRAY_PROPERTY = "meaningfulPKDepArray";
 
     public static final String PK_ATTRIBUTE_PK_COLUMN = "PK_ATTRIBUTE";
 
+    public static final Property<String> DESCR = new Property<String>("descr");
+    public static final Property<Integer> PK_ATTRIBUTE = new Property<Integer>("pkAttribute");
+    public static final Property<List<MeaningfulPKDep>> MEANINGFUL_PKDEP_ARRAY = new Property<List<MeaningfulPKDep>>("meaningfulPKDepArray");
+
     public void setDescr(String descr) {
         writeProperty("descr", descr);
     }
     public String getDescr() {
         return (String)readProperty("descr");
     }
-    
-    
+
     public void setPkAttribute(Integer pkAttribute) {
         writeProperty("pkAttribute", pkAttribute);
     }
     public Integer getPkAttribute() {
         return (Integer)readProperty("pkAttribute");
     }
-    
-    
-    public void addToMeaningfulPKDepArray(org.apache.cayenne.testdo.testmap.MeaningfulPKDep obj) {
+
+    public void addToMeaningfulPKDepArray(MeaningfulPKDep obj) {
         addToManyTarget("meaningfulPKDepArray", obj, true);
     }
-    public void removeFromMeaningfulPKDepArray(org.apache.cayenne.testdo.testmap.MeaningfulPKDep obj) {
+    public void removeFromMeaningfulPKDepArray(MeaningfulPKDep obj) {
         removeToManyTarget("meaningfulPKDepArray", obj, true);
     }
-    public java.util.List getMeaningfulPKDepArray() {
-        return (java.util.List)readProperty("meaningfulPKDepArray");
+    @SuppressWarnings("unchecked")
+    public List<MeaningfulPKDep> getMeaningfulPKDepArray() {
+        return (List<MeaningfulPKDep>)readProperty("meaningfulPKDepArray");
     }
-    
-    
+
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_MixedPersistenceStrategy.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_MixedPersistenceStrategy.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/_MixedPersistenceStrategy.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_MixedPersistenceStrategy.java Wed Dec 26 15:00:02 2012
@@ -1,43 +1,56 @@
 package org.apache.cayenne.testdo.testmap.auto;
 
-/** Class _MixedPersistenceStrategy was generated by Cayenne.
-  * It is probably a good idea to avoid changing this class manually, 
-  * since it may be overwritten next time code is regenerated. 
-  * If you need to make any customizations, please use subclass. 
-  */
-public abstract class _MixedPersistenceStrategy extends 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.MixedPersistenceStrategy2;
+
+/**
+ * Class _MixedPersistenceStrategy was generated by Cayenne.
+ * It is probably a good idea to avoid changing this class manually,
+ * since it may be overwritten next time code is regenerated.
+ * If you need to make any customizations, please use subclass.
+ */
+public abstract class _MixedPersistenceStrategy extends CayenneDataObject {
+
+    @Deprecated
     public static final String DESCRIPTION_PROPERTY = "description";
+    @Deprecated
     public static final String NAME_PROPERTY = "name";
+    @Deprecated
     public static final String DETAILS_PROPERTY = "details";
 
     public static final String ID_PK_COLUMN = "ID";
 
+    public static final Property<String> DESCRIPTION = new Property<String>("description");
+    public static final Property<String> NAME = new Property<String>("name");
+    public static final Property<List<MixedPersistenceStrategy2>> DETAILS = new Property<List<MixedPersistenceStrategy2>>("details");
+
     public void setDescription(String description) {
         writeProperty("description", description);
     }
     public String getDescription() {
         return (String)readProperty("description");
     }
-    
-    
+
     public void setName(String name) {
         writeProperty("name", name);
     }
     public String getName() {
         return (String)readProperty("name");
     }
-    
-    
-    public void addToDetails(org.apache.cayenne.testdo.testmap.MixedPersistenceStrategy2 obj) {
+
+    public void addToDetails(MixedPersistenceStrategy2 obj) {
         addToManyTarget("details", obj, true);
     }
-    public void removeFromDetails(org.apache.cayenne.testdo.testmap.MixedPersistenceStrategy2 obj) {
+    public void removeFromDetails(MixedPersistenceStrategy2 obj) {
         removeToManyTarget("details", obj, true);
     }
-    public java.util.List getDetails() {
-        return (java.util.List)readProperty("details");
+    @SuppressWarnings("unchecked")
+    public List<MixedPersistenceStrategy2> getDetails() {
+        return (List<MixedPersistenceStrategy2>)readProperty("details");
     }
-    
-    
+
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_MixedPersistenceStrategy2.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_MixedPersistenceStrategy2.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/_MixedPersistenceStrategy2.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_MixedPersistenceStrategy2.java Wed Dec 26 15:00:02 2012
@@ -1,32 +1,41 @@
 package org.apache.cayenne.testdo.testmap.auto;
 
-/** Class _MixedPersistenceStrategy2 was generated by Cayenne.
-  * It is probably a good idea to avoid changing this class manually, 
-  * since it may be overwritten next time code is regenerated. 
-  * If you need to make any customizations, please use subclass. 
-  */
-public abstract class _MixedPersistenceStrategy2 extends org.apache.cayenne.CayenneDataObject {
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
+import org.apache.cayenne.testdo.testmap.MixedPersistenceStrategy;
 
+/**
+ * Class _MixedPersistenceStrategy2 was generated by Cayenne.
+ * It is probably a good idea to avoid changing this class manually,
+ * since it may be overwritten next time code is regenerated.
+ * If you need to make any customizations, please use subclass.
+ */
+public abstract class _MixedPersistenceStrategy2 extends CayenneDataObject {
+
+    @Deprecated
     public static final String NAME_PROPERTY = "name";
+    @Deprecated
     public static final String MASTER_PROPERTY = "master";
 
     public static final String ID_PK_COLUMN = "ID";
 
+    public static final Property<String> NAME = new Property<String>("name");
+    public static final Property<MixedPersistenceStrategy> MASTER = new Property<MixedPersistenceStrategy>("master");
+
     public void setName(String name) {
         writeProperty("name", name);
     }
     public String getName() {
         return (String)readProperty("name");
     }
-    
-    
-    public void setMaster(org.apache.cayenne.testdo.testmap.MixedPersistenceStrategy master) {
+
+    public void setMaster(MixedPersistenceStrategy master) {
         setToOneTarget("master", master, true);
     }
 
-    public org.apache.cayenne.testdo.testmap.MixedPersistenceStrategy getMaster() {
-        return (org.apache.cayenne.testdo.testmap.MixedPersistenceStrategy)readProperty("master");
-    } 
-    
-    
+    public MixedPersistenceStrategy getMaster() {
+        return (MixedPersistenceStrategy)readProperty("master");
+    }
+
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_NoPkTestEntity.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_NoPkTestEntity.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/_NoPkTestEntity.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_NoPkTestEntity.java Wed Dec 26 15:00:02 2012
@@ -1,21 +1,27 @@
 package org.apache.cayenne.testdo.testmap.auto;
 
-/** Class _NoPkTestEntity was generated by Cayenne.
-  * It is probably a good idea to avoid changing this class manually, 
-  * since it may be overwritten next time code is regenerated. 
-  * If you need to make any customizations, please use subclass. 
-  */
-public abstract class _NoPkTestEntity extends org.apache.cayenne.CayenneDataObject {
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
 
+/**
+ * Class _NoPkTestEntity was generated by Cayenne.
+ * It is probably a good idea to avoid changing this class manually,
+ * since it may be overwritten next time code is regenerated.
+ * If you need to make any customizations, please use subclass.
+ */
+public abstract class _NoPkTestEntity extends CayenneDataObject {
+
+    @Deprecated
     public static final String ATTRIBUTE1_PROPERTY = "attribute1";
 
 
+    public static final Property<Integer> ATTRIBUTE1 = new Property<Integer>("attribute1");
+
     public void setAttribute1(Integer attribute1) {
         writeProperty("attribute1", attribute1);
     }
     public Integer getAttribute1() {
         return (Integer)readProperty("attribute1");
     }
-    
-    
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_NullTestEntity.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_NullTestEntity.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/_NullTestEntity.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_NullTestEntity.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 _NullTestEntity was generated by Cayenne.
@@ -10,10 +11,13 @@ import org.apache.cayenne.CayenneDataObj
  */
 public abstract class _NullTestEntity extends CayenneDataObject {
 
+    @Deprecated
     public static final String NAME_PROPERTY = "name";
 
     public static final String ID_PK_COLUMN = "ID";
 
+    public static final Property<String> NAME = new Property<String>("name");
+
     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/_Painting.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Painting.java?rev=1425936&r1=1425935&r2=1425936&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Painting.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Painting.java Wed Dec 26 15:00:02 2012
@@ -2,6 +2,7 @@ package org.apache.cayenne.testdo.testma
 
 import java.math.BigDecimal;
 
+import org.apache.cayenne.exp.Property;
 import org.apache.cayenne.testdo.testmap.ArtDataObject;
 import org.apache.cayenne.testdo.testmap.Artist;
 import org.apache.cayenne.testdo.testmap.Gallery;
@@ -15,60 +16,73 @@ import org.apache.cayenne.testdo.testmap
  */
 public abstract class _Painting extends ArtDataObject {
 
+    @Deprecated
     public static final String ESTIMATED_PRICE_PROPERTY = "estimatedPrice";
+    @Deprecated
     public static final String PAINTING_DESCRIPTION_PROPERTY = "paintingDescription";
+    @Deprecated
     public static final String PAINTING_TITLE_PROPERTY = "paintingTitle";
+    @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<BigDecimal> ESTIMATED_PRICE = new Property<BigDecimal>("estimatedPrice");
+    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<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 setEstimatedPrice(BigDecimal estimatedPrice) {
-        writeProperty(ESTIMATED_PRICE_PROPERTY, estimatedPrice);
+        writeProperty("estimatedPrice", estimatedPrice);
     }
     public BigDecimal getEstimatedPrice() {
-        return (BigDecimal)readProperty(ESTIMATED_PRICE_PROPERTY);
+        return (BigDecimal)readProperty("estimatedPrice");
     }
 
     public void setPaintingDescription(String paintingDescription) {
-        writeProperty(PAINTING_DESCRIPTION_PROPERTY, paintingDescription);
+        writeProperty("paintingDescription", paintingDescription);
     }
     public String getPaintingDescription() {
-        return (String)readProperty(PAINTING_DESCRIPTION_PROPERTY);
+        return (String)readProperty("paintingDescription");
     }
 
     public void setPaintingTitle(String paintingTitle) {
-        writeProperty(PAINTING_TITLE_PROPERTY, paintingTitle);
+        writeProperty("paintingTitle", paintingTitle);
     }
     public String getPaintingTitle() {
-        return (String)readProperty(PAINTING_TITLE_PROPERTY);
+        return (String)readProperty("paintingTitle");
     }
 
     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 setToGallery(Gallery toGallery) {
-        setToOneTarget(TO_GALLERY_PROPERTY, toGallery, true);
+        setToOneTarget("toGallery", toGallery, true);
     }
 
     public Gallery getToGallery() {
-        return (Gallery)readProperty(TO_GALLERY_PROPERTY);
+        return (Gallery)readProperty("toGallery");
     }
 
 
     public void setToPaintingInfo(PaintingInfo toPaintingInfo) {
-        setToOneTarget(TO_PAINTING_INFO_PROPERTY, toPaintingInfo, true);
+        setToOneTarget("toPaintingInfo", toPaintingInfo, true);
     }
 
     public PaintingInfo getToPaintingInfo() {
-        return (PaintingInfo)readProperty(TO_PAINTING_INFO_PROPERTY);
+        return (PaintingInfo)readProperty("toPaintingInfo");
     }
 
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Painting1.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Painting1.java?rev=1425936&r1=1425935&r2=1425936&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Painting1.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Painting1.java 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;
 
 /**
@@ -13,32 +14,39 @@ import org.apache.cayenne.testdo.testmap
  */
 public abstract class _Painting1 extends CayenneDataObject {
 
+    @Deprecated
     public static final String ESTIMATED_PRICE_PROPERTY = "estimatedPrice";
+    @Deprecated
     public static final String PAINTING_TITLE_PROPERTY = "paintingTitle";
+    @Deprecated
     public static final String TO_ARTIST_PROPERTY = "toArtist";
 
     public static final String PAINTING_ID_PK_COLUMN = "PAINTING_ID";
 
+    public static final Property<BigDecimal> ESTIMATED_PRICE = new Property<BigDecimal>("estimatedPrice");
+    public static final Property<String> PAINTING_TITLE = new Property<String>("paintingTitle");
+    public static final Property<Artist> TO_ARTIST = new Property<Artist>("toArtist");
+
     public void setEstimatedPrice(BigDecimal estimatedPrice) {
-        writeProperty(ESTIMATED_PRICE_PROPERTY, estimatedPrice);
+        writeProperty("estimatedPrice", estimatedPrice);
     }
     public BigDecimal getEstimatedPrice() {
-        return (BigDecimal)readProperty(ESTIMATED_PRICE_PROPERTY);
+        return (BigDecimal)readProperty("estimatedPrice");
     }
 
     public void setPaintingTitle(String paintingTitle) {
-        writeProperty(PAINTING_TITLE_PROPERTY, paintingTitle);
+        writeProperty("paintingTitle", paintingTitle);
     }
     public String getPaintingTitle() {
-        return (String)readProperty(PAINTING_TITLE_PROPERTY);
+        return (String)readProperty("paintingTitle");
     }
 
     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");
     }
 
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_PaintingInfo.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_PaintingInfo.java?rev=1425936&r1=1425935&r2=1425936&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_PaintingInfo.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_PaintingInfo.java 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.Painting;
 
 /**
@@ -11,32 +12,39 @@ import org.apache.cayenne.testdo.testmap
  */
 public abstract class _PaintingInfo extends CayenneDataObject {
 
+    @Deprecated
     public static final String IMAGE_BLOB_PROPERTY = "imageBlob";
+    @Deprecated
     public static final String TEXT_REVIEW_PROPERTY = "textReview";
+    @Deprecated
     public static final String PAINTING_PROPERTY = "painting";
 
     public static final String PAINTING_ID_PK_COLUMN = "PAINTING_ID";
 
+    public static final Property<byte[]> IMAGE_BLOB = new Property<byte[]>("imageBlob");
+    public static final Property<String> TEXT_REVIEW = new Property<String>("textReview");
+    public static final Property<Painting> PAINTING = new Property<Painting>("painting");
+
     public void setImageBlob(byte[] imageBlob) {
-        writeProperty(IMAGE_BLOB_PROPERTY, imageBlob);
+        writeProperty("imageBlob", imageBlob);
     }
     public byte[] getImageBlob() {
-        return (byte[])readProperty(IMAGE_BLOB_PROPERTY);
+        return (byte[])readProperty("imageBlob");
     }
 
     public void setTextReview(String textReview) {
-        writeProperty(TEXT_REVIEW_PROPERTY, textReview);
+        writeProperty("textReview", textReview);
     }
     public String getTextReview() {
-        return (String)readProperty(TEXT_REVIEW_PROPERTY);
+        return (String)readProperty("textReview");
     }
 
     public void setPainting(Painting painting) {
-        setToOneTarget(PAINTING_PROPERTY, painting, true);
+        setToOneTarget("painting", painting, true);
     }
 
     public Painting getPainting() {
-        return (Painting)readProperty(PAINTING_PROPERTY);
+        return (Painting)readProperty("painting");
     }
 
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_PrimitivesTestEntity.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_PrimitivesTestEntity.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/_PrimitivesTestEntity.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_PrimitivesTestEntity.java Wed Dec 26 15:00:02 2012
@@ -1,17 +1,26 @@
 package org.apache.cayenne.testdo.testmap.auto;
 
-/** Class _PrimitivesTestEntity was generated by Cayenne.
-  * It is probably a good idea to avoid changing this class manually, 
-  * since it may be overwritten next time code is regenerated. 
-  * If you need to make any customizations, please use subclass. 
-  */
-public abstract class _PrimitivesTestEntity extends org.apache.cayenne.CayenneDataObject {
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
 
+/**
+ * Class _PrimitivesTestEntity was generated by Cayenne.
+ * It is probably a good idea to avoid changing this class manually,
+ * since it may be overwritten next time code is regenerated.
+ * If you need to make any customizations, please use subclass.
+ */
+public abstract class _PrimitivesTestEntity extends CayenneDataObject {
+
+    @Deprecated
     public static final String BOOLEAN_COLUMN_PROPERTY = "booleanColumn";
+    @Deprecated
     public static final String INT_COLUMN_PROPERTY = "intColumn";
 
     public static final String ID_PK_COLUMN = "ID";
 
+    public static final Property<Boolean> BOOLEAN_COLUMN = new Property<Boolean>("booleanColumn");
+    public static final Property<Integer> INT_COLUMN = new Property<Integer>("intColumn");
+
     public void setBooleanColumn(boolean booleanColumn) {
         writeProperty("booleanColumn", booleanColumn);
     }
@@ -20,14 +29,12 @@ public abstract class _PrimitivesTestEnt
         return (value != null) ? value.booleanValue() : false;
     }
 
-
     public void setIntColumn(int intColumn) {
         writeProperty("intColumn", intColumn);
     }
     public int getIntColumn() {
         Object value = readProperty("intColumn");
-        return (value != null) ? (Integer) value : 0; 
+        return (value != null) ? (Integer) value : 0;
     }
 
-
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ROArtist.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ROArtist.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/_ROArtist.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ROArtist.java Wed Dec 26 15:00:02 2012
@@ -1,37 +1,51 @@
 package org.apache.cayenne.testdo.testmap.auto;
 
-/** Class _ROArtist 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 _ROArtist extends org.apache.cayenne.CayenneDataObject {
+import java.sql.Date;
+import java.util.List;
 
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
+import org.apache.cayenne.testdo.testmap.Painting;
+
+/**
+ * Class _ROArtist 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 _ROArtist 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 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<Painting>> PAINTING_ARRAY = new Property<List<Painting>>("paintingArray");
+
     public String getArtistName() {
         return (String)readProperty("artistName");
     }
-    
-    
-    public java.sql.Date getDateOfBirth() {
-        return (java.sql.Date)readProperty("dateOfBirth");
+
+    public Date getDateOfBirth() {
+        return (Date)readProperty("dateOfBirth");
     }
-    
-    
-    public void addToPaintingArray(org.apache.cayenne.testdo.testmap.Painting obj) {
+
+    public void addToPaintingArray(Painting obj) {
         addToManyTarget("paintingArray", obj, true);
     }
-    public void removeFromPaintingArray(org.apache.cayenne.testdo.testmap.Painting obj) {
+    public void removeFromPaintingArray(Painting obj) {
         removeToManyTarget("paintingArray", obj, true);
     }
-    public java.util.List getPaintingArray() {
-        return (java.util.List)readProperty("paintingArray");
+    @SuppressWarnings("unchecked")
+    public List<Painting> getPaintingArray() {
+        return (List<Painting>)readProperty("paintingArray");
     }
-    
-    
+
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ROPainting.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ROPainting.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/_ROPainting.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ROPainting.java Wed Dec 26 15:00:02 2012
@@ -1,32 +1,44 @@
 package org.apache.cayenne.testdo.testmap.auto;
 
-/** Class _ROPainting 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 _ROPainting extends org.apache.cayenne.CayenneDataObject {
+import java.math.BigDecimal;
 
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
+import org.apache.cayenne.testdo.testmap.Artist;
+
+/**
+ * Class _ROPainting 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 _ROPainting extends CayenneDataObject {
+
+    @Deprecated
     public static final String ESTIMATED_PRICE_PROPERTY = "estimatedPrice";
+    @Deprecated
     public static final String PAINTING_TITLE_PROPERTY = "paintingTitle";
+    @Deprecated
     public static final String TO_ARTIST_PROPERTY = "toArtist";
 
     public static final String PAINTING_ID_PK_COLUMN = "PAINTING_ID";
 
-    public java.math.BigDecimal getEstimatedPrice() {
-        return (java.math.BigDecimal)readProperty("estimatedPrice");
+    public static final Property<BigDecimal> ESTIMATED_PRICE = new Property<BigDecimal>("estimatedPrice");
+    public static final Property<String> PAINTING_TITLE = new Property<String>("paintingTitle");
+    public static final Property<Artist> TO_ARTIST = new Property<Artist>("toArtist");
+
+    public BigDecimal getEstimatedPrice() {
+        return (BigDecimal)readProperty("estimatedPrice");
     }
-    
-    
+
     public String getPaintingTitle() {
         return (String)readProperty("paintingTitle");
     }
-    
-    
 
-    public org.apache.cayenne.testdo.testmap.Artist getToArtist() {
-        return (org.apache.cayenne.testdo.testmap.Artist)readProperty("toArtist");
-    } 
-    
-    
+
+    public Artist getToArtist() {
+        return (Artist)readProperty("toArtist");
+    }
+
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_RWCompoundPainting.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_RWCompoundPainting.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/_RWCompoundPainting.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_RWCompoundPainting.java Wed Dec 26 15:00:02 2012
@@ -1,40 +1,50 @@
 package org.apache.cayenne.testdo.testmap.auto;
 
-/** Class _RWCompoundPainting 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 _RWCompoundPainting extends org.apache.cayenne.CayenneDataObject {
+import java.math.BigDecimal;
 
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
+
+/**
+ * Class _RWCompoundPainting 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 _RWCompoundPainting extends CayenneDataObject {
+
+    @Deprecated
     public static final String ESTIMATED_PRICE_PROPERTY = "estimatedPrice";
+    @Deprecated
     public static final String PAINTING_TITLE_PROPERTY = "paintingTitle";
+    @Deprecated
     public static final String TEXT_REVIEW_PROPERTY = "textReview";
 
     public static final String PAINTING_ID_PK_COLUMN = "PAINTING_ID";
 
-    public void setEstimatedPrice(java.math.BigDecimal estimatedPrice) {
+    public static final Property<BigDecimal> ESTIMATED_PRICE = new Property<BigDecimal>("estimatedPrice");
+    public static final Property<String> PAINTING_TITLE = new Property<String>("paintingTitle");
+    public static final Property<String> TEXT_REVIEW = new Property<String>("textReview");
+
+    public void setEstimatedPrice(BigDecimal estimatedPrice) {
         writeProperty("estimatedPrice", estimatedPrice);
     }
-    public java.math.BigDecimal getEstimatedPrice() {
-        return (java.math.BigDecimal)readProperty("estimatedPrice");
+    public BigDecimal getEstimatedPrice() {
+        return (BigDecimal)readProperty("estimatedPrice");
     }
-    
-    
+
     public void setPaintingTitle(String paintingTitle) {
         writeProperty("paintingTitle", paintingTitle);
     }
     public String getPaintingTitle() {
         return (String)readProperty("paintingTitle");
     }
-    
-    
+
     public void setTextReview(String textReview) {
         writeProperty("textReview", textReview);
     }
     public String getTextReview() {
         return (String)readProperty("textReview");
     }
-    
-    
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ReturnTypesMap1.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ReturnTypesMap1.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/_ReturnTypesMap1.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ReturnTypesMap1.java Wed Dec 26 15:00:02 2012
@@ -4,6 +4,7 @@ import java.math.BigDecimal;
 import java.util.Date;
 
 import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
 
 /**
  * Class _ReturnTypesMap1 was generated by Cayenne.
@@ -13,143 +14,178 @@ import org.apache.cayenne.CayenneDataObj
  */
 public abstract class _ReturnTypesMap1 extends CayenneDataObject {
 
+    @Deprecated
     public static final String BIGINT_COLUMN_PROPERTY = "bigintColumn";
+    @Deprecated
     public static final String BIT_COLUMN_PROPERTY = "bitColumn";
+    @Deprecated
     public static final String BOOLEAN_COLUMN_PROPERTY = "booleanColumn";
+    @Deprecated
     public static final String CHAR_COLUMN_PROPERTY = "charColumn";
+    @Deprecated
     public static final String DATE_COLUMN_PROPERTY = "dateColumn";
+    @Deprecated
     public static final String DECIMAL_COLUMN_PROPERTY = "decimalColumn";
+    @Deprecated
     public static final String DOUBLE_COLUMN_PROPERTY = "doubleColumn";
+    @Deprecated
     public static final String FLOAT_COLUMN_PROPERTY = "floatColumn";
+    @Deprecated
     public static final String INTEGER_COLUMN_PROPERTY = "integerColumn";
+    @Deprecated
     public static final String LONGVARCHAR_COLUMN_PROPERTY = "longvarcharColumn";
+    @Deprecated
     public static final String NUMERIC_COLUMN_PROPERTY = "numericColumn";
+    @Deprecated
     public static final String REAL_COLUMN_PROPERTY = "realColumn";
+    @Deprecated
     public static final String SMALLINT_COLUMN_PROPERTY = "smallintColumn";
+    @Deprecated
     public static final String TIME_COLUMN_PROPERTY = "timeColumn";
+    @Deprecated
     public static final String TIMESTAMP_COLUMN_PROPERTY = "timestampColumn";
+    @Deprecated
     public static final String TINYINT_COLUMN_PROPERTY = "tinyintColumn";
+    @Deprecated
     public static final String VARCHAR_COLUMN_PROPERTY = "varcharColumn";
 
     public static final String AAAID_PK_COLUMN = "AAAID";
 
+    public static final Property<Long> BIGINT_COLUMN = new Property<Long>("bigintColumn");
+    public static final Property<Boolean> BIT_COLUMN = new Property<Boolean>("bitColumn");
+    public static final Property<Boolean> BOOLEAN_COLUMN = new Property<Boolean>("booleanColumn");
+    public static final Property<String> CHAR_COLUMN = new Property<String>("charColumn");
+    public static final Property<Date> DATE_COLUMN = new Property<Date>("dateColumn");
+    public static final Property<BigDecimal> DECIMAL_COLUMN = new Property<BigDecimal>("decimalColumn");
+    public static final Property<Double> DOUBLE_COLUMN = new Property<Double>("doubleColumn");
+    public static final Property<Float> FLOAT_COLUMN = new Property<Float>("floatColumn");
+    public static final Property<Integer> INTEGER_COLUMN = new Property<Integer>("integerColumn");
+    public static final Property<String> LONGVARCHAR_COLUMN = new Property<String>("longvarcharColumn");
+    public static final Property<BigDecimal> NUMERIC_COLUMN = new Property<BigDecimal>("numericColumn");
+    public static final Property<Float> REAL_COLUMN = new Property<Float>("realColumn");
+    public static final Property<Short> SMALLINT_COLUMN = new Property<Short>("smallintColumn");
+    public static final Property<Date> TIME_COLUMN = new Property<Date>("timeColumn");
+    public static final Property<Date> TIMESTAMP_COLUMN = new Property<Date>("timestampColumn");
+    public static final Property<Byte> TINYINT_COLUMN = new Property<Byte>("tinyintColumn");
+    public static final Property<String> VARCHAR_COLUMN = new Property<String>("varcharColumn");
+
     public void setBigintColumn(Long bigintColumn) {
-        writeProperty(BIGINT_COLUMN_PROPERTY, bigintColumn);
+        writeProperty("bigintColumn", bigintColumn);
     }
     public Long getBigintColumn() {
-        return (Long)readProperty(BIGINT_COLUMN_PROPERTY);
+        return (Long)readProperty("bigintColumn");
     }
 
     public void setBitColumn(Boolean bitColumn) {
-        writeProperty(BIT_COLUMN_PROPERTY, bitColumn);
+        writeProperty("bitColumn", bitColumn);
     }
     public Boolean getBitColumn() {
-        return (Boolean)readProperty(BIT_COLUMN_PROPERTY);
+        return (Boolean)readProperty("bitColumn");
     }
 
     public void setBooleanColumn(Boolean booleanColumn) {
-        writeProperty(BOOLEAN_COLUMN_PROPERTY, booleanColumn);
+        writeProperty("booleanColumn", booleanColumn);
     }
     public Boolean getBooleanColumn() {
-        return (Boolean)readProperty(BOOLEAN_COLUMN_PROPERTY);
+        return (Boolean)readProperty("booleanColumn");
     }
 
     public void setCharColumn(String charColumn) {
-        writeProperty(CHAR_COLUMN_PROPERTY, charColumn);
+        writeProperty("charColumn", charColumn);
     }
     public String getCharColumn() {
-        return (String)readProperty(CHAR_COLUMN_PROPERTY);
+        return (String)readProperty("charColumn");
     }
 
     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 setDecimalColumn(BigDecimal decimalColumn) {
-        writeProperty(DECIMAL_COLUMN_PROPERTY, decimalColumn);
+        writeProperty("decimalColumn", decimalColumn);
     }
     public BigDecimal getDecimalColumn() {
-        return (BigDecimal)readProperty(DECIMAL_COLUMN_PROPERTY);
+        return (BigDecimal)readProperty("decimalColumn");
     }
 
     public void setDoubleColumn(Double doubleColumn) {
-        writeProperty(DOUBLE_COLUMN_PROPERTY, doubleColumn);
+        writeProperty("doubleColumn", doubleColumn);
     }
     public Double getDoubleColumn() {
-        return (Double)readProperty(DOUBLE_COLUMN_PROPERTY);
+        return (Double)readProperty("doubleColumn");
     }
 
     public void setFloatColumn(Float floatColumn) {
-        writeProperty(FLOAT_COLUMN_PROPERTY, floatColumn);
+        writeProperty("floatColumn", floatColumn);
     }
     public Float getFloatColumn() {
-        return (Float)readProperty(FLOAT_COLUMN_PROPERTY);
+        return (Float)readProperty("floatColumn");
     }
 
     public void setIntegerColumn(Integer integerColumn) {
-        writeProperty(INTEGER_COLUMN_PROPERTY, integerColumn);
+        writeProperty("integerColumn", integerColumn);
     }
     public Integer getIntegerColumn() {
-        return (Integer)readProperty(INTEGER_COLUMN_PROPERTY);
+        return (Integer)readProperty("integerColumn");
     }
 
     public void setLongvarcharColumn(String longvarcharColumn) {
-        writeProperty(LONGVARCHAR_COLUMN_PROPERTY, longvarcharColumn);
+        writeProperty("longvarcharColumn", longvarcharColumn);
     }
     public String getLongvarcharColumn() {
-        return (String)readProperty(LONGVARCHAR_COLUMN_PROPERTY);
+        return (String)readProperty("longvarcharColumn");
     }
 
     public void setNumericColumn(BigDecimal numericColumn) {
-        writeProperty(NUMERIC_COLUMN_PROPERTY, numericColumn);
+        writeProperty("numericColumn", numericColumn);
     }
     public BigDecimal getNumericColumn() {
-        return (BigDecimal)readProperty(NUMERIC_COLUMN_PROPERTY);
+        return (BigDecimal)readProperty("numericColumn");
     }
 
     public void setRealColumn(Float realColumn) {
-        writeProperty(REAL_COLUMN_PROPERTY, realColumn);
+        writeProperty("realColumn", realColumn);
     }
     public Float getRealColumn() {
-        return (Float)readProperty(REAL_COLUMN_PROPERTY);
+        return (Float)readProperty("realColumn");
     }
 
     public void setSmallintColumn(Short smallintColumn) {
-        writeProperty(SMALLINT_COLUMN_PROPERTY, smallintColumn);
+        writeProperty("smallintColumn", smallintColumn);
     }
     public Short getSmallintColumn() {
-        return (Short)readProperty(SMALLINT_COLUMN_PROPERTY);
+        return (Short)readProperty("smallintColumn");
     }
 
     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");
     }
 
     public void setTinyintColumn(Byte tinyintColumn) {
-        writeProperty(TINYINT_COLUMN_PROPERTY, tinyintColumn);
+        writeProperty("tinyintColumn", tinyintColumn);
     }
     public Byte getTinyintColumn() {
-        return (Byte)readProperty(TINYINT_COLUMN_PROPERTY);
+        return (Byte)readProperty("tinyintColumn");
     }
 
     public void setVarcharColumn(String varcharColumn) {
-        writeProperty(VARCHAR_COLUMN_PROPERTY, varcharColumn);
+        writeProperty("varcharColumn", varcharColumn);
     }
     public String getVarcharColumn() {
-        return (String)readProperty(VARCHAR_COLUMN_PROPERTY);
+        return (String)readProperty("varcharColumn");
     }
 
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ReturnTypesMap2.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ReturnTypesMap2.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/_ReturnTypesMap2.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ReturnTypesMap2.java Wed Dec 26 15:00:02 2012
@@ -1,22 +1,32 @@
 package org.apache.cayenne.testdo.testmap.auto;
 
 import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
 
 /**
- * Class _ReturnTypesMap was generated by Cayenne.
+ * Class _ReturnTypesMap2 was generated by Cayenne.
  * It is probably a good idea to avoid changing this class manually,
  * since it may be overwritten next time code is regenerated.
  * If you need to make any customizations, please use subclass.
  */
 public abstract class _ReturnTypesMap2 extends CayenneDataObject {
 
+    @Deprecated
     public static final String BINARY_COLUMN_PROPERTY = "binaryColumn";
+    @Deprecated
     public static final String BLOB_COLUMN_PROPERTY = "blobColumn";
+    @Deprecated
     public static final String LONGVARBINARY_COLUMN_PROPERTY = "longvarbinaryColumn";
+    @Deprecated
     public static final String VARBINARY_COLUMN_PROPERTY = "varbinaryColumn";
 
     public static final String AAAID_PK_COLUMN = "AAAID";
 
+    public static final Property<byte[]> BINARY_COLUMN = new Property<byte[]>("binaryColumn");
+    public static final Property<byte[]> BLOB_COLUMN = new Property<byte[]>("blobColumn");
+    public static final Property<byte[]> LONGVARBINARY_COLUMN = new Property<byte[]>("longvarbinaryColumn");
+    public static final Property<byte[]> VARBINARY_COLUMN = new Property<byte[]>("varbinaryColumn");
+
     public void setBinaryColumn(byte[] binaryColumn) {
         writeProperty("binaryColumn", binaryColumn);
     }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ReturnTypesMapLobs1.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ReturnTypesMapLobs1.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/_ReturnTypesMapLobs1.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ReturnTypesMapLobs1.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 _ReturnTypesMapLobs1 was generated by Cayenne.
@@ -10,15 +11,18 @@ import org.apache.cayenne.CayenneDataObj
  */
 public abstract class _ReturnTypesMapLobs1 extends CayenneDataObject {
 
+    @Deprecated
     public static final String CLOB_COLUMN_PROPERTY = "clobColumn";
 
     public static final String AAAID_PK_COLUMN = "AAAID";
 
+    public static final Property<String> CLOB_COLUMN = new Property<String>("clobColumn");
+
     public void setClobColumn(String clobColumn) {
-        writeProperty(CLOB_COLUMN_PROPERTY, clobColumn);
+        writeProperty("clobColumn", clobColumn);
     }
     public String getClobColumn() {
-        return (String)readProperty(CLOB_COLUMN_PROPERTY);
+        return (String)readProperty("clobColumn");
     }
 
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_SerializableEntity.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_SerializableEntity.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/_SerializableEntity.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_SerializableEntity.java Wed Dec 26 15:00:02 2012
@@ -1,22 +1,29 @@
 package org.apache.cayenne.testdo.testmap.auto;
 
-/** Class _SerializableEntity was generated by Cayenne.
-  * It is probably a good idea to avoid changing this class manually, 
-  * since it may be overwritten next time code is regenerated. 
-  * If you need to make any customizations, please use subclass. 
-  */
-public abstract class _SerializableEntity extends org.apache.cayenne.CayenneDataObject {
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.MockSerializable;
+import org.apache.cayenne.exp.Property;
 
+/**
+ * Class _SerializableEntity was generated by Cayenne.
+ * It is probably a good idea to avoid changing this class manually,
+ * since it may be overwritten next time code is regenerated.
+ * If you need to make any customizations, please use subclass.
+ */
+public abstract class _SerializableEntity extends CayenneDataObject {
+
+    @Deprecated
     public static final String SERIALIZABLE_FIELD_PROPERTY = "serializableField";
 
     public static final String ID_PK_COLUMN = "ID";
 
-    public void setSerializableField(org.apache.cayenne.MockSerializable serializableField) {
+    public static final Property<MockSerializable> SERIALIZABLE_FIELD = new Property<MockSerializable>("serializableField");
+
+    public void setSerializableField(MockSerializable serializableField) {
         writeProperty("serializableField", serializableField);
     }
-    public org.apache.cayenne.MockSerializable getSerializableField() {
-        return (org.apache.cayenne.MockSerializable)readProperty("serializableField");
+    public MockSerializable getSerializableField() {
+        return (MockSerializable)readProperty("serializableField");
     }
-    
-    
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_SmallintTestEntity.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_SmallintTestEntity.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/_SmallintTestEntity.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_SmallintTestEntity.java Wed Dec 26 15:00:02 2012
@@ -1,22 +1,28 @@
 package org.apache.cayenne.testdo.testmap.auto;
 
-/** Class _SmallintTestEntity was generated by Cayenne.
-  * It is probably a good idea to avoid changing this class manually, 
-  * since it may be overwritten next time code is regenerated. 
-  * If you need to make any customizations, please use subclass. 
-  */
-public abstract class _SmallintTestEntity extends org.apache.cayenne.CayenneDataObject {
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
 
+/**
+ * Class _SmallintTestEntity was generated by Cayenne.
+ * It is probably a good idea to avoid changing this class manually,
+ * since it may be overwritten next time code is regenerated.
+ * If you need to make any customizations, please use subclass.
+ */
+public abstract class _SmallintTestEntity extends CayenneDataObject {
+
+    @Deprecated
     public static final String SMALLINT_COL_PROPERTY = "smallintCol";
 
     public static final String ID_PK_COLUMN = "ID";
 
+    public static final Property<Short> SMALLINT_COL = new Property<Short>("smallintCol");
+
     public void setSmallintCol(Short smallintCol) {
         writeProperty("smallintCol", smallintCol);
     }
     public Short getSmallintCol() {
         return (Short)readProperty("smallintCol");
     }
-    
-    
+
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_SubPainting.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_SubPainting.java?rev=1425936&r1=1425935&r2=1425936&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_SubPainting.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_SubPainting.java 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 _SubPainting was generated by Cayenne.
@@ -10,15 +11,18 @@ import org.apache.cayenne.CayenneDataObj
  */
 public abstract class _SubPainting extends CayenneDataObject {
 
+    @Deprecated
     public static final String PAINTING_TITLE_PROPERTY = "paintingTitle";
 
     public static final String PAINTING_ID_PK_COLUMN = "PAINTING_ID";
 
+    public static final Property<String> PAINTING_TITLE = new Property<String>("paintingTitle");
+
     public void setPaintingTitle(String paintingTitle) {
-        writeProperty(PAINTING_TITLE_PROPERTY, paintingTitle);
+        writeProperty("paintingTitle", paintingTitle);
     }
     public String getPaintingTitle() {
-        return (String)readProperty(PAINTING_TITLE_PROPERTY);
+        return (String)readProperty("paintingTitle");
     }
 
 }



Mime
View raw message