diff --git a/mvn-build/acegi-support/pom.xml b/acegi-support/pom.xml
similarity index 100%
rename from mvn-build/acegi-support/pom.xml
rename to acegi-support/pom.xml
diff --git a/mvn-build/acegi-support/src/main/java/org/springframework/ldap/authentication/AcegiAuthenticationSource.java b/acegi-support/src/main/java/org/springframework/ldap/authentication/AcegiAuthenticationSource.java
similarity index 100%
rename from mvn-build/acegi-support/src/main/java/org/springframework/ldap/authentication/AcegiAuthenticationSource.java
rename to acegi-support/src/main/java/org/springframework/ldap/authentication/AcegiAuthenticationSource.java
diff --git a/mvn-build/acegi-support/src/test/java/org/springframework/ldap/authentication/AcegiAuthenticationSourceTest.java b/acegi-support/src/test/java/org/springframework/ldap/authentication/AcegiAuthenticationSourceTest.java
similarity index 100%
rename from mvn-build/acegi-support/src/test/java/org/springframework/ldap/authentication/AcegiAuthenticationSourceTest.java
rename to acegi-support/src/test/java/org/springframework/ldap/authentication/AcegiAuthenticationSourceTest.java
diff --git a/mvn-build/core-tiger/pom.xml b/core-tiger/pom.xml
similarity index 100%
rename from mvn-build/core-tiger/pom.xml
rename to core-tiger/pom.xml
diff --git a/mvn-build/core-tiger/src/assemble/bin-with-source.xml b/core-tiger/src/assemble/bin-with-source.xml
similarity index 100%
rename from mvn-build/core-tiger/src/assemble/bin-with-source.xml
rename to core-tiger/src/assemble/bin-with-source.xml
diff --git a/mvn-build/core-tiger/src/main/java/org/springframework/ldap/core/simple/AbstractParameterizedContextMapper.java b/core-tiger/src/main/java/org/springframework/ldap/core/simple/AbstractParameterizedContextMapper.java
similarity index 100%
rename from mvn-build/core-tiger/src/main/java/org/springframework/ldap/core/simple/AbstractParameterizedContextMapper.java
rename to core-tiger/src/main/java/org/springframework/ldap/core/simple/AbstractParameterizedContextMapper.java
diff --git a/mvn-build/core-tiger/src/main/java/org/springframework/ldap/core/simple/ParameterizedContextMapper.java b/core-tiger/src/main/java/org/springframework/ldap/core/simple/ParameterizedContextMapper.java
similarity index 100%
rename from mvn-build/core-tiger/src/main/java/org/springframework/ldap/core/simple/ParameterizedContextMapper.java
rename to core-tiger/src/main/java/org/springframework/ldap/core/simple/ParameterizedContextMapper.java
diff --git a/mvn-build/core-tiger/src/main/java/org/springframework/ldap/core/simple/SimpleLdapOperations.java b/core-tiger/src/main/java/org/springframework/ldap/core/simple/SimpleLdapOperations.java
similarity index 100%
rename from mvn-build/core-tiger/src/main/java/org/springframework/ldap/core/simple/SimpleLdapOperations.java
rename to core-tiger/src/main/java/org/springframework/ldap/core/simple/SimpleLdapOperations.java
diff --git a/mvn-build/core-tiger/src/main/java/org/springframework/ldap/core/simple/SimpleLdapTemplate.java b/core-tiger/src/main/java/org/springframework/ldap/core/simple/SimpleLdapTemplate.java
similarity index 100%
rename from mvn-build/core-tiger/src/main/java/org/springframework/ldap/core/simple/SimpleLdapTemplate.java
rename to core-tiger/src/main/java/org/springframework/ldap/core/simple/SimpleLdapTemplate.java
diff --git a/mvn-build/core-tiger/src/main/java/org/springframework/ldap/core/simple/package.html b/core-tiger/src/main/java/org/springframework/ldap/core/simple/package.html
similarity index 100%
rename from mvn-build/core-tiger/src/main/java/org/springframework/ldap/core/simple/package.html
rename to core-tiger/src/main/java/org/springframework/ldap/core/simple/package.html
diff --git a/mvn-build/core-tiger/src/main/java/overview.html b/core-tiger/src/main/java/overview.html
similarity index 100%
rename from mvn-build/core-tiger/src/main/java/overview.html
rename to core-tiger/src/main/java/overview.html
diff --git a/mvn-build/core/build-instructions.txt b/core/build-instructions.txt
similarity index 100%
rename from mvn-build/core/build-instructions.txt
rename to core/build-instructions.txt
diff --git a/mvn-build/core/build.xml b/core/build.xml
similarity index 100%
rename from mvn-build/core/build.xml
rename to core/build.xml
diff --git a/mvn-build/core/changelog.txt b/core/changelog.txt
similarity index 100%
rename from mvn-build/core/changelog.txt
rename to core/changelog.txt
diff --git a/mvn-build/core/docs/quickstart/quickstart.pdf b/core/docs/quickstart/quickstart.pdf
similarity index 100%
rename from mvn-build/core/docs/quickstart/quickstart.pdf
rename to core/docs/quickstart/quickstart.pdf
diff --git a/mvn-build/core/docs/reference/images/admons/blank.png b/core/docs/reference/images/admons/blank.png
similarity index 100%
rename from mvn-build/core/docs/reference/images/admons/blank.png
rename to core/docs/reference/images/admons/blank.png
diff --git a/mvn-build/core/docs/reference/images/admons/caution.gif b/core/docs/reference/images/admons/caution.gif
similarity index 100%
rename from mvn-build/core/docs/reference/images/admons/caution.gif
rename to core/docs/reference/images/admons/caution.gif
diff --git a/mvn-build/core/docs/reference/images/admons/caution.png b/core/docs/reference/images/admons/caution.png
similarity index 100%
rename from mvn-build/core/docs/reference/images/admons/caution.png
rename to core/docs/reference/images/admons/caution.png
diff --git a/mvn-build/core/docs/reference/images/admons/caution.tif b/core/docs/reference/images/admons/caution.tif
similarity index 100%
rename from mvn-build/core/docs/reference/images/admons/caution.tif
rename to core/docs/reference/images/admons/caution.tif
diff --git a/mvn-build/core/docs/reference/images/admons/draft.png b/core/docs/reference/images/admons/draft.png
similarity index 100%
rename from mvn-build/core/docs/reference/images/admons/draft.png
rename to core/docs/reference/images/admons/draft.png
diff --git a/mvn-build/core/docs/reference/images/admons/home.gif b/core/docs/reference/images/admons/home.gif
similarity index 100%
rename from mvn-build/core/docs/reference/images/admons/home.gif
rename to core/docs/reference/images/admons/home.gif
diff --git a/mvn-build/core/docs/reference/images/admons/home.png b/core/docs/reference/images/admons/home.png
similarity index 100%
rename from mvn-build/core/docs/reference/images/admons/home.png
rename to core/docs/reference/images/admons/home.png
diff --git a/mvn-build/core/docs/reference/images/admons/important.gif b/core/docs/reference/images/admons/important.gif
similarity index 100%
rename from mvn-build/core/docs/reference/images/admons/important.gif
rename to core/docs/reference/images/admons/important.gif
diff --git a/mvn-build/core/docs/reference/images/admons/important.png b/core/docs/reference/images/admons/important.png
similarity index 100%
rename from mvn-build/core/docs/reference/images/admons/important.png
rename to core/docs/reference/images/admons/important.png
diff --git a/mvn-build/core/docs/reference/images/admons/important.tif b/core/docs/reference/images/admons/important.tif
similarity index 100%
rename from mvn-build/core/docs/reference/images/admons/important.tif
rename to core/docs/reference/images/admons/important.tif
diff --git a/mvn-build/core/docs/reference/images/admons/next.gif b/core/docs/reference/images/admons/next.gif
similarity index 100%
rename from mvn-build/core/docs/reference/images/admons/next.gif
rename to core/docs/reference/images/admons/next.gif
diff --git a/mvn-build/core/docs/reference/images/admons/next.png b/core/docs/reference/images/admons/next.png
similarity index 100%
rename from mvn-build/core/docs/reference/images/admons/next.png
rename to core/docs/reference/images/admons/next.png
diff --git a/mvn-build/core/docs/reference/images/admons/note.gif b/core/docs/reference/images/admons/note.gif
similarity index 100%
rename from mvn-build/core/docs/reference/images/admons/note.gif
rename to core/docs/reference/images/admons/note.gif
diff --git a/mvn-build/core/docs/reference/images/admons/note.png b/core/docs/reference/images/admons/note.png
similarity index 100%
rename from mvn-build/core/docs/reference/images/admons/note.png
rename to core/docs/reference/images/admons/note.png
diff --git a/mvn-build/core/docs/reference/images/admons/note.tif b/core/docs/reference/images/admons/note.tif
similarity index 100%
rename from mvn-build/core/docs/reference/images/admons/note.tif
rename to core/docs/reference/images/admons/note.tif
diff --git a/mvn-build/core/docs/reference/images/admons/prev.gif b/core/docs/reference/images/admons/prev.gif
similarity index 100%
rename from mvn-build/core/docs/reference/images/admons/prev.gif
rename to core/docs/reference/images/admons/prev.gif
diff --git a/mvn-build/core/docs/reference/images/admons/prev.png b/core/docs/reference/images/admons/prev.png
similarity index 100%
rename from mvn-build/core/docs/reference/images/admons/prev.png
rename to core/docs/reference/images/admons/prev.png
diff --git a/mvn-build/core/docs/reference/images/admons/tip.gif b/core/docs/reference/images/admons/tip.gif
similarity index 100%
rename from mvn-build/core/docs/reference/images/admons/tip.gif
rename to core/docs/reference/images/admons/tip.gif
diff --git a/mvn-build/core/docs/reference/images/admons/tip.png b/core/docs/reference/images/admons/tip.png
similarity index 100%
rename from mvn-build/core/docs/reference/images/admons/tip.png
rename to core/docs/reference/images/admons/tip.png
diff --git a/mvn-build/core/docs/reference/images/admons/tip.tif b/core/docs/reference/images/admons/tip.tif
similarity index 100%
rename from mvn-build/core/docs/reference/images/admons/tip.tif
rename to core/docs/reference/images/admons/tip.tif
diff --git a/mvn-build/core/docs/reference/images/admons/toc-blank.png b/core/docs/reference/images/admons/toc-blank.png
similarity index 100%
rename from mvn-build/core/docs/reference/images/admons/toc-blank.png
rename to core/docs/reference/images/admons/toc-blank.png
diff --git a/mvn-build/core/docs/reference/images/admons/toc-minus.png b/core/docs/reference/images/admons/toc-minus.png
similarity index 100%
rename from mvn-build/core/docs/reference/images/admons/toc-minus.png
rename to core/docs/reference/images/admons/toc-minus.png
diff --git a/mvn-build/core/docs/reference/images/admons/toc-plus.png b/core/docs/reference/images/admons/toc-plus.png
similarity index 100%
rename from mvn-build/core/docs/reference/images/admons/toc-plus.png
rename to core/docs/reference/images/admons/toc-plus.png
diff --git a/mvn-build/core/docs/reference/images/admons/up.gif b/core/docs/reference/images/admons/up.gif
similarity index 100%
rename from mvn-build/core/docs/reference/images/admons/up.gif
rename to core/docs/reference/images/admons/up.gif
diff --git a/mvn-build/core/docs/reference/images/admons/up.png b/core/docs/reference/images/admons/up.png
similarity index 100%
rename from mvn-build/core/docs/reference/images/admons/up.png
rename to core/docs/reference/images/admons/up.png
diff --git a/mvn-build/core/docs/reference/images/admons/warning.gif b/core/docs/reference/images/admons/warning.gif
similarity index 100%
rename from mvn-build/core/docs/reference/images/admons/warning.gif
rename to core/docs/reference/images/admons/warning.gif
diff --git a/mvn-build/core/docs/reference/images/admons/warning.png b/core/docs/reference/images/admons/warning.png
similarity index 100%
rename from mvn-build/core/docs/reference/images/admons/warning.png
rename to core/docs/reference/images/admons/warning.png
diff --git a/mvn-build/core/docs/reference/images/admons/warning.tif b/core/docs/reference/images/admons/warning.tif
similarity index 100%
rename from mvn-build/core/docs/reference/images/admons/warning.tif
rename to core/docs/reference/images/admons/warning.tif
diff --git a/mvn-build/core/docs/reference/images/callouts/1.gif b/core/docs/reference/images/callouts/1.gif
similarity index 100%
rename from mvn-build/core/docs/reference/images/callouts/1.gif
rename to core/docs/reference/images/callouts/1.gif
diff --git a/mvn-build/core/docs/reference/images/callouts/1.png b/core/docs/reference/images/callouts/1.png
similarity index 100%
rename from mvn-build/core/docs/reference/images/callouts/1.png
rename to core/docs/reference/images/callouts/1.png
diff --git a/mvn-build/core/docs/reference/images/callouts/10.gif b/core/docs/reference/images/callouts/10.gif
similarity index 100%
rename from mvn-build/core/docs/reference/images/callouts/10.gif
rename to core/docs/reference/images/callouts/10.gif
diff --git a/mvn-build/core/docs/reference/images/callouts/10.png b/core/docs/reference/images/callouts/10.png
similarity index 100%
rename from mvn-build/core/docs/reference/images/callouts/10.png
rename to core/docs/reference/images/callouts/10.png
diff --git a/mvn-build/core/docs/reference/images/callouts/11.gif b/core/docs/reference/images/callouts/11.gif
similarity index 100%
rename from mvn-build/core/docs/reference/images/callouts/11.gif
rename to core/docs/reference/images/callouts/11.gif
diff --git a/mvn-build/core/docs/reference/images/callouts/11.png b/core/docs/reference/images/callouts/11.png
similarity index 100%
rename from mvn-build/core/docs/reference/images/callouts/11.png
rename to core/docs/reference/images/callouts/11.png
diff --git a/mvn-build/core/docs/reference/images/callouts/12.gif b/core/docs/reference/images/callouts/12.gif
similarity index 100%
rename from mvn-build/core/docs/reference/images/callouts/12.gif
rename to core/docs/reference/images/callouts/12.gif
diff --git a/mvn-build/core/docs/reference/images/callouts/12.png b/core/docs/reference/images/callouts/12.png
similarity index 100%
rename from mvn-build/core/docs/reference/images/callouts/12.png
rename to core/docs/reference/images/callouts/12.png
diff --git a/mvn-build/core/docs/reference/images/callouts/13.gif b/core/docs/reference/images/callouts/13.gif
similarity index 100%
rename from mvn-build/core/docs/reference/images/callouts/13.gif
rename to core/docs/reference/images/callouts/13.gif
diff --git a/mvn-build/core/docs/reference/images/callouts/13.png b/core/docs/reference/images/callouts/13.png
similarity index 100%
rename from mvn-build/core/docs/reference/images/callouts/13.png
rename to core/docs/reference/images/callouts/13.png
diff --git a/mvn-build/core/docs/reference/images/callouts/14.gif b/core/docs/reference/images/callouts/14.gif
similarity index 100%
rename from mvn-build/core/docs/reference/images/callouts/14.gif
rename to core/docs/reference/images/callouts/14.gif
diff --git a/mvn-build/core/docs/reference/images/callouts/14.png b/core/docs/reference/images/callouts/14.png
similarity index 100%
rename from mvn-build/core/docs/reference/images/callouts/14.png
rename to core/docs/reference/images/callouts/14.png
diff --git a/mvn-build/core/docs/reference/images/callouts/15.gif b/core/docs/reference/images/callouts/15.gif
similarity index 100%
rename from mvn-build/core/docs/reference/images/callouts/15.gif
rename to core/docs/reference/images/callouts/15.gif
diff --git a/mvn-build/core/docs/reference/images/callouts/15.png b/core/docs/reference/images/callouts/15.png
similarity index 100%
rename from mvn-build/core/docs/reference/images/callouts/15.png
rename to core/docs/reference/images/callouts/15.png
diff --git a/mvn-build/core/docs/reference/images/callouts/2.gif b/core/docs/reference/images/callouts/2.gif
similarity index 100%
rename from mvn-build/core/docs/reference/images/callouts/2.gif
rename to core/docs/reference/images/callouts/2.gif
diff --git a/mvn-build/core/docs/reference/images/callouts/2.png b/core/docs/reference/images/callouts/2.png
similarity index 100%
rename from mvn-build/core/docs/reference/images/callouts/2.png
rename to core/docs/reference/images/callouts/2.png
diff --git a/mvn-build/core/docs/reference/images/callouts/3.gif b/core/docs/reference/images/callouts/3.gif
similarity index 100%
rename from mvn-build/core/docs/reference/images/callouts/3.gif
rename to core/docs/reference/images/callouts/3.gif
diff --git a/mvn-build/core/docs/reference/images/callouts/3.png b/core/docs/reference/images/callouts/3.png
similarity index 100%
rename from mvn-build/core/docs/reference/images/callouts/3.png
rename to core/docs/reference/images/callouts/3.png
diff --git a/mvn-build/core/docs/reference/images/callouts/4.gif b/core/docs/reference/images/callouts/4.gif
similarity index 100%
rename from mvn-build/core/docs/reference/images/callouts/4.gif
rename to core/docs/reference/images/callouts/4.gif
diff --git a/mvn-build/core/docs/reference/images/callouts/4.png b/core/docs/reference/images/callouts/4.png
similarity index 100%
rename from mvn-build/core/docs/reference/images/callouts/4.png
rename to core/docs/reference/images/callouts/4.png
diff --git a/mvn-build/core/docs/reference/images/callouts/5.gif b/core/docs/reference/images/callouts/5.gif
similarity index 100%
rename from mvn-build/core/docs/reference/images/callouts/5.gif
rename to core/docs/reference/images/callouts/5.gif
diff --git a/mvn-build/core/docs/reference/images/callouts/5.png b/core/docs/reference/images/callouts/5.png
similarity index 100%
rename from mvn-build/core/docs/reference/images/callouts/5.png
rename to core/docs/reference/images/callouts/5.png
diff --git a/mvn-build/core/docs/reference/images/callouts/6.gif b/core/docs/reference/images/callouts/6.gif
similarity index 100%
rename from mvn-build/core/docs/reference/images/callouts/6.gif
rename to core/docs/reference/images/callouts/6.gif
diff --git a/mvn-build/core/docs/reference/images/callouts/6.png b/core/docs/reference/images/callouts/6.png
similarity index 100%
rename from mvn-build/core/docs/reference/images/callouts/6.png
rename to core/docs/reference/images/callouts/6.png
diff --git a/mvn-build/core/docs/reference/images/callouts/7.gif b/core/docs/reference/images/callouts/7.gif
similarity index 100%
rename from mvn-build/core/docs/reference/images/callouts/7.gif
rename to core/docs/reference/images/callouts/7.gif
diff --git a/mvn-build/core/docs/reference/images/callouts/7.png b/core/docs/reference/images/callouts/7.png
similarity index 100%
rename from mvn-build/core/docs/reference/images/callouts/7.png
rename to core/docs/reference/images/callouts/7.png
diff --git a/mvn-build/core/docs/reference/images/callouts/8.gif b/core/docs/reference/images/callouts/8.gif
similarity index 100%
rename from mvn-build/core/docs/reference/images/callouts/8.gif
rename to core/docs/reference/images/callouts/8.gif
diff --git a/mvn-build/core/docs/reference/images/callouts/8.png b/core/docs/reference/images/callouts/8.png
similarity index 100%
rename from mvn-build/core/docs/reference/images/callouts/8.png
rename to core/docs/reference/images/callouts/8.png
diff --git a/mvn-build/core/docs/reference/images/callouts/9.gif b/core/docs/reference/images/callouts/9.gif
similarity index 100%
rename from mvn-build/core/docs/reference/images/callouts/9.gif
rename to core/docs/reference/images/callouts/9.gif
diff --git a/mvn-build/core/docs/reference/images/callouts/9.png b/core/docs/reference/images/callouts/9.png
similarity index 100%
rename from mvn-build/core/docs/reference/images/callouts/9.png
rename to core/docs/reference/images/callouts/9.png
diff --git a/mvn-build/core/docs/reference/readme.txt b/core/docs/reference/readme.txt
similarity index 100%
rename from mvn-build/core/docs/reference/readme.txt
rename to core/docs/reference/readme.txt
diff --git a/mvn-build/core/docs/reference/src/basic.xml b/core/docs/reference/src/basic.xml
similarity index 100%
rename from mvn-build/core/docs/reference/src/basic.xml
rename to core/docs/reference/src/basic.xml
diff --git a/mvn-build/core/docs/reference/src/configuration.xml b/core/docs/reference/src/configuration.xml
similarity index 100%
rename from mvn-build/core/docs/reference/src/configuration.xml
rename to core/docs/reference/src/configuration.xml
diff --git a/mvn-build/core/docs/reference/src/contextprocessor.xml b/core/docs/reference/src/contextprocessor.xml
similarity index 100%
rename from mvn-build/core/docs/reference/src/contextprocessor.xml
rename to core/docs/reference/src/contextprocessor.xml
diff --git a/mvn-build/core/docs/reference/src/dirobjectfactory.xml b/core/docs/reference/src/dirobjectfactory.xml
similarity index 100%
rename from mvn-build/core/docs/reference/src/dirobjectfactory.xml
rename to core/docs/reference/src/dirobjectfactory.xml
diff --git a/mvn-build/core/docs/reference/src/executors.xml b/core/docs/reference/src/executors.xml
similarity index 100%
rename from mvn-build/core/docs/reference/src/executors.xml
rename to core/docs/reference/src/executors.xml
diff --git a/mvn-build/core/docs/reference/src/images/NamingException.png b/core/docs/reference/src/images/NamingException.png
similarity index 100%
rename from mvn-build/core/docs/reference/src/images/NamingException.png
rename to core/docs/reference/src/images/NamingException.png
diff --git a/mvn-build/core/docs/reference/src/images/banner4.jpg b/core/docs/reference/src/images/banner4.jpg
similarity index 100%
rename from mvn-build/core/docs/reference/src/images/banner4.jpg
rename to core/docs/reference/src/images/banner4.jpg
diff --git a/mvn-build/core/docs/reference/src/images/bannerR.gif b/core/docs/reference/src/images/bannerR.gif
similarity index 100%
rename from mvn-build/core/docs/reference/src/images/bannerR.gif
rename to core/docs/reference/src/images/bannerR.gif
diff --git a/mvn-build/core/docs/reference/src/images/logo.png b/core/docs/reference/src/images/logo.png
similarity index 100%
rename from mvn-build/core/docs/reference/src/images/logo.png
rename to core/docs/reference/src/images/logo.png
diff --git a/mvn-build/core/docs/reference/src/images/package-dependencies.png b/core/docs/reference/src/images/package-dependencies.png
similarity index 100%
rename from mvn-build/core/docs/reference/src/images/package-dependencies.png
rename to core/docs/reference/src/images/package-dependencies.png
diff --git a/mvn-build/core/docs/reference/src/images/package-structure.png b/core/docs/reference/src/images/package-structure.png
similarity index 100%
rename from mvn-build/core/docs/reference/src/images/package-structure.png
rename to core/docs/reference/src/images/package-structure.png
diff --git a/mvn-build/core/docs/reference/src/index.xml b/core/docs/reference/src/index.xml
similarity index 100%
rename from mvn-build/core/docs/reference/src/index.xml
rename to core/docs/reference/src/index.xml
diff --git a/mvn-build/core/docs/reference/src/overview.xml b/core/docs/reference/src/overview.xml
similarity index 100%
rename from mvn-build/core/docs/reference/src/overview.xml
rename to core/docs/reference/src/overview.xml
diff --git a/mvn-build/core/docs/reference/src/pooling.xml b/core/docs/reference/src/pooling.xml
similarity index 100%
rename from mvn-build/core/docs/reference/src/pooling.xml
rename to core/docs/reference/src/pooling.xml
diff --git a/mvn-build/core/docs/reference/src/preface.xml b/core/docs/reference/src/preface.xml
similarity index 100%
rename from mvn-build/core/docs/reference/src/preface.xml
rename to core/docs/reference/src/preface.xml
diff --git a/mvn-build/core/docs/reference/src/simple.xml b/core/docs/reference/src/simple.xml
similarity index 100%
rename from mvn-build/core/docs/reference/src/simple.xml
rename to core/docs/reference/src/simple.xml
diff --git a/mvn-build/core/docs/reference/src/transactions.xml b/core/docs/reference/src/transactions.xml
similarity index 100%
rename from mvn-build/core/docs/reference/src/transactions.xml
rename to core/docs/reference/src/transactions.xml
diff --git a/mvn-build/core/docs/reference/styles/fopdf.xsl b/core/docs/reference/styles/fopdf.xsl
similarity index 100%
rename from mvn-build/core/docs/reference/styles/fopdf.xsl
rename to core/docs/reference/styles/fopdf.xsl
diff --git a/mvn-build/core/docs/reference/styles/html.css b/core/docs/reference/styles/html.css
similarity index 100%
rename from mvn-build/core/docs/reference/styles/html.css
rename to core/docs/reference/styles/html.css
diff --git a/mvn-build/core/docs/reference/styles/html.xsl b/core/docs/reference/styles/html.xsl
similarity index 100%
rename from mvn-build/core/docs/reference/styles/html.xsl
rename to core/docs/reference/styles/html.xsl
diff --git a/mvn-build/core/docs/reference/styles/html_chunk.xsl b/core/docs/reference/styles/html_chunk.xsl
similarity index 100%
rename from mvn-build/core/docs/reference/styles/html_chunk.xsl
rename to core/docs/reference/styles/html_chunk.xsl
diff --git a/mvn-build/core/docs/reference/styles/tld.to.docbook.xsl b/core/docs/reference/styles/tld.to.docbook.xsl
similarity index 100%
rename from mvn-build/core/docs/reference/styles/tld.to.docbook.xsl
rename to core/docs/reference/styles/tld.to.docbook.xsl
diff --git a/mvn-build/core/docs/reference/styles/xsd.to.docbook.xsl b/core/docs/reference/styles/xsd.to.docbook.xsl
similarity index 100%
rename from mvn-build/core/docs/reference/styles/xsd.to.docbook.xsl
rename to core/docs/reference/styles/xsd.to.docbook.xsl
diff --git a/mvn-build/core/docs/upgrade/src/readme.txt b/core/docs/upgrade/src/readme.txt
similarity index 100%
rename from mvn-build/core/docs/upgrade/src/readme.txt
rename to core/docs/upgrade/src/readme.txt
diff --git a/mvn-build/core/docs/upgrade/src/upgrade.xml b/core/docs/upgrade/src/upgrade.xml
similarity index 100%
rename from mvn-build/core/docs/upgrade/src/upgrade.xml
rename to core/docs/upgrade/src/upgrade.xml
diff --git a/mvn-build/core/itest-openldap-targets.xml b/core/itest-openldap-targets.xml
similarity index 100%
rename from mvn-build/core/itest-openldap-targets.xml
rename to core/itest-openldap-targets.xml
diff --git a/mvn-build/core/ivy.xml b/core/ivy.xml
similarity index 100%
rename from mvn-build/core/ivy.xml
rename to core/ivy.xml
diff --git a/mvn-build/core/license.txt b/core/license.txt
similarity index 100%
rename from mvn-build/core/license.txt
rename to core/license.txt
diff --git a/mvn-build/core/notice.txt b/core/notice.txt
similarity index 100%
rename from mvn-build/core/notice.txt
rename to core/notice.txt
diff --git a/mvn-build/core/pom.xml b/core/pom.xml
similarity index 100%
rename from mvn-build/core/pom.xml
rename to core/pom.xml
diff --git a/mvn-build/core/project.properties b/core/project.properties
similarity index 100%
rename from mvn-build/core/project.properties
rename to core/project.properties
diff --git a/mvn-build/core/project.xml b/core/project.xml
similarity index 100%
rename from mvn-build/core/project.xml
rename to core/project.xml
diff --git a/mvn-build/core/readme.txt b/core/readme.txt
similarity index 100%
rename from mvn-build/core/readme.txt
rename to core/readme.txt
diff --git a/mvn-build/core/src/itest-openldap/java/conf/ldap-openldap.properties b/core/src/itest-openldap/java/conf/ldap-openldap.properties
similarity index 100%
rename from mvn-build/core/src/itest-openldap/java/conf/ldap-openldap.properties
rename to core/src/itest-openldap/java/conf/ldap-openldap.properties
diff --git a/mvn-build/core/src/itest-openldap/java/conf/ldap.conf b/core/src/itest-openldap/java/conf/ldap.conf
similarity index 100%
rename from mvn-build/core/src/itest-openldap/java/conf/ldap.conf
rename to core/src/itest-openldap/java/conf/ldap.conf
diff --git a/mvn-build/core/src/itest-openldap/java/conf/ldapTemplateTestContext-openldap.xml b/core/src/itest-openldap/java/conf/ldapTemplateTestContext-openldap.xml
similarity index 100%
rename from mvn-build/core/src/itest-openldap/java/conf/ldapTemplateTestContext-openldap.xml
rename to core/src/itest-openldap/java/conf/ldapTemplateTestContext-openldap.xml
diff --git a/mvn-build/core/src/itest-openldap/java/org/springframework/ldap/LdapTemplateLookupOpenLdapITest.java b/core/src/itest-openldap/java/org/springframework/ldap/LdapTemplateLookupOpenLdapITest.java
similarity index 100%
rename from mvn-build/core/src/itest-openldap/java/org/springframework/ldap/LdapTemplateLookupOpenLdapITest.java
rename to core/src/itest-openldap/java/org/springframework/ldap/LdapTemplateLookupOpenLdapITest.java
diff --git a/mvn-build/core/src/itest-openldap/java/org/springframework/ldap/control/LdapTemplatePagedSearchITest.java b/core/src/itest-openldap/java/org/springframework/ldap/control/LdapTemplatePagedSearchITest.java
similarity index 100%
rename from mvn-build/core/src/itest-openldap/java/org/springframework/ldap/control/LdapTemplatePagedSearchITest.java
rename to core/src/itest-openldap/java/org/springframework/ldap/control/LdapTemplatePagedSearchITest.java
diff --git a/mvn-build/core/src/itest-openldap/java/org/springframework/ldap/control/LdapTemplateSortedSearchITest.java b/core/src/itest-openldap/java/org/springframework/ldap/control/LdapTemplateSortedSearchITest.java
similarity index 100%
rename from mvn-build/core/src/itest-openldap/java/org/springframework/ldap/control/LdapTemplateSortedSearchITest.java
rename to core/src/itest-openldap/java/org/springframework/ldap/control/LdapTemplateSortedSearchITest.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/AttributeInUseException.java b/core/src/main/java/org/springframework/ldap/AttributeInUseException.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/AttributeInUseException.java
rename to core/src/main/java/org/springframework/ldap/AttributeInUseException.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/AttributeModificationException.java b/core/src/main/java/org/springframework/ldap/AttributeModificationException.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/AttributeModificationException.java
rename to core/src/main/java/org/springframework/ldap/AttributeModificationException.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/AuthenticationException.java b/core/src/main/java/org/springframework/ldap/AuthenticationException.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/AuthenticationException.java
rename to core/src/main/java/org/springframework/ldap/AuthenticationException.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/AuthenticationNotSupportedException.java b/core/src/main/java/org/springframework/ldap/AuthenticationNotSupportedException.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/AuthenticationNotSupportedException.java
rename to core/src/main/java/org/springframework/ldap/AuthenticationNotSupportedException.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/BadLdapGrammarException.java b/core/src/main/java/org/springframework/ldap/BadLdapGrammarException.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/BadLdapGrammarException.java
rename to core/src/main/java/org/springframework/ldap/BadLdapGrammarException.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/CannotProceedException.java b/core/src/main/java/org/springframework/ldap/CannotProceedException.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/CannotProceedException.java
rename to core/src/main/java/org/springframework/ldap/CannotProceedException.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/CommunicationException.java b/core/src/main/java/org/springframework/ldap/CommunicationException.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/CommunicationException.java
rename to core/src/main/java/org/springframework/ldap/CommunicationException.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/ConfigurationException.java b/core/src/main/java/org/springframework/ldap/ConfigurationException.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/ConfigurationException.java
rename to core/src/main/java/org/springframework/ldap/ConfigurationException.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/ContextNotEmptyException.java b/core/src/main/java/org/springframework/ldap/ContextNotEmptyException.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/ContextNotEmptyException.java
rename to core/src/main/java/org/springframework/ldap/ContextNotEmptyException.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/InsufficientResourcesException.java b/core/src/main/java/org/springframework/ldap/InsufficientResourcesException.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/InsufficientResourcesException.java
rename to core/src/main/java/org/springframework/ldap/InsufficientResourcesException.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/InterruptedNamingException.java b/core/src/main/java/org/springframework/ldap/InterruptedNamingException.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/InterruptedNamingException.java
rename to core/src/main/java/org/springframework/ldap/InterruptedNamingException.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/InvalidAttributeIdentifierException.java b/core/src/main/java/org/springframework/ldap/InvalidAttributeIdentifierException.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/InvalidAttributeIdentifierException.java
rename to core/src/main/java/org/springframework/ldap/InvalidAttributeIdentifierException.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/InvalidAttributeValueException.java b/core/src/main/java/org/springframework/ldap/InvalidAttributeValueException.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/InvalidAttributeValueException.java
rename to core/src/main/java/org/springframework/ldap/InvalidAttributeValueException.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/InvalidAttributesException.java b/core/src/main/java/org/springframework/ldap/InvalidAttributesException.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/InvalidAttributesException.java
rename to core/src/main/java/org/springframework/ldap/InvalidAttributesException.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/InvalidNameException.java b/core/src/main/java/org/springframework/ldap/InvalidNameException.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/InvalidNameException.java
rename to core/src/main/java/org/springframework/ldap/InvalidNameException.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/InvalidSearchControlsException.java b/core/src/main/java/org/springframework/ldap/InvalidSearchControlsException.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/InvalidSearchControlsException.java
rename to core/src/main/java/org/springframework/ldap/InvalidSearchControlsException.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/InvalidSearchFilterException.java b/core/src/main/java/org/springframework/ldap/InvalidSearchFilterException.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/InvalidSearchFilterException.java
rename to core/src/main/java/org/springframework/ldap/InvalidSearchFilterException.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/LdapReferralException.java b/core/src/main/java/org/springframework/ldap/LdapReferralException.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/LdapReferralException.java
rename to core/src/main/java/org/springframework/ldap/LdapReferralException.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/LimitExceededException.java b/core/src/main/java/org/springframework/ldap/LimitExceededException.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/LimitExceededException.java
rename to core/src/main/java/org/springframework/ldap/LimitExceededException.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/LinkException.java b/core/src/main/java/org/springframework/ldap/LinkException.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/LinkException.java
rename to core/src/main/java/org/springframework/ldap/LinkException.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/LinkLoopException.java b/core/src/main/java/org/springframework/ldap/LinkLoopException.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/LinkLoopException.java
rename to core/src/main/java/org/springframework/ldap/LinkLoopException.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/MalformedLinkException.java b/core/src/main/java/org/springframework/ldap/MalformedLinkException.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/MalformedLinkException.java
rename to core/src/main/java/org/springframework/ldap/MalformedLinkException.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/NameAlreadyBoundException.java b/core/src/main/java/org/springframework/ldap/NameAlreadyBoundException.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/NameAlreadyBoundException.java
rename to core/src/main/java/org/springframework/ldap/NameAlreadyBoundException.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/NameNotFoundException.java b/core/src/main/java/org/springframework/ldap/NameNotFoundException.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/NameNotFoundException.java
rename to core/src/main/java/org/springframework/ldap/NameNotFoundException.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/NamingException.java b/core/src/main/java/org/springframework/ldap/NamingException.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/NamingException.java
rename to core/src/main/java/org/springframework/ldap/NamingException.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/NamingSecurityException.java b/core/src/main/java/org/springframework/ldap/NamingSecurityException.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/NamingSecurityException.java
rename to core/src/main/java/org/springframework/ldap/NamingSecurityException.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/NoInitialContextException.java b/core/src/main/java/org/springframework/ldap/NoInitialContextException.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/NoInitialContextException.java
rename to core/src/main/java/org/springframework/ldap/NoInitialContextException.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/NoPermissionException.java b/core/src/main/java/org/springframework/ldap/NoPermissionException.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/NoPermissionException.java
rename to core/src/main/java/org/springframework/ldap/NoPermissionException.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/NoSuchAttributeException.java b/core/src/main/java/org/springframework/ldap/NoSuchAttributeException.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/NoSuchAttributeException.java
rename to core/src/main/java/org/springframework/ldap/NoSuchAttributeException.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/NotContextException.java b/core/src/main/java/org/springframework/ldap/NotContextException.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/NotContextException.java
rename to core/src/main/java/org/springframework/ldap/NotContextException.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/OperationNotSupportedException.java b/core/src/main/java/org/springframework/ldap/OperationNotSupportedException.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/OperationNotSupportedException.java
rename to core/src/main/java/org/springframework/ldap/OperationNotSupportedException.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/PartialResultException.java b/core/src/main/java/org/springframework/ldap/PartialResultException.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/PartialResultException.java
rename to core/src/main/java/org/springframework/ldap/PartialResultException.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/ReferralException.java b/core/src/main/java/org/springframework/ldap/ReferralException.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/ReferralException.java
rename to core/src/main/java/org/springframework/ldap/ReferralException.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/SchemaViolationException.java b/core/src/main/java/org/springframework/ldap/SchemaViolationException.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/SchemaViolationException.java
rename to core/src/main/java/org/springframework/ldap/SchemaViolationException.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/ServiceUnavailableException.java b/core/src/main/java/org/springframework/ldap/ServiceUnavailableException.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/ServiceUnavailableException.java
rename to core/src/main/java/org/springframework/ldap/ServiceUnavailableException.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/SizeLimitExceededException.java b/core/src/main/java/org/springframework/ldap/SizeLimitExceededException.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/SizeLimitExceededException.java
rename to core/src/main/java/org/springframework/ldap/SizeLimitExceededException.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/TimeLimitExceededException.java b/core/src/main/java/org/springframework/ldap/TimeLimitExceededException.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/TimeLimitExceededException.java
rename to core/src/main/java/org/springframework/ldap/TimeLimitExceededException.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/UncategorizedLdapException.java b/core/src/main/java/org/springframework/ldap/UncategorizedLdapException.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/UncategorizedLdapException.java
rename to core/src/main/java/org/springframework/ldap/UncategorizedLdapException.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/authentication/DefaultValuesAuthenticationSourceDecorator.java b/core/src/main/java/org/springframework/ldap/authentication/DefaultValuesAuthenticationSourceDecorator.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/authentication/DefaultValuesAuthenticationSourceDecorator.java
rename to core/src/main/java/org/springframework/ldap/authentication/DefaultValuesAuthenticationSourceDecorator.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/authentication/package.html b/core/src/main/java/org/springframework/ldap/authentication/package.html
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/authentication/package.html
rename to core/src/main/java/org/springframework/ldap/authentication/package.html
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/control/AbstractRequestControlDirContextProcessor.java b/core/src/main/java/org/springframework/ldap/control/AbstractRequestControlDirContextProcessor.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/control/AbstractRequestControlDirContextProcessor.java
rename to core/src/main/java/org/springframework/ldap/control/AbstractRequestControlDirContextProcessor.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/control/CreateControlFailedException.java b/core/src/main/java/org/springframework/ldap/control/CreateControlFailedException.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/control/CreateControlFailedException.java
rename to core/src/main/java/org/springframework/ldap/control/CreateControlFailedException.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/control/PagedResult.java b/core/src/main/java/org/springframework/ldap/control/PagedResult.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/control/PagedResult.java
rename to core/src/main/java/org/springframework/ldap/control/PagedResult.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/control/PagedResultsCookie.java b/core/src/main/java/org/springframework/ldap/control/PagedResultsCookie.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/control/PagedResultsCookie.java
rename to core/src/main/java/org/springframework/ldap/control/PagedResultsCookie.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/control/PagedResultsRequestControl.java b/core/src/main/java/org/springframework/ldap/control/PagedResultsRequestControl.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/control/PagedResultsRequestControl.java
rename to core/src/main/java/org/springframework/ldap/control/PagedResultsRequestControl.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/control/SortControlDirContextProcessor.java b/core/src/main/java/org/springframework/ldap/control/SortControlDirContextProcessor.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/control/SortControlDirContextProcessor.java
rename to core/src/main/java/org/springframework/ldap/control/SortControlDirContextProcessor.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/control/package.html b/core/src/main/java/org/springframework/ldap/control/package.html
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/control/package.html
rename to core/src/main/java/org/springframework/ldap/control/package.html
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/core/AttributeModificationsAware.java b/core/src/main/java/org/springframework/ldap/core/AttributeModificationsAware.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/core/AttributeModificationsAware.java
rename to core/src/main/java/org/springframework/ldap/core/AttributeModificationsAware.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/core/AttributesMapper.java b/core/src/main/java/org/springframework/ldap/core/AttributesMapper.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/core/AttributesMapper.java
rename to core/src/main/java/org/springframework/ldap/core/AttributesMapper.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/core/AttributesMapperCallbackHandler.java b/core/src/main/java/org/springframework/ldap/core/AttributesMapperCallbackHandler.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/core/AttributesMapperCallbackHandler.java
rename to core/src/main/java/org/springframework/ldap/core/AttributesMapperCallbackHandler.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/core/AuthenticationSource.java b/core/src/main/java/org/springframework/ldap/core/AuthenticationSource.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/core/AuthenticationSource.java
rename to core/src/main/java/org/springframework/ldap/core/AuthenticationSource.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/core/CollectingNameClassPairCallbackHandler.java b/core/src/main/java/org/springframework/ldap/core/CollectingNameClassPairCallbackHandler.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/core/CollectingNameClassPairCallbackHandler.java
rename to core/src/main/java/org/springframework/ldap/core/CollectingNameClassPairCallbackHandler.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/core/ContextAssembler.java b/core/src/main/java/org/springframework/ldap/core/ContextAssembler.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/core/ContextAssembler.java
rename to core/src/main/java/org/springframework/ldap/core/ContextAssembler.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/core/ContextExecutor.java b/core/src/main/java/org/springframework/ldap/core/ContextExecutor.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/core/ContextExecutor.java
rename to core/src/main/java/org/springframework/ldap/core/ContextExecutor.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/core/ContextMapper.java b/core/src/main/java/org/springframework/ldap/core/ContextMapper.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/core/ContextMapper.java
rename to core/src/main/java/org/springframework/ldap/core/ContextMapper.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/core/ContextMapperCallbackHandler.java b/core/src/main/java/org/springframework/ldap/core/ContextMapperCallbackHandler.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/core/ContextMapperCallbackHandler.java
rename to core/src/main/java/org/springframework/ldap/core/ContextMapperCallbackHandler.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/core/ContextSource.java b/core/src/main/java/org/springframework/ldap/core/ContextSource.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/core/ContextSource.java
rename to core/src/main/java/org/springframework/ldap/core/ContextSource.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/core/DefaultDnParserFactory.java b/core/src/main/java/org/springframework/ldap/core/DefaultDnParserFactory.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/core/DefaultDnParserFactory.java
rename to core/src/main/java/org/springframework/ldap/core/DefaultDnParserFactory.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/core/DefaultNameClassPairMapper.java b/core/src/main/java/org/springframework/ldap/core/DefaultNameClassPairMapper.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/core/DefaultNameClassPairMapper.java
rename to core/src/main/java/org/springframework/ldap/core/DefaultNameClassPairMapper.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/core/DirContextAdapter.java b/core/src/main/java/org/springframework/ldap/core/DirContextAdapter.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/core/DirContextAdapter.java
rename to core/src/main/java/org/springframework/ldap/core/DirContextAdapter.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/core/DirContextOperations.java b/core/src/main/java/org/springframework/ldap/core/DirContextOperations.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/core/DirContextOperations.java
rename to core/src/main/java/org/springframework/ldap/core/DirContextOperations.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/core/DirContextProcessor.java b/core/src/main/java/org/springframework/ldap/core/DirContextProcessor.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/core/DirContextProcessor.java
rename to core/src/main/java/org/springframework/ldap/core/DirContextProcessor.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/core/DirContextProxy.java b/core/src/main/java/org/springframework/ldap/core/DirContextProxy.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/core/DirContextProxy.java
rename to core/src/main/java/org/springframework/ldap/core/DirContextProxy.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/core/DistinguishedName.java b/core/src/main/java/org/springframework/ldap/core/DistinguishedName.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/core/DistinguishedName.java
rename to core/src/main/java/org/springframework/ldap/core/DistinguishedName.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/core/DistinguishedNameEditor.java b/core/src/main/java/org/springframework/ldap/core/DistinguishedNameEditor.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/core/DistinguishedNameEditor.java
rename to core/src/main/java/org/springframework/ldap/core/DistinguishedNameEditor.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/core/DnParser.java b/core/src/main/java/org/springframework/ldap/core/DnParser.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/core/DnParser.java
rename to core/src/main/java/org/springframework/ldap/core/DnParser.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/core/LdapEncoder.java b/core/src/main/java/org/springframework/ldap/core/LdapEncoder.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/core/LdapEncoder.java
rename to core/src/main/java/org/springframework/ldap/core/LdapEncoder.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/core/LdapOperations.java b/core/src/main/java/org/springframework/ldap/core/LdapOperations.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/core/LdapOperations.java
rename to core/src/main/java/org/springframework/ldap/core/LdapOperations.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/core/LdapRdn.java b/core/src/main/java/org/springframework/ldap/core/LdapRdn.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/core/LdapRdn.java
rename to core/src/main/java/org/springframework/ldap/core/LdapRdn.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/core/LdapRdnComponent.java b/core/src/main/java/org/springframework/ldap/core/LdapRdnComponent.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/core/LdapRdnComponent.java
rename to core/src/main/java/org/springframework/ldap/core/LdapRdnComponent.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/core/LdapTemplate.java b/core/src/main/java/org/springframework/ldap/core/LdapTemplate.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/core/LdapTemplate.java
rename to core/src/main/java/org/springframework/ldap/core/LdapTemplate.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/core/NameClassPairCallbackHandler.java b/core/src/main/java/org/springframework/ldap/core/NameClassPairCallbackHandler.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/core/NameClassPairCallbackHandler.java
rename to core/src/main/java/org/springframework/ldap/core/NameClassPairCallbackHandler.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/core/NameClassPairMapper.java b/core/src/main/java/org/springframework/ldap/core/NameClassPairMapper.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/core/NameClassPairMapper.java
rename to core/src/main/java/org/springframework/ldap/core/NameClassPairMapper.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/core/ObjectRetrievalException.java b/core/src/main/java/org/springframework/ldap/core/ObjectRetrievalException.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/core/ObjectRetrievalException.java
rename to core/src/main/java/org/springframework/ldap/core/ObjectRetrievalException.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/core/SearchExecutor.java b/core/src/main/java/org/springframework/ldap/core/SearchExecutor.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/core/SearchExecutor.java
rename to core/src/main/java/org/springframework/ldap/core/SearchExecutor.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/core/package.html b/core/src/main/java/org/springframework/ldap/core/package.html
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/core/package.html
rename to core/src/main/java/org/springframework/ldap/core/package.html
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/core/support/AbstractContextMapper.java b/core/src/main/java/org/springframework/ldap/core/support/AbstractContextMapper.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/core/support/AbstractContextMapper.java
rename to core/src/main/java/org/springframework/ldap/core/support/AbstractContextMapper.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/core/support/AbstractContextSource.java b/core/src/main/java/org/springframework/ldap/core/support/AbstractContextSource.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/core/support/AbstractContextSource.java
rename to core/src/main/java/org/springframework/ldap/core/support/AbstractContextSource.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/core/support/AbstractTlsDirContextAuthenticationStrategy.java b/core/src/main/java/org/springframework/ldap/core/support/AbstractTlsDirContextAuthenticationStrategy.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/core/support/AbstractTlsDirContextAuthenticationStrategy.java
rename to core/src/main/java/org/springframework/ldap/core/support/AbstractTlsDirContextAuthenticationStrategy.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/core/support/AggregateDirContextProcessor.java b/core/src/main/java/org/springframework/ldap/core/support/AggregateDirContextProcessor.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/core/support/AggregateDirContextProcessor.java
rename to core/src/main/java/org/springframework/ldap/core/support/AggregateDirContextProcessor.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/core/support/BaseLdapPathAware.java b/core/src/main/java/org/springframework/ldap/core/support/BaseLdapPathAware.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/core/support/BaseLdapPathAware.java
rename to core/src/main/java/org/springframework/ldap/core/support/BaseLdapPathAware.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/core/support/BaseLdapPathBeanPostProcessor.java b/core/src/main/java/org/springframework/ldap/core/support/BaseLdapPathBeanPostProcessor.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/core/support/BaseLdapPathBeanPostProcessor.java
rename to core/src/main/java/org/springframework/ldap/core/support/BaseLdapPathBeanPostProcessor.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/core/support/BaseLdapPathContextSource.java b/core/src/main/java/org/springframework/ldap/core/support/BaseLdapPathContextSource.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/core/support/BaseLdapPathContextSource.java
rename to core/src/main/java/org/springframework/ldap/core/support/BaseLdapPathContextSource.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/core/support/BaseLdapPathSource.java b/core/src/main/java/org/springframework/ldap/core/support/BaseLdapPathSource.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/core/support/BaseLdapPathSource.java
rename to core/src/main/java/org/springframework/ldap/core/support/BaseLdapPathSource.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/core/support/CountNameClassPairCallbackHandler.java b/core/src/main/java/org/springframework/ldap/core/support/CountNameClassPairCallbackHandler.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/core/support/CountNameClassPairCallbackHandler.java
rename to core/src/main/java/org/springframework/ldap/core/support/CountNameClassPairCallbackHandler.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/core/support/DefaultDirObjectFactory.java b/core/src/main/java/org/springframework/ldap/core/support/DefaultDirObjectFactory.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/core/support/DefaultDirObjectFactory.java
rename to core/src/main/java/org/springframework/ldap/core/support/DefaultDirObjectFactory.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/core/support/DefaultTlsDirContextAuthenticationStrategy.java b/core/src/main/java/org/springframework/ldap/core/support/DefaultTlsDirContextAuthenticationStrategy.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/core/support/DefaultTlsDirContextAuthenticationStrategy.java
rename to core/src/main/java/org/springframework/ldap/core/support/DefaultTlsDirContextAuthenticationStrategy.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/core/support/DirContextAuthenticationStrategy.java b/core/src/main/java/org/springframework/ldap/core/support/DirContextAuthenticationStrategy.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/core/support/DirContextAuthenticationStrategy.java
rename to core/src/main/java/org/springframework/ldap/core/support/DirContextAuthenticationStrategy.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/core/support/DirContextSource.java b/core/src/main/java/org/springframework/ldap/core/support/DirContextSource.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/core/support/DirContextSource.java
rename to core/src/main/java/org/springframework/ldap/core/support/DirContextSource.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/core/support/ExternalTlsDirContextAuthenticationStrategy.java b/core/src/main/java/org/springframework/ldap/core/support/ExternalTlsDirContextAuthenticationStrategy.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/core/support/ExternalTlsDirContextAuthenticationStrategy.java
rename to core/src/main/java/org/springframework/ldap/core/support/ExternalTlsDirContextAuthenticationStrategy.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/core/support/LdapContextSource.java b/core/src/main/java/org/springframework/ldap/core/support/LdapContextSource.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/core/support/LdapContextSource.java
rename to core/src/main/java/org/springframework/ldap/core/support/LdapContextSource.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/core/support/SimpleDirContextAuthenticationStrategy.java b/core/src/main/java/org/springframework/ldap/core/support/SimpleDirContextAuthenticationStrategy.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/core/support/SimpleDirContextAuthenticationStrategy.java
rename to core/src/main/java/org/springframework/ldap/core/support/SimpleDirContextAuthenticationStrategy.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/core/support/SingleContextSource.java b/core/src/main/java/org/springframework/ldap/core/support/SingleContextSource.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/core/support/SingleContextSource.java
rename to core/src/main/java/org/springframework/ldap/core/support/SingleContextSource.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/core/support/package.html b/core/src/main/java/org/springframework/ldap/core/support/package.html
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/core/support/package.html
rename to core/src/main/java/org/springframework/ldap/core/support/package.html
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/filter/AbstractFilter.java b/core/src/main/java/org/springframework/ldap/filter/AbstractFilter.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/filter/AbstractFilter.java
rename to core/src/main/java/org/springframework/ldap/filter/AbstractFilter.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/filter/AndFilter.java b/core/src/main/java/org/springframework/ldap/filter/AndFilter.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/filter/AndFilter.java
rename to core/src/main/java/org/springframework/ldap/filter/AndFilter.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/filter/BinaryLogicalFilter.java b/core/src/main/java/org/springframework/ldap/filter/BinaryLogicalFilter.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/filter/BinaryLogicalFilter.java
rename to core/src/main/java/org/springframework/ldap/filter/BinaryLogicalFilter.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/filter/CompareFilter.java b/core/src/main/java/org/springframework/ldap/filter/CompareFilter.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/filter/CompareFilter.java
rename to core/src/main/java/org/springframework/ldap/filter/CompareFilter.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/filter/EqualsFilter.java b/core/src/main/java/org/springframework/ldap/filter/EqualsFilter.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/filter/EqualsFilter.java
rename to core/src/main/java/org/springframework/ldap/filter/EqualsFilter.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/filter/Filter.java b/core/src/main/java/org/springframework/ldap/filter/Filter.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/filter/Filter.java
rename to core/src/main/java/org/springframework/ldap/filter/Filter.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/filter/FilterEditor.java b/core/src/main/java/org/springframework/ldap/filter/FilterEditor.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/filter/FilterEditor.java
rename to core/src/main/java/org/springframework/ldap/filter/FilterEditor.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/filter/GreaterThanOrEqualsFilter.java b/core/src/main/java/org/springframework/ldap/filter/GreaterThanOrEqualsFilter.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/filter/GreaterThanOrEqualsFilter.java
rename to core/src/main/java/org/springframework/ldap/filter/GreaterThanOrEqualsFilter.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/filter/HardcodedFilter.java b/core/src/main/java/org/springframework/ldap/filter/HardcodedFilter.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/filter/HardcodedFilter.java
rename to core/src/main/java/org/springframework/ldap/filter/HardcodedFilter.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/filter/LessThanOrEqualsFilter.java b/core/src/main/java/org/springframework/ldap/filter/LessThanOrEqualsFilter.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/filter/LessThanOrEqualsFilter.java
rename to core/src/main/java/org/springframework/ldap/filter/LessThanOrEqualsFilter.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/filter/LikeFilter.java b/core/src/main/java/org/springframework/ldap/filter/LikeFilter.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/filter/LikeFilter.java
rename to core/src/main/java/org/springframework/ldap/filter/LikeFilter.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/filter/NotFilter.java b/core/src/main/java/org/springframework/ldap/filter/NotFilter.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/filter/NotFilter.java
rename to core/src/main/java/org/springframework/ldap/filter/NotFilter.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/filter/OrFilter.java b/core/src/main/java/org/springframework/ldap/filter/OrFilter.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/filter/OrFilter.java
rename to core/src/main/java/org/springframework/ldap/filter/OrFilter.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/filter/WhitespaceWildcardsFilter.java b/core/src/main/java/org/springframework/ldap/filter/WhitespaceWildcardsFilter.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/filter/WhitespaceWildcardsFilter.java
rename to core/src/main/java/org/springframework/ldap/filter/WhitespaceWildcardsFilter.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/filter/package.html b/core/src/main/java/org/springframework/ldap/filter/package.html
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/filter/package.html
rename to core/src/main/java/org/springframework/ldap/filter/package.html
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/package.html b/core/src/main/java/org/springframework/ldap/package.html
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/package.html
rename to core/src/main/java/org/springframework/ldap/package.html
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/pool/DelegatingContext.java b/core/src/main/java/org/springframework/ldap/pool/DelegatingContext.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/pool/DelegatingContext.java
rename to core/src/main/java/org/springframework/ldap/pool/DelegatingContext.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/pool/DelegatingDirContext.java b/core/src/main/java/org/springframework/ldap/pool/DelegatingDirContext.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/pool/DelegatingDirContext.java
rename to core/src/main/java/org/springframework/ldap/pool/DelegatingDirContext.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/pool/DelegatingLdapContext.java b/core/src/main/java/org/springframework/ldap/pool/DelegatingLdapContext.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/pool/DelegatingLdapContext.java
rename to core/src/main/java/org/springframework/ldap/pool/DelegatingLdapContext.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/pool/DirContextType.java b/core/src/main/java/org/springframework/ldap/pool/DirContextType.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/pool/DirContextType.java
rename to core/src/main/java/org/springframework/ldap/pool/DirContextType.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/pool/factory/DirContextPoolableObjectFactory.java b/core/src/main/java/org/springframework/ldap/pool/factory/DirContextPoolableObjectFactory.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/pool/factory/DirContextPoolableObjectFactory.java
rename to core/src/main/java/org/springframework/ldap/pool/factory/DirContextPoolableObjectFactory.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/pool/factory/PoolingContextSource.java b/core/src/main/java/org/springframework/ldap/pool/factory/PoolingContextSource.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/pool/factory/PoolingContextSource.java
rename to core/src/main/java/org/springframework/ldap/pool/factory/PoolingContextSource.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/pool/factory/package.html b/core/src/main/java/org/springframework/ldap/pool/factory/package.html
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/pool/factory/package.html
rename to core/src/main/java/org/springframework/ldap/pool/factory/package.html
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/pool/package.html b/core/src/main/java/org/springframework/ldap/pool/package.html
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/pool/package.html
rename to core/src/main/java/org/springframework/ldap/pool/package.html
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/pool/validation/DefaultDirContextValidator.java b/core/src/main/java/org/springframework/ldap/pool/validation/DefaultDirContextValidator.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/pool/validation/DefaultDirContextValidator.java
rename to core/src/main/java/org/springframework/ldap/pool/validation/DefaultDirContextValidator.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/pool/validation/DirContextValidator.java b/core/src/main/java/org/springframework/ldap/pool/validation/DirContextValidator.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/pool/validation/DirContextValidator.java
rename to core/src/main/java/org/springframework/ldap/pool/validation/DirContextValidator.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/pool/validation/package.html b/core/src/main/java/org/springframework/ldap/pool/validation/package.html
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/pool/validation/package.html
rename to core/src/main/java/org/springframework/ldap/pool/validation/package.html
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/support/LdapUtils.java b/core/src/main/java/org/springframework/ldap/support/LdapUtils.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/support/LdapUtils.java
rename to core/src/main/java/org/springframework/ldap/support/LdapUtils.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/support/ListComparator.java b/core/src/main/java/org/springframework/ldap/support/ListComparator.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/support/ListComparator.java
rename to core/src/main/java/org/springframework/ldap/support/ListComparator.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/support/package.html b/core/src/main/java/org/springframework/ldap/support/package.html
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/support/package.html
rename to core/src/main/java/org/springframework/ldap/support/package.html
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/transaction/compensating/BindOperationExecutor.java b/core/src/main/java/org/springframework/ldap/transaction/compensating/BindOperationExecutor.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/transaction/compensating/BindOperationExecutor.java
rename to core/src/main/java/org/springframework/ldap/transaction/compensating/BindOperationExecutor.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/transaction/compensating/BindOperationRecorder.java b/core/src/main/java/org/springframework/ldap/transaction/compensating/BindOperationRecorder.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/transaction/compensating/BindOperationRecorder.java
rename to core/src/main/java/org/springframework/ldap/transaction/compensating/BindOperationRecorder.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/transaction/compensating/LdapCompensatingTransactionOperationFactory.java b/core/src/main/java/org/springframework/ldap/transaction/compensating/LdapCompensatingTransactionOperationFactory.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/transaction/compensating/LdapCompensatingTransactionOperationFactory.java
rename to core/src/main/java/org/springframework/ldap/transaction/compensating/LdapCompensatingTransactionOperationFactory.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/transaction/compensating/LdapTransactionUtils.java b/core/src/main/java/org/springframework/ldap/transaction/compensating/LdapTransactionUtils.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/transaction/compensating/LdapTransactionUtils.java
rename to core/src/main/java/org/springframework/ldap/transaction/compensating/LdapTransactionUtils.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationExecutor.java b/core/src/main/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationExecutor.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationExecutor.java
rename to core/src/main/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationExecutor.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationRecorder.java b/core/src/main/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationRecorder.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationRecorder.java
rename to core/src/main/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationRecorder.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/transaction/compensating/NullOperationExecutor.java b/core/src/main/java/org/springframework/ldap/transaction/compensating/NullOperationExecutor.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/transaction/compensating/NullOperationExecutor.java
rename to core/src/main/java/org/springframework/ldap/transaction/compensating/NullOperationExecutor.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/transaction/compensating/NullOperationRecorder.java b/core/src/main/java/org/springframework/ldap/transaction/compensating/NullOperationRecorder.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/transaction/compensating/NullOperationRecorder.java
rename to core/src/main/java/org/springframework/ldap/transaction/compensating/NullOperationRecorder.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/transaction/compensating/RebindOperationExecutor.java b/core/src/main/java/org/springframework/ldap/transaction/compensating/RebindOperationExecutor.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/transaction/compensating/RebindOperationExecutor.java
rename to core/src/main/java/org/springframework/ldap/transaction/compensating/RebindOperationExecutor.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/transaction/compensating/RebindOperationRecorder.java b/core/src/main/java/org/springframework/ldap/transaction/compensating/RebindOperationRecorder.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/transaction/compensating/RebindOperationRecorder.java
rename to core/src/main/java/org/springframework/ldap/transaction/compensating/RebindOperationRecorder.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/transaction/compensating/RenameOperationExecutor.java b/core/src/main/java/org/springframework/ldap/transaction/compensating/RenameOperationExecutor.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/transaction/compensating/RenameOperationExecutor.java
rename to core/src/main/java/org/springframework/ldap/transaction/compensating/RenameOperationExecutor.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/transaction/compensating/RenameOperationRecorder.java b/core/src/main/java/org/springframework/ldap/transaction/compensating/RenameOperationRecorder.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/transaction/compensating/RenameOperationRecorder.java
rename to core/src/main/java/org/springframework/ldap/transaction/compensating/RenameOperationRecorder.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/transaction/compensating/TempEntryRenamingStrategy.java b/core/src/main/java/org/springframework/ldap/transaction/compensating/TempEntryRenamingStrategy.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/transaction/compensating/TempEntryRenamingStrategy.java
rename to core/src/main/java/org/springframework/ldap/transaction/compensating/TempEntryRenamingStrategy.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/transaction/compensating/UnbindOperationExecutor.java b/core/src/main/java/org/springframework/ldap/transaction/compensating/UnbindOperationExecutor.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/transaction/compensating/UnbindOperationExecutor.java
rename to core/src/main/java/org/springframework/ldap/transaction/compensating/UnbindOperationExecutor.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/transaction/compensating/UnbindOperationRecorder.java b/core/src/main/java/org/springframework/ldap/transaction/compensating/UnbindOperationRecorder.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/transaction/compensating/UnbindOperationRecorder.java
rename to core/src/main/java/org/springframework/ldap/transaction/compensating/UnbindOperationRecorder.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceAndDataSourceTransactionManager.java b/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceAndDataSourceTransactionManager.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceAndDataSourceTransactionManager.java
rename to core/src/main/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceAndDataSourceTransactionManager.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceAndHibernateTransactionManager.java b/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceAndHibernateTransactionManager.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceAndHibernateTransactionManager.java
rename to core/src/main/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceAndHibernateTransactionManager.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceTransactionManager.java b/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceTransactionManager.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceTransactionManager.java
rename to core/src/main/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceTransactionManager.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceTransactionManagerDelegate.java b/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceTransactionManagerDelegate.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceTransactionManagerDelegate.java
rename to core/src/main/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceTransactionManagerDelegate.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/DirContextHolder.java b/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/DirContextHolder.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/DirContextHolder.java
rename to core/src/main/java/org/springframework/ldap/transaction/compensating/manager/DirContextHolder.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareContextSourceProxy.java b/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareContextSourceProxy.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareContextSourceProxy.java
rename to core/src/main/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareContextSourceProxy.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareDirContextInvocationHandler.java b/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareDirContextInvocationHandler.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareDirContextInvocationHandler.java
rename to core/src/main/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareDirContextInvocationHandler.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/package.html b/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/package.html
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/package.html
rename to core/src/main/java/org/springframework/ldap/transaction/compensating/manager/package.html
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/transaction/compensating/package.html b/core/src/main/java/org/springframework/ldap/transaction/compensating/package.html
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/transaction/compensating/package.html
rename to core/src/main/java/org/springframework/ldap/transaction/compensating/package.html
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/transaction/compensating/support/DefaultTempEntryRenamingStrategy.java b/core/src/main/java/org/springframework/ldap/transaction/compensating/support/DefaultTempEntryRenamingStrategy.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/transaction/compensating/support/DefaultTempEntryRenamingStrategy.java
rename to core/src/main/java/org/springframework/ldap/transaction/compensating/support/DefaultTempEntryRenamingStrategy.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/transaction/compensating/support/DifferentSubtreeTempEntryRenamingStrategy.java b/core/src/main/java/org/springframework/ldap/transaction/compensating/support/DifferentSubtreeTempEntryRenamingStrategy.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/transaction/compensating/support/DifferentSubtreeTempEntryRenamingStrategy.java
rename to core/src/main/java/org/springframework/ldap/transaction/compensating/support/DifferentSubtreeTempEntryRenamingStrategy.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/transaction/compensating/support/package.html b/core/src/main/java/org/springframework/ldap/transaction/compensating/support/package.html
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/transaction/compensating/support/package.html
rename to core/src/main/java/org/springframework/ldap/transaction/compensating/support/package.html
diff --git a/mvn-build/core/src/main/java/org/springframework/transaction/compensating/CompensatingTransactionOperationExecutor.java b/core/src/main/java/org/springframework/transaction/compensating/CompensatingTransactionOperationExecutor.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/transaction/compensating/CompensatingTransactionOperationExecutor.java
rename to core/src/main/java/org/springframework/transaction/compensating/CompensatingTransactionOperationExecutor.java
diff --git a/mvn-build/core/src/main/java/org/springframework/transaction/compensating/CompensatingTransactionOperationFactory.java b/core/src/main/java/org/springframework/transaction/compensating/CompensatingTransactionOperationFactory.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/transaction/compensating/CompensatingTransactionOperationFactory.java
rename to core/src/main/java/org/springframework/transaction/compensating/CompensatingTransactionOperationFactory.java
diff --git a/mvn-build/core/src/main/java/org/springframework/transaction/compensating/CompensatingTransactionOperationManager.java b/core/src/main/java/org/springframework/transaction/compensating/CompensatingTransactionOperationManager.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/transaction/compensating/CompensatingTransactionOperationManager.java
rename to core/src/main/java/org/springframework/transaction/compensating/CompensatingTransactionOperationManager.java
diff --git a/mvn-build/core/src/main/java/org/springframework/transaction/compensating/CompensatingTransactionOperationRecorder.java b/core/src/main/java/org/springframework/transaction/compensating/CompensatingTransactionOperationRecorder.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/transaction/compensating/CompensatingTransactionOperationRecorder.java
rename to core/src/main/java/org/springframework/transaction/compensating/CompensatingTransactionOperationRecorder.java
diff --git a/mvn-build/core/src/main/java/org/springframework/transaction/compensating/package.html b/core/src/main/java/org/springframework/transaction/compensating/package.html
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/transaction/compensating/package.html
rename to core/src/main/java/org/springframework/transaction/compensating/package.html
diff --git a/mvn-build/core/src/main/java/org/springframework/transaction/compensating/support/AbstractCompensatingTransactionManagerDelegate.java b/core/src/main/java/org/springframework/transaction/compensating/support/AbstractCompensatingTransactionManagerDelegate.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/transaction/compensating/support/AbstractCompensatingTransactionManagerDelegate.java
rename to core/src/main/java/org/springframework/transaction/compensating/support/AbstractCompensatingTransactionManagerDelegate.java
diff --git a/mvn-build/core/src/main/java/org/springframework/transaction/compensating/support/CompensatingTransactionHolderSupport.java b/core/src/main/java/org/springframework/transaction/compensating/support/CompensatingTransactionHolderSupport.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/transaction/compensating/support/CompensatingTransactionHolderSupport.java
rename to core/src/main/java/org/springframework/transaction/compensating/support/CompensatingTransactionHolderSupport.java
diff --git a/mvn-build/core/src/main/java/org/springframework/transaction/compensating/support/CompensatingTransactionObject.java b/core/src/main/java/org/springframework/transaction/compensating/support/CompensatingTransactionObject.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/transaction/compensating/support/CompensatingTransactionObject.java
rename to core/src/main/java/org/springframework/transaction/compensating/support/CompensatingTransactionObject.java
diff --git a/mvn-build/core/src/main/java/org/springframework/transaction/compensating/support/CompensatingTransactionUtils.java b/core/src/main/java/org/springframework/transaction/compensating/support/CompensatingTransactionUtils.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/transaction/compensating/support/CompensatingTransactionUtils.java
rename to core/src/main/java/org/springframework/transaction/compensating/support/CompensatingTransactionUtils.java
diff --git a/mvn-build/core/src/main/java/org/springframework/transaction/compensating/support/DefaultCompensatingTransactionOperationManager.java b/core/src/main/java/org/springframework/transaction/compensating/support/DefaultCompensatingTransactionOperationManager.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/transaction/compensating/support/DefaultCompensatingTransactionOperationManager.java
rename to core/src/main/java/org/springframework/transaction/compensating/support/DefaultCompensatingTransactionOperationManager.java
diff --git a/mvn-build/core/src/main/java/org/springframework/transaction/compensating/support/package.html b/core/src/main/java/org/springframework/transaction/compensating/support/package.html
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/transaction/compensating/support/package.html
rename to core/src/main/java/org/springframework/transaction/compensating/support/package.html
diff --git a/mvn-build/core/src/main/java/overview.html b/core/src/main/java/overview.html
similarity index 100%
rename from mvn-build/core/src/main/java/overview.html
rename to core/src/main/java/overview.html
diff --git a/mvn-build/core/src/main/javacc/DnParserImpl.jj b/core/src/main/javacc/DnParserImpl.jj
similarity index 100%
rename from mvn-build/core/src/main/javacc/DnParserImpl.jj
rename to core/src/main/javacc/DnParserImpl.jj
diff --git a/mvn-build/core/src/test/java/org/springframework/ldap/NamingExceptionTest.java b/core/src/test/java/org/springframework/ldap/NamingExceptionTest.java
similarity index 100%
rename from mvn-build/core/src/test/java/org/springframework/ldap/NamingExceptionTest.java
rename to core/src/test/java/org/springframework/ldap/NamingExceptionTest.java
diff --git a/mvn-build/core/src/test/java/org/springframework/ldap/authentication/DefaultValuesAuthenticationSourceDecoratorTest.java b/core/src/test/java/org/springframework/ldap/authentication/DefaultValuesAuthenticationSourceDecoratorTest.java
similarity index 100%
rename from mvn-build/core/src/test/java/org/springframework/ldap/authentication/DefaultValuesAuthenticationSourceDecoratorTest.java
rename to core/src/test/java/org/springframework/ldap/authentication/DefaultValuesAuthenticationSourceDecoratorTest.java
diff --git a/mvn-build/core/src/test/java/org/springframework/ldap/control/PagedResultTest.java b/core/src/test/java/org/springframework/ldap/control/PagedResultTest.java
similarity index 100%
rename from mvn-build/core/src/test/java/org/springframework/ldap/control/PagedResultTest.java
rename to core/src/test/java/org/springframework/ldap/control/PagedResultTest.java
diff --git a/mvn-build/core/src/test/java/org/springframework/ldap/control/PagedResultsCookieTest.java b/core/src/test/java/org/springframework/ldap/control/PagedResultsCookieTest.java
similarity index 100%
rename from mvn-build/core/src/test/java/org/springframework/ldap/control/PagedResultsCookieTest.java
rename to core/src/test/java/org/springframework/ldap/control/PagedResultsCookieTest.java
diff --git a/mvn-build/core/src/test/java/org/springframework/ldap/control/PagedResultsRequestControlTest.java b/core/src/test/java/org/springframework/ldap/control/PagedResultsRequestControlTest.java
similarity index 100%
rename from mvn-build/core/src/test/java/org/springframework/ldap/control/PagedResultsRequestControlTest.java
rename to core/src/test/java/org/springframework/ldap/control/PagedResultsRequestControlTest.java
diff --git a/mvn-build/core/src/test/java/org/springframework/ldap/control/RequestControlDirContextProcessorTest.java b/core/src/test/java/org/springframework/ldap/control/RequestControlDirContextProcessorTest.java
similarity index 100%
rename from mvn-build/core/src/test/java/org/springframework/ldap/control/RequestControlDirContextProcessorTest.java
rename to core/src/test/java/org/springframework/ldap/control/RequestControlDirContextProcessorTest.java
diff --git a/mvn-build/core/src/test/java/org/springframework/ldap/control/SortControlDirContextProcessorTest.java b/core/src/test/java/org/springframework/ldap/control/SortControlDirContextProcessorTest.java
similarity index 100%
rename from mvn-build/core/src/test/java/org/springframework/ldap/control/SortControlDirContextProcessorTest.java
rename to core/src/test/java/org/springframework/ldap/control/SortControlDirContextProcessorTest.java
diff --git a/mvn-build/core/src/test/java/org/springframework/ldap/core/CollectingNameClassPairCallbackHandlerTest.java b/core/src/test/java/org/springframework/ldap/core/CollectingNameClassPairCallbackHandlerTest.java
similarity index 100%
rename from mvn-build/core/src/test/java/org/springframework/ldap/core/CollectingNameClassPairCallbackHandlerTest.java
rename to core/src/test/java/org/springframework/ldap/core/CollectingNameClassPairCallbackHandlerTest.java
diff --git a/mvn-build/core/src/test/java/org/springframework/ldap/core/ContextMapperCallbackHandlerTest.java b/core/src/test/java/org/springframework/ldap/core/ContextMapperCallbackHandlerTest.java
similarity index 100%
rename from mvn-build/core/src/test/java/org/springframework/ldap/core/ContextMapperCallbackHandlerTest.java
rename to core/src/test/java/org/springframework/ldap/core/ContextMapperCallbackHandlerTest.java
diff --git a/mvn-build/core/src/test/java/org/springframework/ldap/core/DirContextAdapterBugTest.java b/core/src/test/java/org/springframework/ldap/core/DirContextAdapterBugTest.java
similarity index 100%
rename from mvn-build/core/src/test/java/org/springframework/ldap/core/DirContextAdapterBugTest.java
rename to core/src/test/java/org/springframework/ldap/core/DirContextAdapterBugTest.java
diff --git a/mvn-build/core/src/test/java/org/springframework/ldap/core/DirContextAdapterTest.java b/core/src/test/java/org/springframework/ldap/core/DirContextAdapterTest.java
similarity index 100%
rename from mvn-build/core/src/test/java/org/springframework/ldap/core/DirContextAdapterTest.java
rename to core/src/test/java/org/springframework/ldap/core/DirContextAdapterTest.java
diff --git a/mvn-build/core/src/test/java/org/springframework/ldap/core/DistinguishedNameEditorTest.java b/core/src/test/java/org/springframework/ldap/core/DistinguishedNameEditorTest.java
similarity index 100%
rename from mvn-build/core/src/test/java/org/springframework/ldap/core/DistinguishedNameEditorTest.java
rename to core/src/test/java/org/springframework/ldap/core/DistinguishedNameEditorTest.java
diff --git a/mvn-build/core/src/test/java/org/springframework/ldap/core/DistinguishedNameTest.java b/core/src/test/java/org/springframework/ldap/core/DistinguishedNameTest.java
similarity index 100%
rename from mvn-build/core/src/test/java/org/springframework/ldap/core/DistinguishedNameTest.java
rename to core/src/test/java/org/springframework/ldap/core/DistinguishedNameTest.java
diff --git a/mvn-build/core/src/test/java/org/springframework/ldap/core/LdapEncoderTest.java b/core/src/test/java/org/springframework/ldap/core/LdapEncoderTest.java
similarity index 100%
rename from mvn-build/core/src/test/java/org/springframework/ldap/core/LdapEncoderTest.java
rename to core/src/test/java/org/springframework/ldap/core/LdapEncoderTest.java
diff --git a/mvn-build/core/src/test/java/org/springframework/ldap/core/LdapRdnComponentTest.java b/core/src/test/java/org/springframework/ldap/core/LdapRdnComponentTest.java
similarity index 100%
rename from mvn-build/core/src/test/java/org/springframework/ldap/core/LdapRdnComponentTest.java
rename to core/src/test/java/org/springframework/ldap/core/LdapRdnComponentTest.java
diff --git a/mvn-build/core/src/test/java/org/springframework/ldap/core/LdapRdnTest.java b/core/src/test/java/org/springframework/ldap/core/LdapRdnTest.java
similarity index 100%
rename from mvn-build/core/src/test/java/org/springframework/ldap/core/LdapRdnTest.java
rename to core/src/test/java/org/springframework/ldap/core/LdapRdnTest.java
diff --git a/mvn-build/core/src/test/java/org/springframework/ldap/core/LdapTemplateListTest.java b/core/src/test/java/org/springframework/ldap/core/LdapTemplateListTest.java
similarity index 100%
rename from mvn-build/core/src/test/java/org/springframework/ldap/core/LdapTemplateListTest.java
rename to core/src/test/java/org/springframework/ldap/core/LdapTemplateListTest.java
diff --git a/mvn-build/core/src/test/java/org/springframework/ldap/core/LdapTemplateLookupTest.java b/core/src/test/java/org/springframework/ldap/core/LdapTemplateLookupTest.java
similarity index 100%
rename from mvn-build/core/src/test/java/org/springframework/ldap/core/LdapTemplateLookupTest.java
rename to core/src/test/java/org/springframework/ldap/core/LdapTemplateLookupTest.java
diff --git a/mvn-build/core/src/test/java/org/springframework/ldap/core/LdapTemplateRenameTest.java b/core/src/test/java/org/springframework/ldap/core/LdapTemplateRenameTest.java
similarity index 100%
rename from mvn-build/core/src/test/java/org/springframework/ldap/core/LdapTemplateRenameTest.java
rename to core/src/test/java/org/springframework/ldap/core/LdapTemplateRenameTest.java
diff --git a/mvn-build/core/src/test/java/org/springframework/ldap/core/LdapTemplateTest.java b/core/src/test/java/org/springframework/ldap/core/LdapTemplateTest.java
similarity index 100%
rename from mvn-build/core/src/test/java/org/springframework/ldap/core/LdapTemplateTest.java
rename to core/src/test/java/org/springframework/ldap/core/LdapTemplateTest.java
diff --git a/mvn-build/core/src/test/java/org/springframework/ldap/core/RequestControlMatcher.java b/core/src/test/java/org/springframework/ldap/core/RequestControlMatcher.java
similarity index 100%
rename from mvn-build/core/src/test/java/org/springframework/ldap/core/RequestControlMatcher.java
rename to core/src/test/java/org/springframework/ldap/core/RequestControlMatcher.java
diff --git a/mvn-build/core/src/test/java/org/springframework/ldap/core/support/AggregateDirContextProcessorTest.java b/core/src/test/java/org/springframework/ldap/core/support/AggregateDirContextProcessorTest.java
similarity index 100%
rename from mvn-build/core/src/test/java/org/springframework/ldap/core/support/AggregateDirContextProcessorTest.java
rename to core/src/test/java/org/springframework/ldap/core/support/AggregateDirContextProcessorTest.java
diff --git a/mvn-build/core/src/test/java/org/springframework/ldap/core/support/BaseLdapPathBeanPostProcessorTest.java b/core/src/test/java/org/springframework/ldap/core/support/BaseLdapPathBeanPostProcessorTest.java
similarity index 100%
rename from mvn-build/core/src/test/java/org/springframework/ldap/core/support/BaseLdapPathBeanPostProcessorTest.java
rename to core/src/test/java/org/springframework/ldap/core/support/BaseLdapPathBeanPostProcessorTest.java
diff --git a/mvn-build/core/src/test/java/org/springframework/ldap/core/support/CountNameClassPairResultCallbackHandlerTest.java b/core/src/test/java/org/springframework/ldap/core/support/CountNameClassPairResultCallbackHandlerTest.java
similarity index 100%
rename from mvn-build/core/src/test/java/org/springframework/ldap/core/support/CountNameClassPairResultCallbackHandlerTest.java
rename to core/src/test/java/org/springframework/ldap/core/support/CountNameClassPairResultCallbackHandlerTest.java
diff --git a/mvn-build/core/src/test/java/org/springframework/ldap/core/support/DefaultDirObjectFactoryTest.java b/core/src/test/java/org/springframework/ldap/core/support/DefaultDirObjectFactoryTest.java
similarity index 100%
rename from mvn-build/core/src/test/java/org/springframework/ldap/core/support/DefaultDirObjectFactoryTest.java
rename to core/src/test/java/org/springframework/ldap/core/support/DefaultDirObjectFactoryTest.java
diff --git a/mvn-build/core/src/test/java/org/springframework/ldap/core/support/LdapContextSourceTest.java b/core/src/test/java/org/springframework/ldap/core/support/LdapContextSourceTest.java
similarity index 100%
rename from mvn-build/core/src/test/java/org/springframework/ldap/core/support/LdapContextSourceTest.java
rename to core/src/test/java/org/springframework/ldap/core/support/LdapContextSourceTest.java
diff --git a/mvn-build/core/src/test/java/org/springframework/ldap/core/support/SimpleDirContextAuthenticationStrategyTest.java b/core/src/test/java/org/springframework/ldap/core/support/SimpleDirContextAuthenticationStrategyTest.java
similarity index 100%
rename from mvn-build/core/src/test/java/org/springframework/ldap/core/support/SimpleDirContextAuthenticationStrategyTest.java
rename to core/src/test/java/org/springframework/ldap/core/support/SimpleDirContextAuthenticationStrategyTest.java
diff --git a/mvn-build/core/src/test/java/org/springframework/ldap/filter/AbstractFilterTest.java b/core/src/test/java/org/springframework/ldap/filter/AbstractFilterTest.java
similarity index 100%
rename from mvn-build/core/src/test/java/org/springframework/ldap/filter/AbstractFilterTest.java
rename to core/src/test/java/org/springframework/ldap/filter/AbstractFilterTest.java
diff --git a/mvn-build/core/src/test/java/org/springframework/ldap/filter/AndFilterTest.java b/core/src/test/java/org/springframework/ldap/filter/AndFilterTest.java
similarity index 100%
rename from mvn-build/core/src/test/java/org/springframework/ldap/filter/AndFilterTest.java
rename to core/src/test/java/org/springframework/ldap/filter/AndFilterTest.java
diff --git a/mvn-build/core/src/test/java/org/springframework/ldap/filter/EqualsFilterTest.java b/core/src/test/java/org/springframework/ldap/filter/EqualsFilterTest.java
similarity index 100%
rename from mvn-build/core/src/test/java/org/springframework/ldap/filter/EqualsFilterTest.java
rename to core/src/test/java/org/springframework/ldap/filter/EqualsFilterTest.java
diff --git a/mvn-build/core/src/test/java/org/springframework/ldap/filter/GreaterThanOrEqualsFilterTest.java b/core/src/test/java/org/springframework/ldap/filter/GreaterThanOrEqualsFilterTest.java
similarity index 100%
rename from mvn-build/core/src/test/java/org/springframework/ldap/filter/GreaterThanOrEqualsFilterTest.java
rename to core/src/test/java/org/springframework/ldap/filter/GreaterThanOrEqualsFilterTest.java
diff --git a/mvn-build/core/src/test/java/org/springframework/ldap/filter/LessThanOrEqualsFilterTest.java b/core/src/test/java/org/springframework/ldap/filter/LessThanOrEqualsFilterTest.java
similarity index 100%
rename from mvn-build/core/src/test/java/org/springframework/ldap/filter/LessThanOrEqualsFilterTest.java
rename to core/src/test/java/org/springframework/ldap/filter/LessThanOrEqualsFilterTest.java
diff --git a/mvn-build/core/src/test/java/org/springframework/ldap/filter/LikeFilterTest.java b/core/src/test/java/org/springframework/ldap/filter/LikeFilterTest.java
similarity index 100%
rename from mvn-build/core/src/test/java/org/springframework/ldap/filter/LikeFilterTest.java
rename to core/src/test/java/org/springframework/ldap/filter/LikeFilterTest.java
diff --git a/mvn-build/core/src/test/java/org/springframework/ldap/filter/NotFilterTest.java b/core/src/test/java/org/springframework/ldap/filter/NotFilterTest.java
similarity index 100%
rename from mvn-build/core/src/test/java/org/springframework/ldap/filter/NotFilterTest.java
rename to core/src/test/java/org/springframework/ldap/filter/NotFilterTest.java
diff --git a/mvn-build/core/src/test/java/org/springframework/ldap/filter/OrFilterTest.java b/core/src/test/java/org/springframework/ldap/filter/OrFilterTest.java
similarity index 100%
rename from mvn-build/core/src/test/java/org/springframework/ldap/filter/OrFilterTest.java
rename to core/src/test/java/org/springframework/ldap/filter/OrFilterTest.java
diff --git a/mvn-build/core/src/test/java/org/springframework/ldap/filter/WhitespaceWildcardsFilterTest.java b/core/src/test/java/org/springframework/ldap/filter/WhitespaceWildcardsFilterTest.java
similarity index 100%
rename from mvn-build/core/src/test/java/org/springframework/ldap/filter/WhitespaceWildcardsFilterTest.java
rename to core/src/test/java/org/springframework/ldap/filter/WhitespaceWildcardsFilterTest.java
diff --git a/mvn-build/core/src/test/java/org/springframework/ldap/pool/AbstractPoolTestCase.java b/core/src/test/java/org/springframework/ldap/pool/AbstractPoolTestCase.java
similarity index 100%
rename from mvn-build/core/src/test/java/org/springframework/ldap/pool/AbstractPoolTestCase.java
rename to core/src/test/java/org/springframework/ldap/pool/AbstractPoolTestCase.java
diff --git a/mvn-build/core/src/test/java/org/springframework/ldap/pool/DelegatingContextTest.java b/core/src/test/java/org/springframework/ldap/pool/DelegatingContextTest.java
similarity index 100%
rename from mvn-build/core/src/test/java/org/springframework/ldap/pool/DelegatingContextTest.java
rename to core/src/test/java/org/springframework/ldap/pool/DelegatingContextTest.java
diff --git a/mvn-build/core/src/test/java/org/springframework/ldap/pool/DelegatingDirContextTest.java b/core/src/test/java/org/springframework/ldap/pool/DelegatingDirContextTest.java
similarity index 100%
rename from mvn-build/core/src/test/java/org/springframework/ldap/pool/DelegatingDirContextTest.java
rename to core/src/test/java/org/springframework/ldap/pool/DelegatingDirContextTest.java
diff --git a/mvn-build/core/src/test/java/org/springframework/ldap/pool/DelegatingLdapContextTest.java b/core/src/test/java/org/springframework/ldap/pool/DelegatingLdapContextTest.java
similarity index 100%
rename from mvn-build/core/src/test/java/org/springframework/ldap/pool/DelegatingLdapContextTest.java
rename to core/src/test/java/org/springframework/ldap/pool/DelegatingLdapContextTest.java
diff --git a/mvn-build/core/src/test/java/org/springframework/ldap/pool/factory/DirContextPoolableObjectFactoryTest.java b/core/src/test/java/org/springframework/ldap/pool/factory/DirContextPoolableObjectFactoryTest.java
similarity index 100%
rename from mvn-build/core/src/test/java/org/springframework/ldap/pool/factory/DirContextPoolableObjectFactoryTest.java
rename to core/src/test/java/org/springframework/ldap/pool/factory/DirContextPoolableObjectFactoryTest.java
diff --git a/mvn-build/core/src/test/java/org/springframework/ldap/pool/factory/PoolingContextSourceTest.java b/core/src/test/java/org/springframework/ldap/pool/factory/PoolingContextSourceTest.java
similarity index 100%
rename from mvn-build/core/src/test/java/org/springframework/ldap/pool/factory/PoolingContextSourceTest.java
rename to core/src/test/java/org/springframework/ldap/pool/factory/PoolingContextSourceTest.java
diff --git a/mvn-build/core/src/test/java/org/springframework/ldap/pool/validation/DefaultDirContextValidatorTest.java b/core/src/test/java/org/springframework/ldap/pool/validation/DefaultDirContextValidatorTest.java
similarity index 100%
rename from mvn-build/core/src/test/java/org/springframework/ldap/pool/validation/DefaultDirContextValidatorTest.java
rename to core/src/test/java/org/springframework/ldap/pool/validation/DefaultDirContextValidatorTest.java
diff --git a/mvn-build/core/src/test/java/org/springframework/ldap/transaction/compensating/BindOperationExecutorTest.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/BindOperationExecutorTest.java
similarity index 100%
rename from mvn-build/core/src/test/java/org/springframework/ldap/transaction/compensating/BindOperationExecutorTest.java
rename to core/src/test/java/org/springframework/ldap/transaction/compensating/BindOperationExecutorTest.java
diff --git a/mvn-build/core/src/test/java/org/springframework/ldap/transaction/compensating/BindOperationRecorderTest.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/BindOperationRecorderTest.java
similarity index 100%
rename from mvn-build/core/src/test/java/org/springframework/ldap/transaction/compensating/BindOperationRecorderTest.java
rename to core/src/test/java/org/springframework/ldap/transaction/compensating/BindOperationRecorderTest.java
diff --git a/mvn-build/core/src/test/java/org/springframework/ldap/transaction/compensating/LdapCompensatingTransactionOperationFactoryTest.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/LdapCompensatingTransactionOperationFactoryTest.java
similarity index 100%
rename from mvn-build/core/src/test/java/org/springframework/ldap/transaction/compensating/LdapCompensatingTransactionOperationFactoryTest.java
rename to core/src/test/java/org/springframework/ldap/transaction/compensating/LdapCompensatingTransactionOperationFactoryTest.java
diff --git a/mvn-build/core/src/test/java/org/springframework/ldap/transaction/compensating/LdapTransactionUtilsTest.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/LdapTransactionUtilsTest.java
similarity index 100%
rename from mvn-build/core/src/test/java/org/springframework/ldap/transaction/compensating/LdapTransactionUtilsTest.java
rename to core/src/test/java/org/springframework/ldap/transaction/compensating/LdapTransactionUtilsTest.java
diff --git a/mvn-build/core/src/test/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationExecutorTest.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationExecutorTest.java
similarity index 100%
rename from mvn-build/core/src/test/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationExecutorTest.java
rename to core/src/test/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationExecutorTest.java
diff --git a/mvn-build/core/src/test/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationRecorderTest.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationRecorderTest.java
similarity index 100%
rename from mvn-build/core/src/test/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationRecorderTest.java
rename to core/src/test/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationRecorderTest.java
diff --git a/mvn-build/core/src/test/java/org/springframework/ldap/transaction/compensating/RebindOperationExecutorTest.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/RebindOperationExecutorTest.java
similarity index 100%
rename from mvn-build/core/src/test/java/org/springframework/ldap/transaction/compensating/RebindOperationExecutorTest.java
rename to core/src/test/java/org/springframework/ldap/transaction/compensating/RebindOperationExecutorTest.java
diff --git a/mvn-build/core/src/test/java/org/springframework/ldap/transaction/compensating/RebindOperationRecorderTest.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/RebindOperationRecorderTest.java
similarity index 100%
rename from mvn-build/core/src/test/java/org/springframework/ldap/transaction/compensating/RebindOperationRecorderTest.java
rename to core/src/test/java/org/springframework/ldap/transaction/compensating/RebindOperationRecorderTest.java
diff --git a/mvn-build/core/src/test/java/org/springframework/ldap/transaction/compensating/RenameOperationExecutorTest.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/RenameOperationExecutorTest.java
similarity index 100%
rename from mvn-build/core/src/test/java/org/springframework/ldap/transaction/compensating/RenameOperationExecutorTest.java
rename to core/src/test/java/org/springframework/ldap/transaction/compensating/RenameOperationExecutorTest.java
diff --git a/mvn-build/core/src/test/java/org/springframework/ldap/transaction/compensating/RenameOperationRecorderTest.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/RenameOperationRecorderTest.java
similarity index 100%
rename from mvn-build/core/src/test/java/org/springframework/ldap/transaction/compensating/RenameOperationRecorderTest.java
rename to core/src/test/java/org/springframework/ldap/transaction/compensating/RenameOperationRecorderTest.java
diff --git a/mvn-build/core/src/test/java/org/springframework/ldap/transaction/compensating/UnbindOperationExecutorTest.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/UnbindOperationExecutorTest.java
similarity index 100%
rename from mvn-build/core/src/test/java/org/springframework/ldap/transaction/compensating/UnbindOperationExecutorTest.java
rename to core/src/test/java/org/springframework/ldap/transaction/compensating/UnbindOperationExecutorTest.java
diff --git a/mvn-build/core/src/test/java/org/springframework/ldap/transaction/compensating/UnbindOperationRecorderTest.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/UnbindOperationRecorderTest.java
similarity index 100%
rename from mvn-build/core/src/test/java/org/springframework/ldap/transaction/compensating/UnbindOperationRecorderTest.java
rename to core/src/test/java/org/springframework/ldap/transaction/compensating/UnbindOperationRecorderTest.java
diff --git a/mvn-build/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceTransactionManagerTest.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceTransactionManagerTest.java
similarity index 100%
rename from mvn-build/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceTransactionManagerTest.java
rename to core/src/test/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceTransactionManagerTest.java
diff --git a/mvn-build/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareContextSourceProxyTest.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareContextSourceProxyTest.java
similarity index 100%
rename from mvn-build/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareContextSourceProxyTest.java
rename to core/src/test/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareContextSourceProxyTest.java
diff --git a/mvn-build/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareDirContextInvocationHandlerTest.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareDirContextInvocationHandlerTest.java
similarity index 100%
rename from mvn-build/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareDirContextInvocationHandlerTest.java
rename to core/src/test/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareDirContextInvocationHandlerTest.java
diff --git a/mvn-build/core/src/test/java/org/springframework/ldap/transaction/compensating/support/DefaultTempEntryRenamingStrategyTest.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/support/DefaultTempEntryRenamingStrategyTest.java
similarity index 100%
rename from mvn-build/core/src/test/java/org/springframework/ldap/transaction/compensating/support/DefaultTempEntryRenamingStrategyTest.java
rename to core/src/test/java/org/springframework/ldap/transaction/compensating/support/DefaultTempEntryRenamingStrategyTest.java
diff --git a/mvn-build/core/src/test/java/org/springframework/ldap/transaction/compensating/support/DifferentSubtreeTempEntryRenamingStrategyTest.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/support/DifferentSubtreeTempEntryRenamingStrategyTest.java
similarity index 100%
rename from mvn-build/core/src/test/java/org/springframework/ldap/transaction/compensating/support/DifferentSubtreeTempEntryRenamingStrategyTest.java
rename to core/src/test/java/org/springframework/ldap/transaction/compensating/support/DifferentSubtreeTempEntryRenamingStrategyTest.java
diff --git a/mvn-build/core/src/test/java/org/springframework/ldap/util/ListComparatorTest.java b/core/src/test/java/org/springframework/ldap/util/ListComparatorTest.java
similarity index 100%
rename from mvn-build/core/src/test/java/org/springframework/ldap/util/ListComparatorTest.java
rename to core/src/test/java/org/springframework/ldap/util/ListComparatorTest.java
diff --git a/mvn-build/core/src/test/java/org/springframework/transaction/compensating/support/CompensatingTransactionUtilsTest.java b/core/src/test/java/org/springframework/transaction/compensating/support/CompensatingTransactionUtilsTest.java
similarity index 100%
rename from mvn-build/core/src/test/java/org/springframework/transaction/compensating/support/CompensatingTransactionUtilsTest.java
rename to core/src/test/java/org/springframework/transaction/compensating/support/CompensatingTransactionUtilsTest.java
diff --git a/mvn-build/core/src/test/java/org/springframework/transaction/compensating/support/DefaultCompensatingTransactionOperationManagerTest.java b/core/src/test/java/org/springframework/transaction/compensating/support/DefaultCompensatingTransactionOperationManagerTest.java
similarity index 100%
rename from mvn-build/core/src/test/java/org/springframework/transaction/compensating/support/DefaultCompensatingTransactionOperationManagerTest.java
rename to core/src/test/java/org/springframework/transaction/compensating/support/DefaultCompensatingTransactionOperationManagerTest.java
diff --git a/mvn-build/core/src/test/resources/log4j.properties b/core/src/test/resources/log4j.properties
similarity index 100%
rename from mvn-build/core/src/test/resources/log4j.properties
rename to core/src/test/resources/log4j.properties
diff --git a/mvn-build/core/xdocs/navigation.xml b/core/xdocs/navigation.xml
similarity index 100%
rename from mvn-build/core/xdocs/navigation.xml
rename to core/xdocs/navigation.xml
diff --git a/mvn-build/lib/ldapbp.jar b/lib/ldapbp.jar
similarity index 100%
rename from mvn-build/lib/ldapbp.jar
rename to lib/ldapbp.jar
diff --git a/mvn-build/license.txt b/license.txt
similarity index 100%
rename from mvn-build/license.txt
rename to license.txt
diff --git a/mvn-build/notice.txt b/notice.txt
similarity index 100%
rename from mvn-build/notice.txt
rename to notice.txt
diff --git a/mvn-build/parent/pom.xml b/parent/pom.xml
similarity index 100%
rename from mvn-build/parent/pom.xml
rename to parent/pom.xml
diff --git a/mvn-build/pom.xml b/pom.xml
similarity index 100%
rename from mvn-build/pom.xml
rename to pom.xml
diff --git a/mvn-build/readme.txt b/readme.txt
similarity index 100%
rename from mvn-build/readme.txt
rename to readme.txt
diff --git a/mvn-build/releasebuild.sh b/releasebuild.sh
similarity index 100%
rename from mvn-build/releasebuild.sh
rename to releasebuild.sh
diff --git a/mvn-build/samples/article/.springBeans b/samples/article/.springBeans
similarity index 100%
rename from mvn-build/samples/article/.springBeans
rename to samples/article/.springBeans
diff --git a/mvn-build/samples/article/pom.xml b/samples/article/pom.xml
similarity index 100%
rename from mvn-build/samples/article/pom.xml
rename to samples/article/pom.xml
diff --git a/mvn-build/samples/article/readme.txt b/samples/article/readme.txt
similarity index 100%
rename from mvn-build/samples/article/readme.txt
rename to samples/article/readme.txt
diff --git a/mvn-build/samples/article/src/itest/java/org/springframework/ldap/samples/article/dao/AbstractPersonDaoIntegrationTest.java b/samples/article/src/itest/java/org/springframework/ldap/samples/article/dao/AbstractPersonDaoIntegrationTest.java
similarity index 100%
rename from mvn-build/samples/article/src/itest/java/org/springframework/ldap/samples/article/dao/AbstractPersonDaoIntegrationTest.java
rename to samples/article/src/itest/java/org/springframework/ldap/samples/article/dao/AbstractPersonDaoIntegrationTest.java
diff --git a/mvn-build/samples/article/src/itest/java/org/springframework/ldap/samples/article/dao/PersonDaoImplIntegrationTest.java b/samples/article/src/itest/java/org/springframework/ldap/samples/article/dao/PersonDaoImplIntegrationTest.java
similarity index 100%
rename from mvn-build/samples/article/src/itest/java/org/springframework/ldap/samples/article/dao/PersonDaoImplIntegrationTest.java
rename to samples/article/src/itest/java/org/springframework/ldap/samples/article/dao/PersonDaoImplIntegrationTest.java
diff --git a/mvn-build/samples/article/src/itest/java/org/springframework/ldap/samples/article/dao/TraditionalPersonDaoImplIntegrationTest.java b/samples/article/src/itest/java/org/springframework/ldap/samples/article/dao/TraditionalPersonDaoImplIntegrationTest.java
similarity index 100%
rename from mvn-build/samples/article/src/itest/java/org/springframework/ldap/samples/article/dao/TraditionalPersonDaoImplIntegrationTest.java
rename to samples/article/src/itest/java/org/springframework/ldap/samples/article/dao/TraditionalPersonDaoImplIntegrationTest.java
diff --git a/mvn-build/samples/article/src/main/java/log4j.properties b/samples/article/src/main/java/log4j.properties
similarity index 100%
rename from mvn-build/samples/article/src/main/java/log4j.properties
rename to samples/article/src/main/java/log4j.properties
diff --git a/mvn-build/samples/article/src/main/java/org/springframework/ldap/samples/article/dao/PersonDao.java b/samples/article/src/main/java/org/springframework/ldap/samples/article/dao/PersonDao.java
similarity index 100%
rename from mvn-build/samples/article/src/main/java/org/springframework/ldap/samples/article/dao/PersonDao.java
rename to samples/article/src/main/java/org/springframework/ldap/samples/article/dao/PersonDao.java
diff --git a/mvn-build/samples/article/src/main/java/org/springframework/ldap/samples/article/dao/PersonDaoImpl.java b/samples/article/src/main/java/org/springframework/ldap/samples/article/dao/PersonDaoImpl.java
similarity index 100%
rename from mvn-build/samples/article/src/main/java/org/springframework/ldap/samples/article/dao/PersonDaoImpl.java
rename to samples/article/src/main/java/org/springframework/ldap/samples/article/dao/PersonDaoImpl.java
diff --git a/mvn-build/samples/article/src/main/java/org/springframework/ldap/samples/article/dao/TraditionalPersonDaoImpl.java b/samples/article/src/main/java/org/springframework/ldap/samples/article/dao/TraditionalPersonDaoImpl.java
similarity index 100%
rename from mvn-build/samples/article/src/main/java/org/springframework/ldap/samples/article/dao/TraditionalPersonDaoImpl.java
rename to samples/article/src/main/java/org/springframework/ldap/samples/article/dao/TraditionalPersonDaoImpl.java
diff --git a/mvn-build/samples/article/src/main/java/org/springframework/ldap/samples/article/domain/Person.java b/samples/article/src/main/java/org/springframework/ldap/samples/article/domain/Person.java
similarity index 100%
rename from mvn-build/samples/article/src/main/java/org/springframework/ldap/samples/article/domain/Person.java
rename to samples/article/src/main/java/org/springframework/ldap/samples/article/domain/Person.java
diff --git a/mvn-build/samples/article/src/main/java/org/springframework/ldap/samples/article/web/DefaultController.java b/samples/article/src/main/java/org/springframework/ldap/samples/article/web/DefaultController.java
similarity index 100%
rename from mvn-build/samples/article/src/main/java/org/springframework/ldap/samples/article/web/DefaultController.java
rename to samples/article/src/main/java/org/springframework/ldap/samples/article/web/DefaultController.java
diff --git a/mvn-build/samples/article/src/main/java/overview.html b/samples/article/src/main/java/overview.html
similarity index 100%
rename from mvn-build/samples/article/src/main/java/overview.html
rename to samples/article/src/main/java/overview.html
diff --git a/mvn-build/samples/article/src/main/webapp/WEB-INF/applicationContext.xml b/samples/article/src/main/webapp/WEB-INF/applicationContext.xml
similarity index 100%
rename from mvn-build/samples/article/src/main/webapp/WEB-INF/applicationContext.xml
rename to samples/article/src/main/webapp/WEB-INF/applicationContext.xml
diff --git a/mvn-build/samples/article/src/main/webapp/WEB-INF/basic-servlet.xml b/samples/article/src/main/webapp/WEB-INF/basic-servlet.xml
similarity index 100%
rename from mvn-build/samples/article/src/main/webapp/WEB-INF/basic-servlet.xml
rename to samples/article/src/main/webapp/WEB-INF/basic-servlet.xml
diff --git a/mvn-build/samples/article/src/main/webapp/WEB-INF/jsp/showPerson.jsp b/samples/article/src/main/webapp/WEB-INF/jsp/showPerson.jsp
similarity index 100%
rename from mvn-build/samples/article/src/main/webapp/WEB-INF/jsp/showPerson.jsp
rename to samples/article/src/main/webapp/WEB-INF/jsp/showPerson.jsp
diff --git a/mvn-build/samples/article/src/main/webapp/WEB-INF/jsp/showTree.jsp b/samples/article/src/main/webapp/WEB-INF/jsp/showTree.jsp
similarity index 100%
rename from mvn-build/samples/article/src/main/webapp/WEB-INF/jsp/showTree.jsp
rename to samples/article/src/main/webapp/WEB-INF/jsp/showTree.jsp
diff --git a/mvn-build/samples/article/src/main/webapp/WEB-INF/ldap.properties b/samples/article/src/main/webapp/WEB-INF/ldap.properties
similarity index 100%
rename from mvn-build/samples/article/src/main/webapp/WEB-INF/ldap.properties
rename to samples/article/src/main/webapp/WEB-INF/ldap.properties
diff --git a/mvn-build/samples/article/src/main/webapp/WEB-INF/setup_data.ldif b/samples/article/src/main/webapp/WEB-INF/setup_data.ldif
similarity index 100%
rename from mvn-build/samples/article/src/main/webapp/WEB-INF/setup_data.ldif
rename to samples/article/src/main/webapp/WEB-INF/setup_data.ldif
diff --git a/mvn-build/samples/article/src/main/webapp/WEB-INF/web.xml b/samples/article/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from mvn-build/samples/article/src/main/webapp/WEB-INF/web.xml
rename to samples/article/src/main/webapp/WEB-INF/web.xml
diff --git a/mvn-build/samples/article/src/main/webapp/index.htm b/samples/article/src/main/webapp/index.htm
similarity index 100%
rename from mvn-build/samples/article/src/main/webapp/index.htm
rename to samples/article/src/main/webapp/index.htm
diff --git a/mvn-build/samples/article/src/test/java/.dummy b/samples/article/src/test/java/.dummy
similarity index 100%
rename from mvn-build/samples/article/src/test/java/.dummy
rename to samples/article/src/test/java/.dummy
diff --git a/mvn-build/samples/article/src/test/resources/config/ldap.properties b/samples/article/src/test/resources/config/ldap.properties
similarity index 100%
rename from mvn-build/samples/article/src/test/resources/config/ldap.properties
rename to samples/article/src/test/resources/config/ldap.properties
diff --git a/mvn-build/samples/article/src/test/resources/config/testContext.xml b/samples/article/src/test/resources/config/testContext.xml
similarity index 100%
rename from mvn-build/samples/article/src/test/resources/config/testContext.xml
rename to samples/article/src/test/resources/config/testContext.xml
diff --git a/mvn-build/samples/pom.xml b/samples/pom.xml
similarity index 100%
rename from mvn-build/samples/pom.xml
rename to samples/pom.xml
diff --git a/mvn-build/samples/readme.txt b/samples/readme.txt
similarity index 100%
rename from mvn-build/samples/readme.txt
rename to samples/readme.txt
diff --git a/mvn-build/samples/samples-utils/pom.xml b/samples/samples-utils/pom.xml
similarity index 100%
rename from mvn-build/samples/samples-utils/pom.xml
rename to samples/samples-utils/pom.xml
diff --git a/mvn-build/samples/samples-utils/src/main/java/org/springframework/ldap/samples/utils/HtmlRowLdapTreeVisitor.java b/samples/samples-utils/src/main/java/org/springframework/ldap/samples/utils/HtmlRowLdapTreeVisitor.java
similarity index 100%
rename from mvn-build/samples/samples-utils/src/main/java/org/springframework/ldap/samples/utils/HtmlRowLdapTreeVisitor.java
rename to samples/samples-utils/src/main/java/org/springframework/ldap/samples/utils/HtmlRowLdapTreeVisitor.java
diff --git a/mvn-build/samples/samples-utils/src/main/java/org/springframework/ldap/samples/utils/LdapTree.java b/samples/samples-utils/src/main/java/org/springframework/ldap/samples/utils/LdapTree.java
similarity index 100%
rename from mvn-build/samples/samples-utils/src/main/java/org/springframework/ldap/samples/utils/LdapTree.java
rename to samples/samples-utils/src/main/java/org/springframework/ldap/samples/utils/LdapTree.java
diff --git a/mvn-build/samples/samples-utils/src/main/java/org/springframework/ldap/samples/utils/LdapTreeBuilder.java b/samples/samples-utils/src/main/java/org/springframework/ldap/samples/utils/LdapTreeBuilder.java
similarity index 100%
rename from mvn-build/samples/samples-utils/src/main/java/org/springframework/ldap/samples/utils/LdapTreeBuilder.java
rename to samples/samples-utils/src/main/java/org/springframework/ldap/samples/utils/LdapTreeBuilder.java
diff --git a/mvn-build/samples/samples-utils/src/main/java/org/springframework/ldap/samples/utils/LdapTreeVisitor.java b/samples/samples-utils/src/main/java/org/springframework/ldap/samples/utils/LdapTreeVisitor.java
similarity index 100%
rename from mvn-build/samples/samples-utils/src/main/java/org/springframework/ldap/samples/utils/LdapTreeVisitor.java
rename to samples/samples-utils/src/main/java/org/springframework/ldap/samples/utils/LdapTreeVisitor.java
diff --git a/mvn-build/samples/samples-utils/src/test/java/org/springframework/ldap/samples/utils/LdapTreeBuilderIntegrationTest.java b/samples/samples-utils/src/test/java/org/springframework/ldap/samples/utils/LdapTreeBuilderIntegrationTest.java
similarity index 100%
rename from mvn-build/samples/samples-utils/src/test/java/org/springframework/ldap/samples/utils/LdapTreeBuilderIntegrationTest.java
rename to samples/samples-utils/src/test/java/org/springframework/ldap/samples/utils/LdapTreeBuilderIntegrationTest.java
diff --git a/mvn-build/samples/samples-utils/src/test/resources/conf/commonTestContext.xml b/samples/samples-utils/src/test/resources/conf/commonTestContext.xml
similarity index 100%
rename from mvn-build/samples/samples-utils/src/test/resources/conf/commonTestContext.xml
rename to samples/samples-utils/src/test/resources/conf/commonTestContext.xml
diff --git a/mvn-build/samples/samples-utils/src/test/resources/conf/ldap.properties b/samples/samples-utils/src/test/resources/conf/ldap.properties
similarity index 100%
rename from mvn-build/samples/samples-utils/src/test/resources/conf/ldap.properties
rename to samples/samples-utils/src/test/resources/conf/ldap.properties
diff --git a/mvn-build/samples/samples-utils/src/test/resources/conf/testContext.xml b/samples/samples-utils/src/test/resources/conf/testContext.xml
similarity index 100%
rename from mvn-build/samples/samples-utils/src/test/resources/conf/testContext.xml
rename to samples/samples-utils/src/test/resources/conf/testContext.xml
diff --git a/mvn-build/samples/samples-utils/src/test/resources/setup_data.ldif b/samples/samples-utils/src/test/resources/setup_data.ldif
similarity index 100%
rename from mvn-build/samples/samples-utils/src/test/resources/setup_data.ldif
rename to samples/samples-utils/src/test/resources/setup_data.ldif
diff --git a/mvn-build/sandbox/pom.xml b/sandbox/pom.xml
similarity index 100%
rename from mvn-build/sandbox/pom.xml
rename to sandbox/pom.xml
diff --git a/mvn-build/sandbox/src/main/java/org/springframework/ldap/control/VirtualListViewControlAggregateDirContextProcessor.java b/sandbox/src/main/java/org/springframework/ldap/control/VirtualListViewControlAggregateDirContextProcessor.java
similarity index 100%
rename from mvn-build/sandbox/src/main/java/org/springframework/ldap/control/VirtualListViewControlAggregateDirContextProcessor.java
rename to sandbox/src/main/java/org/springframework/ldap/control/VirtualListViewControlAggregateDirContextProcessor.java
diff --git a/mvn-build/sandbox/src/main/java/org/springframework/ldap/control/VirtualListViewControlDirContextProcessor.java b/sandbox/src/main/java/org/springframework/ldap/control/VirtualListViewControlDirContextProcessor.java
similarity index 100%
rename from mvn-build/sandbox/src/main/java/org/springframework/ldap/control/VirtualListViewControlDirContextProcessor.java
rename to sandbox/src/main/java/org/springframework/ldap/control/VirtualListViewControlDirContextProcessor.java
diff --git a/mvn-build/sandbox/src/main/java/org/springframework/ldap/control/VirtualListViewResultsCookie.java b/sandbox/src/main/java/org/springframework/ldap/control/VirtualListViewResultsCookie.java
similarity index 100%
rename from mvn-build/sandbox/src/main/java/org/springframework/ldap/control/VirtualListViewResultsCookie.java
rename to sandbox/src/main/java/org/springframework/ldap/control/VirtualListViewResultsCookie.java
diff --git a/mvn-build/sandbox/src/test/java/org/springframework/ldap/control/ControlArrayMatcher.java b/sandbox/src/test/java/org/springframework/ldap/control/ControlArrayMatcher.java
similarity index 100%
rename from mvn-build/sandbox/src/test/java/org/springframework/ldap/control/ControlArrayMatcher.java
rename to sandbox/src/test/java/org/springframework/ldap/control/ControlArrayMatcher.java
diff --git a/mvn-build/sandbox/src/test/java/org/springframework/ldap/control/VirtualListViewControlDirContextProcessorTest.java b/sandbox/src/test/java/org/springframework/ldap/control/VirtualListViewControlDirContextProcessorTest.java
similarity index 100%
rename from mvn-build/sandbox/src/test/java/org/springframework/ldap/control/VirtualListViewControlDirContextProcessorTest.java
rename to sandbox/src/test/java/org/springframework/ldap/control/VirtualListViewControlDirContextProcessorTest.java
diff --git a/mvn-build/src/assembly/all.xml b/src/assembly/all.xml
similarity index 100%
rename from mvn-build/src/assembly/all.xml
rename to src/assembly/all.xml
diff --git a/mvn-build/src/assembly/docs.xml b/src/assembly/docs.xml
similarity index 100%
rename from mvn-build/src/assembly/docs.xml
rename to src/assembly/docs.xml
diff --git a/mvn-build/src/assembly/minimal.xml b/src/assembly/minimal.xml
similarity index 100%
rename from mvn-build/src/assembly/minimal.xml
rename to src/assembly/minimal.xml
diff --git a/mvn-build/src/assembly/sources.xml b/src/assembly/sources.xml
similarity index 100%
rename from mvn-build/src/assembly/sources.xml
rename to src/assembly/sources.xml
diff --git a/mvn-build/src/assembly/with-dependencies.xml b/src/assembly/with-dependencies.xml
similarity index 100%
rename from mvn-build/src/assembly/with-dependencies.xml
rename to src/assembly/with-dependencies.xml
diff --git a/mvn-build/src/docbkx/basic.xml b/src/docbkx/basic.xml
similarity index 100%
rename from mvn-build/src/docbkx/basic.xml
rename to src/docbkx/basic.xml
diff --git a/mvn-build/src/docbkx/configuration.xml b/src/docbkx/configuration.xml
similarity index 100%
rename from mvn-build/src/docbkx/configuration.xml
rename to src/docbkx/configuration.xml
diff --git a/mvn-build/src/docbkx/contextprocessor.xml b/src/docbkx/contextprocessor.xml
similarity index 100%
rename from mvn-build/src/docbkx/contextprocessor.xml
rename to src/docbkx/contextprocessor.xml
diff --git a/mvn-build/src/docbkx/dirobjectfactory.xml b/src/docbkx/dirobjectfactory.xml
similarity index 100%
rename from mvn-build/src/docbkx/dirobjectfactory.xml
rename to src/docbkx/dirobjectfactory.xml
diff --git a/mvn-build/src/docbkx/executors.xml b/src/docbkx/executors.xml
similarity index 100%
rename from mvn-build/src/docbkx/executors.xml
rename to src/docbkx/executors.xml
diff --git a/mvn-build/src/docbkx/images/NamingException.png b/src/docbkx/images/NamingException.png
similarity index 100%
rename from mvn-build/src/docbkx/images/NamingException.png
rename to src/docbkx/images/NamingException.png
diff --git a/mvn-build/src/docbkx/images/banner4.jpg b/src/docbkx/images/banner4.jpg
similarity index 100%
rename from mvn-build/src/docbkx/images/banner4.jpg
rename to src/docbkx/images/banner4.jpg
diff --git a/mvn-build/src/docbkx/images/bannerR.gif b/src/docbkx/images/bannerR.gif
similarity index 100%
rename from mvn-build/src/docbkx/images/bannerR.gif
rename to src/docbkx/images/bannerR.gif
diff --git a/mvn-build/src/docbkx/images/logo.png b/src/docbkx/images/logo.png
similarity index 100%
rename from mvn-build/src/docbkx/images/logo.png
rename to src/docbkx/images/logo.png
diff --git a/mvn-build/src/docbkx/images/package-dependencies.png b/src/docbkx/images/package-dependencies.png
similarity index 100%
rename from mvn-build/src/docbkx/images/package-dependencies.png
rename to src/docbkx/images/package-dependencies.png
diff --git a/mvn-build/src/docbkx/images/package-structure.png b/src/docbkx/images/package-structure.png
similarity index 100%
rename from mvn-build/src/docbkx/images/package-structure.png
rename to src/docbkx/images/package-structure.png
diff --git a/mvn-build/src/docbkx/overview.xml b/src/docbkx/overview.xml
similarity index 100%
rename from mvn-build/src/docbkx/overview.xml
rename to src/docbkx/overview.xml
diff --git a/mvn-build/src/docbkx/pooling.xml b/src/docbkx/pooling.xml
similarity index 100%
rename from mvn-build/src/docbkx/pooling.xml
rename to src/docbkx/pooling.xml
diff --git a/mvn-build/src/docbkx/preface.xml b/src/docbkx/preface.xml
similarity index 100%
rename from mvn-build/src/docbkx/preface.xml
rename to src/docbkx/preface.xml
diff --git a/mvn-build/src/docbkx/resources/css/html.css b/src/docbkx/resources/css/html.css
similarity index 100%
rename from mvn-build/src/docbkx/resources/css/html.css
rename to src/docbkx/resources/css/html.css
diff --git a/mvn-build/src/docbkx/resources/xsl/fopdf.xsl b/src/docbkx/resources/xsl/fopdf.xsl
similarity index 100%
rename from mvn-build/src/docbkx/resources/xsl/fopdf.xsl
rename to src/docbkx/resources/xsl/fopdf.xsl
diff --git a/mvn-build/src/docbkx/resources/xsl/html.xsl b/src/docbkx/resources/xsl/html.xsl
similarity index 100%
rename from mvn-build/src/docbkx/resources/xsl/html.xsl
rename to src/docbkx/resources/xsl/html.xsl
diff --git a/mvn-build/src/docbkx/resources/xsl/html_chunk.xsl b/src/docbkx/resources/xsl/html_chunk.xsl
similarity index 100%
rename from mvn-build/src/docbkx/resources/xsl/html_chunk.xsl
rename to src/docbkx/resources/xsl/html_chunk.xsl
diff --git a/mvn-build/src/docbkx/simple.xml b/src/docbkx/simple.xml
similarity index 100%
rename from mvn-build/src/docbkx/simple.xml
rename to src/docbkx/simple.xml
diff --git a/mvn-build/src/docbkx/spring-ldap-reference.xml b/src/docbkx/spring-ldap-reference.xml
similarity index 100%
rename from mvn-build/src/docbkx/spring-ldap-reference.xml
rename to src/docbkx/spring-ldap-reference.xml
diff --git a/mvn-build/src/docbkx/transactions.xml b/src/docbkx/transactions.xml
similarity index 100%
rename from mvn-build/src/docbkx/transactions.xml
rename to src/docbkx/transactions.xml
diff --git a/mvn-build/src/docbkx/user-authentication.xml b/src/docbkx/user-authentication.xml
similarity index 100%
rename from mvn-build/src/docbkx/user-authentication.xml
rename to src/docbkx/user-authentication.xml
diff --git a/mvn-build/src/main/javadoc/javadoc.css b/src/main/javadoc/javadoc.css
similarity index 100%
rename from mvn-build/src/main/javadoc/javadoc.css
rename to src/main/javadoc/javadoc.css
diff --git a/mvn-build/src/main/javadoc/overview.html b/src/main/javadoc/overview.html
similarity index 100%
rename from mvn-build/src/main/javadoc/overview.html
rename to src/main/javadoc/overview.html
diff --git a/mvn-build/test-support/pom.xml b/test-support/pom.xml
similarity index 100%
rename from mvn-build/test-support/pom.xml
rename to test-support/pom.xml
diff --git a/mvn-build/test-support/src/main/java/org/springframework/ldap/test/AttributeCheckAttributesMapper.java b/test-support/src/main/java/org/springframework/ldap/test/AttributeCheckAttributesMapper.java
similarity index 100%
rename from mvn-build/test-support/src/main/java/org/springframework/ldap/test/AttributeCheckAttributesMapper.java
rename to test-support/src/main/java/org/springframework/ldap/test/AttributeCheckAttributesMapper.java
diff --git a/mvn-build/test-support/src/main/java/org/springframework/ldap/test/AttributeCheckContextMapper.java b/test-support/src/main/java/org/springframework/ldap/test/AttributeCheckContextMapper.java
similarity index 100%
rename from mvn-build/test-support/src/main/java/org/springframework/ldap/test/AttributeCheckContextMapper.java
rename to test-support/src/main/java/org/springframework/ldap/test/AttributeCheckContextMapper.java
diff --git a/mvn-build/test-support/src/main/java/org/springframework/ldap/test/LdapTestUtils.java b/test-support/src/main/java/org/springframework/ldap/test/LdapTestUtils.java
similarity index 100%
rename from mvn-build/test-support/src/main/java/org/springframework/ldap/test/LdapTestUtils.java
rename to test-support/src/main/java/org/springframework/ldap/test/LdapTestUtils.java
diff --git a/mvn-build/test-support/src/main/java/org/springframework/ldap/test/TestContextSourceFactoryBean.java b/test-support/src/main/java/org/springframework/ldap/test/TestContextSourceFactoryBean.java
similarity index 100%
rename from mvn-build/test-support/src/main/java/org/springframework/ldap/test/TestContextSourceFactoryBean.java
rename to test-support/src/main/java/org/springframework/ldap/test/TestContextSourceFactoryBean.java
diff --git a/mvn-build/test-support/src/main/java/org/springframework/ldap/test/package.html b/test-support/src/main/java/org/springframework/ldap/test/package.html
similarity index 100%
rename from mvn-build/test-support/src/main/java/org/springframework/ldap/test/package.html
rename to test-support/src/main/java/org/springframework/ldap/test/package.html
diff --git a/mvn-build/test/integration-tests-openldap/README-EC2-tests.txt b/test/integration-tests-openldap/README-EC2-tests.txt
similarity index 100%
rename from mvn-build/test/integration-tests-openldap/README-EC2-tests.txt
rename to test/integration-tests-openldap/README-EC2-tests.txt
diff --git a/mvn-build/test/integration-tests-openldap/etc/lib/typica-1.4.jar b/test/integration-tests-openldap/etc/lib/typica-1.4.jar
similarity index 100%
rename from mvn-build/test/integration-tests-openldap/etc/lib/typica-1.4.jar
rename to test/integration-tests-openldap/etc/lib/typica-1.4.jar
diff --git a/mvn-build/test/integration-tests-openldap/pom.xml b/test/integration-tests-openldap/pom.xml
similarity index 100%
rename from mvn-build/test/integration-tests-openldap/pom.xml
rename to test/integration-tests-openldap/pom.xml
diff --git a/mvn-build/test/integration-tests-openldap/src/main/java/org/springframework/ldap/AbstractEc2InstanceLaunchingFactoryBean.java b/test/integration-tests-openldap/src/main/java/org/springframework/ldap/AbstractEc2InstanceLaunchingFactoryBean.java
similarity index 100%
rename from mvn-build/test/integration-tests-openldap/src/main/java/org/springframework/ldap/AbstractEc2InstanceLaunchingFactoryBean.java
rename to test/integration-tests-openldap/src/main/java/org/springframework/ldap/AbstractEc2InstanceLaunchingFactoryBean.java
diff --git a/mvn-build/test/integration-tests-openldap/src/main/java/org/springframework/ldap/ContextSourceEc2InstanceLaunchingFactoryBean.java b/test/integration-tests-openldap/src/main/java/org/springframework/ldap/ContextSourceEc2InstanceLaunchingFactoryBean.java
similarity index 100%
rename from mvn-build/test/integration-tests-openldap/src/main/java/org/springframework/ldap/ContextSourceEc2InstanceLaunchingFactoryBean.java
rename to test/integration-tests-openldap/src/main/java/org/springframework/ldap/ContextSourceEc2InstanceLaunchingFactoryBean.java
diff --git a/mvn-build/test/integration-tests-openldap/src/main/java/org/springframework/ldap/TlsContextSourceEc2InstanceLaunchingFactoryBean.java b/test/integration-tests-openldap/src/main/java/org/springframework/ldap/TlsContextSourceEc2InstanceLaunchingFactoryBean.java
similarity index 100%
rename from mvn-build/test/integration-tests-openldap/src/main/java/org/springframework/ldap/TlsContextSourceEc2InstanceLaunchingFactoryBean.java
rename to test/integration-tests-openldap/src/main/java/org/springframework/ldap/TlsContextSourceEc2InstanceLaunchingFactoryBean.java
diff --git a/mvn-build/test/integration-tests-openldap/src/main/java/org/springframework/ldap/control/Person.java b/test/integration-tests-openldap/src/main/java/org/springframework/ldap/control/Person.java
similarity index 100%
rename from mvn-build/test/integration-tests-openldap/src/main/java/org/springframework/ldap/control/Person.java
rename to test/integration-tests-openldap/src/main/java/org/springframework/ldap/control/Person.java
diff --git a/mvn-build/test/integration-tests-openldap/src/test/java/org/springframework/ldap/control/LdapTemplatePagedSearchITest.java b/test/integration-tests-openldap/src/test/java/org/springframework/ldap/control/LdapTemplatePagedSearchITest.java
similarity index 100%
rename from mvn-build/test/integration-tests-openldap/src/test/java/org/springframework/ldap/control/LdapTemplatePagedSearchITest.java
rename to test/integration-tests-openldap/src/test/java/org/springframework/ldap/control/LdapTemplatePagedSearchITest.java
diff --git a/mvn-build/test/integration-tests-openldap/src/test/java/org/springframework/ldap/core/LdapTemplateSearchResultITest.java b/test/integration-tests-openldap/src/test/java/org/springframework/ldap/core/LdapTemplateSearchResultITest.java
similarity index 100%
rename from mvn-build/test/integration-tests-openldap/src/test/java/org/springframework/ldap/core/LdapTemplateSearchResultITest.java
rename to test/integration-tests-openldap/src/test/java/org/springframework/ldap/core/LdapTemplateSearchResultITest.java
diff --git a/mvn-build/test/integration-tests-openldap/src/test/resources/conf/ldap.properties b/test/integration-tests-openldap/src/test/resources/conf/ldap.properties
similarity index 100%
rename from mvn-build/test/integration-tests-openldap/src/test/resources/conf/ldap.properties
rename to test/integration-tests-openldap/src/test/resources/conf/ldap.properties
diff --git a/mvn-build/test/integration-tests-openldap/src/test/resources/conf/ldapTemplateTestContext-tls.xml b/test/integration-tests-openldap/src/test/resources/conf/ldapTemplateTestContext-tls.xml
similarity index 100%
rename from mvn-build/test/integration-tests-openldap/src/test/resources/conf/ldapTemplateTestContext-tls.xml
rename to test/integration-tests-openldap/src/test/resources/conf/ldapTemplateTestContext-tls.xml
diff --git a/mvn-build/test/integration-tests-openldap/src/test/resources/conf/ldapTemplateTestContext.xml b/test/integration-tests-openldap/src/test/resources/conf/ldapTemplateTestContext.xml
similarity index 100%
rename from mvn-build/test/integration-tests-openldap/src/test/resources/conf/ldapTemplateTestContext.xml
rename to test/integration-tests-openldap/src/test/resources/conf/ldapTemplateTestContext.xml
diff --git a/mvn-build/test/integration-tests-openldap/src/test/resources/log4j.properties b/test/integration-tests-openldap/src/test/resources/log4j.properties
similarity index 100%
rename from mvn-build/test/integration-tests-openldap/src/test/resources/log4j.properties
rename to test/integration-tests-openldap/src/test/resources/log4j.properties
diff --git a/mvn-build/test/integration-tests-sunone/pom.xml b/test/integration-tests-sunone/pom.xml
similarity index 100%
rename from mvn-build/test/integration-tests-sunone/pom.xml
rename to test/integration-tests-sunone/pom.xml
diff --git a/mvn-build/test/integration-tests-sunone/src/test/java/org/springframework/ldap/core/LdapTemplateVirtualListViewSearchITest.java b/test/integration-tests-sunone/src/test/java/org/springframework/ldap/core/LdapTemplateVirtualListViewSearchITest.java
similarity index 100%
rename from mvn-build/test/integration-tests-sunone/src/test/java/org/springframework/ldap/core/LdapTemplateVirtualListViewSearchITest.java
rename to test/integration-tests-sunone/src/test/java/org/springframework/ldap/core/LdapTemplateVirtualListViewSearchITest.java
diff --git a/mvn-build/test/integration-tests-sunone/src/test/resources/conf/ldap.properties b/test/integration-tests-sunone/src/test/resources/conf/ldap.properties
similarity index 100%
rename from mvn-build/test/integration-tests-sunone/src/test/resources/conf/ldap.properties
rename to test/integration-tests-sunone/src/test/resources/conf/ldap.properties
diff --git a/mvn-build/test/integration-tests-sunone/src/test/resources/conf/ldapTemplateTestContext.xml b/test/integration-tests-sunone/src/test/resources/conf/ldapTemplateTestContext.xml
similarity index 100%
rename from mvn-build/test/integration-tests-sunone/src/test/resources/conf/ldapTemplateTestContext.xml
rename to test/integration-tests-sunone/src/test/resources/conf/ldapTemplateTestContext.xml
diff --git a/mvn-build/test/integration-tests-sunone/src/test/resources/log4j.properties b/test/integration-tests-sunone/src/test/resources/log4j.properties
similarity index 100%
rename from mvn-build/test/integration-tests-sunone/src/test/resources/log4j.properties
rename to test/integration-tests-sunone/src/test/resources/log4j.properties
diff --git a/mvn-build/test/integration-tests/pom.xml b/test/integration-tests/pom.xml
similarity index 100%
rename from mvn-build/test/integration-tests/pom.xml
rename to test/integration-tests/pom.xml
diff --git a/mvn-build/test/integration-tests/src/main/java/org/springframework/ldap/Person.java b/test/integration-tests/src/main/java/org/springframework/ldap/Person.java
similarity index 100%
rename from mvn-build/test/integration-tests/src/main/java/org/springframework/ldap/Person.java
rename to test/integration-tests/src/main/java/org/springframework/ldap/Person.java
diff --git a/mvn-build/test/integration-tests/src/main/java/org/springframework/ldap/PersonAttributesMapper.java b/test/integration-tests/src/main/java/org/springframework/ldap/PersonAttributesMapper.java
similarity index 100%
rename from mvn-build/test/integration-tests/src/main/java/org/springframework/ldap/PersonAttributesMapper.java
rename to test/integration-tests/src/main/java/org/springframework/ldap/PersonAttributesMapper.java
diff --git a/mvn-build/test/integration-tests/src/main/java/org/springframework/ldap/PersonContextMapper.java b/test/integration-tests/src/main/java/org/springframework/ldap/PersonContextMapper.java
similarity index 100%
rename from mvn-build/test/integration-tests/src/main/java/org/springframework/ldap/PersonContextMapper.java
rename to test/integration-tests/src/main/java/org/springframework/ldap/PersonContextMapper.java
diff --git a/mvn-build/test/integration-tests/src/main/java/org/springframework/ldap/core/DummyDistinguishedNameConsumer.java b/test/integration-tests/src/main/java/org/springframework/ldap/core/DummyDistinguishedNameConsumer.java
similarity index 100%
rename from mvn-build/test/integration-tests/src/main/java/org/springframework/ldap/core/DummyDistinguishedNameConsumer.java
rename to test/integration-tests/src/main/java/org/springframework/ldap/core/DummyDistinguishedNameConsumer.java
diff --git a/mvn-build/test/integration-tests/src/main/java/org/springframework/ldap/core/support/DummyBaseLdapPathAware.java b/test/integration-tests/src/main/java/org/springframework/ldap/core/support/DummyBaseLdapPathAware.java
similarity index 100%
rename from mvn-build/test/integration-tests/src/main/java/org/springframework/ldap/core/support/DummyBaseLdapPathAware.java
rename to test/integration-tests/src/main/java/org/springframework/ldap/core/support/DummyBaseLdapPathAware.java
diff --git a/mvn-build/test/integration-tests/src/main/java/org/springframework/ldap/filter/DummyFilterConsumer.java b/test/integration-tests/src/main/java/org/springframework/ldap/filter/DummyFilterConsumer.java
similarity index 100%
rename from mvn-build/test/integration-tests/src/main/java/org/springframework/ldap/filter/DummyFilterConsumer.java
rename to test/integration-tests/src/main/java/org/springframework/ldap/filter/DummyFilterConsumer.java
diff --git a/mvn-build/test/integration-tests/src/main/java/org/springframework/ldap/transaction/compensating/manager/DummyDao.java b/test/integration-tests/src/main/java/org/springframework/ldap/transaction/compensating/manager/DummyDao.java
similarity index 100%
rename from mvn-build/test/integration-tests/src/main/java/org/springframework/ldap/transaction/compensating/manager/DummyDao.java
rename to test/integration-tests/src/main/java/org/springframework/ldap/transaction/compensating/manager/DummyDao.java
diff --git a/mvn-build/test/integration-tests/src/main/java/org/springframework/ldap/transaction/compensating/manager/DummyException.java b/test/integration-tests/src/main/java/org/springframework/ldap/transaction/compensating/manager/DummyException.java
similarity index 100%
rename from mvn-build/test/integration-tests/src/main/java/org/springframework/ldap/transaction/compensating/manager/DummyException.java
rename to test/integration-tests/src/main/java/org/springframework/ldap/transaction/compensating/manager/DummyException.java
diff --git a/mvn-build/test/integration-tests/src/main/java/org/springframework/ldap/transaction/compensating/manager/DummyServiceImpl.java b/test/integration-tests/src/main/java/org/springframework/ldap/transaction/compensating/manager/DummyServiceImpl.java
similarity index 100%
rename from mvn-build/test/integration-tests/src/main/java/org/springframework/ldap/transaction/compensating/manager/DummyServiceImpl.java
rename to test/integration-tests/src/main/java/org/springframework/ldap/transaction/compensating/manager/DummyServiceImpl.java
diff --git a/mvn-build/test/integration-tests/src/main/java/org/springframework/ldap/transaction/compensating/manager/LdapAndJdbcDummyDaoImpl.java b/test/integration-tests/src/main/java/org/springframework/ldap/transaction/compensating/manager/LdapAndJdbcDummyDaoImpl.java
similarity index 100%
rename from mvn-build/test/integration-tests/src/main/java/org/springframework/ldap/transaction/compensating/manager/LdapAndJdbcDummyDaoImpl.java
rename to test/integration-tests/src/main/java/org/springframework/ldap/transaction/compensating/manager/LdapAndJdbcDummyDaoImpl.java
diff --git a/mvn-build/test/integration-tests/src/main/java/org/springframework/ldap/transaction/compensating/manager/LdapDummyDaoImpl.java b/test/integration-tests/src/main/java/org/springframework/ldap/transaction/compensating/manager/LdapDummyDaoImpl.java
similarity index 100%
rename from mvn-build/test/integration-tests/src/main/java/org/springframework/ldap/transaction/compensating/manager/LdapDummyDaoImpl.java
rename to test/integration-tests/src/main/java/org/springframework/ldap/transaction/compensating/manager/LdapDummyDaoImpl.java
diff --git a/mvn-build/test/integration-tests/src/main/java/org/springframework/ldap/transaction/compensating/manager/hibernate/DummyDaoLdapAndHibernateImpl.java b/test/integration-tests/src/main/java/org/springframework/ldap/transaction/compensating/manager/hibernate/DummyDaoLdapAndHibernateImpl.java
similarity index 100%
rename from mvn-build/test/integration-tests/src/main/java/org/springframework/ldap/transaction/compensating/manager/hibernate/DummyDaoLdapAndHibernateImpl.java
rename to test/integration-tests/src/main/java/org/springframework/ldap/transaction/compensating/manager/hibernate/DummyDaoLdapAndHibernateImpl.java
diff --git a/mvn-build/test/integration-tests/src/main/java/org/springframework/ldap/transaction/compensating/manager/hibernate/OrgPerson.java b/test/integration-tests/src/main/java/org/springframework/ldap/transaction/compensating/manager/hibernate/OrgPerson.java
similarity index 100%
rename from mvn-build/test/integration-tests/src/main/java/org/springframework/ldap/transaction/compensating/manager/hibernate/OrgPerson.java
rename to test/integration-tests/src/main/java/org/springframework/ldap/transaction/compensating/manager/hibernate/OrgPerson.java
diff --git a/mvn-build/test/integration-tests/src/main/java/org/springframework/ldap/transaction/compensating/manager/hibernate/OrgPersonDao.java b/test/integration-tests/src/main/java/org/springframework/ldap/transaction/compensating/manager/hibernate/OrgPersonDao.java
similarity index 100%
rename from mvn-build/test/integration-tests/src/main/java/org/springframework/ldap/transaction/compensating/manager/hibernate/OrgPersonDao.java
rename to test/integration-tests/src/main/java/org/springframework/ldap/transaction/compensating/manager/hibernate/OrgPersonDao.java
diff --git a/mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/AbstractLdapTemplateIntegrationTest.java b/test/integration-tests/src/test/java/org/springframework/ldap/AbstractLdapTemplateIntegrationTest.java
similarity index 100%
rename from mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/AbstractLdapTemplateIntegrationTest.java
rename to test/integration-tests/src/test/java/org/springframework/ldap/AbstractLdapTemplateIntegrationTest.java
diff --git a/mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/InvalidBackslashITest.java b/test/integration-tests/src/test/java/org/springframework/ldap/InvalidBackslashITest.java
similarity index 100%
rename from mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/InvalidBackslashITest.java
rename to test/integration-tests/src/test/java/org/springframework/ldap/InvalidBackslashITest.java
diff --git a/mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateAttributesMapperITest.java b/test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateAttributesMapperITest.java
similarity index 100%
rename from mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateAttributesMapperITest.java
rename to test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateAttributesMapperITest.java
diff --git a/mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateBindUnbindITest.java b/test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateBindUnbindITest.java
similarity index 100%
rename from mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateBindUnbindITest.java
rename to test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateBindUnbindITest.java
diff --git a/mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateContextExecutorTest.java b/test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateContextExecutorTest.java
similarity index 100%
rename from mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateContextExecutorTest.java
rename to test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateContextExecutorTest.java
diff --git a/mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateContextMapperITest.java b/test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateContextMapperITest.java
similarity index 100%
rename from mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateContextMapperITest.java
rename to test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateContextMapperITest.java
diff --git a/mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateListITest.java b/test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateListITest.java
similarity index 100%
rename from mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateListITest.java
rename to test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateListITest.java
diff --git a/mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateLookupITest.java b/test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateLookupITest.java
similarity index 100%
rename from mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateLookupITest.java
rename to test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateLookupITest.java
diff --git a/mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateModifyITest.java b/test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateModifyITest.java
similarity index 100%
rename from mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateModifyITest.java
rename to test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateModifyITest.java
diff --git a/mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateNoBaseSuffixITest.java b/test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateNoBaseSuffixITest.java
similarity index 100%
rename from mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateNoBaseSuffixITest.java
rename to test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateNoBaseSuffixITest.java
diff --git a/mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateObjectBindIntegrationTest.java b/test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateObjectBindIntegrationTest.java
similarity index 100%
rename from mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateObjectBindIntegrationTest.java
rename to test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateObjectBindIntegrationTest.java
diff --git a/mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateRecursiveDeleteITest.java b/test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateRecursiveDeleteITest.java
similarity index 100%
rename from mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateRecursiveDeleteITest.java
rename to test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateRecursiveDeleteITest.java
diff --git a/mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateRenameITest.java b/test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateRenameITest.java
similarity index 100%
rename from mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateRenameITest.java
rename to test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateRenameITest.java
diff --git a/mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateSearchCountITest.xls b/test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateSearchCountITest.xls
similarity index 100%
rename from mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateSearchCountITest.xls
rename to test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateSearchCountITest.xls
diff --git a/mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateSearchResultITest.java b/test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateSearchResultITest.java
similarity index 100%
rename from mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateSearchResultITest.java
rename to test/integration-tests/src/test/java/org/springframework/ldap/LdapTemplateSearchResultITest.java
diff --git a/mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/control/SupportedControlsITest.java b/test/integration-tests/src/test/java/org/springframework/ldap/control/SupportedControlsITest.java
similarity index 100%
rename from mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/control/SupportedControlsITest.java
rename to test/integration-tests/src/test/java/org/springframework/ldap/control/SupportedControlsITest.java
diff --git a/mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/core/DistinguishedNameEditorITest.java b/test/integration-tests/src/test/java/org/springframework/ldap/core/DistinguishedNameEditorITest.java
similarity index 100%
rename from mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/core/DistinguishedNameEditorITest.java
rename to test/integration-tests/src/test/java/org/springframework/ldap/core/DistinguishedNameEditorITest.java
diff --git a/mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/core/DnParsePerformanceITest.java b/test/integration-tests/src/test/java/org/springframework/ldap/core/DnParsePerformanceITest.java
similarity index 100%
rename from mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/core/DnParsePerformanceITest.java
rename to test/integration-tests/src/test/java/org/springframework/ldap/core/DnParsePerformanceITest.java
diff --git a/mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/core/simple/SimpleLdapTemplateITest.java b/test/integration-tests/src/test/java/org/springframework/ldap/core/simple/SimpleLdapTemplateITest.java
similarity index 100%
rename from mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/core/simple/SimpleLdapTemplateITest.java
rename to test/integration-tests/src/test/java/org/springframework/ldap/core/simple/SimpleLdapTemplateITest.java
diff --git a/mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/core/support/BaseLdapPathBeanPostprocessorITest.java b/test/integration-tests/src/test/java/org/springframework/ldap/core/support/BaseLdapPathBeanPostprocessorITest.java
similarity index 100%
rename from mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/core/support/BaseLdapPathBeanPostprocessorITest.java
rename to test/integration-tests/src/test/java/org/springframework/ldap/core/support/BaseLdapPathBeanPostprocessorITest.java
diff --git a/mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/core/support/LdapContextSourcelITest.java b/test/integration-tests/src/test/java/org/springframework/ldap/core/support/LdapContextSourcelITest.java
similarity index 100%
rename from mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/core/support/LdapContextSourcelITest.java
rename to test/integration-tests/src/test/java/org/springframework/ldap/core/support/LdapContextSourcelITest.java
diff --git a/mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/core/support/LdapContextSourcelMultiServerITest.java b/test/integration-tests/src/test/java/org/springframework/ldap/core/support/LdapContextSourcelMultiServerITest.java
similarity index 100%
rename from mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/core/support/LdapContextSourcelMultiServerITest.java
rename to test/integration-tests/src/test/java/org/springframework/ldap/core/support/LdapContextSourcelMultiServerITest.java
diff --git a/mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/filter/HardcodedFilterIntegrationTest.java b/test/integration-tests/src/test/java/org/springframework/ldap/filter/HardcodedFilterIntegrationTest.java
similarity index 100%
rename from mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/filter/HardcodedFilterIntegrationTest.java
rename to test/integration-tests/src/test/java/org/springframework/ldap/filter/HardcodedFilterIntegrationTest.java
diff --git a/mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceAndDataSourceTransactionManagerIntegrationTest.java b/test/integration-tests/src/test/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceAndDataSourceTransactionManagerIntegrationTest.java
similarity index 100%
rename from mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceAndDataSourceTransactionManagerIntegrationTest.java
rename to test/integration-tests/src/test/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceAndDataSourceTransactionManagerIntegrationTest.java
diff --git a/mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceTransactionManagerIntegrationTest.java b/test/integration-tests/src/test/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceTransactionManagerIntegrationTest.java
similarity index 100%
rename from mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceTransactionManagerIntegrationTest.java
rename to test/integration-tests/src/test/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceTransactionManagerIntegrationTest.java
diff --git a/mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/transaction/compensating/manager/hibernate/ContextSourceAndHibernateTransactionManagerIntegrationTest.java b/test/integration-tests/src/test/java/org/springframework/ldap/transaction/compensating/manager/hibernate/ContextSourceAndHibernateTransactionManagerIntegrationTest.java
similarity index 100%
rename from mvn-build/test/integration-tests/src/test/java/org/springframework/ldap/transaction/compensating/manager/hibernate/ContextSourceAndHibernateTransactionManagerIntegrationTest.java
rename to test/integration-tests/src/test/java/org/springframework/ldap/transaction/compensating/manager/hibernate/ContextSourceAndHibernateTransactionManagerIntegrationTest.java
diff --git a/mvn-build/test/integration-tests/src/test/java/setup_data.ldif b/test/integration-tests/src/test/java/setup_data.ldif
similarity index 100%
rename from mvn-build/test/integration-tests/src/test/java/setup_data.ldif
rename to test/integration-tests/src/test/java/setup_data.ldif
diff --git a/mvn-build/test/integration-tests/src/test/java/teardown_data.ldif b/test/integration-tests/src/test/java/teardown_data.ldif
similarity index 100%
rename from mvn-build/test/integration-tests/src/test/java/teardown_data.ldif
rename to test/integration-tests/src/test/java/teardown_data.ldif
diff --git a/mvn-build/test/integration-tests/src/test/resources/conf/OrgPerson.hbm.xml b/test/integration-tests/src/test/resources/conf/OrgPerson.hbm.xml
similarity index 100%
rename from mvn-build/test/integration-tests/src/test/resources/conf/OrgPerson.hbm.xml
rename to test/integration-tests/src/test/resources/conf/OrgPerson.hbm.xml
diff --git a/mvn-build/test/integration-tests/src/test/resources/conf/apacheDsContext.xml b/test/integration-tests/src/test/resources/conf/apacheDsContext.xml
similarity index 100%
rename from mvn-build/test/integration-tests/src/test/resources/conf/apacheDsContext.xml
rename to test/integration-tests/src/test/resources/conf/apacheDsContext.xml
diff --git a/mvn-build/test/integration-tests/src/test/resources/conf/baseLdapPathPostProcessorMultiContextSourceOneSpecTestContext.xml b/test/integration-tests/src/test/resources/conf/baseLdapPathPostProcessorMultiContextSourceOneSpecTestContext.xml
similarity index 100%
rename from mvn-build/test/integration-tests/src/test/resources/conf/baseLdapPathPostProcessorMultiContextSourceOneSpecTestContext.xml
rename to test/integration-tests/src/test/resources/conf/baseLdapPathPostProcessorMultiContextSourceOneSpecTestContext.xml
diff --git a/mvn-build/test/integration-tests/src/test/resources/conf/baseLdapPathPostProcessorMultiContextSourceTestContext.xml b/test/integration-tests/src/test/resources/conf/baseLdapPathPostProcessorMultiContextSourceTestContext.xml
similarity index 100%
rename from mvn-build/test/integration-tests/src/test/resources/conf/baseLdapPathPostProcessorMultiContextSourceTestContext.xml
rename to test/integration-tests/src/test/resources/conf/baseLdapPathPostProcessorMultiContextSourceTestContext.xml
diff --git a/mvn-build/test/integration-tests/src/test/resources/conf/baseLdapPathPostProcessorNoContextSourceTestContext.xml b/test/integration-tests/src/test/resources/conf/baseLdapPathPostProcessorNoContextSourceTestContext.xml
similarity index 100%
rename from mvn-build/test/integration-tests/src/test/resources/conf/baseLdapPathPostProcessorNoContextSourceTestContext.xml
rename to test/integration-tests/src/test/resources/conf/baseLdapPathPostProcessorNoContextSourceTestContext.xml
diff --git a/mvn-build/test/integration-tests/src/test/resources/conf/baseLdapPathPostProcessorPropertyOverrideTestContext.xml b/test/integration-tests/src/test/resources/conf/baseLdapPathPostProcessorPropertyOverrideTestContext.xml
similarity index 100%
rename from mvn-build/test/integration-tests/src/test/resources/conf/baseLdapPathPostProcessorPropertyOverrideTestContext.xml
rename to test/integration-tests/src/test/resources/conf/baseLdapPathPostProcessorPropertyOverrideTestContext.xml
diff --git a/mvn-build/test/integration-tests/src/test/resources/conf/baseLdapPathPostProcessorTestContext.xml b/test/integration-tests/src/test/resources/conf/baseLdapPathPostProcessorTestContext.xml
similarity index 100%
rename from mvn-build/test/integration-tests/src/test/resources/conf/baseLdapPathPostProcessorTestContext.xml
rename to test/integration-tests/src/test/resources/conf/baseLdapPathPostProcessorTestContext.xml
diff --git a/mvn-build/test/integration-tests/src/test/resources/conf/baseLdapPathPostProcessorTransactionTestContext.xml b/test/integration-tests/src/test/resources/conf/baseLdapPathPostProcessorTransactionTestContext.xml
similarity index 100%
rename from mvn-build/test/integration-tests/src/test/resources/conf/baseLdapPathPostProcessorTransactionTestContext.xml
rename to test/integration-tests/src/test/resources/conf/baseLdapPathPostProcessorTransactionTestContext.xml
diff --git a/mvn-build/test/integration-tests/src/test/resources/conf/commonTestContext.xml b/test/integration-tests/src/test/resources/conf/commonTestContext.xml
similarity index 100%
rename from mvn-build/test/integration-tests/src/test/resources/conf/commonTestContext.xml
rename to test/integration-tests/src/test/resources/conf/commonTestContext.xml
diff --git a/mvn-build/test/integration-tests/src/test/resources/conf/distinguishedNameEditorTestContext.xml b/test/integration-tests/src/test/resources/conf/distinguishedNameEditorTestContext.xml
similarity index 100%
rename from mvn-build/test/integration-tests/src/test/resources/conf/distinguishedNameEditorTestContext.xml
rename to test/integration-tests/src/test/resources/conf/distinguishedNameEditorTestContext.xml
diff --git a/mvn-build/test/integration-tests/src/test/resources/conf/hardcodedFilterTestContext.xml b/test/integration-tests/src/test/resources/conf/hardcodedFilterTestContext.xml
similarity index 100%
rename from mvn-build/test/integration-tests/src/test/resources/conf/hardcodedFilterTestContext.xml
rename to test/integration-tests/src/test/resources/conf/hardcodedFilterTestContext.xml
diff --git a/mvn-build/test/integration-tests/src/test/resources/conf/ldap.properties b/test/integration-tests/src/test/resources/conf/ldap.properties
similarity index 100%
rename from mvn-build/test/integration-tests/src/test/resources/conf/ldap.properties
rename to test/integration-tests/src/test/resources/conf/ldap.properties
diff --git a/mvn-build/test/integration-tests/src/test/resources/conf/ldapAndHibernateTransactionTestContext.xml b/test/integration-tests/src/test/resources/conf/ldapAndHibernateTransactionTestContext.xml
similarity index 100%
rename from mvn-build/test/integration-tests/src/test/resources/conf/ldapAndHibernateTransactionTestContext.xml
rename to test/integration-tests/src/test/resources/conf/ldapAndHibernateTransactionTestContext.xml
diff --git a/mvn-build/test/integration-tests/src/test/resources/conf/ldapAndJdbcTransactionTestContext.xml b/test/integration-tests/src/test/resources/conf/ldapAndJdbcTransactionTestContext.xml
similarity index 100%
rename from mvn-build/test/integration-tests/src/test/resources/conf/ldapAndJdbcTransactionTestContext.xml
rename to test/integration-tests/src/test/resources/conf/ldapAndJdbcTransactionTestContext.xml
diff --git a/mvn-build/test/integration-tests/src/test/resources/conf/ldapContextSourceTestContext.xml b/test/integration-tests/src/test/resources/conf/ldapContextSourceTestContext.xml
similarity index 100%
rename from mvn-build/test/integration-tests/src/test/resources/conf/ldapContextSourceTestContext.xml
rename to test/integration-tests/src/test/resources/conf/ldapContextSourceTestContext.xml
diff --git a/mvn-build/test/integration-tests/src/test/resources/conf/ldapTemplateAcegiTestContext.xml b/test/integration-tests/src/test/resources/conf/ldapTemplateAcegiTestContext.xml
similarity index 100%
rename from mvn-build/test/integration-tests/src/test/resources/conf/ldapTemplateAcegiTestContext.xml
rename to test/integration-tests/src/test/resources/conf/ldapTemplateAcegiTestContext.xml
diff --git a/mvn-build/test/integration-tests/src/test/resources/conf/ldapTemplateNoBaseSuffixTestContext.xml b/test/integration-tests/src/test/resources/conf/ldapTemplateNoBaseSuffixTestContext.xml
similarity index 100%
rename from mvn-build/test/integration-tests/src/test/resources/conf/ldapTemplateNoBaseSuffixTestContext.xml
rename to test/integration-tests/src/test/resources/conf/ldapTemplateNoBaseSuffixTestContext.xml
diff --git a/mvn-build/test/integration-tests/src/test/resources/conf/ldapTemplateObjectBindTestContext.xml b/test/integration-tests/src/test/resources/conf/ldapTemplateObjectBindTestContext.xml
similarity index 100%
rename from mvn-build/test/integration-tests/src/test/resources/conf/ldapTemplateObjectBindTestContext.xml
rename to test/integration-tests/src/test/resources/conf/ldapTemplateObjectBindTestContext.xml
diff --git a/mvn-build/test/integration-tests/src/test/resources/conf/ldapTemplateTestContext.xml b/test/integration-tests/src/test/resources/conf/ldapTemplateTestContext.xml
similarity index 100%
rename from mvn-build/test/integration-tests/src/test/resources/conf/ldapTemplateTestContext.xml
rename to test/integration-tests/src/test/resources/conf/ldapTemplateTestContext.xml
diff --git a/mvn-build/test/integration-tests/src/test/resources/conf/ldapTemplateTransactionTestContext.xml b/test/integration-tests/src/test/resources/conf/ldapTemplateTransactionTestContext.xml
similarity index 100%
rename from mvn-build/test/integration-tests/src/test/resources/conf/ldapTemplateTransactionTestContext.xml
rename to test/integration-tests/src/test/resources/conf/ldapTemplateTransactionTestContext.xml
diff --git a/mvn-build/test/integration-tests/src/test/resources/conf/rootContextSourceTestContext.xml b/test/integration-tests/src/test/resources/conf/rootContextSourceTestContext.xml
similarity index 100%
rename from mvn-build/test/integration-tests/src/test/resources/conf/rootContextSourceTestContext.xml
rename to test/integration-tests/src/test/resources/conf/rootContextSourceTestContext.xml
diff --git a/mvn-build/test/integration-tests/src/test/resources/conf/simpleLdapTemplateTestContext.xml b/test/integration-tests/src/test/resources/conf/simpleLdapTemplateTestContext.xml
similarity index 100%
rename from mvn-build/test/integration-tests/src/test/resources/conf/simpleLdapTemplateTestContext.xml
rename to test/integration-tests/src/test/resources/conf/simpleLdapTemplateTestContext.xml
diff --git a/mvn-build/test/integration-tests/src/test/resources/log4j.properties b/test/integration-tests/src/test/resources/log4j.properties
similarity index 100%
rename from mvn-build/test/integration-tests/src/test/resources/log4j.properties
rename to test/integration-tests/src/test/resources/log4j.properties
diff --git a/mvn-build/test/integration-tests/src/test/resources/setup_data.ldif b/test/integration-tests/src/test/resources/setup_data.ldif
similarity index 100%
rename from mvn-build/test/integration-tests/src/test/resources/setup_data.ldif
rename to test/integration-tests/src/test/resources/setup_data.ldif
diff --git a/mvn-build/test/pom.xml b/test/pom.xml
similarity index 100%
rename from mvn-build/test/pom.xml
rename to test/pom.xml
diff --git a/mvn-build/with-dependencies.sh b/with-dependencies.sh
similarity index 100%
rename from mvn-build/with-dependencies.sh
rename to with-dependencies.sh