Author: solomax
Date: Sat Nov 23 14:42:07 2013
New Revision: 1544811
URL: http://svn.apache.org/r1544811
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=1544811&r1=1544810&r2=1544811&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:42:07 2013
@@ -38,7 +38,7 @@
<!-- Configures the @Controller programming model -->
<mvc:annotation-driven />
- <tx:annotation-driven transaction-manager="jpaTransactionManager"
proxy-target-class="true" />
+ <tx:annotation-driven transaction-manager="transactionManager"
proxy-target-class="true" />
<context:annotation-config />
<context:component-scan base-package="org.apache.openmeetings" />
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=1544811&r1=1544810&r2=1544811&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:42:07 2013
@@ -38,7 +38,7 @@
<!-- Configures the @Controller programming model -->
<mvc:annotation-driven />
- <tx:annotation-driven transaction-manager="jpaTransactionManager"
proxy-target-class="true" />
+ <tx:annotation-driven transaction-manager="transactionManager"
proxy-target-class="true" />
<context:annotation-config />
<context:component-scan base-package="org.apache.openmeetings" />
