diff --git a/spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/Counter.java b/spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/Counter.java
index 07882aa1b4..736989d8fa 100644
--- a/spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/Counter.java
+++ b/spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/Counter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2010 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/spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/CronOddEvenDemo.java b/spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/CronOddEvenDemo.java
index ea9c404440..5dfc387d9d 100644
--- a/spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/CronOddEvenDemo.java
+++ b/spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/CronOddEvenDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2010 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/spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/EvenLogger.java b/spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/EvenLogger.java
index b7494eb847..7f3f1e551f 100644
--- a/spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/EvenLogger.java
+++ b/spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/EvenLogger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2010 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/spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/IntervalOddEvenDemo.java b/spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/IntervalOddEvenDemo.java
index c941d8fed1..fcf3107347 100644
--- a/spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/IntervalOddEvenDemo.java
+++ b/spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/IntervalOddEvenDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2010 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/spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/OddLogger.java b/spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/OddLogger.java
index 88f44a1829..2e2dbb0cdc 100644
--- a/spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/OddLogger.java
+++ b/spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/OddLogger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2010 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/spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/ParityResolver.java b/spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/ParityResolver.java
deleted file mode 100644
index 4f0d214cda..0000000000
--- a/spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/ParityResolver.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2002-2009 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.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.integration.samples.oddeven;
-
-/**
- * A POJO Content Based Router.
- * 
- * @author Mark Fisher
- */
-public class ParityResolver {
-
-	public String getParity(int i) {
-		return (i % 2 == 0) ? "even" : "odd";
-	}
-
-}
diff --git a/spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/PositiveChecker.java b/spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/PositiveChecker.java
deleted file mode 100644
index fdffa43b0a..0000000000
--- a/spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/PositiveChecker.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2002-2009 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.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.integration.samples.oddeven;
-
-/**
- * A POJO Message Filter.
- * 
- * @author Mark Fisher
- */
-public class PositiveChecker {
-
-	public boolean isPositive(int i) {
-		return i > 0;
-	}
-
-}
diff --git a/spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/cronOddEvenDemo.xml b/spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/cronOddEvenDemo.xml
index 3d65379288..394bc6658e 100644
--- a/spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/cronOddEvenDemo.xml
+++ b/spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/cronOddEvenDemo.xml
@@ -19,21 +19,17 @@
 	</inbound-channel-adapter>
 
 	<filter input-channel="numbers" output-channel="positives"
-			ref="positiveChecker" method="isPositive"
+			expression="payload > 0"
 			discard-channel="nullChannel"/>
 
-	<router ref="parityResolver" method="getParity" input-channel="positives"/>
+	<router input-channel="positives" expression="payload % 2 == 0 ? 'even' : 'odd'"/>
 
-	<service-activator ref="oddLogger" input-channel="odd"/>
+	<service-activator input-channel="odd" ref="oddLogger"/>
 
-	<service-activator ref="evenLogger" input-channel="even"/>
+	<service-activator input-channel="even" ref="evenLogger"/>
 
 	<beans:bean id="counter" class="org.springframework.integration.samples.oddeven.Counter"/>
 
-	<beans:bean id="positiveChecker" class="org.springframework.integration.samples.oddeven.PositiveChecker"/>
-
-	<beans:bean id="parityResolver" class="org.springframework.integration.samples.oddeven.ParityResolver"/>
-
 	<beans:bean id="oddLogger" class="org.springframework.integration.samples.oddeven.OddLogger"/>
 
 	<beans:bean id="evenLogger" class="org.springframework.integration.samples.oddeven.EvenLogger"/>
diff --git a/spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/intervalOddEvenDemo.xml b/spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/intervalOddEvenDemo.xml
index f285ffacc8..a47e188445 100644
--- a/spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/intervalOddEvenDemo.xml
+++ b/spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/intervalOddEvenDemo.xml
@@ -19,21 +19,17 @@
 	</inbound-channel-adapter>
 
 	<filter input-channel="numbers" output-channel="positives"
-			ref="positiveChecker" method="isPositive"
+			expression="payload > 0"
 			discard-channel="nullChannel"/>
 
-	<router ref="parityResolver" method="getParity" input-channel="positives"/>
+	<router input-channel="positives" expression="payload % 2 == 0 ? 'even' : 'odd'"/>
 
-	<service-activator ref="oddLogger" input-channel="odd"/>
+	<service-activator input-channel="odd" ref="oddLogger"/>
 
-	<service-activator ref="evenLogger" input-channel="even"/>
+	<service-activator input-channel="even" ref="evenLogger"/>
 
 	<beans:bean id="counter" class="org.springframework.integration.samples.oddeven.Counter"/>
 
-	<beans:bean id="positiveChecker" class="org.springframework.integration.samples.oddeven.PositiveChecker"/>
-
-	<beans:bean id="parityResolver" class="org.springframework.integration.samples.oddeven.ParityResolver"/>
-
 	<beans:bean id="oddLogger" class="org.springframework.integration.samples.oddeven.OddLogger"/>
 
 	<beans:bean id="evenLogger" class="org.springframework.integration.samples.oddeven.EvenLogger"/>