[seam-commits] Seam SVN: r14498 - in branches/community/Seam_2_3/jboss-seam-ioc: src/main/java/org/jboss/seam/ioc/spring and 1 other directory.

[seam-commits at lists.jboss.org]

Author: maschmid
Date: 2012-04-04 07:57:14 -0400 (Wed, 04 Apr 2012)
New Revision: 14498

Modified:
   branches/community/Seam_2_3/jboss-seam-ioc/pom.xml
   branches/community/Seam_2_3/jboss-seam-ioc/src/main/java/org/jboss/seam/ioc/spring/SeamManagedSessionFactoryBean.java
   branches/community/Seam_2_3/jboss-seam-ioc/src/main/java/org/jboss/seam/ioc/spring/SeamScope.java
Log:
Naive migration of seam-ioc to spring3.1 and hibernate4


Modified: branches/community/Seam_2_3/jboss-seam-ioc/pom.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-ioc/pom.xml	2012-04-04 02:46:59 UTC (rev 14497)
+++ branches/community/Seam_2_3/jboss-seam-ioc/pom.xml	2012-04-04 11:57:14 UTC (rev 14498)
@@ -13,11 +13,23 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework</groupId>
-			<artifactId>spring</artifactId>
+			<artifactId>spring-aop</artifactId>
 			<optional>true</optional>
 		</dependency>
 
 		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-orm</artifactId>
+			<optional>true</optional>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-web</artifactId>
+			<optional>true</optional>
+		</dependency>
+
+		<dependency>
 			<groupId>cglib</groupId>
 			<artifactId>cglib-nodep</artifactId>
 			<optional>true</optional>

Modified: branches/community/Seam_2_3/jboss-seam-ioc/src/main/java/org/jboss/seam/ioc/spring/SeamManagedSessionFactoryBean.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam-ioc/src/main/java/org/jboss/seam/ioc/spring/SeamManagedSessionFactoryBean.java	2012-04-04 02:46:59 UTC (rev 14497)
+++ branches/community/Seam_2_3/jboss-seam-ioc/src/main/java/org/jboss/seam/ioc/spring/SeamManagedSessionFactoryBean.java	2012-04-04 11:57:14 UTC (rev 14498)
@@ -17,7 +17,6 @@
 import org.jboss.seam.log.Logging;
 import org.springframework.beans.factory.annotation.Required;
 import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.springframework.orm.hibernate3.SessionFactoryUtils;
 import org.springframework.util.ClassUtils;
 
 /**
@@ -175,7 +174,7 @@
          {
             try
             {
-               return SessionFactoryUtils.doGetSession((SessionFactory) proxy, false);
+               return getSession();
             }
             catch (IllegalStateException ex)
             {

Modified: branches/community/Seam_2_3/jboss-seam-ioc/src/main/java/org/jboss/seam/ioc/spring/SeamScope.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam-ioc/src/main/java/org/jboss/seam/ioc/spring/SeamScope.java	2012-04-04 02:46:59 UTC (rev 14497)
+++ branches/community/Seam_2_3/jboss-seam-ioc/src/main/java/org/jboss/seam/ioc/spring/SeamScope.java	2012-04-04 11:57:14 UTC (rev 14498)
@@ -104,4 +104,9 @@
         }
         return bean;
     }
+
+   public Object resolveContextualObject(String key)
+   {
+      return null;
+   }
 }