From 3afc0f6de9e8e79d94372eb01b9bd7a7107c9aa3 Mon Sep 17 00:00:00 2001 From: Ulrik Sandberg Date: Mon, 26 Nov 2007 23:16:21 +0000 Subject: [PATCH] Began restructuring the pooling code. --- .../ldap/pool/DirContextPoolableObjectFactory.java | 2 +- .../org/springframework/ldap/pool/PoolingContextSource.java | 2 +- .../ldap/{ => pool}/validation/DefaultDirContextValidator.java | 2 +- .../ldap/{ => pool}/validation/DirContextValidator.java | 2 +- .../org/springframework/ldap/pool/AbstractPoolTestCase.java | 2 +- .../ldap/pool/DirContextPoolableObjectFactoryTest.java | 2 +- .../org/springframework/ldap/pool/PoolingContextSourceTest.java | 2 +- .../ldap/validation/DefaultDirContextValidatorTest.java | 1 + 8 files changed, 8 insertions(+), 7 deletions(-) rename sandbox/src/main/java/org/springframework/ldap/{ => pool}/validation/DefaultDirContextValidator.java (96%) rename sandbox/src/main/java/org/springframework/ldap/{ => pool}/validation/DirContextValidator.java (94%) diff --git a/sandbox/src/main/java/org/springframework/ldap/pool/DirContextPoolableObjectFactory.java b/sandbox/src/main/java/org/springframework/ldap/pool/DirContextPoolableObjectFactory.java index 87cc4f62..405e4208 100644 --- a/sandbox/src/main/java/org/springframework/ldap/pool/DirContextPoolableObjectFactory.java +++ b/sandbox/src/main/java/org/springframework/ldap/pool/DirContextPoolableObjectFactory.java @@ -23,7 +23,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.commons.pool.BaseKeyedPoolableObjectFactory; import org.springframework.ldap.core.ContextSource; -import org.springframework.ldap.validation.DirContextValidator; +import org.springframework.ldap.pool.validation.DirContextValidator; /** * Factory that creates {@link DirContext} instances for pooling via a diff --git a/sandbox/src/main/java/org/springframework/ldap/pool/PoolingContextSource.java b/sandbox/src/main/java/org/springframework/ldap/pool/PoolingContextSource.java index c897fb7a..19339dc7 100644 --- a/sandbox/src/main/java/org/springframework/ldap/pool/PoolingContextSource.java +++ b/sandbox/src/main/java/org/springframework/ldap/pool/PoolingContextSource.java @@ -30,7 +30,7 @@ import org.apache.commons.pool.impl.GenericObjectPool; import org.springframework.dao.DataAccessResourceFailureException; import org.springframework.ldap.NamingException; import org.springframework.ldap.core.ContextSource; -import org.springframework.ldap.validation.DirContextValidator; +import org.springframework.ldap.pool.validation.DirContextValidator; /** * A {@link ContextSource} implementation that wraps an object pool and another {@link ContextSource}. diff --git a/sandbox/src/main/java/org/springframework/ldap/validation/DefaultDirContextValidator.java b/sandbox/src/main/java/org/springframework/ldap/pool/validation/DefaultDirContextValidator.java similarity index 96% rename from sandbox/src/main/java/org/springframework/ldap/validation/DefaultDirContextValidator.java rename to sandbox/src/main/java/org/springframework/ldap/pool/validation/DefaultDirContextValidator.java index 68255f46..3826e865 100644 --- a/sandbox/src/main/java/org/springframework/ldap/validation/DefaultDirContextValidator.java +++ b/sandbox/src/main/java/org/springframework/ldap/pool/validation/DefaultDirContextValidator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ldap.validation; +package org.springframework.ldap.pool.validation; import javax.naming.NamingEnumeration; import javax.naming.directory.DirContext; diff --git a/sandbox/src/main/java/org/springframework/ldap/validation/DirContextValidator.java b/sandbox/src/main/java/org/springframework/ldap/pool/validation/DirContextValidator.java similarity index 94% rename from sandbox/src/main/java/org/springframework/ldap/validation/DirContextValidator.java rename to sandbox/src/main/java/org/springframework/ldap/pool/validation/DirContextValidator.java index 53e79724..3d7299b8 100644 --- a/sandbox/src/main/java/org/springframework/ldap/validation/DirContextValidator.java +++ b/sandbox/src/main/java/org/springframework/ldap/pool/validation/DirContextValidator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ldap.validation; +package org.springframework.ldap.pool.validation; import javax.naming.directory.DirContext; diff --git a/sandbox/src/test/java/org/springframework/ldap/pool/AbstractPoolTestCase.java b/sandbox/src/test/java/org/springframework/ldap/pool/AbstractPoolTestCase.java index 03fdac55..b5994969 100644 --- a/sandbox/src/test/java/org/springframework/ldap/pool/AbstractPoolTestCase.java +++ b/sandbox/src/test/java/org/springframework/ldap/pool/AbstractPoolTestCase.java @@ -22,7 +22,7 @@ import javax.naming.ldap.LdapContext; import org.apache.commons.pool.KeyedObjectPool; import org.easymock.MockControl; import org.springframework.ldap.core.ContextSource; -import org.springframework.ldap.validation.DirContextValidator; +import org.springframework.ldap.pool.validation.DirContextValidator; import junit.framework.TestCase; diff --git a/sandbox/src/test/java/org/springframework/ldap/pool/DirContextPoolableObjectFactoryTest.java b/sandbox/src/test/java/org/springframework/ldap/pool/DirContextPoolableObjectFactoryTest.java index f639dc0e..1b5bbcc5 100644 --- a/sandbox/src/test/java/org/springframework/ldap/pool/DirContextPoolableObjectFactoryTest.java +++ b/sandbox/src/test/java/org/springframework/ldap/pool/DirContextPoolableObjectFactoryTest.java @@ -19,7 +19,7 @@ import javax.naming.directory.DirContext; import org.easymock.MockControl; import org.springframework.ldap.core.ContextSource; -import org.springframework.ldap.validation.DirContextValidator; +import org.springframework.ldap.pool.validation.DirContextValidator; /** * @author Eric Dalquist eric.dalquist@doit.wisc.edu diff --git a/sandbox/src/test/java/org/springframework/ldap/pool/PoolingContextSourceTest.java b/sandbox/src/test/java/org/springframework/ldap/pool/PoolingContextSourceTest.java index 483be161..aaf3b668 100644 --- a/sandbox/src/test/java/org/springframework/ldap/pool/PoolingContextSourceTest.java +++ b/sandbox/src/test/java/org/springframework/ldap/pool/PoolingContextSourceTest.java @@ -22,7 +22,7 @@ import org.easymock.MockControl; import org.springframework.dao.DataAccessResourceFailureException; import org.springframework.ldap.core.ContextSource; import org.springframework.ldap.pool.PoolingContextSource.WhenExhaustedAction; -import org.springframework.ldap.validation.DirContextValidator; +import org.springframework.ldap.pool.validation.DirContextValidator; /** * @author Eric Dalquist eric.dalquist@doit.wisc.edu diff --git a/sandbox/src/test/java/org/springframework/ldap/validation/DefaultDirContextValidatorTest.java b/sandbox/src/test/java/org/springframework/ldap/validation/DefaultDirContextValidatorTest.java index 77afdae3..c1aec2e5 100644 --- a/sandbox/src/test/java/org/springframework/ldap/validation/DefaultDirContextValidatorTest.java +++ b/sandbox/src/test/java/org/springframework/ldap/validation/DefaultDirContextValidatorTest.java @@ -24,6 +24,7 @@ import junit.framework.TestCase; import org.easymock.MockControl; import org.springframework.ldap.pool.DirContextType; +import org.springframework.ldap.pool.validation.DefaultDirContextValidator; /** * @author Eric Dalquist