Fix for LDAP-134:
DefaultDirObjectFactory now properly handles referrals that are passed to it. Added referralUrl property to DirContextAdapter, and accessor methods to DirContextOperations and DirContextAdapter. Fixed some svn ignores as well.
This commit is contained in:
@@ -11,8 +11,8 @@
|
||||
|
||||
|
||||
<bean id="contextSource" class="org.springframework.ldap.TlsContextSourceEc2InstanceLaunchingFactoryBean">
|
||||
<property name="awsKey" value="${aws.key}" />
|
||||
<property name="awsSecretKey" value="${aws.secret.key}" />
|
||||
<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="keypairName" value="${aws.keypair}" />
|
||||
@@ -21,20 +21,6 @@
|
||||
<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" />
|
||||
|
||||
@@ -10,8 +10,8 @@
|
||||
</bean>
|
||||
|
||||
<bean id="contextSource" class="org.springframework.ldap.test.ContextSourceEc2InstanceLaunchingFactoryBean">
|
||||
<property name="awsKey" value="${aws.key}" />
|
||||
<property name="awsSecretKey" value="${aws.secret.key}" />
|
||||
<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="keypairName" value="${aws.keypair}" />
|
||||
|
||||
Reference in New Issue
Block a user