[Opentaps-crmcommits] [portal commits] r94 - in trunk/bundles: persistence/src/main/resources/META-INF/spring webshell/src/main/resources/META-INF/spring

[<jwi...@ea...>]

Author: jwickers
Date: 2010-03-31 15:37:33 -0700 (Wed, 31 Mar 2010)
New Revision: 94

Modified:
   trunk/bundles/persistence/src/main/resources/META-INF/spring/bundle-context-osgi.xml
   trunk/bundles/persistence/src/main/resources/META-INF/spring/bundle-context.xml
   trunk/bundles/webshell/src/main/resources/META-INF/spring/bundle-context.xml
Log:
Remove unused reference to transaction manager.

Modified: trunk/bundles/persistence/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
--- trunk/bundles/persistence/src/main/resources/META-INF/spring/bundle-context-osgi.xml	2010-03-31 22:24:32 UTC (rev 93)
+++ trunk/bundles/persistence/src/main/resources/META-INF/spring/bundle-context-osgi.xml	2010-03-31 22:37:33 UTC (rev 94)
@@ -8,9 +8,5 @@
   <osgi:service ref="dynamicSessionConfiguration"
                 interface="org.opentaps.core.persistence.session.DynamicSessionConfiguration">
   </osgi:service>
-
-  <!-- osgi:service ref="transactionManager"
-       interface="org.springframework.orm.hibernate3.HibernateTransactionManager">
-       </osgi:service -->
   
 </beans>

Modified: trunk/bundles/persistence/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
--- trunk/bundles/persistence/src/main/resources/META-INF/spring/bundle-context.xml	2010-03-31 22:24:32 UTC (rev 93)
+++ trunk/bundles/persistence/src/main/resources/META-INF/spring/bundle-context.xml	2010-03-31 22:37:33 UTC (rev 94)
@@ -60,7 +60,5 @@
               depends-on="dynamicSessionConfiguration">
           <property name="configuration" ref="dynamicSessionConfiguration"/>
         </bean>
-	
-        <tx:annotation-driven transaction-manager="transactionManager" proxy-target-class="true" />
 
 </beans>

Modified: trunk/bundles/webshell/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
--- trunk/bundles/webshell/src/main/resources/META-INF/spring/bundle-context.xml	2010-03-31 22:24:32 UTC (rev 93)
+++ trunk/bundles/webshell/src/main/resources/META-INF/spring/bundle-context.xml	2010-03-31 22:37:33 UTC (rev 94)
@@ -21,15 +21,5 @@
   
   <bean id="dynamicSessionConfigurationListener" class="org.opentaps.bundle.webshell.persistence.config.DynamicSessionConfigurationListener">
   </bean>
-  
-  <!-- Things fall apart when I add a transaction manager into the mix... 
-       The transaction manager seems to keep holding on to it's old session factory 
-       and never learn about the new classes added to the repository -->
-  <bean id="transactionManager"
-        class="org.springframework.orm.hibernate3.HibernateTransactionManager">
-    <property name="sessionFactory" ref="dynamicSessionFactory" />
-  </bean>
 
-  <tx:annotation-driven transaction-manager="transactionManager" proxy-target-class="true" />
-
 </beans>