From f9989bfa4a0be306033a25df566a351a21c06e95 Mon Sep 17 00:00:00 2001 From: Ulrik Sandberg Date: Tue, 10 Apr 2007 14:18:33 +0000 Subject: [PATCH] Moved generic compensating transaction support classes to separate package. --- .../ldap/transaction/core/BindOperationExecutor.java | 2 +- .../ldap/transaction/core/BindOperationRecorder.java | 4 ++-- .../transaction/core/ContextSourceTransactionManager.java | 6 +++--- .../ldap/transaction/core/DirContextHolder.java | 6 +++--- .../core/LdapCompensatingTransactionOperationFactory.java | 4 ++-- .../transaction/core/ModifyAttributesOperationExecutor.java | 2 +- .../transaction/core/ModifyAttributesOperationRecorder.java | 4 ++-- .../ldap/transaction/core/NullOperationExecutor.java | 2 +- .../ldap/transaction/core/NullOperationRecorder.java | 6 +++--- .../ldap/transaction/core/RebindOperationExecutor.java | 2 +- .../ldap/transaction/core/RebindOperationRecorder.java | 4 ++-- .../ldap/transaction/core/RenameOperationExecutor.java | 2 +- .../ldap/transaction/core/RenameOperationRecorder.java | 4 ++-- .../ldap/transaction/core/TransactionUtils.java | 2 +- .../ldap/transaction/core/UnbindOperationExecutor.java | 2 +- .../ldap/transaction/core/UnbindOperationRecorder.java | 4 ++-- .../CompensatingTransactionOperationExecutor.java | 2 +- .../CompensatingTransactionOperationFactory.java | 2 +- .../CompensatingTransactionOperationManager.java | 2 +- .../CompensatingTransactionOperationRecorder.java | 2 +- .../DefaultCompensatingTransactionOperationManager.java | 2 +- .../springframework/ldap/support/TransactionUtilsTest.java | 2 +- .../ldap/transaction/core/BindOperationRecorderTest.java | 2 +- .../core/ContextSourceTransactionManagerTest.java | 2 +- .../LdapCompensatingTransactionOperationFactoryTest.java | 2 +- .../core/ModifyAttributesOperationRecorderTest.java | 2 +- .../ldap/transaction/core/RebindOperationRecorderTest.java | 2 +- .../ldap/transaction/core/RenameOperationRecorderTest.java | 2 +- .../ldap/transaction/core/UnbindOperationRecorderTest.java | 2 +- .../DefaultCompensatingTransactionOperationManagerTest.java | 6 +++++- 30 files changed, 46 insertions(+), 42 deletions(-) rename spring-ldap/src/main/java/org/springframework/{ldap/transaction => transaction/compensating}/CompensatingTransactionOperationExecutor.java (95%) rename spring-ldap/src/main/java/org/springframework/{ldap/transaction => transaction/compensating}/CompensatingTransactionOperationFactory.java (93%) rename spring-ldap/src/main/java/org/springframework/{ldap/transaction => transaction/compensating}/CompensatingTransactionOperationManager.java (94%) rename spring-ldap/src/main/java/org/springframework/{ldap/transaction => transaction/compensating}/CompensatingTransactionOperationRecorder.java (94%) rename spring-ldap/src/main/java/org/springframework/{ldap/transaction => transaction/compensating}/DefaultCompensatingTransactionOperationManager.java (96%) rename spring-ldap/src/test/java/org/springframework/{ldap/transaction => transaction/compensating}/DefaultCompensatingTransactionOperationManagerTest.java (89%) diff --git a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/BindOperationExecutor.java b/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/BindOperationExecutor.java index 43b326fe..bd6dd2fa 100644 --- a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/BindOperationExecutor.java +++ b/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/BindOperationExecutor.java @@ -21,7 +21,7 @@ import javax.naming.directory.Attributes; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.ldap.core.LdapOperations; -import org.springframework.ldap.transaction.CompensatingTransactionOperationExecutor; +import org.springframework.transaction.compensating.CompensatingTransactionOperationExecutor; /** * A {@link CompensatingTransactionOperationExecutor} to manage a bind diff --git a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/BindOperationRecorder.java b/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/BindOperationRecorder.java index af4ac236..a84869f7 100644 --- a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/BindOperationRecorder.java +++ b/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/BindOperationRecorder.java @@ -19,8 +19,8 @@ import javax.naming.Name; import javax.naming.directory.Attributes; import org.springframework.ldap.core.LdapOperations; -import org.springframework.ldap.transaction.CompensatingTransactionOperationExecutor; -import org.springframework.ldap.transaction.CompensatingTransactionOperationRecorder; +import org.springframework.transaction.compensating.CompensatingTransactionOperationExecutor; +import org.springframework.transaction.compensating.CompensatingTransactionOperationRecorder; /** * A {@link CompensatingTransactionOperationRecorder} to manage LDAP bind diff --git a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/ContextSourceTransactionManager.java b/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/ContextSourceTransactionManager.java index 1e179fab..395fded8 100644 --- a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/ContextSourceTransactionManager.java +++ b/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/ContextSourceTransactionManager.java @@ -16,11 +16,11 @@ package org.springframework.ldap.transaction.core; import org.springframework.ldap.core.ContextSource; -import org.springframework.ldap.transaction.CompensatingTransactionOperationExecutor; -import org.springframework.ldap.transaction.CompensatingTransactionOperationRecorder; -import org.springframework.ldap.transaction.DefaultCompensatingTransactionOperationManager; import org.springframework.transaction.TransactionDefinition; import org.springframework.transaction.TransactionException; +import org.springframework.transaction.compensating.CompensatingTransactionOperationExecutor; +import org.springframework.transaction.compensating.CompensatingTransactionOperationRecorder; +import org.springframework.transaction.compensating.DefaultCompensatingTransactionOperationManager; import org.springframework.transaction.support.AbstractPlatformTransactionManager; import org.springframework.transaction.support.DefaultTransactionStatus; diff --git a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/DirContextHolder.java b/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/DirContextHolder.java index 3365e8ac..4b9aeb33 100644 --- a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/DirContextHolder.java +++ b/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/DirContextHolder.java @@ -17,9 +17,9 @@ package org.springframework.ldap.transaction.core; import javax.naming.directory.DirContext; -import org.springframework.ldap.transaction.CompensatingTransactionOperationFactory; -import org.springframework.ldap.transaction.CompensatingTransactionOperationManager; -import org.springframework.ldap.transaction.DefaultCompensatingTransactionOperationManager; +import org.springframework.transaction.compensating.CompensatingTransactionOperationFactory; +import org.springframework.transaction.compensating.CompensatingTransactionOperationManager; +import org.springframework.transaction.compensating.DefaultCompensatingTransactionOperationManager; import org.springframework.transaction.support.ResourceHolderSupport; /** diff --git a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/LdapCompensatingTransactionOperationFactory.java b/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/LdapCompensatingTransactionOperationFactory.java index 33c61d4f..441fb5d9 100644 --- a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/LdapCompensatingTransactionOperationFactory.java +++ b/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/LdapCompensatingTransactionOperationFactory.java @@ -29,8 +29,8 @@ import org.springframework.ldap.NamingException; import org.springframework.ldap.core.ContextSource; import org.springframework.ldap.core.LdapOperations; import org.springframework.ldap.core.LdapTemplate; -import org.springframework.ldap.transaction.CompensatingTransactionOperationFactory; -import org.springframework.ldap.transaction.CompensatingTransactionOperationRecorder; +import org.springframework.transaction.compensating.CompensatingTransactionOperationFactory; +import org.springframework.transaction.compensating.CompensatingTransactionOperationRecorder; /** * {@link CompensatingTransactionOperationRecorder} implementation for LDAP diff --git a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/ModifyAttributesOperationExecutor.java b/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/ModifyAttributesOperationExecutor.java index f8c4bcdb..90cbdf7c 100644 --- a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/ModifyAttributesOperationExecutor.java +++ b/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/ModifyAttributesOperationExecutor.java @@ -21,7 +21,7 @@ import javax.naming.directory.ModificationItem; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.ldap.core.LdapOperations; -import org.springframework.ldap.transaction.CompensatingTransactionOperationExecutor; +import org.springframework.transaction.compensating.CompensatingTransactionOperationExecutor; /** * A {@link CompensatingTransactionOperationExecutor} to manage a diff --git a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/ModifyAttributesOperationRecorder.java b/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/ModifyAttributesOperationRecorder.java index 6f6f8159..fea8f94d 100644 --- a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/ModifyAttributesOperationRecorder.java +++ b/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/ModifyAttributesOperationRecorder.java @@ -28,8 +28,8 @@ import javax.naming.directory.ModificationItem; import org.springframework.ldap.core.AttributesMapper; import org.springframework.ldap.core.LdapOperations; -import org.springframework.ldap.transaction.CompensatingTransactionOperationExecutor; -import org.springframework.ldap.transaction.CompensatingTransactionOperationRecorder; +import org.springframework.transaction.compensating.CompensatingTransactionOperationExecutor; +import org.springframework.transaction.compensating.CompensatingTransactionOperationRecorder; import org.springframework.util.Assert; /** diff --git a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/NullOperationExecutor.java b/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/NullOperationExecutor.java index dd04d62e..c2307598 100644 --- a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/NullOperationExecutor.java +++ b/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/NullOperationExecutor.java @@ -17,7 +17,7 @@ package org.springframework.ldap.transaction.core; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.ldap.transaction.CompensatingTransactionOperationExecutor; +import org.springframework.transaction.compensating.CompensatingTransactionOperationExecutor; /** * A {@link CompensatingTransactionOperationExecutor} that performs nothing. diff --git a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/NullOperationRecorder.java b/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/NullOperationRecorder.java index 7e2f82ff..70b6e051 100644 --- a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/NullOperationRecorder.java +++ b/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/NullOperationRecorder.java @@ -15,9 +15,9 @@ */ package org.springframework.ldap.transaction.core; -import org.springframework.ldap.transaction.CompensatingTransactionOperationExecutor; -import org.springframework.ldap.transaction.CompensatingTransactionOperationManager; -import org.springframework.ldap.transaction.CompensatingTransactionOperationRecorder; +import org.springframework.transaction.compensating.CompensatingTransactionOperationExecutor; +import org.springframework.transaction.compensating.CompensatingTransactionOperationManager; +import org.springframework.transaction.compensating.CompensatingTransactionOperationRecorder; /** * A {@link CompensatingTransactionOperationRecorder} performing nothing, diff --git a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/RebindOperationExecutor.java b/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/RebindOperationExecutor.java index 1f105a4d..f825e60b 100644 --- a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/RebindOperationExecutor.java +++ b/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/RebindOperationExecutor.java @@ -21,7 +21,7 @@ import javax.naming.directory.Attributes; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.ldap.core.LdapOperations; -import org.springframework.ldap.transaction.CompensatingTransactionOperationExecutor; +import org.springframework.transaction.compensating.CompensatingTransactionOperationExecutor; /** * A {@link CompensatingTransactionOperationExecutor} to manage a rebind diff --git a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/RebindOperationRecorder.java b/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/RebindOperationRecorder.java index 3b907c63..8211d907 100644 --- a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/RebindOperationRecorder.java +++ b/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/RebindOperationRecorder.java @@ -19,8 +19,8 @@ import javax.naming.Name; import javax.naming.directory.Attributes; import org.springframework.ldap.core.LdapOperations; -import org.springframework.ldap.transaction.CompensatingTransactionOperationExecutor; -import org.springframework.ldap.transaction.CompensatingTransactionOperationRecorder; +import org.springframework.transaction.compensating.CompensatingTransactionOperationExecutor; +import org.springframework.transaction.compensating.CompensatingTransactionOperationRecorder; /** * A {@link CompensatingTransactionOperationRecorder} keeping track of a rebind diff --git a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/RenameOperationExecutor.java b/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/RenameOperationExecutor.java index af14b3f7..54971a2b 100644 --- a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/RenameOperationExecutor.java +++ b/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/RenameOperationExecutor.java @@ -20,7 +20,7 @@ import javax.naming.Name; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.ldap.core.LdapOperations; -import org.springframework.ldap.transaction.CompensatingTransactionOperationExecutor; +import org.springframework.transaction.compensating.CompensatingTransactionOperationExecutor; /** * A {@link CompensatingTransactionOperationExecutor} to manage a rename diff --git a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/RenameOperationRecorder.java b/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/RenameOperationRecorder.java index 3da3712b..a987af65 100644 --- a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/RenameOperationRecorder.java +++ b/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/RenameOperationRecorder.java @@ -20,8 +20,8 @@ import javax.naming.Name; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.ldap.core.LdapOperations; -import org.springframework.ldap.transaction.CompensatingTransactionOperationExecutor; -import org.springframework.ldap.transaction.CompensatingTransactionOperationRecorder; +import org.springframework.transaction.compensating.CompensatingTransactionOperationExecutor; +import org.springframework.transaction.compensating.CompensatingTransactionOperationRecorder; import org.springframework.util.Assert; /** diff --git a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/TransactionUtils.java b/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/TransactionUtils.java index 68cd13a3..1c6f71a9 100644 --- a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/TransactionUtils.java +++ b/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/TransactionUtils.java @@ -29,7 +29,7 @@ import org.apache.commons.logging.LogFactory; import org.springframework.ldap.NamingException; import org.springframework.ldap.core.ContextSource; import org.springframework.ldap.core.DistinguishedName; -import org.springframework.ldap.transaction.CompensatingTransactionOperationManager; +import org.springframework.transaction.compensating.CompensatingTransactionOperationManager; import org.springframework.transaction.support.TransactionSynchronizationManager; import org.springframework.util.Assert; diff --git a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/UnbindOperationExecutor.java b/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/UnbindOperationExecutor.java index d47f1127..113aeabd 100644 --- a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/UnbindOperationExecutor.java +++ b/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/UnbindOperationExecutor.java @@ -20,7 +20,7 @@ import javax.naming.Name; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.ldap.core.LdapOperations; -import org.springframework.ldap.transaction.CompensatingTransactionOperationExecutor; +import org.springframework.transaction.compensating.CompensatingTransactionOperationExecutor; /** * A {@link CompensatingTransactionOperationExecutor} to manage an unbind diff --git a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/UnbindOperationRecorder.java b/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/UnbindOperationRecorder.java index fb27a04b..0ecec374 100644 --- a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/UnbindOperationRecorder.java +++ b/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/UnbindOperationRecorder.java @@ -18,8 +18,8 @@ package org.springframework.ldap.transaction.core; import javax.naming.Name; import org.springframework.ldap.core.LdapOperations; -import org.springframework.ldap.transaction.CompensatingTransactionOperationExecutor; -import org.springframework.ldap.transaction.CompensatingTransactionOperationRecorder; +import org.springframework.transaction.compensating.CompensatingTransactionOperationExecutor; +import org.springframework.transaction.compensating.CompensatingTransactionOperationRecorder; /** * {@link CompensatingTransactionOperationRecorder} to keep track of unbind diff --git a/spring-ldap/src/main/java/org/springframework/ldap/transaction/CompensatingTransactionOperationExecutor.java b/spring-ldap/src/main/java/org/springframework/transaction/compensating/CompensatingTransactionOperationExecutor.java similarity index 95% rename from spring-ldap/src/main/java/org/springframework/ldap/transaction/CompensatingTransactionOperationExecutor.java rename to spring-ldap/src/main/java/org/springframework/transaction/compensating/CompensatingTransactionOperationExecutor.java index 7d809398..83e35661 100644 --- a/spring-ldap/src/main/java/org/springframework/ldap/transaction/CompensatingTransactionOperationExecutor.java +++ b/spring-ldap/src/main/java/org/springframework/transaction/compensating/CompensatingTransactionOperationExecutor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ldap.transaction; +package org.springframework.transaction.compensating; /** * Responsible for executing a single recorded operation as well as committing diff --git a/spring-ldap/src/main/java/org/springframework/ldap/transaction/CompensatingTransactionOperationFactory.java b/spring-ldap/src/main/java/org/springframework/transaction/compensating/CompensatingTransactionOperationFactory.java similarity index 93% rename from spring-ldap/src/main/java/org/springframework/ldap/transaction/CompensatingTransactionOperationFactory.java rename to spring-ldap/src/main/java/org/springframework/transaction/compensating/CompensatingTransactionOperationFactory.java index 2864776d..50d08073 100644 --- a/spring-ldap/src/main/java/org/springframework/ldap/transaction/CompensatingTransactionOperationFactory.java +++ b/spring-ldap/src/main/java/org/springframework/transaction/compensating/CompensatingTransactionOperationFactory.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ldap.transaction; +package org.springframework.transaction.compensating; /** * Factory interface for creating diff --git a/spring-ldap/src/main/java/org/springframework/ldap/transaction/CompensatingTransactionOperationManager.java b/spring-ldap/src/main/java/org/springframework/transaction/compensating/CompensatingTransactionOperationManager.java similarity index 94% rename from spring-ldap/src/main/java/org/springframework/ldap/transaction/CompensatingTransactionOperationManager.java rename to spring-ldap/src/main/java/org/springframework/transaction/compensating/CompensatingTransactionOperationManager.java index 197902e3..2d9943c1 100644 --- a/spring-ldap/src/main/java/org/springframework/ldap/transaction/CompensatingTransactionOperationManager.java +++ b/spring-ldap/src/main/java/org/springframework/transaction/compensating/CompensatingTransactionOperationManager.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ldap.transaction; +package org.springframework.transaction.compensating; /** * A CompensatingTransactionOperationManager implementation records and performs diff --git a/spring-ldap/src/main/java/org/springframework/ldap/transaction/CompensatingTransactionOperationRecorder.java b/spring-ldap/src/main/java/org/springframework/transaction/compensating/CompensatingTransactionOperationRecorder.java similarity index 94% rename from spring-ldap/src/main/java/org/springframework/ldap/transaction/CompensatingTransactionOperationRecorder.java rename to spring-ldap/src/main/java/org/springframework/transaction/compensating/CompensatingTransactionOperationRecorder.java index 3c715f39..edb05ceb 100644 --- a/spring-ldap/src/main/java/org/springframework/ldap/transaction/CompensatingTransactionOperationRecorder.java +++ b/spring-ldap/src/main/java/org/springframework/transaction/compensating/CompensatingTransactionOperationRecorder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ldap.transaction; +package org.springframework.transaction.compensating; /** * An implementation of this interface is responsible for recording data and diff --git a/spring-ldap/src/main/java/org/springframework/ldap/transaction/DefaultCompensatingTransactionOperationManager.java b/spring-ldap/src/main/java/org/springframework/transaction/compensating/DefaultCompensatingTransactionOperationManager.java similarity index 96% rename from spring-ldap/src/main/java/org/springframework/ldap/transaction/DefaultCompensatingTransactionOperationManager.java rename to spring-ldap/src/main/java/org/springframework/transaction/compensating/DefaultCompensatingTransactionOperationManager.java index 6bb097ab..9e89caad 100644 --- a/spring-ldap/src/main/java/org/springframework/ldap/transaction/DefaultCompensatingTransactionOperationManager.java +++ b/spring-ldap/src/main/java/org/springframework/transaction/compensating/DefaultCompensatingTransactionOperationManager.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ldap.transaction; +package org.springframework.transaction.compensating; import java.util.Iterator; import java.util.Stack; diff --git a/spring-ldap/src/test/java/org/springframework/ldap/support/TransactionUtilsTest.java b/spring-ldap/src/test/java/org/springframework/ldap/support/TransactionUtilsTest.java index 39debef0..273fa18c 100644 --- a/spring-ldap/src/test/java/org/springframework/ldap/support/TransactionUtilsTest.java +++ b/spring-ldap/src/test/java/org/springframework/ldap/support/TransactionUtilsTest.java @@ -9,9 +9,9 @@ import junit.framework.TestCase; import org.easymock.MockControl; import org.springframework.ldap.core.ContextSource; -import org.springframework.ldap.transaction.CompensatingTransactionOperationManager; import org.springframework.ldap.transaction.core.DirContextHolder; import org.springframework.ldap.transaction.core.TransactionUtils; +import org.springframework.transaction.compensating.CompensatingTransactionOperationManager; import org.springframework.transaction.support.TransactionSynchronizationManager; public class TransactionUtilsTest extends TestCase { diff --git a/spring-ldap/src/test/java/org/springframework/ldap/transaction/core/BindOperationRecorderTest.java b/spring-ldap/src/test/java/org/springframework/ldap/transaction/core/BindOperationRecorderTest.java index 8db3074e..1933954b 100644 --- a/spring-ldap/src/test/java/org/springframework/ldap/transaction/core/BindOperationRecorderTest.java +++ b/spring-ldap/src/test/java/org/springframework/ldap/transaction/core/BindOperationRecorderTest.java @@ -7,9 +7,9 @@ import junit.framework.TestCase; import org.easymock.MockControl; import org.springframework.ldap.core.DistinguishedName; import org.springframework.ldap.core.LdapOperations; -import org.springframework.ldap.transaction.CompensatingTransactionOperationExecutor; import org.springframework.ldap.transaction.core.BindOperationExecutor; import org.springframework.ldap.transaction.core.BindOperationRecorder; +import org.springframework.transaction.compensating.CompensatingTransactionOperationExecutor; public class BindOperationRecorderTest extends TestCase { private MockControl ldapOperationsControl; diff --git a/spring-ldap/src/test/java/org/springframework/ldap/transaction/core/ContextSourceTransactionManagerTest.java b/spring-ldap/src/test/java/org/springframework/ldap/transaction/core/ContextSourceTransactionManagerTest.java index f20ea252..e9073934 100644 --- a/spring-ldap/src/test/java/org/springframework/ldap/transaction/core/ContextSourceTransactionManagerTest.java +++ b/spring-ldap/src/test/java/org/springframework/ldap/transaction/core/ContextSourceTransactionManagerTest.java @@ -6,13 +6,13 @@ import junit.framework.TestCase; import org.easymock.MockControl; import org.springframework.ldap.core.ContextSource; -import org.springframework.ldap.transaction.CompensatingTransactionOperationManager; import org.springframework.ldap.transaction.core.ContextSourceTransactionManager; import org.springframework.ldap.transaction.core.ContextSourceTransactionObject; import org.springframework.ldap.transaction.core.DirContextHolder; import org.springframework.ldap.transaction.core.TempEntryRenamingStrategy; import org.springframework.ldap.transaction.core.TransactionAwareContextSourceProxy; import org.springframework.transaction.TransactionDefinition; +import org.springframework.transaction.compensating.CompensatingTransactionOperationManager; import org.springframework.transaction.support.DefaultTransactionStatus; import org.springframework.transaction.support.TransactionSynchronizationManager; diff --git a/spring-ldap/src/test/java/org/springframework/ldap/transaction/core/LdapCompensatingTransactionOperationFactoryTest.java b/spring-ldap/src/test/java/org/springframework/ldap/transaction/core/LdapCompensatingTransactionOperationFactoryTest.java index e90d0626..0129780e 100644 --- a/spring-ldap/src/test/java/org/springframework/ldap/transaction/core/LdapCompensatingTransactionOperationFactoryTest.java +++ b/spring-ldap/src/test/java/org/springframework/ldap/transaction/core/LdapCompensatingTransactionOperationFactoryTest.java @@ -4,7 +4,6 @@ import junit.framework.TestCase; import org.easymock.MockControl; import org.springframework.ldap.core.LdapOperations; -import org.springframework.ldap.transaction.CompensatingTransactionOperationRecorder; import org.springframework.ldap.transaction.core.BindOperationRecorder; import org.springframework.ldap.transaction.core.LdapCompensatingTransactionOperationFactory; import org.springframework.ldap.transaction.core.ModifyAttributesOperationRecorder; @@ -12,6 +11,7 @@ import org.springframework.ldap.transaction.core.RebindOperationRecorder; import org.springframework.ldap.transaction.core.RenameOperationRecorder; import org.springframework.ldap.transaction.core.TempEntryRenamingStrategy; import org.springframework.ldap.transaction.core.UnbindOperationRecorder; +import org.springframework.transaction.compensating.CompensatingTransactionOperationRecorder; public class LdapCompensatingTransactionOperationFactoryTest extends TestCase { private MockControl ldapOperationsControl; diff --git a/spring-ldap/src/test/java/org/springframework/ldap/transaction/core/ModifyAttributesOperationRecorderTest.java b/spring-ldap/src/test/java/org/springframework/ldap/transaction/core/ModifyAttributesOperationRecorderTest.java index f9f4b1af..5553cd7e 100644 --- a/spring-ldap/src/test/java/org/springframework/ldap/transaction/core/ModifyAttributesOperationRecorderTest.java +++ b/spring-ldap/src/test/java/org/springframework/ldap/transaction/core/ModifyAttributesOperationRecorderTest.java @@ -14,9 +14,9 @@ import org.easymock.MockControl; import org.springframework.ldap.core.AttributesMapper; import org.springframework.ldap.core.DistinguishedName; import org.springframework.ldap.core.LdapOperations; -import org.springframework.ldap.transaction.CompensatingTransactionOperationExecutor; import org.springframework.ldap.transaction.core.ModifyAttributesOperationExecutor; import org.springframework.ldap.transaction.core.ModifyAttributesOperationRecorder; +import org.springframework.transaction.compensating.CompensatingTransactionOperationExecutor; public class ModifyAttributesOperationRecorderTest extends TestCase { private MockControl ldapOperationsControl; diff --git a/spring-ldap/src/test/java/org/springframework/ldap/transaction/core/RebindOperationRecorderTest.java b/spring-ldap/src/test/java/org/springframework/ldap/transaction/core/RebindOperationRecorderTest.java index 774647e3..92e729d8 100644 --- a/spring-ldap/src/test/java/org/springframework/ldap/transaction/core/RebindOperationRecorderTest.java +++ b/spring-ldap/src/test/java/org/springframework/ldap/transaction/core/RebindOperationRecorderTest.java @@ -7,10 +7,10 @@ import junit.framework.TestCase; import org.easymock.MockControl; import org.springframework.ldap.core.DistinguishedName; import org.springframework.ldap.core.LdapOperations; -import org.springframework.ldap.transaction.CompensatingTransactionOperationExecutor; import org.springframework.ldap.transaction.core.RebindOperationExecutor; import org.springframework.ldap.transaction.core.RebindOperationRecorder; import org.springframework.ldap.transaction.core.TempEntryRenamingStrategy; +import org.springframework.transaction.compensating.CompensatingTransactionOperationExecutor; public class RebindOperationRecorderTest extends TestCase { private MockControl ldapOperationsControl; diff --git a/spring-ldap/src/test/java/org/springframework/ldap/transaction/core/RenameOperationRecorderTest.java b/spring-ldap/src/test/java/org/springframework/ldap/transaction/core/RenameOperationRecorderTest.java index ffc5eb8e..504d501c 100644 --- a/spring-ldap/src/test/java/org/springframework/ldap/transaction/core/RenameOperationRecorderTest.java +++ b/spring-ldap/src/test/java/org/springframework/ldap/transaction/core/RenameOperationRecorderTest.java @@ -4,9 +4,9 @@ import junit.framework.TestCase; import org.easymock.MockControl; import org.springframework.ldap.core.LdapOperations; -import org.springframework.ldap.transaction.CompensatingTransactionOperationExecutor; import org.springframework.ldap.transaction.core.RenameOperationExecutor; import org.springframework.ldap.transaction.core.RenameOperationRecorder; +import org.springframework.transaction.compensating.CompensatingTransactionOperationExecutor; public class RenameOperationRecorderTest extends TestCase { diff --git a/spring-ldap/src/test/java/org/springframework/ldap/transaction/core/UnbindOperationRecorderTest.java b/spring-ldap/src/test/java/org/springframework/ldap/transaction/core/UnbindOperationRecorderTest.java index 3f357612..26c38fbe 100644 --- a/spring-ldap/src/test/java/org/springframework/ldap/transaction/core/UnbindOperationRecorderTest.java +++ b/spring-ldap/src/test/java/org/springframework/ldap/transaction/core/UnbindOperationRecorderTest.java @@ -5,10 +5,10 @@ import junit.framework.TestCase; import org.easymock.MockControl; import org.springframework.ldap.core.DistinguishedName; import org.springframework.ldap.core.LdapOperations; -import org.springframework.ldap.transaction.CompensatingTransactionOperationExecutor; import org.springframework.ldap.transaction.core.TempEntryRenamingStrategy; import org.springframework.ldap.transaction.core.UnbindOperationExecutor; import org.springframework.ldap.transaction.core.UnbindOperationRecorder; +import org.springframework.transaction.compensating.CompensatingTransactionOperationExecutor; public class UnbindOperationRecorderTest extends TestCase { private MockControl ldapOperationsControl; diff --git a/spring-ldap/src/test/java/org/springframework/ldap/transaction/DefaultCompensatingTransactionOperationManagerTest.java b/spring-ldap/src/test/java/org/springframework/transaction/compensating/DefaultCompensatingTransactionOperationManagerTest.java similarity index 89% rename from spring-ldap/src/test/java/org/springframework/ldap/transaction/DefaultCompensatingTransactionOperationManagerTest.java rename to spring-ldap/src/test/java/org/springframework/transaction/compensating/DefaultCompensatingTransactionOperationManagerTest.java index ee2a02cb..6d025960 100644 --- a/spring-ldap/src/test/java/org/springframework/ldap/transaction/DefaultCompensatingTransactionOperationManagerTest.java +++ b/spring-ldap/src/test/java/org/springframework/transaction/compensating/DefaultCompensatingTransactionOperationManagerTest.java @@ -1,4 +1,4 @@ -package org.springframework.ldap.transaction; +package org.springframework.transaction.compensating; import java.util.Stack; @@ -6,6 +6,10 @@ import junit.framework.TestCase; import org.easymock.MockControl; import org.springframework.transaction.TransactionSystemException; +import org.springframework.transaction.compensating.CompensatingTransactionOperationExecutor; +import org.springframework.transaction.compensating.CompensatingTransactionOperationFactory; +import org.springframework.transaction.compensating.CompensatingTransactionOperationRecorder; +import org.springframework.transaction.compensating.DefaultCompensatingTransactionOperationManager; public class DefaultCompensatingTransactionOperationManagerTest extends TestCase {