diff --git a/mvn-build/pom.xml b/mvn-build/pom.xml index 10329f2a..2f1febf5 100644 --- a/mvn-build/pom.xml +++ b/mvn-build/pom.xml @@ -114,7 +114,7 @@ core-tiger acegi-support test-support - integration-tests + test diff --git a/mvn-build/integration-tests-openldap/pom.xml b/mvn-build/test/integration-tests-openldap/pom.xml similarity index 96% rename from mvn-build/integration-tests-openldap/pom.xml rename to mvn-build/test/integration-tests-openldap/pom.xml index f234c6dc..7b185ea3 100644 --- a/mvn-build/integration-tests-openldap/pom.xml +++ b/mvn-build/test/integration-tests-openldap/pom.xml @@ -11,7 +11,7 @@ 4.0.0 spring-ldap-openldap-integration-tests jar - Spring LDAP Integration Tests + Spring LDAP Integration Tests (OpenLDAP) diff --git a/mvn-build/integration-tests-openldap/src/test/java/org/springframework/ldap/core/LdapTemplateSearchResultITest.java b/mvn-build/test/integration-tests-openldap/src/test/java/org/springframework/ldap/core/LdapTemplateSearchResultITest.java similarity index 100% rename from mvn-build/integration-tests-openldap/src/test/java/org/springframework/ldap/core/LdapTemplateSearchResultITest.java rename to mvn-build/test/integration-tests-openldap/src/test/java/org/springframework/ldap/core/LdapTemplateSearchResultITest.java diff --git a/mvn-build/integration-tests-openldap/src/test/resources/conf/ldap.properties b/mvn-build/test/integration-tests-openldap/src/test/resources/conf/ldap.properties similarity index 100% rename from mvn-build/integration-tests-openldap/src/test/resources/conf/ldap.properties rename to mvn-build/test/integration-tests-openldap/src/test/resources/conf/ldap.properties diff --git a/mvn-build/integration-tests-openldap/src/test/resources/conf/ldapTemplateTestContext.xml b/mvn-build/test/integration-tests-openldap/src/test/resources/conf/ldapTemplateTestContext.xml similarity index 100% rename from mvn-build/integration-tests-openldap/src/test/resources/conf/ldapTemplateTestContext.xml rename to mvn-build/test/integration-tests-openldap/src/test/resources/conf/ldapTemplateTestContext.xml diff --git a/mvn-build/integration-tests-openldap/src/test/resources/log4j.properties b/mvn-build/test/integration-tests-openldap/src/test/resources/log4j.properties similarity index 100% rename from mvn-build/integration-tests-openldap/src/test/resources/log4j.properties rename to mvn-build/test/integration-tests-openldap/src/test/resources/log4j.properties diff --git a/mvn-build/integration-tests/pom.xml b/mvn-build/test/integration-tests/pom.xml similarity index 98% rename from mvn-build/integration-tests/pom.xml rename to mvn-build/test/integration-tests/pom.xml index cb9c5172..f0a6469b 100644 --- a/mvn-build/integration-tests/pom.xml +++ b/mvn-build/test/integration-tests/pom.xml @@ -11,7 +11,7 @@ 4.0.0 spring-ldap-integration-tests jar - Spring LDAP Integration Tests + Spring LDAP Integration Tests (Generic) diff --git a/mvn-build/integration-tests/src/main/java/org/springframework/ldap/Person.java b/mvn-build/test/integration-tests/src/main/java/org/springframework/ldap/Person.java similarity index 100% rename from mvn-build/integration-tests/src/main/java/org/springframework/ldap/Person.java rename to mvn-build/test/integration-tests/src/main/java/org/springframework/ldap/Person.java diff --git a/mvn-build/integration-tests/src/main/java/org/springframework/ldap/PersonAttributesMapper.java b/mvn-build/test/integration-tests/src/main/java/org/springframework/ldap/PersonAttributesMapper.java similarity index 100% rename from mvn-build/integration-tests/src/main/java/org/springframework/ldap/PersonAttributesMapper.java rename to mvn-build/test/integration-tests/src/main/java/org/springframework/ldap/PersonAttributesMapper.java diff --git a/mvn-build/integration-tests/src/main/java/org/springframework/ldap/PersonContextMapper.java b/mvn-build/test/integration-tests/src/main/java/org/springframework/ldap/PersonContextMapper.java similarity index 100% rename from mvn-build/integration-tests/src/main/java/org/springframework/ldap/PersonContextMapper.java rename to mvn-build/test/integration-tests/src/main/java/org/springframework/ldap/PersonContextMapper.java diff --git a/mvn-build/integration-tests/src/main/java/org/springframework/ldap/core/DummyDistinguishedNameConsumer.java b/mvn-build/test/integration-tests/src/main/java/org/springframework/ldap/core/DummyDistinguishedNameConsumer.java similarity index 100% rename from mvn-build/integration-tests/src/main/java/org/springframework/ldap/core/DummyDistinguishedNameConsumer.java rename to mvn-build/test/integration-tests/src/main/java/org/springframework/ldap/core/DummyDistinguishedNameConsumer.java diff --git a/mvn-build/integration-tests/src/main/java/org/springframework/ldap/core/support/DummyBaseLdapPathAware.java b/mvn-build/test/integration-tests/src/main/java/org/springframework/ldap/core/support/DummyBaseLdapPathAware.java similarity index 100% rename from mvn-build/integration-tests/src/main/java/org/springframework/ldap/core/support/DummyBaseLdapPathAware.java rename to mvn-build/test/integration-tests/src/main/java/org/springframework/ldap/core/support/DummyBaseLdapPathAware.java diff --git a/mvn-build/integration-tests/src/main/java/org/springframework/ldap/filter/DummyFilterConsumer.java b/mvn-build/test/integration-tests/src/main/java/org/springframework/ldap/filter/DummyFilterConsumer.java similarity index 100% rename from mvn-build/integration-tests/src/main/java/org/springframework/ldap/filter/DummyFilterConsumer.java rename to mvn-build/test/integration-tests/src/main/java/org/springframework/ldap/filter/DummyFilterConsumer.java diff --git a/mvn-build/integration-tests/src/main/java/org/springframework/ldap/transaction/compensating/manager/DummyDao.java b/mvn-build/test/integration-tests/src/main/java/org/springframework/ldap/transaction/compensating/manager/DummyDao.java similarity index 100% rename from mvn-build/integration-tests/src/main/java/org/springframework/ldap/transaction/compensating/manager/DummyDao.java rename to mvn-build/test/integration-tests/src/main/java/org/springframework/ldap/transaction/compensating/manager/DummyDao.java diff --git a/mvn-build/integration-tests/src/main/java/org/springframework/ldap/transaction/compensating/manager/DummyException.java b/mvn-build/test/integration-tests/src/main/java/org/springframework/ldap/transaction/compensating/manager/DummyException.java similarity index 100% rename from mvn-build/integration-tests/src/main/java/org/springframework/ldap/transaction/compensating/manager/DummyException.java rename to mvn-build/test/integration-tests/src/main/java/org/springframework/ldap/transaction/compensating/manager/DummyException.java diff --git a/mvn-build/integration-tests/src/main/java/org/springframework/ldap/transaction/compensating/manager/DummyServiceImpl.java b/mvn-build/test/integration-tests/src/main/java/org/springframework/ldap/transaction/compensating/manager/DummyServiceImpl.java similarity index 100% rename from mvn-build/integration-tests/src/main/java/org/springframework/ldap/transaction/compensating/manager/DummyServiceImpl.java rename to mvn-build/test/integration-tests/src/main/java/org/springframework/ldap/transaction/compensating/manager/DummyServiceImpl.java diff --git a/mvn-build/integration-tests/src/main/java/org/springframework/ldap/transaction/compensating/manager/LdapAndJdbcDummyDaoImpl.java b/mvn-build/test/integration-tests/src/main/java/org/springframework/ldap/transaction/compensating/manager/LdapAndJdbcDummyDaoImpl.java similarity index 100% rename from mvn-build/integration-tests/src/main/java/org/springframework/ldap/transaction/compensating/manager/LdapAndJdbcDummyDaoImpl.java rename to mvn-build/test/integration-tests/src/main/java/org/springframework/ldap/transaction/compensating/manager/LdapAndJdbcDummyDaoImpl.java diff --git a/mvn-build/integration-tests/src/main/java/org/springframework/ldap/transaction/compensating/manager/LdapDummyDaoImpl.java b/mvn-build/test/integration-tests/src/main/java/org/springframework/ldap/transaction/compensating/manager/LdapDummyDaoImpl.java similarity index 100% rename from mvn-build/integration-tests/src/main/java/org/springframework/ldap/transaction/compensating/manager/LdapDummyDaoImpl.java rename to mvn-build/test/integration-tests/src/main/java/org/springframework/ldap/transaction/compensating/manager/LdapDummyDaoImpl.java diff --git a/mvn-build/integration-tests/src/main/java/org/springframework/ldap/transaction/compensating/manager/hibernate/DummyDaoLdapAndHibernateImpl.java b/mvn-build/test/integration-tests/src/main/java/org/springframework/ldap/transaction/compensating/manager/hibernate/DummyDaoLdapAndHibernateImpl.java similarity index 100% rename from mvn-build/integration-tests/src/main/java/org/springframework/ldap/transaction/compensating/manager/hibernate/DummyDaoLdapAndHibernateImpl.java rename to mvn-build/test/integration-tests/src/main/java/org/springframework/ldap/transaction/compensating/manager/hibernate/DummyDaoLdapAndHibernateImpl.java diff --git a/mvn-build/integration-tests/src/main/java/org/springframework/ldap/transaction/compensating/manager/hibernate/OrgPerson.java b/mvn-build/test/integration-tests/src/main/java/org/springframework/ldap/transaction/compensating/manager/hibernate/OrgPerson.java similarity index 100% rename from mvn-build/integration-tests/src/main/java/org/springframework/ldap/transaction/compensating/manager/hibernate/OrgPerson.java rename to mvn-build/test/integration-tests/src/main/java/org/springframework/ldap/transaction/compensating/manager/hibernate/OrgPerson.java diff --git a/mvn-build/integration-tests/src/main/java/org/springframework/ldap/transaction/compensating/manager/hibernate/OrgPersonDao.java b/mvn-build/test/integration-tests/src/main/java/org/springframework/ldap/transaction/compensating/manager/hibernate/OrgPersonDao.java similarity index 100% rename from mvn-build/integration-tests/src/main/java/org/springframework/ldap/transaction/compensating/manager/hibernate/OrgPersonDao.java rename to mvn-build/test/integration-tests/src/main/java/org/springframework/ldap/transaction/compensating/manager/hibernate/OrgPersonDao.java diff --git a/mvn-build/integration-tests/src/test/java/log4j.properties b/mvn-build/test/integration-tests/src/test/java/log4j.properties similarity index 100% rename from mvn-build/integration-tests/src/test/java/log4j.properties rename to mvn-build/test/integration-tests/src/test/java/log4j.properties diff --git a/mvn-build/integration-tests/src/test/java/org/springframework/ldap/AbstractLdapTemplateIntegrationTest.java b/mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/AbstractLdapTemplateIntegrationTest.java similarity index 100% rename from mvn-build/integration-tests/src/test/java/org/springframework/ldap/AbstractLdapTemplateIntegrationTest.java rename to mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/AbstractLdapTemplateIntegrationTest.java diff --git a/mvn-build/integration-tests/src/test/java/org/springframework/ldap/InvalidBackslashITest.java b/mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/InvalidBackslashITest.java similarity index 100% rename from mvn-build/integration-tests/src/test/java/org/springframework/ldap/InvalidBackslashITest.java rename to mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/InvalidBackslashITest.java diff --git a/mvn-build/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateAttributesMapperITest.java b/mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateAttributesMapperITest.java similarity index 100% rename from mvn-build/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateAttributesMapperITest.java rename to mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateAttributesMapperITest.java diff --git a/mvn-build/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateBindUnbindITest.java b/mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateBindUnbindITest.java similarity index 100% rename from mvn-build/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateBindUnbindITest.java rename to mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateBindUnbindITest.java diff --git a/mvn-build/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateContextExecutorTest.java b/mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateContextExecutorTest.java similarity index 100% rename from mvn-build/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateContextExecutorTest.java rename to mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateContextExecutorTest.java diff --git a/mvn-build/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateContextMapperITest.java b/mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateContextMapperITest.java similarity index 100% rename from mvn-build/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateContextMapperITest.java rename to mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateContextMapperITest.java diff --git a/mvn-build/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateListITest.java b/mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateListITest.java similarity index 100% rename from mvn-build/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateListITest.java rename to mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateListITest.java diff --git a/mvn-build/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateLookupITest.java b/mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateLookupITest.java similarity index 100% rename from mvn-build/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateLookupITest.java rename to mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateLookupITest.java diff --git a/mvn-build/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateModifyITest.java b/mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateModifyITest.java similarity index 100% rename from mvn-build/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateModifyITest.java rename to mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateModifyITest.java diff --git a/mvn-build/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateNoBaseSuffixITest.java b/mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateNoBaseSuffixITest.java similarity index 100% rename from mvn-build/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateNoBaseSuffixITest.java rename to mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateNoBaseSuffixITest.java diff --git a/mvn-build/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateObjectBindIntegrationTest.java b/mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateObjectBindIntegrationTest.java similarity index 100% rename from mvn-build/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateObjectBindIntegrationTest.java rename to mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateObjectBindIntegrationTest.java diff --git a/mvn-build/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateRecursiveDeleteITest.java b/mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateRecursiveDeleteITest.java similarity index 100% rename from mvn-build/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateRecursiveDeleteITest.java rename to mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateRecursiveDeleteITest.java diff --git a/mvn-build/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateRenameITest.java b/mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateRenameITest.java similarity index 100% rename from mvn-build/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateRenameITest.java rename to mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateRenameITest.java diff --git a/mvn-build/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateSearchCountITest.xls b/mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateSearchCountITest.xls similarity index 100% rename from mvn-build/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateSearchCountITest.xls rename to mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateSearchCountITest.xls diff --git a/mvn-build/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateSearchResultITest.java b/mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateSearchResultITest.java similarity index 100% rename from mvn-build/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateSearchResultITest.java rename to mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateSearchResultITest.java diff --git a/mvn-build/integration-tests/src/test/java/org/springframework/ldap/control/SupportedControlsITest.java b/mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/control/SupportedControlsITest.java similarity index 100% rename from mvn-build/integration-tests/src/test/java/org/springframework/ldap/control/SupportedControlsITest.java rename to mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/control/SupportedControlsITest.java diff --git a/mvn-build/integration-tests/src/test/java/org/springframework/ldap/core/DistinguishedNameEditorITest.java b/mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/core/DistinguishedNameEditorITest.java similarity index 100% rename from mvn-build/integration-tests/src/test/java/org/springframework/ldap/core/DistinguishedNameEditorITest.java rename to mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/core/DistinguishedNameEditorITest.java diff --git a/mvn-build/integration-tests/src/test/java/org/springframework/ldap/core/DnParsePerformanceITest.java b/mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/core/DnParsePerformanceITest.java similarity index 100% rename from mvn-build/integration-tests/src/test/java/org/springframework/ldap/core/DnParsePerformanceITest.java rename to mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/core/DnParsePerformanceITest.java diff --git a/mvn-build/integration-tests/src/test/java/org/springframework/ldap/core/simple/SimpleLdapTemplateITest.java b/mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/core/simple/SimpleLdapTemplateITest.java similarity index 100% rename from mvn-build/integration-tests/src/test/java/org/springframework/ldap/core/simple/SimpleLdapTemplateITest.java rename to mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/core/simple/SimpleLdapTemplateITest.java diff --git a/mvn-build/integration-tests/src/test/java/org/springframework/ldap/core/support/BaseLdapPathBeanPostprocessorITest.java b/mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/core/support/BaseLdapPathBeanPostprocessorITest.java similarity index 100% rename from mvn-build/integration-tests/src/test/java/org/springframework/ldap/core/support/BaseLdapPathBeanPostprocessorITest.java rename to mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/core/support/BaseLdapPathBeanPostprocessorITest.java diff --git a/mvn-build/integration-tests/src/test/java/org/springframework/ldap/core/support/LdapContextSourcelITest.java b/mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/core/support/LdapContextSourcelITest.java similarity index 100% rename from mvn-build/integration-tests/src/test/java/org/springframework/ldap/core/support/LdapContextSourcelITest.java rename to mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/core/support/LdapContextSourcelITest.java diff --git a/mvn-build/integration-tests/src/test/java/org/springframework/ldap/core/support/LdapContextSourcelMultiServerITest.java b/mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/core/support/LdapContextSourcelMultiServerITest.java similarity index 100% rename from mvn-build/integration-tests/src/test/java/org/springframework/ldap/core/support/LdapContextSourcelMultiServerITest.java rename to mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/core/support/LdapContextSourcelMultiServerITest.java diff --git a/mvn-build/integration-tests/src/test/java/org/springframework/ldap/filter/HardcodedFilterIntegrationTest.java b/mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/filter/HardcodedFilterIntegrationTest.java similarity index 100% rename from mvn-build/integration-tests/src/test/java/org/springframework/ldap/filter/HardcodedFilterIntegrationTest.java rename to mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/filter/HardcodedFilterIntegrationTest.java diff --git a/mvn-build/integration-tests/src/test/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceAndDataSourceTransactionManagerIntegrationTest.java b/mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceAndDataSourceTransactionManagerIntegrationTest.java similarity index 100% rename from mvn-build/integration-tests/src/test/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceAndDataSourceTransactionManagerIntegrationTest.java rename to mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceAndDataSourceTransactionManagerIntegrationTest.java diff --git a/mvn-build/integration-tests/src/test/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceTransactionManagerIntegrationTest.java b/mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceTransactionManagerIntegrationTest.java similarity index 100% rename from mvn-build/integration-tests/src/test/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceTransactionManagerIntegrationTest.java rename to mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceTransactionManagerIntegrationTest.java diff --git a/mvn-build/integration-tests/src/test/java/org/springframework/ldap/transaction/compensating/manager/hibernate/ContextSourceAndHibernateTransactionManagerIntegrationTest.java b/mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/transaction/compensating/manager/hibernate/ContextSourceAndHibernateTransactionManagerIntegrationTest.java similarity index 100% rename from mvn-build/integration-tests/src/test/java/org/springframework/ldap/transaction/compensating/manager/hibernate/ContextSourceAndHibernateTransactionManagerIntegrationTest.java rename to mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/transaction/compensating/manager/hibernate/ContextSourceAndHibernateTransactionManagerIntegrationTest.java diff --git a/mvn-build/integration-tests/src/test/java/setup_data.ldif b/mvn-build/test/integration-tests/src/test/java/setup_data.ldif similarity index 100% rename from mvn-build/integration-tests/src/test/java/setup_data.ldif rename to mvn-build/test/integration-tests/src/test/java/setup_data.ldif diff --git a/mvn-build/integration-tests/src/test/java/teardown_data.ldif b/mvn-build/test/integration-tests/src/test/java/teardown_data.ldif similarity index 100% rename from mvn-build/integration-tests/src/test/java/teardown_data.ldif rename to mvn-build/test/integration-tests/src/test/java/teardown_data.ldif diff --git a/mvn-build/integration-tests/src/test/resources/conf/OrgPerson.hbm.xml b/mvn-build/test/integration-tests/src/test/resources/conf/OrgPerson.hbm.xml similarity index 100% rename from mvn-build/integration-tests/src/test/resources/conf/OrgPerson.hbm.xml rename to mvn-build/test/integration-tests/src/test/resources/conf/OrgPerson.hbm.xml diff --git a/mvn-build/integration-tests/src/test/resources/conf/apacheDsContext.xml b/mvn-build/test/integration-tests/src/test/resources/conf/apacheDsContext.xml similarity index 100% rename from mvn-build/integration-tests/src/test/resources/conf/apacheDsContext.xml rename to mvn-build/test/integration-tests/src/test/resources/conf/apacheDsContext.xml diff --git a/mvn-build/integration-tests/src/test/resources/conf/baseLdapPathPostProcessorMultiContextSourceOneSpecTestContext.xml b/mvn-build/test/integration-tests/src/test/resources/conf/baseLdapPathPostProcessorMultiContextSourceOneSpecTestContext.xml similarity index 100% rename from mvn-build/integration-tests/src/test/resources/conf/baseLdapPathPostProcessorMultiContextSourceOneSpecTestContext.xml rename to mvn-build/test/integration-tests/src/test/resources/conf/baseLdapPathPostProcessorMultiContextSourceOneSpecTestContext.xml diff --git a/mvn-build/integration-tests/src/test/resources/conf/baseLdapPathPostProcessorMultiContextSourceTestContext.xml b/mvn-build/test/integration-tests/src/test/resources/conf/baseLdapPathPostProcessorMultiContextSourceTestContext.xml similarity index 100% rename from mvn-build/integration-tests/src/test/resources/conf/baseLdapPathPostProcessorMultiContextSourceTestContext.xml rename to mvn-build/test/integration-tests/src/test/resources/conf/baseLdapPathPostProcessorMultiContextSourceTestContext.xml diff --git a/mvn-build/integration-tests/src/test/resources/conf/baseLdapPathPostProcessorNoContextSourceTestContext.xml b/mvn-build/test/integration-tests/src/test/resources/conf/baseLdapPathPostProcessorNoContextSourceTestContext.xml similarity index 100% rename from mvn-build/integration-tests/src/test/resources/conf/baseLdapPathPostProcessorNoContextSourceTestContext.xml rename to mvn-build/test/integration-tests/src/test/resources/conf/baseLdapPathPostProcessorNoContextSourceTestContext.xml diff --git a/mvn-build/integration-tests/src/test/resources/conf/baseLdapPathPostProcessorPropertyOverrideTestContext.xml b/mvn-build/test/integration-tests/src/test/resources/conf/baseLdapPathPostProcessorPropertyOverrideTestContext.xml similarity index 100% rename from mvn-build/integration-tests/src/test/resources/conf/baseLdapPathPostProcessorPropertyOverrideTestContext.xml rename to mvn-build/test/integration-tests/src/test/resources/conf/baseLdapPathPostProcessorPropertyOverrideTestContext.xml diff --git a/mvn-build/integration-tests/src/test/resources/conf/baseLdapPathPostProcessorTestContext.xml b/mvn-build/test/integration-tests/src/test/resources/conf/baseLdapPathPostProcessorTestContext.xml similarity index 100% rename from mvn-build/integration-tests/src/test/resources/conf/baseLdapPathPostProcessorTestContext.xml rename to mvn-build/test/integration-tests/src/test/resources/conf/baseLdapPathPostProcessorTestContext.xml diff --git a/mvn-build/integration-tests/src/test/resources/conf/baseLdapPathPostProcessorTransactionTestContext.xml b/mvn-build/test/integration-tests/src/test/resources/conf/baseLdapPathPostProcessorTransactionTestContext.xml similarity index 100% rename from mvn-build/integration-tests/src/test/resources/conf/baseLdapPathPostProcessorTransactionTestContext.xml rename to mvn-build/test/integration-tests/src/test/resources/conf/baseLdapPathPostProcessorTransactionTestContext.xml diff --git a/mvn-build/integration-tests/src/test/resources/conf/commonTestContext.xml b/mvn-build/test/integration-tests/src/test/resources/conf/commonTestContext.xml similarity index 100% rename from mvn-build/integration-tests/src/test/resources/conf/commonTestContext.xml rename to mvn-build/test/integration-tests/src/test/resources/conf/commonTestContext.xml diff --git a/mvn-build/integration-tests/src/test/resources/conf/distinguishedNameEditorTestContext.xml b/mvn-build/test/integration-tests/src/test/resources/conf/distinguishedNameEditorTestContext.xml similarity index 100% rename from mvn-build/integration-tests/src/test/resources/conf/distinguishedNameEditorTestContext.xml rename to mvn-build/test/integration-tests/src/test/resources/conf/distinguishedNameEditorTestContext.xml diff --git a/mvn-build/integration-tests/src/test/resources/conf/hardcodedFilterTestContext.xml b/mvn-build/test/integration-tests/src/test/resources/conf/hardcodedFilterTestContext.xml similarity index 100% rename from mvn-build/integration-tests/src/test/resources/conf/hardcodedFilterTestContext.xml rename to mvn-build/test/integration-tests/src/test/resources/conf/hardcodedFilterTestContext.xml diff --git a/mvn-build/integration-tests/src/test/resources/conf/ldap.properties b/mvn-build/test/integration-tests/src/test/resources/conf/ldap.properties similarity index 100% rename from mvn-build/integration-tests/src/test/resources/conf/ldap.properties rename to mvn-build/test/integration-tests/src/test/resources/conf/ldap.properties diff --git a/mvn-build/integration-tests/src/test/resources/conf/ldapAndHibernateTransactionTestContext.xml b/mvn-build/test/integration-tests/src/test/resources/conf/ldapAndHibernateTransactionTestContext.xml similarity index 100% rename from mvn-build/integration-tests/src/test/resources/conf/ldapAndHibernateTransactionTestContext.xml rename to mvn-build/test/integration-tests/src/test/resources/conf/ldapAndHibernateTransactionTestContext.xml diff --git a/mvn-build/integration-tests/src/test/resources/conf/ldapAndJdbcTransactionTestContext.xml b/mvn-build/test/integration-tests/src/test/resources/conf/ldapAndJdbcTransactionTestContext.xml similarity index 100% rename from mvn-build/integration-tests/src/test/resources/conf/ldapAndJdbcTransactionTestContext.xml rename to mvn-build/test/integration-tests/src/test/resources/conf/ldapAndJdbcTransactionTestContext.xml diff --git a/mvn-build/integration-tests/src/test/resources/conf/ldapContextSourceTestContext.xml b/mvn-build/test/integration-tests/src/test/resources/conf/ldapContextSourceTestContext.xml similarity index 100% rename from mvn-build/integration-tests/src/test/resources/conf/ldapContextSourceTestContext.xml rename to mvn-build/test/integration-tests/src/test/resources/conf/ldapContextSourceTestContext.xml diff --git a/mvn-build/integration-tests/src/test/resources/conf/ldapTemplateAcegiTestContext.xml b/mvn-build/test/integration-tests/src/test/resources/conf/ldapTemplateAcegiTestContext.xml similarity index 100% rename from mvn-build/integration-tests/src/test/resources/conf/ldapTemplateAcegiTestContext.xml rename to mvn-build/test/integration-tests/src/test/resources/conf/ldapTemplateAcegiTestContext.xml diff --git a/mvn-build/integration-tests/src/test/resources/conf/ldapTemplateNoBaseSuffixTestContext.xml b/mvn-build/test/integration-tests/src/test/resources/conf/ldapTemplateNoBaseSuffixTestContext.xml similarity index 100% rename from mvn-build/integration-tests/src/test/resources/conf/ldapTemplateNoBaseSuffixTestContext.xml rename to mvn-build/test/integration-tests/src/test/resources/conf/ldapTemplateNoBaseSuffixTestContext.xml diff --git a/mvn-build/integration-tests/src/test/resources/conf/ldapTemplateObjectBindTestContext.xml b/mvn-build/test/integration-tests/src/test/resources/conf/ldapTemplateObjectBindTestContext.xml similarity index 100% rename from mvn-build/integration-tests/src/test/resources/conf/ldapTemplateObjectBindTestContext.xml rename to mvn-build/test/integration-tests/src/test/resources/conf/ldapTemplateObjectBindTestContext.xml diff --git a/mvn-build/integration-tests/src/test/resources/conf/ldapTemplateTestContext.xml b/mvn-build/test/integration-tests/src/test/resources/conf/ldapTemplateTestContext.xml similarity index 100% rename from mvn-build/integration-tests/src/test/resources/conf/ldapTemplateTestContext.xml rename to mvn-build/test/integration-tests/src/test/resources/conf/ldapTemplateTestContext.xml diff --git a/mvn-build/integration-tests/src/test/resources/conf/ldapTemplateTransactionTestContext.xml b/mvn-build/test/integration-tests/src/test/resources/conf/ldapTemplateTransactionTestContext.xml similarity index 100% rename from mvn-build/integration-tests/src/test/resources/conf/ldapTemplateTransactionTestContext.xml rename to mvn-build/test/integration-tests/src/test/resources/conf/ldapTemplateTransactionTestContext.xml diff --git a/mvn-build/integration-tests/src/test/resources/conf/rootContextSourceTestContext.xml b/mvn-build/test/integration-tests/src/test/resources/conf/rootContextSourceTestContext.xml similarity index 100% rename from mvn-build/integration-tests/src/test/resources/conf/rootContextSourceTestContext.xml rename to mvn-build/test/integration-tests/src/test/resources/conf/rootContextSourceTestContext.xml diff --git a/mvn-build/integration-tests/src/test/resources/conf/simpleLdapTemplateTestContext.xml b/mvn-build/test/integration-tests/src/test/resources/conf/simpleLdapTemplateTestContext.xml similarity index 100% rename from mvn-build/integration-tests/src/test/resources/conf/simpleLdapTemplateTestContext.xml rename to mvn-build/test/integration-tests/src/test/resources/conf/simpleLdapTemplateTestContext.xml diff --git a/mvn-build/integration-tests/src/test/resources/log4j.properties b/mvn-build/test/integration-tests/src/test/resources/log4j.properties similarity index 100% rename from mvn-build/integration-tests/src/test/resources/log4j.properties rename to mvn-build/test/integration-tests/src/test/resources/log4j.properties diff --git a/mvn-build/integration-tests/src/test/resources/setup_data.ldif b/mvn-build/test/integration-tests/src/test/resources/setup_data.ldif similarity index 100% rename from mvn-build/integration-tests/src/test/resources/setup_data.ldif rename to mvn-build/test/integration-tests/src/test/resources/setup_data.ldif diff --git a/mvn-build/test/pom.xml b/mvn-build/test/pom.xml new file mode 100644 index 00000000..f9331d7a --- /dev/null +++ b/mvn-build/test/pom.xml @@ -0,0 +1,56 @@ + + + + + org.springframework.ldap + spring-ldap-parent + 1.3-SNAPSHOT + + 4.0.0 + spring-ldap-integration-tests-parent + pom + Spring LDAP Integration Tests + + integration-tests + + + + openldap + + integration-tests-openldap + + + + + + spring-milestone + Spring Milestone Repository + http://maven.springframework.org/milestone + + + + + + org.mortbay.jetty + maven-jetty-plugin + + + org.apache.maven.plugins + maven-war-plugin + + ${pom.artifactId} + + + + + + + + log4j + log4j + runtime + + +