Remove old transition files

[gpl/argeo-slc.git] / modules / server / org.argeo.slc.webapp.war / WEB-INF / applicationContext.xml

diff --git a/modules/server/org.argeo.slc.webapp.war/WEB-INF/applicationContext.xml b/modules/server/org.argeo.slc.webapp.war/WEB-INF/applicationContext.xml
index 703e681a76d30c8b7dbd47307cef1c74e745b5e7..7a450578faf85d6f747cc6807064f7617038a4c1 100644 (file)
--- a/modules/server/org.argeo.slc.webapp.war/WEB-INF/applicationContext.xml
+++ b/modules/server/org.argeo.slc.webapp.war/WEB-INF/applicationContext.xml
@@ -11,13 +11,18 @@
                <import resource="classpath:/org/argeo/slc/server/spring/jmx.xml" />
        -->
 
+       <!--
+               security.xml has to be before osgi.xml, otherwise namespace parsing
+               fails
+       -->
+       <import resource="security.xml" />
        <import resource="osgi.xml" />
 
-       <!-- Hibernate instrumentation-->
-       <bean id="osivInterceptor"
+       <!--
+               Hibernate instrumentation <bean id="osivInterceptor"
                class="org.springframework.orm.hibernate3.support.OpenSessionInViewInterceptor">
-               <property name="sessionFactory" ref="sessionFactory" />
-       </bean>
+               <property name="sessionFactory" ref="sessionFactory" /> </bean>
+       -->
 
 
        <!--  Properties -->
@@ -25,20 +30,17 @@
                class="org.springframework.web.context.support.ServletContextPropertyPlaceholderConfigurer"
                lazy-init="false">
                <property name="contextOverride" value="true" />
-               <property name="ignoreUnresolvablePlaceholders" value="true" />
        </bean>
 
-       <!-- Web Services transactions -->
-       <aop:config>
-               <aop:pointcut id="epMethods"
-                       expression="execution(* org.springframework.web.servlet.mvc.Controller.handleRequest(..))" />
+       <!--
+               Web Services transactions <aop:config> <aop:pointcut id="epMethods"
+               expression="execution(*
+               org.springframework.web.servlet.mvc.Controller.handleRequest(..))" />
                <aop:advisor advice-ref="epAdvice" pointcut-ref="epMethods" />
-       </aop:config>
-
-       <tx:advice id="epAdvice" transaction-manager="hibernateTransactionManager">
-               <tx:attributes>
-                       <tx:method name="*" propagation="REQUIRED" />
-               </tx:attributes>
-       </tx:advice>
+               </aop:config> <tx:advice id="epAdvice"
+               transaction-manager="hibernateTransactionManager"> <tx:attributes>
+               <tx:method name="*" propagation="REQUIRED" /> </tx:attributes>
+               </tx:advice>
+       -->
 
 </beans>
\ No newline at end of file