From 890607b1bffe201df5bfeddf608afc3d6d3be1d9 Mon Sep 17 00:00:00 2001 From: Ulrik Sandberg Date: Tue, 10 Apr 2007 14:53:20 +0000 Subject: [PATCH] Moved the LDAP-specific transaction support classes from ldap.transaction.core to ldap.transaction. --- .../{core => }/BindOperationExecutor.java | 2 +- .../{core => }/BindOperationRecorder.java | 2 +- .../transaction/{core => }/DirContextHolder.java | 2 +- .../transaction/{core => }/DirContextProxy.java | 4 +++- ...pCompensatingTransactionOperationFactory.java | 2 +- .../ModifyAttributesOperationExecutor.java | 2 +- .../ModifyAttributesOperationRecorder.java | 2 +- .../{core => }/NullOperationExecutor.java | 2 +- .../{core => }/NullOperationRecorder.java | 2 +- .../{core => }/RebindOperationExecutor.java | 2 +- .../{core => }/RebindOperationRecorder.java | 2 +- .../{core => }/RenameOperationExecutor.java | 2 +- .../{core => }/RenameOperationRecorder.java | 2 +- .../{core => }/TempEntryRenamingStrategy.java | 2 +- .../transaction/{core => }/TransactionUtils.java | 2 +- .../{core => }/UnbindOperationExecutor.java | 2 +- .../{core => }/UnbindOperationRecorder.java | 2 +- ...extSourceAndDataSourceTransactionManager.java | 1 + .../core/ContextSourceTransactionManager.java | 2 ++ .../ContextSourceTransactionManagerDelegate.java | 2 ++ .../core/ContextSourceTransactionObject.java | 2 ++ .../core/DefaultTempEntryRenamingStrategy.java | 1 + ...ifferentSubtreeTempEntryRenamingStrategy.java | 1 + .../core/TransactionAwareContextSourceProxy.java | 3 +++ ...nsactionAwareDirContextInvocationHandler.java | 2 ++ .../ldap/support/TransactionUtilsTest.java | 4 ++-- .../{core => }/BindOperationExecutorTest.java | 4 ++-- .../{core => }/BindOperationRecorderTest.java | 6 +++--- ...pensatingTransactionOperationFactoryTest.java | 16 ++++++++-------- .../ModifyAttributesOperationExecutorTest.java | 4 ++-- .../ModifyAttributesOperationRecorderTest.java | 6 +++--- .../{core => }/RebindOperationExecutorTest.java | 4 ++-- .../{core => }/RebindOperationRecorderTest.java | 8 ++++---- .../{core => }/RenameOperationExecutorTest.java | 4 ++-- .../{core => }/RenameOperationRecorderTest.java | 6 +++--- .../{core => }/UnbindOperationExecutorTest.java | 4 ++-- .../{core => }/UnbindOperationRecorderTest.java | 8 ++++---- .../ContextSourceTransactionManagerTest.java | 4 ++-- .../TransactionAwareContextSourceProxyTest.java | 1 + 39 files changed, 73 insertions(+), 56 deletions(-) rename spring-ldap/src/main/java/org/springframework/ldap/transaction/{core => }/BindOperationExecutor.java (95%) rename spring-ldap/src/main/java/org/springframework/ldap/transaction/{core => }/BindOperationRecorder.java (95%) rename spring-ldap/src/main/java/org/springframework/ldap/transaction/{core => }/DirContextHolder.java (96%) rename spring-ldap/src/main/java/org/springframework/ldap/transaction/{core => }/DirContextProxy.java (86%) rename spring-ldap/src/main/java/org/springframework/ldap/transaction/{core => }/LdapCompensatingTransactionOperationFactory.java (96%) rename spring-ldap/src/main/java/org/springframework/ldap/transaction/{core => }/ModifyAttributesOperationExecutor.java (95%) rename spring-ldap/src/main/java/org/springframework/ldap/transaction/{core => }/ModifyAttributesOperationRecorder.java (96%) rename spring-ldap/src/main/java/org/springframework/ldap/transaction/{core => }/NullOperationExecutor.java (93%) rename spring-ldap/src/main/java/org/springframework/ldap/transaction/{core => }/NullOperationRecorder.java (94%) rename spring-ldap/src/main/java/org/springframework/ldap/transaction/{core => }/RebindOperationExecutor.java (96%) rename spring-ldap/src/main/java/org/springframework/ldap/transaction/{core => }/RebindOperationRecorder.java (95%) rename spring-ldap/src/main/java/org/springframework/ldap/transaction/{core => }/RenameOperationExecutor.java (95%) rename spring-ldap/src/main/java/org/springframework/ldap/transaction/{core => }/RenameOperationRecorder.java (95%) rename spring-ldap/src/main/java/org/springframework/ldap/transaction/{core => }/TempEntryRenamingStrategy.java (93%) rename spring-ldap/src/main/java/org/springframework/ldap/transaction/{core => }/TransactionUtils.java (96%) rename spring-ldap/src/main/java/org/springframework/ldap/transaction/{core => }/UnbindOperationExecutor.java (95%) rename spring-ldap/src/main/java/org/springframework/ldap/transaction/{core => }/UnbindOperationRecorder.java (95%) rename spring-ldap/src/test/java/org/springframework/ldap/transaction/{core => }/BindOperationExecutorTest.java (92%) rename spring-ldap/src/test/java/org/springframework/ldap/transaction/{core => }/BindOperationRecorderTest.java (91%) rename spring-ldap/src/test/java/org/springframework/ldap/transaction/{core => }/LdapCompensatingTransactionOperationFactoryTest.java (87%) rename spring-ldap/src/test/java/org/springframework/ldap/transaction/{core => }/ModifyAttributesOperationExecutorTest.java (92%) rename spring-ldap/src/test/java/org/springframework/ldap/transaction/{core => }/ModifyAttributesOperationRecorderTest.java (95%) rename spring-ldap/src/test/java/org/springframework/ldap/transaction/{core => }/RebindOperationExecutorTest.java (93%) rename spring-ldap/src/test/java/org/springframework/ldap/transaction/{core => }/RebindOperationRecorderTest.java (88%) rename spring-ldap/src/test/java/org/springframework/ldap/transaction/{core => }/RenameOperationExecutorTest.java (92%) rename spring-ldap/src/test/java/org/springframework/ldap/transaction/{core => }/RenameOperationRecorderTest.java (86%) rename spring-ldap/src/test/java/org/springframework/ldap/transaction/{core => }/UnbindOperationExecutorTest.java (92%) rename spring-ldap/src/test/java/org/springframework/ldap/transaction/{core => }/UnbindOperationRecorderTest.java (87%) 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/BindOperationExecutor.java similarity index 95% rename from spring-ldap/src/main/java/org/springframework/ldap/transaction/core/BindOperationExecutor.java rename to spring-ldap/src/main/java/org/springframework/ldap/transaction/BindOperationExecutor.java index bd6dd2fa..cefa16aa 100644 --- a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/BindOperationExecutor.java +++ b/spring-ldap/src/main/java/org/springframework/ldap/transaction/BindOperationExecutor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ldap.transaction.core; +package org.springframework.ldap.transaction; import javax.naming.Name; import javax.naming.directory.Attributes; 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/BindOperationRecorder.java similarity index 95% rename from spring-ldap/src/main/java/org/springframework/ldap/transaction/core/BindOperationRecorder.java rename to spring-ldap/src/main/java/org/springframework/ldap/transaction/BindOperationRecorder.java index a84869f7..d43af9c0 100644 --- a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/BindOperationRecorder.java +++ b/spring-ldap/src/main/java/org/springframework/ldap/transaction/BindOperationRecorder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ldap.transaction.core; +package org.springframework.ldap.transaction; import javax.naming.Name; import javax.naming.directory.Attributes; 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/DirContextHolder.java similarity index 96% rename from spring-ldap/src/main/java/org/springframework/ldap/transaction/core/DirContextHolder.java rename to spring-ldap/src/main/java/org/springframework/ldap/transaction/DirContextHolder.java index 4b9aeb33..36e57bef 100644 --- a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/DirContextHolder.java +++ b/spring-ldap/src/main/java/org/springframework/ldap/transaction/DirContextHolder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ldap.transaction.core; +package org.springframework.ldap.transaction; import javax.naming.directory.DirContext; diff --git a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/DirContextProxy.java b/spring-ldap/src/main/java/org/springframework/ldap/transaction/DirContextProxy.java similarity index 86% rename from spring-ldap/src/main/java/org/springframework/ldap/transaction/core/DirContextProxy.java rename to spring-ldap/src/main/java/org/springframework/ldap/transaction/DirContextProxy.java index 75e69a8b..6fad6863 100644 --- a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/DirContextProxy.java +++ b/spring-ldap/src/main/java/org/springframework/ldap/transaction/DirContextProxy.java @@ -13,10 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ldap.transaction.core; +package org.springframework.ldap.transaction; import javax.naming.directory.DirContext; +import org.springframework.ldap.transaction.core.TransactionAwareContextSourceProxy; + /** * Helper interface to be able to get hold of the target DirContext from proxies * created by {@link TransactionAwareContextSourceProxy}. 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/LdapCompensatingTransactionOperationFactory.java similarity index 96% rename from spring-ldap/src/main/java/org/springframework/ldap/transaction/core/LdapCompensatingTransactionOperationFactory.java rename to spring-ldap/src/main/java/org/springframework/ldap/transaction/LdapCompensatingTransactionOperationFactory.java index 441fb5d9..a41f7f88 100644 --- a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/LdapCompensatingTransactionOperationFactory.java +++ b/spring-ldap/src/main/java/org/springframework/ldap/transaction/LdapCompensatingTransactionOperationFactory.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ldap.transaction.core; +package org.springframework.ldap.transaction; import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationTargetException; 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/ModifyAttributesOperationExecutor.java similarity index 95% rename from spring-ldap/src/main/java/org/springframework/ldap/transaction/core/ModifyAttributesOperationExecutor.java rename to spring-ldap/src/main/java/org/springframework/ldap/transaction/ModifyAttributesOperationExecutor.java index 90cbdf7c..7c0d9d4a 100644 --- a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/ModifyAttributesOperationExecutor.java +++ b/spring-ldap/src/main/java/org/springframework/ldap/transaction/ModifyAttributesOperationExecutor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ldap.transaction.core; +package org.springframework.ldap.transaction; import javax.naming.Name; import javax.naming.directory.ModificationItem; 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/ModifyAttributesOperationRecorder.java similarity index 96% rename from spring-ldap/src/main/java/org/springframework/ldap/transaction/core/ModifyAttributesOperationRecorder.java rename to spring-ldap/src/main/java/org/springframework/ldap/transaction/ModifyAttributesOperationRecorder.java index fea8f94d..d1cc0ffb 100644 --- a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/ModifyAttributesOperationRecorder.java +++ b/spring-ldap/src/main/java/org/springframework/ldap/transaction/ModifyAttributesOperationRecorder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ldap.transaction.core; +package org.springframework.ldap.transaction; import java.util.HashSet; import java.util.Set; 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/NullOperationExecutor.java similarity index 93% rename from spring-ldap/src/main/java/org/springframework/ldap/transaction/core/NullOperationExecutor.java rename to spring-ldap/src/main/java/org/springframework/ldap/transaction/NullOperationExecutor.java index c2307598..8f6b8dfd 100644 --- a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/NullOperationExecutor.java +++ b/spring-ldap/src/main/java/org/springframework/ldap/transaction/NullOperationExecutor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ldap.transaction.core; +package org.springframework.ldap.transaction; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; 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/NullOperationRecorder.java similarity index 94% rename from spring-ldap/src/main/java/org/springframework/ldap/transaction/core/NullOperationRecorder.java rename to spring-ldap/src/main/java/org/springframework/ldap/transaction/NullOperationRecorder.java index 70b6e051..d2271b6c 100644 --- a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/NullOperationRecorder.java +++ b/spring-ldap/src/main/java/org/springframework/ldap/transaction/NullOperationRecorder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ldap.transaction.core; +package org.springframework.ldap.transaction; import org.springframework.transaction.compensating.CompensatingTransactionOperationExecutor; import org.springframework.transaction.compensating.CompensatingTransactionOperationManager; 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/RebindOperationExecutor.java similarity index 96% rename from spring-ldap/src/main/java/org/springframework/ldap/transaction/core/RebindOperationExecutor.java rename to spring-ldap/src/main/java/org/springframework/ldap/transaction/RebindOperationExecutor.java index f825e60b..a8a8dab7 100644 --- a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/RebindOperationExecutor.java +++ b/spring-ldap/src/main/java/org/springframework/ldap/transaction/RebindOperationExecutor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ldap.transaction.core; +package org.springframework.ldap.transaction; import javax.naming.Name; import javax.naming.directory.Attributes; 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/RebindOperationRecorder.java similarity index 95% rename from spring-ldap/src/main/java/org/springframework/ldap/transaction/core/RebindOperationRecorder.java rename to spring-ldap/src/main/java/org/springframework/ldap/transaction/RebindOperationRecorder.java index 8211d907..3ec81949 100644 --- a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/RebindOperationRecorder.java +++ b/spring-ldap/src/main/java/org/springframework/ldap/transaction/RebindOperationRecorder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ldap.transaction.core; +package org.springframework.ldap.transaction; import javax.naming.Name; import javax.naming.directory.Attributes; 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/RenameOperationExecutor.java similarity index 95% rename from spring-ldap/src/main/java/org/springframework/ldap/transaction/core/RenameOperationExecutor.java rename to spring-ldap/src/main/java/org/springframework/ldap/transaction/RenameOperationExecutor.java index 54971a2b..848db7d9 100644 --- a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/RenameOperationExecutor.java +++ b/spring-ldap/src/main/java/org/springframework/ldap/transaction/RenameOperationExecutor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ldap.transaction.core; +package org.springframework.ldap.transaction; import javax.naming.Name; 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/RenameOperationRecorder.java similarity index 95% rename from spring-ldap/src/main/java/org/springframework/ldap/transaction/core/RenameOperationRecorder.java rename to spring-ldap/src/main/java/org/springframework/ldap/transaction/RenameOperationRecorder.java index a987af65..8054489a 100644 --- a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/RenameOperationRecorder.java +++ b/spring-ldap/src/main/java/org/springframework/ldap/transaction/RenameOperationRecorder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ldap.transaction.core; +package org.springframework.ldap.transaction; import javax.naming.Name; diff --git a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/TempEntryRenamingStrategy.java b/spring-ldap/src/main/java/org/springframework/ldap/transaction/TempEntryRenamingStrategy.java similarity index 93% rename from spring-ldap/src/main/java/org/springframework/ldap/transaction/core/TempEntryRenamingStrategy.java rename to spring-ldap/src/main/java/org/springframework/ldap/transaction/TempEntryRenamingStrategy.java index 869378f8..54e2c964 100644 --- a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/TempEntryRenamingStrategy.java +++ b/spring-ldap/src/main/java/org/springframework/ldap/transaction/TempEntryRenamingStrategy.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ldap.transaction.core; +package org.springframework.ldap.transaction; import javax.naming.Name; 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/TransactionUtils.java similarity index 96% rename from spring-ldap/src/main/java/org/springframework/ldap/transaction/core/TransactionUtils.java rename to spring-ldap/src/main/java/org/springframework/ldap/transaction/TransactionUtils.java index 1c6f71a9..cfc33812 100644 --- a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/TransactionUtils.java +++ b/spring-ldap/src/main/java/org/springframework/ldap/transaction/TransactionUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ldap.transaction.core; +package org.springframework.ldap.transaction; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; 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/UnbindOperationExecutor.java similarity index 95% rename from spring-ldap/src/main/java/org/springframework/ldap/transaction/core/UnbindOperationExecutor.java rename to spring-ldap/src/main/java/org/springframework/ldap/transaction/UnbindOperationExecutor.java index 113aeabd..7dbda9cd 100644 --- a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/UnbindOperationExecutor.java +++ b/spring-ldap/src/main/java/org/springframework/ldap/transaction/UnbindOperationExecutor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ldap.transaction.core; +package org.springframework.ldap.transaction; import javax.naming.Name; 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/UnbindOperationRecorder.java similarity index 95% rename from spring-ldap/src/main/java/org/springframework/ldap/transaction/core/UnbindOperationRecorder.java rename to spring-ldap/src/main/java/org/springframework/ldap/transaction/UnbindOperationRecorder.java index 0ecec374..f668404d 100644 --- a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/UnbindOperationRecorder.java +++ b/spring-ldap/src/main/java/org/springframework/ldap/transaction/UnbindOperationRecorder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.ldap.transaction.core; +package org.springframework.ldap.transaction; import javax.naming.Name; diff --git a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/ContextSourceAndDataSourceTransactionManager.java b/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/ContextSourceAndDataSourceTransactionManager.java index 5f1720b4..cd00f312 100644 --- a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/ContextSourceAndDataSourceTransactionManager.java +++ b/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/ContextSourceAndDataSourceTransactionManager.java @@ -17,6 +17,7 @@ package org.springframework.ldap.transaction.core; import org.springframework.jdbc.datasource.DataSourceTransactionManager; import org.springframework.ldap.core.ContextSource; +import org.springframework.ldap.transaction.TempEntryRenamingStrategy; import org.springframework.transaction.TransactionDefinition; import org.springframework.transaction.TransactionException; import org.springframework.transaction.TransactionSuspensionNotSupportedException; 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 395fded8..68178973 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,6 +16,8 @@ package org.springframework.ldap.transaction.core; import org.springframework.ldap.core.ContextSource; +import org.springframework.ldap.transaction.TempEntryRenamingStrategy; +import org.springframework.ldap.transaction.UnbindOperationExecutor; import org.springframework.transaction.TransactionDefinition; import org.springframework.transaction.TransactionException; import org.springframework.transaction.compensating.CompensatingTransactionOperationExecutor; diff --git a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/ContextSourceTransactionManagerDelegate.java b/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/ContextSourceTransactionManagerDelegate.java index e5be0b5a..fef2639f 100644 --- a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/ContextSourceTransactionManagerDelegate.java +++ b/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/ContextSourceTransactionManagerDelegate.java @@ -21,6 +21,8 @@ import javax.naming.directory.DirContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.ldap.core.ContextSource; +import org.springframework.ldap.transaction.DirContextHolder; +import org.springframework.ldap.transaction.TempEntryRenamingStrategy; import org.springframework.transaction.TransactionDefinition; import org.springframework.transaction.TransactionException; import org.springframework.transaction.support.DefaultTransactionStatus; diff --git a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/ContextSourceTransactionObject.java b/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/ContextSourceTransactionObject.java index 3dac7d5b..5e19cc1c 100644 --- a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/ContextSourceTransactionObject.java +++ b/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/ContextSourceTransactionObject.java @@ -15,6 +15,8 @@ */ package org.springframework.ldap.transaction.core; +import org.springframework.ldap.transaction.DirContextHolder; + /** * Transaction object for ContextSourceTransactionManager. Keeps a reference to * the {@link DirContextHolder} associated with the current transaction. diff --git a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/DefaultTempEntryRenamingStrategy.java b/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/DefaultTempEntryRenamingStrategy.java index 5c31e0f8..3de9a647 100644 --- a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/DefaultTempEntryRenamingStrategy.java +++ b/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/DefaultTempEntryRenamingStrategy.java @@ -22,6 +22,7 @@ import javax.naming.Name; import org.springframework.ldap.core.DistinguishedName; import org.springframework.ldap.core.LdapRdn; import org.springframework.ldap.core.LdapRdnComponent; +import org.springframework.ldap.transaction.TempEntryRenamingStrategy; /** * Default implementation of {@link TempEntryRenamingStrategy}. This diff --git a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/DifferentSubtreeTempEntryRenamingStrategy.java b/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/DifferentSubtreeTempEntryRenamingStrategy.java index 2191b50a..3c3045f8 100644 --- a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/DifferentSubtreeTempEntryRenamingStrategy.java +++ b/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/DifferentSubtreeTempEntryRenamingStrategy.java @@ -22,6 +22,7 @@ import javax.naming.Name; import org.springframework.ldap.core.DistinguishedName; import org.springframework.ldap.core.LdapRdn; import org.springframework.ldap.core.LdapRdnComponent; +import org.springframework.ldap.transaction.TempEntryRenamingStrategy; /** * A {@link TempEntryRenamingStrategy} that moves the entry to a different diff --git a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/TransactionAwareContextSourceProxy.java b/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/TransactionAwareContextSourceProxy.java index a9ed00a3..eb6b9d51 100644 --- a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/TransactionAwareContextSourceProxy.java +++ b/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/TransactionAwareContextSourceProxy.java @@ -21,6 +21,9 @@ import javax.naming.directory.DirContext; import org.springframework.ldap.NamingException; import org.springframework.ldap.core.ContextSource; +import org.springframework.ldap.transaction.DirContextHolder; +import org.springframework.ldap.transaction.DirContextProxy; +import org.springframework.ldap.transaction.TransactionUtils; import org.springframework.transaction.support.TransactionSynchronizationManager; /** diff --git a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/TransactionAwareDirContextInvocationHandler.java b/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/TransactionAwareDirContextInvocationHandler.java index ae2bd7c1..cd22136a 100644 --- a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/TransactionAwareDirContextInvocationHandler.java +++ b/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/TransactionAwareDirContextInvocationHandler.java @@ -22,6 +22,8 @@ import java.lang.reflect.Method; import javax.naming.directory.DirContext; import org.springframework.ldap.core.ContextSource; +import org.springframework.ldap.transaction.DirContextHolder; +import org.springframework.ldap.transaction.TransactionUtils; /** * Proxy implementation for DirContext, making sure that the instance is not 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 273fa18c..ee074722 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,8 +9,8 @@ import junit.framework.TestCase; import org.easymock.MockControl; import org.springframework.ldap.core.ContextSource; -import org.springframework.ldap.transaction.core.DirContextHolder; -import org.springframework.ldap.transaction.core.TransactionUtils; +import org.springframework.ldap.transaction.DirContextHolder; +import org.springframework.ldap.transaction.TransactionUtils; import org.springframework.transaction.compensating.CompensatingTransactionOperationManager; import org.springframework.transaction.support.TransactionSynchronizationManager; diff --git a/spring-ldap/src/test/java/org/springframework/ldap/transaction/core/BindOperationExecutorTest.java b/spring-ldap/src/test/java/org/springframework/ldap/transaction/BindOperationExecutorTest.java similarity index 92% rename from spring-ldap/src/test/java/org/springframework/ldap/transaction/core/BindOperationExecutorTest.java rename to spring-ldap/src/test/java/org/springframework/ldap/transaction/BindOperationExecutorTest.java index 466ee492..a80835f1 100644 --- a/spring-ldap/src/test/java/org/springframework/ldap/transaction/core/BindOperationExecutorTest.java +++ b/spring-ldap/src/test/java/org/springframework/ldap/transaction/BindOperationExecutorTest.java @@ -1,4 +1,4 @@ -package org.springframework.ldap.transaction.core; +package org.springframework.ldap.transaction; import javax.naming.directory.BasicAttributes; @@ -7,7 +7,7 @@ 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.core.BindOperationExecutor; +import org.springframework.ldap.transaction.BindOperationExecutor; public class BindOperationExecutorTest extends TestCase { private MockControl ldapOperationsControl; 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/BindOperationRecorderTest.java similarity index 91% rename from spring-ldap/src/test/java/org/springframework/ldap/transaction/core/BindOperationRecorderTest.java rename to spring-ldap/src/test/java/org/springframework/ldap/transaction/BindOperationRecorderTest.java index 1933954b..021e9d52 100644 --- a/spring-ldap/src/test/java/org/springframework/ldap/transaction/core/BindOperationRecorderTest.java +++ b/spring-ldap/src/test/java/org/springframework/ldap/transaction/BindOperationRecorderTest.java @@ -1,4 +1,4 @@ -package org.springframework.ldap.transaction.core; +package org.springframework.ldap.transaction; import javax.naming.directory.BasicAttributes; @@ -7,8 +7,8 @@ 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.core.BindOperationExecutor; -import org.springframework.ldap.transaction.core.BindOperationRecorder; +import org.springframework.ldap.transaction.BindOperationExecutor; +import org.springframework.ldap.transaction.BindOperationRecorder; import org.springframework.transaction.compensating.CompensatingTransactionOperationExecutor; public class BindOperationRecorderTest extends TestCase { 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/LdapCompensatingTransactionOperationFactoryTest.java similarity index 87% rename from spring-ldap/src/test/java/org/springframework/ldap/transaction/core/LdapCompensatingTransactionOperationFactoryTest.java rename to spring-ldap/src/test/java/org/springframework/ldap/transaction/LdapCompensatingTransactionOperationFactoryTest.java index 0129780e..d8b02174 100644 --- a/spring-ldap/src/test/java/org/springframework/ldap/transaction/core/LdapCompensatingTransactionOperationFactoryTest.java +++ b/spring-ldap/src/test/java/org/springframework/ldap/transaction/LdapCompensatingTransactionOperationFactoryTest.java @@ -1,16 +1,16 @@ -package org.springframework.ldap.transaction.core; +package org.springframework.ldap.transaction; import junit.framework.TestCase; import org.easymock.MockControl; import org.springframework.ldap.core.LdapOperations; -import org.springframework.ldap.transaction.core.BindOperationRecorder; -import org.springframework.ldap.transaction.core.LdapCompensatingTransactionOperationFactory; -import org.springframework.ldap.transaction.core.ModifyAttributesOperationRecorder; -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.ldap.transaction.BindOperationRecorder; +import org.springframework.ldap.transaction.LdapCompensatingTransactionOperationFactory; +import org.springframework.ldap.transaction.ModifyAttributesOperationRecorder; +import org.springframework.ldap.transaction.RebindOperationRecorder; +import org.springframework.ldap.transaction.RenameOperationRecorder; +import org.springframework.ldap.transaction.TempEntryRenamingStrategy; +import org.springframework.ldap.transaction.UnbindOperationRecorder; import org.springframework.transaction.compensating.CompensatingTransactionOperationRecorder; public class LdapCompensatingTransactionOperationFactoryTest extends TestCase { diff --git a/spring-ldap/src/test/java/org/springframework/ldap/transaction/core/ModifyAttributesOperationExecutorTest.java b/spring-ldap/src/test/java/org/springframework/ldap/transaction/ModifyAttributesOperationExecutorTest.java similarity index 92% rename from spring-ldap/src/test/java/org/springframework/ldap/transaction/core/ModifyAttributesOperationExecutorTest.java rename to spring-ldap/src/test/java/org/springframework/ldap/transaction/ModifyAttributesOperationExecutorTest.java index f57c52a9..9efb1f71 100644 --- a/spring-ldap/src/test/java/org/springframework/ldap/transaction/core/ModifyAttributesOperationExecutorTest.java +++ b/spring-ldap/src/test/java/org/springframework/ldap/transaction/ModifyAttributesOperationExecutorTest.java @@ -1,4 +1,4 @@ -package org.springframework.ldap.transaction.core; +package org.springframework.ldap.transaction; import javax.naming.Name; import javax.naming.directory.ModificationItem; @@ -6,7 +6,7 @@ import javax.naming.directory.ModificationItem; import org.easymock.MockControl; import org.springframework.ldap.core.DistinguishedName; import org.springframework.ldap.core.LdapOperations; -import org.springframework.ldap.transaction.core.ModifyAttributesOperationExecutor; +import org.springframework.ldap.transaction.ModifyAttributesOperationExecutor; import junit.framework.TestCase; 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/ModifyAttributesOperationRecorderTest.java similarity index 95% rename from spring-ldap/src/test/java/org/springframework/ldap/transaction/core/ModifyAttributesOperationRecorderTest.java rename to spring-ldap/src/test/java/org/springframework/ldap/transaction/ModifyAttributesOperationRecorderTest.java index 5553cd7e..cf4a224d 100644 --- a/spring-ldap/src/test/java/org/springframework/ldap/transaction/core/ModifyAttributesOperationRecorderTest.java +++ b/spring-ldap/src/test/java/org/springframework/ldap/transaction/ModifyAttributesOperationRecorderTest.java @@ -1,4 +1,4 @@ -package org.springframework.ldap.transaction.core; +package org.springframework.ldap.transaction; import javax.naming.NamingException; import javax.naming.directory.Attribute; @@ -14,8 +14,8 @@ 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.core.ModifyAttributesOperationExecutor; -import org.springframework.ldap.transaction.core.ModifyAttributesOperationRecorder; +import org.springframework.ldap.transaction.ModifyAttributesOperationExecutor; +import org.springframework.ldap.transaction.ModifyAttributesOperationRecorder; import org.springframework.transaction.compensating.CompensatingTransactionOperationExecutor; public class ModifyAttributesOperationRecorderTest extends TestCase { diff --git a/spring-ldap/src/test/java/org/springframework/ldap/transaction/core/RebindOperationExecutorTest.java b/spring-ldap/src/test/java/org/springframework/ldap/transaction/RebindOperationExecutorTest.java similarity index 93% rename from spring-ldap/src/test/java/org/springframework/ldap/transaction/core/RebindOperationExecutorTest.java rename to spring-ldap/src/test/java/org/springframework/ldap/transaction/RebindOperationExecutorTest.java index 759aa280..64ad2ecb 100644 --- a/spring-ldap/src/test/java/org/springframework/ldap/transaction/core/RebindOperationExecutorTest.java +++ b/spring-ldap/src/test/java/org/springframework/ldap/transaction/RebindOperationExecutorTest.java @@ -1,4 +1,4 @@ -package org.springframework.ldap.transaction.core; +package org.springframework.ldap.transaction; import javax.naming.directory.BasicAttributes; @@ -7,7 +7,7 @@ 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.core.RebindOperationExecutor; +import org.springframework.ldap.transaction.RebindOperationExecutor; public class RebindOperationExecutorTest extends TestCase { 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/RebindOperationRecorderTest.java similarity index 88% rename from spring-ldap/src/test/java/org/springframework/ldap/transaction/core/RebindOperationRecorderTest.java rename to spring-ldap/src/test/java/org/springframework/ldap/transaction/RebindOperationRecorderTest.java index 92e729d8..9b7624a2 100644 --- a/spring-ldap/src/test/java/org/springframework/ldap/transaction/core/RebindOperationRecorderTest.java +++ b/spring-ldap/src/test/java/org/springframework/ldap/transaction/RebindOperationRecorderTest.java @@ -1,4 +1,4 @@ -package org.springframework.ldap.transaction.core; +package org.springframework.ldap.transaction; import javax.naming.directory.BasicAttributes; @@ -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.core.RebindOperationExecutor; -import org.springframework.ldap.transaction.core.RebindOperationRecorder; -import org.springframework.ldap.transaction.core.TempEntryRenamingStrategy; +import org.springframework.ldap.transaction.RebindOperationExecutor; +import org.springframework.ldap.transaction.RebindOperationRecorder; +import org.springframework.ldap.transaction.TempEntryRenamingStrategy; import org.springframework.transaction.compensating.CompensatingTransactionOperationExecutor; public class RebindOperationRecorderTest extends TestCase { diff --git a/spring-ldap/src/test/java/org/springframework/ldap/transaction/core/RenameOperationExecutorTest.java b/spring-ldap/src/test/java/org/springframework/ldap/transaction/RenameOperationExecutorTest.java similarity index 92% rename from spring-ldap/src/test/java/org/springframework/ldap/transaction/core/RenameOperationExecutorTest.java rename to spring-ldap/src/test/java/org/springframework/ldap/transaction/RenameOperationExecutorTest.java index e1296fe4..91b44d4d 100644 --- a/spring-ldap/src/test/java/org/springframework/ldap/transaction/core/RenameOperationExecutorTest.java +++ b/spring-ldap/src/test/java/org/springframework/ldap/transaction/RenameOperationExecutorTest.java @@ -1,9 +1,9 @@ -package org.springframework.ldap.transaction.core; +package org.springframework.ldap.transaction; import org.easymock.MockControl; import org.springframework.ldap.core.DistinguishedName; import org.springframework.ldap.core.LdapOperations; -import org.springframework.ldap.transaction.core.RenameOperationExecutor; +import org.springframework.ldap.transaction.RenameOperationExecutor; import junit.framework.TestCase; 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/RenameOperationRecorderTest.java similarity index 86% rename from spring-ldap/src/test/java/org/springframework/ldap/transaction/core/RenameOperationRecorderTest.java rename to spring-ldap/src/test/java/org/springframework/ldap/transaction/RenameOperationRecorderTest.java index 504d501c..8bfd578a 100644 --- a/spring-ldap/src/test/java/org/springframework/ldap/transaction/core/RenameOperationRecorderTest.java +++ b/spring-ldap/src/test/java/org/springframework/ldap/transaction/RenameOperationRecorderTest.java @@ -1,11 +1,11 @@ -package org.springframework.ldap.transaction.core; +package org.springframework.ldap.transaction; import junit.framework.TestCase; import org.easymock.MockControl; import org.springframework.ldap.core.LdapOperations; -import org.springframework.ldap.transaction.core.RenameOperationExecutor; -import org.springframework.ldap.transaction.core.RenameOperationRecorder; +import org.springframework.ldap.transaction.RenameOperationExecutor; +import org.springframework.ldap.transaction.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/UnbindOperationExecutorTest.java b/spring-ldap/src/test/java/org/springframework/ldap/transaction/UnbindOperationExecutorTest.java similarity index 92% rename from spring-ldap/src/test/java/org/springframework/ldap/transaction/core/UnbindOperationExecutorTest.java rename to spring-ldap/src/test/java/org/springframework/ldap/transaction/UnbindOperationExecutorTest.java index 4db0726a..75f3c960 100644 --- a/spring-ldap/src/test/java/org/springframework/ldap/transaction/core/UnbindOperationExecutorTest.java +++ b/spring-ldap/src/test/java/org/springframework/ldap/transaction/UnbindOperationExecutorTest.java @@ -1,11 +1,11 @@ -package org.springframework.ldap.transaction.core; +package org.springframework.ldap.transaction; 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.core.UnbindOperationExecutor; +import org.springframework.ldap.transaction.UnbindOperationExecutor; public class UnbindOperationExecutorTest extends TestCase { private MockControl ldapOperationsControl; 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/UnbindOperationRecorderTest.java similarity index 87% rename from spring-ldap/src/test/java/org/springframework/ldap/transaction/core/UnbindOperationRecorderTest.java rename to spring-ldap/src/test/java/org/springframework/ldap/transaction/UnbindOperationRecorderTest.java index 26c38fbe..aa2333dd 100644 --- a/spring-ldap/src/test/java/org/springframework/ldap/transaction/core/UnbindOperationRecorderTest.java +++ b/spring-ldap/src/test/java/org/springframework/ldap/transaction/UnbindOperationRecorderTest.java @@ -1,13 +1,13 @@ -package org.springframework.ldap.transaction.core; +package org.springframework.ldap.transaction; 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.core.TempEntryRenamingStrategy; -import org.springframework.ldap.transaction.core.UnbindOperationExecutor; -import org.springframework.ldap.transaction.core.UnbindOperationRecorder; +import org.springframework.ldap.transaction.TempEntryRenamingStrategy; +import org.springframework.ldap.transaction.UnbindOperationExecutor; +import org.springframework.ldap.transaction.UnbindOperationRecorder; import org.springframework.transaction.compensating.CompensatingTransactionOperationExecutor; public class UnbindOperationRecorderTest extends TestCase { 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 e9073934..79c525d5 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,10 +6,10 @@ import junit.framework.TestCase; import org.easymock.MockControl; import org.springframework.ldap.core.ContextSource; +import org.springframework.ldap.transaction.DirContextHolder; +import org.springframework.ldap.transaction.TempEntryRenamingStrategy; 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; diff --git a/spring-ldap/src/test/java/org/springframework/ldap/transaction/core/TransactionAwareContextSourceProxyTest.java b/spring-ldap/src/test/java/org/springframework/ldap/transaction/core/TransactionAwareContextSourceProxyTest.java index d7fa93d1..4c4e79aa 100644 --- a/spring-ldap/src/test/java/org/springframework/ldap/transaction/core/TransactionAwareContextSourceProxyTest.java +++ b/spring-ldap/src/test/java/org/springframework/ldap/transaction/core/TransactionAwareContextSourceProxyTest.java @@ -22,6 +22,7 @@ import junit.framework.TestCase; import org.easymock.MockControl; import org.springframework.ldap.core.ContextSource; +import org.springframework.ldap.transaction.DirContextProxy; /** * Tests for {@link TransactionAwareContextSourceProxy}.