You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by vk...@apache.org on 2008/09/25 16:09:11 UTC
svn commit: r698973 - in
/portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources:
assembly/security-ldap.xml conf/jetspeed/jetspeed.properties
Author: vkumar
Date: Thu Sep 25 07:09:11 2008
New Revision: 698973
URL: http://svn.apache.org/viewvc?rev=698973&view=rev
Log:
Moving LDAP props in Jetspeed.properties
Modified:
portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/security-ldap.xml
portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/conf/jetspeed/jetspeed.properties
Modified: portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/security-ldap.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/security-ldap.xml?rev=698973&r1=698972&r2=698973&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/security-ldap.xml (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/security-ldap.xml Thu Sep 25 07:09:11 2008
@@ -261,18 +261,32 @@
<bean id="LdapSpringContext" class="org.springframework.ldap.core.support.LdapContextSource">
<meta key="j2:cat" value="ldap" />
- <property name="url" value="ldap://localhost:389" />
- <property name="base" value="o=sevenSeas" />
- <property name="userDn" value="cn=admin,o=sevenSeas" />
- <property name="password" value="secret" />
+ <property name="url">
+ <value>${ldap.url}</value>
+ </property>
+ <property name="base">
+ <value>${ldap.base}</value>
+ </property>
+ <property name="userDn">
+ <value>${ldap.userDn}</value>
+ </property>
+ <property name="password">
+ <value>${ldap.password}</value>
+ </property>
</bean>
<bean id="ldapContext" class="org.apache.jetspeed.security.spi.impl.ldap.LdapContextProxy"
depends-on="LdapSpringContext">
<meta key="j2:cat" value="ldap" />
<constructor-arg index="0" ref="LdapSpringContext" />
- <constructor-arg index="1" value="com.sun.jndi.ldap.LdapCtxFactory" />
- <constructor-arg index="2" value="(objectclass=person)" />
- <constructor-arg index="3" value="2" />
+ <constructor-arg index="1">
+ <value>${ldap.context.factory}</value>
+ </constructor-arg>
+ <constructor-arg index="2">
+ <value>${ldap.user.filter}</value>
+ </constructor-arg>
+ <constructor-arg index="3">
+ <value>${ldap.search.scope}</value>
+ </constructor-arg>
</bean>
</beans>
\ No newline at end of file
Modified: portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/conf/jetspeed/jetspeed.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/conf/jetspeed/jetspeed.properties?rev=698973&r1=698972&r2=698973&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/conf/jetspeed/jetspeed.properties (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/conf/jetspeed/jetspeed.properties Thu Sep 25 07:09:11 2008
@@ -213,6 +213,17 @@
page.manager.constraints.security = true
#-------------------------------------------------------------------------
+# LDAP
+#-------------------------------------------------------------------------
+#defaults for LDAP
+ldap.url = ldap://localhost:389
+ldap.base =o=sevenSea
+ldap.userDn = cn=admin,o=sevenSeas
+ldap.password =secret
+ldap.context.factory=com.sun.jndi.ldap.LdapCtxFactory
+ldap.user.filter = (objectclass=person)
+ldap.search.scope = 2
+#-------------------------------------------------------------------------
# P R O F I L E R
#-------------------------------------------------------------------------
# default profiling rule names assigned to a new user
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org