BATCH-1573: Created a test case for fully qualified namespace usage, and added a check to the parser for the namespace, which would then be stripped before checking the end state.

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

@@ -15,15 +15,6 @@
  */
 package org.springframework.batch.core.configuration.xml;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
 import org.springframework.batch.core.job.flow.FlowExecutionStatus;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.parsing.CompositeComponentDefinition;
@@ -37,6 +28,8 @@ import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
+import java.util.*;
+
 /**
  * @author Dave Syer
  * 
@@ -391,6 +384,7 @@ public abstract class AbstractFlowParser extends AbstractSingleBeanDefinitionPar
 	 * @return the BatchStatus corresponding to the transition name
 	 */
 	private static FlowExecutionStatus getBatchStatusFromEndTransitionName(String elementName) {
+        elementName = stripNamespace(elementName);
 		if (STOP_ELE.equals(elementName)) {
 			return FlowExecutionStatus.STOPPED;
 		}
@@ -405,6 +399,18 @@ public abstract class AbstractFlowParser extends AbstractSingleBeanDefinitionPar
 		}
 	}
 
+    /**
+     * Strip the namespace from the element name if it exists.
+     */
+    private static String stripNamespace(String elementName){
+        if(elementName.startsWith("batch:")){
+            return elementName.substring(6);
+        }
+        else{
+            return elementName;
+        }
+    }
+
 	/**
 	 * @param parserContext the parser context
 	 * @param stateDefinition a reference to the state implementation

spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/NamespacePrefixedJobParserTests.java

@@ -0,0 +1,75 @@
+/*
+ * Copyright 2006-2007 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.batch.core.configuration.xml;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.batch.core.*;
+import org.springframework.batch.core.repository.JobRepository;
+import org.springframework.batch.core.repository.support.MapJobRepositoryFactoryBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+
+/**
+ * @author Dave Syer
+ *
+ */
+@ContextConfiguration
+@RunWith(SpringJUnit4ClassRunner.class)
+public class NamespacePrefixedJobParserTests {
+
+	@Autowired
+	@Qualifier("job1")
+	private Job job1;
+
+	@Autowired
+	private JobRepository jobRepository;
+
+	@Autowired
+	private MapJobRepositoryFactoryBean mapJobRepositoryFactoryBean;
+
+	@Before
+	public void setUp() {
+		mapJobRepositoryFactoryBean.clear();
+	}
+
+	@Test
+	public void testNoopJob() throws Exception {
+		assertNotNull(job1);
+		JobExecution jobExecution = jobRepository.createJobExecution(job1.getName(), new JobParameters());
+		job1.execute(jobExecution);
+		assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus());
+	}
+
+	private List<String> getStepNames(JobExecution jobExecution) {
+		List<String> list = new ArrayList<String>();
+		for (StepExecution stepExecution : jobExecution.getStepExecutions()) {
+			list.add(stepExecution.getStepName());
+		}
+		return list;
+	}
+
+}

spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/NoopTasklet.java

@@ -0,0 +1,16 @@
+package org.springframework.batch.core.configuration.xml;
+
+import org.springframework.batch.core.ExitStatus;
+import org.springframework.batch.core.StepContribution;
+import org.springframework.batch.core.scope.context.ChunkContext;
+import org.springframework.batch.repeat.RepeatStatus;
+
+public class NoopTasklet extends NameStoringTasklet {
+
+    @Override
+    public RepeatStatus execute(StepContribution contribution, ChunkContext chunkContext) throws Exception {
+        super.execute(contribution, chunkContext);
+        contribution.setExitStatus(ExitStatus.NOOP);        
+        return RepeatStatus.FINISHED;
+    }
+}

spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/NamespacePrefixedJobParserTests-context.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+    xmlns:batch="http://www.springframework.org/schema/batch"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch-2.1.xsd
+	http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+
+	<import resource="common-context.xml" />
+
+	<batch:job id="job1">
+		<batch:step id="noopStep" parent="noopStep1">
+            <batch:next on="COMPLETED" to="step4" />
+            <batch:end on="NOOP" />
+            <batch:fail on="*" />
+        </batch:step>
+        <batch:step id="step4" parent="step45" />
+	</batch:job>
+
+    <batch:step id="noopStep1">
+        <batch:tasklet ref="noopTasklet" />
+    </batch:step>
+    
+    <!--<beans:bean id="noopStep1" class="org.springframework.batch.core.step.tasklet.TaskletStep">-->
+		<!--<beans:property name="jobRepository" ref="jobRepository"/>-->
+		<!--<beans:property name="transactionManager" ref="transactionManager"/>-->
+		<!--<beans:property name="tasklet" ref="noopTasklet"/>-->
+	<!--</beans:bean>-->
+
+    <bean id="noopTasklet" class="org.springframework.batch.core.configuration.xml.NoopTasklet" />
+
+    <bean id="step45" class="org.springframework.batch.core.step.tasklet.TaskletStep">
+		<property name="jobRepository" ref="jobRepository"/>
+		<property name="transactionManager" ref="transactionManager"/>
+		<property name="tasklet" ref="nameStoringTasklet"/>
+	</bean>
+
+	<bean id="nameStoringTasklet" class="org.springframework.batch.core.configuration.xml.NameStoringTasklet">
+		<property name="stepNamesList" ref="stepNamesList"/>
+	</bean>
+
+</beans>