Enable security configuration from properties.

wise-webapp/src/main/webapp/WEB-INF/app.properties

@@ -100,7 +100,7 @@ google.analytics.account=UA-XXXX
 google.ads.enabled=false
 
 #######################################################################################
-Security Configuration Section
+# Authentication Configuration Section
 #######################################################################################
 
 # Two type of security are supported:

wise-webapp/src/main/webapp/WEB-INF/web.xml

@@ -22,6 +22,11 @@
         </param-value>
     </context-param>
 
+    <context-param>
+        <param-name>contextInitializerClasses</param-name>
+        <param-value>com.wisemapping.webmvc.ApplicationContextInitializer</param-value>
+    </context-param>
+
 
     <!--
       - Loads the root application context of this web app at startup.

wise-webapp/src/main/webapp/WEB-INF/wisemapping-security-db.xml

@@ -8,8 +8,6 @@
           http://www.springframework.org/schema/security
           http://www.springframework.org/schema/security/spring-security-3.1.xsd">
 
-    <bean id="encoder" class="com.wisemapping.security.CustomPasswordEncoder"/>
-
     <sec:authentication-manager alias="authenticationManager">
         <sec:authentication-provider ref="dbAuthenticationProvider"/>
         <sec:authentication-provider user-service-ref="userDetailsService"/>

wise-webapp/src/main/webapp/WEB-INF/wisemapping-security.xml

@@ -3,11 +3,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:sec="http://www.springframework.org/schema/security"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
           http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
-          http://www.springframework.org/schema/context
-		  http://www.springframework.org/schema/context/spring-context-3.1.xsd
           http://www.springframework.org/schema/security
           http://www.springframework.org/schema/security/spring-security-3.1.xsd">
 
@@ -56,9 +53,9 @@
         <sec:logout logout-url="/c/logout" invalidate-session="true" logout-success-url="/c/login"/>
     </sec:http>
 
-    <!--<import resource="wisemapping-security-${security.type}.xml"/>-->
-    <import resource="wisemapping-security-db.xml"/>
-    <!--<import resource="wisemapping-security-ldap.xml"/>-->
+    <bean id="encoder" class="com.wisemapping.security.CustomPasswordEncoder"/>
+
+    <import resource="wisemapping-security-${security.type}.xml"/>
 
     <bean id="userDetailsService" class="com.wisemapping.security.UserDetailsService">
         <property name="userService" ref="userService"/>