Moved everything from mvn-build to trunk root.

test/integration-tests-openldap/src/main/java/org/springframework/ldap/AbstractEc2InstanceLaunchingFactoryBean.java

@@ -0,0 +1,97 @@
+package org.springframework.ldap;
+
+import java.util.Collections;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.beans.factory.config.AbstractFactoryBean;
+import org.springframework.util.Assert;
+
+import com.xerox.amazonws.ec2.Jec2;
+import com.xerox.amazonws.ec2.LaunchConfiguration;
+import com.xerox.amazonws.ec2.ReservationDescription;
+import com.xerox.amazonws.ec2.ReservationDescription.Instance;
+
+public abstract class AbstractEc2InstanceLaunchingFactoryBean extends AbstractFactoryBean {
+	private static final int SLEEP_TIME = 1000;
+
+	private static final Log log = LogFactory.getLog(AbstractEc2InstanceLaunchingFactoryBean.class);
+
+	private String imageName;
+
+	private String awsKey;
+
+	private String awsSecretKey;
+
+	private String keyName;
+
+	private String groupName;
+
+	private Instance instance;
+
+	public void setImageName(String imageName) {
+		this.imageName = imageName;
+	}
+
+	public void setAwsKey(String awsKey) {
+		this.awsKey = awsKey;
+	}
+
+	public void setAwsSecretKey(String awsSecretKey) {
+		this.awsSecretKey = awsSecretKey;
+	}
+
+	public void setKeyName(String keyName) {
+		this.keyName = keyName;
+	}
+
+	public void setGroupName(String groupName) {
+		this.groupName = groupName;
+	}
+
+	@Override
+	protected final Object createInstance() throws Exception {
+		Assert.hasLength(imageName, "ImageName must be set");
+		Assert.hasLength(awsKey, "AwsKey must be set");
+		Assert.hasLength(awsSecretKey, "AwsSecretKey must be set");
+		Assert.hasLength(keyName, "KeyName must be set");
+		Assert.hasLength(groupName, "GroupName must be set");
+
+		log.info("Launching EC2 instance for image: " + imageName);
+
+		Jec2 jec2 = new Jec2(awsKey, awsSecretKey);
+		LaunchConfiguration launchConfiguration = new LaunchConfiguration(imageName);
+		launchConfiguration.setKeyName(keyName);
+		launchConfiguration.setSecurityGroup(Collections.singletonList(groupName));
+
+		ReservationDescription reservationDescription = jec2.runInstances(launchConfiguration);
+		instance = reservationDescription.getInstances().get(0);
+		while (!instance.isRunning() && !instance.isTerminated()) {
+			log.info("Instance still starting up; sleeping " + SLEEP_TIME + "ms");
+			Thread.sleep(SLEEP_TIME);
+			reservationDescription = jec2.describeInstances(Collections.singletonList(instance.getInstanceId())).get(0);
+			instance = reservationDescription.getInstances().get(0);
+		}
+
+		if (instance.isRunning()) {
+			log.info("EC2 instance is now running");
+			return doCreateInstance(instance.getDnsName());
+		}
+		else {
+			throw new IllegalStateException("Failed to start a new instance");
+		}
+
+	}
+
+	protected abstract Object doCreateInstance(String dnsName) throws Exception;
+
+	@Override
+	protected void destroyInstance(Object ignored) throws Exception {
+		if (this.instance != null) {
+			log.info("Shutting down instance");
+			Jec2 jec2 = new Jec2(awsKey, awsSecretKey);
+			jec2.terminateInstances(Collections.singletonList(this.instance.getInstanceId()));
+		}
+
+	}
+}

test/integration-tests-openldap/src/main/java/org/springframework/ldap/ContextSourceEc2InstanceLaunchingFactoryBean.java

@@ -0,0 +1,54 @@
+package org.springframework.ldap;
+
+import org.springframework.ldap.core.ContextSource;
+import org.springframework.ldap.core.support.LdapContextSource;
+
+public class ContextSourceEc2InstanceLaunchingFactoryBean extends AbstractEc2InstanceLaunchingFactoryBean {
+
+	private String base;
+
+	private String userDn;
+
+	private String password;
+
+	@Override
+	public final Class getObjectType() {
+		return ContextSource.class;
+	}
+
+	@Override
+	protected final Object doCreateInstance(final String dnsName) throws Exception {
+		LdapContextSource instance = new LdapContextSource();
+		instance.setUrl("ldap://" + dnsName);
+		instance.setUserDn(userDn);
+		instance.setPassword(password);
+		instance.setBase(base);
+		setAdditionalContextSourceProperties(instance, dnsName);
+
+		instance.afterPropertiesSet();
+		return instance;
+	}
+
+	/**
+	 * Override to set additional properties on the ContextSource.
+	 * 
+	 * @param ctx The created instance.
+	 * @param dnsName The dns name of the created Ec2 instance.
+	 */
+	protected void setAdditionalContextSourceProperties(LdapContextSource ctx, final String dnsName) {
+
+	}
+
+	public void setBase(String base) {
+		this.base = base;
+	}
+
+	public void setUserDn(String userDn) {
+		this.userDn = userDn;
+	}
+
+	public void setPassword(String password) {
+		this.password = password;
+	}
+
+}

test/integration-tests-openldap/src/main/java/org/springframework/ldap/TlsContextSourceEc2InstanceLaunchingFactoryBean.java

@@ -0,0 +1,23 @@
+package org.springframework.ldap;
+
+import javax.net.ssl.HostnameVerifier;
+import javax.net.ssl.SSLSession;
+
+import org.springframework.ldap.core.support.DefaultTlsDirContextAuthenticationStrategy;
+import org.springframework.ldap.core.support.LdapContextSource;
+
+public class TlsContextSourceEc2InstanceLaunchingFactoryBean extends ContextSourceEc2InstanceLaunchingFactoryBean {
+	
+	protected void setAdditionalContextSourceProperties(LdapContextSource ctx, final String dnsName) {
+		DefaultTlsDirContextAuthenticationStrategy authenticationStrategy = new DefaultTlsDirContextAuthenticationStrategy();
+	
+		authenticationStrategy.setHostnameVerifier(new HostnameVerifier() {
+			public boolean verify(String hostname, SSLSession session) {
+				return hostname.equals(dnsName);
+			}
+		});
+
+		ctx.setAuthenticationStrategy(authenticationStrategy);
+		ctx.setPooled(false);
+	}
+}

test/integration-tests-openldap/src/main/java/org/springframework/ldap/control/Person.java

@@ -0,0 +1,104 @@
+/*
+ * Copyright 2005-2007 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.control;
+
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+/**
+ * Simple class representing a single person.
+ * 
+ * @author Mattias Arthursson
+ * @author Ulrik Sandberg
+ */
+public class Person {
+   private String fullName;
+
+   private String lastName;
+
+   private String description;
+
+   private String country;
+
+   private String company;
+
+   private String phone;
+
+   public String getDescription() {
+      return description;
+   }
+
+   public void setDescription(String description) {
+      this.description = description;
+   }
+
+   public String getFullName() {
+      return fullName;
+   }
+
+   public void setFullName(String fullName) {
+      this.fullName = fullName;
+   }
+
+   public String getLastName() {
+      return lastName;
+   }
+
+   public void setLastName(String lastName) {
+      this.lastName = lastName;
+   }
+
+   public String getCompany() {
+      return company;
+   }
+
+   public void setCompany(String company) {
+      this.company = company;
+   }
+
+   public String getCountry() {
+      return country;
+   }
+
+   public void setCountry(String country) {
+      this.country = country;
+   }
+
+   public String getPhone() {
+      return phone;
+   }
+
+   public void setPhone(String phone) {
+      this.phone = phone;
+   }
+
+   public boolean equals(Object obj) {
+      return EqualsBuilder.reflectionEquals(
+         this, obj);
+   }
+
+   public int hashCode() {
+      return HashCodeBuilder
+         .reflectionHashCode(this);
+   }
+
+   public String toString() {
+      return ToStringBuilder.reflectionToString(
+         this, ToStringStyle.MULTI_LINE_STYLE);
+   }
+}

test/integration-tests-openldap/src/test/java/org/springframework/ldap/control/LdapTemplatePagedSearchITest.java

@@ -0,0 +1,179 @@
+/*
+ * Copyright 2005-2007 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.control;
+
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertNotNull;
+import static junit.framework.Assert.assertNull;
+
+import java.util.List;
+
+import javax.naming.Name;
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+import javax.naming.directory.DirContext;
+import javax.naming.directory.SearchControls;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.ldap.core.CollectingNameClassPairCallbackHandler;
+import org.springframework.ldap.core.ContextMapper;
+import org.springframework.ldap.core.ContextMapperCallbackHandler;
+import org.springframework.ldap.core.DirContextAdapter;
+import org.springframework.ldap.core.DistinguishedName;
+import org.springframework.ldap.core.LdapTemplate;
+import org.springframework.ldap.core.SearchExecutor;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
+
+/**
+ * Tests the paged search result capability of LdapTemplate.
+ * <p>
+ * Note: Currently, ApacheDS does not support paged results controls, so this
+ * test must be run under another directory server, for example OpenLdap. This
+ * test will not run under ApacheDS, and the other integration tests assume
+ * ApacheDS and will probably not run under OpenLdap.
+ * 
+ * @author Ulrik Sandberg
+ */
+@ContextConfiguration(locations = { "/conf/ldapTemplateTestContext.xml" })
+public class LdapTemplatePagedSearchITest extends AbstractJUnit4SpringContextTests {
+
+	private static final Name BASE = DistinguishedName.EMPTY_PATH;
+
+	private static final String FILTER_STRING = "(&(objectclass=person))";
+
+	@Autowired
+	private LdapTemplate tested;
+
+	private CollectingNameClassPairCallbackHandler callbackHandler;
+
+	private SearchControls searchControls;
+
+	@Before
+	public void onSetUp() throws Exception {
+		PersonContextMapper mapper = new PersonContextMapper();
+		callbackHandler = new ContextMapperCallbackHandler(mapper);
+		searchControls = new SearchControls();
+		searchControls.setSearchScope(SearchControls.SUBTREE_SCOPE);
+		searchControls.setReturningObjFlag(true);
+	}
+
+	@After
+	public void onTearDown() throws Exception {
+		callbackHandler = null;
+		tested = null;
+		searchControls = null;
+	}
+
+	@Test
+	public void testSearch_PagedResult() {
+		SearchExecutor searchExecutor = new SearchExecutor() {
+			public NamingEnumeration executeSearch(DirContext ctx) throws NamingException {
+				return ctx.search(BASE, FILTER_STRING, searchControls);
+			}
+		};
+		Person person;
+		List list;
+		PagedResultsCookie cookie;
+		PagedResultsRequestControl requestControl;
+
+		// Prepare for first search
+		requestControl = new PagedResultsRequestControl(3);
+		tested.search(searchExecutor, callbackHandler, requestControl);
+		cookie = requestControl.getCookie();
+		assertNotNull("Cookie should not be null yet", cookie.getCookie());
+		list = callbackHandler.getList();
+		assertEquals(3, list.size());
+		person = (Person) list.get(0);
+		assertEquals("Some Person", person.getFullName());
+		assertEquals("+46 555-123456", person.getPhone());
+		person = (Person) list.get(1);
+		assertEquals("Some Person2", person.getFullName());
+		assertEquals("+46 555-654321", person.getPhone());
+		person = (Person) list.get(2);
+		assertEquals("Some Person3", person.getFullName());
+		assertEquals("+46 555-123654", person.getPhone());
+
+		// Prepare for second and last search
+		requestControl = new PagedResultsRequestControl(3, cookie);
+		tested.search(searchExecutor, callbackHandler, requestControl);
+		cookie = requestControl.getCookie();
+		assertNull("Cookie should be null now", cookie.getCookie());
+		assertEquals(5, list.size());
+		person = (Person) list.get(3);
+		assertEquals("Some Person", person.getFullName());
+		assertEquals("+46 555-456321", person.getPhone());
+		person = (Person) list.get(4);
+		assertEquals("Some Person", person.getFullName());
+		assertEquals("+45 555-654123", person.getPhone());
+	}
+
+	public void testSearch_PagedResult_ConvenienceMethod() {
+		Person person;
+		List list;
+		PagedResultsCookie cookie;
+		PagedResultsRequestControl requestControl;
+
+		// Prepare for first search
+		requestControl = new PagedResultsRequestControl(3);
+		tested.search(BASE, FILTER_STRING, searchControls, callbackHandler, requestControl);
+		cookie = requestControl.getCookie();
+		assertNotNull("Cookie should not be null yet", cookie.getCookie());
+		list = callbackHandler.getList();
+		assertEquals(3, list.size());
+		person = (Person) list.get(0);
+		assertEquals("Some Person", person.getFullName());
+		person = (Person) list.get(1);
+		assertEquals("Some Person2", person.getFullName());
+		person = (Person) list.get(2);
+		assertEquals("Some Person3", person.getFullName());
+
+		// Prepare for second and last search
+		requestControl = new PagedResultsRequestControl(3, cookie);
+		tested.search(BASE, FILTER_STRING, searchControls, callbackHandler, requestControl);
+		cookie = requestControl.getCookie();
+		assertNull("Cookie should be null now", cookie.getCookie());
+		assertEquals(5, list.size());
+		person = (Person) list.get(3);
+		assertEquals("Some Person", person.getFullName());
+		person = (Person) list.get(4);
+		assertEquals("Some Person", person.getFullName());
+	}
+
+	private static class PersonContextMapper implements ContextMapper {
+
+		public Object mapFromContext(Object ctx) {
+			DirContextAdapter context = (DirContextAdapter) ctx;
+			DistinguishedName dn = new DistinguishedName(context.getDn());
+			Person person = new Person();
+			person.setCountry(dn.getLdapRdn(0).getComponent().getValue());
+			person.setCompany(dn.getLdapRdn(1).getComponent().getValue());
+			person.setFullName(context.getStringAttribute("cn"));
+			person.setLastName(context.getStringAttribute("sn"));
+			person.setDescription(context.getStringAttribute("description"));
+			person.setPhone(context.getStringAttribute("telephoneNumber"));
+
+			return person;
+		}
+	}
+
+	public void setTested(LdapTemplate tested) {
+		this.tested = tested;
+	}
+}

test/integration-tests-openldap/src/test/java/org/springframework/ldap/core/LdapTemplateSearchResultITest.java

@@ -0,0 +1,181 @@
+/*
+ * Copyright 2005-2007 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.core;
+
+import static junit.framework.Assert.assertEquals;
+
+import java.util.List;
+
+import javax.naming.Name;
+import javax.naming.directory.SearchControls;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.ldap.core.DistinguishedName;
+import org.springframework.ldap.core.LdapTemplate;
+import org.springframework.ldap.test.AttributeCheckAttributesMapper;
+import org.springframework.ldap.test.AttributeCheckContextMapper;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
+
+/**
+ * Verifies that LdapTemplate search methods work against OpenLDAP with TLS.
+ * 
+ * @author Mattias Arthursson
+ */
+@ContextConfiguration(locations = { "/conf/ldapTemplateTestContext-tls.xml" })
+public class LdapTemplateSearchResultITest extends AbstractJUnit4SpringContextTests {
+
+	@Autowired
+	private LdapTemplate tested;
+
+	private AttributeCheckAttributesMapper attributesMapper;
+
+	private AttributeCheckContextMapper contextMapper;
+
+	private static final String[] ALL_ATTRIBUTES = { "cn", "sn", "description", "telephoneNumber" };
+
+	private static final String[] CN_SN_ATTRS = { "cn", "sn" };
+
+	private static final String[] ABSENT_ATTRIBUTES = { "description", "telephoneNumber" };
+
+	private static final String[] CN_SN_VALUES = { "Some Person2", "Person2" };
+
+	private static final String[] ALL_VALUES = { "Some Person2", "Person2", "Sweden, Company1, Some Person2",
+			"+46 555-654321" };
+
+	private static final String BASE_STRING = "";
+
+	private static final String FILTER_STRING = "(&(objectclass=person)(sn=Person2))";
+
+	private static final Name BASE_NAME = new DistinguishedName(BASE_STRING);
+
+	@Before
+	public void prepareTestedInstance() throws Exception {
+		attributesMapper = new AttributeCheckAttributesMapper();
+		contextMapper = new AttributeCheckContextMapper();
+	}
+
+	@After
+	public void cleanup() throws Exception {
+		attributesMapper = null;
+		contextMapper = null;
+	}
+
+	@Test
+	public void testSearch_AttributesMapper() {
+		attributesMapper.setExpectedAttributes(ALL_ATTRIBUTES);
+		attributesMapper.setExpectedValues(ALL_VALUES);
+		List list = tested.search(BASE_STRING, FILTER_STRING, attributesMapper);
+		assertEquals(1, list.size());
+	}
+
+	@Test
+	public void testSearch_SearchScope_AttributesMapper() {
+		attributesMapper.setExpectedAttributes(ALL_ATTRIBUTES);
+		attributesMapper.setExpectedValues(ALL_VALUES);
+		List list = tested.search(BASE_STRING, FILTER_STRING, SearchControls.SUBTREE_SCOPE, attributesMapper);
+		assertEquals(1, list.size());
+	}
+
+	@Test
+	public void testSearch_SearchScope_LimitedAttrs_AttributesMapper() {
+		attributesMapper.setExpectedAttributes(CN_SN_ATTRS);
+		attributesMapper.setExpectedValues(CN_SN_VALUES);
+		attributesMapper.setAbsentAttributes(ABSENT_ATTRIBUTES);
+		List list = tested.search(BASE_STRING, FILTER_STRING, SearchControls.SUBTREE_SCOPE, CN_SN_ATTRS,
+				attributesMapper);
+		assertEquals(1, list.size());
+	}
+
+	@Test
+	public void testSearch_AttributesMapper_Name() {
+		attributesMapper.setExpectedAttributes(ALL_ATTRIBUTES);
+		attributesMapper.setExpectedValues(ALL_VALUES);
+		List list = tested.search(BASE_NAME, FILTER_STRING, attributesMapper);
+		assertEquals(1, list.size());
+	}
+
+	@Test
+	public void testSearch_SearchScope_AttributesMapper_Name() {
+		attributesMapper.setExpectedAttributes(ALL_ATTRIBUTES);
+		attributesMapper.setExpectedValues(ALL_VALUES);
+		List list = tested.search(BASE_NAME, FILTER_STRING, SearchControls.SUBTREE_SCOPE, attributesMapper);
+		assertEquals(1, list.size());
+	}
+
+	@Test
+	public void testSearch_SearchScope_LimitedAttrs_AttributesMapper_Name() {
+		attributesMapper.setExpectedAttributes(CN_SN_ATTRS);
+		attributesMapper.setExpectedValues(CN_SN_VALUES);
+		attributesMapper.setAbsentAttributes(ABSENT_ATTRIBUTES);
+		List list = tested
+				.search(BASE_NAME, FILTER_STRING, SearchControls.SUBTREE_SCOPE, CN_SN_ATTRS, attributesMapper);
+		assertEquals(1, list.size());
+	}
+
+	@Test
+	public void testSearch_ContextMapper() {
+		contextMapper.setExpectedAttributes(ALL_ATTRIBUTES);
+		contextMapper.setExpectedValues(ALL_VALUES);
+		List list = tested.search(BASE_STRING, FILTER_STRING, contextMapper);
+		assertEquals(1, list.size());
+	}
+
+	@Test
+	public void testSearch_SearchScope_ContextMapper() {
+		contextMapper.setExpectedAttributes(ALL_ATTRIBUTES);
+		contextMapper.setExpectedValues(ALL_VALUES);
+		List list = tested.search(BASE_STRING, FILTER_STRING, SearchControls.SUBTREE_SCOPE, contextMapper);
+		assertEquals(1, list.size());
+	}
+
+	@Test
+	public void testSearch_SearchScope_LimitedAttrs_ContextMapper() {
+		contextMapper.setExpectedAttributes(CN_SN_ATTRS);
+		contextMapper.setExpectedValues(CN_SN_VALUES);
+		contextMapper.setAbsentAttributes(ABSENT_ATTRIBUTES);
+		List list = tested.search(BASE_STRING, FILTER_STRING, SearchControls.SUBTREE_SCOPE, CN_SN_ATTRS, contextMapper);
+		assertEquals(1, list.size());
+	}
+
+	@Test
+	public void testSearch_ContextMapper_Name() {
+		contextMapper.setExpectedAttributes(ALL_ATTRIBUTES);
+		contextMapper.setExpectedValues(ALL_VALUES);
+		List list = tested.search(BASE_NAME, FILTER_STRING, contextMapper);
+		assertEquals(1, list.size());
+	}
+
+	@Test
+	public void testSearch_SearchScope_ContextMapper_Name() {
+		contextMapper.setExpectedAttributes(ALL_ATTRIBUTES);
+		contextMapper.setExpectedValues(ALL_VALUES);
+		List list = tested.search(BASE_NAME, FILTER_STRING, SearchControls.SUBTREE_SCOPE, contextMapper);
+		assertEquals(1, list.size());
+	}
+
+	@Test
+	public void testSearch_SearchScope_LimitedAttrs_ContextMapper_Name() {
+		contextMapper.setExpectedAttributes(CN_SN_ATTRS);
+		contextMapper.setExpectedValues(CN_SN_VALUES);
+		contextMapper.setAbsentAttributes(ABSENT_ATTRIBUTES);
+		List list = tested.search(BASE_NAME, FILTER_STRING, SearchControls.SUBTREE_SCOPE, CN_SN_ATTRS, contextMapper);
+		assertEquals(1, list.size());
+	}
+}

test/integration-tests-openldap/src/test/resources/conf/ldap.properties

@@ -0,0 +1,8 @@
+itest.openldap.serverAddress=spring-ldap-test.dyndns.org
+userDn=cn=admin,dc=jayway,dc=se
+password=secret
+base=dc=jayway,dc=se
+
+aws.ami=ami-56ec083f
+aws.keypair=spring-ldap-keypair
+aws.security.group=spring-ldap

test/integration-tests-openldap/src/test/resources/conf/ldapTemplateTestContext-tls.xml

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	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-2.0.xsd">
+
+	<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+		<property name="location" value="/conf/ldap.properties" />
+		<property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
+	</bean>
+
+
+	<bean id="contextSource" class="org.springframework.ldap.TlsContextSourceEc2InstanceLaunchingFactoryBean">
+		<property name="awsKey" value="${aws.key}" />
+		<property name="awsSecretKey" value="${aws.secret.key}" />
+		<property name="imageName" value="${aws.ami}" />
+		<property name="groupName" value="${aws.security.group}" />
+		<property name="keyName" value="${aws.keypair}" />
+		<property name="base" value="dc=jayway,dc=se" />
+		<property name="userDn" value="${userDn}" />
+		<property name="password" value="${password}" />
+	</bean>
+
+<!-- 
+	<bean id="contextSource"
+		class="org.springframework.ldap.core.support.LdapContextSource">
+		<property name="base" value="dc=jayway,dc=se" />
+		<property name="userDn" value="${userDn}" />
+		<property name="password" value="${password}" />
+		<property name="url" value="ldap://${itest.openldap.serverAddress}:389" />
+		<property name="authenticationStrategy">
+			<bean class="org.springframework.ldap.core.support.DefaultTlsDirContextAuthenticationStrategy" />
+		</property>
+		<property name="pooled" value="false" />
+	</bean>
+ -->
+
+	<bean id="ldapTemplate"
+		class="org.springframework.ldap.core.LdapTemplate">
+		<constructor-arg ref="contextSource" />
+	</bean>
+</beans>

test/integration-tests-openldap/src/test/resources/conf/ldapTemplateTestContext.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	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-2.0.xsd">
+
+	<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+		<property name="location" value="/conf/ldap.properties" />
+		<property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
+	</bean>
+
+	<bean id="contextSource" class="org.springframework.ldap.ContextSourceEc2InstanceLaunchingFactoryBean">
+		<property name="awsKey" value="${aws.key}" />
+		<property name="awsSecretKey" value="${aws.secret.key}" />
+		<property name="imageName" value="${aws.ami}" />
+		<property name="groupName" value="${aws.security.group}" />
+		<property name="keyName" value="${aws.keypair}" />
+		<property name="base" value="dc=jayway,dc=se" />
+		<property name="userDn" value="${userDn}" />
+		<property name="password" value="${password}" />
+	</bean>
+
+	<bean id="ldapTemplate"
+		class="org.springframework.ldap.core.LdapTemplate">
+		<constructor-arg ref="contextSource" />
+	</bean>
+</beans>

test/integration-tests-openldap/src/test/resources/log4j.properties

@@ -0,0 +1,6 @@
+log4j.rootCategory=INFO, stdout
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout.ConversionPattern=%r [%t] %-5p\: %-15c{2} - %m%n
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+
+log4j.logger.org.apache.directory.server.schema.registries.DefaultSyntaxRegistry=WARN