LDAP-247: Using Spring Security and Spring LDAP together requires that BaseLdapPathBeanPostProcessor implements interface Ordered

BaseLdapPathBeanPostProcessor now implements Ordered.
Integration test from original issue comments to verify that the change fixes the problem.

test/integration-tests/src/main/java/org/springframework/ldap/itest/LdapGroupDao.java

@@ -0,0 +1,27 @@
+package org.springframework.ldap.itest;
+
+import org.springframework.ldap.core.DistinguishedName;
+import org.springframework.ldap.core.support.BaseLdapPathAware;
+
+import javax.naming.Name;
+
+/**
+ *
+ * @author Mattias Hellborg Arthursson
+ */
+public class LdapGroupDao implements BaseLdapPathAware
+{
+    private Name basePath;
+
+    public LdapGroupDao() {
+        super();
+    }
+
+    public void setBaseLdapPath(DistinguishedName baseLdapPath) {
+        this.basePath = baseLdapPath;
+    }
+
+    public Name getBasePath() {
+        return basePath;
+    }
+}

test/integration-tests/src/main/java/org/springframework/ldap/itest/support/springsecurity/MethodSecurityExpressionHandler.java

@@ -0,0 +1,20 @@
+package org.springframework.ldap.itest.support.springsecurity;
+
+import org.springframework.ldap.itest.LdapGroupDao;
+import org.springframework.security.access.expression.method.DefaultMethodSecurityExpressionHandler;
+
+/**
+ * @author Mattias Hellborg Arthursson
+ */
+public class MethodSecurityExpressionHandler extends DefaultMethodSecurityExpressionHandler {
+    private LdapGroupDao groupDao;
+
+    public LdapGroupDao getGroupDao() {
+        return groupDao;
+    }
+
+    public void setGroupDao(LdapGroupDao groupDao) {
+        this.groupDao = groupDao;
+    }
+
+}

test/integration-tests/src/test/java/org/springframework/ldap/integration/JiraLdap247ITest.java

@@ -0,0 +1,49 @@
+/*
+ * Copyright 2005-2010 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.ldap.integration;
+
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.ldap.AbstractLdapTemplateIntegrationTest;
+import org.springframework.ldap.itest.LdapGroupDao;
+import org.springframework.test.context.ContextConfiguration;
+
+import static org.junit.Assert.assertNotNull;
+
+/**
+ * Tests for https://jira.springsource.org/browse/LDAP-247.
+ * Thanks to Jürgen Failenschmid for spotting the problem and providing the code for testing this.
+ * 
+ * @author Mattias Hellborg Arthursson
+ */
+@ContextConfiguration(locations = { "/conf/ldap-247-testContext.xml" })
+public class JiraLdap247ITest extends AbstractLdapTemplateIntegrationTest {
+
+    @Autowired
+    private LdapGroupDao ldapGroupDao;
+
+    @Test
+    public void verifyThatBasePathIsProperlyPopulated() {
+        assertNotNull(ldapGroupDao);
+
+        // The base path should be automatically populated by BaseLdapPathBeanPostProcessor,
+        // but it doesn't unless it implements Ordered, which caused the assertion below to fail.
+        assertNotNull(
+                "Base path has not been populated by BaseLdapPathBeanPostProcessor",
+                ldapGroupDao.getBasePath());
+    }
+}

test/integration-tests/src/test/resources/conf/ldap-247-testContext.xml

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-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"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+    http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.0.xsd">
+
+    <import resource="classpath:/conf/commonTestContext.xml"/>
+
+    <bean id="contextSource"
+          class="org.springframework.ldap.test.TestContextSourceFactoryBean">
+        <property name="defaultPartitionSuffix" value="dc=jayway,dc=se" />
+        <property name="defaultPartitionName" value="jayway" />
+        <property name="principal" value="${userDn}" />
+        <property name="password" value="${password}" />
+        <property name="ldifFile" value="classpath:/setup_data.ldif" />
+        <property name="port" value="1888" />
+        <property name="pooled" value="false" />
+    </bean>
+
+    <sec:ldap-server url="${urls}" />
+    <sec:authentication-manager>
+        <sec:ldap-authentication-provider
+                group-search-filter="member={0}"
+                group-search-base="ou=groups"
+                user-search-base="ou=people"
+                user-search-filter="uid={0}"
+                />
+    </sec:authentication-manager>
+
+    <bean id="baseLdapPathBeanPostProcessor"
+          class="org.springframework.ldap.core.support.BaseLdapPathBeanPostProcessor"/>
+
+    <!-- This prevents BaseLdapPathBeanPostProcessor from being applied unless it implements Ordered -->
+
+    <sec:global-method-security pre-post-annotations="enabled">
+        <sec:expression-handler ref="accessExpressionHandler"/>
+    </sec:global-method-security>
+
+    <bean id="accessExpressionHandler" class="org.springframework.ldap.itest.support.springsecurity.MethodSecurityExpressionHandler">
+        <property name="groupDao" ref="groupDao"/>
+    </bean>
+
+    <bean id="groupDao" class="org.springframework.ldap.itest.LdapGroupDao"/>
+</beans>