svn commit: r1149416 - /tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry5/hibernate/HibernateModule.java

[hl...@apache.org]

Author: hlship
Date: Fri Jul 22 00:22:46 2011
New Revision: 1149416

URL: http://svn.apache.org/viewvc?rev=1149416&view=rev
Log:
TAP5-1508: Contributions to CCTW2 must be qualified with @Primary when using @Contribute, to avoid collision with MetaWorker service

Modified:
    tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry5/hibernate/HibernateModule.java

Modified: tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry5/hibernate/HibernateModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry5/hibernate/HibernateModule.java?rev=1149416&r1=1149415&r2=1149416&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry5/hibernate/HibernateModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry5/hibernate/HibernateModule.java Fri Jul 22 00:22:46 2011
@@ -27,6 +27,7 @@ import org.apache.tapestry5.ioc.LoggerSo
 import org.apache.tapestry5.ioc.MappedConfiguration;
 import org.apache.tapestry5.ioc.OrderedConfiguration;
 import org.apache.tapestry5.ioc.annotations.Contribute;
+import org.apache.tapestry5.ioc.annotations.Primary;
 import org.apache.tapestry5.ioc.annotations.Symbol;
 import org.apache.tapestry5.ioc.services.PropertyAccess;
 import org.apache.tapestry5.ioc.services.ServiceOverride;
@@ -173,6 +174,7 @@ public class HibernateModule
      * {@link org.apache.tapestry5.hibernate.annotations.CommitAfter} annotation.
      */
     @Contribute(ComponentClassTransformWorker2.class)
+    @Primary
     public static void provideCommitAfterAnnotationSupport(
             OrderedConfiguration<ComponentClassTransformWorker2> configuration)
     {