Spring/spring-ldap
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Changed all embedded LDAP server ports to 1888, since it appears CI tests might be helped by this.

Browse Source
This commit is contained in:
Mattias Hellborg Arthursson
2013-07-30 06:13:30 +02:00
parent cbd11f6868
commit 88574847c2
28 changed files with 110 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/article-spring20/src/main/webapp/WEB-INF/applicationContext.xml
View File

@@ -15,7 +15,7 @@
<property name="principal" value="${userDn}" />
<property name="password" value="${password}" />
<property name="ldifFile" value="/WEB-INF/setup_data.ldif" />
<property name="port" value="3900" />
<property name="port" value="1888" />
</bean>
<bean id="ldapTemplate"

2
samples/article-spring20/src/main/webapp/WEB-INF/ldap.properties
View File

@@ -1,4 +1,4 @@
urls=ldap://127.0.0.1:3900
urls=ldap://127.0.0.1:1888
userDn=uid=admin,ou=system
password=secret
base=dc=jayway,dc=se

2
samples/article-spring30/src/main/webapp/WEB-INF/applicationContext.xml
View File

@@ -15,7 +15,7 @@
<property name="principal" value="${userDn}" />
<property name="password" value="${password}" />
<property name="ldifFile" value="/WEB-INF/setup_data.ldif" />
<property name="port" value="3900" />
<property name="port" value="1888" />
</bean>
<bean id="ldapTemplate"

2
samples/article-spring30/src/main/webapp/WEB-INF/ldap.properties
View File

@@ -1,4 +1,4 @@
urls=ldap://127.0.0.1:3900
urls=ldap://127.0.0.1:1888
userDn=uid=admin,ou=system
password=secret
base=dc=jayway,dc=se

2
samples/article-spring30/src/test/resources/config/ldap.properties
View File

@@ -1,4 +1,4 @@
urls=ldap://127.0.0.1:3900
urls=ldap://127.0.0.1:1888
userDn=uid=admin,ou=system
password=secret
base=dc=jayway,dc=se

10
samples/article-spring30/src/test/resources/config/testContext.xml
View File

@@ -1,7 +1,7 @@
<?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
<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 id="placeholderConfig"
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
@@ -15,7 +15,7 @@
<property name="principal" value="${userDn}" />
<property name="password" value="${password}" />
<property name="ldifFile" value="/setup_data.ldif" />
<property name="port" value="3901" />
<property name="port" value="1888" />
</bean>
<bean id="ldapTemplate" class="org.springframework.ldap.core.LdapTemplate">
@@ -29,7 +29,7 @@
<bean id="traditionalPersonDao"
class="org.springframework.ldap.samples.article.dao.TraditionalPersonDaoImpl">
<property name="url" value="ldap://localhost:3901" />
<property name="url" value="ldap://localhost:1888" />
<property name="base" value="dc=jayway,dc=se" />
<property name="userDn" value="${userDn}" />
<property name="password" value="${password}" />

2
samples/article/src/main/webapp/WEB-INF/applicationContext.xml
View File

@@ -15,7 +15,7 @@
<property name="principal" value="${userDn}" />
<property name="password" value="${password}" />
<property name="ldifFile" value="/WEB-INF/setup_data.ldif" />
<property name="port" value="3900" />
<property name="port" value="1888" />
</bean>
<bean id="ldapTemplate"

2
samples/article/src/main/webapp/WEB-INF/ldap.properties
View File

@@ -1,4 +1,4 @@
urls=ldap://127.0.0.1:3900
urls=ldap://127.0.0.1:1888
userDn=uid=admin,ou=system
password=secret
base=dc=jayway,dc=se

2
samples/article/src/test/resources/config/ldap.properties
View File

@@ -1,4 +1,4 @@
urls=ldap://127.0.0.1:3900
urls=ldap://127.0.0.1:1888
userDn=uid=admin,ou=system
password=secret
base=dc=jayway,dc=se

10
samples/article/src/test/resources/config/testContext.xml
View File

@@ -1,7 +1,7 @@
<?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
<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 id="placeholderConfig"
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
@@ -15,7 +15,7 @@
<property name="principal" value="${userDn}" />
<property name="password" value="${password}" />
<property name="ldifFile" value="/setup_data.ldif" />
<property name="port" value="3901" />
<property name="port" value="1888" />
</bean>
<bean id="ldapTemplate" class="org.springframework.ldap.core.LdapTemplate">
@@ -29,7 +29,7 @@
<bean id="traditionalPersonDao"
class="org.springframework.ldap.samples.article.dao.TraditionalPersonDaoImpl">
<property name="url" value="ldap://localhost:3901" />
<property name="url" value="ldap://localhost:1888" />
<property name="base" value="dc=jayway,dc=se" />
<property name="userDn" value="${userDn}" />
<property name="password" value="${password}" />

2
samples/demos/demo-tiger/src/test/resources/config/ldap.properties
View File

@@ -1,4 +1,4 @@
urls=ldap://127.0.0.1:3900
urls=ldap://127.0.0.1:1888
userDn=uid=admin,ou=system
password=secret
base=dc=jayway,dc=se

6
samples/demos/demo-tiger/src/test/resources/config/testContext.xml
View File

@@ -1,7 +1,7 @@
<?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
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
<bean id="placeholderConfig"
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
@@ -14,14 +14,14 @@
<property name="principal" value="${userDn}" />
<property name="password" value="${password}" />
<property name="ldifFile" value="/config/setup_data.ldif" />
<property name="port" value="3900" />
<property name="port" value="1888" />
</bean>
<bean id="ldapTemplate" class="org.springframework.ldap.core.LdapTemplate">
<constructor-arg ref="contextSource" />
</bean>
<bean id="personDao" class="org.springframework.ldap.demo.dao.PersonDaoImpl">
<property name="base" value="dc=jayway,dc=se" />
<property name="url" value="ldap://localhost:3900" />
<property name="url" value="ldap://localhost:1888" />
<property name="userDn" value="${userDn}" />
<property name="password" value="${password}" />
</bean>

6
samples/demos/demo/src/main/java/org/springframework/ldap/demo/solution/testContext.xml
View File

@@ -1,7 +1,7 @@
<?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
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
<bean id="placeholderConfig"
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
@@ -14,13 +14,13 @@
<property name="principal" value="${userDn}" />
<property name="password" value="${password}" />
<property name="ldifFile" value="/config/setup_data.ldif" />
<property name="port" value="3900" />
<property name="port" value="1888" />
</bean>
<bean id="ldapTemplate" class="org.springframework.ldap.core.LdapTemplate">
<constructor-arg ref="contextSource" />
</bean>
<bean id="personDao" class="org.springframework.ldap.demo.dao.PersonDaoImpl">
<property name="url" value="ldap://127.0.0.1:3900" />
<property name="url" value="ldap://127.0.0.1:1888" />
<property name="base" value="dc=jayway,dc=se" />
<property name="userDn" value="${userDn}" />
<property name="password" value="${password}" />

2
samples/demos/demo/src/test/resources/config/ldap.properties
View File

@@ -1,4 +1,4 @@
urls=ldap://127.0.0.1:3900
urls=ldap://127.0.0.1:1888
userDn=uid=admin,ou=system
password=secret
base=dc=jayway,dc=se

6
samples/demos/demo/src/test/resources/config/testContext.xml
View File

@@ -1,7 +1,7 @@
<?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
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
<bean id="placeholderConfig"
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
@@ -14,14 +14,14 @@
<property name="principal" value="${userDn}" />
<property name="password" value="${password}" />
<property name="ldifFile" value="/config/setup_data.ldif" />
<property name="port" value="3900" />
<property name="port" value="1888" />
</bean>
<bean id="ldapTemplate" class="org.springframework.ldap.core.LdapTemplate">
<constructor-arg ref="contextSource" />
</bean>
<bean id="personDao" class="org.springframework.ldap.demo.dao.PersonDaoImpl">
<property name="base" value="dc=jayway,dc=se" />
<property name="url" value="ldap://localhost:3900" />
<property name="url" value="ldap://localhost:1888" />
<property name="userDn" value="${userDn}" />
<property name="password" value="${password}" />
</bean>

2
samples/samples-utils/src/test/resources/conf/ldap.properties
View File

@@ -1,4 +1,4 @@
urls=ldap://127.0.0.1:3900
urls=ldap://127.0.0.1:1888
userDn=uid=admin,ou=system
password=secret
base=dc=jayway,dc=se

2
samples/samples-utils/src/test/resources/conf/testContext.xml
View File

@@ -12,7 +12,7 @@
<property name="principal" value="${userDn}" />
<property name="password" value="${password}" />
<property name="ldifFile" value="classpath:/setup_data.ldif" />
<property name="port" value="3900" />
<property name="port" value="1888" />
</bean>
<bean id="ldapTemplate"

8
test/integration-tests/src/test/resources/conf/apacheDsContext.xml
View File

@@ -4,9 +4,9 @@
This context automatically starts the Apache Directory Server
and sets up the test data
-->
<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
<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">
<!-- Used mainly to enable injecting base into LdapServerManager -->
@@ -36,7 +36,7 @@
making it easier for the integration tests requiring OpenLDAP.
-->
<bean id="configuration" class="org.apache.directory.server.configuration.MutableServerStartupConfiguration">
<property name="ldapPort" value="3900" />
<property name="ldapPort" value="1888" />
<property name="contextPartitionConfigurations">
<set>
<ref bean="jaywayPartitionConfiguration"/>

2
test/integration-tests/src/test/resources/conf/ldap.properties
View File

@@ -1,4 +1,4 @@
urls=ldap://127.0.0.1:3900
urls=ldap://127.0.0.1:1888
userDn=uid=admin,ou=system
password=secret
base=dc=jayway,dc=se

62
test/integration-tests/src/test/resources/conf/ldapAndHibernateTransactionTestContext.xml
View File

@@ -1,21 +1,21 @@
<?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
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.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="3900" />
<property name="pooled" value="false" />
</bean>
<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>
<bean id="dataSource"
class="org.springframework.jdbc.datasource.DriverManagerDataSource">
@@ -29,29 +29,29 @@
class="org.springframework.ldap.transaction.compensating.manager.TransactionAwareContextSourceProxy">
<constructor-arg ref="contextSource" />
</bean>
<bean id="ldapTemplate"
class="org.springframework.ldap.core.LdapTemplate">
<constructor-arg ref="transactedContextSource" />
</bean>
<bean id="hibernateTemplate" class="org.springframework.orm.hibernate3.HibernateTemplate">
<property name="sessionFactory" ref="sessionFactory" />
</bean>
<bean id="hibernateTemplate" class="org.springframework.orm.hibernate3.HibernateTemplate">
<property name="sessionFactory" ref="sessionFactory" />
</bean>
<bean id="sessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
<property name="dataSource" ref="dataSource"/>
<property name="mappingResources">
<list>
<value>conf/OrgPerson.hbm.xml</value>
</list>
</property>
<property name="hibernateProperties">
<value>
hibernate.dialect=org.hibernate.dialect.HSQLDialect
hibernate.hbm2ddl.auto=create
</value>
</property>
<bean id="sessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
<property name="dataSource" ref="dataSource"/>
<property name="mappingResources">
<list>
<value>conf/OrgPerson.hbm.xml</value>
</list>
</property>
<property name="hibernateProperties">
<value>
hibernate.dialect=org.hibernate.dialect.HSQLDialect
hibernate.hbm2ddl.auto=create
</value>
</property>
</bean>
<bean id="transactionManager"
class="org.springframework.ldap.transaction.compensating.manager.ContextSourceAndHibernateTransactionManager">

22
test/integration-tests/src/test/resources/conf/ldapAndJdbcTransactionTestContext.xml
View File

@@ -1,20 +1,20 @@
<?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
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.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="3900" />
<property name="pooled" value="false" />
</bean>
<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>
<bean id="dataSource"
class="org.springframework.jdbc.datasource.DriverManagerDataSource">

2
test/integration-tests/src/test/resources/conf/ldapTemplateAcegiTestContext.xml
View File

@@ -13,7 +13,7 @@
<property name="principal" value="${userDn}" />
<property name="password" value="${password}" />
<property name="ldifFile" value="classpath:/setup_data.ldif" />
<property name="port" value="3900" />
<property name="port" value="1888" />
<property name="authenticationSource">
<bean
class="org.springframework.ldap.authentication.AcegiAuthenticationSource" />

20
test/integration-tests/src/test/resources/conf/ldapTemplateNoBaseSuffixTestContext.xml
View File

@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<?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">
http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
<import resource="classpath:/conf/commonTestContext.xml"/>
<import resource="classpath:/conf/commonTestContext.xml"/>
<bean id="contextSource"
class="org.springframework.ldap.test.TestContextSourceFactoryBean">
<property name="defaultPartitionSuffix" value="dc=jayway,dc=se" />
@@ -13,14 +13,14 @@
<property name="principal" value="${userDn}" />
<property name="password" value="${password}" />
<property name="ldifFile" value="classpath:/setup_data.ldif" />
<property name="port" value="3900" />
<property name="port" value="1888" />
<property name="baseOnTarget" value="false" />
</bean>
<bean id="ldapTemplate" class="org.springframework.ldap.core.LdapTemplate">
<constructor-arg ref="contextSource" />
</bean>
<bean id="ldapTemplate" class="org.springframework.ldap.core.LdapTemplate">
<constructor-arg ref="contextSource" />
</bean>
<!--
<bean id="dataLoader" class="org.ddsteps.data.excel.CachingExcelDataLoader" />
-->

10
test/integration-tests/src/test/resources/conf/ldapTemplateObjectBindTestContext.xml
View File

@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<?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">
http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
<import resource="classpath:/conf/commonTestContext.xml"/>
<import resource="classpath:/conf/commonTestContext.xml"/>
<bean id="contextSource"
class="org.springframework.ldap.test.TestContextSourceFactoryBean">
@@ -13,7 +13,7 @@
<property name="principal" value="${userDn}" />
<property name="password" value="${password}" />
<property name="ldifFile" value="classpath:/setup_data.ldif" />
<property name="port" value="3900" />
<property name="port" value="1888" />
<property name="dirObjectFactory"><null/></property>
</bean>
@@ -21,4 +21,4 @@
class="org.springframework.ldap.core.LdapTemplate">
<constructor-arg ref="contextSource" />
</bean>
</beans>
</beans>

2
test/integration-tests/src/test/resources/conf/ldapTemplateTestContext.xml
View File

@@ -12,7 +12,7 @@
<property name="principal" value="${userDn}" />
<property name="password" value="${password}" />
<property name="ldifFile" value="classpath:/setup_data.ldif" />
<property name="port" value="3900" />
<property name="port" value="1888" />
</bean>
<bean id="ldapTemplate"

26
test/integration-tests/src/test/resources/conf/ldapTemplateTransactionTestContext.xml
View File

@@ -1,22 +1,22 @@
<?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
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.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="3900" />
<property name="pooled" value="false" />
</bean>
<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>
<bean id="transactedContextSource"
class="org.springframework.ldap.transaction.compensating.manager.TransactionAwareContextSourceProxy">
<constructor-arg ref="contextSource" />

2
test/integration-tests/src/test/resources/conf/rootContextSourceTestContext.xml
View File

@@ -13,7 +13,7 @@
<property name="principal" value="${userDn}" />
<property name="password" value="${password}" />
<property name="ldifFile" value="classpath:/setup_data.ldif" />
<property name="port" value="3900" />
<property name="port" value="1888" />
<property name="baseOnTarget" value="false" />
</bean>

2
test/integration-tests/src/test/resources/conf/simpleLdapTemplateTestContext.xml
View File

@@ -12,7 +12,7 @@
<property name="principal" value="${userDn}" />
<property name="password" value="${password}" />
<property name="ldifFile" value="classpath:/setup_data.ldif" />
<property name="port" value="3900" />
<property name="port" value="1888" />
</bean>
<bean id="simpleLdapTemplate"