BATCH-1588: fix listener parsers

spring-batch-core/.settings/com.springsource.sts.config.flow.prefs

@@ -1,4 +1,5 @@
-#Thu Jun 24 11:17:24 BST 2010
+#Mon Jun 28 17:47:16 BST 2010
+//com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/batch\:/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/JobExecutionListenerMethodAttributeParserTests-context.xml=<?xml version\="1.0" encoding\="UTF-8"?>\n<graph>\n<element type\="job">\n<structure end\="995" endstart\="989" start\="511" startend\="586"/>\n<bounds height\="118" width\="77" x\="15" y\="17"/>\n</element>\n</graph>
 //com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/batch\:/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/JobRepositoryDefaultParserTests-context.xml=<?xml version\="1.0" encoding\="UTF-8"?>\n<graph/>
 //com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/batch\:/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepWithPojoListenerJobParserTests-context.xml=<?xml version\="1.0" encoding\="UTF-8"?>\n<graph>\n<element type\="job">\n<structure end\="769" endstart\="763" start\="510" startend\="524"/>\n<bounds height\="118" width\="79" x\="15" y\="17"/>\n</element>\n</graph>
 eclipse.preferences.version=1

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

@@ -108,7 +108,7 @@ public abstract class AbstractListenerParser {
 	private List<String> getMethodNameAttributes() {
 		List<String> methodNameAttributes = new ArrayList<String>();
 		for (ListenerMetaData metaData : getMetaDataValues()) {
-			methodNameAttributes.add(metaData.getMethodName());
+			methodNameAttributes.add(metaData.getPropertyName());
 		}
 		return methodNameAttributes;
 	}

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

@@ -0,0 +1,67 @@
+/*
+ * Copyright 2002-2008 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 static junit.framework.Assert.assertTrue;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.batch.core.Job;
+import org.springframework.batch.core.JobExecution;
+import org.springframework.batch.core.JobParametersBuilder;
+import org.springframework.batch.core.repository.JobRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+/**
+ * @author Lucas Ward
+ *
+ */
+@ContextConfiguration
+@RunWith(SpringJUnit4ClassRunner.class)
+public class JobExecutionListenerMethodAttributeParserTests {
+
+	public static boolean beforeCalled = false;
+	public static boolean afterCalled = false;
+	
+	@Autowired
+	Job job;
+	
+	@Autowired
+	JobRepository jobRepository;
+	
+	@Test
+	public void testListeners() throws Exception{
+		JobExecution jobExecution = jobRepository.createJobExecution("testJob", new JobParametersBuilder().addLong("now", 
+				System.currentTimeMillis()).toJobParameters());
+		job.execute(jobExecution);
+		assertTrue(beforeCalled);
+		assertTrue(afterCalled);
+	}
+	
+	public static class TestComponent{
+		
+		public void before(JobExecution jobExecution){
+			beforeCalled = true;
+		}
+		
+		public void after(){
+			afterCalled = true;
+		}
+	}
+	
+}

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

@@ -11,6 +11,11 @@ public class TestListener extends AbstractTestComponent implements StepExecution
 		return null;
 	}
 
+	public ExitStatus destroy(StepExecution stepExecution) {
+		executed = true;
+		return stepExecution.getExitStatus();
+	}
+
 	public void beforeStep(StepExecution stepExecution) {
 		executed = true;
 	}

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

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans:beans xmlns="http://www.springframework.org/schema/batch" xmlns:beans="http://www.springframework.org/schema/beans"
+	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">
+
+	<beans:import resource="common-context.xml" />
+	
+	<job id="job" incrementer="testIncrementer" job-repository="jobRepository">
+		<description>A job that executes step1</description>
+		<step id="s1" parent="step1">
+			<description>A step that does some stuff</description>
+		</step>
+		<listeners>
+			<listener after-job-method="after" before-job-method="before">
+				<beans:bean class="org.springframework.batch.core.configuration.xml.JobExecutionListenerMethodAttributeParserTests$TestComponent"/>
+			</listener>
+		</listeners>
+	</job>
+
+	<beans:bean id="testIncrementer" class="org.springframework.batch.core.configuration.xml.TestIncrementer" />
+	
+</beans:beans>