Rename some packages with more logical names

spring-batch-core/src/main/java/org/springframework/batch/core/configuration/JobFactory.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.repository;
+package org.springframework.batch.core.configuration;
 
 import org.springframework.batch.core.domain.Job;
 

spring-batch-core/src/main/java/org/springframework/batch/core/configuration/JobLocator.java

@@ -13,9 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.repository;
+package org.springframework.batch.core.configuration;
 
 import org.springframework.batch.core.domain.Job;
+import org.springframework.batch.core.repository.NoSuchJobException;
 
 /**
  * A runtime service locator interface for retrieving job configurations by

spring-batch-core/src/main/java/org/springframework/batch/core/configuration/JobRegistry.java

@@ -13,9 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.repository;
+package org.springframework.batch.core.configuration;
 
 import org.springframework.batch.core.domain.Job;
+import org.springframework.batch.core.repository.DuplicateJobException;
 
 /**
  * A runtime service registry interface for registering job configurations by

spring-batch-core/src/main/java/org/springframework/batch/core/configuration/ListableJobRegistry.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.repository;
+package org.springframework.batch.core.configuration;
 
 import java.util.Collection;
 

spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/CommandLineJobRunner.java

@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.execution.bootstrap.support;
+package org.springframework.batch.execution.bootstrap;
 
 import java.util.Properties;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.springframework.batch.core.configuration.JobLocator;
 import org.springframework.batch.core.domain.Job;
 import org.springframework.batch.core.domain.JobExecution;
 import org.springframework.batch.core.domain.JobParameters;
-import org.springframework.batch.core.repository.JobLocator;
 import org.springframework.batch.core.runtime.ExitStatusExceptionClassifier;
 import org.springframework.batch.core.runtime.JobParametersFactory;
 import org.springframework.batch.execution.launch.JobLauncher;

spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/DefaultJobParametersFactory.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.execution.bootstrap.support;
+package org.springframework.batch.execution.bootstrap;
 
 import java.text.DateFormat;
 import java.text.DecimalFormat;

spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/ExitCodeMapper.java

@@ -1,4 +1,4 @@
-package org.springframework.batch.execution.bootstrap.support;
+package org.springframework.batch.execution.bootstrap;
 
 
 /**

spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/ExportedJobLauncher.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.execution.bootstrap.support;
+package org.springframework.batch.execution.bootstrap;
 
 import java.util.Properties;
 

spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/JvmSystemExiter.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.execution.bootstrap.support;
+package org.springframework.batch.execution.bootstrap;
 
 /**
  * Implementation of the {@link SystemExiter} interface that calls the standards

spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/ScheduledJobParametersFactory.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.execution.bootstrap.support;
+package org.springframework.batch.execution.bootstrap;
 
 import java.text.DateFormat;
 import java.text.ParseException;

spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/SimpleExportedJobLauncher.java

@@ -13,19 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.execution.bootstrap.support;
+package org.springframework.batch.execution.bootstrap;
 
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Properties;
 
+import org.springframework.batch.core.configuration.JobLocator;
 import org.springframework.batch.core.domain.Job;
 import org.springframework.batch.core.domain.JobExecution;
 import org.springframework.batch.core.domain.JobParameters;
 import org.springframework.batch.core.domain.StepExecution;
 import org.springframework.batch.core.repository.JobExecutionAlreadyRunningException;
-import org.springframework.batch.core.repository.JobLocator;
 import org.springframework.batch.core.repository.NoSuchJobException;
 import org.springframework.batch.core.runtime.JobParametersFactory;
 import org.springframework.batch.execution.launch.JobLauncher;

spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/SimpleJvmExitCodeMapper.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.execution.bootstrap.support;
+package org.springframework.batch.execution.bootstrap;
 
 import java.util.HashMap;
 import java.util.Map;

spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/SystemExiter.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.execution.bootstrap.support;
+package org.springframework.batch.execution.bootstrap;
 
 /**
  * Interface for exiting the JVM.  This abstraction is only

spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/package.html

@@ -1,7 +1,7 @@
 <html>
 <body>
 <p>
-Specific implementations of bootstrap concerns.
+Support classes for use in bootstrap implementations or configurations.
 </p>
 </body>
 </html>

spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/support/package.html

@@ -1,7 +0,0 @@
-<html>
-<body>
-<p>
-Support classes for use in bootstrap implementations or configurations.
-</p>
-</body>
-</html>

spring-batch-execution/src/main/java/org/springframework/batch/execution/configuration/JobRegistryBeanPostProcessor.java

@@ -19,10 +19,10 @@ import java.util.Collection;
 import java.util.HashSet;
 import java.util.Iterator;
 
+import org.springframework.batch.core.configuration.JobLocator;
+import org.springframework.batch.core.configuration.JobRegistry;
 import org.springframework.batch.core.domain.Job;
 import org.springframework.batch.core.repository.DuplicateJobException;
-import org.springframework.batch.core.repository.JobLocator;
-import org.springframework.batch.core.repository.JobRegistry;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.FatalBeanException;
 import org.springframework.beans.factory.DisposableBean;

spring-batch-execution/src/main/java/org/springframework/batch/execution/configuration/MapJobRegistry.java

@@ -21,11 +21,11 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 
+import org.springframework.batch.core.configuration.JobFactory;
+import org.springframework.batch.core.configuration.JobRegistry;
+import org.springframework.batch.core.configuration.ListableJobRegistry;
 import org.springframework.batch.core.domain.Job;
 import org.springframework.batch.core.repository.DuplicateJobException;
-import org.springframework.batch.core.repository.JobFactory;
-import org.springframework.batch.core.repository.JobRegistry;
-import org.springframework.batch.core.repository.ListableJobRegistry;
 import org.springframework.batch.core.repository.NoSuchJobException;
 import org.springframework.util.Assert;
 

spring-batch-execution/src/main/java/org/springframework/batch/execution/configuration/ReferenceJobFactory.java

@@ -15,8 +15,8 @@
  */
 package org.springframework.batch.execution.configuration;
 
+import org.springframework.batch.core.configuration.JobFactory;
 import org.springframework.batch.core.domain.Job;
-import org.springframework.batch.core.repository.JobFactory;
 
 /**
  * A {@link JobFactory} that just keeps a reference to a {@link Job}. It never
@@ -43,7 +43,7 @@ public class ReferenceJobFactory implements JobFactory {
 	/**
 	 * Just return the instance passed in on initialization.
 	 * 
-	 * @see org.springframework.batch.core.repository.JobFactory#createJob()
+	 * @see org.springframework.batch.core.configuration.JobFactory#createJob()
 	 */
 	public Job createJob() {
 		return job;
@@ -52,7 +52,7 @@ public class ReferenceJobFactory implements JobFactory {
 	/**
 	 * Returns the job name as passed in on initialization.
 	 * 
-	 * @see org.springframework.batch.core.repository.JobFactory#getJobName()
+	 * @see org.springframework.batch.core.configuration.JobFactory#getJobName()
 	 */
 	public String getJobName() {
 		return name;

spring-batch-execution/src/main/java/org/springframework/batch/execution/resource/StepExecutionProxyResource.java

@@ -30,7 +30,7 @@ import org.springframework.batch.core.domain.StepExecution;
 import org.springframework.batch.core.domain.StepListener;
 import org.springframework.batch.core.listener.StepListenerSupport;
 import org.springframework.batch.core.runtime.JobParametersFactory;
-import org.springframework.batch.execution.bootstrap.support.DefaultJobParametersFactory;
+import org.springframework.batch.execution.bootstrap.DefaultJobParametersFactory;
 import org.springframework.context.ResourceLoaderAware;
 import org.springframework.core.io.FileSystemResourceLoader;
 import org.springframework.core.io.Resource;

spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/ListenerMulticaster.java

@@ -33,7 +33,7 @@ import org.springframework.batch.item.exception.StreamException;
 import org.springframework.batch.item.stream.CompositeItemStream;
 import org.springframework.batch.repeat.ExitStatus;
 import org.springframework.batch.repeat.RepeatListener;
-import org.springframework.batch.repeat.interceptor.CompositeRepeatListener;
+import org.springframework.batch.repeat.listener.CompositeRepeatListener;
 
 /**
  * @author Dave Syer

spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/CommandLineJobRunnerTests.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.execution.bootstrap.support;
+package org.springframework.batch.execution.bootstrap;
 
 import junit.framework.TestCase;
 
@@ -22,6 +22,8 @@ import org.springframework.batch.core.domain.JobExecution;
 import org.springframework.batch.core.domain.JobParameters;
 import org.springframework.batch.core.repository.JobExecutionAlreadyRunningException;
 import org.springframework.batch.core.runtime.ExitStatusExceptionClassifier;
+import org.springframework.batch.execution.bootstrap.CommandLineJobRunner;
+import org.springframework.batch.execution.bootstrap.SystemExiter;
 import org.springframework.batch.execution.launch.JobLauncher;
 import org.springframework.batch.repeat.ExitStatus;
 

spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/DefaultJobParametersFactoryTests.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.execution.bootstrap.support;
+package org.springframework.batch.execution.bootstrap;
 
 import java.text.DateFormat;
 import java.text.DecimalFormat;
@@ -25,6 +25,7 @@ import junit.framework.TestCase;
 
 import org.springframework.batch.core.domain.JobParameters;
 import org.springframework.batch.core.domain.JobParametersBuilder;
+import org.springframework.batch.execution.bootstrap.DefaultJobParametersFactory;
 import org.springframework.util.StringUtils;
 
 /**

spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/ScheduledJobParametersFactoryTests.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.execution.bootstrap.support;
+package org.springframework.batch.execution.bootstrap;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
@@ -24,6 +24,7 @@ import junit.framework.TestCase;
 
 import org.springframework.batch.core.domain.JobParameters;
 import org.springframework.batch.core.domain.JobParametersBuilder;
+import org.springframework.batch.execution.bootstrap.ScheduledJobParametersFactory;
 import org.springframework.util.StringUtils;
 
 /**

spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/SimpleExportedJobLauncherTests.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.execution.bootstrap.support;
+package org.springframework.batch.execution.bootstrap;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -28,6 +28,7 @@ import org.springframework.batch.core.domain.JobParametersBuilder;
 import org.springframework.batch.core.domain.StepExecution;
 import org.springframework.batch.core.repository.JobExecutionAlreadyRunningException;
 import org.springframework.batch.core.runtime.JobParametersFactory;
+import org.springframework.batch.execution.bootstrap.SimpleExportedJobLauncher;
 import org.springframework.batch.execution.configuration.MapJobRegistry;
 import org.springframework.batch.execution.configuration.ReferenceJobFactory;
 import org.springframework.batch.execution.job.JobSupport;
@@ -65,7 +66,7 @@ public class SimpleExportedJobLauncherTests extends TestCase {
 
 	/**
 	 * Test method for
-	 * {@link org.springframework.batch.execution.bootstrap.support.SimpleExportedJobLauncher#afterPropertiesSet()}.
+	 * {@link org.springframework.batch.execution.bootstrap.SimpleExportedJobLauncher#afterPropertiesSet()}.
 	 * @throws Exception
 	 */
 	public void testAfterPropertiesSet() throws Exception {
@@ -82,7 +83,7 @@ public class SimpleExportedJobLauncherTests extends TestCase {
 
 	/**
 	 * Test method for
-	 * {@link org.springframework.batch.execution.bootstrap.support.SimpleExportedJobLauncher#afterPropertiesSet()}.
+	 * {@link org.springframework.batch.execution.bootstrap.SimpleExportedJobLauncher#afterPropertiesSet()}.
 	 * @throws Exception
 	 */
 	public void testAfterPropertiesSetWithLauncher() throws Exception {
@@ -104,7 +105,7 @@ public class SimpleExportedJobLauncherTests extends TestCase {
 
 	/**
 	 * Test method for
-	 * {@link org.springframework.batch.execution.bootstrap.support.SimpleExportedJobLauncher#getStatistics()}.
+	 * {@link org.springframework.batch.execution.bootstrap.SimpleExportedJobLauncher#getStatistics()}.
 	 */
 	public void testGetStatistics() {
 		Properties props = launcher.getStatistics();
@@ -114,7 +115,7 @@ public class SimpleExportedJobLauncherTests extends TestCase {
 
 	/**
 	 * Test method for
-	 * {@link org.springframework.batch.execution.bootstrap.support.SimpleExportedJobLauncher#getStatistics()}.
+	 * {@link org.springframework.batch.execution.bootstrap.SimpleExportedJobLauncher#getStatistics()}.
 	 * @throws Exception
 	 */
 	public void testGetStatisticsWithContent() throws Exception {
@@ -127,7 +128,7 @@ public class SimpleExportedJobLauncherTests extends TestCase {
 
 	/**
 	 * Test method for
-	 * {@link org.springframework.batch.execution.bootstrap.support.SimpleExportedJobLauncher#isRunning()}.
+	 * {@link org.springframework.batch.execution.bootstrap.SimpleExportedJobLauncher#isRunning()}.
 	 * @throws Exception
 	 */
 	public void testIsRunning() throws Exception {
@@ -138,7 +139,7 @@ public class SimpleExportedJobLauncherTests extends TestCase {
 
 	/**
 	 * Test method for
-	 * {@link org.springframework.batch.execution.bootstrap.support.SimpleExportedJobLauncher#isRunning()}.
+	 * {@link org.springframework.batch.execution.bootstrap.SimpleExportedJobLauncher#isRunning()}.
 	 * @throws Exception
 	 */
 	public void testAlreadyRunning() throws Exception {
@@ -154,7 +155,7 @@ public class SimpleExportedJobLauncherTests extends TestCase {
 
 	/**
 	 * Test method for
-	 * {@link org.springframework.batch.execution.bootstrap.support.SimpleExportedJobLauncher#run(java.lang.String)}.
+	 * {@link org.springframework.batch.execution.bootstrap.SimpleExportedJobLauncher#run(java.lang.String)}.
 	 */
 	public void testRunNonExistentJob() {
 		String value = launcher.run("foo");
@@ -163,7 +164,7 @@ public class SimpleExportedJobLauncherTests extends TestCase {
 
 	/**
 	 * Test method for
-	 * {@link org.springframework.batch.execution.bootstrap.support.SimpleExportedJobLauncher#run(java.lang.String)}.
+	 * {@link org.springframework.batch.execution.bootstrap.SimpleExportedJobLauncher#run(java.lang.String)}.
 	 * @throws Exception 
 	 */
 	public void testRunJobWithParameters() throws Exception {
@@ -175,7 +176,7 @@ public class SimpleExportedJobLauncherTests extends TestCase {
 
 	/**
 	 * Test method for
-	 * {@link org.springframework.batch.execution.bootstrap.support.SimpleExportedJobLauncher#run(java.lang.String)}.
+	 * {@link org.springframework.batch.execution.bootstrap.SimpleExportedJobLauncher#run(java.lang.String)}.
 	 * @throws Exception 
 	 */
 	public void testRunJobWithParametersAndFactory() throws Exception {
@@ -195,7 +196,7 @@ public class SimpleExportedJobLauncherTests extends TestCase {
 
 	/**
 	 * Test method for
-	 * {@link org.springframework.batch.execution.bootstrap.support.SimpleExportedJobLauncher#stop()}.
+	 * {@link org.springframework.batch.execution.bootstrap.SimpleExportedJobLauncher#stop()}.
 	 * @throws Exception 
 	 */
 	public void testStop() throws Exception {

spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/SimpleJvmExitCodeMapperTests.java

@@ -14,13 +14,15 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.execution.bootstrap.support;
+package org.springframework.batch.execution.bootstrap;
 
 import java.util.HashMap;
 import java.util.Map;
 
 import junit.framework.TestCase;
 
+import org.springframework.batch.execution.bootstrap.ExitCodeMapper;
+import org.springframework.batch.execution.bootstrap.SimpleJvmExitCodeMapper;
 import org.springframework.batch.repeat.ExitStatus;
 
 public class SimpleJvmExitCodeMapperTests extends TestCase {

spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/StubJobLauncher.java

@@ -1,4 +1,4 @@
-package org.springframework.batch.execution.bootstrap.support;
+package org.springframework.batch.execution.bootstrap;
 
 import org.springframework.batch.core.domain.Job;
 import org.springframework.batch.core.domain.JobExecution;

spring-batch-execution/src/test/java/org/springframework/batch/execution/configuration/MapJobRegistryTests.java

@@ -19,8 +19,8 @@ import java.util.Collection;
 
 import junit.framework.TestCase;
 
+import org.springframework.batch.core.configuration.JobFactory;
 import org.springframework.batch.core.repository.DuplicateJobException;
-import org.springframework.batch.core.repository.JobFactory;
 import org.springframework.batch.core.repository.NoSuchJobException;
 import org.springframework.batch.execution.job.JobSupport;
 

spring-batch-execution/src/test/resources/org/springframework/batch/execution/bootstrap/support/test-environment.xml

@@ -7,14 +7,14 @@
 		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd
 		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.0.xsd">
 
-	<bean id="simpleContainerLauncher" class="org.springframework.batch.execution.bootstrap.support.CommandLineJobRunnerTests$StubJobLauncher" />
+	<bean id="simpleContainerLauncher" class="org.springframework.batch.execution.bootstrap.CommandLineJobRunnerTests$StubJobLauncher" />
 
-	<bean class="org.springframework.batch.execution.bootstrap.support.SimpleJvmExitCodeMapper" />
+	<bean class="org.springframework.batch.execution.bootstrap.SimpleJvmExitCodeMapper" />
 
 	<bean
-		class="org.springframework.batch.execution.bootstrap.support.CommandLineJobRunnerTests$StubSystemExiter" />
+		class="org.springframework.batch.execution.bootstrap.CommandLineJobRunnerTests$StubSystemExiter" />
 		
 	<bean
-		class="org.springframework.batch.execution.bootstrap.support.CommandLineJobRunnerTests$StubExceptionClassifier" />
+		class="org.springframework.batch.execution.bootstrap.CommandLineJobRunnerTests$StubExceptionClassifier" />
 
 </beans>

spring-batch-execution/src/test/resources/simple-container-definition.xml

@@ -62,7 +62,7 @@
 	<!-- init-method="clear"/-->
 
 	<bean
-		class="org.springframework.batch.execution.bootstrap.support.SimpleJvmExitCodeMapper" />
+		class="org.springframework.batch.execution.bootstrap.SimpleJvmExitCodeMapper" />
 
 	<bean
 		class="org.springframework.beans.factory.config.CustomEditorConfigurer">
@@ -93,6 +93,6 @@
 	</bean>
 
 	<bean
-		class="org.springframework.batch.execution.bootstrap.support.CommandLineJobRunnerTests$StubSystemExiter" />
+		class="org.springframework.batch.execution.bootstrap.CommandLineJobRunnerTests$StubSystemExiter" />
 
 </beans>

spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/listener/CompositeRepeatListener.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.repeat.interceptor;
+package org.springframework.batch.repeat.listener;
 
 import java.util.ArrayList;
 import java.util.Arrays;

spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/listener/RepeatListenerSupport.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.repeat.interceptor;
+package org.springframework.batch.repeat.listener;
 
 import org.springframework.batch.repeat.ExitStatus;
 import org.springframework.batch.repeat.RepeatContext;

spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/listener/RetryListenerSupport.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.retry.interceptor;
+package org.springframework.batch.retry.listener;
 
 import org.springframework.batch.retry.RetryCallback;
 import org.springframework.batch.retry.RetryContext;

spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/listener/CompositeRepeatListenerTests.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.repeat.interceptor;
+package org.springframework.batch.repeat.listener;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -23,6 +23,8 @@ import junit.framework.TestCase;
 import org.springframework.batch.repeat.RepeatContext;
 import org.springframework.batch.repeat.RepeatListener;
 import org.springframework.batch.repeat.context.RepeatContextSupport;
+import org.springframework.batch.repeat.listener.CompositeRepeatListener;
+import org.springframework.batch.repeat.listener.RepeatListenerSupport;
 
 /**
  * @author Dave Syer

spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/listener/RepeatListenerTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.repeat.interceptor;
+package org.springframework.batch.repeat.listener;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -25,6 +25,7 @@ import org.springframework.batch.repeat.ExitStatus;
 import org.springframework.batch.repeat.RepeatCallback;
 import org.springframework.batch.repeat.RepeatContext;
 import org.springframework.batch.repeat.RepeatListener;
+import org.springframework.batch.repeat.listener.RepeatListenerSupport;
 import org.springframework.batch.repeat.support.RepeatTemplate;
 import org.springframework.batch.repeat.support.TaskExecutorRepeatTemplate;
 import org.springframework.core.task.SimpleAsyncTaskExecutor;

spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/listener/RetryListenerSupportTests.java

@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.retry.interceptor;
+package org.springframework.batch.retry.listener;
+
+import org.springframework.batch.retry.listener.RetryListenerSupport;
 
 import junit.framework.TestCase;
 

spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/listener/RetryListenerTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.retry.interceptor;
+package org.springframework.batch.retry.listener;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -25,6 +25,7 @@ import org.springframework.batch.retry.RetryCallback;
 import org.springframework.batch.retry.RetryContext;
 import org.springframework.batch.retry.RetryListener;
 import org.springframework.batch.retry.exception.TerminatedRetryException;
+import org.springframework.batch.retry.listener.RetryListenerSupport;
 import org.springframework.batch.retry.policy.NeverRetryPolicy;
 import org.springframework.batch.retry.support.RetryTemplate;
 

spring-batch-samples/src/test/java/org/springframework/batch/sample/ClassPathXmlApplicationContextJobFactory.java

@@ -15,8 +15,8 @@
  */
 package org.springframework.batch.sample;
 
+import org.springframework.batch.core.configuration.JobFactory;
 import org.springframework.batch.core.domain.Job;
-import org.springframework.batch.core.repository.JobFactory;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
@@ -50,7 +50,7 @@ public class ClassPathXmlApplicationContextJobFactory implements JobFactory {
 	 * Create a {@link ClassPathXmlApplicationContext} from the path provided
 	 * and pull out a bean with the name given during initialization.
 	 * 
-	 * @see org.springframework.batch.core.repository.JobFactory#createJob()
+	 * @see org.springframework.batch.core.configuration.JobFactory#createJob()
 	 */
 	public Job createJob() {
 		ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(new String[] { path }, parent);
@@ -62,7 +62,7 @@ public class ClassPathXmlApplicationContextJobFactory implements JobFactory {
 	 * usually the name of the job as well, but it needn't be. The important
 	 * thing is that the job can be located by this name.
 	 * 
-	 * @see org.springframework.batch.core.repository.JobFactory#getJobName()
+	 * @see org.springframework.batch.core.configuration.JobFactory#getJobName()
 	 */
 	public String getJobName() {
 		return beanName;

spring-batch-samples/src/test/java/org/springframework/batch/sample/DefaultJobLoader.java

@@ -7,8 +7,8 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
+import org.springframework.batch.core.configuration.ListableJobRegistry;
 import org.springframework.batch.core.domain.Job;
-import org.springframework.batch.core.repository.ListableJobRegistry;
 import org.springframework.batch.core.repository.NoSuchJobException;
 import org.springframework.beans.BeanWrapperImpl;
 import org.springframework.beans.BeansException;

spring-batch-samples/src/test/java/org/springframework/batch/sample/TaskExecutorLauncher.java

@@ -15,9 +15,9 @@
  */
 package org.springframework.batch.sample;
 
+import org.springframework.batch.core.configuration.JobRegistry;
 import org.springframework.batch.core.domain.Job;
 import org.springframework.batch.core.repository.DuplicateJobException;
-import org.springframework.batch.core.repository.JobRegistry;
 import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.factory.xml.XmlBeanFactory;