From 2bad16d6d8e519692d3aa0abf00668a00da31ae3 Mon Sep 17 00:00:00 2001
From: Ulrik Sandberg <ulrik.sandberg@jayway.com>
Date: Wed, 17 Jan 2007 23:21:42 +0000
Subject: [PATCH] IN PROGRESS - issue LDAP-36:  Ldap Person example using
 OpenLDAP http://opensource.atlassian.com/projects/spring/browse/LDAP-36

---
 .../webapp/WEB-INF/applicationContext-acegi-security.xml  | 2 +-
 .../src/main/webapp/WEB-INF/applicationContext.xml        | 8 ++++----
 .../src/main/webapp/WEB-INF/jsp/includeBottom.jsp         | 3 +++
 .../src/main/webapp/WEB-INF/jsp/includeTop.jsp            | 1 +
 .../src/main/webapp/WEB-INF/ldap.properties               | 4 ++--
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/spring-ldap-person/src/main/webapp/WEB-INF/applicationContext-acegi-security.xml b/spring-ldap-person/src/main/webapp/WEB-INF/applicationContext-acegi-security.xml
index b1308006..81a9200e 100644
--- a/spring-ldap-person/src/main/webapp/WEB-INF/applicationContext-acegi-security.xml
+++ b/spring-ldap-person/src/main/webapp/WEB-INF/applicationContext-acegi-security.xml
@@ -72,7 +72,7 @@
 	<!-- =================================================================================== -->
 	
 	<bean id="contextFactory" class="org.acegisecurity.ldap.DefaultInitialDirContextFactory">
-		<constructor-arg value="ldap://localhost:389/dc=jayway,dc=se" />
+		<constructor-arg value="${url}/${base}" />
 	</bean>
 	
 	<bean id="ldapUserSearch" class="org.acegisecurity.ldap.search.FilterBasedLdapUserSearch">
diff --git a/spring-ldap-person/src/main/webapp/WEB-INF/applicationContext.xml b/spring-ldap-person/src/main/webapp/WEB-INF/applicationContext.xml
index e3ab2fed..1815416f 100644
--- a/spring-ldap-person/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/spring-ldap-person/src/main/webapp/WEB-INF/applicationContext.xml
@@ -13,7 +13,7 @@
 	<!-- Authenticate using a fixed user -->
 	<!--
 	<bean id="contextSource" class="org.springframework.ldap.core.support.LdapContextSource" >
-		<property name="urls" value="${urls}" />
+		<property name="url" value="${url}" />
 		<property name="base" value="${base}" />
 		<property name="userDn" value="${userDn}" />
 		<property name="password" value="${password}" />
@@ -23,7 +23,7 @@
 
 	<!-- Authenticate using the currently logged in user, retrieved by Acegi Security -->
 	<bean id="contextSource" class="org.springframework.ldap.core.support.LdapContextSource" >
-		<property name="urls" value="${urls}" />
+		<property name="url" value="${url}" />
 		<property name="base" value="${base}" />
 		<property name="authenticationSource" ref="acegiAuthenticationSource" />
 		<property name="dirObjectFactory" value="org.springframework.ldap.core.DefaultDirObjectFactory" />
@@ -50,8 +50,8 @@
 
 	<bean id="traditionalPersonDao"
 		class="org.springframework.ldap.samples.person.dao.TraditionalPersonDaoImpl">
-		<property name="url" value="ldap://localhost:389" />
-		<property name="base" value="dc=jayway,dc=se" />
+		<property name="url" value="${url}" />
+		<property name="base" value="${base}" />
 	</bean>
 
 	<bean id="dummyPersonDao"
diff --git a/spring-ldap-person/src/main/webapp/WEB-INF/jsp/includeBottom.jsp b/spring-ldap-person/src/main/webapp/WEB-INF/jsp/includeBottom.jsp
index 3bb24aba..f35f5ab4 100644
--- a/spring-ldap-person/src/main/webapp/WEB-INF/jsp/includeBottom.jsp
+++ b/spring-ldap-person/src/main/webapp/WEB-INF/jsp/includeBottom.jsp
@@ -1,3 +1,6 @@
+<br/>
+<a href="<c:url value="logoff.jsp"/>">Logoff</a> user <authz:authentication operation="username"/>
+
 <div id="copyright">
 	<p>&copy; Copyright 2002-2006, <a href="http://www.springframework.org">www.springframework.org</a>, under the terms of the Apache 2.0 software license.</p>
 </div>
diff --git a/spring-ldap-person/src/main/webapp/WEB-INF/jsp/includeTop.jsp b/spring-ldap-person/src/main/webapp/WEB-INF/jsp/includeTop.jsp
index 4500d28d..82701d00 100644
--- a/spring-ldap-person/src/main/webapp/WEB-INF/jsp/includeTop.jsp
+++ b/spring-ldap-person/src/main/webapp/WEB-INF/jsp/includeTop.jsp
@@ -4,6 +4,7 @@
 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
 <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+<%@ taglib prefix="authz" uri="http://acegisecurity.org/authz" %>
 
 <html>
 <head>
diff --git a/spring-ldap-person/src/main/webapp/WEB-INF/ldap.properties b/spring-ldap-person/src/main/webapp/WEB-INF/ldap.properties
index 70995985..d3dfc30a 100644
--- a/spring-ldap-person/src/main/webapp/WEB-INF/ldap.properties
+++ b/spring-ldap-person/src/main/webapp/WEB-INF/ldap.properties
@@ -1,4 +1,4 @@
-urls=ldap://127.0.0.1
-userDn=uid=admin,ou=system
+url=ldap://127.0.0.1
+userDn=cn=Manager,dc=jayway,dc=se
 password=secret
 base=dc=jayway,dc=se