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

[hlship]

Author: hlship
Date: Sat Aug 23 14:24:16 2008
New Revision: 688419

URL: http://svn.apache.org/viewvc?rev=688419&view=rev
Log:
TAPESTRY-2615: IOC autobuild conflict between org.hibernate.Session and the 
FullTextSession from the hibernate serach module

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=688419&r1=688418&r2=688419&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
 Sat Aug 23 14:24:16 2008
@@ -20,9 +20,11 @@
 import org.apache.tapestry5.ioc.*;
 import static org.apache.tapestry5.ioc.IOCConstants.PERTHREAD_SCOPE;
 import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.ioc.annotations.Local;
 import org.apache.tapestry5.ioc.annotations.Scope;
 import org.apache.tapestry5.ioc.annotations.Symbol;
 import org.apache.tapestry5.ioc.services.*;
+import org.apache.tapestry5.services.AliasContribution;
 import org.apache.tapestry5.services.ComponentClassTransformWorker;
 import org.apache.tapestry5.services.PersistentFieldStrategy;
 import org.apache.tapestry5.services.ValueEncoderFactory;
@@ -111,6 +113,11 @@
         return propertyShadowBuilder.build(sessionManager, "session", 
Session.class);
     }
 
+    public static void contributeAlias(Configuration<AliasContribution> 
configuration, @Local Session session)
+    {
+        configuration.add(AliasContribution.create(Session.class, session));
+    }
+
     public static HibernateSessionSource buildHibernateSessionSource(Logger 
logger, List<HibernateConfigurer> config,
                                                                      
RegistryShutdownHub hub)
     {
@@ -193,5 +200,4 @@
 
         configuration.add("CommitAfter", 
locator.autobuild(CommitAfterWorker.class), "after:Log");
     }
-
 }