X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=modules%2Fserver%2Forg.argeo.slc.webapp.war%2FWEB-INF%2FapplicationContext.xml;h=7a450578faf85d6f747cc6807064f7617038a4c1;hb=3f7517acb8c3d2d5e90ddee64a7a2890be301468;hp=703e681a76d30c8b7dbd47307cef1c74e745b5e7;hpb=25faa15e49f30510b365ba75646128b7e5a74586;p=gpl%2Fargeo-slc.git

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 703e681a7..7a450578f 100644
--- 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