You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by dk...@apache.org on 2011/08/18 15:43:19 UTC
svn commit: r1159215 - in /cayenne/main/trunk: docs/doc/src/main/resources/
framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/
modeler/cayenne-modeler/src/...
Author: dkazimirchyk
Date: Thu Aug 18 13:43:18 2011
New Revision: 1159215
URL: http://svn.apache.org/viewvc?rev=1159215&view=rev
Log:
CAY-1598 Per DataMap listeners are called for all entities in DataDomain
removed DataMap listeners from modeler
Removed:
cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateCallbackMethodForDataMapListenerAction.java
cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/RemoveCallbackMethodForDataMapListenerAction.java
cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/DataMapCallbackListenersTab.java
Modified:
cayenne/main/trunk/docs/doc/src/main/resources/UPGRADE.txt
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/DataMap.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/MapLoader.java
cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DefaultActionManager.java
cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/DataMapTabbedView.java
Modified: cayenne/main/trunk/docs/doc/src/main/resources/UPGRADE.txt
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/UPGRADE.txt?rev=1159215&r1=1159214&r2=1159215&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/UPGRADE.txt (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/UPGRADE.txt Thu Aug 18 13:43:18 2011
@@ -5,6 +5,25 @@ IMPORTANT: be sure to read all notes for
current release and the release you are upgrading to.
-------------------------------------------------------------------------------
+UPGRADING TO 3.1M3
+
+* DataMap listeners are no longer supported. Global listeners registered through
+ annotations API can be used instead. E.g.:
+
+ public class SomeListener {
+ @PrePersist
+ public void onPrePersist(Object object) {
+ // callback method
+ }
+ }
+
+ To register listener class use following API:
+
+ runtime.getChannel().getEntityResolver().getCallbackRegistry().addListener(listenerInstance);
+
+ Note that DataMap listeners entries from old *.map.xml files will be ignored.
+
+
UPGRADING TO 3.1M1
The most essential change in Cayenne 3.1 is a new Dependency-Injection (DI) based
@@ -16,7 +35,7 @@ application.
CayenneModeler. Agree to perform an upgrade when asked. Note that Cayenne
3.1 only supports one DataDomain per project, so if multiple domains existed in
the project, you'll end up with multiple project files after the upgrade. Each
- will require instantiation of a separate ServerRuntime in the code.
+ will require instantiation of a separate ServerRuntime in the code.
* Upgrading 2.0.x and earlier mappings files: Note that CayenneModeler
3.1 won't be able to upgrade projects created with a Modeler older than 3.0. To
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/DataMap.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/DataMap.java?rev=1159215&r1=1159214&r2=1159215&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/DataMap.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/DataMap.java Thu Aug 18 13:43:18 2011
@@ -399,11 +399,6 @@ public class DataMap implements Serializ
}
}
- // write entity listeners
- for (EntityListener entityListener : getDefaultEntityListeners()) {
- entityListener.encodeAsXML(encoder);
- }
-
encoder.indent(-1);
encoder.println("</data-map>");
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/MapLoader.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/MapLoader.java?rev=1159215&r1=1159214&r2=1159215&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/MapLoader.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/MapLoader.java Thu Aug 18 13:43:18 2011
@@ -32,6 +32,8 @@ import org.apache.cayenne.dba.TypesMappi
import org.apache.cayenne.exp.Expression;
import org.apache.cayenne.util.ResourceLocator;
import org.apache.cayenne.util.Util;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.xml.sax.Attributes;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -47,6 +49,8 @@ public class MapLoader extends DefaultHa
// TODO: andrus, 7/17/2006 - move upgrade logic out of here
final static String _1_2_PACKAGE_PREFIX = "org.objectstyle.cayenne.";
final static String _2_0_PACKAGE_PREFIX = "org.apache.cayenne.";
+
+ private static Log logger = LogFactory.getLog(MapLoader.class);
public static final String DATA_MAP_TAG = "data-map";
public static final String PROPERTY_TAG = "property";
@@ -597,7 +601,7 @@ public class MapLoader extends DefaultHa
}
else if (dataMap != null) {
// we are inside of datamap tag
- dataMap.addDefaultEntityListener(entityListener);
+ logger.warn("DataMap listeners are no longer supported. See UPGRADE.txt for more information.");
}
}
Modified: cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DefaultActionManager.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DefaultActionManager.java?rev=1159215&r1=1159214&r2=1159215&view=diff
==============================================================================
--- cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DefaultActionManager.java (original)
+++ cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DefaultActionManager.java Thu Aug 18 13:43:18 2011
@@ -156,10 +156,8 @@ public class DefaultActionManager implem
// start callback-related actions
registerAction(new CreateCallbackMethodAction(application)).setAlwaysOn(true);
registerAction(new CreateCallbackMethodForListenerAction(application));
- registerAction(new CreateCallbackMethodForDataMapListenerAction(application));
registerAction(new RemoveCallbackMethodAction(application));
registerAction(new RemoveCallbackMethodForListenerAction(application));
- registerAction(new RemoveCallbackMethodForDataMapListenerAction(application));
registerAction(new CreateObjEntityListenerAction(application)).setAlwaysOn(true);
registerAction(new CreateDataMapEntityListenerAction(application)).setAlwaysOn(
true);
Modified: cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/DataMapTabbedView.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/DataMapTabbedView.java?rev=1159215&r1=1159214&r2=1159215&view=diff
==============================================================================
--- cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/DataMapTabbedView.java (original)
+++ cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/DataMapTabbedView.java Thu Aug 18 13:43:18 2011
@@ -53,9 +53,6 @@ public class DataMapTabbedView extends J
// must be wrapped in a scroll pane
JScrollPane dataMapView = new JScrollPane(new DataMapView(mediator));
addTab("DataMap", dataMapView);
-
- DataMapCallbackListenersTab listenersPanel = new DataMapCallbackListenersTab(mediator);
- addTab("Listeners", listenersPanel);
}
}