You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2013/11/23 15:26:55 UTC
svn commit: r1544808 - in /openmeetings:
branches/2.x/WebContent/WEB-INF/openmeetings-applicationContext.xml
trunk/singlewebapp/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml
Author: solomax
Date: Sat Nov 23 14:26:55 2013
New Revision: 1544808
URL: http://svn.apache.org/r1544808
Log:
Duplicated bean is removed from bean definition list
Modified:
openmeetings/branches/2.x/WebContent/WEB-INF/openmeetings-applicationContext.xml
openmeetings/trunk/singlewebapp/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml
Modified: openmeetings/branches/2.x/WebContent/WEB-INF/openmeetings-applicationContext.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.x/WebContent/WEB-INF/openmeetings-applicationContext.xml?rev=1544808&r1=1544807&r2=1544808&view=diff
==============================================================================
--- openmeetings/branches/2.x/WebContent/WEB-INF/openmeetings-applicationContext.xml (original)
+++ openmeetings/branches/2.x/WebContent/WEB-INF/openmeetings-applicationContext.xml Sat Nov 23 14:26:55 2013
@@ -34,9 +34,6 @@
<bean class="org.springframework.orm.jpa.support.PersistenceAnnotationBeanPostProcessor" />
- <bean id="jpaTransactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
- <property name="entityManagerFactory" ref="entityManagerFactory" />
- </bean>
<bean id="multipartResolver" class="org.springframework.web.multipart.commons.CommonsMultipartResolver" />
<!-- Configures the @Controller programming model -->
<mvc:annotation-driven />
Modified: openmeetings/trunk/singlewebapp/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml?rev=1544808&r1=1544807&r2=1544808&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml (original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml Sat Nov 23 14:26:55 2013
@@ -34,9 +34,6 @@
<bean class="org.springframework.orm.jpa.support.PersistenceAnnotationBeanPostProcessor" />
- <bean id="jpaTransactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
- <property name="entityManagerFactory" ref="entityManagerFactory" />
- </bean>
<bean id="multipartResolver" class="org.springframework.web.multipart.commons.CommonsMultipartResolver" />
<!-- Configures the @Controller programming model -->
<mvc:annotation-driven />