Author: hlship
Date: Mon Oct 13 16:50:14 2008
New Revision: 704287
URL: http://svn.apache.org/viewvc?rev=704287&view=rev
Log:
TAP5-230: Defining a service that implements the HibernateConfigurer service
causes injection exceptions (due to the ambiguity)
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=704287&r1=704286&r2=704287&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
Mon Oct 13 16:50:14 2008
@@ -126,15 +126,12 @@
}
/**
- * Adds the following configurers: <ul> <li>Default - performs default
hibernate configuration</li> <li>PackageName
- * - loads entities by package name</li> </ul>
- * <p/>
- * Note: if another service implementing [EMAIL PROTECTED]
org.apache.tapestry5.hibernate.HibernateConfigurer} is defined, then
- * an contribution to the [EMAIL PROTECTED]
org.apache.tapestry5.services.Alias} service will be necessary to disambiguate.
+ * Adds the following configurers: <dl> <dt>Default <dd> performs default
hibernate configuration <dt>PackageName
+ * <dd> loads entities by package name</dl>
*/
public static void
contributeHibernateSessionSource(OrderedConfiguration<HibernateConfigurer>
config,
- HibernateConfigurer
defaultHibernateConfigurer,
+ @Local
HibernateConfigurer defaultHibernateConfigurer,
ObjectLocator locator)
{