Moved generic compensating transaction support classes to separate package.
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
/**
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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;
|
||||
|
||||
/**
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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;
|
||||
|
||||
/**
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -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;
|
||||
@@ -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 {
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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 {
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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 {
|
||||
Reference in New Issue
Block a user