diff --git a/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-2.2.xsd b/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-2.2.xsd
index f8d7763f55..7c9a16caa3 100644
--- a/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-2.2.xsd
+++ b/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-2.2.xsd
@@ -866,6 +866,16 @@ endpoint itself is a Polling Consumer for a channel with a queue.
 							]]></xsd:documentation>
 						</xsd:annotation>
 					</xsd:attribute>
+					<xsd:attribute name="order">
+						<xsd:annotation>
+							<xsd:documentation>
+	Specifies the order for invocation when this endpoint is connected as a
+	subscriber to a channel. This is particularly relevant when that channel
+	is using a "failover" dispatching strategy. It has no effect when this
+	endpoint itself is a Polling Consumer for a channel with a queue.
+							</xsd:documentation>
+						</xsd:annotation>
+					</xsd:attribute>
 				</xsd:extension>
 			</xsd:complexContent>
 		</xsd:complexType>
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/LoggingChannelAdapterParserTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/LoggingChannelAdapterParserTests-context.xml
index 08c29339de..f5c6804e81 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/LoggingChannelAdapterParserTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/LoggingChannelAdapterParserTests-context.xml
@@ -7,6 +7,12 @@
 			http://www.springframework.org/schema/integration
 			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
-	<logging-channel-adapter id="logger" logger-name="org.springframework.integration.test.logger"/>
+	<logging-channel-adapter id="logger"
+							 logger-name="org.springframework.integration.test.logger"
+							 order="1"
+							 level="WARN"
+							 log-full-message="true"/>
+
+	<logging-channel-adapter id="loggerWithExpression" expression="payload.foo"/>
 
 </beans:beans>
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/LoggingChannelAdapterParserTests-fail-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/LoggingChannelAdapterParserTests-fail-context.xml
new file mode 100644
index 0000000000..d286879767
--- /dev/null
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/LoggingChannelAdapterParserTests-fail-context.xml
@@ -0,0 +1,12 @@
+<?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"
+			 xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+			http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd">
+
+	<logging-channel-adapter id="logger"
+							 expression="payload.foo"
+							 log-full-message="false"/>
+
+</beans:beans>
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/LoggingChannelAdapterParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/LoggingChannelAdapterParserTests.java
index abbe3ba643..3ffc54f5b7 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/LoggingChannelAdapterParserTests.java
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/LoggingChannelAdapterParserTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2012 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.
@@ -17,11 +17,20 @@
 package org.springframework.integration.config.xml;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.parsing.BeanDefinitionParsingException;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+import org.springframework.core.Ordered;
+import org.springframework.expression.spel.SpelEvaluationException;
+import org.springframework.integration.endpoint.EventDrivenConsumer;
 import org.springframework.integration.handler.LoggingHandler;
 import org.springframework.integration.test.util.TestUtils;
 import org.springframework.test.context.ContextConfiguration;
@@ -29,19 +38,48 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 /**
  * @author Mark Fisher
+ * @author Artem Bilan
  * @since 2.1
  */
 @ContextConfiguration
 @RunWith(SpringJUnit4ClassRunner.class)
 public class LoggingChannelAdapterParserTests {
 
-	@Autowired
-	private LoggingHandler loggingHandler;
+	@Autowired @Qualifier("logger.adapter")
+	private EventDrivenConsumer loggerConsumer;
+
+	@Autowired @Qualifier("loggerWithExpression.adapter")
+	private EventDrivenConsumer loggerWithExpression;
 
 
 	@Test
-	public void verifyLoggerName() {
+	public void verifyConfig() {
+		LoggingHandler loggingHandler = TestUtils.getPropertyValue(loggerConsumer, "handler", LoggingHandler.class);
 		assertEquals("org.springframework.integration.test.logger", TestUtils.getPropertyValue(loggingHandler, "messageLogger.name"));
+		assertEquals(1, TestUtils.getPropertyValue(loggingHandler, "order"));
+		assertEquals("WARN", TestUtils.getPropertyValue(loggingHandler, "level").toString());
+		assertEquals("#root", TestUtils.getPropertyValue(loggingHandler, "expression.expression"));
+	}
+
+	@Test
+	public void verifyExpressionAndOtherDefaultConfig() {
+		LoggingHandler loggingHandler = TestUtils.getPropertyValue(loggerWithExpression, "handler", LoggingHandler.class);
+		assertEquals("org.springframework.integration.handler.LoggingHandler", TestUtils.getPropertyValue(loggingHandler, "messageLogger.name"));
+		assertEquals(Ordered.LOWEST_PRECEDENCE, TestUtils.getPropertyValue(loggingHandler, "order"));
+		assertEquals("INFO", TestUtils.getPropertyValue(loggingHandler, "level").toString());
+		assertEquals("payload.foo", TestUtils.getPropertyValue(loggingHandler, "expression.expression"));
+	}
+
+	@Test
+	public void failConfigLogFullMessageAndExpression() {
+		try {
+			new ClassPathXmlApplicationContext("LoggingChannelAdapterParserTests-fail-context.xml", this.getClass());
+			fail("BeanDefinitionParsingException expected");
+		}
+		catch (BeansException e) {
+			assertTrue(e instanceof BeanDefinitionParsingException);
+			assertTrue(e.getMessage().contains("The 'expression' and 'log-full-message' attributes are mutually exclusive."));
+		}
 	}
 
 }