From 921d995c9529b666904b22897c84df1fe1bb28f8 Mon Sep 17 00:00:00 2001 From: Ulrik Sandberg Date: Tue, 10 Apr 2007 15:25:40 +0000 Subject: [PATCH] Renamed ldap.transaction.core to ldap.transaction.support. --- spring-ldap/docs/reference/src/overview.xml | 69 +++++++++++++++---- .../docs/reference/src/transactions.xml | 4 +- .../ldapAndJdbcTransactionTestContext.xml | 8 +-- .../ldapTemplateTransactionTestContext.xml | 6 +- ...urceTransactionManagerIntegrationTest.java | 3 +- ...urceTransactionManagerIntegrationTest.java | 3 +- .../{core => support}/DummyDao.java | 2 +- .../{core => support}/DummyException.java | 2 +- .../{core => support}/DummyServiceImpl.java | 2 +- .../LdapAndJdbcDummyDaoImpl.java | 22 +++--- .../{core => support}/LdapDummyDaoImpl.java | 22 +++--- .../ldap/transaction/DirContextProxy.java | 2 +- ...SourceAndDataSourceTransactionManager.java | 2 +- .../ContextSourceTransactionManager.java | 2 +- ...ntextSourceTransactionManagerDelegate.java | 2 +- .../ContextSourceTransactionObject.java | 2 +- .../DefaultTempEntryRenamingStrategy.java | 2 +- ...erentSubtreeTempEntryRenamingStrategy.java | 2 +- .../TransactionAwareContextSourceProxy.java | 2 +- ...ctionAwareDirContextInvocationHandler.java | 2 +- .../ContextSourceTransactionManagerTest.java | 8 +-- .../DefaultTempEntryRenamingStrategyTest.java | 4 +- ...tSubtreeTempEntryRenamingStrategyTest.java | 4 +- ...ransactionAwareContextSourceProxyTest.java | 3 +- 24 files changed, 112 insertions(+), 68 deletions(-) rename spring-ldap/src/itest/java/org/springframework/ldap/transaction/{core => support}/ContextSourceAndDataSourceTransactionManagerIntegrationTest.java (96%) rename spring-ldap/src/itest/java/org/springframework/ldap/transaction/{core => support}/ContextSourceTransactionManagerIntegrationTest.java (95%) rename spring-ldap/src/itest/java/org/springframework/ldap/transaction/{core => support}/DummyDao.java (94%) rename spring-ldap/src/itest/java/org/springframework/ldap/transaction/{core => support}/DummyException.java (90%) rename spring-ldap/src/itest/java/org/springframework/ldap/transaction/{core => support}/DummyServiceImpl.java (91%) rename spring-ldap/src/itest/java/org/springframework/ldap/transaction/{core => support}/LdapAndJdbcDummyDaoImpl.java (81%) rename spring-ldap/src/itest/java/org/springframework/ldap/transaction/{core => support}/LdapDummyDaoImpl.java (79%) rename spring-ldap/src/main/java/org/springframework/ldap/transaction/{core => support}/ContextSourceAndDataSourceTransactionManager.java (97%) rename spring-ldap/src/main/java/org/springframework/ldap/transaction/{core => support}/ContextSourceTransactionManager.java (97%) rename spring-ldap/src/main/java/org/springframework/ldap/transaction/{core => support}/ContextSourceTransactionManagerDelegate.java (96%) rename spring-ldap/src/main/java/org/springframework/ldap/transaction/{core => support}/ContextSourceTransactionObject.java (94%) rename spring-ldap/src/main/java/org/springframework/ldap/transaction/{core => support}/DefaultTempEntryRenamingStrategy.java (95%) rename spring-ldap/src/main/java/org/springframework/ldap/transaction/{core => support}/DifferentSubtreeTempEntryRenamingStrategy.java (95%) rename spring-ldap/src/main/java/org/springframework/ldap/transaction/{core => support}/TransactionAwareContextSourceProxy.java (95%) rename spring-ldap/src/main/java/org/springframework/ldap/transaction/{core => support}/TransactionAwareDirContextInvocationHandler.java (95%) rename spring-ldap/src/test/java/org/springframework/ldap/transaction/{core => support}/ContextSourceTransactionManagerTest.java (93%) rename spring-ldap/src/test/java/org/springframework/ldap/transaction/{core => support}/DefaultTempEntryRenamingStrategyTest.java (86%) rename spring-ldap/src/test/java/org/springframework/ldap/transaction/{core => support}/DifferentSubtreeTempEntryRenamingStrategyTest.java (82%) rename spring-ldap/src/test/java/org/springframework/ldap/transaction/{core => support}/TransactionAwareContextSourceProxyTest.java (93%) diff --git a/spring-ldap/docs/reference/src/overview.xml b/spring-ldap/docs/reference/src/overview.xml index 885ee7e0..376e77f5 100644 --- a/spring-ldap/docs/reference/src/overview.xml +++ b/spring-ldap/docs/reference/src/overview.xml @@ -129,9 +129,9 @@ public class PersonDaoImpl implements PersonDao { is nothing Spring-specific about this "Inversion of Control". Anyone that can create an instance of PersonDaoImpl can also set the LdapTemplate on it. However, Spring provides a very - flexible and easy way of achieving this (see http://static.springframework.org/spring/docs/current/reference/beans.html). - The Spring container can be told to wire up an instance of + flexible and easy way of achieving + this. The Spring container can be told to wire up an instance of LdapTemplate with its required dependencies and inject it into the PersonDao instance. This wiring can be defined in various ways, but the most common is through XML: @@ -241,6 +241,20 @@ public class PersonDaoImpl implements PersonDao { + + org.springframework.transaction.compensating + + The transaction.compensating package contains + the generic compensating transaction support. This is not LDAP-specific + or JNDI-specific in any way. + + + + Dependencies: spring-dao, commons-logging + + + + org.springframework.ldap @@ -250,7 +264,7 @@ public class PersonDaoImpl implements PersonDao { - Dependencies: spring-core, spring-dao + Dependencies: spring-core @@ -266,7 +280,7 @@ public class PersonDaoImpl implements PersonDao { - Dependencies: ldap, ldap.support, spring-beans, spring-dao, + Dependencies: ldap, ldap.support, spring-beans, commons-collections, commons-lang, commons-logging @@ -276,8 +290,7 @@ public class PersonDaoImpl implements PersonDao { org.springframework.ldap.core.support The ldap.core.support package contains - supporting implementations of the central interfaces as well as the - DirContextAdapter abstraction. + supporting implementations of some of the core interfaces. @@ -291,13 +304,11 @@ public class PersonDaoImpl implements PersonDao { org.springframework.ldap.support The ldap.support package contains supporting - implementations of the central interfaces as well as the - DirContextAdapter abstraction. + utilities, like the exception translation mechanism. - Dependencies: ldap, spring-core, spring-dao, - commons-logging + Dependencies: ldap, spring-core, commons-logging @@ -330,8 +341,8 @@ public class PersonDaoImpl implements PersonDao { - Dependencies: ldap.core, ldap.support, LDAP booster pack, - spring-core, commons-lang, commons-logging + Dependencies: ldap, ldap.core, LDAP booster pack, spring-core, + commons-lang, commons-logging @@ -349,6 +360,35 @@ public class PersonDaoImpl implements PersonDao { + + org.springframework.ldap.transaction + + The ldap.transaction package contains the + core LDAP-specific implementation of compensating transactions. + + + + Dependencies: ldap, ldap.core, transaction.compensating, + spring-core, spring-dao, commons-lang, commons-logging + + + + + + org.springframework.ldap.transaction.support + + The ldap.transaction.support package contains + supporting transaction classes, like + ContextSourceTransactionManager. + + + + Dependencies: ldap.core, ldap.transaction, + transaction.compensating, spring-dao, commons-logging + + + + For the exact list of jar dependencies, see the Spring LDAP Ivy dependency manager descriptor located within the Spring LDAP distribution at @@ -358,7 +398,8 @@ public class PersonDaoImpl implements PersonDao { Support - Spring LDAP 1.2 is supported on Spring 1.2.8 or later. + Spring LDAP 1.2 is supported on Spring 1.2.8 or later, including + 2.0.x. The community support forum is located at http://forum.springframework.org, diff --git a/spring-ldap/docs/reference/src/transactions.xml b/spring-ldap/docs/reference/src/transactions.xml index 9249817a..da3f57f3 100644 --- a/spring-ldap/docs/reference/src/transactions.xml +++ b/spring-ldap/docs/reference/src/transactions.xml @@ -55,7 +55,7 @@ </bean> <bean id="contextSource" - class="org.springframework.ldap.transaction.core.TransactionAwareContextSourceProxy"> + class="org.springframework.ldap.transaction.support.TransactionAwareContextSourceProxy"> <constructor-arg ref="contextSourceTarget" /> </bean> @@ -64,7 +64,7 @@ </bean> <bean id="transactionManager" - class="org.springframework.ldap.transaction.core.ContextSourceTransactionManager"> + class="org.springframework.ldap.transaction.support.ContextSourceTransactionManager"> <constructor-arg ref="contextSource" /> </bean> diff --git a/spring-ldap/src/itest/java/conf/ldapAndJdbcTransactionTestContext.xml b/spring-ldap/src/itest/java/conf/ldapAndJdbcTransactionTestContext.xml index cd74f83f..8ab52b25 100644 --- a/spring-ldap/src/itest/java/conf/ldapAndJdbcTransactionTestContext.xml +++ b/spring-ldap/src/itest/java/conf/ldapAndJdbcTransactionTestContext.xml @@ -31,7 +31,7 @@ + class="org.springframework.ldap.transaction.support.TransactionAwareContextSourceProxy"> @@ -47,21 +47,21 @@ + class="org.springframework.ldap.transaction.support.ContextSourceAndDataSourceTransactionManager"> + class="org.springframework.ldap.transaction.support.LdapAndJdbcDummyDaoImpl"> diff --git a/spring-ldap/src/itest/java/conf/ldapTemplateTransactionTestContext.xml b/spring-ldap/src/itest/java/conf/ldapTemplateTransactionTestContext.xml index ee31f80c..099c1da5 100644 --- a/spring-ldap/src/itest/java/conf/ldapTemplateTransactionTestContext.xml +++ b/spring-ldap/src/itest/java/conf/ldapTemplateTransactionTestContext.xml @@ -23,7 +23,7 @@ + class="org.springframework.ldap.transaction.support.TransactionAwareContextSourceProxy"> @@ -33,13 +33,13 @@ + class="org.springframework.ldap.transaction.support.ContextSourceTransactionManager"> + class="org.springframework.ldap.transaction.support.LdapDummyDaoImpl"> diff --git a/spring-ldap/src/itest/java/org/springframework/ldap/transaction/core/ContextSourceAndDataSourceTransactionManagerIntegrationTest.java b/spring-ldap/src/itest/java/org/springframework/ldap/transaction/support/ContextSourceAndDataSourceTransactionManagerIntegrationTest.java similarity index 96% rename from spring-ldap/src/itest/java/org/springframework/ldap/transaction/core/ContextSourceAndDataSourceTransactionManagerIntegrationTest.java rename to spring-ldap/src/itest/java/org/springframework/ldap/transaction/support/ContextSourceAndDataSourceTransactionManagerIntegrationTest.java index 89348ea6..f324bb09 100644 --- a/spring-ldap/src/itest/java/org/springframework/ldap/transaction/core/ContextSourceAndDataSourceTransactionManagerIntegrationTest.java +++ b/spring-ldap/src/itest/java/org/springframework/ldap/transaction/support/ContextSourceAndDataSourceTransactionManagerIntegrationTest.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.support; import java.sql.ResultSet; import java.sql.SQLException; @@ -30,6 +30,7 @@ import org.springframework.ldap.LdapServerManager; import org.springframework.ldap.NameNotFoundException; import org.springframework.ldap.core.AttributesMapper; import org.springframework.ldap.core.LdapTemplate; +import org.springframework.ldap.transaction.support.ContextSourceAndDataSourceTransactionManager; import org.springframework.test.AbstractDependencyInjectionSpringContextTests; import org.springframework.transaction.support.TransactionSynchronizationManager; diff --git a/spring-ldap/src/itest/java/org/springframework/ldap/transaction/core/ContextSourceTransactionManagerIntegrationTest.java b/spring-ldap/src/itest/java/org/springframework/ldap/transaction/support/ContextSourceTransactionManagerIntegrationTest.java similarity index 95% rename from spring-ldap/src/itest/java/org/springframework/ldap/transaction/core/ContextSourceTransactionManagerIntegrationTest.java rename to spring-ldap/src/itest/java/org/springframework/ldap/transaction/support/ContextSourceTransactionManagerIntegrationTest.java index 3a5d4290..6253a736 100644 --- a/spring-ldap/src/itest/java/org/springframework/ldap/transaction/core/ContextSourceTransactionManagerIntegrationTest.java +++ b/spring-ldap/src/itest/java/org/springframework/ldap/transaction/support/ContextSourceTransactionManagerIntegrationTest.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.support; import javax.naming.NamingException; import javax.naming.directory.Attributes; @@ -24,6 +24,7 @@ import org.springframework.ldap.LdapServerManager; import org.springframework.ldap.NameNotFoundException; import org.springframework.ldap.core.AttributesMapper; import org.springframework.ldap.core.LdapTemplate; +import org.springframework.ldap.transaction.support.ContextSourceAndDataSourceTransactionManager; import org.springframework.test.AbstractDependencyInjectionSpringContextTests; import org.springframework.transaction.support.TransactionSynchronizationManager; diff --git a/spring-ldap/src/itest/java/org/springframework/ldap/transaction/core/DummyDao.java b/spring-ldap/src/itest/java/org/springframework/ldap/transaction/support/DummyDao.java similarity index 94% rename from spring-ldap/src/itest/java/org/springframework/ldap/transaction/core/DummyDao.java rename to spring-ldap/src/itest/java/org/springframework/ldap/transaction/support/DummyDao.java index c6fd53b9..83038134 100644 --- a/spring-ldap/src/itest/java/org/springframework/ldap/transaction/core/DummyDao.java +++ b/spring-ldap/src/itest/java/org/springframework/ldap/transaction/support/DummyDao.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.support; public interface DummyDao { void createWithException(String country, String company, String fullname, diff --git a/spring-ldap/src/itest/java/org/springframework/ldap/transaction/core/DummyException.java b/spring-ldap/src/itest/java/org/springframework/ldap/transaction/support/DummyException.java similarity index 90% rename from spring-ldap/src/itest/java/org/springframework/ldap/transaction/core/DummyException.java rename to spring-ldap/src/itest/java/org/springframework/ldap/transaction/support/DummyException.java index 4637e5d8..1346994e 100644 --- a/spring-ldap/src/itest/java/org/springframework/ldap/transaction/core/DummyException.java +++ b/spring-ldap/src/itest/java/org/springframework/ldap/transaction/support/DummyException.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.support; public class DummyException extends RuntimeException { public DummyException(String message) { diff --git a/spring-ldap/src/itest/java/org/springframework/ldap/transaction/core/DummyServiceImpl.java b/spring-ldap/src/itest/java/org/springframework/ldap/transaction/support/DummyServiceImpl.java similarity index 91% rename from spring-ldap/src/itest/java/org/springframework/ldap/transaction/core/DummyServiceImpl.java rename to spring-ldap/src/itest/java/org/springframework/ldap/transaction/support/DummyServiceImpl.java index 272d630e..fe2ea681 100644 --- a/spring-ldap/src/itest/java/org/springframework/ldap/transaction/core/DummyServiceImpl.java +++ b/spring-ldap/src/itest/java/org/springframework/ldap/transaction/support/DummyServiceImpl.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.support; public class DummyServiceImpl { private DummyDao dummyDaoImpl; diff --git a/spring-ldap/src/itest/java/org/springframework/ldap/transaction/core/LdapAndJdbcDummyDaoImpl.java b/spring-ldap/src/itest/java/org/springframework/ldap/transaction/support/LdapAndJdbcDummyDaoImpl.java similarity index 81% rename from spring-ldap/src/itest/java/org/springframework/ldap/transaction/core/LdapAndJdbcDummyDaoImpl.java rename to spring-ldap/src/itest/java/org/springframework/ldap/transaction/support/LdapAndJdbcDummyDaoImpl.java index 0b897d5b..2565d1cf 100644 --- a/spring-ldap/src/itest/java/org/springframework/ldap/transaction/core/LdapAndJdbcDummyDaoImpl.java +++ b/spring-ldap/src/itest/java/org/springframework/ldap/transaction/support/LdapAndJdbcDummyDaoImpl.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.support; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.ldap.core.DirContextAdapter; @@ -36,7 +36,7 @@ public class LdapAndJdbcDummyDaoImpl implements DummyDao { /* * (non-Javadoc) * - * @see org.springframework.ldap.transaction.core.DummyDao#createWithException(java.lang.String, + * @see org.springframework.ldap.transaction.support.DummyDao#createWithException(java.lang.String, * java.lang.String, java.lang.String, java.lang.String, * java.lang.String) */ @@ -49,7 +49,7 @@ public class LdapAndJdbcDummyDaoImpl implements DummyDao { /* * (non-Javadoc) * - * @see org.springframework.ldap.transaction.core.DummyDao#create(java.lang.String, + * @see org.springframework.ldap.transaction.support.DummyDao#create(java.lang.String, * java.lang.String, java.lang.String, java.lang.String, * java.lang.String) */ @@ -73,7 +73,7 @@ public class LdapAndJdbcDummyDaoImpl implements DummyDao { /* * (non-Javadoc) * - * @see org.springframework.ldap.transaction.core.DummyDao#update(java.lang.String, + * @see org.springframework.ldap.transaction.support.DummyDao#update(java.lang.String, * java.lang.String, java.lang.String) */ public void update(String dn, String fullname, String lastname, @@ -93,7 +93,7 @@ public class LdapAndJdbcDummyDaoImpl implements DummyDao { /* * (non-Javadoc) * - * @see org.springframework.ldap.transaction.core.DummyDao#updateWithException(java.lang.String, + * @see org.springframework.ldap.transaction.support.DummyDao#updateWithException(java.lang.String, * java.lang.String, java.lang.String) */ public void updateWithException(String dn, String fullname, @@ -105,7 +105,7 @@ public class LdapAndJdbcDummyDaoImpl implements DummyDao { /* * (non-Javadoc) * - * @see org.springframework.ldap.transaction.core.DummyDao#updateAndRename(java.lang.String, + * @see org.springframework.ldap.transaction.support.DummyDao#updateAndRename(java.lang.String, * java.lang.String, java.lang.String) */ public void updateAndRename(String dn, String newDn, String description) { @@ -120,7 +120,7 @@ public class LdapAndJdbcDummyDaoImpl implements DummyDao { /* * (non-Javadoc) * - * @see org.springframework.ldap.transaction.core.DummyDao#updateAndRenameWithException(java.lang.String, + * @see org.springframework.ldap.transaction.support.DummyDao#updateAndRenameWithException(java.lang.String, * java.lang.String, java.lang.String) */ public void updateAndRenameWithException(String dn, String newDn, @@ -132,7 +132,7 @@ public class LdapAndJdbcDummyDaoImpl implements DummyDao { /* * (non-Javadoc) * - * @see org.springframework.ldap.transaction.core.DummyDao#modifyAttributes(java.lang.String, + * @see org.springframework.ldap.transaction.support.DummyDao#modifyAttributes(java.lang.String, * java.lang.String, java.lang.String) */ public void modifyAttributes(String dn, String lastName, String description) { @@ -146,7 +146,7 @@ public class LdapAndJdbcDummyDaoImpl implements DummyDao { /* * (non-Javadoc) * - * @see org.springframework.ldap.transaction.core.DummyDao#modifyAttributesWithException(java.lang.String, + * @see org.springframework.ldap.transaction.support.DummyDao#modifyAttributesWithException(java.lang.String, * java.lang.String, java.lang.String) */ public void modifyAttributesWithException(String dn, String lastName, @@ -158,7 +158,7 @@ public class LdapAndJdbcDummyDaoImpl implements DummyDao { /* * (non-Javadoc) * - * @see org.springframework.ldap.transaction.core.DummyDao#unbind(java.lang.String) + * @see org.springframework.ldap.transaction.support.DummyDao#unbind(java.lang.String) */ public void unbind(String dn, String fullname) { ldapTemplate.unbind(dn); @@ -169,7 +169,7 @@ public class LdapAndJdbcDummyDaoImpl implements DummyDao { /* * (non-Javadoc) * - * @see org.springframework.ldap.transaction.core.DummyDao#unbindWithException(java.lang.String) + * @see org.springframework.ldap.transaction.support.DummyDao#unbindWithException(java.lang.String) */ public void unbindWithException(String dn, String fullname) { unbind(dn, fullname); diff --git a/spring-ldap/src/itest/java/org/springframework/ldap/transaction/core/LdapDummyDaoImpl.java b/spring-ldap/src/itest/java/org/springframework/ldap/transaction/support/LdapDummyDaoImpl.java similarity index 79% rename from spring-ldap/src/itest/java/org/springframework/ldap/transaction/core/LdapDummyDaoImpl.java rename to spring-ldap/src/itest/java/org/springframework/ldap/transaction/support/LdapDummyDaoImpl.java index b7570b68..f3abca80 100644 --- a/spring-ldap/src/itest/java/org/springframework/ldap/transaction/core/LdapDummyDaoImpl.java +++ b/spring-ldap/src/itest/java/org/springframework/ldap/transaction/support/LdapDummyDaoImpl.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.support; import org.springframework.ldap.core.DirContextAdapter; import org.springframework.ldap.core.DistinguishedName; @@ -29,7 +29,7 @@ public class LdapDummyDaoImpl implements DummyDao { /* * (non-Javadoc) * - * @see org.springframework.ldap.transaction.core.DummyDao#createWithException(java.lang.String, + * @see org.springframework.ldap.transaction.support.DummyDao#createWithException(java.lang.String, * java.lang.String, java.lang.String, java.lang.String, * java.lang.String) */ @@ -42,7 +42,7 @@ public class LdapDummyDaoImpl implements DummyDao { /* * (non-Javadoc) * - * @see org.springframework.ldap.transaction.core.DummyDao#create(java.lang.String, + * @see org.springframework.ldap.transaction.support.DummyDao#create(java.lang.String, * java.lang.String, java.lang.String, java.lang.String, * java.lang.String) */ @@ -64,7 +64,7 @@ public class LdapDummyDaoImpl implements DummyDao { /* * (non-Javadoc) * - * @see org.springframework.ldap.transaction.core.DummyDao#update(java.lang.String, + * @see org.springframework.ldap.transaction.support.DummyDao#update(java.lang.String, * java.lang.String, java.lang.String) */ public void update(String dn, String fullname, String lastname, @@ -80,7 +80,7 @@ public class LdapDummyDaoImpl implements DummyDao { /* * (non-Javadoc) * - * @see org.springframework.ldap.transaction.core.DummyDao#updateWithException(java.lang.String, + * @see org.springframework.ldap.transaction.support.DummyDao#updateWithException(java.lang.String, * java.lang.String, java.lang.String) */ public void updateWithException(String dn, String fullname, @@ -92,7 +92,7 @@ public class LdapDummyDaoImpl implements DummyDao { /* * (non-Javadoc) * - * @see org.springframework.ldap.transaction.core.DummyDao#updateAndRename(java.lang.String, + * @see org.springframework.ldap.transaction.support.DummyDao#updateAndRename(java.lang.String, * java.lang.String, java.lang.String) */ public void updateAndRename(String dn, String newDn, String description) { @@ -107,7 +107,7 @@ public class LdapDummyDaoImpl implements DummyDao { /* * (non-Javadoc) * - * @see org.springframework.ldap.transaction.core.DummyDao#updateAndRenameWithException(java.lang.String, + * @see org.springframework.ldap.transaction.support.DummyDao#updateAndRenameWithException(java.lang.String, * java.lang.String, java.lang.String) */ public void updateAndRenameWithException(String dn, String newDn, @@ -119,7 +119,7 @@ public class LdapDummyDaoImpl implements DummyDao { /* * (non-Javadoc) * - * @see org.springframework.ldap.transaction.core.DummyDao#modifyAttributes(java.lang.String, + * @see org.springframework.ldap.transaction.support.DummyDao#modifyAttributes(java.lang.String, * java.lang.String, java.lang.String) */ public void modifyAttributes(String dn, String lastName, String description) { @@ -133,7 +133,7 @@ public class LdapDummyDaoImpl implements DummyDao { /* * (non-Javadoc) * - * @see org.springframework.ldap.transaction.core.DummyDao#modifyAttributesWithException(java.lang.String, + * @see org.springframework.ldap.transaction.support.DummyDao#modifyAttributesWithException(java.lang.String, * java.lang.String, java.lang.String) */ public void modifyAttributesWithException(String dn, String lastName, @@ -145,7 +145,7 @@ public class LdapDummyDaoImpl implements DummyDao { /* * (non-Javadoc) * - * @see org.springframework.ldap.transaction.core.DummyDao#unbind(java.lang.String) + * @see org.springframework.ldap.transaction.support.DummyDao#unbind(java.lang.String) */ public void unbind(String dn, String fullname) { ldapTemplate.unbind(dn); @@ -154,7 +154,7 @@ public class LdapDummyDaoImpl implements DummyDao { /* * (non-Javadoc) * - * @see org.springframework.ldap.transaction.core.DummyDao#unbindWithException(java.lang.String) + * @see org.springframework.ldap.transaction.support.DummyDao#unbindWithException(java.lang.String) */ public void unbindWithException(String dn, String fullname) { unbind(dn, fullname); diff --git a/spring-ldap/src/main/java/org/springframework/ldap/transaction/DirContextProxy.java b/spring-ldap/src/main/java/org/springframework/ldap/transaction/DirContextProxy.java index 6fad6863..156bce4c 100644 --- a/spring-ldap/src/main/java/org/springframework/ldap/transaction/DirContextProxy.java +++ b/spring-ldap/src/main/java/org/springframework/ldap/transaction/DirContextProxy.java @@ -17,7 +17,7 @@ package org.springframework.ldap.transaction; import javax.naming.directory.DirContext; -import org.springframework.ldap.transaction.core.TransactionAwareContextSourceProxy; +import org.springframework.ldap.transaction.support.TransactionAwareContextSourceProxy; /** * Helper interface to be able to get hold of the target DirContext from proxies 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/support/ContextSourceAndDataSourceTransactionManager.java similarity index 97% rename from spring-ldap/src/main/java/org/springframework/ldap/transaction/core/ContextSourceAndDataSourceTransactionManager.java rename to spring-ldap/src/main/java/org/springframework/ldap/transaction/support/ContextSourceAndDataSourceTransactionManager.java index cd00f312..62f607a7 100644 --- a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/ContextSourceAndDataSourceTransactionManager.java +++ b/spring-ldap/src/main/java/org/springframework/ldap/transaction/support/ContextSourceAndDataSourceTransactionManager.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.support; import org.springframework.jdbc.datasource.DataSourceTransactionManager; import org.springframework.ldap.core.ContextSource; 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/support/ContextSourceTransactionManager.java similarity index 97% rename from spring-ldap/src/main/java/org/springframework/ldap/transaction/core/ContextSourceTransactionManager.java rename to spring-ldap/src/main/java/org/springframework/ldap/transaction/support/ContextSourceTransactionManager.java index 68178973..64a1f3f6 100644 --- a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/ContextSourceTransactionManager.java +++ b/spring-ldap/src/main/java/org/springframework/ldap/transaction/support/ContextSourceTransactionManager.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.support; import org.springframework.ldap.core.ContextSource; import org.springframework.ldap.transaction.TempEntryRenamingStrategy; 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/support/ContextSourceTransactionManagerDelegate.java similarity index 96% rename from spring-ldap/src/main/java/org/springframework/ldap/transaction/core/ContextSourceTransactionManagerDelegate.java rename to spring-ldap/src/main/java/org/springframework/ldap/transaction/support/ContextSourceTransactionManagerDelegate.java index fef2639f..dd4ea0fe 100644 --- a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/ContextSourceTransactionManagerDelegate.java +++ b/spring-ldap/src/main/java/org/springframework/ldap/transaction/support/ContextSourceTransactionManagerDelegate.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.support; import javax.naming.NamingException; import javax.naming.directory.DirContext; 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/support/ContextSourceTransactionObject.java similarity index 94% rename from spring-ldap/src/main/java/org/springframework/ldap/transaction/core/ContextSourceTransactionObject.java rename to spring-ldap/src/main/java/org/springframework/ldap/transaction/support/ContextSourceTransactionObject.java index 5e19cc1c..46b99c53 100644 --- a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/ContextSourceTransactionObject.java +++ b/spring-ldap/src/main/java/org/springframework/ldap/transaction/support/ContextSourceTransactionObject.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.support; import org.springframework.ldap.transaction.DirContextHolder; 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/support/DefaultTempEntryRenamingStrategy.java similarity index 95% rename from spring-ldap/src/main/java/org/springframework/ldap/transaction/core/DefaultTempEntryRenamingStrategy.java rename to spring-ldap/src/main/java/org/springframework/ldap/transaction/support/DefaultTempEntryRenamingStrategy.java index 3de9a647..254e79ac 100644 --- a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/DefaultTempEntryRenamingStrategy.java +++ b/spring-ldap/src/main/java/org/springframework/ldap/transaction/support/DefaultTempEntryRenamingStrategy.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.support; import java.util.List; 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/support/DifferentSubtreeTempEntryRenamingStrategy.java similarity index 95% rename from spring-ldap/src/main/java/org/springframework/ldap/transaction/core/DifferentSubtreeTempEntryRenamingStrategy.java rename to spring-ldap/src/main/java/org/springframework/ldap/transaction/support/DifferentSubtreeTempEntryRenamingStrategy.java index 3c3045f8..43786eac 100644 --- a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/DifferentSubtreeTempEntryRenamingStrategy.java +++ b/spring-ldap/src/main/java/org/springframework/ldap/transaction/support/DifferentSubtreeTempEntryRenamingStrategy.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.support; import java.util.List; 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/support/TransactionAwareContextSourceProxy.java similarity index 95% rename from spring-ldap/src/main/java/org/springframework/ldap/transaction/core/TransactionAwareContextSourceProxy.java rename to spring-ldap/src/main/java/org/springframework/ldap/transaction/support/TransactionAwareContextSourceProxy.java index eb6b9d51..adad5d55 100644 --- a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/TransactionAwareContextSourceProxy.java +++ b/spring-ldap/src/main/java/org/springframework/ldap/transaction/support/TransactionAwareContextSourceProxy.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.support; import java.lang.reflect.Proxy; 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/support/TransactionAwareDirContextInvocationHandler.java similarity index 95% rename from spring-ldap/src/main/java/org/springframework/ldap/transaction/core/TransactionAwareDirContextInvocationHandler.java rename to spring-ldap/src/main/java/org/springframework/ldap/transaction/support/TransactionAwareDirContextInvocationHandler.java index cd22136a..50b9edcd 100644 --- a/spring-ldap/src/main/java/org/springframework/ldap/transaction/core/TransactionAwareDirContextInvocationHandler.java +++ b/spring-ldap/src/main/java/org/springframework/ldap/transaction/support/TransactionAwareDirContextInvocationHandler.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.support; import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationTargetException; 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/support/ContextSourceTransactionManagerTest.java similarity index 93% rename from spring-ldap/src/test/java/org/springframework/ldap/transaction/core/ContextSourceTransactionManagerTest.java rename to spring-ldap/src/test/java/org/springframework/ldap/transaction/support/ContextSourceTransactionManagerTest.java index 79c525d5..5a22e5ae 100644 --- a/spring-ldap/src/test/java/org/springframework/ldap/transaction/core/ContextSourceTransactionManagerTest.java +++ b/spring-ldap/src/test/java/org/springframework/ldap/transaction/support/ContextSourceTransactionManagerTest.java @@ -1,4 +1,4 @@ -package org.springframework.ldap.transaction.core; +package org.springframework.ldap.transaction.support; import javax.naming.directory.DirContext; @@ -8,9 +8,9 @@ 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.TransactionAwareContextSourceProxy; +import org.springframework.ldap.transaction.support.ContextSourceTransactionManager; +import org.springframework.ldap.transaction.support.ContextSourceTransactionObject; +import org.springframework.ldap.transaction.support.TransactionAwareContextSourceProxy; import org.springframework.transaction.TransactionDefinition; import org.springframework.transaction.compensating.CompensatingTransactionOperationManager; import org.springframework.transaction.support.DefaultTransactionStatus; diff --git a/spring-ldap/src/test/java/org/springframework/ldap/transaction/core/DefaultTempEntryRenamingStrategyTest.java b/spring-ldap/src/test/java/org/springframework/ldap/transaction/support/DefaultTempEntryRenamingStrategyTest.java similarity index 86% rename from spring-ldap/src/test/java/org/springframework/ldap/transaction/core/DefaultTempEntryRenamingStrategyTest.java rename to spring-ldap/src/test/java/org/springframework/ldap/transaction/support/DefaultTempEntryRenamingStrategyTest.java index 934c6d6d..0b0ac321 100644 --- a/spring-ldap/src/test/java/org/springframework/ldap/transaction/core/DefaultTempEntryRenamingStrategyTest.java +++ b/spring-ldap/src/test/java/org/springframework/ldap/transaction/support/DefaultTempEntryRenamingStrategyTest.java @@ -1,9 +1,9 @@ -package org.springframework.ldap.transaction.core; +package org.springframework.ldap.transaction.support; import javax.naming.Name; import org.springframework.ldap.core.DistinguishedName; -import org.springframework.ldap.transaction.core.DefaultTempEntryRenamingStrategy; +import org.springframework.ldap.transaction.support.DefaultTempEntryRenamingStrategy; import junit.framework.TestCase; diff --git a/spring-ldap/src/test/java/org/springframework/ldap/transaction/core/DifferentSubtreeTempEntryRenamingStrategyTest.java b/spring-ldap/src/test/java/org/springframework/ldap/transaction/support/DifferentSubtreeTempEntryRenamingStrategyTest.java similarity index 82% rename from spring-ldap/src/test/java/org/springframework/ldap/transaction/core/DifferentSubtreeTempEntryRenamingStrategyTest.java rename to spring-ldap/src/test/java/org/springframework/ldap/transaction/support/DifferentSubtreeTempEntryRenamingStrategyTest.java index 8e946c1f..ccca78c7 100644 --- a/spring-ldap/src/test/java/org/springframework/ldap/transaction/core/DifferentSubtreeTempEntryRenamingStrategyTest.java +++ b/spring-ldap/src/test/java/org/springframework/ldap/transaction/support/DifferentSubtreeTempEntryRenamingStrategyTest.java @@ -1,9 +1,9 @@ -package org.springframework.ldap.transaction.core; +package org.springframework.ldap.transaction.support; import javax.naming.Name; import org.springframework.ldap.core.DistinguishedName; -import org.springframework.ldap.transaction.core.DifferentSubtreeTempEntryRenamingStrategy; +import org.springframework.ldap.transaction.support.DifferentSubtreeTempEntryRenamingStrategy; import junit.framework.TestCase; 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/support/TransactionAwareContextSourceProxyTest.java similarity index 93% rename from spring-ldap/src/test/java/org/springframework/ldap/transaction/core/TransactionAwareContextSourceProxyTest.java rename to spring-ldap/src/test/java/org/springframework/ldap/transaction/support/TransactionAwareContextSourceProxyTest.java index 4c4e79aa..ea9d2933 100644 --- a/spring-ldap/src/test/java/org/springframework/ldap/transaction/core/TransactionAwareContextSourceProxyTest.java +++ b/spring-ldap/src/test/java/org/springframework/ldap/transaction/support/TransactionAwareContextSourceProxyTest.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.support; import javax.naming.directory.DirContext; import javax.naming.ldap.LdapContext; @@ -23,6 +23,7 @@ import junit.framework.TestCase; import org.easymock.MockControl; import org.springframework.ldap.core.ContextSource; import org.springframework.ldap.transaction.DirContextProxy; +import org.springframework.ldap.transaction.support.TransactionAwareContextSourceProxy; /** * Tests for {@link TransactionAwareContextSourceProxy}.