Author: mraible
Date: Mon Oct 22 21:53:54 2007
New Revision: 587388
URL: http://svn.apache.org/viewvc?rev=587388&view=rev
Log:
Updated LDAP configuration to use Spring 1.2 syntax
Modified:
roller/trunk/apps/weblogger/web/WEB-INF/security.xml
Modified: roller/trunk/apps/weblogger/web/WEB-INF/security.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/security.xml?rev=587388&r1=587387&r2=587388&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/security.xml (original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/security.xml Mon Oct 22 21:53:54
2007
@@ -72,53 +72,32 @@
<!-- BEGIN: Sample LDAP/RollerDB hybrid security configuration
- <bean id="initialDirContextFactory"
class="org.acegisecurity.ldap.DefaultInitialDirContextFactory">
- <constructor-arg value="LDAP_URL"/>
- <property name="managerDn">
- <value>cn=LDAP_USERNAME</value>
- </property>
- <property name="managerPassword">
- <value>LDAP_PASSWORD</value>
- </property>
+ <bean id="initialDirContextFactory"
class="org.acegisecurity.ldap.DefaultInitialDirContextFactory">
+ <constructor-arg value="LDAP_URL"/>
+ <property name="managerDn" value="LDAP_USERNAME"/>
+ <property name="managerPassword" value="LDAP_PASSWORD"/>
</bean>
<bean id="ldapUserSearch"
class="org.acegisecurity.ldap.search.FilterBasedLdapUserSearch">
- <constructor-arg index="0">
- <value></value>
- </constructor-arg>
- <constructor-arg index="1">
- <value>uid={0}</value>
- </constructor-arg>
- <constructor-arg index="2">
- <ref local="initialDirContextFactory" />
- </constructor-arg>
- <property name="searchSubtree">
- <value>true</value>
- </property>
+ <constructor-arg index="0" value=""/>
+ <constructor-arg index="1" value="uid={0}"/>
+ <constructor-arg index="2" ref="initialDirContextFactory"/>
+ <property name="searchSubtree" value="true"/>
</bean>
- <bean id="ldapAuthProvider"
-
class="org.acegisecurity.providers.ldap.LdapAuthenticationProvider">
- <constructor-arg>
- <bean
class="org.acegisecurity.providers.ldap.authenticator.BindAuthenticator">
- <constructor-arg><ref
local="initialDirContextFactory"/></constructor-arg>
- <property name="userSearch"><ref
bean="ldapUserSearch"/></property>
- </bean>
- </constructor-arg>
- <constructor-arg><ref
local="jdbcAuthoritiesPopulator"/></constructor-arg>
- <property name="userCache" ref="userCache"/>
+ <bean id="ldapAuthProvider"
class="org.acegisecurity.providers.ldap.LdapAuthenticationProvider">
+ <constructor-arg>
+ <bean
class="org.acegisecurity.providers.ldap.authenticator.BindAuthenticator">
+ <constructor-arg ref="initialDirContextFactory"/>
+ <property name="userSearch" ref="ldapUserSearch"/>
+ </bean>
+ </constructor-arg>
+ <constructor-arg ref="jdbcAuthoritiesPopulator"/>
+ <property name="userCache" ref="userCache"/>
</bean>
<bean id="jdbcAuthoritiesPopulator"
class="org.apache.roller.weblogger.ui.core.security.AuthoritiesPopulator">
- <property name="dataSource">
- <bean class="org.springframework.jndi.JndiObjectFactoryBean">
- <property name="jndiName" value="java:comp/env/jdbc/rollerdb"/>
- </bean>
- </property>
- <property name="authoritiesByUsernameQuery">
- <value>SELECT username,rolename FROM userrole WHERE username =
?</value>
- </property>
- <property name="defaultRole"><value>register</value></property>
+ <property name="defaultRole" value="register"/>
</bean>
-->
<!-- END Sample LDAP/RollerDB hybrid security configuration -->
