svn commit: r516964 - in /tapestry/tapestry5/tapestry-hibernate/trunk: cobertura.ser src/main/java/org/apache/tapestry/hibernate/HibernateModule.java src/test/java/org/apache/tapestry/internal/hibernate/HibernateSessionSourceImplTest.java

[hl...@apache.org]

Author: hlship
Date: Sun Mar 11 10:29:29 2007
New Revision: 516964

URL: http://svn.apache.org/viewvc?view=rev&rev=516964
Log:
TAPESTRY-1339: Merge changes into trunk

Removed:
    tapestry/tapestry5/tapestry-hibernate/trunk/cobertura.ser
Modified:
    tapestry/tapestry5/tapestry-hibernate/trunk/src/main/java/org/apache/tapestry/hibernate/HibernateModule.java
    tapestry/tapestry5/tapestry-hibernate/trunk/src/test/java/org/apache/tapestry/internal/hibernate/HibernateSessionSourceImplTest.java

Modified: tapestry/tapestry5/tapestry-hibernate/trunk/src/main/java/org/apache/tapestry/hibernate/HibernateModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-hibernate/trunk/src/main/java/org/apache/tapestry/hibernate/HibernateModule.java?view=diff&rev=516964&r1=516963&r2=516964
==============================================================================
--- tapestry/tapestry5/tapestry-hibernate/trunk/src/main/java/org/apache/tapestry/hibernate/HibernateModule.java (original)
+++ tapestry/tapestry5/tapestry-hibernate/trunk/src/main/java/org/apache/tapestry/hibernate/HibernateModule.java Sun Mar 11 10:29:29 2007
@@ -21,8 +21,6 @@
 import org.apache.tapestry.internal.hibernate.HibernateSessionSourceImpl;
 import org.apache.tapestry.internal.services.ComponentClassLocator;
 import org.apache.tapestry.ioc.Configuration;
-import org.apache.tapestry.ioc.annotations.Contribute;
-import org.apache.tapestry.ioc.annotations.Id;
 import org.apache.tapestry.ioc.annotations.Inject;
 import org.apache.tapestry.ioc.annotations.InjectService;
 import org.apache.tapestry.ioc.annotations.Lifecycle;
@@ -33,7 +31,6 @@
 import org.hibernate.Session;
 import org.hibernate.Transaction;
 
-@Id("tapestry.hibernate")
 public class HibernateModule
 {
     /**
@@ -42,7 +39,7 @@
      */
     public static HibernateSessionSource buildHibernateSessionSource(Log log,
 
-    @InjectService("tapestry.internal.ComponentClassLocator")
+    @InjectService("ComponentClassLocator")
     ComponentClassLocator classLocator,
 
     Collection<String> packageNames)
@@ -70,7 +67,7 @@
             @InjectService("HibernateSessionSource")
             HibernateSessionSource sessionSource,
 
-            @InjectService("tapestry.ThreadCleanupHub")
+            @InjectService("ThreadCleanupHub")
             ThreadCleanupHub threadCleanupHub)
     {
         HibernateSessionManagerImpl service = new HibernateSessionManagerImpl(sessionSource);
@@ -83,7 +80,7 @@
     public static Session buildSession(@InjectService("HibernateSessionManager")
     HibernateSessionManager sessionManager,
 
-    @InjectService("tapestry.ioc.PropertyShadowBuilder")
+    @InjectService("PropertyShadowBuilder")
     PropertyShadowBuilder propertyShadowBuilder)
     {
         // Here's the thing: the tapestry.hibernate.Session class doesn't have to be per-thread,
@@ -105,7 +102,6 @@
      * Contributes the "session" property (type {@link Session}), the Hibernate Session for the
      * current request.
      */
-    @Contribute("tapestry.Infrastructure")
     public static void contributeInfrastructure(
             Configuration<InfrastructureContribution> configuration,
 

Modified: tapestry/tapestry5/tapestry-hibernate/trunk/src/test/java/org/apache/tapestry/internal/hibernate/HibernateSessionSourceImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-hibernate/trunk/src/test/java/org/apache/tapestry/internal/hibernate/HibernateSessionSourceImplTest.java?view=diff&rev=516964&r1=516963&r2=516964
==============================================================================
--- tapestry/tapestry5/tapestry-hibernate/trunk/src/test/java/org/apache/tapestry/internal/hibernate/HibernateSessionSourceImplTest.java (original)
+++ tapestry/tapestry5/tapestry-hibernate/trunk/src/test/java/org/apache/tapestry/internal/hibernate/HibernateSessionSourceImplTest.java Sun Mar 11 10:29:29 2007
@@ -15,7 +15,6 @@
 package org.apache.tapestry.internal.hibernate;
 
 import java.util.Collection;
-import java.util.Collections;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;