vmario/wisemapping-open-source
1
0
Fork 0
mirror of https://bitbucket.org/wisemapping/wisemapping-open-source.git synced 2024-11-22 14:17:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Minor fixes

Browse Source 
Update Spring 3.1.3 fixed.
This commit is contained in:
Paulo Gustavo Veiga 2013-02-17 21:26:42 -03:00
parent 3ff67910c9
commit cb6828c08e
4 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wise-webapp/pom.xml
View File

@ -28,7 +28,7 @@
</repositories> </repositories>
<properties> <properties>
<org.springframework.version>3.1.2.RELEASE</org.springframework.version> <org.springframework.version>3.1.3.RELEASE</org.springframework.version>
</properties> </properties>
<dependencies> <dependencies>

11
wise-webapp/src/main/webapp/WEB-INF/app.properties
View File

@ -100,9 +100,15 @@ google.analytics.account=UA-XXXX
google.ads.enabled=false google.ads.enabled=false
####################################################################################### #######################################################################################
LDAP Configuration Section Security Configuration Section
####################################################################################### #######################################################################################
security.ldap.enabled=false
# Two type of security are supported:
# - db: User are stored in the database. Registration is required in advance.
# - ldap: Authentication takes place using a LDAP. In this case, security.ldap.* must be configured.
security.type=db
# LDAP Configuration properties.
security.ldap.server=ldap://localhost:389 security.ldap.server=ldap://localhost:389
security.ldap.server.user=cn=pveiga,dc=wisemapping,dc=com security.ldap.server.user=cn=pveiga,dc=wisemapping,dc=com
security.ldap.server.password=password security.ldap.server.password=password
@ -110,7 +116,6 @@ security.ldap.server.password=password
security.ldap.basedn=dc=wisemapping,dc=com security.ldap.basedn=dc=wisemapping,dc=com
security.ldap.subDn=people security.ldap.subDn=people
security.ldap.auth.attribute=mail security.ldap.auth.attribute=mail
#######################################################################################

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

@ -8,6 +8,8 @@
http://www.springframework.org/schema/security http://www.springframework.org/schema/security
http://www.springframework.org/schema/security/spring-security-3.1.xsd"> 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-manager alias="authenticationManager">
<sec:authentication-provider ref="dbAuthenticationProvider"/> <sec:authentication-provider ref="dbAuthenticationProvider"/>
<sec:authentication-provider user-service-ref="userDetailsService"/> <sec:authentication-provider user-service-ref="userDetailsService"/>

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

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