From 426a077d0a068f7eefbee96352885c5d2eae229c Mon Sep 17 00:00:00 2001 From: Ulrik Sandberg Date: Fri, 12 Jan 2007 13:51:02 +0000 Subject: [PATCH] IN PROGRESS - issue LDAP-33: Remove package dependency cycle between ldap.core and ldap.support http://opensource.atlassian.com/projects/spring/browse/LDAP-33 --- .../org/springframework/ldap/filter/AbstractFilterTest.java | 4 ++-- .../java/org/springframework/ldap/filter/AndFilterTest.java | 6 +++--- .../org/springframework/ldap/filter/EqualsFilterTest.java | 4 ++-- .../ldap/filter/GreaterThanOrEqualsFilterTest.java | 4 ++-- .../ldap/filter/LessThanOrEqualsFilterTest.java | 4 ++-- .../org/springframework/ldap/filter/LikeFilterTest.java | 4 ++-- .../java/org/springframework/ldap/filter/NotFilterTest.java | 6 +++--- .../java/org/springframework/ldap/filter/OrFilterTest.java | 6 +++--- .../ldap/filter/WhitespaceWildcardsFilterTest.java | 4 ++-- 9 files changed, 21 insertions(+), 21 deletions(-) diff --git a/spring-ldap/src/test/java/org/springframework/ldap/filter/AbstractFilterTest.java b/spring-ldap/src/test/java/org/springframework/ldap/filter/AbstractFilterTest.java index 7fad9e46..7328b11a 100644 --- a/spring-ldap/src/test/java/org/springframework/ldap/filter/AbstractFilterTest.java +++ b/spring-ldap/src/test/java/org/springframework/ldap/filter/AbstractFilterTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.springframework.ldap.support.filter; +package org.springframework.ldap.filter; -import org.springframework.ldap.support.filter.AbstractFilter; +import org.springframework.ldap.filter.AbstractFilter; import junit.framework.TestCase; diff --git a/spring-ldap/src/test/java/org/springframework/ldap/filter/AndFilterTest.java b/spring-ldap/src/test/java/org/springframework/ldap/filter/AndFilterTest.java index c1feccbc..77b2f3ae 100644 --- a/spring-ldap/src/test/java/org/springframework/ldap/filter/AndFilterTest.java +++ b/spring-ldap/src/test/java/org/springframework/ldap/filter/AndFilterTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.springframework.ldap.support.filter; +package org.springframework.ldap.filter; -import org.springframework.ldap.support.filter.AndFilter; -import org.springframework.ldap.support.filter.EqualsFilter; +import org.springframework.ldap.filter.AndFilter; +import org.springframework.ldap.filter.EqualsFilter; import com.gargoylesoftware.base.testing.EqualsTester; diff --git a/spring-ldap/src/test/java/org/springframework/ldap/filter/EqualsFilterTest.java b/spring-ldap/src/test/java/org/springframework/ldap/filter/EqualsFilterTest.java index 58122f1e..c7cd07b2 100644 --- a/spring-ldap/src/test/java/org/springframework/ldap/filter/EqualsFilterTest.java +++ b/spring-ldap/src/test/java/org/springframework/ldap/filter/EqualsFilterTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.springframework.ldap.support.filter; +package org.springframework.ldap.filter; -import org.springframework.ldap.support.filter.EqualsFilter; +import org.springframework.ldap.filter.EqualsFilter; import com.gargoylesoftware.base.testing.EqualsTester; diff --git a/spring-ldap/src/test/java/org/springframework/ldap/filter/GreaterThanOrEqualsFilterTest.java b/spring-ldap/src/test/java/org/springframework/ldap/filter/GreaterThanOrEqualsFilterTest.java index 6a483973..62a2dc89 100644 --- a/spring-ldap/src/test/java/org/springframework/ldap/filter/GreaterThanOrEqualsFilterTest.java +++ b/spring-ldap/src/test/java/org/springframework/ldap/filter/GreaterThanOrEqualsFilterTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.springframework.ldap.support.filter; +package org.springframework.ldap.filter; -import org.springframework.ldap.support.filter.GreaterThanOrEqualsFilter; +import org.springframework.ldap.filter.GreaterThanOrEqualsFilter; import junit.framework.TestCase; diff --git a/spring-ldap/src/test/java/org/springframework/ldap/filter/LessThanOrEqualsFilterTest.java b/spring-ldap/src/test/java/org/springframework/ldap/filter/LessThanOrEqualsFilterTest.java index 3a152f45..afe0b4ad 100644 --- a/spring-ldap/src/test/java/org/springframework/ldap/filter/LessThanOrEqualsFilterTest.java +++ b/spring-ldap/src/test/java/org/springframework/ldap/filter/LessThanOrEqualsFilterTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.springframework.ldap.support.filter; +package org.springframework.ldap.filter; -import org.springframework.ldap.support.filter.LessThanOrEqualsFilter; +import org.springframework.ldap.filter.LessThanOrEqualsFilter; import junit.framework.TestCase; diff --git a/spring-ldap/src/test/java/org/springframework/ldap/filter/LikeFilterTest.java b/spring-ldap/src/test/java/org/springframework/ldap/filter/LikeFilterTest.java index af3d9d1d..9ea9c8bf 100644 --- a/spring-ldap/src/test/java/org/springframework/ldap/filter/LikeFilterTest.java +++ b/spring-ldap/src/test/java/org/springframework/ldap/filter/LikeFilterTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.springframework.ldap.support.filter; +package org.springframework.ldap.filter; -import org.springframework.ldap.support.filter.LikeFilter; +import org.springframework.ldap.filter.LikeFilter; import junit.framework.TestCase; diff --git a/spring-ldap/src/test/java/org/springframework/ldap/filter/NotFilterTest.java b/spring-ldap/src/test/java/org/springframework/ldap/filter/NotFilterTest.java index 58788e7c..87b5affb 100644 --- a/spring-ldap/src/test/java/org/springframework/ldap/filter/NotFilterTest.java +++ b/spring-ldap/src/test/java/org/springframework/ldap/filter/NotFilterTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.springframework.ldap.support.filter; +package org.springframework.ldap.filter; -import org.springframework.ldap.support.filter.EqualsFilter; -import org.springframework.ldap.support.filter.NotFilter; +import org.springframework.ldap.filter.EqualsFilter; +import org.springframework.ldap.filter.NotFilter; import com.gargoylesoftware.base.testing.EqualsTester; diff --git a/spring-ldap/src/test/java/org/springframework/ldap/filter/OrFilterTest.java b/spring-ldap/src/test/java/org/springframework/ldap/filter/OrFilterTest.java index f5f5360d..f01adc18 100644 --- a/spring-ldap/src/test/java/org/springframework/ldap/filter/OrFilterTest.java +++ b/spring-ldap/src/test/java/org/springframework/ldap/filter/OrFilterTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.springframework.ldap.support.filter; +package org.springframework.ldap.filter; -import org.springframework.ldap.support.filter.EqualsFilter; -import org.springframework.ldap.support.filter.OrFilter; +import org.springframework.ldap.filter.EqualsFilter; +import org.springframework.ldap.filter.OrFilter; import junit.framework.TestCase; diff --git a/spring-ldap/src/test/java/org/springframework/ldap/filter/WhitespaceWildcardsFilterTest.java b/spring-ldap/src/test/java/org/springframework/ldap/filter/WhitespaceWildcardsFilterTest.java index d781c281..42edfcfd 100644 --- a/spring-ldap/src/test/java/org/springframework/ldap/filter/WhitespaceWildcardsFilterTest.java +++ b/spring-ldap/src/test/java/org/springframework/ldap/filter/WhitespaceWildcardsFilterTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.springframework.ldap.support.filter; +package org.springframework.ldap.filter; -import org.springframework.ldap.support.filter.WhitespaceWildcardsFilter; +import org.springframework.ldap.filter.WhitespaceWildcardsFilter; import junit.framework.TestCase;