From 57f409e0f16c35b1e415768cf930a01aaeeb30e3 Mon Sep 17 00:00:00 2001
From: Chris Schaefer <cschaefer@gopivotal.com>
Date: Wed, 7 May 2014 12:29:49 -0400
Subject: [PATCH] update copyright dates, fix test method typo, xml cleanup,
 add varg - for BATCH-2227

---
 .../support/AbstractApplicationContextFactory.java  |  4 ++--
 .../GenericApplicationContextFactoryTests.java      |  5 ++---
 .../core/configuration/support/abstract-context.xml | 13 +++++--------
 .../support/child-context-with-abstract-job.xml     | 12 ++++--------
 4 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/AbstractApplicationContextFactory.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/AbstractApplicationContextFactory.java
index b74c8cf9f..f89c25d6b 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/AbstractApplicationContextFactory.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/AbstractApplicationContextFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2007 the original author or authors.
+ * Copyright 2006-2014 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.
@@ -64,7 +64,7 @@ public abstract class AbstractApplicationContextFactory implements ApplicationCo
 	 * Create a factory instance with the resource specified. The resource is a Spring configuration file or java
 	 * package containing configuration files.
 	 */
-	public AbstractApplicationContextFactory(Object[] resources) {
+	public AbstractApplicationContextFactory(Object... resources) {
 
 		this.resources = resources;
 		beanFactoryPostProcessorClasses = new ArrayList<Class<? extends BeanFactoryPostProcessor>>();
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/GenericApplicationContextFactoryTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/GenericApplicationContextFactoryTests.java
index 9abf524b4..398ea4858 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/GenericApplicationContextFactoryTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/GenericApplicationContextFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2007 the original author or authors.
+ * Copyright 2006-2014 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.
@@ -138,7 +138,7 @@ public class GenericApplicationContextFactoryTests {
 	}
 
 	@Test
-	public void testEqualsMultileConfigs() throws Exception {
+	public void testEqualsMultipleConfigs() throws Exception {
 		Resource resource1 = new ClassPathResource(ClassUtils.addResourcePathToPackagePath(getClass(),
 				"abstract-context.xml"));
 		Resource resource2 = new ClassPathResource(ClassUtils.addResourcePathToPackagePath(getClass(),
@@ -178,5 +178,4 @@ public class GenericApplicationContextFactoryTests {
 			this.values = values;
 		}
 	}
-
 }
diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/support/abstract-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/support/abstract-context.xml
index 2f79e8208..598146c05 100644
--- a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/support/abstract-context.xml
+++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/support/abstract-context.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:aop="http://www.springframework.org/schema/aop"
-	xmlns:tx="http://www.springframework.org/schema/tx" xmlns:p="http://www.springframework.org/schema/p" 
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:context="http://www.springframework.org/schema/context"
 	xsi:schemaLocation="
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
-		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd
-		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.1.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd">
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
 
 	<context:annotation-config />
 
@@ -36,5 +34,4 @@
 			</map>
 		</property>
 	</bean>
-
 </beans>
diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/support/child-context-with-abstract-job.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/support/child-context-with-abstract-job.xml
index 292c87aef..b4f77cffc 100644
--- a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/support/child-context-with-abstract-job.xml
+++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/support/child-context-with-abstract-job.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:aop="http://www.springframework.org/schema/aop"
-	xmlns:tx="http://www.springframework.org/schema/tx" xmlns:p="http://www.springframework.org/schema/p" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
-		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd
-		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.1.xsd">
-
-	<bean id="concrete-job" parent="abstract-job">
-	</bean>
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
+	<bean id="concrete-job" parent="abstract-job"/>
 </beans>