[BATCH-63] Refactoring to accomodate the new <config/> element

Author: nebhale

spring-batch-execution/.springBeans

@@ -16,27 +16,27 @@
 		<config>src/test/resources/beanRefContext.xml</config>
 		<config>src/test/resources/org/springframework/batch/execution/bootstrap/support/job.xml</config>
 		<config>src/test/resources/org/springframework/batch/execution/bootstrap/support/test-environment.xml</config>
-		<config>src/test/resources/org/springframework/batch/execution/configuration/BatchNamespaceHandlerJobRepositoryDb2.xml</config>
-		<config>src/test/resources/org/springframework/batch/execution/configuration/BatchNamespaceHandlerJobRepositoryDerby.xml</config>
-		<config>src/test/resources/org/springframework/batch/execution/configuration/BatchNamespaceHandlerJobRepositoryHsql.xml</config>
-		<config>src/test/resources/org/springframework/batch/execution/configuration/BatchNamespaceHandlerJobRepositoryMissingDataSource.xml</config>
-		<config>src/test/resources/org/springframework/batch/execution/configuration/BatchNamespaceHandlerJobRepositoryMySql.xml</config>
-		<config>src/test/resources/org/springframework/batch/execution/configuration/BatchNamespaceHandlerJobRepositoryOk.xml</config>
-		<config>src/test/resources/org/springframework/batch/execution/configuration/BatchNamespaceHandlerJobRepositoryOracle.xml</config>
-		<config>src/test/resources/org/springframework/batch/execution/configuration/BatchNamespaceHandlerJobRepositoryPostgres.xml</config>
-		<config>src/test/resources/org/springframework/batch/execution/configuration/BatchNamespaceHandlerTaskletStepMissingTasklet.xml</config>
-		<config>src/test/resources/org/springframework/batch/execution/configuration/BatchNamespaceHandlerTaskletStepOk.xml</config>
-		<config>src/test/resources/org/springframework/batch/execution/configuration/BatchNamespaceHandlerTaskletStepRerunAlways.xml</config>
-		<config>src/test/resources/org/springframework/batch/execution/configuration/BatchNamespaceHandlerTaskletStepRerunIncomplete.xml</config>
-		<config>src/test/resources/org/springframework/batch/execution/configuration/BatchNamespaceHandlerTaskletStepRerunNever.xml</config>
-		<config>src/test/resources/org/springframework/batch/execution/configuration/BatchNamespaceHandlerStepOk.xml</config>
-		<config>src/test/resources/org/springframework/batch/execution/configuration/BatchNamespaceHandlerStepMissingItemReader.xml</config>
-		<config>src/test/resources/org/springframework/batch/execution/configuration/BatchNamespaceHandlerStepMissingItemWriter.xml</config>
-		<config>src/test/resources/org/springframework/batch/execution/configuration/BatchNamespaceHandlerStepMissingTransactionManager.xml</config>
-		<config>src/test/resources/org/springframework/batch/execution/configuration/BatchNamespaceHandlerStepRerunAlways.xml</config>
-		<config>src/test/resources/org/springframework/batch/execution/configuration/BatchNamespaceHandlerStepRerunIncomplete.xml</config>
-		<config>src/test/resources/org/springframework/batch/execution/configuration/BatchNamespaceHandlerStepRerunNever.xml</config>
-		<config>src/test/resources/org/springframework/batch/execution/configuration/BatchNamespaceHandlerStepSpecificTransactionManager.xml</config>
+		<config>src/test/resources/org/springframework/batch/execution/configuration/JobRepoDb2.xml</config>
+		<config>src/test/resources/org/springframework/batch/execution/configuration/JobRepoDerby.xml</config>
+		<config>src/test/resources/org/springframework/batch/execution/configuration/JobRepoHsql.xml</config>
+		<config>src/test/resources/org/springframework/batch/execution/configuration/JobRepoMissingDataSource.xml</config>
+		<config>src/test/resources/org/springframework/batch/execution/configuration/JobRepoMySql.xml</config>
+		<config>src/test/resources/org/springframework/batch/execution/configuration/JobRepoOk.xml</config>
+		<config>src/test/resources/org/springframework/batch/execution/configuration/JobRepoOracle.xml</config>
+		<config>src/test/resources/org/springframework/batch/execution/configuration/JobRepoPostgres.xml</config>
+		<config>src/test/resources/org/springframework/batch/execution/configuration/StepMissingItemReader.xml</config>
+		<config>src/test/resources/org/springframework/batch/execution/configuration/StepMissingItemWriter.xml</config>
+		<config>src/test/resources/org/springframework/batch/execution/configuration/StepMissingTransactionManager.xml</config>
+		<config>src/test/resources/org/springframework/batch/execution/configuration/StepOk.xml</config>
+		<config>src/test/resources/org/springframework/batch/execution/configuration/StepRerunAlways.xml</config>
+		<config>src/test/resources/org/springframework/batch/execution/configuration/StepRerunIncomplete.xml</config>
+		<config>src/test/resources/org/springframework/batch/execution/configuration/StepRerunNever.xml</config>
+		<config>src/test/resources/org/springframework/batch/execution/configuration/StepSpecificTransactionManager.xml</config>
+		<config>src/test/resources/org/springframework/batch/execution/configuration/TaskletStepMissingTasklet.xml</config>
+		<config>src/test/resources/org/springframework/batch/execution/configuration/TaskletStepOk.xml</config>
+		<config>src/test/resources/org/springframework/batch/execution/configuration/TaskletStepRerunAlways.xml</config>
+		<config>src/test/resources/org/springframework/batch/execution/configuration/TaskletStepRerunIncomplete.xml</config>
+		<config>src/test/resources/org/springframework/batch/execution/configuration/TaskletStepRerunNever.xml</config>
 	</configs>
 	<configSets>
 		<configSet>

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

@@ -20,25 +20,18 @@
 import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
 
 /**
- * <code>NamespaceHandler</code> for the <code>batch-execution</code> namespace.
+ * <code>NamespaceHandler</code> for the <code>batch</code> namespace.
  * 
  * <p>
- * Provides a {@link BeanDefinitionParser} for the <code>&lt;batch:job&gt;</code> tag. A <code>job</code> tag can
- * include nested <code>chunked-step</code> and <code>tasklet-step</code> tags.
- * 
- * <p>
- * Provides a {@link BeanDefinitionParser} for the <code>&lt;batch:job-repository&gt;</code> tag.
+ * Provides a {@link BeanDefinitionParser} for the <code>&lt;batch:config&gt;</code> tag. A <code>config</code> tag
+ * must include nested <code>job-repository</code> and <code>job</code> tags.
  * 
  * @author Ben Hale
  */
 public class BatchNamespaceHandler extends NamespaceHandlerSupport {
 
-	/**
-	 * Register the {@link BeanDefinitionParser BeanDefinitionParser} for the '<code>job</code>', tag.
-	 */
 	public void init() {
-		registerBeanDefinitionParser("job", new JobBeanDefinitionParser());
-		registerBeanDefinitionParser("job-repository", new JobRepositoryBeanDefinitionParser());
+		registerBeanDefinitionParser("config", new ConfigBeanDefinitionParser());
 	}
 
 }