Review process: Merge synch packages into support in retry / repeat.

spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/BatchSqlUpdateItemWriterTests.java

@@ -29,7 +29,7 @@ import junit.framework.TestCase;
 import org.easymock.MockControl;
 import org.springframework.batch.repeat.RepeatContext;
 import org.springframework.batch.repeat.context.RepeatContextSupport;
-import org.springframework.batch.repeat.synch.RepeatSynchronizationManager;
+import org.springframework.batch.repeat.support.RepeatSynchronizationManager;
 import org.springframework.dao.DataAccessException;
 import org.springframework.jdbc.UncategorizedSQLException;
 import org.springframework.jdbc.core.JdbcTemplate;

spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/HibernateAwareItemWriterTests.java

@@ -26,7 +26,7 @@ import org.springframework.batch.item.ClearFailedException;
 import org.springframework.batch.item.FlushFailedException;
 import org.springframework.batch.item.ItemWriter;
 import org.springframework.batch.repeat.context.RepeatContextSupport;
-import org.springframework.batch.repeat.synch.RepeatSynchronizationManager;
+import org.springframework.batch.repeat.support.RepeatSynchronizationManager;
 import org.springframework.dao.DataAccessException;
 import org.springframework.orm.hibernate3.HibernateTemplate;
 import org.springframework.transaction.support.TransactionSynchronizationManager;

spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/RepeatSynchronizationManagerTests.java

@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.repeat.synch;
+package org.springframework.batch.repeat.support;
 
 import junit.framework.TestCase;
 
 import org.springframework.batch.repeat.RepeatContext;
 import org.springframework.batch.repeat.context.RepeatContextSupport;
+import org.springframework.batch.repeat.support.RepeatSynchronizationManager;
 
 public class RepeatSynchronizationManagerTests extends TestCase {
 

spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/SimpleRepeatTemplateTests.java

@@ -28,7 +28,6 @@ import org.springframework.batch.repeat.context.RepeatContextSupport;
 import org.springframework.batch.repeat.exception.ExceptionHandler;
 import org.springframework.batch.repeat.policy.CompletionPolicySupport;
 import org.springframework.batch.repeat.policy.SimpleCompletionPolicy;
-import org.springframework.batch.repeat.synch.RepeatSynchronizationManager;
 
 /**
  * @author Dave Syer

spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/AlwaysRetryPolicyTests.java

@@ -19,7 +19,7 @@ package org.springframework.batch.retry.policy;
 import junit.framework.TestCase;
 
 import org.springframework.batch.retry.RetryContext;
-import org.springframework.batch.retry.synch.RetrySynchronizationManager;
+import org.springframework.batch.retry.support.RetrySynchronizationManager;
 
 public class AlwaysRetryPolicyTests extends TestCase {
 

spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/CompositeRetryPolicyTests.java

@@ -24,7 +24,7 @@ import junit.framework.TestCase;
 import org.springframework.batch.retry.RetryContext;
 import org.springframework.batch.retry.RetryPolicy;
 import org.springframework.batch.retry.TerminatedRetryException;
-import org.springframework.batch.retry.synch.RetrySynchronizationManager;
+import org.springframework.batch.retry.support.RetrySynchronizationManager;
 
 public class CompositeRetryPolicyTests extends TestCase {
 

spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/ExceptionClassifierRetryPolicyTests.java

@@ -23,7 +23,7 @@ import java.util.Map;
 import junit.framework.TestCase;
 
 import org.springframework.batch.retry.RetryContext;
-import org.springframework.batch.retry.synch.RetrySynchronizationManager;
+import org.springframework.batch.retry.support.RetrySynchronizationManager;
 import org.springframework.batch.support.ExceptionClassifierSupport;
 
 public class ExceptionClassifierRetryPolicyTests extends TestCase {

spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/ItemReaderRetryPolicyTests.java

@@ -30,7 +30,7 @@ import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.support.ListItemReader;
 import org.springframework.batch.repeat.RepeatContext;
 import org.springframework.batch.repeat.context.RepeatContextSupport;
-import org.springframework.batch.repeat.synch.RepeatSynchronizationManager;
+import org.springframework.batch.repeat.support.RepeatSynchronizationManager;
 import org.springframework.batch.retry.ListItemReaderRecoverer;
 import org.springframework.batch.retry.RetryCallback;
 import org.springframework.batch.retry.RetryContext;

spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/NeverRetryPolicyTests.java

@@ -19,7 +19,7 @@ package org.springframework.batch.retry.policy;
 import junit.framework.TestCase;
 
 import org.springframework.batch.retry.RetryContext;
-import org.springframework.batch.retry.synch.RetrySynchronizationManager;
+import org.springframework.batch.retry.support.RetrySynchronizationManager;
 
 public class NeverRetryPolicyTests extends TestCase {
 

spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/SimpleRetryPolicyTests.java

@@ -19,7 +19,7 @@ package org.springframework.batch.retry.policy;
 import junit.framework.TestCase;
 
 import org.springframework.batch.retry.RetryContext;
-import org.springframework.batch.retry.synch.RetrySynchronizationManager;
+import org.springframework.batch.retry.support.RetrySynchronizationManager;
 
 public class SimpleRetryPolicyTests extends TestCase {
 

spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/TimeoutRetryPolicyTests.java

@@ -19,7 +19,7 @@ package org.springframework.batch.retry.policy;
 import junit.framework.TestCase;
 
 import org.springframework.batch.retry.RetryContext;
-import org.springframework.batch.retry.synch.RetrySynchronizationManager;
+import org.springframework.batch.retry.support.RetrySynchronizationManager;
 
 public class TimeoutRetryPolicyTests extends TestCase {
 

spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/support/RetrySynchronizationManagerTests.java

@@ -14,13 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.retry.synch;
+package org.springframework.batch.retry.support;
 
 import junit.framework.TestCase;
 
 import org.springframework.batch.retry.RetryCallback;
 import org.springframework.batch.retry.RetryContext;
 import org.springframework.batch.retry.context.RetryContextSupport;
+import org.springframework.batch.retry.support.RetrySynchronizationManager;
 import org.springframework.batch.retry.support.RetryTemplate;
 
 /**

spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/support/RetryTemplateTests.java

@@ -27,7 +27,6 @@ import org.springframework.batch.retry.backoff.BackOffPolicy;
 import org.springframework.batch.retry.backoff.StatelessBackOffPolicy;
 import org.springframework.batch.retry.policy.NeverRetryPolicy;
 import org.springframework.batch.retry.policy.SimpleRetryPolicy;
-import org.springframework.batch.retry.synch.RetrySynchronizationManager;
 
 /**
  * @author Rob Harrop