cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r571783 - in /cayenne/main/trunk: docs/doc/src/main/resources/ framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/map/ framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/project/ framework/cayenne-jdk1....
Date Sat, 01 Sep 2007 12:25:41 GMT
Author: aadamchik
Date: Sat Sep  1 05:25:40 2007
New Revision: 571783

URL: http://svn.apache.org/viewvc?rev=571783&view=rev
Log:
CAY-857 Deprecate derived DbEntity and all associated API's - schedule for removal in 3.0M3

Modified:
    cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt
    cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/map/DerivedDbAttribute.java
    cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/map/DerivedDbEntity.java
    cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/project/NamedObjectFactory.java
    cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/query/SelectQuery.java
    cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/remote/IncrementalSelectQuery.java
    cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/map/DerivedDbEntityTest.java
    cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/EditDerivedParamsDialog.java
    cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DerivedAttributeParamsTableModel.java
    cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DerivedDbAttributeTableModel.java

Modified: cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt?rev=571783&r1=571782&r2=571783&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt Sat Sep  1 05:25:40 2007
@@ -30,6 +30,7 @@
 CAY-846 EJBQL Support for Functional Expressions
 CAY-855 Add DataContext.objectFromDataRow variety for generic classes
 CAY-856 Deprecate CayenneMap and replace all references to it with standard java.util package
Maps
+CAY-857 Deprecate derived DbEntity and all associated API's - schedule for removal in 3.0M3
 
 Bug Fixes Since M1:
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/map/DerivedDbAttribute.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/map/DerivedDbAttribute.java?rev=571783&r1=571782&r2=571783&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/map/DerivedDbAttribute.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/map/DerivedDbAttribute.java
Sat Sep  1 05:25:40 2007
@@ -42,6 +42,7 @@
  * </p>
  * 
  * @author Andrus Adamchik
+ * @deprecated since 3.0M2 (scheduled for removal in 3.0M3) this type of mapping is no longer
supported.
  */
 public class DerivedDbAttribute extends DbAttribute {
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/map/DerivedDbEntity.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/map/DerivedDbEntity.java?rev=571783&r1=571782&r2=571783&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/map/DerivedDbEntity.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/map/DerivedDbEntity.java
Sat Sep  1 05:25:40 2007
@@ -33,6 +33,7 @@
  * like GROUP BY and aggregate functions.
  * 
  * @author Andrus Adamchik
+ * @deprecated since 3.0M2 (scheduled for removal in 3.0M3) this type of mapping is no longer
supported.
  */
 public class DerivedDbEntity extends DbEntity {
     protected String parentEntityName;

Modified: cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/project/NamedObjectFactory.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/project/NamedObjectFactory.java?rev=571783&r1=571782&r2=571783&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/project/NamedObjectFactory.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/project/NamedObjectFactory.java
Sat Sep  1 05:25:40 2007
@@ -348,6 +348,9 @@
         }
     }
 
+    /**
+     * @deprecated since 3.0M2 (scheduled for removal in 3.0M3)
+     */
     static class DerivedDbAttributeFactory extends ObjAttributeFactory {
         protected Object create(String name, Object namingContext) {
             return new DerivedDbAttribute(

Modified: cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/query/SelectQuery.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/query/SelectQuery.java?rev=571783&r1=571782&r2=571783&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/query/SelectQuery.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/query/SelectQuery.java
Sat Sep  1 05:25:40 2007
@@ -54,7 +54,14 @@
     protected List orderings;
     protected boolean distinct;
 
+    /**
+     * since 3.0M2 (scheduled for removal in 3.0M3) as DerivedDbEntity is deprecated.
+     */
     protected Expression parentQualifier;
+    
+    /**
+     * since 3.0M2 (scheduled for removal in 3.0M3) as DerivedDbEntity is deprecated.
+     */
     protected String parentObjEntityName;
 
     SelectQueryMetadata selectInfo = new SelectQueryMetadata();
@@ -589,12 +596,20 @@
         this.selectInfo.setFetchLimit(fetchLimit);
     }
 
-    /** Setter for query's parent entity qualifier. */
+    /** 
+     * Setter for query's parent entity qualifier. 
+     * 
+     * @deprecated since 3.0M2 (scheduled for removal in 3.0M3) as DerivedDbEntity is deprecated.
+     */
     public void setParentQualifier(Expression parentQualifier) {
         this.parentQualifier = parentQualifier;
     }
 
-    /** Getter for query parent entity qualifier. */
+    /** 
+     * Getter for query parent entity qualifier. 
+     * 
+     * @deprecated since 3.0M2 (scheduled for removal in 3.0M3) as DerivedDbEntity is deprecated.
+     */
     public Expression getParentQualifier() {
         return parentQualifier;
     }
@@ -602,6 +617,8 @@
     /**
      * Adds specified parent entity qualifier to the existing parent entity qualifier
      * joining it using "AND".
+     * 
+     * @deprecated since 3.0M2 (scheduled for removal in 3.0M3) as DerivedDbEntity is deprecated.
      */
     public void andParentQualifier(Expression e) {
         parentQualifier = (parentQualifier != null) ? parentQualifier.andExp(e) : e;
@@ -610,6 +627,8 @@
     /**
      * Adds specified parent entity qualifier to the existing qualifier joining it using
      * "OR".
+     * 
+     * @deprecated since 3.0M2 (scheduled for removal in 3.0M3) as DerivedDbEntity is deprecated.
      */
     public void orParentQualifier(Expression e) {
         parentQualifier = (parentQualifier != null) ? parentQualifier.orExp(e) : e;
@@ -618,7 +637,7 @@
     /**
      * Returns the name of parent ObjEntity.
      * 
-     * @return String
+     * @deprecated since 3.0M2 (scheduled for removal in 3.0M3) as DerivedDbEntity is deprecated.
      */
     public String getParentObjEntityName() {
         return parentObjEntityName;
@@ -636,6 +655,7 @@
      * </p>
      * 
      * @param parentObjEntityName The parentObjEntityName to set
+     * @deprecated since 3.0M2 (scheduled for removal in 3.0M3) as DerivedDbEntity is deprecated.
      */
     public void setParentObjEntityName(String parentObjEntityName) {
         this.parentObjEntityName = parentObjEntityName;
@@ -644,6 +664,8 @@
     /**
      * Returns <code>true</code> if this query has an extra qualifier that uses
a parent
      * entity of the query root entity for additional result filtering.
+     * 
+     * @deprecated since 3.0M2 (scheduled for removal in 3.0M3) as DerivedDbEntity is deprecated.
      */
     public boolean isQualifiedOnParent() {
         return getParentObjEntityName() != null && parentQualifier != null;

Modified: cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/remote/IncrementalSelectQuery.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/remote/IncrementalSelectQuery.java?rev=571783&r1=571782&r2=571783&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/remote/IncrementalSelectQuery.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/remote/IncrementalSelectQuery.java
Sat Sep  1 05:25:40 2007
@@ -164,6 +164,9 @@
         return query.addPrefetch(prefetchPath);
     }
 
+    /**
+     * @deprecated since 3.0M2 (scheduled for removal in 3.0M3) as DerivedDbEntity is deprecated.
+     */
     public void andParentQualifier(Expression e) {
         query.andParentQualifier(e);
     }
@@ -224,10 +227,16 @@
         return query.getPageSize();
     }
 
+    /**
+     * @deprecated since 3.0M2 (scheduled for removal in 3.0M3) as DerivedDbEntity is deprecated.
+     */
     public String getParentObjEntityName() {
         return query.getParentObjEntityName();
     }
 
+    /**
+     * @deprecated since 3.0M2 (scheduled for removal in 3.0M3) as DerivedDbEntity is deprecated.
+     */
     public Expression getParentQualifier() {
         return query.getParentQualifier();
     }
@@ -264,6 +273,9 @@
         return query.isFetchingDataRows();
     }
 
+    /**
+     * @deprecated since 3.0M2 (scheduled for removal in 3.0M3) as DerivedDbEntity is deprecated.
+     */
     public boolean isQualifiedOnParent() {
         return query.isQualifiedOnParent();
     }
@@ -276,6 +288,9 @@
         return query.isResolvingInherited();
     }
 
+    /**
+     * @deprecated since 3.0M2 (scheduled for removal in 3.0M3) as DerivedDbEntity is deprecated.
+     */
     public void orParentQualifier(Expression e) {
         query.orParentQualifier(e);
     }
@@ -332,10 +347,16 @@
         query.setPageSize(pageSize);
     }
 
+    /**
+     * @deprecated since 3.0M2 (scheduled for removal in 3.0M3) as DerivedDbEntity is deprecated.
+     */
     public void setParentObjEntityName(String parentObjEntityName) {
         query.setParentObjEntityName(parentObjEntityName);
     }
 
+    /**
+     * @deprecated since 3.0M2 (scheduled for removal in 3.0M3) as DerivedDbEntity is deprecated.
+     */
     public void setParentQualifier(Expression parentQualifier) {
         query.setParentQualifier(parentQualifier);
     }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/map/DerivedDbEntityTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/map/DerivedDbEntityTest.java?rev=571783&r1=571782&r2=571783&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/map/DerivedDbEntityTest.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/map/DerivedDbEntityTest.java
Sat Sep  1 05:25:40 2007
@@ -23,6 +23,7 @@
 
 /**
  * @author Andrus Adamchik
+ * @deprecated since 3.0M2 (scheduled for removal in 3.0M3)
  */
 public class DerivedDbEntityTest extends CayenneCase {
     protected DerivedDbEntity ent;

Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/EditDerivedParamsDialog.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/EditDerivedParamsDialog.java?rev=571783&r1=571782&r2=571783&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/EditDerivedParamsDialog.java
(original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/EditDerivedParamsDialog.java
Sat Sep  1 05:25:40 2007
@@ -53,6 +53,7 @@
  * for derived attribute expression.
  *  
  * @author Andrus Adamchik
+ * @deprecated since 3.0M2 (scheduled for removal in 3.0M3).
  */
 public class EditDerivedParamsDialog extends CayenneDialog implements ActionListener {
 

Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DerivedAttributeParamsTableModel.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DerivedAttributeParamsTableModel.java?rev=571783&r1=571782&r2=571783&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DerivedAttributeParamsTableModel.java
(original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DerivedAttributeParamsTableModel.java
Sat Sep  1 05:25:40 2007
@@ -29,6 +29,7 @@
 
 /**
  * @author Andrus Adamchik
+ * @deprecated since 3.0M2 (scheduled for removal in 3.0M3)
  */
 public class DerivedAttributeParamsTableModel extends DbAttributeTableModel {
 	private static final int DB_ATTRIBUTE_NAME = 0;

Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DerivedDbAttributeTableModel.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DerivedDbAttributeTableModel.java?rev=571783&r1=571782&r2=571783&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DerivedDbAttributeTableModel.java
(original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DerivedDbAttributeTableModel.java
Sat Sep  1 05:25:40 2007
@@ -28,6 +28,7 @@
  * Table model for derived DbAttributes.
  * 
  * @author Andrus Adamchik
+ * @deprecated since 3.0M2 (scheduled for removal in 3.0M3)
  */
 public class DerivedDbAttributeTableModel extends DbAttributeTableModel {
 	// Column indices



Mime
View raw message