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 2007/01/24 14:45:08 UTC
svn commit: r499404 - in /cayenne/main/trunk: docs/doc/src/main/resources/
framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/
framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/event/
framework/cayen...
Author: aadamchik
Date: Wed Jan 24 05:45:07 2007
New Revision: 499404
URL: http://svn.apache.org/viewvc?view=rev&rev=499404
Log:
Deprecate DataContextTransactionEventListener, DataObjectTransactionEventListener, DataContextEvent - CAY-737
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/access/DataContext.java
cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/DataContextFlushEventHandler.java
cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/event/DataContextEvent.java
cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/event/DataContextTransactionEventListener.java
cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/event/DataObjectTransactionEventListener.java
cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/access/DataContextEventsTest.java
cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/access/DataContextExtrasTest.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?view=diff&rev=499404&r1=499403&r2=499404
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt Wed Jan 24 05:45:07 2007
@@ -51,6 +51,7 @@
CAY-700 where in () with empty collection
CAY-702 Improve DBCPDataSourceFactory to use it for a JettyPlus DataSource
CAY-703 Cache EntityResolver in the ClientChannel
+CAY-737 Deprecate DataContextTransactionEventListener, DataObjectTransactionEventListener, DataContextEvent
Bug Fixes since 1.2 final:
Modified: cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/DataContext.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/DataContext.java?view=diff&rev=499404&r1=499403&r2=499404
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/DataContext.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/DataContext.java Wed Jan 24 05:45:07 2007
@@ -58,6 +58,7 @@
import org.apache.cayenne.map.DbJoin;
import org.apache.cayenne.map.DbRelationship;
import org.apache.cayenne.map.EntityResolver;
+import org.apache.cayenne.map.LifecycleEventCallback;
import org.apache.cayenne.map.ObjAttribute;
import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.map.ObjRelationship;
@@ -1385,6 +1386,9 @@
/**
* Sets default for posting transaction events by new DataContexts.
+ *
+ * @deprecated since 3.0M1 in favor of {@link LifecycleEventCallback}. Will be
+ * removed in later 3.0 milestones.
*/
public static void setTransactionEventsEnabledDefault(boolean flag) {
transactionEventsEnabledDefault = flag;
@@ -1392,11 +1396,18 @@
/**
* Enables or disables posting of transaction events by this DataContext.
+ *
+ * @deprecated since 3.0M1 in favor of {@link LifecycleEventCallback}. Will be
+ * removed in later 3.0 milestones.
*/
public void setTransactionEventsEnabled(boolean flag) {
this.transactionEventsEnabled = flag;
}
+ /**
+ * @deprecated since 3.0M1 in favor of {@link LifecycleEventCallback}. Will be
+ * removed in later 3.0 milestones.
+ */
public boolean isTransactionEventsEnabled() {
return this.transactionEventsEnabled;
}
@@ -1431,6 +1442,10 @@
this.validatingObjectsOnCommit = flag;
}
+ /**
+ * @deprecated since 3.0M1 in favor of {@link LifecycleEventCallback}. Will be
+ * removed in later 3.0 milestones.
+ */
void fireWillCommit() {
// post event: WILL_COMMIT
if (this.transactionEventsEnabled) {
@@ -1439,6 +1454,10 @@
}
}
+ /**
+ * @deprecated since 3.0M1 in favor of {@link LifecycleEventCallback}. Will be
+ * removed in later 3.0 milestones.
+ */
void fireTransactionRolledback() {
// post event: DID_ROLLBACK
if ((this.transactionEventsEnabled)) {
@@ -1447,6 +1466,10 @@
}
}
+ /**
+ * @deprecated since 3.0M1 in favor of {@link LifecycleEventCallback}. Will be
+ * removed in later 3.0 milestones.
+ */
void fireTransactionCommitted() {
// old-style event
if ((this.transactionEventsEnabled)) {
Modified: cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/DataContextFlushEventHandler.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/DataContextFlushEventHandler.java?view=diff&rev=499404&r1=499403&r2=499404
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/DataContextFlushEventHandler.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/DataContextFlushEventHandler.java Wed Jan 24 05:45:07 2007
@@ -29,12 +29,15 @@
import org.apache.cayenne.access.event.DataContextTransactionEventListener;
import org.apache.cayenne.access.event.DataObjectTransactionEventListener;
import org.apache.cayenne.event.EventManager;
+import org.apache.cayenne.map.LifecycleEventCallback;
/**
* Handles DataContext events on domain flush.
*
* @since 1.2
* @author Andrus Adamchik
+ * @deprecated since 3.0M1 in favor of {@link LifecycleEventCallback}. Will be removed in
+ * later 3.0 milestones.
*/
class DataContextFlushEventHandler implements DataContextTransactionEventListener {
Modified: cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/event/DataContextEvent.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/event/DataContextEvent.java?view=diff&rev=499404&r1=499403&r2=499404
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/event/DataContextEvent.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/event/DataContextEvent.java Wed Jan 24 05:45:07 2007
@@ -17,34 +17,34 @@
* under the License.
****************************************************************/
-
package org.apache.cayenne.access.event;
import java.util.Map;
import org.apache.cayenne.access.DataContext;
import org.apache.cayenne.event.CayenneEvent;
+import org.apache.cayenne.map.LifecycleEventCallback;
/**
* Represents events sent by DataContext.
*
* @author Dirk Olmes
* @author Holger Hoffstaette
+ * @deprecated since 3.0M1 in favor of {@link LifecycleEventCallback}. Will be removed in
+ * later 3.0 milestones.
*/
-
public class DataContextEvent extends CayenneEvent {
- public DataContextEvent(DataContext src) {
- super(src);
- }
-
- public DataContextEvent(DataContext src, Map info) {
- super(src, info);
- }
-
- public DataContext getDataContext() {
- return (DataContext)super.getSource();
- }
+ public DataContextEvent(DataContext src) {
+ super(src);
+ }
+
+ public DataContextEvent(DataContext src, Map info) {
+ super(src, info);
+ }
+
+ public DataContext getDataContext() {
+ return (DataContext) super.getSource();
+ }
}
-
Modified: cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/event/DataContextTransactionEventListener.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/event/DataContextTransactionEventListener.java?view=diff&rev=499404&r1=499403&r2=499404
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/event/DataContextTransactionEventListener.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/event/DataContextTransactionEventListener.java Wed Jan 24 05:45:07 2007
@@ -16,20 +16,24 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-
-
package org.apache.cayenne.access.event;
import java.util.EventListener;
+import org.apache.cayenne.map.LifecycleEventCallback;
+
/**
- * This interface declares callback methods that subscribers to DataContext
- * events can implement to be notified about transactions.
+ * This interface declares callback methods that subscribers to DataContext events can
+ * implement to be notified about transactions.
+ *
+ * @deprecated since 3.0M1 in favor of {@link LifecycleEventCallback}. Will be removed in
+ * later 3.0 milestones.
*/
-
public interface DataContextTransactionEventListener extends EventListener {
- public void dataContextWillCommit(DataContextEvent event);
- public void dataContextDidCommit(DataContextEvent event);
- public void dataContextDidRollback(DataContextEvent event);
-}
+ public void dataContextWillCommit(DataContextEvent event);
+
+ public void dataContextDidCommit(DataContextEvent event);
+
+ public void dataContextDidRollback(DataContextEvent event);
+}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/event/DataObjectTransactionEventListener.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/event/DataObjectTransactionEventListener.java?view=diff&rev=499404&r1=499403&r2=499404
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/event/DataObjectTransactionEventListener.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/event/DataObjectTransactionEventListener.java Wed Jan 24 05:45:07 2007
@@ -16,23 +16,25 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-
-
package org.apache.cayenne.access.event;
import java.util.EventListener;
+import org.apache.cayenne.map.LifecycleEventCallback;
+
/**
- * This interface declares methods that DataObject classes can implement to be
- * notified about transactions of their DataContext.
- * Note: explicit registration with EventManager is not necessary, since the
- * events are simply forwarded by ContextCommitObserver; stricly speaking these
- * methods are just regular 'callbacks'. The event argument is passed along for
- * convenience.
+ * This interface declares methods that DataObject classes can implement to be notified
+ * about transactions of their DataContext. Note: explicit registration with EventManager
+ * is not necessary, since the events are simply forwarded by ContextCommitObserver;
+ * stricly speaking these methods are just regular 'callbacks'. The event argument is
+ * passed along for convenience.
+ *
+ * @deprecated since 3.0M1 in favor of {@link LifecycleEventCallback}. Will be removed in
+ * later 3.0 milestones.
*/
-
public interface DataObjectTransactionEventListener extends EventListener {
- public void willCommit(DataContextEvent event);
- public void didCommit(DataContextEvent event);
-}
+ public void willCommit(DataContextEvent event);
+
+ public void didCommit(DataContextEvent event);
+}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/access/DataContextEventsTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/access/DataContextEventsTest.java?view=diff&rev=499404&r1=499403&r2=499404
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/access/DataContextEventsTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/access/DataContextEventsTest.java Wed Jan 24 05:45:07 2007
@@ -24,11 +24,14 @@
import org.apache.art.oneway.Artist;
import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.dba.mysql.MySQLAdapter;
+import org.apache.cayenne.map.LifecycleEventCallback;
import org.apache.cayenne.unit.OneWayMappingCase;
/**
* @author Holger Hoffstaette
* @author Andrus Adamchik
+ * @deprecated since 3.0M1 in favor of {@link LifecycleEventCallback}. Will be removed in
+ * later 3.0 milestones.
*/
public class DataContextEventsTest extends OneWayMappingCase {
Modified: cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/access/DataContextExtrasTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/access/DataContextExtrasTest.java?view=diff&rev=499404&r1=499403&r2=499404
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/access/DataContextExtrasTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/access/DataContextExtrasTest.java Wed Jan 24 05:45:07 2007
@@ -37,6 +37,7 @@
import org.apache.cayenne.dba.JdbcPkGenerator;
import org.apache.cayenne.dba.PkGenerator;
import org.apache.cayenne.map.DbEntity;
+import org.apache.cayenne.map.LifecycleEventCallback;
import org.apache.cayenne.query.SQLTemplate;
import org.apache.cayenne.query.SelectQuery;
import org.apache.cayenne.unit.CayenneCase;
@@ -120,6 +121,10 @@
assertSame(object, context.getUserProperty("ABC"));
}
+ /**
+ * @deprecated since 3.0M1 in favor of {@link LifecycleEventCallback}. Will be
+ * removed in later 3.0 milestones.
+ */
public void testTransactionEventsEnabled() {
DataContext context = createDataContext();
context.setTransactionEventsEnabled(false);