From fa7b6e4525ea2782daf02c2505eee6576e1077cd Mon Sep 17 00:00:00 2001
From: robokaso <robokaso@2e8e966d-6415-0410-94b9-dc4e65435d03>
Date: Tue, 7 Oct 2008 09:18:55 +0000
Subject: [PATCH] RESOLVED - BATCH-864: rename SkipLimitStepFactoryBean

SkipLimit -> FaultTolerant
---
 ...epFactoryBean.java => FaultTolerantStepFactoryBean.java} | 2 +-
 .../batch/core/step/item/SimpleStepFactoryBean.java         | 2 +-
 ...a => FaultTolerantStepFactoryBeanNonBufferingTests.java} | 4 ++--
 ...sts.java => FaultTolerantStepFactoryBeanRetryTests.java} | 4 ++--
 ...eanTests.java => FaultTolerantStepFactoryBeanTests.java} | 6 +++---
 .../src/main/resources/jobs/retrySample.xml                 | 2 +-
 .../springframework/batch/sample/config/common-context.xml  | 2 +-
 spring-batch-samples/src/site/apt/index.apt                 | 2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)
 rename spring-batch-core/src/main/java/org/springframework/batch/core/step/item/{SkipLimitStepFactoryBean.java => FaultTolerantStepFactoryBean.java} (96%)
 rename spring-batch-core/src/test/java/org/springframework/batch/core/step/item/{SkipLimitStepFactoryBeanNonBufferingTests.java => FaultTolerantStepFactoryBeanNonBufferingTests.java} (95%)
 rename spring-batch-core/src/test/java/org/springframework/batch/core/step/item/{StatefulRetryStepFactoryBeanTests.java => FaultTolerantStepFactoryBeanRetryTests.java} (99%)
 rename spring-batch-core/src/test/java/org/springframework/batch/core/step/item/{SkipLimitStepFactoryBeanTests.java => FaultTolerantStepFactoryBeanTests.java} (96%)

diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SkipLimitStepFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBean.java
similarity index 96%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SkipLimitStepFactoryBean.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBean.java
index d654575c3..3ec060b45 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SkipLimitStepFactoryBean.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBean.java
@@ -44,7 +44,7 @@ import org.springframework.batch.support.Classifier;
  * @author Robert Kasanicky
  * 
  */
-public class SkipLimitStepFactoryBean<T, S> extends SimpleStepFactoryBean<T, S> {
+public class FaultTolerantStepFactoryBean<T, S> extends SimpleStepFactoryBean<T, S> {
 
 	private int skipLimit = 0;
 
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleStepFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleStepFactoryBean.java
index 9e20b8fbf..5b92551d6 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleStepFactoryBean.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleStepFactoryBean.java
@@ -49,7 +49,7 @@ import org.springframework.util.Assert;
  * This factory does not support configuration of fault-tolerant behavior, use
  * appropriate subclass of this factory bean to configure skip or retry.
  * 
- * @see SkipLimitStepFactoryBean
+ * @see FaultTolerantStepFactoryBean
  * 
  * @author Dave Syer
  * 
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SkipLimitStepFactoryBeanNonBufferingTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBeanNonBufferingTests.java
similarity index 95%
rename from spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SkipLimitStepFactoryBeanNonBufferingTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBeanNonBufferingTests.java
index 6916ec913..bd586a9e1 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SkipLimitStepFactoryBeanNonBufferingTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBeanNonBufferingTests.java
@@ -31,11 +31,11 @@ import org.springframework.batch.support.transaction.TransactionAwareProxyFactor
 import org.springframework.transaction.interceptor.DefaultTransactionAttribute;
 import org.springframework.util.StringUtils;
 
-public class SkipLimitStepFactoryBeanNonBufferingTests {
+public class FaultTolerantStepFactoryBeanNonBufferingTests {
 
 	protected final Log logger = LogFactory.getLog(getClass());
 
-	private SkipLimitStepFactoryBean<String, String> factory = new SkipLimitStepFactoryBean<String, String>();
+	private FaultTolerantStepFactoryBean<String, String> factory = new FaultTolerantStepFactoryBean<String, String>();
 
 	@SuppressWarnings("unchecked")
 	private Collection<Class<? extends Throwable>> skippableExceptions = new HashSet<Class<? extends Throwable>>(Arrays
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/StatefulRetryStepFactoryBeanTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBeanRetryTests.java
similarity index 99%
rename from spring-batch-core/src/test/java/org/springframework/batch/core/step/item/StatefulRetryStepFactoryBeanTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBeanRetryTests.java
index ccde21c20..083b5a369 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/StatefulRetryStepFactoryBeanTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBeanRetryTests.java
@@ -57,11 +57,11 @@ import org.springframework.util.StringUtils;
  * @author Dave Syer
  * 
  */
-public class StatefulRetryStepFactoryBeanTests {
+public class FaultTolerantStepFactoryBeanRetryTests {
 
 	protected final Log logger = LogFactory.getLog(getClass());
 
-	private SkipLimitStepFactoryBean<String, String> factory = new SkipLimitStepFactoryBean<String, String>();
+	private FaultTolerantStepFactoryBean<String, String> factory = new FaultTolerantStepFactoryBean<String, String>();
 
 	private List<Object> recovered = new ArrayList<Object>();
 
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SkipLimitStepFactoryBeanTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBeanTests.java
similarity index 96%
rename from spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SkipLimitStepFactoryBeanTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBeanTests.java
index d202821b2..d9cc252e7 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SkipLimitStepFactoryBeanTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBeanTests.java
@@ -37,13 +37,13 @@ import org.springframework.transaction.interceptor.DefaultTransactionAttribute;
 import org.springframework.util.StringUtils;
 
 /**
- * Tests for {@link SkipLimitStepFactoryBean}.
+ * Tests for {@link FaultTolerantStepFactoryBean}.
  */
-public class SkipLimitStepFactoryBeanTests {
+public class FaultTolerantStepFactoryBeanTests {
 
 	protected final Log logger = LogFactory.getLog(getClass());
 
-	private SkipLimitStepFactoryBean<String, String> factory = new SkipLimitStepFactoryBean<String, String>();
+	private FaultTolerantStepFactoryBean<String, String> factory = new FaultTolerantStepFactoryBean<String, String>();
 
 	@SuppressWarnings("unchecked")
 	private Collection<Class<? extends Throwable>> skippableExceptions = new HashSet<Class<? extends Throwable>>(Arrays
diff --git a/spring-batch-samples/src/main/resources/jobs/retrySample.xml b/spring-batch-samples/src/main/resources/jobs/retrySample.xml
index a47f51388..fd823e6a2 100644
--- a/spring-batch-samples/src/main/resources/jobs/retrySample.xml
+++ b/spring-batch-samples/src/main/resources/jobs/retrySample.xml
@@ -10,7 +10,7 @@
 	<bean id="retrySample" parent="simpleJob">
 		<property name="steps">
 			<bean id="step1" parent="simpleStep"
-				class="org.springframework.batch.core.step.item.SkipLimitStepFactoryBean">
+				class="org.springframework.batch.core.step.item.FaultTolerantStepFactoryBean">
 				<property name="itemReader" ref="itemGenerator" />
 				<property name="itemWriter" ref="itemWriter" />
 				<property name="retryLimit" value="3" />
diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/config/common-context.xml b/spring-batch-samples/src/main/resources/org/springframework/batch/sample/config/common-context.xml
index 7d67fac65..366f8c8aa 100644
--- a/spring-batch-samples/src/main/resources/org/springframework/batch/sample/config/common-context.xml
+++ b/spring-batch-samples/src/main/resources/org/springframework/batch/sample/config/common-context.xml
@@ -26,7 +26,7 @@
 		<property name="commitInterval" value="1" />
 	</bean>
 	
-	<bean id="skipLimitStep" class="org.springframework.batch.core.step.item.SkipLimitStepFactoryBean"
+	<bean id="skipLimitStep" class="org.springframework.batch.core.step.item.FaultTolerantStepFactoryBean"
 		parent="simpleStep" abstract="true">
 		<property name="skipLimit" value="0" />
 	</bean>
diff --git a/spring-batch-samples/src/site/apt/index.apt b/spring-batch-samples/src/site/apt/index.apt
index 16b5608bb..8c7e9d27b 100644
--- a/spring-batch-samples/src/site/apt/index.apt
+++ b/spring-batch-samples/src/site/apt/index.apt
@@ -759,7 +759,7 @@ SELECT ID FROM BATCH_STAGING WHERE JOB_ID=? AND PROCESSED=? ORDER BY ID
 
 +---
 <bean id="step1" parent="simpleStep"
-    class="org.springframework.batch.core.step.item.SkipLimitStepFactoryBean">
+    class="org.springframework.batch.core.step.item.FaultTolerantStepFactoryBean">
     ...
     <property name="retryLimit" value="3" />
     <property name="retryableExceptionClasses" value="java.lang.Exception" />