Author: dkazimirchyk
Date: Mon Sep 12 07:40:33 2011
New Revision: 1169635
URL: http://svn.apache.org/viewvc?rev=1169635&view=rev
Log:
CAY-1598 Per DataMap listeners are called for all entities in DataDomain
removed data map listeners from unit test maps
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/testmap/EntityListenerDataMap.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/small-testmap.map.xml
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/testmap.map.xml
cayenne/main/trunk/framework/cayenne-tools/src/test/resources/testmap.map.xml
cayenne/main/trunk/itests/cayenne-tools-itest/src/test/resources/testmap.map.xml
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/small-testmap.map.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/small-testmap.map.xml?rev=1169635&r1=1169634&r2=1169635&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/small-testmap.map.xml
(original)
+++
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/small-testmap.map.xml
Mon Sep 12 07:40:33 2011
@@ -222,15 +222,4 @@
<obj-relationship name="toPaintingInfo" source="Painting"
target="PaintingInfo" deleteRule="Cascade"
db-relationship-path="toPaintingInfo"/>
<obj-relationship name="toArtist" source="Painting1" target="Artist"
deleteRule="Nullify" db-relationship-path="toArtist"/>
<obj-relationship name="painting" source="PaintingInfo"
target="Painting" deleteRule="Nullify" db-relationship-path="painting"/>
-
- <entity-listener
class="org.apache.cayenne.testdo.testmap.EntityListenerDataMap">
- <post-add method-name="prePersistDataMap1"/>
- <post-add method-name="prePersistDataMap2"/>
- <post-persist method-name="postPersistDataMap"/>
- <pre-update method-name="preUpdateDataMap"/>
- <post-update method-name="postUpdateDataMap"/>
- <pre-remove method-name="preRemoveDataMap"/>
- <post-remove method-name="postRemoveDataMap"/>
- <post-load method-name="postLoadDataMap"/>
- </entity-listener>
</data-map>
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/testmap.map.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/testmap.map.xml?rev=1169635&r1=1169634&r2=1169635&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/testmap.map.xml
(original)
+++
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/testmap.map.xml
Mon Sep 12 07:40:33 2011
@@ -760,14 +760,4 @@ VALUES (#bind($id), #bind($title), #bind
<property name="cayenne.SQLTemplate.columnNameCapitalization"
value="UPPER"/>
<sql><![CDATA[select * from ARTIST]]></sql>
</query>
- <entity-listener
class="org.apache.cayenne.testdo.testmap.EntityListenerDataMap">
- <post-add method-name="prePersistDataMap1"/>
- <post-add method-name="prePersistDataMap2"/>
- <post-persist method-name="postPersistDataMap"/>
- <pre-update method-name="preUpdateDataMap"/>
- <post-update method-name="postUpdateDataMap"/>
- <pre-remove method-name="preRemoveDataMap"/>
- <post-remove method-name="postRemoveDataMap"/>
- <post-load method-name="postLoadDataMap"/>
- </entity-listener>
</data-map>
Modified:
cayenne/main/trunk/framework/cayenne-tools/src/test/resources/testmap.map.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-tools/src/test/resources/testmap.map.xml?rev=1169635&r1=1169634&r2=1169635&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-tools/src/test/resources/testmap.map.xml
(original)
+++
cayenne/main/trunk/framework/cayenne-tools/src/test/resources/testmap.map.xml
Mon Sep 12 07:40:33 2011
@@ -741,14 +741,4 @@ VALUES (#bind($id), #bind($title), #bind
<property name="cayenne.SQLTemplate.columnNameCapitalization"
value="UPPER"/>
<sql><![CDATA[select * from ARTIST]]></sql>
</query>
- <entity-listener
class="org.apache.cayenne.testdo.testmap.EntityListenerDataMap">
- <post-add method-name="prePersistDataMap1"/>
- <post-add method-name="prePersistDataMap2"/>
- <post-persist method-name="postPersistDataMap"/>
- <pre-update method-name="preUpdateDataMap"/>
- <post-update method-name="postUpdateDataMap"/>
- <pre-remove method-name="preRemoveDataMap"/>
- <post-remove method-name="postRemoveDataMap"/>
- <post-load method-name="postLoadDataMap"/>
- </entity-listener>
</data-map>
Modified:
cayenne/main/trunk/itests/cayenne-tools-itest/src/test/resources/testmap.map.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/itests/cayenne-tools-itest/src/test/resources/testmap.map.xml?rev=1169635&r1=1169634&r2=1169635&view=diff
==============================================================================
---
cayenne/main/trunk/itests/cayenne-tools-itest/src/test/resources/testmap.map.xml
(original)
+++
cayenne/main/trunk/itests/cayenne-tools-itest/src/test/resources/testmap.map.xml
Mon Sep 12 07:40:33 2011
@@ -741,14 +741,4 @@ VALUES (#bind($id), #bind($title), #bind
<property name="cayenne.SQLTemplate.columnNameCapitalization"
value="UPPER"/>
<sql><![CDATA[select * from ARTIST]]></sql>
</query>
- <entity-listener
class="org.apache.cayenne.testdo.testmap.EntityListenerDataMap">
- <post-add method-name="prePersistDataMap1"/>
- <post-add method-name="prePersistDataMap2"/>
- <post-persist method-name="postPersistDataMap"/>
- <pre-update method-name="preUpdateDataMap"/>
- <post-update method-name="postUpdateDataMap"/>
- <pre-remove method-name="preRemoveDataMap"/>
- <post-remove method-name="postRemoveDataMap"/>
- <post-load method-name="postLoadDataMap"/>
- </entity-listener>
</data-map>
