Move to the root the bundles which will be part of v1.4 and v2.2

[lgpl/argeo-commons.git] / security / modules / org.argeo.security.webapp / WEB-INF / applicationContext.xml

diff --git a/security/modules/org.argeo.security.webapp/WEB-INF/applicationContext.xml b/security/modules/org.argeo.security.webapp/WEB-INF/applicationContext.xml
index 2ad009d2b42a6753790b59099d446573cdc3682b..899afa3128f1cd43d1751959f8a851b7072e3faf 100644 (file)
--- a/security/modules/org.argeo.security.webapp/WEB-INF/applicationContext.xml
+++ b/security/modules/org.argeo.security.webapp/WEB-INF/applicationContext.xml
@@ -7,11 +7,7 @@
        http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
        http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
 
-       <!--
-               <import resource="classpath:/org/argeo/slc/server/spring/jmx.xml" />
-       -->
        <import resource="security.xml" />
-
        <import resource="osgi.xml" />
 
        <!--  Properties -->
@@ -19,6 +15,5 @@
                class="org.springframework.web.context.support.ServletContextPropertyPlaceholderConfigurer"
                lazy-init="false">
                <property name="contextOverride" value="true" />
-               <property name="ignoreUnresolvablePlaceholders" value="true" />
        </bean>
 </beans>
\ No newline at end of file