diff --git a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/filecopy/BinaryFileCopyDemo.java b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/filecopy/BinaryFileCopyDemo.java
index 008c2b985c..47a851927b 100644
--- a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/filecopy/BinaryFileCopyDemo.java
+++ b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/filecopy/BinaryFileCopyDemo.java
@@ -27,9 +27,7 @@ public class BinaryFileCopyDemo {
 
 	public static void main(String[] args) {
 		FileCopyDemoCommon.setupDirectories();
-		ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("fileCopyDemo-binary.xml",
-				BinaryFileCopyDemo.class);
+		new ClassPathXmlApplicationContext("fileCopyDemo-binary.xml", BinaryFileCopyDemo.class);
 	}
-	
-}
 
+}
diff --git a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/filecopy/FileBasedFileCopyDemo.java b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/filecopy/FileBasedFileCopyDemo.java
index 0fd79413a1..8004c3e5b4 100644
--- a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/filecopy/FileBasedFileCopyDemo.java
+++ b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/filecopy/FileBasedFileCopyDemo.java
@@ -27,9 +27,7 @@ public class FileBasedFileCopyDemo {
 
 	public static void main(String[] args) {
 		FileCopyDemoCommon.setupDirectories();
-		ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("fileCopyDemo-file.xml",
-				FileBasedFileCopyDemo.class);
+		new ClassPathXmlApplicationContext("fileCopyDemo-file.xml", FileBasedFileCopyDemo.class);
 	}
-	
-}
 
+}
diff --git a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/filecopy/TextFileCopyDemo.java b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/filecopy/TextFileCopyDemo.java
index fe673a1ea7..490fcb2dda 100644
--- a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/filecopy/TextFileCopyDemo.java
+++ b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/filecopy/TextFileCopyDemo.java
@@ -28,8 +28,7 @@ public class TextFileCopyDemo {
 
 	public static void main(String[] args) {
 		FileCopyDemoCommon.setupDirectories();
-		ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("fileCopyDemo-text.xml",
-				TextFileCopyDemo.class);
+		new ClassPathXmlApplicationContext("fileCopyDemo-text.xml", TextFileCopyDemo.class);
 	}
 	
 }
diff --git a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/helloworld/HelloService.java b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/helloworld/HelloService.java
index 445fa7b55c..b09b1c6fbd 100644
--- a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/helloworld/HelloService.java
+++ b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/helloworld/HelloService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/helloworld/HelloWorldDemo.java b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/helloworld/HelloWorldDemo.java
index 5b85bb4115..0da4d349c5 100644
--- a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/helloworld/HelloWorldDemo.java
+++ b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/helloworld/HelloWorldDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/oddeven/OddEvenDemo.java b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/oddeven/OddEvenDemo.java
index bb59e8bbba..ed2bbcd691 100644
--- a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/oddeven/OddEvenDemo.java
+++ b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/oddeven/OddEvenDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
@@ -16,7 +16,6 @@
 
 package org.springframework.integration.samples.oddeven;
 
-import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 /**
@@ -25,7 +24,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
 public class OddEvenDemo {
 
 	public static void main(String[] args) {
-		AbstractApplicationContext context = new ClassPathXmlApplicationContext("oddEvenDemo.xml", OddEvenDemo.class);
+		new ClassPathXmlApplicationContext("oddEvenDemo.xml", OddEvenDemo.class);
 	}
 
 }
diff --git a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/oddeven/oddEvenDemo.xml b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/oddeven/oddEvenDemo.xml
index afc81b6334..57bfd7472f 100644
--- a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/oddeven/oddEvenDemo.xml
+++ b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/oddeven/oddEvenDemo.xml
@@ -12,7 +12,7 @@
 
 	<context:component-scan base-package="org.springframework.integration.samples.oddeven"/>
 
-	<message-bus auto-startup="false"/>
+	<message-bus/>
 
 	<channel id="numbers"/>
 	<channel id="even"/>
diff --git a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/quote/Quote.java b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/quote/Quote.java
index f655f02cf6..d8c051c5f2 100644
--- a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/quote/Quote.java
+++ b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/quote/Quote.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/quote/QuoteDemo.java b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/quote/QuoteDemo.java
index f823df0e7c..edb84d626d 100644
--- a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/quote/QuoteDemo.java
+++ b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/quote/QuoteDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
@@ -16,7 +16,6 @@
 
 package org.springframework.integration.samples.quote;
 
-import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 /**
@@ -25,6 +24,6 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
 public class QuoteDemo {
 
 	public static void main(String[] args) {
-		AbstractApplicationContext context = new ClassPathXmlApplicationContext("quoteDemo.xml", QuoteDemo.class);
+		new ClassPathXmlApplicationContext("quoteDemo.xml", QuoteDemo.class);
 	}
 }