You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2010/06/13 00:45:43 UTC
svn commit: r954144 [6/9] - in /cayenne/main/trunk:
build-tools/cayenne-test-utilities/src/main/java/org/apache/cayenne/test/
build-tools/cayenne-test-utilities/src/main/java/org/apache/cayenne/test/jdbc/
build-tools/cayenne-test-utilities/src/main/jav...
Added: 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=954144&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_GeneratedColumnDep.java (added)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_GeneratedColumnDep.java Sat Jun 12 22:45:31 2010
@@ -0,0 +1,32 @@
+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 {
+
+ public static final String NAME_PROPERTY = "name";
+ public static final String TO_MASTER_PROPERTY = "toMaster";
+
+ public static final String GENERATED_COLUMN_FK_PK_COLUMN = "GENERATED_COLUMN_FK";
+
+ 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) {
+ setToOneTarget("toMaster", toMaster, true);
+ }
+
+ public org.apache.cayenne.testdo.testmap.GeneratedColumnTestEntity getToMaster() {
+ return (org.apache.cayenne.testdo.testmap.GeneratedColumnTestEntity)readProperty("toMaster");
+ }
+
+
+}
Added: 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=954144&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_GeneratedColumnTest2.java (added)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_GeneratedColumnTest2.java Sat Jun 12 22:45:31 2010
@@ -0,0 +1,22 @@
+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 {
+
+ public static final String NAME_PROPERTY = "name";
+
+ public static final String GENERATED_COLUMN_PK_COLUMN = "GENERATED_COLUMN";
+
+ public void setName(String name) {
+ writeProperty("name", name);
+ }
+ public String getName() {
+ return (String)readProperty("name");
+ }
+
+
+}
Added: 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=954144&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_GeneratedColumnTestEntity.java (added)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_GeneratedColumnTestEntity.java Sat Jun 12 22:45:31 2010
@@ -0,0 +1,32 @@
+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 {
+
+ public static final String NAME_PROPERTY = "name";
+ public static final String TO_DEP_PROPERTY = "toDep";
+
+ public static final String GENERATED_COLUMN_PK_COLUMN = "GENERATED_COLUMN";
+
+ 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) {
+ setToOneTarget("toDep", toDep, true);
+ }
+
+ public org.apache.cayenne.testdo.testmap.GeneratedColumnDep getToDep() {
+ return (org.apache.cayenne.testdo.testmap.GeneratedColumnDep)readProperty("toDep");
+ }
+
+
+}
Added: 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=954144&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_GeneratedF1.java (added)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_GeneratedF1.java Sat Jun 12 22:45:31 2010
@@ -0,0 +1,32 @@
+package org.apache.cayenne.testdo.testmap.auto;
+
+import java.util.List;
+
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.testdo.testmap.GeneratedF2;
+
+/**
+ * Class _GeneratedF1 was generated by Cayenne.
+ * It is probably a good idea to avoid changing this class manually,
+ * since it may be overwritten next time code is regenerated.
+ * If you need to make any customizations, please use subclass.
+ */
+public abstract class _GeneratedF1 extends CayenneDataObject {
+
+ public static final String F2_PROPERTY = "f2";
+
+ public static final String ID_PK_COLUMN = "ID";
+
+ public void addToF2(GeneratedF2 obj) {
+ addToManyTarget("f2", obj, true);
+ }
+ public void removeFromF2(GeneratedF2 obj) {
+ removeToManyTarget("f2", obj, true);
+ }
+ @SuppressWarnings("unchecked")
+ public List<GeneratedF2> getF2() {
+ return (List<GeneratedF2>)readProperty("f2");
+ }
+
+
+}
Added: 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=954144&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_GeneratedF2.java (added)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_GeneratedF2.java Sat Jun 12 22:45:31 2010
@@ -0,0 +1,32 @@
+package org.apache.cayenne.testdo.testmap.auto;
+
+import java.util.List;
+
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.testdo.testmap.GeneratedF1;
+
+/**
+ * Class _GeneratedF2 was generated by Cayenne.
+ * It is probably a good idea to avoid changing this class manually,
+ * since it may be overwritten next time code is regenerated.
+ * If you need to make any customizations, please use subclass.
+ */
+public abstract class _GeneratedF2 extends CayenneDataObject {
+
+ public static final String F1_PROPERTY = "f1";
+
+ public static final String ID_PK_COLUMN = "ID";
+
+ public void addToF1(GeneratedF1 obj) {
+ addToManyTarget("f1", obj, true);
+ }
+ public void removeFromF1(GeneratedF1 obj) {
+ removeToManyTarget("f1", obj, true);
+ }
+ @SuppressWarnings("unchecked")
+ public List<GeneratedF1> getF1() {
+ return (List<GeneratedF1>)readProperty("f1");
+ }
+
+
+}
Added: 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=954144&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_LongEntity.java (added)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_LongEntity.java Sat Jun 12 22:45:31 2010
@@ -0,0 +1,22 @@
+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 {
+
+ public static final String LONG_FIELD_PROPERTY = "longField";
+
+ public static final String ID_PK_COLUMN = "ID";
+
+ public void setLongField(Long longField) {
+ writeProperty("longField", longField);
+ }
+ public Long getLongField() {
+ return (Long)readProperty("longField");
+ }
+
+
+}
Added: 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=954144&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_MeaningfulGeneratedColumnTestEntity.java (added)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_MeaningfulGeneratedColumnTestEntity.java Sat Jun 12 22:45:31 2010
@@ -0,0 +1,31 @@
+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 {
+
+ public static final String GENERATED_COLUMN_PROPERTY = "generatedColumn";
+ public static final String NAME_PROPERTY = "name";
+
+ public static final String GENERATED_COLUMN_PK_COLUMN = "GENERATED_COLUMN";
+
+ 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");
+ }
+
+
+}
Added: 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=954144&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_MeaningfulPKDep.java (added)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_MeaningfulPKDep.java Sat Jun 12 22:45:31 2010
@@ -0,0 +1,32 @@
+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 {
+
+ public static final String DESCR_PROPERTY = "descr";
+ public static final String TO_MEANINGFUL_PK_PROPERTY = "toMeaningfulPK";
+
+ public static final String PK_ATTRIBUTE_PK_COLUMN = "PK_ATTRIBUTE";
+
+ 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) {
+ setToOneTarget("toMeaningfulPK", toMeaningfulPK, true);
+ }
+
+ public org.apache.cayenne.testdo.testmap.MeaningfulPKTest1 getToMeaningfulPK() {
+ return (org.apache.cayenne.testdo.testmap.MeaningfulPKTest1)readProperty("toMeaningfulPK");
+ }
+
+
+}
Added: 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=954144&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_MeaningfulPKTest1.java (added)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_MeaningfulPKTest1.java Sat Jun 12 22:45:31 2010
@@ -0,0 +1,43 @@
+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 {
+
+ public static final String DESCR_PROPERTY = "descr";
+ public static final String PK_ATTRIBUTE_PROPERTY = "pkAttribute";
+ public static final String MEANINGFUL_PKDEP_ARRAY_PROPERTY = "meaningfulPKDepArray";
+
+ public static final String PK_ATTRIBUTE_PK_COLUMN = "PK_ATTRIBUTE";
+
+ 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) {
+ addToManyTarget("meaningfulPKDepArray", obj, true);
+ }
+ public void removeFromMeaningfulPKDepArray(org.apache.cayenne.testdo.testmap.MeaningfulPKDep obj) {
+ removeToManyTarget("meaningfulPKDepArray", obj, true);
+ }
+ public java.util.List getMeaningfulPKDepArray() {
+ return (java.util.List)readProperty("meaningfulPKDepArray");
+ }
+
+
+}
Added: 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=954144&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_MixedPersistenceStrategy.java (added)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_MixedPersistenceStrategy.java Sat Jun 12 22:45:31 2010
@@ -0,0 +1,43 @@
+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 {
+
+ public static final String DESCRIPTION_PROPERTY = "description";
+ public static final String NAME_PROPERTY = "name";
+ public static final String DETAILS_PROPERTY = "details";
+
+ public static final String ID_PK_COLUMN = "ID";
+
+ 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) {
+ addToManyTarget("details", obj, true);
+ }
+ public void removeFromDetails(org.apache.cayenne.testdo.testmap.MixedPersistenceStrategy2 obj) {
+ removeToManyTarget("details", obj, true);
+ }
+ public java.util.List getDetails() {
+ return (java.util.List)readProperty("details");
+ }
+
+
+}
Added: 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=954144&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_MixedPersistenceStrategy2.java (added)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_MixedPersistenceStrategy2.java Sat Jun 12 22:45:31 2010
@@ -0,0 +1,32 @@
+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 {
+
+ public static final String NAME_PROPERTY = "name";
+ public static final String MASTER_PROPERTY = "master";
+
+ public static final String ID_PK_COLUMN = "ID";
+
+ 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) {
+ setToOneTarget("master", master, true);
+ }
+
+ public org.apache.cayenne.testdo.testmap.MixedPersistenceStrategy getMaster() {
+ return (org.apache.cayenne.testdo.testmap.MixedPersistenceStrategy)readProperty("master");
+ }
+
+
+}
Added: 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=954144&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_NoPkTestEntity.java (added)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_NoPkTestEntity.java Sat Jun 12 22:45:31 2010
@@ -0,0 +1,21 @@
+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 {
+
+ public static final String ATTRIBUTE1_PROPERTY = "attribute1";
+
+
+ public void setAttribute1(Integer attribute1) {
+ writeProperty("attribute1", attribute1);
+ }
+ public Integer getAttribute1() {
+ return (Integer)readProperty("attribute1");
+ }
+
+
+}
Added: 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=954144&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Painting.java (added)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Painting.java Sat Jun 12 22:45:31 2010
@@ -0,0 +1,70 @@
+package org.apache.cayenne.testdo.testmap.auto;
+
+/** Class _Painting was generated by Cayenne.
+ * It is probably a good idea to avoid changing this class manually,
+ * since it may be overwritten next time code is regenerated.
+ * If you need to make any customizations, please use subclass.
+ */
+public abstract class _Painting extends org.apache.cayenne.testdo.testmap.ArtDataObject {
+
+ public static final String ESTIMATED_PRICE_PROPERTY = "estimatedPrice";
+ public static final String PAINTING_DESCRIPTION_PROPERTY = "paintingDescription";
+ public static final String PAINTING_TITLE_PROPERTY = "paintingTitle";
+ public static final String TO_ARTIST_PROPERTY = "toArtist";
+ public static final String TO_GALLERY_PROPERTY = "toGallery";
+ public static final String TO_PAINTING_INFO_PROPERTY = "toPaintingInfo";
+
+ public static final String PAINTING_ID_PK_COLUMN = "PAINTING_ID";
+
+ public void setEstimatedPrice(java.math.BigDecimal estimatedPrice) {
+ writeProperty("estimatedPrice", estimatedPrice);
+ }
+ public java.math.BigDecimal getEstimatedPrice() {
+ return (java.math.BigDecimal)readProperty("estimatedPrice");
+ }
+
+
+ public void setPaintingDescription(String paintingDescription) {
+ writeProperty("paintingDescription", paintingDescription);
+ }
+ public String getPaintingDescription() {
+ return (String)readProperty("paintingDescription");
+ }
+
+
+ public void setPaintingTitle(String paintingTitle) {
+ writeProperty("paintingTitle", paintingTitle);
+ }
+ public String getPaintingTitle() {
+ return (String)readProperty("paintingTitle");
+ }
+
+
+ public void setToArtist(org.apache.cayenne.testdo.testmap.Artist toArtist) {
+ setToOneTarget("toArtist", toArtist, true);
+ }
+
+ public org.apache.cayenne.testdo.testmap.Artist getToArtist() {
+ return (org.apache.cayenne.testdo.testmap.Artist)readProperty("toArtist");
+ }
+
+
+ public void setToGallery(org.apache.cayenne.testdo.testmap.Gallery toGallery) {
+ setToOneTarget("toGallery", toGallery, true);
+ }
+
+ public org.apache.cayenne.testdo.testmap.Gallery getToGallery() {
+ return (org.apache.cayenne.testdo.testmap.Gallery)readProperty("toGallery");
+ }
+
+
+ public void setToPaintingInfo(org.apache.cayenne.testdo.testmap.PaintingInfo toPaintingInfo) {
+ setToOneTarget("toPaintingInfo", toPaintingInfo, true);
+ }
+
+ public org.apache.cayenne.testdo.testmap.PaintingInfo getToPaintingInfo() {
+ return (org.apache.cayenne.testdo.testmap.PaintingInfo)readProperty("toPaintingInfo");
+ }
+
+
+}
Added: 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=954144&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Painting1.java (added)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Painting1.java Sat Jun 12 22:45:31 2010
@@ -0,0 +1,41 @@
+package org.apache.cayenne.testdo.testmap.auto;
+
+/** Class _Painting1 was generated by Cayenne.
+ * It is probably a good idea to avoid changing this class manually,
+ * since it may be overwritten next time code is regenerated.
+ * If you need to make any customizations, please use subclass.
+ */
+public abstract class _Painting1 extends org.apache.cayenne.CayenneDataObject {
+
+ public static final String ESTIMATED_PRICE_PROPERTY = "estimatedPrice";
+ public static final String PAINTING_TITLE_PROPERTY = "paintingTitle";
+ public static final String TO_ARTIST_PROPERTY = "toArtist";
+
+ public static final String PAINTING_ID_PK_COLUMN = "PAINTING_ID";
+
+ public void setEstimatedPrice(java.math.BigDecimal estimatedPrice) {
+ writeProperty("estimatedPrice", estimatedPrice);
+ }
+ public java.math.BigDecimal getEstimatedPrice() {
+ return (java.math.BigDecimal)readProperty("estimatedPrice");
+ }
+
+
+ public void setPaintingTitle(String paintingTitle) {
+ writeProperty("paintingTitle", paintingTitle);
+ }
+ public String getPaintingTitle() {
+ return (String)readProperty("paintingTitle");
+ }
+
+
+ public void setToArtist(org.apache.cayenne.testdo.testmap.Artist toArtist) {
+ setToOneTarget("toArtist", toArtist, true);
+ }
+
+ public org.apache.cayenne.testdo.testmap.Artist getToArtist() {
+ return (org.apache.cayenne.testdo.testmap.Artist)readProperty("toArtist");
+ }
+
+
+}
Added: 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=954144&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_PaintingInfo.java (added)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_PaintingInfo.java Sat Jun 12 22:45:31 2010
@@ -0,0 +1,41 @@
+package org.apache.cayenne.testdo.testmap.auto;
+
+/** Class _PaintingInfo was generated by Cayenne.
+ * It is probably a good idea to avoid changing this class manually,
+ * since it may be overwritten next time code is regenerated.
+ * If you need to make any customizations, please use subclass.
+ */
+public abstract class _PaintingInfo extends org.apache.cayenne.CayenneDataObject {
+
+ public static final String IMAGE_BLOB_PROPERTY = "imageBlob";
+ public static final String TEXT_REVIEW_PROPERTY = "textReview";
+ public static final String PAINTING_PROPERTY = "painting";
+
+ public static final String PAINTING_ID_PK_COLUMN = "PAINTING_ID";
+
+ public void setImageBlob(byte[] imageBlob) {
+ writeProperty("imageBlob", imageBlob);
+ }
+ public byte[] getImageBlob() {
+ return (byte[])readProperty("imageBlob");
+ }
+
+
+ public void setTextReview(String textReview) {
+ writeProperty("textReview", textReview);
+ }
+ public String getTextReview() {
+ return (String)readProperty("textReview");
+ }
+
+
+ public void setPainting(org.apache.cayenne.testdo.testmap.Painting painting) {
+ setToOneTarget("painting", painting, true);
+ }
+
+ public org.apache.cayenne.testdo.testmap.Painting getPainting() {
+ return (org.apache.cayenne.testdo.testmap.Painting)readProperty("painting");
+ }
+
+
+}
Added: 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=954144&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_PrimitivesTestEntity.java (added)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_PrimitivesTestEntity.java Sat Jun 12 22:45:31 2010
@@ -0,0 +1,33 @@
+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 {
+
+ public static final String BOOLEAN_COLUMN_PROPERTY = "booleanColumn";
+ public static final String INT_COLUMN_PROPERTY = "intColumn";
+
+ public static final String ID_PK_COLUMN = "ID";
+
+ public void setBooleanColumn(boolean booleanColumn) {
+ writeProperty("booleanColumn", booleanColumn);
+ }
+ public boolean isBooleanColumn() {
+ Boolean value = (Boolean)readProperty("booleanColumn");
+ return (value != null) ? value.booleanValue() : false;
+ }
+
+
+ public void setIntColumn(int intColumn) {
+ writeProperty("intColumn", intColumn);
+ }
+ public int getIntColumn() {
+ Object value = readProperty("intColumn");
+ return (value != null) ? (Integer) value : 0;
+ }
+
+
+}
Added: 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=954144&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ROArtist.java (added)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ROArtist.java Sat Jun 12 22:45:31 2010
@@ -0,0 +1,37 @@
+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 {
+
+ public static final String ARTIST_NAME_PROPERTY = "artistName";
+ public static final String DATE_OF_BIRTH_PROPERTY = "dateOfBirth";
+ public static final String PAINTING_ARRAY_PROPERTY = "paintingArray";
+
+ public static final String ARTIST_ID_PK_COLUMN = "ARTIST_ID";
+
+ public String getArtistName() {
+ return (String)readProperty("artistName");
+ }
+
+
+ public java.sql.Date getDateOfBirth() {
+ return (java.sql.Date)readProperty("dateOfBirth");
+ }
+
+
+ public void addToPaintingArray(org.apache.cayenne.testdo.testmap.Painting obj) {
+ addToManyTarget("paintingArray", obj, true);
+ }
+ public void removeFromPaintingArray(org.apache.cayenne.testdo.testmap.Painting obj) {
+ removeToManyTarget("paintingArray", obj, true);
+ }
+ public java.util.List getPaintingArray() {
+ return (java.util.List)readProperty("paintingArray");
+ }
+
+
+}
Added: 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=954144&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ROPainting.java (added)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ROPainting.java Sat Jun 12 22:45:31 2010
@@ -0,0 +1,32 @@
+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 {
+
+ public static final String ESTIMATED_PRICE_PROPERTY = "estimatedPrice";
+ public static final String PAINTING_TITLE_PROPERTY = "paintingTitle";
+ 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 String getPaintingTitle() {
+ return (String)readProperty("paintingTitle");
+ }
+
+
+
+ public org.apache.cayenne.testdo.testmap.Artist getToArtist() {
+ return (org.apache.cayenne.testdo.testmap.Artist)readProperty("toArtist");
+ }
+
+
+}
Added: 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=954144&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_RWCompoundPainting.java (added)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_RWCompoundPainting.java Sat Jun 12 22:45:31 2010
@@ -0,0 +1,40 @@
+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 {
+
+ public static final String ESTIMATED_PRICE_PROPERTY = "estimatedPrice";
+ public static final String PAINTING_TITLE_PROPERTY = "paintingTitle";
+ 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) {
+ writeProperty("estimatedPrice", estimatedPrice);
+ }
+ public java.math.BigDecimal getEstimatedPrice() {
+ return (java.math.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");
+ }
+
+
+}
Added: 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=954144&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ReturnTypesMap1.java (added)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ReturnTypesMap1.java Sat Jun 12 22:45:31 2010
@@ -0,0 +1,163 @@
+package org.apache.cayenne.testdo.testmap.auto;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import org.apache.cayenne.CayenneDataObject;
+
+/**
+ * Class _ReturnTypesMap was generated by Cayenne.
+ * It is probably a good idea to avoid changing this class manually,
+ * since it may be overwritten next time code is regenerated.
+ * If you need to make any customizations, please use subclass.
+ */
+public abstract class _ReturnTypesMap1 extends CayenneDataObject {
+
+ public static final String BIGINT_COLUMN_PROPERTY = "bigintColumn";
+ public static final String BIT_COLUMN_PROPERTY = "bitColumn";
+ public static final String BOOLEAN_COLUMN_PROPERTY = "booleanColumn";
+ public static final String CHAR_COLUMN_PROPERTY = "charColumn";
+ public static final String CLOB_COLUMN_PROPERTY = "clobColumn";
+ public static final String DATE_COLUMN_PROPERTY = "dateColumn";
+ public static final String DECIMAL_COLUMN_PROPERTY = "decimalColumn";
+ public static final String DOUBLE_COLUMN_PROPERTY = "doubleColumn";
+ public static final String FLOAT_COLUMN_PROPERTY = "floatColumn";
+ public static final String INTEGER_COLUMN_PROPERTY = "integerColumn";
+ public static final String LONGVARCHAR_COLUMN_PROPERTY = "longvarcharColumn";
+ public static final String NUMERIC_COLUMN_PROPERTY = "numericColumn";
+ public static final String REAL_COLUMN_PROPERTY = "realColumn";
+ public static final String SMALLINT_COLUMN_PROPERTY = "smallintColumn";
+ public static final String TIME_COLUMN_PROPERTY = "timeColumn";
+ public static final String TIMESTAMP_COLUMN_PROPERTY = "timestampColumn";
+ public static final String TINYINT_COLUMN_PROPERTY = "tinyintColumn";
+ public static final String VARCHAR_COLUMN_PROPERTY = "varcharColumn";
+
+ public static final String AAAID_PK_COLUMN = "AAAID";
+
+ public void setBigintColumn(Long bigintColumn) {
+ writeProperty("bigintColumn", bigintColumn);
+ }
+ public Long getBigintColumn() {
+ return (Long)readProperty("bigintColumn");
+ }
+
+ public void setBitColumn(Boolean bitColumn) {
+ writeProperty("bitColumn", bitColumn);
+ }
+ public Boolean getBitColumn() {
+ return (Boolean)readProperty("bitColumn");
+ }
+
+ public void setBooleanColumn(Boolean booleanColumn) {
+ writeProperty("booleanColumn", booleanColumn);
+ }
+ public Boolean getBooleanColumn() {
+ return (Boolean)readProperty("booleanColumn");
+ }
+
+ public void setCharColumn(String charColumn) {
+ writeProperty("charColumn", charColumn);
+ }
+ public String getCharColumn() {
+ return (String)readProperty("charColumn");
+ }
+
+ public void setClobColumn(String clobColumn) {
+ writeProperty("clobColumn", clobColumn);
+ }
+ public String getClobColumn() {
+ return (String)readProperty("clobColumn");
+ }
+
+ public void setDateColumn(Date dateColumn) {
+ writeProperty("dateColumn", dateColumn);
+ }
+ public Date getDateColumn() {
+ return (Date)readProperty("dateColumn");
+ }
+
+ public void setDecimalColumn(BigDecimal decimalColumn) {
+ writeProperty("decimalColumn", decimalColumn);
+ }
+ public BigDecimal getDecimalColumn() {
+ return (BigDecimal)readProperty("decimalColumn");
+ }
+
+ public void setDoubleColumn(Double doubleColumn) {
+ writeProperty("doubleColumn", doubleColumn);
+ }
+ public Double getDoubleColumn() {
+ return (Double)readProperty("doubleColumn");
+ }
+
+ public void setFloatColumn(Float floatColumn) {
+ writeProperty("floatColumn", floatColumn);
+ }
+ public Float getFloatColumn() {
+ return (Float)readProperty("floatColumn");
+ }
+
+ public void setIntegerColumn(Integer integerColumn) {
+ writeProperty("integerColumn", integerColumn);
+ }
+ public Integer getIntegerColumn() {
+ return (Integer)readProperty("integerColumn");
+ }
+
+ public void setLongvarcharColumn(String longvarcharColumn) {
+ writeProperty("longvarcharColumn", longvarcharColumn);
+ }
+ public String getLongvarcharColumn() {
+ return (String)readProperty("longvarcharColumn");
+ }
+
+ public void setNumericColumn(BigDecimal numericColumn) {
+ writeProperty("numericColumn", numericColumn);
+ }
+ public BigDecimal getNumericColumn() {
+ return (BigDecimal)readProperty("numericColumn");
+ }
+
+ public void setRealColumn(Float realColumn) {
+ writeProperty("realColumn", realColumn);
+ }
+ public Float getRealColumn() {
+ return (Float)readProperty("realColumn");
+ }
+
+ public void setSmallintColumn(Short smallintColumn) {
+ writeProperty("smallintColumn", smallintColumn);
+ }
+ public Short getSmallintColumn() {
+ return (Short)readProperty("smallintColumn");
+ }
+
+ public void setTimeColumn(Date timeColumn) {
+ writeProperty("timeColumn", timeColumn);
+ }
+ public Date getTimeColumn() {
+ return (Date)readProperty("timeColumn");
+ }
+
+ public void setTimestampColumn(Date timestampColumn) {
+ writeProperty("timestampColumn", timestampColumn);
+ }
+ public Date getTimestampColumn() {
+ return (Date)readProperty("timestampColumn");
+ }
+
+ public void setTinyintColumn(Byte tinyintColumn) {
+ writeProperty("tinyintColumn", tinyintColumn);
+ }
+ public Byte getTinyintColumn() {
+ return (Byte)readProperty("tinyintColumn");
+ }
+
+ public void setVarcharColumn(String varcharColumn) {
+ writeProperty("varcharColumn", varcharColumn);
+ }
+ public String getVarcharColumn() {
+ return (String)readProperty("varcharColumn");
+ }
+
+}
Added: 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=954144&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ReturnTypesMap2.java (added)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ReturnTypesMap2.java Sat Jun 12 22:45:31 2010
@@ -0,0 +1,48 @@
+package org.apache.cayenne.testdo.testmap.auto;
+
+import org.apache.cayenne.CayenneDataObject;
+
+/**
+ * Class _ReturnTypesMap 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 {
+
+ public static final String BINARY_COLUMN_PROPERTY = "binaryColumn";
+ public static final String BLOB_COLUMN_PROPERTY = "blobColumn";
+ public static final String LONGVARBINARY_COLUMN_PROPERTY = "longvarbinaryColumn";
+ public static final String VARBINARY_COLUMN_PROPERTY = "varbinaryColumn";
+
+ public static final String AAAID_PK_COLUMN = "AAAID";
+
+ public void setBinaryColumn(byte[] binaryColumn) {
+ writeProperty("binaryColumn", binaryColumn);
+ }
+ public byte[] getBinaryColumn() {
+ return (byte[])readProperty("binaryColumn");
+ }
+
+ public void setBlobColumn(byte[] blobColumn) {
+ writeProperty("blobColumn", blobColumn);
+ }
+ public byte[] getBlobColumn() {
+ return (byte[])readProperty("blobColumn");
+ }
+
+ public void setLongvarbinaryColumn(byte[] longvarbinaryColumn) {
+ writeProperty("longvarbinaryColumn", longvarbinaryColumn);
+ }
+ public byte[] getLongvarbinaryColumn() {
+ return (byte[])readProperty("longvarbinaryColumn");
+ }
+
+ public void setVarbinaryColumn(byte[] varbinaryColumn) {
+ writeProperty("varbinaryColumn", varbinaryColumn);
+ }
+ public byte[] getVarbinaryColumn() {
+ return (byte[])readProperty("varbinaryColumn");
+ }
+
+}
Added: 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=954144&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_SerializableEntity.java (added)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_SerializableEntity.java Sat Jun 12 22:45:31 2010
@@ -0,0 +1,22 @@
+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 {
+
+ public static final String SERIALIZABLE_FIELD_PROPERTY = "serializableField";
+
+ public static final String ID_PK_COLUMN = "ID";
+
+ public void setSerializableField(org.apache.cayenne.MockSerializable serializableField) {
+ writeProperty("serializableField", serializableField);
+ }
+ public org.apache.cayenne.MockSerializable getSerializableField() {
+ return (org.apache.cayenne.MockSerializable)readProperty("serializableField");
+ }
+
+
+}
Added: 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=954144&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_SmallintTestEntity.java (added)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_SmallintTestEntity.java Sat Jun 12 22:45:31 2010
@@ -0,0 +1,22 @@
+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 {
+
+ public static final String SMALLINT_COL_PROPERTY = "smallintCol";
+
+ public static final String ID_PK_COLUMN = "ID";
+
+ public void setSmallintCol(Short smallintCol) {
+ writeProperty("smallintCol", smallintCol);
+ }
+ public Short getSmallintCol() {
+ return (Short)readProperty("smallintCol");
+ }
+
+
+}
Added: 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=954144&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_SubPainting.java (added)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_SubPainting.java Sat Jun 12 22:45:31 2010
@@ -0,0 +1,22 @@
+package org.apache.cayenne.testdo.testmap.auto;
+
+/** Class _SubPainting was generated by Cayenne.
+ * It is probably a good idea to avoid changing this class manually,
+ * since it may be overwritten next time code is regenerated.
+ * If you need to make any customizations, please use subclass.
+ */
+public abstract class _SubPainting extends org.apache.cayenne.CayenneDataObject {
+
+ public static final String PAINTING_TITLE_PROPERTY = "paintingTitle";
+
+ public static final String PAINTING_ID_PK_COLUMN = "PAINTING_ID";
+
+ public void setPaintingTitle(String paintingTitle) {
+ writeProperty("paintingTitle", paintingTitle);
+ }
+ public String getPaintingTitle() {
+ return (String)readProperty("paintingTitle");
+ }
+
+
+}
Added: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Testmap.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Testmap.java?rev=954144&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Testmap.java (added)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Testmap.java Sat Jun 12 22:45:31 2010
@@ -0,0 +1,116 @@
+package org.apache.cayenne.testdo.testmap.auto;
+
+import java.util.List;
+
+import org.apache.cayenne.ObjectContext;
+import org.apache.cayenne.query.NamedQuery;
+import org.apache.cayenne.testdo.testmap.Artist;
+import org.apache.cayenne.testdo.testmap.Gallery;
+import org.apache.cayenne.testdo.testmap.Painting;
+
+/**
+ * This class was generated by Cayenne.
+ * It is probably a good idea to avoid changing this class manually,
+ * since it may be overwritten next time code is regenerated.
+ * If you need to make any customizations, please use subclass.
+ */
+public class _Testmap {
+
+ public static final String EJBQL_QUERY_TEST_QUERYNAME = "EjbqlQueryTest";
+
+ public static final String NON_SELECTING_QUERY_QUERYNAME = "NonSelectingQuery";
+
+ public static final String OBJECT_QUERY_QUERYNAME = "ObjectQuery";
+
+ public static final String PARAMETERIZED_NON_SELECTING_QUERY_QUERYNAME = "ParameterizedNonSelectingQuery";
+
+ public static final String PARAMETERIZED_QUERY_WITH_LOCAL_CACHE_QUERYNAME = "ParameterizedQueryWithLocalCache";
+
+ public static final String PARAMETERIZED_QUERY_WITH_SHARED_CACHE_QUERYNAME = "ParameterizedQueryWithSharedCache";
+
+ public static final String PROCEDURE_QUERY_QUERYNAME = "ProcedureQuery";
+
+ public static final String QUERY_WITH_LOCAL_CACHE_QUERYNAME = "QueryWithLocalCache";
+
+ public static final String QUERY_WITH_ORDERING_QUERYNAME = "QueryWithOrdering";
+
+ public static final String QUERY_WITH_PREFETCH_QUERYNAME = "QueryWithPrefetch";
+
+ public static final String QUERY_WITH_QUALIFIER_QUERYNAME = "QueryWithQualifier";
+
+ public static final String QUERY_WITH_SHARED_CACHE_QUERYNAME = "QueryWithSharedCache";
+
+ public static final String SELECT_DATE_TEST_QUERYNAME = "SelectDateTest";
+
+ public static final String SELECT_RETURN_TYPES_MAP1_QUERYNAME = "SelectReturnTypesMap1";
+
+ public static final String SELECT_RETURN_TYPES_MAP2_QUERYNAME = "SelectReturnTypesMap2";
+
+ public static final String SELECT_TEST_LOWER_QUERYNAME = "SelectTestLower";
+
+ public static final String SELECT_TEST_UPPER_QUERYNAME = "SelectTestUpper";
+
+ public List<Painting> performObjectQuery(ObjectContext context , Artist artist) {
+ String[] parameters = {
+ "artist",
+ };
+
+ Object[] values = {
+ artist,
+ };
+
+ return context.performQuery(new NamedQuery("ObjectQuery", parameters, values));
+ }
+
+ public List<Artist> performParameterizedQueryWithLocalCache(ObjectContext context , String name) {
+ String[] parameters = {
+ "name",
+ };
+
+ Object[] values = {
+ name,
+ };
+
+ return context.performQuery(new NamedQuery("ParameterizedQueryWithLocalCache", parameters, values));
+ }
+
+ public List<Artist> performParameterizedQueryWithSharedCache(ObjectContext context , String name) {
+ String[] parameters = {
+ "name",
+ };
+
+ Object[] values = {
+ name,
+ };
+
+ return context.performQuery(new NamedQuery("ParameterizedQueryWithSharedCache", parameters, values));
+ }
+
+ public List<Artist> performQueryWithLocalCache(ObjectContext context ) {
+ return context.performQuery(new NamedQuery("QueryWithLocalCache"));
+ }
+
+ public List<Artist> performQueryWithOrdering(ObjectContext context ) {
+ return context.performQuery(new NamedQuery("QueryWithOrdering"));
+ }
+
+ public List<Gallery> performQueryWithPrefetch(ObjectContext context ) {
+ return context.performQuery(new NamedQuery("QueryWithPrefetch"));
+ }
+
+ public List<Artist> performQueryWithQualifier(ObjectContext context , String param1) {
+ String[] parameters = {
+ "param1",
+ };
+
+ Object[] values = {
+ param1,
+ };
+
+ return context.performQuery(new NamedQuery("QueryWithQualifier", parameters, values));
+ }
+
+ public List<Artist> performQueryWithSharedCache(ObjectContext context ) {
+ return context.performQuery(new NamedQuery("QueryWithSharedCache"));
+ }
+}
\ No newline at end of file
Added: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_TinyintTestEntity.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_TinyintTestEntity.java?rev=954144&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_TinyintTestEntity.java (added)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_TinyintTestEntity.java Sat Jun 12 22:45:31 2010
@@ -0,0 +1,22 @@
+package org.apache.cayenne.testdo.testmap.auto;
+
+/** Class _TinyintTestEntity was generated by Cayenne.
+ * It is probably a good idea to avoid changing this class manually,
+ * since it may be overwritten next time code is regenerated.
+ * If you need to make any customizations, please use subclass.
+ */
+public abstract class _TinyintTestEntity extends org.apache.cayenne.CayenneDataObject {
+
+ public static final String TINYINT_COL_PROPERTY = "tinyintCol";
+
+ public static final String ID_PK_COLUMN = "ID";
+
+ public void setTinyintCol(Byte tinyintCol) {
+ writeProperty("tinyintCol", tinyintCol);
+ }
+ public Byte getTinyintCol() {
+ return (Byte)readProperty("tinyintCol");
+ }
+
+
+}
Added: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_UuidTestEntity.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_UuidTestEntity.java?rev=954144&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_UuidTestEntity.java (added)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/auto/_UuidTestEntity.java Sat Jun 12 22:45:31 2010
@@ -0,0 +1,26 @@
+package org.apache.cayenne.testdo.testmap.auto;
+
+import java.util.UUID;
+
+import org.apache.cayenne.CayenneDataObject;
+
+/**
+ * Class _UuidTestEntity was generated by Cayenne.
+ * It is probably a good idea to avoid changing this class manually,
+ * since it may be overwritten next time code is regenerated.
+ * If you need to make any customizations, please use subclass.
+ */
+public abstract class _UuidTestEntity extends CayenneDataObject {
+
+ public static final String UUID_PROPERTY = "uuid";
+
+ public static final String ID_PK_COLUMN = "ID";
+
+ public void setUuid(UUID uuid) {
+ writeProperty("uuid", uuid);
+ }
+ public UUID getUuid() {
+ return (UUID)readProperty("uuid");
+ }
+
+}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/CayenneCase.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/CayenneCase.java?rev=954144&r1=954143&r2=954144&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/CayenneCase.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/CayenneCase.java Sat Jun 12 22:45:31 2010
@@ -33,7 +33,7 @@ import org.apache.cayenne.conn.DataSourc
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.ObjEntity;
-import org.apache.cayenne.test.DBHelper;
+import org.apache.cayenne.test.jdbc.DBHelper;
import org.apache.cayenne.unit.util.SQLTemplateCustomizer;
/**
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/SimpleAccessStack.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/SimpleAccessStack.java?rev=954144&r1=954143&r2=954144&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/SimpleAccessStack.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/SimpleAccessStack.java Sat Jun 12 22:45:31 2010
@@ -34,7 +34,6 @@ import java.util.List;
import java.util.ListIterator;
import java.util.Map;
-import org.apache.art.StringET1ExtendedType;
import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.access.DataDomain;
import org.apache.cayenne.access.DataNode;
@@ -50,6 +49,7 @@ import org.apache.cayenne.map.DbAttribut
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.Procedure;
import org.apache.cayenne.query.Query;
+import org.apache.cayenne.testdo.testmap.StringET1ExtendedType;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/TestDataDomainTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/TestDataDomainTest.java?rev=954144&r1=954143&r2=954144&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/TestDataDomainTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/TestDataDomainTest.java Sat Jun 12 22:45:31 2010
@@ -24,11 +24,11 @@ import java.util.Collections;
import junit.framework.AssertionFailedError;
-import org.apache.art.Artist;
-import org.apache.art.Painting;
-import org.apache.art.PaintingInfo;
import org.apache.cayenne.access.DataContext;
import org.apache.cayenne.query.SelectQuery;
+import org.apache.cayenne.testdo.testmap.Artist;
+import org.apache.cayenne.testdo.testmap.Painting;
+import org.apache.cayenne.testdo.testmap.PaintingInfo;
/**
* A test case checking that TestDataDomain query blocking works.
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_1125Test.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_1125Test.java?rev=954144&r1=954143&r2=954144&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_1125Test.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_1125Test.java Sat Jun 12 22:45:31 2010
@@ -21,7 +21,6 @@ package org.apache.cayenne.unit.jira;
import java.sql.Types;
import java.util.List;
-import org.apache.art.Artist;
import org.apache.cayenne.ObjectContext;
import org.apache.cayenne.map.DbAttribute;
import org.apache.cayenne.map.DbEntity;
@@ -29,6 +28,7 @@ import org.apache.cayenne.map.ObjAttribu
import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.query.CapsStrategy;
import org.apache.cayenne.query.SQLTemplate;
+import org.apache.cayenne.testdo.testmap.Artist;
import org.apache.cayenne.unit.CayenneCase;
import org.apache.cayenne.unit.MySQLStackAdapter;
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_788Test.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_788Test.java?rev=954144&r1=954143&r2=954144&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_788Test.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_788Test.java Sat Jun 12 22:45:31 2010
@@ -21,12 +21,12 @@ package org.apache.cayenne.unit.jira;
import java.util.Iterator;
import java.util.List;
-import org.apache.art.Painting;
-import org.apache.art.PaintingInfo;
import org.apache.cayenne.PersistenceState;
import org.apache.cayenne.access.DataContext;
import org.apache.cayenne.query.SelectQuery;
import org.apache.cayenne.query.SelectQueryBase;
+import org.apache.cayenne.testdo.testmap.Painting;
+import org.apache.cayenne.testdo.testmap.PaintingInfo;
public class CAY_788Test extends SelectQueryBase {
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_901Test.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_901Test.java?rev=954144&r1=954143&r2=954144&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_901Test.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_901Test.java Sat Jun 12 22:45:31 2010
@@ -20,13 +20,13 @@ package org.apache.cayenne.unit.jira;
import java.util.Map;
-import org.apache.art.Artist;
-import org.apache.art.Gallery;
-import org.apache.art.Painting;
import org.apache.cayenne.Cayenne;
import org.apache.cayenne.ObjectContext;
import org.apache.cayenne.query.CapsStrategy;
import org.apache.cayenne.query.SQLTemplate;
+import org.apache.cayenne.testdo.testmap.Artist;
+import org.apache.cayenne.testdo.testmap.Gallery;
+import org.apache.cayenne.testdo.testmap.Painting;
import org.apache.cayenne.unit.CayenneCase;
public class CAY_901Test extends CayenneCase {
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/util/TestBean.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/util/TestBean.java?rev=954144&r1=954143&r2=954144&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/util/TestBean.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/util/TestBean.java Sat Jun 12 22:45:31 2010
@@ -16,20 +16,15 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-
-
package org.apache.cayenne.unit.util;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
-
/**
* A non-persistent Java Bean. Useful for testing Cayenne operations that rely on
* introspection.
- *
- * @since 1.1
*/
public class TestBean {
@@ -38,7 +33,7 @@ public class TestBean {
protected String property1;
protected int property2;
protected Date dateProperty;
- protected Collection collection;
+ protected Collection<?> collection;
protected TestBean relatedBean;
public static TestBean testFixtureWithCollection(
@@ -46,7 +41,7 @@ public class TestBean {
String childBaseName) {
TestBean root = new TestBean(rootBaseName, 0);
- Collection collection = new ArrayList(10);
+ Collection<TestBean> collection = new ArrayList<TestBean>(10);
for (int i = 0; i < 10; i++) {
collection.add(new TestBean(childBaseName + i, i));
}
@@ -100,11 +95,11 @@ public class TestBean {
this.property2 = property2;
}
- public Collection getCollection() {
+ public Collection<?> getCollection() {
return collection;
}
- public void setCollection(Collection collection) {
+ public void setCollection(Collection<?> collection) {
this.collection = collection;
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/util/UpdatingSQLTemplate.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/util/UpdatingSQLTemplate.java?rev=954144&r1=954143&r2=954144&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/util/UpdatingSQLTemplate.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/util/UpdatingSQLTemplate.java Sat Jun 12 22:45:31 2010
@@ -28,7 +28,7 @@ import org.apache.cayenne.query.SQLTempl
*/
public class UpdatingSQLTemplate extends SQLTemplate {
- public UpdatingSQLTemplate(Class rootClass, String defaultTemplate) {
+ public UpdatingSQLTemplate(Class<?> rootClass, String defaultTemplate) {
super(rootClass, defaultTemplate != null ? defaultTemplate.trim() : null);
}
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/util/DeepMergeOperationTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/util/DeepMergeOperationTest.java?rev=954144&r1=954143&r2=954144&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/util/DeepMergeOperationTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/util/DeepMergeOperationTest.java Sat Jun 12 22:45:31 2010
@@ -19,12 +19,12 @@
package org.apache.cayenne.util;
-import org.apache.art.Artist;
import org.apache.cayenne.Cayenne;
import org.apache.cayenne.DataObjectUtils;
import org.apache.cayenne.PersistenceState;
import org.apache.cayenne.access.DataContext;
import org.apache.cayenne.reflect.ClassDescriptor;
+import org.apache.cayenne.testdo.testmap.Artist;
import org.apache.cayenne.unit.CayenneCase;
import org.apache.cayenne.util.DeepMergeOperation;
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/dml/CayenneDataObjectFlattenedRelTest.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/dml/CayenneDataObjectFlattenedRelTest.xml?rev=954144&r1=954143&r2=954144&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/dml/CayenneDataObjectFlattenedRelTest.xml (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/dml/CayenneDataObjectFlattenedRelTest.xml Sat Jun 12 22:45:31 2010
@@ -8,7 +8,7 @@
<!-- ARTIST -->
<bean id="A1" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
- <constructor-arg type="java.lang.Class"><value>org.apache.art.Artist</value></constructor-arg>
+ <constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.testmap.Artist</value></constructor-arg>
<constructor-arg><value>
insert into ARTIST (ARTIST_ID, ARTIST_NAME) values (33001, 'artist1')
</value></constructor-arg>
@@ -16,14 +16,14 @@
<!-- ARTGROUP -->
<bean id="AG1" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
- <constructor-arg type="java.lang.Class"><value>org.apache.art.ArtGroup</value></constructor-arg>
+ <constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.testmap.ArtGroup</value></constructor-arg>
<constructor-arg><value>
INSERT INTO ARTGROUP (GROUP_ID, NAME) VALUES (1,'g1')
</value></constructor-arg>
</bean>
<bean id="AG2" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
- <constructor-arg type="java.lang.Class"><value>org.apache.art.ArtGroup</value></constructor-arg>
+ <constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.testmap.ArtGroup</value></constructor-arg>
<constructor-arg><value>
INSERT INTO ARTGROUP (GROUP_ID, NAME) VALUES (2,'g2')
</value></constructor-arg>
@@ -32,7 +32,7 @@
<!-- ARTIST_GROUP -->
<bean id="AGG1" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
- <constructor-arg type="java.lang.Class"><value>org.apache.art.ArtGroup</value></constructor-arg>
+ <constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.testmap.ArtGroup</value></constructor-arg>
<constructor-arg><value>
INSERT INTO ARTIST_GROUP (ARTIST_ID, GROUP_ID) VALUES (33001,1)
</value></constructor-arg>
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/dml/CayenneTest.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/dml/CayenneTest.xml?rev=954144&r1=954143&r2=954144&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/dml/CayenneTest.xml (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/dml/CayenneTest.xml Sat Jun 12 22:45:31 2010
@@ -8,14 +8,14 @@
<!-- ARTIST -->
<bean id="A1" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
- <constructor-arg type="java.lang.Class"><value>org.apache.art.Artist</value></constructor-arg>
+ <constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.testmap.Artist</value></constructor-arg>
<constructor-arg><value>
insert into ARTIST (ARTIST_ID, ARTIST_NAME) values (33001, 'artist1')
</value></constructor-arg>
</bean>
<bean id="A2" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
- <constructor-arg type="java.lang.Class"><value>org.apache.art.Artist</value></constructor-arg>
+ <constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.testmap.Artist</value></constructor-arg>
<constructor-arg><value>
insert into ARTIST (ARTIST_ID, ARTIST_NAME) values (33002, 'artist2')
</value></constructor-arg>
@@ -23,7 +23,7 @@
<!-- COMPOUND_PK_TEST -->
<bean id="C1" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
- <constructor-arg type="java.lang.Class"><value>org.apache.art.CompoundPkTestEntity</value></constructor-arg>
+ <constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.testmap.CompoundPkTestEntity</value></constructor-arg>
<constructor-arg><value>
insert into COMPOUND_PK_TEST (KEY1, KEY2, NAME) values ('PK1', 'PK2', 'BBB')
</value></constructor-arg>
@@ -31,7 +31,7 @@
<!-- CHAR_PK_TEST -->
<bean id="CH1" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
- <constructor-arg type="java.lang.Class"><value>org.apache.art.CharPkTestEntity</value></constructor-arg>
+ <constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.testmap.CharPkTestEntity</value></constructor-arg>
<constructor-arg><value>
insert into CHAR_PK_TEST (PK_COL, OTHER_COL) values ('CPK', 'AAAA')
</value></constructor-arg>
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/dml/NestedCayenneContextOnDataContextTest.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/dml/NestedCayenneContextOnDataContextTest.xml?rev=954144&r1=954143&r2=954144&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/dml/NestedCayenneContextOnDataContextTest.xml (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/dml/NestedCayenneContextOnDataContextTest.xml Sat Jun 12 22:45:31 2010
@@ -8,63 +8,63 @@
<!-- ARTIST -->
<bean id="A1" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
- <constructor-arg type="java.lang.Class"><value>org.apache.art.Artist</value></constructor-arg>
+ <constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.testmap.Artist</value></constructor-arg>
<constructor-arg><value>
insert into ARTIST (ARTIST_ID, ARTIST_NAME) values (33001, 'artist1')
</value></constructor-arg>
</bean>
<bean id="A2" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
- <constructor-arg type="java.lang.Class"><value>org.apache.art.Artist</value></constructor-arg>
+ <constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.testmap.Artist</value></constructor-arg>
<constructor-arg><value>
insert into ARTIST (ARTIST_ID, ARTIST_NAME) values (33002, 'artist2')
</value></constructor-arg>
</bean>
<bean id="A3" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
- <constructor-arg type="java.lang.Class"><value>org.apache.art.Artist</value></constructor-arg>
+ <constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.testmap.Artist</value></constructor-arg>
<constructor-arg><value>
insert into ARTIST (ARTIST_ID, ARTIST_NAME) values (33003, 'artist3')
</value></constructor-arg>
</bean>
<bean id="A4" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
- <constructor-arg type="java.lang.Class"><value>org.apache.art.Artist</value></constructor-arg>
+ <constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.testmap.Artist</value></constructor-arg>
<constructor-arg><value>
insert into ARTIST (ARTIST_ID, ARTIST_NAME) values (33004, 'artist4')
</value></constructor-arg>
</bean>
<bean id="P1" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
- <constructor-arg type="java.lang.Class"><value>org.apache.art.Painting</value></constructor-arg>
+ <constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.testmap.Painting</value></constructor-arg>
<constructor-arg><value>
INSERT INTO PAINTING (PAINTING_ID, PAINTING_TITLE, ARTIST_ID, ESTIMATED_PRICE) VALUES (33001, 'P_artist1', 33001, 3000)
</value></constructor-arg>
</bean>
<bean id="P2" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
- <constructor-arg type="java.lang.Class"><value>org.apache.art.Painting</value></constructor-arg>
+ <constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.testmap.Painting</value></constructor-arg>
<constructor-arg><value>
INSERT INTO PAINTING (PAINTING_ID, PAINTING_TITLE, ARTIST_ID, ESTIMATED_PRICE) VALUES (33002, 'P_artist2', 33002, 3000)
</value></constructor-arg>
</bean>
<bean id="P3" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
- <constructor-arg type="java.lang.Class"><value>org.apache.art.Painting</value></constructor-arg>
+ <constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.testmap.Painting</value></constructor-arg>
<constructor-arg><value>
INSERT INTO PAINTING (PAINTING_ID, PAINTING_TITLE, ARTIST_ID, ESTIMATED_PRICE) VALUES (33003, 'P_artist3', 33003, 3000)
</value></constructor-arg>
</bean>
<bean id="P4" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
- <constructor-arg type="java.lang.Class"><value>org.apache.art.Painting</value></constructor-arg>
+ <constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.testmap.Painting</value></constructor-arg>
<constructor-arg><value>
INSERT INTO PAINTING (PAINTING_ID, PAINTING_TITLE, ARTIST_ID, ESTIMATED_PRICE) VALUES (33004, 'P_artist4', 33004, 3000)
</value></constructor-arg>
</bean>
<bean id="P5" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
- <constructor-arg type="java.lang.Class"><value>org.apache.art.Painting</value></constructor-arg>
+ <constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.testmap.Painting</value></constructor-arg>
<constructor-arg><value>
INSERT INTO PAINTING (PAINTING_ID, PAINTING_TITLE, ARTIST_ID, ESTIMATED_PRICE) VALUES (33005, 'P_artist5', null, 3000)
</value></constructor-arg>
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/dml/OneWayOneToManyTest.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/dml/OneWayOneToManyTest.xml?rev=954144&r1=954143&r2=954144&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/dml/OneWayOneToManyTest.xml (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/dml/OneWayOneToManyTest.xml Sat Jun 12 22:45:31 2010
@@ -6,31 +6,31 @@
<!-- Named Queries -->
<!-- ======================================= -->
<bean id="Artist1" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
- <constructor-arg type="java.lang.Class"><value>org.apache.art.oneway.Artist</value></constructor-arg>
+ <constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.testmap.oneway.Artist</value></constructor-arg>
<constructor-arg><value>
INSERT INTO ARTIST (ARTIST_ID, ARTIST_NAME, DATE_OF_BIRTH) VALUES (201, 'artist with one painting', null)
</value></constructor-arg>
</bean>
<bean id="Artist2" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
- <constructor-arg type="java.lang.Class"><value>org.apache.art.oneway.Artist</value></constructor-arg>
+ <constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.testmap.oneway.Artist</value></constructor-arg>
<constructor-arg><value>
INSERT INTO ARTIST (ARTIST_ID, ARTIST_NAME, DATE_OF_BIRTH) VALUES (202, 'artist XXX', null)
</value></constructor-arg>
</bean>
<bean id="Painting1" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
- <constructor-arg type="java.lang.Class"><value>org.apache.art.oneway.Painting</value></constructor-arg>
+ <constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.testmap.oneway.Painting</value></constructor-arg>
<constructor-arg><value>
INSERT INTO PAINTING (ARTIST_ID, ESTIMATED_PRICE, GALLERY_ID, PAINTING_ID, PAINTING_TITLE) VALUES (201, null, null, 201, 'p1')
</value></constructor-arg>
</bean>
<bean id="Painting2" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
- <constructor-arg type="java.lang.Class"><value>org.apache.art.oneway.Painting</value></constructor-arg>
+ <constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.testmap.oneway.Painting</value></constructor-arg>
<constructor-arg><value>
INSERT INTO PAINTING (ARTIST_ID, ESTIMATED_PRICE, GALLERY_ID, PAINTING_ID, PAINTING_TITLE) VALUES (201, null, null, 202, 'p2')
</value></constructor-arg>
</bean>
<bean id="Painting3" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
- <constructor-arg type="java.lang.Class"><value>org.apache.art.oneway.Painting</value></constructor-arg>
+ <constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.testmap.oneway.Painting</value></constructor-arg>
<constructor-arg><value>
INSERT INTO PAINTING (ARTIST_ID, ESTIMATED_PRICE, GALLERY_ID, PAINTING_ID, PAINTING_TITLE) VALUES (202, null, null, 203, 'p2')
</value></constructor-arg>