diff --git a/cook-books/errorhandling/.classpath b/cook-books/errorhandling/.classpath
index 24166ba5..0ce7eaab 100644
--- a/cook-books/errorhandling/.classpath
+++ b/cook-books/errorhandling/.classpath
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
+	<classpathentry kind="src" path="src/main/resources"/>
+	<classpathentry kind="src" path="src/test/resources"/>
+	<classpathentry kind="src" path="src/test/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/cook-books/errorhandling/.gitignore b/cook-books/errorhandling/.gitignore
new file mode 100644
index 00000000..ea8c4bf7
--- /dev/null
+++ b/cook-books/errorhandling/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/cook-books/errorhandling/pom.xml b/cook-books/errorhandling/pom.xml
index 889b9c52..b0d0fb9b 100644
--- a/cook-books/errorhandling/pom.xml
+++ b/cook-books/errorhandling/pom.xml
@@ -2,38 +2,51 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.springframework.integration.samples</groupId>
-		<artifactId>spring-integration-samples</artifactId>
-		<version>2.0.0.BUILD-SNAPSHOT</version>
-	</parent>
+	<groupId>org.springframework.integration.samples</groupId>
 	<artifactId>errorhandling</artifactId>
 	<name>Spring Integration Error Handling Sample</name>
+	<version>2.0.0</version>
+	<properties>
+		<spring.integration.version>2.0.0.M7</spring.integration.version>
+		<log4j.version>1.2.15</log4j.version>
+		<junit.version>4.7</junit.version>
+	</properties>
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.integration</groupId>
 			<artifactId>spring-integration-core</artifactId>
+			<version>${spring.integration.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.integration</groupId>
 			<artifactId>spring-integration-stream</artifactId>
+			<version>${spring.integration.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+			<version>${log4j.version}</version>
+		</dependency>
+		<!-- test-scoped dependencies -->
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>${junit.version}</version>
 		</dependency>
 	</dependencies>
-	<repositories>
-		<repository>
-			<id>repository.springframework.maven.release</id>
-			<name>Spring Framework Maven Release Repository</name>
-			<url>http://maven.springframework.org/release</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.milestone</id>
-			<name>Spring Framework Maven Milestone Repository</name>
-			<url>http://maven.springframework.org/milestone</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.snapshot</id>
-			<name>Spring Framework Maven Snapshot Repository</name>
-			<url>http://maven.springframework.org/snapshot</url>
-		</repository>
-	</repositories>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>1.5</source>
+					<target>1.5</target>
+					<compilerArgument>-Xlint:all</compilerArgument>
+					<showWarnings>true</showWarnings>
+					<showDeprecation>false</showDeprecation>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 </project>
diff --git a/cook-books/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/PartyGuest.java b/cook-books/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/PartyGuest.java
index 54ab6aa0..c777b570 100644
--- a/cook-books/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/PartyGuest.java
+++ b/cook-books/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/PartyGuest.java
@@ -15,6 +15,7 @@
 
 package org.springframework.integration.samples.errorhandling;
 
+import org.apache.log4j.Logger;
 import org.springframework.integration.annotation.MessageEndpoint;
 
 /**
@@ -25,9 +26,10 @@ import org.springframework.integration.annotation.MessageEndpoint;
  */
 @MessageEndpoint
 public class PartyGuest {
-
+	private Logger logger = Logger.getLogger(PartyGuest.class);
+	
 	public void onInvitation(Invitation invitation) {
-		System.out.println("Guest is throwing exception");
+		logger.info("Guest is throwing exception");
 		throw new RuntimeException("Wrong address");
 	}
 
diff --git a/cook-books/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/PartyHost.java b/cook-books/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/PartyHost.java
index 2d18e8ef..624102a3 100644
--- a/cook-books/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/PartyHost.java
+++ b/cook-books/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/PartyHost.java
@@ -17,6 +17,7 @@ package org.springframework.integration.samples.errorhandling;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
+import org.apache.log4j.Logger;
 import org.springframework.integration.annotation.MessageEndpoint;
 
 /**
@@ -27,7 +28,7 @@ import org.springframework.integration.annotation.MessageEndpoint;
  */
 @MessageEndpoint
 public class PartyHost {
-
+	private Logger logger = Logger.getLogger(PartyHost.class);
 	private final AtomicInteger counter = new AtomicInteger(0);
 
 	public Invitation nextInvitation() {
@@ -35,7 +36,6 @@ public class PartyHost {
 	}
 
 	public void onInvitationFailed(Invitation inv) {
-		System.out.println("Host received failure notification for: " + inv);
+		logger.info("Host received failure notification for: " + inv);
 	}
-
 }
diff --git a/cook-books/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/errorHandlingDemo.xml b/cook-books/errorhandling/src/main/resources/META-INF/spring/integration/errorHandlingDemo.xml
similarity index 100%
rename from cook-books/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/errorHandlingDemo.xml
rename to cook-books/errorhandling/src/main/resources/META-INF/spring/integration/errorHandlingDemo.xml
diff --git a/cook-books/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/PartyDemo.java b/cook-books/errorhandling/src/test/java/org/springframework/integration/samples/errorhandling/PartyDemoTest.java
similarity index 76%
rename from cook-books/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/PartyDemo.java
rename to cook-books/errorhandling/src/test/java/org/springframework/integration/samples/errorhandling/PartyDemoTest.java
index 7f77fb4e..337b75b1 100644
--- a/cook-books/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/PartyDemo.java
+++ b/cook-books/errorhandling/src/test/java/org/springframework/integration/samples/errorhandling/PartyDemoTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2002-2010 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,8 +16,7 @@
 
 package org.springframework.integration.samples.errorhandling;
 
-import java.io.IOException;
-
+import org.junit.Test;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 /**
@@ -29,18 +28,10 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
  *
  * @author Iwein Fuld
  */
-public class PartyDemo {
-
-	public static void main(String[] args) {
-		new ClassPathXmlApplicationContext("errorHandlingDemo.xml", PartyDemo.class);
-		System.out.println("### Hit ENTER to stop ###");
-		try {
-			System.in.read();
-		}
-		catch (IOException e) {
- 			throw new RuntimeException(e);
-		}
-		System.exit(0);
+public class PartyDemoTest {
+	@Test
+	public void runPartyDemoTest() throws Exception{
+		new ClassPathXmlApplicationContext("/META-INF/spring/integration/errorHandlingDemo.xml", PartyDemoTest.class);
+		Thread.sleep(5000);
 	}
-
 }
diff --git a/cook-books/errorhandling/src/main/java/log4j.xml b/cook-books/errorhandling/src/test/resources/log4j.xml
similarity index 88%
rename from cook-books/errorhandling/src/main/java/log4j.xml
rename to cook-books/errorhandling/src/test/resources/log4j.xml
index a01d5446..678b69b3 100644
--- a/cook-books/errorhandling/src/main/java/log4j.xml
+++ b/cook-books/errorhandling/src/test/resources/log4j.xml
@@ -15,8 +15,8 @@
 		<level value="warn" />
 	</logger>
 
-	<logger name="org.springframework.integration">
-		<level value="warn" />
+	<logger name="org.springframework.integration.samples">
+		<level value="debug" />
 	</logger>
 
 	<!-- Root Logger -->
diff --git a/cook-books/errorhandling/target/classes/log4j.xml b/cook-books/errorhandling/target/classes/log4j.xml
deleted file mode 100644
index a01d5446..00000000
--- a/cook-books/errorhandling/target/classes/log4j.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-
-	<!-- Appenders -->
-	<appender name="console" class="org.apache.log4j.ConsoleAppender">
-		<param name="Target" value="System.out" />
-		<layout class="org.apache.log4j.PatternLayout">
-			<param name="ConversionPattern" value="%-5p: %c - %m%n" />
-		</layout>
-	</appender>
-
-	<!-- Loggers -->
-	<logger name="org.springframework">
-		<level value="warn" />
-	</logger>
-
-	<logger name="org.springframework.integration">
-		<level value="warn" />
-	</logger>
-
-	<!-- Root Logger -->
-	<root>
-		<priority value="warn" />
-		<appender-ref ref="console" />
-	</root>
-
-</log4j:configuration>
\ No newline at end of file
diff --git a/cook-books/errorhandling/target/classes/org/springframework/integration/samples/errorhandling/ErrorUnwrapper.class b/cook-books/errorhandling/target/classes/org/springframework/integration/samples/errorhandling/ErrorUnwrapper.class
deleted file mode 100644
index ce16e430..00000000
Binary files a/cook-books/errorhandling/target/classes/org/springframework/integration/samples/errorhandling/ErrorUnwrapper.class and /dev/null differ
diff --git a/cook-books/errorhandling/target/classes/org/springframework/integration/samples/errorhandling/Invitation.class b/cook-books/errorhandling/target/classes/org/springframework/integration/samples/errorhandling/Invitation.class
deleted file mode 100644
index 2ac32634..00000000
Binary files a/cook-books/errorhandling/target/classes/org/springframework/integration/samples/errorhandling/Invitation.class and /dev/null differ
diff --git a/cook-books/errorhandling/target/classes/org/springframework/integration/samples/errorhandling/PartyDemo.class b/cook-books/errorhandling/target/classes/org/springframework/integration/samples/errorhandling/PartyDemo.class
deleted file mode 100644
index 017278a3..00000000
Binary files a/cook-books/errorhandling/target/classes/org/springframework/integration/samples/errorhandling/PartyDemo.class and /dev/null differ
diff --git a/cook-books/errorhandling/target/classes/org/springframework/integration/samples/errorhandling/PartyGuest.class b/cook-books/errorhandling/target/classes/org/springframework/integration/samples/errorhandling/PartyGuest.class
deleted file mode 100644
index 4d4eb7b2..00000000
Binary files a/cook-books/errorhandling/target/classes/org/springframework/integration/samples/errorhandling/PartyGuest.class and /dev/null differ
diff --git a/cook-books/errorhandling/target/classes/org/springframework/integration/samples/errorhandling/PartyHost.class b/cook-books/errorhandling/target/classes/org/springframework/integration/samples/errorhandling/PartyHost.class
deleted file mode 100644
index 5ce69811..00000000
Binary files a/cook-books/errorhandling/target/classes/org/springframework/integration/samples/errorhandling/PartyHost.class and /dev/null differ
diff --git a/cook-books/errorhandling/target/classes/org/springframework/integration/samples/errorhandling/errorHandlingDemo.xml b/cook-books/errorhandling/target/classes/org/springframework/integration/samples/errorhandling/errorHandlingDemo.xml
deleted file mode 100644
index 7485ab44..00000000
--- a/cook-books/errorhandling/target/classes/org/springframework/integration/samples/errorhandling/errorHandlingDemo.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
-	xmlns:context="http://www.springframework.org/schema/context"
-	xmlns:stream="http://www.springframework.org/schema/integration/stream"
-	xsi:schemaLocation="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
-			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration.xsd
-			http://www.springframework.org/schema/integration/stream
-			http://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd">
-
-	<context:component-scan base-package="org.springframework.integration.samples.errorhandling" />
-
-	<poller default="true" fixed-delay="1000" max-messages-per-poll="1"/>
-
-	<inbound-channel-adapter ref="partyHost"
-		method="nextInvitation" channel="invitations" />
-
-	<channel id="invitations">
-		<queue capacity="100" />
-	</channel>
-
-	<chain input-channel="invitations">
-		<header-enricher>
-			<error-channel ref="failed-invitations" />
-		</header-enricher>
-		<service-activator ref="partyGuest" method="onInvitation" />
-	</chain>
-
-	<channel id="failed-invitations" />
-
-	<chain input-channel="failed-invitations">
-		<transformer ref="errorUnwrapper" />
-		<service-activator ref="partyHost" method="onInvitationFailed" />
-	</chain>
-
-	<!--
-		If you don't listen to the default error channel you risk losing track
-		of exceptions, as they cannot be passed back to the sender in band. It
-		is recommended to have a generic error handler in your configuration
-		to prevent this.
-	-->
-	<stream:stderr-channel-adapter channel="errorChannel" append-newline="true" />
-
-</beans:beans>
\ No newline at end of file
diff --git a/cook-books/errorhandling/target/errorhandling-2.0.0.BUILD-SNAPSHOT.jar b/cook-books/errorhandling/target/errorhandling-2.0.0.BUILD-SNAPSHOT.jar
deleted file mode 100644
index 2ae91940..00000000
Binary files a/cook-books/errorhandling/target/errorhandling-2.0.0.BUILD-SNAPSHOT.jar and /dev/null differ
diff --git a/cook-books/errorhandling/target/maven-archiver/pom.properties b/cook-books/errorhandling/target/maven-archiver/pom.properties
deleted file mode 100644
index 82b74938..00000000
--- a/cook-books/errorhandling/target/maven-archiver/pom.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Generated by Maven
-#Sat Sep 04 08:22:04 EDT 2010
-version=2.0.0.BUILD-SNAPSHOT
-groupId=org.springframework.integration.samples
-artifactId=errorhandling