svn commit: r883313 - in /cayenne/main/branches/STABLE-3.0/framework: cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/LifecycleCallbackRegistry.java cayenne-tools/src/main/java/org/apache/cayenne/gen/ClientClassGenerationAction.java

[andrey]

Author: andrey
Date: Mon Nov 23 11:54:10 2009
New Revision: 883313

URL: http://svn.apache.org/viewvc?rev=883313&view=rev
Log:
important syncs from trunk

Modified:
    
cayenne/main/branches/STABLE-3.0/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/LifecycleCallbackRegistry.java
    
cayenne/main/branches/STABLE-3.0/framework/cayenne-tools/src/main/java/org/apache/cayenne/gen/ClientClassGenerationAction.java

Modified: 
cayenne/main/branches/STABLE-3.0/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/LifecycleCallbackRegistry.java
URL: 
http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.0/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/LifecycleCallbackRegistry.java?rev=883313&r1=883312&r2=883313&view=diff
==============================================================================
--- 
cayenne/main/branches/STABLE-3.0/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/LifecycleCallbackRegistry.java
 (original)
+++ 
cayenne/main/branches/STABLE-3.0/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/LifecycleCallbackRegistry.java
 Mon Nov 23 11:54:10 2009
@@ -99,6 +99,7 @@
      */
     public void addListener(Class<?> entityClass, LifecycleListener listener) {
         addListener(LifecycleEvent.POST_ADD, entityClass, listener, "postAdd");
+        addListener(LifecycleEvent.PRE_PERSIST, entityClass, listener, 
"prePersist");
         addListener(LifecycleEvent.POST_PERSIST, entityClass, listener, 
"postPersist");
         addListener(LifecycleEvent.PRE_REMOVE, entityClass, listener, 
"preRemove");
         addListener(LifecycleEvent.POST_REMOVE, entityClass, listener, 
"postRemove");

Modified: 
cayenne/main/branches/STABLE-3.0/framework/cayenne-tools/src/main/java/org/apache/cayenne/gen/ClientClassGenerationAction.java
URL: 
http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.0/framework/cayenne-tools/src/main/java/org/apache/cayenne/gen/ClientClassGenerationAction.java?rev=883313&r1=883312&r2=883313&view=diff
==============================================================================
--- 
cayenne/main/branches/STABLE-3.0/framework/cayenne-tools/src/main/java/org/apache/cayenne/gen/ClientClassGenerationAction.java
 (original)
+++ 
cayenne/main/branches/STABLE-3.0/framework/cayenne-tools/src/main/java/org/apache/cayenne/gen/ClientClassGenerationAction.java
 Mon Nov 23 11:54:10 2009
@@ -31,9 +31,9 @@
     public static final String SUBCLASS_TEMPLATE = 
"dotemplates/v1_2/client-subclass.vm";
     public static final String SUPERCLASS_TEMPLATE = 
"dotemplates/v1_2/client-superclass.vm";
     
-    public static final String DMAP_SINGLE_CLASS_TEMPLATE = 
"dotemplates/v1_2/datamap-singleclass.vm";
-    public static final String DMAP_SUBCLASS_TEMPLATE = 
"dotemplates/v1_2/datamap-subclass.vm";
-    public static final String DMAP_SUPERCLASS_TEMPLATE = 
"dotemplates/v1_2/datamap-superclass.vm";
+    public static final String DMAP_SINGLE_CLASS_TEMPLATE = 
"dotemplates/v1_2/client-datamap-singleclass.vm";
+    public static final String DMAP_SUBCLASS_TEMPLATE = 
"dotemplates/v1_2/client-datamap-subclass.vm";
+    public static final String DMAP_SUPERCLASS_TEMPLATE = 
"dotemplates/v1_2/client-datamap-superclass.vm";
     
     public static final String CLIENT_SUPERCLASS_PREFIX = "_Client";