Removed some duplication in config files.

spring-ldap/src/itest/java/conf/baseLdapPathPostProcessorMultiContextSourceOneSpecTestContext.xml

@@ -3,11 +3,7 @@
 	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">
-		<property name="location"
-			value="classpath:/conf/ldap.properties" />
-	</bean>
+    <import resource="classpath:/conf/commonTestContext.xml"/>
 
 	<bean id="contextSource"
 		class="org.springframework.ldap.core.support.LdapContextSource">

spring-ldap/src/itest/java/conf/baseLdapPathPostProcessorMultiContextSourceTestContext.xml

@@ -3,11 +3,7 @@
 	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">
-		<property name="location"
-			value="classpath:/conf/ldap.properties" />
-	</bean>
+    <import resource="classpath:/conf/commonTestContext.xml"/>
 
 	<bean id="contextSource"
 		class="org.springframework.ldap.core.support.LdapContextSource">

spring-ldap/src/itest/java/conf/baseLdapPathPostProcessorNoContextSourceTestContext.xml

@@ -3,11 +3,7 @@
 	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">
-		<property name="location"
-			value="classpath:/conf/ldap.properties" />
-	</bean>
+    <import resource="classpath:/conf/commonTestContext.xml"/>
 
 	<bean id="dummyBaseContextAware"
 		class="org.springframework.ldap.core.support.DummyBaseLdapPathAware" />

spring-ldap/src/itest/java/conf/baseLdapPathPostProcessorPropertyOverrideTestContext.xml

@@ -3,11 +3,7 @@
 	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">
-		<property name="location"
-			value="classpath:/conf/ldap.properties" />
-	</bean>
+    <import resource="classpath:/conf/commonTestContext.xml"/>
 
 	<bean id="contextSource"
 		class="org.springframework.ldap.core.support.LdapContextSource">

spring-ldap/src/itest/java/conf/baseLdapPathPostProcessorTestContext.xml

@@ -3,11 +3,7 @@
 	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">
-		<property name="location"
-			value="classpath:/conf/ldap.properties" />
-	</bean>
+    <import resource="classpath:/conf/commonTestContext.xml"/>
 
 	<bean id="contextSource"
 		class="org.springframework.ldap.core.support.LdapContextSource">

spring-ldap/src/itest/java/conf/baseLdapPathPostProcessorTransactionTestContext.xml

@@ -3,11 +3,7 @@
 	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">
-		<property name="location"
-			value="classpath:/conf/ldap.properties" />
-	</bean>
+    <import resource="classpath:/conf/commonTestContext.xml"/>
 
 	<bean id="contextSource"
 		class="org.springframework.ldap.core.support.LdapContextSource">

spring-ldap/src/itest/java/conf/commonTestContext.xml

@@ -0,0 +1,16 @@
+<?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">
+
+	<!--
+		This context configuration file defines common beans,
+		minimizing duplication in the various test context files.
+	-->
+
+	<bean id="placeholderConfig"
+		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+		<property name="location" value="classpath:/conf/ldap.properties" />
+	</bean>
+</beans>

spring-ldap/src/itest/java/conf/ldapAndJdbcTransactionTestContext.xml

@@ -4,12 +4,7 @@
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
                            http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 	<import resource="classpath:/conf/apacheDsContext.xml" />
-
-	<bean id="placeholderConfig"
-		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-		<property name="location"
-			value="classpath:/conf/ldap.properties" />
-	</bean>
+    <import resource="classpath:/conf/commonTestContext.xml"/>
 
 	<bean id="contextSourceTarget"
 		class="org.springframework.ldap.core.support.LdapContextSource">

spring-ldap/src/itest/java/conf/ldapContextSourceTestContext.xml

@@ -1,5 +1,4 @@
 <?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

spring-ldap/src/itest/java/conf/ldapTemplateAcegiTestContext.xml

@@ -4,12 +4,7 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans
                            http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
     <import resource="classpath:/conf/apacheDsContext.xml"/>
-
-	<bean id="placeholderConfig"
-		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-		<property name="location"
-			value="classpath:/conf/ldap.properties" />
-	</bean>
+    <import resource="classpath:/conf/commonTestContext.xml"/>
 
 	<bean id="contextSource"
 		class="org.springframework.ldap.core.support.LdapContextSource">

spring-ldap/src/itest/java/conf/ldapTemplateNoBaseSuffixTestContext.xml

@@ -4,11 +4,7 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans
                            http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
     <import resource="classpath:/conf/apacheDsContext.xml"/>
-
-	<bean id="placeholderConfig"
-		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-		<property name="location" value="classpath:/conf/ldap.properties" />
-	</bean>
+    <import resource="classpath:/conf/commonTestContext.xml"/>
 	
 	<bean id="contextSource" class="org.springframework.ldap.core.support.LdapContextSource" >
 		<property name="urls" value="${urls}" />

spring-ldap/src/itest/java/conf/ldapTemplateTestContext.xml

@@ -4,11 +4,7 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans
                            http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
     <import resource="classpath:/conf/apacheDsContext.xml"/>
-    
-	<bean id="placeholderConfig"
-		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-		<property name="location" value="classpath:/conf/ldap.properties" />
-	</bean>
+    <import resource="classpath:/conf/commonTestContext.xml"/>
 	
 	<bean id="contextSource" class="org.springframework.ldap.core.support.LdapContextSource" >
 		<property name="urls" value="${urls}" />

spring-ldap/src/itest/java/conf/ldapTemplateTransactionTestContext.xml

@@ -4,12 +4,7 @@
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
                            http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 	<import resource="classpath:/conf/apacheDsContext.xml" />
-
-	<bean id="placeholderConfig"
-		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-		<property name="location"
-			value="classpath:/conf/ldap.properties" />
-	</bean>
+    <import resource="classpath:/conf/commonTestContext.xml"/>
 
 	<bean id="contextSourceTarget"
 		class="org.springframework.ldap.core.support.LdapContextSource">

spring-ldap/src/itest/java/conf/rootContextSourceTestContext.xml

@@ -4,11 +4,7 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans
                            http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
     <import resource="classpath:/conf/apacheDsContext.xml"/>
-    
-	<bean id="placeholderConfig"
-		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-		<property name="location" value="classpath:/conf/ldap.properties" />
-	</bean>
+    <import resource="classpath:/conf/commonTestContext.xml"/>
     
     <!-- note that this has no base set, since we want to get at the root entry -->
 	<bean id="contextSource" class="org.springframework.ldap.core.support.LdapContextSource" >