diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/DefaultPropertEditorRegistrarTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/DefaultPropertEditorRegistrarTests.java
index 299ec8050..5a29f3872 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/DefaultPropertEditorRegistrarTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/DefaultPropertEditorRegistrarTests.java
@@ -70,7 +70,6 @@ public class DefaultPropertEditorRegistrarTests {
 		mapper.setCustomEditors(Collections.singletonMap(new Object(), new CustomNumberEditor(Long.class, true)));
 	}
 
-	@SuppressWarnings("unused")
 	private static class BeanWithIntArray {
 		private int[] numbers;
 
diff --git a/spring-batch-parent/.project b/spring-batch-parent/.project
index b6ed93e3d..0eb6fdb1c 100644
--- a/spring-batch-parent/.project
+++ b/spring-batch-parent/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -19,5 +24,6 @@
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.maven.ide.eclipse.maven2Nature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
 	</natures>
 </projectDescription>
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/loopFlow/GeneratingTradeResettingListener.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/loop/GeneratingTradeResettingListener.java
similarity index 96%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/loopFlow/GeneratingTradeResettingListener.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/loop/GeneratingTradeResettingListener.java
index 58f605026..741b8a257 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/loopFlow/GeneratingTradeResettingListener.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/loop/GeneratingTradeResettingListener.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.sample.loopFlow;
+package org.springframework.batch.sample.loop;
 
 import org.springframework.batch.core.ExitStatus;
 import org.springframework.batch.core.StepExecution;
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/loopFlow/LimitDecider.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/loop/LimitDecider.java
similarity index 96%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/loopFlow/LimitDecider.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/loop/LimitDecider.java
index c50b28b04..7a4e7c29a 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/loopFlow/LimitDecider.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/loop/LimitDecider.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.sample.loopFlow;
+package org.springframework.batch.sample.loop;
 
 import org.springframework.batch.core.JobExecution;
 import org.springframework.batch.core.StepExecution;
diff --git a/spring-batch-samples/src/main/resources/jobs/loopFlowSample.xml b/spring-batch-samples/src/main/resources/jobs/loopFlowSample.xml
index 8062f844e..f953ea0cc 100644
--- a/spring-batch-samples/src/main/resources/jobs/loopFlowSample.xml
+++ b/spring-batch-samples/src/main/resources/jobs/loopFlowSample.xml
@@ -33,11 +33,11 @@
 
 	<bean id="itemWriter" class="org.springframework.batch.sample.domain.trade.internal.ItemTrackingTradeItemWriter" />
 	
-	<bean id="limitDecider" class="org.springframework.batch.sample.loopFlow.LimitDecider">
+	<bean id="limitDecider" class="org.springframework.batch.sample.loop.LimitDecider">
 		<property name="limit" value="9" />
 	</bean>
 	
-	<bean id="resettingListener" class="org.springframework.batch.sample.loopFlow.GeneratingTradeResettingListener">
+	<bean id="resettingListener" class="org.springframework.batch.sample.loop.GeneratingTradeResettingListener">
 		<property name="reader" ref="itemGenerator" />
 	</bean>
 
diff --git a/spring-batch-test/.classpath b/spring-batch-test/.classpath
index 2daddec39..438f0fe3b 100755
--- a/spring-batch-test/.classpath
+++ b/spring-batch-test/.classpath
@@ -4,7 +4,7 @@
 	<classpathentry kind="src" output="target/classes" path="src/main/resources"/>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>