diff --git a/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-3.0.xsd b/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-3.0.xsd
index f07cf095f8..794e061d23 100644
--- a/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-3.0.xsd
+++ b/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-3.0.xsd
@@ -366,14 +366,6 @@
 				</xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="auto-startup" type="xsd:string">
-			<xsd:annotation>
-				<xsd:documentation>
-	Flag to indicate whether this Message Channel should start automatically.
-	This only applies to a message-driven channel. Default is true.
-				</xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
 		<xsd:attributeGroup ref="containerAndTemplateAttributes"/>
 		<xsd:attributeGroup ref="integration:subscribersAttributeGroup" />
 	</xsd:complexType>
@@ -566,13 +558,6 @@ standard headers to also be mapped.
 				</xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="auto-startup" type="xsd:string">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-	Boolean value indicating whether this endpoint should start automatically.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
 	</xsd:complexType>
 
 	<xsd:attributeGroup name="containerAttributes">
@@ -722,15 +707,6 @@ standard headers to also be mapped.
 				</xsd:appinfo>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="phase" type="xsd:string">
-			<xsd:annotation>
-				<xsd:appinfo>
-					<xsd:documentation>
-	The lifeycle phase determining the start/stop order of the underlying listener container.
-					</xsd:documentation>
-				</xsd:appinfo>
-			</xsd:annotation>
-		</xsd:attribute>
 		<xsd:attribute name="prefetch-count" type="xsd:string">
 			<xsd:annotation>
 				<xsd:appinfo>
@@ -815,6 +791,7 @@ standard headers to also be mapped.
 				</xsd:appinfo>
 			</xsd:annotation>
 		</xsd:attribute>
+		<xsd:attributeGroup ref="integration:smartLifeCycleAttributeGroup"/>
 	</xsd:attributeGroup>
 
 </xsd:schema>
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractChannelAdapterParser.java b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractChannelAdapterParser.java
index 163579330c..dd54c51aac 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractChannelAdapterParser.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractChannelAdapterParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -18,8 +18,10 @@ package org.springframework.integration.config.xml;
 
 import org.w3c.dom.Element;
 
+import org.springframework.beans.MutablePropertyValues;
 import org.springframework.beans.factory.BeanDefinitionStoreException;
 import org.springframework.beans.factory.config.BeanDefinitionHolder;
+import org.springframework.beans.factory.config.TypedStringValue;
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.BeanDefinitionReaderUtils;
@@ -30,7 +32,7 @@ import org.springframework.util.StringUtils;
 
 /**
  * Base parser for Channel Adapters.
- *
+ * <p/>
  * Includes logic to determine {@link org.springframework.integration.MessageChannel}:
  * if 'channel' attribute is defined - uses its value as 'channelName';
  * if 'id' attribute is defined - creates {@link DirectChannel} at runtime and uses id's value as 'channelName';
@@ -63,7 +65,17 @@ public abstract class AbstractChannelAdapterParser extends AbstractBeanDefinitio
 		if (!StringUtils.hasText(channelName)) {
 			channelName = this.createDirectChannel(element, parserContext);
 		}
-		return doParse(element, parserContext, channelName);
+		AbstractBeanDefinition beanDefinition = doParse(element, parserContext, channelName);
+		MutablePropertyValues propertyValues = beanDefinition.getPropertyValues();
+		String autoStartup = element.getAttribute(IntegrationNamespaceUtils.AUTO_STARTUP);
+		if (StringUtils.hasText(autoStartup)) {
+			propertyValues.add("autoStartup", new TypedStringValue(autoStartup));
+		}
+		String phase = element.getAttribute(IntegrationNamespaceUtils.PHASE);
+		if (StringUtils.hasText(phase)) {
+			propertyValues.add("phase", new TypedStringValue(phase));
+		}
+		return beanDefinition;
 	}
 
 	private String createDirectChannel(Element element, ParserContext parserContext) {
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractConsumerEndpointParser.java b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractConsumerEndpointParser.java
index 805a90bb24..7c3a8c414b 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractConsumerEndpointParser.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractConsumerEndpointParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -19,6 +19,8 @@ package org.springframework.integration.config.xml;
 import java.util.Collection;
 import java.util.List;
 
+import org.w3c.dom.Element;
+
 import org.springframework.beans.factory.BeanDefinitionStoreException;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.ConstructorArgumentValues;
@@ -34,7 +36,6 @@ import org.springframework.integration.config.ConsumerEndpointFactoryBean;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.util.xml.DomUtils;
-import org.w3c.dom.Element;
 
 /**
  * Base class parser for elements that create Message Endpoints.
@@ -96,7 +97,8 @@ public abstract class AbstractConsumerEndpointParser extends AbstractBeanDefinit
 						+ elementDescription + ".", element);
 			}
 			return handlerBeanDefinition;
-		} else {
+		}
+		else {
 			if (!hasInputChannelAttribute) {
 				String elementDescription = IntegrationNamespaceUtils.createElementDescription(element);
 				parserContext.getReaderContext().error("The '" + inputChannelAttributeName
@@ -115,18 +117,18 @@ public abstract class AbstractConsumerEndpointParser extends AbstractBeanDefinit
 
 		String inputChannelName = element.getAttribute(inputChannelAttributeName);
 
-		if (!parserContext.getRegistry().containsBeanDefinition(inputChannelName)){
-			if (parserContext.getRegistry().containsBeanDefinition(ChannelInitializer.AUTO_CREATE_CHANNEL_CANDIDATES_BEAN_NAME)){
+		if (!parserContext.getRegistry().containsBeanDefinition(inputChannelName)) {
+			if (parserContext.getRegistry().containsBeanDefinition(ChannelInitializer.AUTO_CREATE_CHANNEL_CANDIDATES_BEAN_NAME)) {
 				BeanDefinition channelRegistry = parserContext.getRegistry().
 						getBeanDefinition(ChannelInitializer.AUTO_CREATE_CHANNEL_CANDIDATES_BEAN_NAME);
 				ConstructorArgumentValues caValues = channelRegistry.getConstructorArgumentValues();
 				ValueHolder vh = caValues.getArgumentValue(0, Collection.class);
-				if (vh == null){ //although it should never happen if it does we can fix it
+				if (vh == null) { //although it should never happen if it does we can fix it
 					caValues.addIndexedArgumentValue(0, new ManagedSet<String>());
 				}
 
 				@SuppressWarnings("unchecked")
-				Collection<String>  channelCandidateNames = (Collection<String>) caValues.getArgumentValue(0, Collection.class).getValue();
+				Collection<String> channelCandidateNames = (Collection<String>) caValues.getArgumentValue(0, Collection.class).getValue();
 				channelCandidateNames.add(inputChannelName);
 			}
 			else {
@@ -144,7 +146,8 @@ public abstract class AbstractConsumerEndpointParser extends AbstractBeanDefinit
 			}
 			IntegrationNamespaceUtils.configurePollerMetadata(pollerElementList.get(0), builder, parserContext);
 		}
-		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "auto-startup");
+		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, IntegrationNamespaceUtils.AUTO_STARTUP);
+		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, IntegrationNamespaceUtils.PHASE);
 		AbstractBeanDefinition beanDefinition = builder.getBeanDefinition();
 		String beanName = this.resolveId(element, beanDefinition, parserContext);
 		parserContext.registerBeanComponent(new BeanComponentDefinition(beanDefinition, beanName));
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractOutboundChannelAdapterParser.java b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractOutboundChannelAdapterParser.java
index 5f16c3738a..614bbf922c 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractOutboundChannelAdapterParser.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractOutboundChannelAdapterParser.java
@@ -71,8 +71,6 @@ public abstract class AbstractOutboundChannelAdapterParser extends AbstractChann
 			IntegrationNamespaceUtils.configurePollerMetadata(pollerElement, builder, parserContext);
 		}
 		builder.addPropertyValue("inputChannelName", channelName);
-		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "auto-startup");
-		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "phase");
 
 		this.configureRequestHandlerAdviceChain(element, parserContext, handlerBeanComponentDefinition.getBeanDefinition(), builder);
 
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractPollingInboundChannelAdapterParser.java b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractPollingInboundChannelAdapterParser.java
index 6e6002a55b..7a672c9297 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractPollingInboundChannelAdapterParser.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractPollingInboundChannelAdapterParser.java
@@ -49,8 +49,6 @@ public abstract class AbstractPollingInboundChannelAdapterParser extends Abstrac
 		if (pollerElement != null) {
 			IntegrationNamespaceUtils.configurePollerMetadata(pollerElement, adapterBuilder, parserContext);
 		}
-		IntegrationNamespaceUtils.setValueIfAttributeDefined(adapterBuilder, element, "auto-startup");
-		IntegrationNamespaceUtils.setValueIfAttributeDefined(adapterBuilder, element, "phase");
 		return adapterBuilder.getBeanDefinition();
 	}
 
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/ChainParser.java b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/ChainParser.java
index 63788d145e..b179a94db4 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/ChainParser.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/ChainParser.java
@@ -99,8 +99,6 @@ public class ChainParser extends AbstractConsumerEndpointParser {
 		}
 		builder.addPropertyValue("handlers", handlerList);
 		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "send-timeout");
-		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "auto-startup");
-		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "phase");
 		return builder;
 	}
 
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/IntegrationNamespaceUtils.java b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/IntegrationNamespaceUtils.java
index 160e2a3564..4d98b70048 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/IntegrationNamespaceUtils.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/IntegrationNamespaceUtils.java
@@ -65,6 +65,8 @@ public abstract class IntegrationNamespaceUtils {
 	static final String EXPRESSION_ATTRIBUTE = "expression";
 	public static final String HANDLER_ALIAS_SUFFIX = ".handler";
 	public static final String REQUEST_HANDLER_ADVICE_CHAIN = "request-handler-advice-chain";
+	public static final String AUTO_STARTUP = "auto-startup";
+	public static final String PHASE = "phase";
 
 	/**
 	 * Property name on ChannelInitializer used to configure the default max subscribers for
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/MessageHandlerChain.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/MessageHandlerChain.java
index e52c4d393b..3d891ceb2b 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/handler/MessageHandlerChain.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/MessageHandlerChain.java
@@ -22,7 +22,7 @@ import java.util.concurrent.locks.ReentrantLock;
 
 import org.springframework.beans.DirectFieldAccessor;
 import org.springframework.beans.factory.BeanFactory;
-import org.springframework.context.SmartLifecycle;
+import org.springframework.context.Lifecycle;
 import org.springframework.integration.Message;
 import org.springframework.integration.MessageChannel;
 import org.springframework.integration.MessageHandlingException;
@@ -66,7 +66,7 @@ import org.springframework.util.Assert;
  * @author Gary Russell
  * @author Artem Bilan
  */
-public class MessageHandlerChain extends AbstractMessageHandler implements MessageProducer, SmartLifecycle {
+public class MessageHandlerChain extends AbstractMessageHandler implements MessageProducer, Lifecycle {
 
 	private volatile List<MessageHandler> handlers;
 
@@ -85,10 +85,6 @@ public class MessageHandlerChain extends AbstractMessageHandler implements Messa
 
 	private final Object initializationMonitor = new Object();
 
-	private volatile boolean autoStartup = true;
-
-	private volatile int phase = Integer.MAX_VALUE;
-
 	private volatile boolean running;
 
 	private final ReentrantLock lifecycleLock = new ReentrantLock();
@@ -176,14 +172,6 @@ public class MessageHandlerChain extends AbstractMessageHandler implements Messa
 	 * SmartLifecycle implementation (delegates to the {@link #handlers})
 	 */
 
-	public final boolean isAutoStartup() {
-		return this.autoStartup;
-	}
-
-	public final int getPhase() {
-		return this.phase;
-	}
-
 	public final boolean isRunning() {
 		this.lifecycleLock.lock();
 		try {
@@ -237,26 +225,18 @@ public class MessageHandlerChain extends AbstractMessageHandler implements Messa
 		}
 	}
 
-	public void setAutoStartup(boolean autoStartup) {
-		this.autoStartup = autoStartup;
-	}
-
-	public void setPhase(int phase) {
-		this.phase = phase;
-	}
-
 	private void doStop() {
 		for (MessageHandler handler : this.handlers) {
-			if (handler instanceof SmartLifecycle) {
-				((SmartLifecycle) handler).stop();
+			if (handler instanceof Lifecycle) {
+				((Lifecycle) handler).stop();
 			}
 		}
 	}
 
 	private void doStart() {
 		for (MessageHandler handler : this.handlers) {
-			if (handler instanceof SmartLifecycle) {
-				((SmartLifecycle) handler).start();
+			if (handler instanceof Lifecycle) {
+				((Lifecycle) handler).start();
 			}
 		}
 	}
diff --git a/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-3.0.xsd b/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-3.0.xsd
index 7ea44de1ea..8d8eb42dca 100644
--- a/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-3.0.xsd
+++ b/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-3.0.xsd
@@ -877,13 +877,6 @@
 					</xsd:appinfo>
 				</xsd:annotation>
 			</xsd:attribute>
-			<xsd:attribute name="auto-startup" type="xsd:string">
-				<xsd:annotation>
-					<xsd:documentation>
-						Lifecycle attribute signaling if this component should be started during Application Context startup.
-					</xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
 			<xsd:attribute name="pattern" type="xsd:string">
 				<xsd:annotation>
 					<xsd:documentation>
@@ -907,6 +900,7 @@
 					</xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
+			<xsd:attributeGroup ref="smartLifeCycleAttributeGroup"/>
 		</xsd:complexType>
 	</xsd:element>
 
@@ -1041,23 +1035,7 @@
 				</xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="auto-startup" type="xsd:string" default="true">
-			<xsd:annotation>
-				<xsd:documentation>
-					Lifecycle attribute signaling if this component should be started during Application Context startup.
-				</xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="phase" type="xsd:string">
-			<xsd:annotation>
-				<xsd:appinfo>
-					<xsd:documentation>
-						The Lifecycle attribute determining the start/stop order
-						of the underlying MessageHandlerChain.
-					</xsd:documentation>
-				</xsd:appinfo>
-			</xsd:annotation>
-		</xsd:attribute>
+		<xsd:attributeGroup ref="smartLifeCycleAttributeGroup"/>
 	</xsd:attributeGroup>
 
 	<xsd:complexType name="methodInvokingChannelAdapterType">
@@ -1552,16 +1530,6 @@
 				<xsd:group ref="chain-elements-group" maxOccurs="unbounded"/>
 			</xsd:choice>
 			<xsd:attributeGroup ref="inputOutputChannelGroup" />
-			<xsd:attribute name="phase" type="xsd:string">
-				<xsd:annotation>
-					<xsd:appinfo>
-						<xsd:documentation>
-							The Lifecycle attribute determining the start/stop order
-							of the underlying MessageHandlerChain.
-						</xsd:documentation>
-					</xsd:appinfo>
-				</xsd:annotation>
-			</xsd:attribute>
 			<xsd:attribute name="id" type="xsd:string" />
 		</xsd:complexType>
 	</xsd:element>
@@ -3066,17 +3034,6 @@
     -->
 
     <xsd:attributeGroup name="topLevelRouterAttributeGroup">
-        <xsd:attribute name="auto-startup" default="true">
-            <xsd:annotation>
-                <xsd:documentation>
-                    Lifecycle attribute signaling if this component should be
-                    started during Application Context startup. Defaults to true.
-                </xsd:documentation>
-            </xsd:annotation>
-            <xsd:simpleType>
-                <xsd:union memberTypes="xsd:boolean xsd:string" />
-            </xsd:simpleType>
-        </xsd:attribute>
         <xsd:attribute name="input-channel" type="xsd:string">
             <xsd:annotation>
                 <xsd:appinfo>
@@ -3099,6 +3056,7 @@
                     ]]></xsd:documentation>
             </xsd:annotation>
         </xsd:attribute>
+		<xsd:attributeGroup ref="smartLifeCycleAttributeGroup"/>
     </xsd:attributeGroup>
 
     <!--
@@ -4025,17 +3983,7 @@ endpoint itself is a Polling Consumer for a channel with a queue.
 					]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-        <xsd:attribute name="auto-startup" default="true">
-            <xsd:annotation>
-                <xsd:documentation>
-                    Lifecycle attribute signaling if this component should be
-                    started during Application Context startup. Defaults to true.
-                </xsd:documentation>
-            </xsd:annotation>
-            <xsd:simpleType>
-                <xsd:union memberTypes="xsd:boolean xsd:string" />
-            </xsd:simpleType>
-        </xsd:attribute>
+        <xsd:attributeGroup ref="smartLifeCycleAttributeGroup"/>
 	</xsd:attributeGroup>
 
 	<xsd:attributeGroup name="subscribersAttributeGroup">
@@ -4117,4 +4065,24 @@ endpoint itself is a Polling Consumer for a channel with a queue.
 			</xsd:annotation>
 		</xsd:attribute>
 	</xsd:attributeGroup>
+
+	<xsd:attributeGroup name="smartLifeCycleAttributeGroup">
+		<xsd:attribute name="auto-startup" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Boolean value indicating whether this endpoint should start automatically.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="phase" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The lifecycle phase within which this endpoint should start and stop.
+The lower the value the earlier this endpoint will start and the later it will stop. The
+default is 0. Values can be negative. See SmartLifeCycle.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+	</xsd:attributeGroup>
+
 </xsd:schema>
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/ChainParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/ChainParserTests.java
index f5a3dae46c..d07774fd09 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/ChainParserTests.java
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/ChainParserTests.java
@@ -53,6 +53,7 @@ import org.springframework.integration.MessageChannel;
 import org.springframework.integration.MessageRejectedException;
 import org.springframework.integration.core.MessageHandler;
 import org.springframework.integration.core.PollableChannel;
+import org.springframework.integration.endpoint.AbstractEndpoint;
 import org.springframework.integration.gateway.GatewayProxyFactoryBean;
 import org.springframework.integration.handler.AbstractReplyProducingMessageHandler;
 import org.springframework.integration.handler.LoggingHandler;
@@ -335,9 +336,11 @@ public class ChainParserTests {
 	@Test //INT-2605
 	public void checkSmartLifecycleConfig() {
 		ApplicationContext ctx = new ClassPathXmlApplicationContext("ChainParserSmartLifecycleAttributesTest.xml", this.getClass());
-		MessageHandlerChain handlerChain = ctx.getBean(MessageHandlerChain.class);
-		assertEquals(false, handlerChain.isAutoStartup());
-		assertEquals(256, handlerChain.getPhase());
+		AbstractEndpoint chainEndpoint = ctx.getBean("chain", AbstractEndpoint.class);
+		assertEquals(false, chainEndpoint.isAutoStartup());
+		assertEquals(256, chainEndpoint.getPhase());
+
+		MessageHandlerChain handlerChain = ctx.getBean("chain.handler", MessageHandlerChain.class);
 		assertEquals(3000L, TestUtils.getPropertyValue(handlerChain, "sendTimeout"));
 		assertEquals(false, TestUtils.getPropertyValue(handlerChain, "running"));
 		//INT-3108
diff --git a/spring-integration-event/src/main/resources/.svnignore b/spring-integration-event/src/main/resources/.svnignore
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-3.0.xsd b/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-3.0.xsd
index 379a2ff2ef..f17b92c8d0 100644
--- a/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-3.0.xsd
+++ b/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-3.0.xsd
@@ -24,20 +24,7 @@
             </xsd:documentation>
 		</xsd:annotation>
 		<xsd:complexType>
-			<xsd:attribute name="id" type="xsd:string" use="optional" />
-			<xsd:attribute name="channel" type="xsd:string">
-				<xsd:annotation>
-					<xsd:appinfo>
-						<tool:annotation kind="ref">
-							<tool:expected-type
-								type="org.springframework.integration.MessageChannel" />
-						</tool:annotation>
-					</xsd:appinfo>
-					<xsd:documentation>
-						The channel to which Messages generated from Application Context events will be sent.
-					</xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
+			<xsd:attributeGroup ref="integration:channelAdapterAttributes"/>
 			<xsd:attribute name="error-channel" type="xsd:string">
 				<xsd:annotation>
 					<xsd:appinfo>
@@ -69,7 +56,6 @@
 					]]></xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
-			<xsd:attribute name="auto-startup" type="xsd:string" default="true" />
 		</xsd:complexType>
 	</xsd:element>
 
@@ -85,20 +71,7 @@
 				<xsd:element ref="integration:poller" minOccurs="0" maxOccurs="1" />
 				<xsd:element name="request-handler-advice-chain" type="integration:adviceChainType" minOccurs="0" maxOccurs="1" />
 			</xsd:choice>
-			<xsd:attribute name="id" type="xsd:string" />
-			<xsd:attribute name="channel" type="xsd:string">
-				<xsd:annotation>
-					<xsd:appinfo>
-						<tool:annotation kind="ref">
-							<tool:expected-type
-								type="org.springframework.integration.MessageChannel" />
-						</tool:annotation>
-						<xsd:documentation>
-							The Message Channel from which this adapter receives Messages.
-						</xsd:documentation>
-					</xsd:appinfo>
-				</xsd:annotation>
-			</xsd:attribute>
+			<xsd:attributeGroup ref="integration:channelAdapterAttributes"/>
 			<xsd:attribute name="order">
 				<xsd:annotation>
 					<xsd:documentation>
@@ -107,7 +80,6 @@
 					</xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
-			<xsd:attribute name="auto-startup" type="xsd:string" default="true" />
 		</xsd:complexType>
 	</xsd:element>
 
diff --git a/spring-integration-feed/src/main/resources/org/springframework/integration/feed/config/spring-integration-feed-3.0.xsd b/spring-integration-feed/src/main/resources/org/springframework/integration/feed/config/spring-integration-feed-3.0.xsd
index 957e819c2d..c3182eaf84 100644
--- a/spring-integration-feed/src/main/resources/org/springframework/integration/feed/config/spring-integration-feed-3.0.xsd
+++ b/spring-integration-feed/src/main/resources/org/springframework/integration/feed/config/spring-integration-feed-3.0.xsd
@@ -22,7 +22,7 @@
 			<xsd:sequence>
 				<xsd:element ref="integration:poller" minOccurs="0" maxOccurs="1" />
 			</xsd:sequence>
-			<xsd:attribute name="id" type="xsd:string" />
+			<xsd:attributeGroup ref="integration:channelAdapterAttributes"/>
 			<xsd:attribute name="url" type="xsd:string" use="required">
 				<xsd:annotation>
 					<xsd:documentation>
@@ -30,20 +30,6 @@
 					</xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
-			<xsd:attribute name="channel" type="xsd:string">
-				<xsd:annotation>
-					<xsd:appinfo>
-						<tool:annotation kind="ref">
-							<tool:expected-type type="org.springframework.integration.MessageChannel" />
-						</tool:annotation>
-					</xsd:appinfo>
-					<xsd:documentation>
-						Identifies channel attached to this adapter. Depending on the type of the adapter
-						this channel could be the receiving channel (e.g., outbound-channel-adapter) or channel where
-						messages will be sent to by this adapter (e.g., inbound-channel-adapter).
-					</xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
 			<xsd:attribute name="feed-fetcher" use="optional" type="xsd:string">
 				<xsd:annotation>
 					<xsd:documentation>
@@ -73,15 +59,7 @@
 					</xsd:appinfo>
 				</xsd:annotation>
 			</xsd:attribute>
-			<xsd:attribute name="auto-startup" type="xsd:string" default="true">
-				<xsd:annotation>
-					<xsd:documentation>
-					Lifecycle attribute signaling if this component should be started during Application Context startup.
-					Default is 'true'
-					</xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
 		</xsd:complexType>
 	</xsd:element>
 
-</xsd:schema>
\ No newline at end of file
+</xsd:schema>
diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/config/FileTailInboundChannelAdapterParser.java b/spring-integration-file/src/main/java/org/springframework/integration/file/config/FileTailInboundChannelAdapterParser.java
index 1c9571b562..ca0913eab0 100644
--- a/spring-integration-file/src/main/java/org/springframework/integration/file/config/FileTailInboundChannelAdapterParser.java
+++ b/spring-integration-file/src/main/java/org/springframework/integration/file/config/FileTailInboundChannelAdapterParser.java
@@ -46,8 +46,6 @@ public class FileTailInboundChannelAdapterParser extends AbstractChannelAdapterP
 		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "file-delay");
 		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "end");
 		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "reopen");
-		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "auto-startup");
-		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "phase");
 
 		return builder.getBeanDefinition();
 	}
diff --git a/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-3.0.xsd b/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-3.0.xsd
index c74b77fbc9..455db6f8f2 100644
--- a/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-3.0.xsd
+++ b/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-3.0.xsd
@@ -44,32 +44,7 @@
 					</xsd:sequence>
 				</xsd:choice>
             </xsd:sequence>
-            <xsd:attribute name="id" type="xsd:string">
-                <xsd:annotation>
-                    <xsd:documentation><![CDATA[Identifies the underlying Spring bean definition (SourcePollingChannelAdapter)
-
-                        Keep in mind that if no "channel" attribute is defined, then the "id" attribute is required.
-                        In that case the "id" attribute's value will be used as the channel name and ".adapter" will be
-                        appended to the "id" value of the underlying bean definition.
-                        ]]></xsd:documentation>
-                </xsd:annotation>
-            </xsd:attribute>
-            <xsd:attribute name="channel" type="xsd:string">
-                <xsd:annotation>
-                    <xsd:documentation><![CDATA[Defines the message channel to which the payload shall be forwarded to.
-
-                        Keep in mind that any Channel Adapter can be created without a "channel" reference in which case
-                        it will implicitly create an instance of DirectChannel. The created channel's name will match
-                        the "id" attribute of the <inbound-channel-adapter/> element. Therefore, if the "channel" attribute
-                        is not provided, then the "id" attribute is required.
-                        ]]></xsd:documentation>
-                    <xsd:appinfo>
-                        <tool:annotation kind="ref">
-                            <tool:expected-type type="org.springframework.integration.MessageChannel"/>
-                        </tool:annotation>
-                    </xsd:appinfo>
-                </xsd:annotation>
-            </xsd:attribute>
+           <xsd:attributeGroup ref="integration:channelAdapterAttributes"/>
             <xsd:attribute name="directory" type="xsd:string" use="required">
                 <xsd:annotation>
                     <xsd:documentation><![CDATA[Specifies the input directory (The directory to poll from) e.g.:
@@ -139,13 +114,6 @@ Only files matching this regular expression will be picked up by this adapter.
 					]]></xsd:documentation>
                 </xsd:annotation>
             </xsd:attribute>
-            <xsd:attribute name="auto-startup" type="xsd:string" default="true">
-                <xsd:annotation>
-				    <xsd:documentation>
-				        Lifecycle attribute signaling if this component should be started during Application Context startup.
-				    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:attribute>
             <xsd:attribute name="auto-create-directory" type="xsd:string" default="true">
                 <xsd:annotation>
                     <xsd:documentation>
@@ -200,32 +168,7 @@ Only files matching this regular expression will be picked up by this adapter.
             </xsd:documentation>
         </xsd:annotation>
         <xsd:complexType>
-            <xsd:attribute name="id" type="xsd:string">
-                <xsd:annotation>
-                    <xsd:documentation><![CDATA[Identifies the underlying Spring bean definition (xxxFileTailingMessageProducer)
-
-                        If no "channel" attribute is defined, then the "id" attribute is required.
-                        In that case the "id" attribute's value will be used as the channel name and ".adapter" will be
-                        appended to the "id" value of the underlying bean definition.
-                        ]]></xsd:documentation>
-                </xsd:annotation>
-            </xsd:attribute>
-            <xsd:attribute name="channel" type="xsd:string">
-                <xsd:annotation>
-                    <xsd:documentation><![CDATA[Defines the message channel to which the payload shall be forwarded to.
-
-                        Any Channel Adapter can be created without a "channel" reference in which case
-                        it will implicitly create an instance of DirectChannel. The created channel's name will match
-                        the "id" attribute of the <inbound-channel-adapter/> element. Therefore, if the "channel" attribute
-                        is not provided, then the "id" attribute is required.
-                        ]]></xsd:documentation>
-                    <xsd:appinfo>
-                        <tool:annotation kind="ref">
-                            <tool:expected-type type="org.springframework.integration.MessageChannel"/>
-                        </tool:annotation>
-                    </xsd:appinfo>
-                </xsd:annotation>
-            </xsd:attribute>
+			<xsd:attributeGroup ref="integration:channelAdapterAttributes"/>
             <xsd:attribute name="native-options" type="xsd:string">
                 <xsd:annotation>
                     <xsd:documentation>
@@ -320,21 +263,6 @@ Only files matching this regular expression will be picked up by this adapter.
 					<xsd:union memberTypes="xsd:boolean xsd:string"/>
 				</xsd:simpleType>
             </xsd:attribute>
-            <xsd:attribute name="auto-startup" type="xsd:string" default="true">
-                <xsd:annotation>
-				    <xsd:documentation>
-				        Lifecycle attribute signaling if this component should be started during Application Context startup.
-				    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:attribute>
-            <xsd:attribute name="phase" type="xsd:string">
-                <xsd:annotation>
-				    <xsd:documentation>
-				        Lifecycle attribute signaling the phase in which this component should be started during
-				        Application Context startup when 'auto-startup' is true.
-				    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:attribute>
         </xsd:complexType>
     </xsd:element>
 
@@ -538,13 +466,6 @@ Only files matching this regular expression will be picked up by this adapter.
                 </xsd:documentation>
             </xsd:annotation>
         </xsd:attribute>
-        <xsd:attribute name="auto-startup" type="xsd:string">
-            <xsd:annotation>
-                <xsd:documentation>
-                    <![CDATA[Lifecycle attribute signaling if this component should be started during Application Context startup.]]>
-                </xsd:documentation>
-            </xsd:annotation>
-        </xsd:attribute>
         <xsd:attribute name="charset" type="xsd:string">
             <xsd:annotation>
                 <xsd:documentation>
@@ -555,6 +476,7 @@ Only files matching this regular expression will be picked up by this adapter.
                 </xsd:documentation>
             </xsd:annotation>
         </xsd:attribute>
+		<xsd:attributeGroup ref="integration:smartLifeCycleAttributeGroup"/>
     </xsd:complexType>
 
     <xsd:element name="file-to-string-transformer">
diff --git a/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-3.0.xsd b/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-3.0.xsd
index d27674c478..48945cdabf 100644
--- a/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-3.0.xsd
+++ b/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-3.0.xsd
@@ -545,18 +545,7 @@
 				</xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="auto-startup" type="xsd:string"
-			default="true">
-			<xsd:annotation>
-				<xsd:documentation>
-					Lifecycle attribute signaling if this component
-					should be started during
-					Application Context startup.
-					Default is
-					'true'
-				</xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
+		<xsd:attributeGroup ref="integration:smartLifeCycleAttributeGroup"/>
 	</xsd:complexType>
 
 </xsd:schema>
diff --git a/spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-3.0.xsd b/spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-3.0.xsd
index 5e27f28590..a359514060 100644
--- a/spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-3.0.xsd
+++ b/spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-3.0.xsd
@@ -180,18 +180,7 @@
 	</xsd:element>
 
 	<xsd:complexType name="InboundChannelAdapterType">
-		<xsd:attribute name="id" type="xsd:string" use="optional" />
-		<xsd:attribute name="channel" type="xsd:string" use="optional">
-			<xsd:annotation>
-				<xsd:appinfo>
-					<tool:annotation kind="ref">
-						<tool:expected-type
-							type="org.springframework.integration.MessageChannel" />
-					</tool:annotation>
-				</xsd:appinfo>
-			</xsd:annotation>
-		</xsd:attribute>
-
+		<xsd:attributeGroup ref="integration:channelAdapterAttributes"/>
 		<xsd:attribute name="error-channel" type="xsd:string"
 			use="optional">
 			<xsd:annotation>
@@ -219,4 +208,4 @@
 		</xsd:attribute>
 
 	</xsd:complexType>
-</xsd:schema>
\ No newline at end of file
+</xsd:schema>
diff --git a/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-3.0.xsd b/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-3.0.xsd
index 6f2203a573..3a2e979c55 100644
--- a/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-3.0.xsd
+++ b/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-3.0.xsd
@@ -25,7 +25,7 @@
 			<xsd:sequence>
 				<xsd:element name="header" type="headerType" minOccurs="0" maxOccurs="unbounded" />
 			</xsd:sequence>
-			<xsd:attribute name="id" type="xsd:string" />
+			<xsd:attributeGroup ref="integration:channelAdapterAttributes"/>
 			<xsd:attribute name="name" type="xsd:string">
 				<xsd:annotation>
 					<xsd:documentation>
@@ -45,15 +45,6 @@
 					</xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
-			<xsd:attribute name="channel" type="xsd:string">
-				<xsd:annotation>
-					<xsd:appinfo>
-						<tool:annotation kind="ref">
-							<tool:expected-type type="org.springframework.integration.MessageChannel" />
-						</tool:annotation>
-					</xsd:appinfo>
-				</xsd:annotation>
-			</xsd:attribute>
 			<xsd:attribute name="request-payload-type" type="xsd:string">
 				<xsd:annotation>
 					<xsd:documentation>
@@ -371,7 +362,7 @@ The String "HTTP_REQUEST_HEADERS" will match against any of the standard HTTP Re
 				<xsd:element name="uri-variable" type="uriVariableType" minOccurs="0" maxOccurs="unbounded" />
 				<xsd:element name="request-handler-advice-chain" type="integration:adviceChainType" minOccurs="0" maxOccurs="1" />
 			</xsd:choice>
-			<xsd:attribute name="id" type="xsd:string" />
+			<xsd:attributeGroup ref="integration:channelAdapterAttributes"/>
 			<xsd:attribute name="url" type="xsd:string" use="optional">
 				<xsd:annotation>
 					<xsd:documentation>
@@ -418,15 +409,6 @@ The String "HTTP_REQUEST_HEADERS" will match against any of the standard HTTP Re
 					</xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
-			<xsd:attribute name="channel" type="xsd:string">
-				<xsd:annotation>
-					<xsd:appinfo>
-						<tool:annotation kind="ref">
-							<tool:expected-type type="org.springframework.integration.MessageChannel" />
-						</tool:annotation>
-					</xsd:appinfo>
-				</xsd:annotation>
-			</xsd:attribute>
 			<xsd:attribute name="rest-template" type="xsd:string">
 				<xsd:annotation>
 					<xsd:appinfo>
@@ -520,13 +502,6 @@ The String "HTTP_REQUEST_HEADERS" will match against any of the standard HTTP Re
 					]]></xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
-			<xsd:attribute name="auto-startup" type="xsd:string">
-				<xsd:annotation>
-					<xsd:documentation>
-						Specifies whether this adapter should start automatically.
-					</xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
 		</xsd:complexType>
 	</xsd:element>
 
@@ -700,7 +675,6 @@ The String "HTTP_REQUEST_HEADERS" will match against any of the standard HTTP Re
 							]]></xsd:documentation>
 						</xsd:annotation>
 					</xsd:attribute>
-					<xsd:attribute name="auto-startup" type="xsd:string" />
 					<xsd:attribute name="transfer-cookies" type="xsd:string" default="false">
 						<xsd:annotation>
 							<xsd:documentation><![CDATA[
@@ -813,6 +787,7 @@ The String "HTTP_REQUEST_HEADERS" will match against any of the standard HTTP Re
 				</xsd:appinfo>
 			</xsd:annotation>
 		</xsd:attribute>
+		<xsd:attributeGroup ref="integration:smartLifeCycleAttributeGroup"/>
 	</xsd:complexType>
 
 </xsd:schema>
diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/IpAdapterParserUtils.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/IpAdapterParserUtils.java
index e55cbc0a8d..21c475e840 100644
--- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/IpAdapterParserUtils.java
+++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/IpAdapterParserUtils.java
@@ -16,12 +16,13 @@
 
 package org.springframework.integration.ip.config;
 
+import org.w3c.dom.Element;
+
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.integration.config.xml.IntegrationNamespaceUtils;
 import org.springframework.util.StringUtils;
-import org.w3c.dom.Element;
 
 /**
  * Utility methods and constants for IP adapter parsers.
@@ -103,10 +104,6 @@ public abstract class IpAdapterParserUtils {
 
 	public static final String LOOKUP_HOST = "lookup-host";
 
-	public static final String AUTO_STARTUP = "auto-startup";
-
-	public static final String PHASE = "phase";
-
 	public static final String APPLY_SEQUENCE = "apply-sequence";
 
 	public static final String CLIENT_MODE = "client-mode";
diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/TcpConnectionEventInboundChannelAdapterParser.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/TcpConnectionEventInboundChannelAdapterParser.java
index 8fe115a732..6ed5c49cbb 100644
--- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/TcpConnectionEventInboundChannelAdapterParser.java
+++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/TcpConnectionEventInboundChannelAdapterParser.java
@@ -16,13 +16,14 @@
 
 package org.springframework.integration.ip.config;
 
+import org.w3c.dom.Element;
+
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.integration.config.xml.AbstractChannelAdapterParser;
 import org.springframework.integration.config.xml.IntegrationNamespaceUtils;
 import org.springframework.integration.ip.tcp.connection.TcpConnectionEventListeningMessageProducer;
-import org.w3c.dom.Element;
 
 /**
  * @author Gary Russell
@@ -37,8 +38,6 @@ public class TcpConnectionEventInboundChannelAdapterParser extends AbstractChann
 		adapterBuilder.addPropertyReference("outputChannel", channelName);
 		IntegrationNamespaceUtils.setReferenceIfAttributeDefined(adapterBuilder, element, "error-channel", "errorChannel");
 		IntegrationNamespaceUtils.setValueIfAttributeDefined(adapterBuilder, element, "event-types");
-		IntegrationNamespaceUtils.setValueIfAttributeDefined(adapterBuilder, element, "auto-startup");
-		IntegrationNamespaceUtils.setValueIfAttributeDefined(adapterBuilder, element, "phase");
 		return adapterBuilder.getBeanDefinition();
 	}
 
diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/TcpInboundChannelAdapterParser.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/TcpInboundChannelAdapterParser.java
index 5f07b60579..ee3a5f2cde 100644
--- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/TcpInboundChannelAdapterParser.java
+++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/TcpInboundChannelAdapterParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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,13 +16,14 @@
 
 package org.springframework.integration.ip.config;
 
+import org.w3c.dom.Element;
+
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.integration.config.xml.AbstractChannelAdapterParser;
 import org.springframework.integration.config.xml.IntegrationNamespaceUtils;
 import org.springframework.integration.ip.tcp.TcpReceivingChannelAdapter;
-import org.w3c.dom.Element;
 
 /**
  * Channel Adapter that receives TCP stream frames and maps them to Messages.
@@ -40,10 +41,6 @@ public class TcpInboundChannelAdapterParser extends AbstractChannelAdapterParser
 		builder.addPropertyReference("outputChannel", channelName);
 		IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder,
 				element, "error-channel", "errorChannel");
-		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element,
-				IpAdapterParserUtils.AUTO_STARTUP);
-		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element,
-				IpAdapterParserUtils.PHASE);
 		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element,
 				IpAdapterParserUtils.CLIENT_MODE);
 		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element,
diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/TcpOutboundChannelAdapterParser.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/TcpOutboundChannelAdapterParser.java
index a99ee72b86..9c66d7b9ed 100644
--- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/TcpOutboundChannelAdapterParser.java
+++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/TcpOutboundChannelAdapterParser.java
@@ -36,10 +36,6 @@ public class TcpOutboundChannelAdapterParser extends AbstractOutboundChannelAdap
 		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(TcpSendingMessageHandler.class);
 		IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element,
 				IpAdapterParserUtils.TCP_CONNECTION_FACTORY);
-		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element,
-				IpAdapterParserUtils.AUTO_STARTUP);
-		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element,
-				IpAdapterParserUtils.PHASE);
 		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element,
 				IpAdapterParserUtils.CLIENT_MODE);
 		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element,
diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/TcpOutboundGatewayParser.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/TcpOutboundGatewayParser.java
index a242609251..c1b778b2b0 100644
--- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/TcpOutboundGatewayParser.java
+++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/TcpOutboundGatewayParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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,11 +16,12 @@
 
 package org.springframework.integration.ip.config;
 
+import org.w3c.dom.Element;
+
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.integration.config.xml.AbstractConsumerEndpointParser;
 import org.springframework.integration.config.xml.IntegrationNamespaceUtils;
-import org.w3c.dom.Element;
 
 /**
  * Parser for the &lt;outbound-gateway&gt; element of the integration 'jms' namespace.
@@ -52,9 +53,9 @@ public class TcpOutboundGatewayParser extends AbstractConsumerEndpointParser {
 		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element,
 				IpAdapterParserUtils.REPLY_TIMEOUT, "sendTimeout");
 		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element,
-				IpAdapterParserUtils.AUTO_STARTUP);
+				IntegrationNamespaceUtils.AUTO_STARTUP);
 		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element,
-				IpAdapterParserUtils.PHASE);
+				IntegrationNamespaceUtils.PHASE);
 		return builder;
 	}
 
diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpSendingMessageHandler.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpSendingMessageHandler.java
index 8518db0cba..faeb42dad5 100644
--- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpSendingMessageHandler.java
+++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpSendingMessageHandler.java
@@ -20,7 +20,7 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ScheduledFuture;
 
-import org.springframework.context.SmartLifecycle;
+import org.springframework.context.Lifecycle;
 import org.springframework.integration.Message;
 import org.springframework.integration.MessageHandlingException;
 import org.springframework.integration.handler.AbstractMessageHandler;
@@ -45,7 +45,7 @@ import org.springframework.util.Assert;
  *
  */
 public class TcpSendingMessageHandler extends AbstractMessageHandler implements
-		TcpSender, SmartLifecycle, ClientModeCapable {
+		TcpSender, Lifecycle, ClientModeCapable {
 
 	private volatile AbstractConnectionFactory clientConnectionFactory;
 
@@ -53,10 +53,6 @@ public class TcpSendingMessageHandler extends AbstractMessageHandler implements
 
 	private Map<String, TcpConnection> connections = new ConcurrentHashMap<String, TcpConnection>();
 
-	private volatile boolean autoStartup = true;
-
-	private volatile int phase;
-
 	private volatile boolean isClientMode;
 
 	private volatile long retryInterval = 60000;
@@ -245,14 +241,6 @@ public class TcpSendingMessageHandler extends AbstractMessageHandler implements
 		return this.active;
 	}
 
-	public int getPhase() {
-		return this.phase;
-	}
-
-	public boolean isAutoStartup() {
-		return this.autoStartup;
-	}
-
 	public void stop(Runnable callback) {
 		synchronized (this.lifecycleMonitor) {
 			if (this.active) {
@@ -271,14 +259,6 @@ public class TcpSendingMessageHandler extends AbstractMessageHandler implements
 		}
 	}
 
-	public void setAutoStartup(boolean autoStartup) {
-		this.autoStartup = autoStartup;
-	}
-
-	public void setPhase(int phase) {
-		this.phase = phase;
-	}
-
 	/**
 	 * @return the clientConnectionFactory
 	 */
diff --git a/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-3.0.xsd b/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-3.0.xsd
index 01fda0ff28..54cb88bd67 100644
--- a/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-3.0.xsd
+++ b/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-3.0.xsd
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.springframework.org/schema/integration/ip"
-		xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-		xmlns:beans="http://www.springframework.org/schema/beans"
-		xmlns:tool="http://www.springframework.org/schema/tool"
-		xmlns:integration="http://www.springframework.org/schema/integration"
-		targetNamespace="http://www.springframework.org/schema/integration/ip"
-		elementFormDefault="qualified"
-		attributeFormDefault="unqualified">
+	xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:tool="http://www.springframework.org/schema/tool"
+	xmlns:integration="http://www.springframework.org/schema/integration"
+	targetNamespace="http://www.springframework.org/schema/integration/ip"
+	elementFormDefault="qualified" attributeFormDefault="unqualified">
 
-	<xsd:import namespace="http://www.springframework.org/schema/beans"/>
-	<xsd:import namespace="http://www.springframework.org/schema/tool"/>
+	<xsd:import namespace="http://www.springframework.org/schema/beans" />
+	<xsd:import namespace="http://www.springframework.org/schema/tool" />
 	<xsd:import namespace="http://www.springframework.org/schema/integration"
-			schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd"/>
+		schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd" />
 
 	<xsd:annotation>
 		<xsd:documentation><![CDATA[
@@ -22,7 +20,7 @@
 	<xsd:element name="udp-inbound-channel-adapter">
 		<xsd:annotation>
 			<xsd:documentation>
-	Defines a udp inbound Channel Adapter for receiving incoming udp packets.
+				Defines a udp inbound Channel Adapter for receiving incoming udp packets.
 			</xsd:documentation>
 		</xsd:annotation>
 		<xsd:complexType>
@@ -32,7 +30,8 @@
 						<xsd:annotation>
 							<xsd:appinfo>
 								<tool:annotation kind="ref">
-									<tool:expected-type type="org.springframework.integration.MessageChannel"/>
+									<tool:expected-type
+										type="org.springframework.integration.MessageChannel" />
 								</tool:annotation>
 							</xsd:appinfo>
 						</xsd:annotation>
@@ -41,16 +40,21 @@
 						<xsd:annotation>
 							<xsd:appinfo>
 								<tool:annotation kind="ref">
-									<tool:expected-type type="org.springframework.integration.MessageChannel"/>
+									<tool:expected-type
+										type="org.springframework.integration.MessageChannel" />
 								</tool:annotation>
 							</xsd:appinfo>
 							<xsd:documentation>
-								If a (synchronous) downstream exception is thrown and an "error-channel" is specified,
-								the MessagingException will be sent to this channel. Otherwise, any such exception
+								If a (synchronous) downstream exception is
+								thrown and an "error-channel" is specified,
+								the
+								MessagingException will be sent to this channel. Otherwise, any
+								such exception
 								will simply be logged by the channel adapter.
 							</xsd:documentation>
 						</xsd:annotation>
 					</xsd:attribute>
+					<xsd:attributeGroup ref="integration:smartLifeCycleAttributeGroup" />
 				</xsd:extension>
 			</xsd:complexContent>
 		</xsd:complexType>
@@ -59,20 +63,22 @@
 	<xsd:element name="udp-outbound-channel-adapter">
 		<xsd:annotation>
 			<xsd:documentation>
-	Defines an outbound UDP packet-sending Channel Adapter.
+				Defines an outbound UDP packet-sending Channel Adapter.
 			</xsd:documentation>
 		</xsd:annotation>
 		<xsd:complexType>
 			<xsd:complexContent>
 				<xsd:extension base="udpAdapterType">
 					<xsd:all>
-						<xsd:element name="request-handler-advice-chain" type="integration:adviceChainType" minOccurs="0" maxOccurs="1" />
+						<xsd:element name="request-handler-advice-chain" type="integration:adviceChainType"
+							minOccurs="0" maxOccurs="1" />
 					</xsd:all>
 					<xsd:attribute name="channel" type="xsd:string">
 						<xsd:annotation>
 							<xsd:appinfo>
 								<tool:annotation kind="ref">
-									<tool:expected-type type="org.springframework.integration.MessageChannel"/>
+									<tool:expected-type
+										type="org.springframework.integration.MessageChannel" />
 								</tool:annotation>
 							</xsd:appinfo>
 						</xsd:annotation>
@@ -87,16 +93,19 @@
 					<xsd:attribute name="task-executor" type="xsd:string">
 						<xsd:annotation>
 							<xsd:documentation>
-Specifies a specific Executor to be used for handling acknowledgments in the UDP adapter. If not supplied, an internal
-pooled executor will be used. Needed on some platforms that require the use of specific
-task executors such as a WorkManagerTaskExecutor.
+								Specifies a specific Executor to be used for handling acknowledgments in
+								the UDP adapter. If not supplied, an internal
+								pooled executor will be used. Needed on some platforms that require
+								the use of specific
+								task executors such as a WorkManagerTaskExecutor.
 							</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
+								Specifies the order for invocation when this
+								endpoint is connected as a
 								subscriber to a SubscribableChannel.
 							</xsd:documentation>
 						</xsd:annotation>
@@ -108,237 +117,263 @@ task executors such as a WorkManagerTaskExecutor.
 
 	<xsd:element name="tcp-inbound-channel-adapter">
 		<xsd:complexType>
-			<xsd:complexContent>
-				<xsd:extension base="smartLifeCycleType">
-					<xsd:attribute name="id" type="xsd:string"/>
-					<xsd:attribute name="connection-factory" type="xsd:string">
-						<xsd:annotation>
-							<xsd:appinfo>
-								<tool:annotation kind="ref">
-									<tool:expected-type type="org.springframework.integration.ip.tcp.connection.ConnectionFactory"/>
-								</tool:annotation>
-							</xsd:appinfo>
-							<xsd:documentation>
-		A connection factory is needed by an inbound adapter. If the connection factory has a type 'server',
-		the factory is 'owned' by this adapter. If it has a type 'client', it is owned by an outbound channel
-		adapter and this adapter will receive any incoming messages on the connection created by the outbound
-		adapter.
-							</xsd:documentation>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="channel" type="xsd:string">
-						<xsd:annotation>
-							<xsd:appinfo>
-								<tool:annotation kind="ref">
-									<tool:expected-type type="org.springframework.integration.MessageChannel"/>
-								</tool:annotation>
-							</xsd:appinfo>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="error-channel" type="xsd:string">
-						<xsd:annotation>
-							<xsd:appinfo>
-								<tool:annotation kind="ref">
-									<tool:expected-type type="org.springframework.integration.MessageChannel"/>
-								</tool:annotation>
-							</xsd:appinfo>
-							<xsd:documentation>
-								If a (synchronous) downstream exception is thrown and an "error-channel" is specified,
-								the MessagingException will be sent to this channel. Otherwise, any such exception
-								will simply be logged by the channel adapter.
-							</xsd:documentation>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="client-mode" type="xsd:string" use="optional" default="false">
-						<xsd:annotation>
-							<xsd:documentation>
-							 If set to true, causes the adapter to act as a client with respect to
-							 establishing the connection, rather than listening for incoming connections.
-							 Requires a type="client" connection factory, with single-use set to false.
-							 Defaults to false.
-							</xsd:documentation>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attributeGroup ref="clientModeAttributeGroup" />
-				</xsd:extension>
-			</xsd:complexContent>
+			<xsd:attribute name="id" type="xsd:string" />
+			<xsd:attribute name="connection-factory" type="xsd:string">
+				<xsd:annotation>
+					<xsd:appinfo>
+						<tool:annotation kind="ref">
+							<tool:expected-type
+								type="org.springframework.integration.ip.tcp.connection.ConnectionFactory" />
+						</tool:annotation>
+					</xsd:appinfo>
+					<xsd:documentation>
+						A connection factory is needed by an inbound adapter. If the
+						connection factory has a type 'server',
+						the factory is 'owned' by this adapter. If it has a type 'client', it
+						is owned by an outbound channel
+						adapter and this adapter will receive any incoming messages on the
+						connection created by the outbound
+						adapter.
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="channel" type="xsd:string">
+				<xsd:annotation>
+					<xsd:appinfo>
+						<tool:annotation kind="ref">
+							<tool:expected-type
+								type="org.springframework.integration.MessageChannel" />
+						</tool:annotation>
+					</xsd:appinfo>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="error-channel" type="xsd:string">
+				<xsd:annotation>
+					<xsd:appinfo>
+						<tool:annotation kind="ref">
+							<tool:expected-type
+								type="org.springframework.integration.MessageChannel" />
+						</tool:annotation>
+					</xsd:appinfo>
+					<xsd:documentation>
+						If a (synchronous) downstream exception is thrown and an
+						"error-channel" is specified,
+						the MessagingException will be sent to this channel. Otherwise, any
+						such exception
+						will simply be logged by the channel adapter.
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="client-mode" type="xsd:string"
+				use="optional" default="false">
+				<xsd:annotation>
+					<xsd:documentation>
+						If set to true, causes the adapter to act as a client with respect
+						to
+						establishing the connection, rather than listening for incoming connections.
+						Requires a type="client" connection factory, with single-use set
+						to false.
+						Defaults to false.
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attributeGroup ref="clientModeAttributeGroup" />
+			<xsd:attributeGroup ref="integration:smartLifeCycleAttributeGroup" />
 		</xsd:complexType>
 	</xsd:element>
 
 	<xsd:element name="tcp-outbound-channel-adapter">
 		<xsd:complexType>
-			<xsd:complexContent>
-				<xsd:extension base="smartLifeCycleType">
-					<xsd:all>
-						<xsd:element name="request-handler-advice-chain" type="integration:adviceChainType" minOccurs="0" maxOccurs="1" />
-					</xsd:all>
-					<xsd:attribute name="id" type="xsd:string"/>
-					<xsd:attribute name="connection-factory" type="xsd:string">
-						<xsd:annotation>
-							<xsd:appinfo>
-								<tool:annotation kind="ref">
-									<tool:expected-type type="org.springframework.integration.ip.tcp.connection.ConnectionFactory"/>
-								</tool:annotation>
-							</xsd:appinfo>
-							<xsd:documentation>
-		A connection factory is needed by an outbound adapter. If the connection factory has a type 'client',
-		the factory is 'owned' by this adapter. If it has a type 'server', it is owned by an inbound channel
-		adapter and this adapter will attempt to correlate messages to the connection on which an original
-		inbound message was received.
-							</xsd:documentation>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="channel" type="xsd:string">
-						<xsd:annotation>
-							<xsd:appinfo>
-								<tool:annotation kind="ref">
-									<tool:expected-type type="org.springframework.integration.MessageChannel"/>
-								</tool:annotation>
-							</xsd:appinfo>
-						</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 SubscribableChannel.
-							</xsd:documentation>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="client-mode" type="xsd:string" use="optional" default="false">
-						<xsd:annotation>
-							<xsd:documentation>
-							 If set to true, causes the adapter to establish a connection when started,
-							 rather than when the first message is sent.
-							 Requires a type="client" connection factory, with single-use set to false.
-							 Defaults to false.
-							</xsd:documentation>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attributeGroup ref="clientModeAttributeGroup" />
-				</xsd:extension>
-			</xsd:complexContent>
+			<xsd:all>
+				<xsd:element name="request-handler-advice-chain" type="integration:adviceChainType"
+					minOccurs="0" maxOccurs="1" />
+			</xsd:all>
+			<xsd:attribute name="id" type="xsd:string" />
+			<xsd:attribute name="connection-factory" type="xsd:string">
+				<xsd:annotation>
+					<xsd:appinfo>
+						<tool:annotation kind="ref">
+							<tool:expected-type
+								type="org.springframework.integration.ip.tcp.connection.ConnectionFactory" />
+						</tool:annotation>
+					</xsd:appinfo>
+					<xsd:documentation>
+						A connection factory is needed by an outbound adapter. If the
+						connection factory has a type 'client',
+						the factory is 'owned' by this adapter. If it has a type 'server', it
+						is owned by an inbound channel
+						adapter and this adapter will attempt to correlate messages to the
+						connection on which an original
+						inbound message was received.
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="channel" type="xsd:string">
+				<xsd:annotation>
+					<xsd:appinfo>
+						<tool:annotation kind="ref">
+							<tool:expected-type
+								type="org.springframework.integration.MessageChannel" />
+						</tool:annotation>
+					</xsd:appinfo>
+				</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 SubscribableChannel.
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="client-mode" type="xsd:string"
+				use="optional" default="false">
+				<xsd:annotation>
+					<xsd:documentation>
+						If set to true, causes the adapter to establish a connection when
+						started,
+						rather than when the first message is sent.
+						Requires a type="client" connection factory, with single-use set to false.
+						Defaults to false.
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attributeGroup ref="clientModeAttributeGroup" />
+			<xsd:attributeGroup ref="integration:smartLifeCycleAttributeGroup" />
 		</xsd:complexType>
 	</xsd:element>
 
 	<xsd:element name="tcp-inbound-gateway">
 		<xsd:complexType>
-			<xsd:complexContent>
-				<xsd:extension base="smartLifeCycleType">
-					<xsd:attribute name="id" type="xsd:string"/>
-					<xsd:attribute name="connection-factory" type="xsd:string">
-						<xsd:annotation>
-							<xsd:appinfo>
-								<tool:annotation kind="ref">
-									<tool:expected-type type="org.springframework.integration.ip.tcp.connection.AbstractServerConnectionFactory"/>
-								</tool:annotation>
-							</xsd:appinfo>
-							<xsd:documentation>
-		A connection factory is needed by an inbound adapter. The connection factory must be of type 'server'.
-							</xsd:documentation>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="request-channel" type="xsd:string" use="required">
-						<xsd:annotation>
-							<xsd:appinfo>
-								<tool:annotation kind="ref">
-									<tool:expected-type type="org.springframework.integration.MessageChannel"/>
-								</tool:annotation>
-							</xsd:appinfo>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="reply-channel" type="xsd:string">
-						<xsd:annotation>
-							<xsd:appinfo>
-								<tool:annotation kind="ref">
-									<tool:expected-type type="org.springframework.integration.MessageChannel"/>
-								</tool:annotation>
-							</xsd:appinfo>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="reply-timeout" type="xsd:string"/>
-					<xsd:attribute name="error-channel" type="xsd:string">
-						<xsd:annotation>
-							<xsd:appinfo>
-								<tool:annotation kind="ref">
-									<tool:expected-type type="org.springframework.integration.MessageChannel"/>
-								</tool:annotation>
-							</xsd:appinfo>
-							<xsd:documentation>
-								If a (synchronous) downstream exception is thrown and an "error-channel" is specified,
-								the MessagingException will be sent to this channel and the ultimate response
-								of the error flow will be returned as a response by the gateway. If no
-								"error-channel" is specified, any such exception
-								will simply be logged by the gateway. In such a situation, no response is sent
-								to the client.
-							</xsd:documentation>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="client-mode" type="xsd:string" use="optional" default="false">
-						<xsd:annotation>
-							<xsd:documentation>
-							 If set to true, causes the gateway to act as a client with respect to
-							 establishing the connection, rather than listening for incoming connections.
-							 Requires a type="client" connection factory, with single-use set to false.
-							 Defaults to false.
-							</xsd:documentation>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attributeGroup ref="clientModeAttributeGroup" />
-				</xsd:extension>
-			</xsd:complexContent>
+			<xsd:attribute name="id" type="xsd:string" />
+			<xsd:attribute name="connection-factory" type="xsd:string">
+				<xsd:annotation>
+					<xsd:appinfo>
+						<tool:annotation kind="ref">
+							<tool:expected-type
+								type="org.springframework.integration.ip.tcp.connection.AbstractServerConnectionFactory" />
+						</tool:annotation>
+					</xsd:appinfo>
+					<xsd:documentation>
+						A connection factory is needed by an inbound adapter. The
+						connection factory must be of type 'server'.
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="request-channel" type="xsd:string"
+				use="required">
+				<xsd:annotation>
+					<xsd:appinfo>
+						<tool:annotation kind="ref">
+							<tool:expected-type
+								type="org.springframework.integration.MessageChannel" />
+						</tool:annotation>
+					</xsd:appinfo>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="reply-channel" type="xsd:string">
+				<xsd:annotation>
+					<xsd:appinfo>
+						<tool:annotation kind="ref">
+							<tool:expected-type
+								type="org.springframework.integration.MessageChannel" />
+						</tool:annotation>
+					</xsd:appinfo>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="reply-timeout" type="xsd:string" />
+			<xsd:attribute name="error-channel" type="xsd:string">
+				<xsd:annotation>
+					<xsd:appinfo>
+						<tool:annotation kind="ref">
+							<tool:expected-type
+								type="org.springframework.integration.MessageChannel" />
+						</tool:annotation>
+					</xsd:appinfo>
+					<xsd:documentation>
+						If a (synchronous) downstream exception is thrown and an
+						"error-channel" is specified,
+						the MessagingException will be sent to this channel and the ultimate
+						response
+						of the error flow will be returned as a response by the gateway. If
+						no
+						"error-channel" is specified, any such exception
+						will simply be logged by the gateway. In such a situation, no response
+						is sent
+						to the client.
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="client-mode" type="xsd:string"
+				use="optional" default="false">
+				<xsd:annotation>
+					<xsd:documentation>
+						If set to true, causes the gateway to act as a client with respect
+						to
+						establishing the connection, rather than listening for incoming connections.
+						Requires a type="client" connection factory, with single-use set
+						to false.
+						Defaults to false.
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attributeGroup ref="clientModeAttributeGroup" />
+			<xsd:attributeGroup ref="integration:smartLifeCycleAttributeGroup" />
 		</xsd:complexType>
 	</xsd:element>
 
 	<xsd:element name="tcp-outbound-gateway">
 		<xsd:complexType>
-			<xsd:complexContent>
-				<xsd:extension base="smartLifeCycleType">
-					<xsd:all>
-						<xsd:element name="request-handler-advice-chain" type="integration:adviceChainType" minOccurs="0" maxOccurs="1" />
-					</xsd:all>
-					<xsd:attribute name="id" type="xsd:string"/>
-					<xsd:attribute name="connection-factory" type="xsd:string">
-						<xsd:annotation>
-							<xsd:appinfo>
-								<tool:annotation kind="ref">
-									<tool:expected-type type="org.springframework.integration.ip.tcp.connection.ConnectionFactory"/>
-								</tool:annotation>
-							</xsd:appinfo>
-							<xsd:documentation>
-		A connection factory is needed by an outbound adapter. The connection factory must be of 'client'.
-							</xsd:documentation>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="request-channel" type="xsd:string">
-						<xsd:annotation>
-							<xsd:appinfo>
-								<tool:annotation kind="ref">
-									<tool:expected-type type="org.springframework.integration.MessageChannel"/>
-								</tool:annotation>
-							</xsd:appinfo>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="reply-channel" type="xsd:string">
-						<xsd:annotation>
-							<xsd:appinfo>
-								<tool:annotation kind="ref">
-									<tool:expected-type type="org.springframework.integration.MessageChannel"/>
-								</tool:annotation>
-							</xsd:appinfo>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="request-timeout" type="xsd:string">
-						<xsd:annotation>
-							<xsd:documentation>
-								When using a shared socket, specifies the time the gateway will wait
-								to get access to the socket to send the request.
-							</xsd:documentation>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="reply-timeout" type="xsd:string">
-						<xsd:annotation>
-							<xsd:documentation><![CDATA[
+			<xsd:all>
+				<xsd:element name="request-handler-advice-chain" type="integration:adviceChainType"
+					minOccurs="0" maxOccurs="1" />
+			</xsd:all>
+			<xsd:attribute name="id" type="xsd:string" />
+			<xsd:attribute name="connection-factory" type="xsd:string">
+				<xsd:annotation>
+					<xsd:appinfo>
+						<tool:annotation kind="ref">
+							<tool:expected-type
+								type="org.springframework.integration.ip.tcp.connection.ConnectionFactory" />
+						</tool:annotation>
+					</xsd:appinfo>
+					<xsd:documentation>
+						A connection factory is needed by an outbound adapter. The
+						connection factory must be of 'client'.
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="request-channel" type="xsd:string">
+				<xsd:annotation>
+					<xsd:appinfo>
+						<tool:annotation kind="ref">
+							<tool:expected-type
+								type="org.springframework.integration.MessageChannel" />
+						</tool:annotation>
+					</xsd:appinfo>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="reply-channel" type="xsd:string">
+				<xsd:annotation>
+					<xsd:appinfo>
+						<tool:annotation kind="ref">
+							<tool:expected-type
+								type="org.springframework.integration.MessageChannel" />
+						</tool:annotation>
+					</xsd:appinfo>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="request-timeout" type="xsd:string">
+				<xsd:annotation>
+					<xsd:documentation>
+						When using a shared socket, specifies the time the gateway will wait
+						to get access to the socket to send the request.
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="reply-timeout" type="xsd:string">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
 								Allows you to specify how long this gateway will wait for
 								the reply message to be sent successfully to the reply channel
 								before throwing an exception. This attribute only applies when the
@@ -361,42 +396,42 @@ task executors such as a WorkManagerTaskExecutor.
 								the remote-timeout attribute; it has been changed
 								to make it consistent with other endpoints.
 							]]></xsd:documentation>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="remote-timeout" type="xsd:string">
-						<xsd:annotation>
-							<xsd:documentation>
-								Specifies the time the gateway will wait for a reply
-								from the remote system. Prior to 2.2, this was specified
-								with the reply-timeout attribute. To provide easier migration,
-								this attribute defaults to the same value of the reply-timeout,
-								if supplied, or 10 seconds otherwise.
-							</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 SubscribableChannel.
-							</xsd:documentation>
-						</xsd:annotation>
-					</xsd:attribute>
-				</xsd:extension>
-			</xsd:complexContent>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="remote-timeout" type="xsd:string">
+				<xsd:annotation>
+					<xsd:documentation>
+						Specifies the time the gateway will wait for a reply
+						from the remote system. Prior to 2.2, this was specified
+						with the reply-timeout attribute. To provide easier migration,
+						this attribute defaults to the same value of the reply-timeout,
+						if supplied, or 10 seconds otherwise.
+					</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 SubscribableChannel.
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attributeGroup ref="integration:smartLifeCycleAttributeGroup" />
 		</xsd:complexType>
 	</xsd:element>
 
 	<xsd:element name="tcp-connection-factory">
 		<xsd:complexType>
-			<xsd:attribute name="id" type="xsd:string"/>
+			<xsd:attribute name="id" type="xsd:string" />
 			<xsd:attribute name="type">
 				<xsd:annotation>
 					<xsd:documentation>
-Connection factories can be 'client' or 'server'. Client factories
-open a connection to a server using a host and port. Server factories
-listen on a port and create a separate connection for each incoming
-connection request.
+						Connection factories can be 'client' or 'server'. Client factories
+						open a connection to a server using a host and port. Server factories
+						listen on a port and create a separate connection for each
+						incoming
+						connection request.
 					</xsd:documentation>
 				</xsd:annotation>
 				<xsd:simpleType>
@@ -409,25 +444,30 @@ connection request.
 			<xsd:attribute name="host" type="xsd:string">
 				<xsd:annotation>
 					<xsd:documentation>
-The host to which a client connection factory will connect.
+						The host to which a client connection factory will connect.
 					</xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
 			<xsd:attribute name="port" type="xsd:string">
 				<xsd:annotation>
 					<xsd:documentation>
-For client factories, the port to which a client connection factory will connect.
-For server factories, the port on which the factory will listen for incoming
-connections.
+						For client factories, the port to which a client connection factory
+						will connect.
+						For server factories, the port on which the factory will listen for
+						incoming
+						connections.
 					</xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
-			<xsd:attribute name="using-nio" type="xsd:string" default="false">
+			<xsd:attribute name="using-nio" type="xsd:string"
+				default="false">
 				<xsd:annotation>
 					<xsd:documentation>
-If true, the factory will use java.nio.channel.SocketChannel for communication;
-for a large number of connections on the server side, this can provide better
-performance and may use fewer threads.
+						If true, the factory will use java.nio.channel.SocketChannel for
+						communication;
+						for a large number of connections on the server side, this can
+						provide better
+						performance and may use fewer threads.
 					</xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
@@ -441,85 +481,105 @@ performance and may use fewer threads.
 			<xsd:attribute name="using-direct-buffers" type="xsd:string">
 				<xsd:annotation>
 					<xsd:documentation>
-If true, instructs the factory to use direct buffers if possible; only applies if
-using-nio is true. Refer to ByteBuffer javadocs for more information.
+						If true, instructs the factory to use direct buffers if possible;
+						only applies if
+						using-nio is true. Refer to ByteBuffer javadocs for more information.
 					</xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
 			<xsd:attribute name="single-use" type="xsd:string">
 				<xsd:annotation>
 					<xsd:documentation>
-If true, a new connection will be created for each use. For inbound adapters
-where there is no outbound adapter sharing the factory, the connection will
-be closed after a message is received. For outbound adapters where there is
-no inbound adapter sharing the factory, or for inbound adapters where an
-outbound adapter shares the factory, the connection will be closed after
-so-timeout milliseconds. For outbound adapters where an inbound adapter shares
-the factory, the connection will be closed after a response is received.
+						If true, a new connection will be created for each use. For inbound
+						adapters
+						where there is no outbound adapter sharing the factory, the connection
+						will
+						be closed after a message is received. For outbound adapters where
+						there is
+						no inbound adapter sharing the factory, or for inbound adapters
+						where an
+						outbound adapter shares the factory, the connection will be closed after
+						so-timeout milliseconds. For outbound adapters where an inbound
+						adapter shares
+						the factory, the connection will be closed after a response is
+						received.
 					</xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
-			<xsd:attribute name="serializer" type="xsd:string" >
+			<xsd:attribute name="serializer" type="xsd:string">
 				<xsd:annotation>
 					<xsd:appinfo>
 						<tool:annotation kind="ref">
-							<tool:expected-type type="org.springframework.core.serializer.Serializer"/>
+							<tool:expected-type
+								type="org.springframework.core.serializer.Serializer" />
 						</tool:annotation>
 					</xsd:appinfo>
 					<xsd:documentation>
-A Serializer that converts message payloads to/from output streams/input streams
-associated with the connection. Default is ByteArrayCrLfSerializer. Serializer and Deserializer
-would normally be the same but this is not required.
+						A Serializer that converts message payloads
+						to/from output streams/input streams
+						associated with the
+						connection. Default is ByteArrayCrLfSerializer. Serializer and
+						Deserializer
+						would normally be the same but this is not required.
 					</xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
-			<xsd:attribute name="deserializer" type="xsd:string" >
+			<xsd:attribute name="deserializer" type="xsd:string">
 				<xsd:annotation>
 					<xsd:appinfo>
 						<tool:annotation kind="ref">
-							<tool:expected-type type="org.springframework.core.serializer.Deserializer"/>
+							<tool:expected-type
+								type="org.springframework.core.serializer.Deserializer" />
 						</tool:annotation>
 					</xsd:appinfo>
 					<xsd:documentation>
-A Deserializer that converts message payloads to/from output streams/input streams
-associated with the connection. Default is ByteArrayCrLfSerializer. Serializer and Deserializer
-would normally be the same but this is not required.
+						A Deserializer that converts message payloads to/from output
+						streams/input streams
+						associated with the connection. Default is ByteArrayCrLfSerializer.
+						Serializer and Deserializer
+						would normally be the same but this is not required.
 					</xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
 			<xsd:attribute name="local-address" type="xsd:string">
 				<xsd:annotation>
 					<xsd:documentation>
-On a multi-homed system, specifies the ip address of the network interface used to communicate.
-For inbound adapters and gateways, specifies the interface used to listen for incoming connections.
-If omitted, the endpoint will listen on all available adapters. For the UDP multicast outbound adapter
-specifies the interface to which multicast packets will be sent. For UDP unicast and multicast
-adapters, specifies which interface to which the acknowledgment socket will be bound. Does not
-apply to TCP outbound adapters and gateways.
+						On a multi-homed system, specifies the ip address of the network
+						interface used to communicate.
+						For inbound adapters and gateways, specifies the interface used to
+						listen for incoming connections.
+						If omitted, the endpoint will listen on all available adapters. For
+						the UDP multicast outbound adapter
+						specifies the interface to which multicast packets will be sent. For UDP
+						unicast and multicast
+						adapters, specifies which interface to which the acknowledgment socket will
+						be bound. Does not
+						apply to TCP outbound adapters and gateways.
 					</xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
 			<xsd:attribute name="task-executor" type="xsd:string">
 				<xsd:annotation>
 					<xsd:documentation>
-A task executor for managing connections; if not specified a
-cached thread pool task executor is used.
+						A task executor for managing connections; if not specified a
+						cached thread pool task executor is used.
 					</xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
-			<xsd:attribute name="backlog" type="xsd:string" >
+			<xsd:attribute name="backlog" type="xsd:string">
 				<xsd:annotation>
 					<xsd:documentation>
-Specifies the connection backlog for server sockets. Does not
-apply to client factories.
+						Specifies the connection backlog for server sockets. Does not
+						apply to client factories.
 					</xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
-			<xsd:attribute name="lookup-host" type="xsd:string" >
+			<xsd:attribute name="lookup-host" type="xsd:string">
 				<xsd:annotation>
 					<xsd:documentation>
-Whether or not to do a DNS reverse-lookup on the remote ip address to insert the host name into the
-message headers (ip_connectionId, ip_hostName). Default "true".
+						Whether or not to do a DNS reverse-lookup on the remote ip address to
+						insert the host name into the
+						message headers (ip_connectionId, ip_hostName). Default "true".
 					</xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
@@ -527,32 +587,42 @@ message headers (ip_connectionId, ip_hostName). Default "true".
 				<xsd:annotation>
 					<xsd:appinfo>
 						<tool:annotation kind="ref">
-							<tool:expected-type type="org.springframework.integration.ip.tcp.connection.TcpConnectionInterceptorFactoryChain"/>
+							<tool:expected-type
+								type="org.springframework.integration.ip.tcp.connection.TcpConnectionInterceptorFactoryChain" />
 						</tool:annotation>
 					</xsd:appinfo>
 				</xsd:annotation>
 			</xsd:attribute>
-			<xsd:attribute name="apply-sequence" type="xsd:string" default="false">
+			<xsd:attribute name="apply-sequence" type="xsd:string"
+				default="false">
 				<xsd:annotation>
 					<xsd:documentation>
-When set to "true", adds sequenceNumber and correlationId headers to messages originating from
-connections created by this factory. Facilitates resequencing if necessary. Default "false".
+						When set to "true", adds sequenceNumber and correlationId headers to
+						messages originating from
+						connections created by this factory. Facilitates resequencing if necessary.
+						Default "false".
 					</xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
 			<xsd:attribute name="ssl-context-support" type="xsd:string">
 				<xsd:annotation>
 					<xsd:documentation>
-A reference to a TcpSSLContextSupport strategy implementation. Providing this reference
-enables SSL on connections created by this factory. A DefaultTcpSSLContextSupport implementation
-is provided that takes keystore and trustore names and passwords. The SSLContext created by
-this implementation is used to obtain socket factories (when using-nio="false") or SSLEngine
-instances (when using-nio="true"). When this attribute is omitted, normal plain text
-sockets are used.
+						A reference to a TcpSSLContextSupport strategy implementation.
+						Providing this reference
+						enables SSL on connections created by this factory. A
+						DefaultTcpSSLContextSupport implementation
+						is provided that takes keystore and trustore names and passwords.
+						The SSLContext created by
+						this implementation is used to obtain socket factories (when
+						using-nio="false") or SSLEngine
+						instances (when using-nio="true"). When this attribute is omitted, normal
+						plain text
+						sockets are used.
 					</xsd:documentation>
 					<xsd:appinfo>
 						<tool:annotation kind="ref">
-							<tool:expected-type type="org.springframework.integration.ip.tcp.connection.TcpSSLContextSupport"/>
+							<tool:expected-type
+								type="org.springframework.integration.ip.tcp.connection.TcpSSLContextSupport" />
 						</tool:annotation>
 					</xsd:appinfo>
 				</xsd:annotation>
@@ -560,12 +630,15 @@ sockets are used.
 			<xsd:attribute name="socket-support" type="xsd:string">
 				<xsd:annotation>
 					<xsd:documentation>
-A reference to a TcpSocketSupport strategy implementation. Allows post-processing Socket
-and ServerSocket instances after creation and after configured attributes are applied.
+						A reference to a TcpSocketSupport strategy implementation. Allows
+						post-processing Socket
+						and ServerSocket instances after creation and after configured
+						attributes are applied.
 					</xsd:documentation>
 					<xsd:appinfo>
 						<tool:annotation kind="ref">
-							<tool:expected-type type="org.springframework.integration.ip.tcp.connection.TcpSocketSupport"/>
+							<tool:expected-type
+								type="org.springframework.integration.ip.tcp.connection.TcpSocketSupport" />
 						</tool:annotation>
 					</xsd:appinfo>
 				</xsd:annotation>
@@ -573,15 +646,19 @@ and ServerSocket instances after creation and after configured attributes are ap
 			<xsd:attribute name="socket-factory-support" type="xsd:string">
 				<xsd:annotation>
 					<xsd:documentation>
-A reference to a TcpSocketFactorySupport strategy implementation. Allows customization
-of the factories used to create sockets. The default implementation returns default.
-ServerSocketFactory and SocketFactory instances, unless an 'ssl-context-support'
-attribute has been supplied, in which case the SSLContext obtained therefrom is
-used to create SSLServerSocketFactory and SSLSocketFactory instances.
+						A reference to a TcpSocketFactorySupport strategy implementation.
+						Allows customization
+						of the factories used to create sockets. The default implementation
+						returns default.
+						ServerSocketFactory and SocketFactory instances, unless an 'ssl-context-support'
+						attribute has been supplied, in which case the SSLContext obtained
+						therefrom is
+						used to create SSLServerSocketFactory and SSLSocketFactory instances.
 					</xsd:documentation>
 					<xsd:appinfo>
 						<tool:annotation kind="ref">
-							<tool:expected-type type="org.springframework.integration.ip.tcp.connection.TcpSocketFactorySupport"/>
+							<tool:expected-type
+								type="org.springframework.integration.ip.tcp.connection.TcpSocketFactorySupport" />
 						</tool:annotation>
 					</xsd:appinfo>
 				</xsd:annotation>
@@ -589,12 +666,14 @@ used to create SSLServerSocketFactory and SSLSocketFactory instances.
 			<xsd:attribute name="mapper" type="xsd:string">
 				<xsd:annotation>
 					<xsd:documentation>
-A reference to a TcpMessageMapper implementation. Allows customization of headers in inbound messages by overriding
-setCustomHeaders(). Default is TcpMessageMapper.
+						A reference to a TcpMessageMapper implementation. Allows
+						customization of headers in inbound messages by overriding
+						setCustomHeaders(). Default is TcpMessageMapper.
 					</xsd:documentation>
 					<xsd:appinfo>
 						<tool:annotation kind="ref">
-							<tool:expected-type type="org.springframework.integration.ip.tcp.connection.TcpMessageMapper"/>
+							<tool:expected-type
+								type="org.springframework.integration.ip.tcp.connection.TcpMessageMapper" />
 						</tool:annotation>
 					</xsd:appinfo>
 				</xsd:annotation>
@@ -605,68 +684,78 @@ setCustomHeaders(). Default is TcpMessageMapper.
 	<xsd:element name="tcp-connection-event-inbound-channel-adapter">
 		<xsd:annotation>
 			<xsd:documentation>
-				Configures an inbound Channel Adapter which listens for TCP Connection
-				events, converts them to Messages and sends them to a Message Channel.
+				Configures an inbound Channel Adapter which
+				listens for TCP Connection
+				events, converts them to Messages and
+				sends them to a Message Channel.
 			</xsd:documentation>
 		</xsd:annotation>
 		<xsd:complexType>
-			<xsd:complexContent>
-				<xsd:extension base="smartLifeCycleType">
-					<xsd:attribute name="id" type="xsd:string" use="optional" />
-					<xsd:attribute name="event-types" type="xsd:string" use="optional">
-						<xsd:annotation>
-							<xsd:documentation>
-								Comma delimited list of event types (classes that extend TcpConnectionEvent) that this adapter
-								should send to the message channel. By default, all event types will be sent [OPTIONAL].
-								Note, it is NOT possible to filter by subtype, just class - for example, the standard TcpConnectionEvent
-								class has 3 subtypes (OPEN, CLOSE, EXCEPTION). This feature is intended to allow the adapter to
-								be used, say, to obtain just subclasses of TcpConnectionEvent (perhaps generated by a
-								TcpConnectionInterceptor, perhaps to signal handshaking of some kind).
-							</xsd:documentation>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="channel" type="xsd:string">
-						<xsd:annotation>
-							<xsd:appinfo>
-								<tool:annotation kind="ref">
-									<tool:expected-type
-										type="org.springframework.integration.MessageChannel" />
-								</tool:annotation>
-							</xsd:appinfo>
-							<xsd:documentation>
-								The channel to which Messages generated from Application Context events will be sent.
-							</xsd:documentation>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="error-channel" type="xsd:string">
-						<xsd:annotation>
-							<xsd:appinfo>
-								<tool:annotation kind="ref">
-									<tool:expected-type
-										type="org.springframework.integration.MessageChannel" />
-								</tool:annotation>
-							</xsd:appinfo>
-							<xsd:documentation>
-								If a (synchronous) downstream exception is thrown and an error-channel is specified,
-								a MessagingException will be sent to this channel. Otherwise, any such exception
-								will be propagated to the caller.
-							</xsd:documentation>
-						</xsd:annotation>
-					</xsd:attribute>
-				</xsd:extension>
-			</xsd:complexContent>
+			<xsd:attribute name="id" type="xsd:string" use="optional" />
+			<xsd:attribute name="event-types" type="xsd:string"
+				use="optional">
+				<xsd:annotation>
+					<xsd:documentation>
+						Comma delimited list of event types (classes that extend
+						TcpConnectionEvent) that this adapter
+						should send to the message channel. By default, all event types will be
+						sent [OPTIONAL].
+						Note, it is NOT possible to filter by subtype, just class - for
+						example, the standard TcpConnectionEvent
+						class has 3 subtypes (OPEN, CLOSE, EXCEPTION). This feature is intended
+						to allow the adapter to
+						be used, say, to obtain just subclasses of TcpConnectionEvent
+						(perhaps generated by a
+						TcpConnectionInterceptor, perhaps to signal handshaking of some kind).
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="channel" type="xsd:string">
+				<xsd:annotation>
+					<xsd:appinfo>
+						<tool:annotation kind="ref">
+							<tool:expected-type
+								type="org.springframework.integration.MessageChannel" />
+						</tool:annotation>
+					</xsd:appinfo>
+					<xsd:documentation>
+						The channel to which Messages generated from Application Context
+						events will be sent.
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="error-channel" type="xsd:string">
+				<xsd:annotation>
+					<xsd:appinfo>
+						<tool:annotation kind="ref">
+							<tool:expected-type
+								type="org.springframework.integration.MessageChannel" />
+						</tool:annotation>
+					</xsd:appinfo>
+					<xsd:documentation>
+						If a (synchronous) downstream exception is thrown and an
+						error-channel is specified,
+						a MessagingException will be sent to this channel. Otherwise, any
+						such exception
+						will be propagated to the caller.
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attributeGroup ref="integration:smartLifeCycleAttributeGroup" />
 		</xsd:complexType>
 	</xsd:element>
 
 	<xsd:complexType name="udpInboundAdapterType">
 		<xsd:complexContent>
 			<xsd:extension base="udpAdapterType">
-				<xsd:attribute name="pool-size" type="xsd:string" >
+				<xsd:attribute name="pool-size" type="xsd:string">
 					<xsd:annotation>
 						<xsd:documentation>
-The number of threads that will be used for socket/channel handling. Only applies
-if an external task-executor is NOT being used. When using an external task executor,
-its configuration specifies the number of threads.
+							The number of threads that will be used for socket/channel handling.
+							Only applies
+							if an external task-executor is NOT being used. When using an
+							external task executor,
+							its configuration specifies the number of threads.
 						</xsd:documentation>
 					</xsd:annotation>
 				</xsd:attribute>
@@ -675,17 +764,20 @@ its configuration specifies the number of threads.
 				<xsd:attribute name="task-executor" type="xsd:string">
 					<xsd:annotation>
 						<xsd:documentation>
-Specifies a specific Executor to be used for socket handling. If not supplied, an internal
-pooled executor will be used (See pool-size). Needed on some platforms that require the use of specific
-task executors such as a WorkManagerTaskExecutor.
+							Specifies a specific Executor to be used for socket handling. If not
+							supplied, an internal
+							pooled executor will be used (See pool-size). Needed on some platforms
+							that require the use of specific
+							task executors such as a WorkManagerTaskExecutor.
 						</xsd:documentation>
 					</xsd:annotation>
 				</xsd:attribute>
-				<xsd:attribute name="lookup-host" type="xsd:string" >
+				<xsd:attribute name="lookup-host" type="xsd:string">
 					<xsd:annotation>
 						<xsd:documentation>
-Whether or not to do a DNS reverse-lookup on the remote ip address to insert the host name into the
-message headers (ip_hostName). Default "true".
+							Whether or not to do a DNS reverse-lookup on the remote ip address to
+							insert the host name into the
+							message headers (ip_hostName). Default "true".
 						</xsd:documentation>
 					</xsd:annotation>
 				</xsd:attribute>
@@ -696,7 +788,7 @@ message headers (ip_hostName). Default "true".
 	<xsd:complexType name="udpAdapterType">
 		<xsd:annotation>
 			<xsd:documentation>
-	Common configuration for UDP-based adapters.
+				Common configuration for UDP-based adapters.
 			</xsd:documentation>
 		</xsd:annotation>
 		<xsd:complexContent>
@@ -708,7 +800,7 @@ message headers (ip_hostName). Default "true".
 	</xsd:complexType>
 
 	<xsd:complexType name="common-attributes">
-		<xsd:attribute name="id" type="xsd:string"/>
+		<xsd:attribute name="id" type="xsd:string" />
 		<xsd:attribute name="port" type="xsd:string" />
 		<xsd:attribute name="so-receive-buffer-size" type="xsd:string" />
 		<xsd:attribute name="so-send-buffer-size" type="xsd:string" />
@@ -716,42 +808,30 @@ message headers (ip_hostName). Default "true".
 		<xsd:attribute name="local-address" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation>
-On a multi-homed system, specifies the ip address of the network interface used to communicate.
-For inbound adapters and gateways, specifies the interface used to listen for incoming connections.
-If omitted, the endpoint will listen on all available adapters. For the UDP multicast outbound adapter
-specifies the interface to which multicast packets will be sent. For UDP unicast and multicast
-adapters, specifies which interface to which the acknowledgment socket will be bound. Does not
-apply to TCP outbound adapters and gateways.
+					On a multi-homed system, specifies the ip address of the network
+					interface used to communicate.
+					For inbound adapters and gateways, specifies the interface used to
+					listen for incoming connections.
+					If omitted, the endpoint will listen on all available adapters. For
+					the UDP multicast outbound adapter
+					specifies the interface to which multicast packets will be sent. For UDP
+					unicast and multicast
+					adapters, specifies which interface to which the acknowledgment socket will
+					be bound. Does not
+					apply to TCP outbound adapters and gateways.
 				</xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 	</xsd:complexType>
 
-	<xsd:complexType name="smartLifeCycleType">
-		<xsd:attribute name="auto-startup" type="xsd:string">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-Boolean value indicating whether this endpoint should start automatically.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="phase" type="xsd:string">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-The lifecycle phase within which this endpoint should start and stop.
-The lower the value the earlier this endpoint will start and the later it will stop. The
-default is 0. Values can be negative. See SmartLifeCycle.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-	</xsd:complexType>
-
 	<xsd:attributeGroup name="clientModeAttributeGroup">
-		<xsd:attribute name="retry-interval" type="xsd:string" use="optional" default="60000">
+		<xsd:attribute name="retry-interval" type="xsd:string"
+			use="optional" default="60000">
 			<xsd:annotation>
 				<xsd:documentation>
-				 When in client mode, specifies the retry interval, in milliseconds, if a connection
-				 cannot be established. Defaults to 60000.
+					When in client mode, specifies the retry interval, in milliseconds, if
+					a connection
+					cannot be established. Defaults to 60000.
 				</xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -759,8 +839,10 @@ default is 0. Values can be negative. See SmartLifeCycle.
 			<xsd:annotation>
 				<xsd:documentation>
 					When in client mode,
-					provide a reference to the TaskScheduler instance to
-					be used for establishing connections. If not provided, the default
+					provide a reference to the
+					TaskScheduler instance to
+					be used for establishing connections. If
+					not provided, the default
 					will use a thread pool of size 1.
 				</xsd:documentation>
 				<xsd:appinfo>
diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests-context.xml b/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests-context.xml
index 79fb0a86e9..4358085b06 100644
--- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests-context.xml
+++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests-context.xml
@@ -37,6 +37,8 @@
 		task-executor="externalTE"
 		error-channel="errorChannel"
 		lookup-host="false"
+		auto-startup="false"
+		phase="1234"
 	/>
 
 	<ip:udp-inbound-channel-adapter id="testInUdpMulticast"
diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests.java
index 46258a9b78..c6b0831fed 100644
--- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests.java
+++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests.java
@@ -46,6 +46,7 @@ import org.springframework.integration.channel.DirectChannel;
 import org.springframework.integration.channel.QueueChannel;
 import org.springframework.integration.core.MessageHandler;
 import org.springframework.integration.core.MessagingTemplate;
+import org.springframework.integration.endpoint.AbstractEndpoint;
 import org.springframework.integration.endpoint.EventDrivenConsumer;
 import org.springframework.integration.handler.advice.AbstractRequestHandlerAdvice;
 import org.springframework.integration.ip.tcp.TcpInboundGateway;
@@ -111,6 +112,10 @@ public class ParserUnitTests {
 	@Qualifier(value="testOutUdpiMulticast.handler")
 	MulticastSendingMessageHandler udpOutMulticast;
 
+	@Autowired
+	@Qualifier(value="testOutTcpNio")
+	AbstractEndpoint tcpOutEndpoint;
+
 	@Autowired
 	@Qualifier(value="testOutTcpNio.handler")
 	TcpSendingMessageHandler tcpOut;
@@ -288,6 +293,8 @@ public class ParserUnitTests {
 		DatagramPacketMessageMapper mapper = (DatagramPacketMessageMapper) dfa.getPropertyValue("mapper");
 		DirectFieldAccessor mapperAccessor = new DirectFieldAccessor(mapper);
 		assertFalse((Boolean)mapperAccessor.getPropertyValue("lookupHost"));
+		assertFalse(TestUtils.getPropertyValue(udpIn, "autoStartup", Boolean.class));
+		assertEquals(1234, dfa.getPropertyValue("phase"));
 	}
 
 	@Test
@@ -431,8 +438,8 @@ public class ParserUnitTests {
 		assertEquals("ip:tcp-outbound-channel-adapter", tcpOut.getComponentType());
 		assertFalse(cfC1.isLookupHost());
 		assertEquals(35, dfa.getPropertyValue("order"));
-		assertFalse(tcpOut.isAutoStartup());
-		assertEquals(125, tcpOut.getPhase());
+		assertFalse(tcpOutEndpoint.isAutoStartup());
+		assertEquals(125, tcpOutEndpoint.getPhase());
 		assertFalse((Boolean) TestUtils.getPropertyValue(
 				TestUtils.getPropertyValue(cfC1, "mapper"), "applySequence"));
 	}
diff --git a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-3.0.xsd b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-3.0.xsd
index d4900cf3ed..773d56306f 100644
--- a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-3.0.xsd
+++ b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-3.0.xsd
@@ -144,7 +144,7 @@
 						</xsd:element>
 						<xsd:element ref="integration:poller" minOccurs="0" maxOccurs="1" />
 					</xsd:sequence>
-					<xsd:attribute name="id" type="xsd:string" use="optional"/>
+					<xsd:attributeGroup ref="integration:channelAdapterAttributes"/>
 					<xsd:attribute name="update" type="xsd:string">
 						<xsd:annotation>
 							<xsd:appinfo>
@@ -177,27 +177,6 @@
 							</xsd:documentation>
 						</xsd:annotation>
 					</xsd:attribute>
-					<xsd:attribute name="channel" type="xsd:string">
-						<xsd:annotation>
-							<xsd:appinfo>
-								<xsd:documentation>
-									Channel to which polled messages will be sent.
-								</xsd:documentation>
-								<tool:annotation kind="ref">
-									<tool:expected-type type="org.springframework.integration.MessageChannel" />
-								</tool:annotation>
-							</xsd:appinfo>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="auto-startup" type="xsd:string" default="true">
-						<xsd:annotation>
-							<xsd:appinfo>
-								<xsd:documentation>
-									Flag to indicate that the poller should start automatically on startup (default true).
-								</xsd:documentation>
-							</xsd:appinfo>
-						</xsd:annotation>
-					</xsd:attribute>
 					<xsd:attribute name="update-sql-parameter-source-factory" type="xsd:string">
 						<xsd:annotation>
 							<xsd:appinfo>
@@ -249,6 +228,7 @@
 						<xsd:element ref="integration:poller" minOccurs="0" maxOccurs="1"/>
 						<xsd:element name="request-handler-advice-chain" type="integration:adviceChainType" minOccurs="0" maxOccurs="1" />
 					</xsd:choice>
+					<xsd:attributeGroup ref="integration:channelAdapterAttributes"/>
 					<xsd:attribute name="sql-parameter-source-factory" type="xsd:string">
 						<xsd:annotation>
 							<xsd:appinfo>
@@ -265,22 +245,6 @@
 							</xsd:appinfo>
 						</xsd:annotation>
 					</xsd:attribute>
-					<xsd:attribute name="id" type="xsd:string" use="optional"/>
-					<xsd:attribute name="channel" type="xsd:string">
-						<xsd:annotation>
-							<xsd:appinfo>
-								<xsd:documentation>
-									Channel from which messages will be output.
-									When a message is sent to this channel it will
-									cause the query
-									to be executed.
-								</xsd:documentation>
-								<tool:annotation kind="ref">
-									<tool:expected-type type="org.springframework.integration.MessageChannel" />
-								</tool:annotation>
-							</xsd:appinfo>
-						</xsd:annotation>
-					</xsd:attribute>
 					<xsd:attribute name="keys-generated" type="xsd:boolean">
 						<xsd:annotation>
 							<xsd:appinfo>
@@ -290,15 +254,6 @@
 							</xsd:appinfo>
 						</xsd:annotation>
 					</xsd:attribute>
-					<xsd:attribute name="auto-startup" type="xsd:string" default="true">
-						<xsd:annotation>
-							<xsd:appinfo>
-								<xsd:documentation>
-									Flag to indicate that the poller should start automatically on startup (default true).
-								</xsd:documentation>
-							</xsd:appinfo>
-						</xsd:annotation>
-					</xsd:attribute>
 					<xsd:attribute name="order">
 						<xsd:annotation>
 							<xsd:documentation>
@@ -485,15 +440,6 @@
 							</xsd:appinfo>
 						</xsd:annotation>
 					</xsd:attribute>
-					<xsd:attribute name="auto-startup" type="xsd:string" default="true">
-						<xsd:annotation>
-							<xsd:appinfo>
-								<xsd:documentation>
-									Flag to indicate that the poller should start automatically on startup (default true).
-								</xsd:documentation>
-							</xsd:appinfo>
-						</xsd:annotation>
-					</xsd:attribute>
 					<xsd:attribute name="order">
 						<xsd:annotation>
 							<xsd:documentation>
@@ -511,6 +457,7 @@
 							</xsd:documentation>
 						</xsd:annotation>
 					</xsd:attribute>
+					<xsd:attributeGroup ref="integration:smartLifeCycleAttributeGroup"/>
 				</xsd:extension>
 			</xsd:complexContent>
 		</xsd:complexType>
@@ -1206,14 +1153,7 @@
 				</xsd:appinfo>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="auto-startup" type="xsd:string" default="true" use="optional">
-			<xsd:annotation>
-				<xsd:documentation>
-					Flag to indicate that the poller should start automatically
-					on startup (default true).
-				</xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
+		<xsd:attributeGroup ref="integration:smartLifeCycleAttributeGroup"/>
 		<xsd:attribute name="ignore-column-meta-data" default="false" use="optional">
 			<xsd:annotation>
 				<xsd:documentation>
diff --git a/spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-3.0.xsd b/spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-3.0.xsd
index dc4b0470b7..a3aedd4afa 100644
--- a/spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-3.0.xsd
+++ b/spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-3.0.xsd
@@ -325,23 +325,6 @@
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="auto-startup" type="xsd:string">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-	Boolean value indicating whether this channel's listener container should start automatically.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="phase" type="xsd:string">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-	The lifecycle phase within which this channel's listener container should start and stop.
-	The lower the value the earlier this container will start and the later it will stop. The
-	default is Integer.MAX_VALUE meaning the container will start as late as possible
-	and stop as soon as possible.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
 		<xsd:attribute name="delivery-persistent" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation>
@@ -377,6 +360,7 @@
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attributeGroup ref="integration:subscribersAttributeGroup" />
+		<xsd:attributeGroup ref="integration:smartLifeCycleAttributeGroup" />
 	</xsd:complexType>
 
 	<xsd:element name="message-driven-channel-adapter">
@@ -1056,7 +1040,6 @@
 					]]></xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
-			<xsd:attribute name="auto-startup" type="xsd:string" default="true"/>
 			<xsd:attribute name="order" type="xsd:string">
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
@@ -1074,6 +1057,7 @@
 					</xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
+			<xsd:attributeGroup ref="integration:smartLifeCycleAttributeGroup"/>
 		</xsd:complexType>
 	</xsd:element>
 
@@ -1366,7 +1350,7 @@
 				</xsd:appinfo>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="auto-startup" type="xsd:string" default="true"/>
+		<xsd:attributeGroup ref="integration:smartLifeCycleAttributeGroup"/>
 	</xsd:complexType>
 
 	<xsd:complexType name="transformerType">
diff --git a/spring-integration-jmx/src/main/resources/org/springframework/integration/jmx/config/spring-integration-jmx-3.0.xsd b/spring-integration-jmx/src/main/resources/org/springframework/integration/jmx/config/spring-integration-jmx-3.0.xsd
index cbe7ed26a2..04f8b34b2c 100644
--- a/spring-integration-jmx/src/main/resources/org/springframework/integration/jmx/config/spring-integration-jmx-3.0.xsd
+++ b/spring-integration-jmx/src/main/resources/org/springframework/integration/jmx/config/spring-integration-jmx-3.0.xsd
@@ -27,7 +27,6 @@
 						<xsd:element ref="integration:poller" />
 					</xsd:sequence>
 					<xsd:attribute name="attribute-name" type="xsd:string" use="required" />
-					<xsd:attribute name="auto-startup" type="xsd:string" default="true" />
 				</xsd:extension>
 			</xsd:complexContent>
 		</xsd:complexType>
@@ -56,7 +55,6 @@
 							</xsd:element>
 						</xsd:choice>
 					</xsd:sequence>
-					<xsd:attribute name="auto-startup" type="xsd:string" default="true" />
 				</xsd:extension>
 			</xsd:complexContent>
 		</xsd:complexType>
@@ -274,6 +272,7 @@
 						</xsd:appinfo>
 					</xsd:annotation>
 				</xsd:attribute>
+				<xsd:attributeGroup ref="integration:smartLifeCycleAttributeGroup"/>
 			</xsd:extension>
 		</xsd:complexContent>
 	</xsd:complexType>
@@ -288,6 +287,7 @@
 			<xsd:extension base="mbeanServerIdentifyerType">
 				<xsd:attribute name="channel" type="xsd:string" />
 				<xsd:attribute name="object-name" type="xsd:string" use="required" />
+				<xsd:attributeGroup ref="integration:smartLifeCycleAttributeGroup"/>
 			</xsd:extension>
 		</xsd:complexContent>
 	</xsd:complexType>
diff --git a/spring-integration-jpa/src/main/resources/org/springframework/integration/jpa/config/xml/spring-integration-jpa-3.0.xsd b/spring-integration-jpa/src/main/resources/org/springframework/integration/jpa/config/xml/spring-integration-jpa-3.0.xsd
index 55b9754653..16f8fd963f 100644
--- a/spring-integration-jpa/src/main/resources/org/springframework/integration/jpa/config/xml/spring-integration-jpa-3.0.xsd
+++ b/spring-integration-jpa/src/main/resources/org/springframework/integration/jpa/config/xml/spring-integration-jpa-3.0.xsd
@@ -564,17 +564,7 @@
 				</xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="auto-startup" default="true" use="optional">
-			<xsd:annotation>
-				<xsd:documentation>
-					Flag to indicate that the component should start automatically
-					on startup (default true).
-				</xsd:documentation>
-			</xsd:annotation>
-			<xsd:simpleType>
-				<xsd:union memberTypes="xsd:boolean xsd:string" />
-			</xsd:simpleType>
-		</xsd:attribute>
+		<xsd:attributeGroup ref="integration:smartLifeCycleAttributeGroup"/>
 	</xsd:attributeGroup>
 
 	<xsd:simpleType name="persistMode">
diff --git a/spring-integration-mail/src/main/java/org/springframework/integration/mail/config/ImapIdleChannelAdapterParser.java b/spring-integration-mail/src/main/java/org/springframework/integration/mail/config/ImapIdleChannelAdapterParser.java
index 359bf8ee4c..9450ff1803 100644
--- a/spring-integration-mail/src/main/java/org/springframework/integration/mail/config/ImapIdleChannelAdapterParser.java
+++ b/spring-integration-mail/src/main/java/org/springframework/integration/mail/config/ImapIdleChannelAdapterParser.java
@@ -16,6 +16,8 @@
 
 package org.springframework.integration.mail.config;
 
+import org.w3c.dom.Element;
+
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
@@ -27,7 +29,6 @@ import org.springframework.integration.mail.ImapIdleChannelAdapter;
 import org.springframework.integration.mail.ImapMailReceiver;
 import org.springframework.util.StringUtils;
 import org.springframework.util.xml.DomUtils;
-import org.w3c.dom.Element;
 
 /**
  * Parser for the &lt;imap-idle-channel-adapter&gt; element in the 'mail' namespace.
@@ -45,7 +46,6 @@ public class ImapIdleChannelAdapterParser extends AbstractChannelAdapterParser {
 		builder.addConstructorArgValue(this.parseImapMailReceiver(element, parserContext));
 		builder.addPropertyReference("outputChannel", channelName);
 		IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, "error-channel", "errorChannel");
-		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "auto-startup");
 
 		Element txElement = DomUtils.getChildElementByTagName(element, "transactional");
 		if (txElement != null){
diff --git a/spring-integration-mail/src/main/resources/org/springframework/integration/mail/config/spring-integration-mail-3.0.xsd b/spring-integration-mail/src/main/resources/org/springframework/integration/mail/config/spring-integration-mail-3.0.xsd
index 0a80d1fbe2..e12ed0c318 100644
--- a/spring-integration-mail/src/main/resources/org/springframework/integration/mail/config/spring-integration-mail-3.0.xsd
+++ b/spring-integration-mail/src/main/resources/org/springframework/integration/mail/config/spring-integration-mail-3.0.xsd
@@ -30,16 +30,7 @@
 				<xsd:element ref="integration:poller" minOccurs="0" maxOccurs="1"/>
 				<xsd:element name="request-handler-advice-chain" type="integration:adviceChainType" minOccurs="0" maxOccurs="1" />
 			</xsd:choice>
-			<xsd:attribute name="id" type="xsd:string"/>
-			<xsd:attribute name="channel" type="xsd:string">
-				<xsd:annotation>
-					<xsd:appinfo>
-						<tool:annotation kind="ref">
-							<tool:expected-type type="org.springframework.integration.MessageChannel"/>
-						</tool:annotation>
-					</xsd:appinfo>
-				</xsd:annotation>
-			</xsd:attribute>
+			<xsd:attributeGroup ref="integration:channelAdapterAttributes"/>
 			<xsd:attribute name="mail-sender" type="xsd:string">
 				<xsd:annotation>
 					<xsd:appinfo>
@@ -62,7 +53,6 @@
 					</xsd:appinfo>
 				</xsd:annotation>
 			</xsd:attribute>
-			<xsd:attribute name="auto-startup" type="xsd:string" default="true"/>
 			<xsd:attribute name="order">
 				<xsd:annotation>
 					<xsd:documentation>
@@ -181,25 +171,7 @@
 	</xsd:element>
 
 	<xsd:complexType name="inboundMailAdapterType">
-		<xsd:attribute name="id" type="xsd:string">
-			<xsd:annotation>
-				<xsd:documentation>
-	A unique identifier for this Channel Adapter.
-				</xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="channel" type="xsd:string">
-			<xsd:annotation>
-				<xsd:documentation>
-	Reference for the MessageChannel to which this adapter will send Messages.
-				</xsd:documentation>
-				<xsd:appinfo>
-					<tool:annotation kind="ref">
-						<tool:expected-type type="org.springframework.integration.MessageChannel"/>
-					</tool:annotation>
-				</xsd:appinfo>
-			</xsd:annotation>
-		</xsd:attribute>
+		<xsd:attributeGroup ref="integration:channelAdapterAttributes"/>
 		<xsd:attribute name="store-uri" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
@@ -281,13 +253,6 @@
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="auto-startup" type="xsd:string" default="true">
-			<xsd:annotation>
-				<xsd:documentation>
-	Specify whether this endpoint should be started automatically. The default is TRUE.
-				</xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
 	</xsd:complexType>
 
 	<xsd:element name="mail-to-string-transformer">
@@ -380,4 +345,4 @@
 		</xsd:attribute>
 	</xsd:complexType>
 
-</xsd:schema>
\ No newline at end of file
+</xsd:schema>
diff --git a/spring-integration-mongodb/src/main/resources/org/springframework/integration/mongodb/config/spring-integration-mongodb-3.0.xsd b/spring-integration-mongodb/src/main/resources/org/springframework/integration/mongodb/config/spring-integration-mongodb-3.0.xsd
index a1b6a99870..0917faa5b3 100644
--- a/spring-integration-mongodb/src/main/resources/org/springframework/integration/mongodb/config/spring-integration-mongodb-3.0.xsd
+++ b/spring-integration-mongodb/src/main/resources/org/springframework/integration/mongodb/config/spring-integration-mongodb-3.0.xsd
@@ -108,17 +108,7 @@
 				Common configuration for mongodb adapters.
 			</xsd:documentation>
 		</xsd:annotation>
-		<xsd:attribute name="id" type="xsd:string" />
-		<xsd:attribute name="channel" type="xsd:string">
-			<xsd:annotation>
-				<xsd:documentation>
-					Reference to a Message Channel that will be used
-					by this adapter to
-					'receiveFrom' or 'sendTo' Messages depending on the adapter type (e.g.,
-					inbound/outbound)
-				</xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
+		<xsd:attributeGroup ref="integration:channelAdapterAttributes"/>
 		<xsd:attribute name="mongodb-factory" type="xsd:string">
 			<xsd:annotation>
 				<xsd:appinfo>
@@ -183,7 +173,5 @@
 				</xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="auto-startup" type="xsd:string"
-			default="true" />
 	</xsd:complexType>
 </xsd:schema>
diff --git a/spring-integration-redis/src/main/java/org/springframework/integration/redis/config/RedisInboundChannelAdapterParser.java b/spring-integration-redis/src/main/java/org/springframework/integration/redis/config/RedisInboundChannelAdapterParser.java
index 6a4add53cd..6ade9c2c30 100644
--- a/spring-integration-redis/src/main/java/org/springframework/integration/redis/config/RedisInboundChannelAdapterParser.java
+++ b/spring-integration-redis/src/main/java/org/springframework/integration/redis/config/RedisInboundChannelAdapterParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -46,7 +46,6 @@ public class RedisInboundChannelAdapterParser extends AbstractChannelAdapterPars
 		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "topics");
 		IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, "error-channel");
 		IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, "message-converter");
-		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "auto-startup");
 		IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, "serializer");
 		return builder.getBeanDefinition();
 	}
diff --git a/spring-integration-redis/src/main/resources/org/springframework/integration/redis/config/spring-integration-redis-3.0.xsd b/spring-integration-redis/src/main/resources/org/springframework/integration/redis/config/spring-integration-redis-3.0.xsd
index 981d7481fe..0a13868fab 100644
--- a/spring-integration-redis/src/main/resources/org/springframework/integration/redis/config/spring-integration-redis-3.0.xsd
+++ b/spring-integration-redis/src/main/resources/org/springframework/integration/redis/config/spring-integration-redis-3.0.xsd
@@ -129,13 +129,7 @@
 			</xsd:documentation>
 		</xsd:annotation>
 		<xsd:complexType>
-			<xsd:attribute name="id" type="xsd:string">
-				<xsd:annotation>
-					<xsd:documentation>
-	The ID for this Channel Adapter.
-					</xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
+			<xsd:attributeGroup ref="integration:channelAdapterAttributes"/>
 			<xsd:attribute name="connection-factory" type="xsd:string">
 				<xsd:annotation>
 					<xsd:documentation>
@@ -156,18 +150,6 @@
 					</xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
-			<xsd:attribute name="channel" type="xsd:string">
-				<xsd:annotation>
-					<xsd:documentation>
-	Channel to which Messages will be sent.
-					</xsd:documentation>
-					<xsd:appinfo>
-						<tool:annotation kind="ref">
-							<tool:expected-type type="org.springframework.integration.MessageChannel"/>
-						</tool:annotation>
-					</xsd:appinfo>
-				</xsd:annotation>
-			</xsd:attribute>
 			<xsd:attribute name="message-converter" type="xsd:string">
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
@@ -353,7 +335,7 @@
 	Common configuration for Redis adapters.
 			</xsd:documentation>
 		</xsd:annotation>
-		<xsd:attribute name="id" type="xsd:string"/>
+		<xsd:attributeGroup ref="integration:channelAdapterAttributes"/>
 		<xsd:attribute name="connection-factory" type="xsd:string">
 			<xsd:annotation>
 				<xsd:appinfo>
@@ -363,19 +345,6 @@
 				</xsd:appinfo>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="auto-startup" type="xsd:string" default="true"/>
-		<xsd:attribute name="channel" type="xsd:string">
-			<xsd:annotation>
-				<xsd:documentation>
-				Channel to which Messages will be sent.
-				</xsd:documentation>
-				<xsd:appinfo>
-					<tool:annotation kind="ref">
-						<tool:expected-type type="org.springframework.integration.MessageChannel"/>
-					</tool:annotation>
-				</xsd:appinfo>
-			</xsd:annotation>
-		</xsd:attribute>
 	</xsd:complexType>
 
 	<xsd:complexType name="redisCollectionInboundAdapterType">
diff --git a/spring-integration-rmi/src/main/resources/org/springframework/integration/rmi/config/spring-integration-rmi-3.0.xsd b/spring-integration-rmi/src/main/resources/org/springframework/integration/rmi/config/spring-integration-rmi-3.0.xsd
index fe601f2fca..78c7982a70 100644
--- a/spring-integration-rmi/src/main/resources/org/springframework/integration/rmi/config/spring-integration-rmi-3.0.xsd
+++ b/spring-integration-rmi/src/main/resources/org/springframework/integration/rmi/config/spring-integration-rmi-3.0.xsd
@@ -134,7 +134,7 @@
 		</xsd:attribute>
 		<xsd:attribute name="request-timeout" type="xsd:string"/>
 		<xsd:attribute name="reply-timeout" type="xsd:string"/>
-		<xsd:attribute name="auto-startup" type="xsd:string" default="true"/>
+		<xsd:attributeGroup ref="integration:smartLifeCycleAttributeGroup"/>
 	</xsd:complexType>
 
 </xsd:schema>
diff --git a/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-3.0.xsd b/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-3.0.xsd
index 3a7e45bb41..543833b594 100644
--- a/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-3.0.xsd
+++ b/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-3.0.xsd
@@ -551,18 +551,7 @@
 				</xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="auto-startup" type="xsd:string"
-			default="true">
-			<xsd:annotation>
-				<xsd:documentation>
-					Lifecycle attribute signaling if this component
-					should be started during
-					Application Context startup.
-					Default is
-					'true'
-				</xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
+		<xsd:attributeGroup ref="integration:smartLifeCycleAttributeGroup"/>
 	</xsd:complexType>
 
 </xsd:schema>
diff --git a/spring-integration-stream/src/main/resources/org/springframework/integration/stream/config/spring-integration-stream-3.0.xsd b/spring-integration-stream/src/main/resources/org/springframework/integration/stream/config/spring-integration-stream-3.0.xsd
index 238ede12e1..888c135a3e 100644
--- a/spring-integration-stream/src/main/resources/org/springframework/integration/stream/config/spring-integration-stream-3.0.xsd
+++ b/spring-integration-stream/src/main/resources/org/springframework/integration/stream/config/spring-integration-stream-3.0.xsd
@@ -29,18 +29,8 @@
 			<xsd:sequence>
 				<xsd:element ref="integration:poller" minOccurs="0" maxOccurs="1"/>
 			</xsd:sequence>
-			<xsd:attribute name="id" type="xsd:string"/>
-			<xsd:attribute name="channel" type="xsd:string">
-				<xsd:annotation>
-					<xsd:appinfo>
-						<tool:annotation kind="ref">
-							<tool:expected-type type="org.springframework.integration.MessageChannel"/>
-						</tool:annotation>
-					</xsd:appinfo>
-				</xsd:annotation>
-			</xsd:attribute>
+			<xsd:attributeGroup ref="integration:channelAdapterAttributes"/>
 			<xsd:attribute name="charset" type="xsd:string"/>
-			<xsd:attribute name="auto-startup" type="xsd:string" default="true"/>
 		</xsd:complexType>
 	</xsd:element>
 
@@ -55,19 +45,9 @@
 	or to stderr (System.err) depending on the element name.
 			</xsd:documentation>
 		</xsd:annotation>
-		<xsd:attribute name="id" type="xsd:string"/>
-		<xsd:attribute name="channel" type="xsd:string">
-			<xsd:annotation>
-				<xsd:appinfo>
-					<tool:annotation kind="ref">
-						<tool:expected-type type="org.springframework.integration.MessageChannel"/>
-					</tool:annotation>
-				</xsd:appinfo>
-			</xsd:annotation>
-		</xsd:attribute>
+		<xsd:attributeGroup ref="integration:channelAdapterAttributes"/>
 		<xsd:attribute name="charset" type="xsd:string"/>
 		<xsd:attribute name="append-newline" type="xsd:string" default="false"/>
-		<xsd:attribute name="auto-startup" type="xsd:string" default="true"/>
 		<xsd:attribute name="order">
 			<xsd:annotation>
 				<xsd:documentation>
diff --git a/spring-integration-syslog/src/main/java/org/springframework/integration/syslog/config/SyslogInboundChannelAdapterParser.java b/spring-integration-syslog/src/main/java/org/springframework/integration/syslog/config/SyslogInboundChannelAdapterParser.java
index 869a925dbd..7768fbd952 100644
--- a/spring-integration-syslog/src/main/java/org/springframework/integration/syslog/config/SyslogInboundChannelAdapterParser.java
+++ b/spring-integration-syslog/src/main/java/org/springframework/integration/syslog/config/SyslogInboundChannelAdapterParser.java
@@ -15,6 +15,8 @@
  */
 package org.springframework.integration.syslog.config;
 
+import org.w3c.dom.Element;
+
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
@@ -23,7 +25,6 @@ import org.springframework.integration.config.xml.IntegrationNamespaceUtils;
 import org.springframework.integration.ip.config.UdpInboundChannelAdapterParser;
 import org.springframework.util.StringUtils;
 import org.springframework.util.xml.DomUtils;
-import org.w3c.dom.Element;
 
 /**
  * Parses a {@code <int-syslog:inbound-channel-adapter/>}.
@@ -59,8 +60,6 @@ public class SyslogInboundChannelAdapterParser extends UdpInboundChannelAdapterP
 		IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder,
 				element, "error-channel", "errorChannel");
 		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "send-timeout");
-		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "auto-startup");
-		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "phase");
 		return builder.getBeanDefinition();
 	}
 
diff --git a/spring-integration-syslog/src/main/resources/org/springframework/integration/syslog/config/spring-integration-syslog-3.0.xsd b/spring-integration-syslog/src/main/resources/org/springframework/integration/syslog/config/spring-integration-syslog-3.0.xsd
index 27aa232183..5469b800c5 100644
--- a/spring-integration-syslog/src/main/resources/org/springframework/integration/syslog/config/spring-integration-syslog-3.0.xsd
+++ b/spring-integration-syslog/src/main/resources/org/springframework/integration/syslog/config/spring-integration-syslog-3.0.xsd
@@ -1,20 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.springframework.org/schema/integration/ip"
-		xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-		xmlns:beans="http://www.springframework.org/schema/beans"
-		xmlns:tool="http://www.springframework.org/schema/tool"
-		xmlns:integration="http://www.springframework.org/schema/integration"
-		xmlns:int-ip="http://www.springframework.org/schema/integration/ip"
-		targetNamespace="http://www.springframework.org/schema/integration/syslog"
-		elementFormDefault="qualified"
-		attributeFormDefault="unqualified">
+	xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:tool="http://www.springframework.org/schema/tool"
+	xmlns:integration="http://www.springframework.org/schema/integration"
+	xmlns:int-ip="http://www.springframework.org/schema/integration/ip"
+	targetNamespace="http://www.springframework.org/schema/integration/syslog"
+	elementFormDefault="qualified" attributeFormDefault="unqualified">
 
-	<xsd:import namespace="http://www.springframework.org/schema/beans"/>
-	<xsd:import namespace="http://www.springframework.org/schema/tool"/>
+	<xsd:import namespace="http://www.springframework.org/schema/beans" />
+	<xsd:import namespace="http://www.springframework.org/schema/tool" />
 	<xsd:import namespace="http://www.springframework.org/schema/integration"
-			schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd"/>
+		schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd" />
 	<xsd:import namespace="http://www.springframework.org/schema/integration/ip"
-			schemaLocation="http://www.springframework.org/schema/integration/ip/spring-integration-ip-3.0.xsd"/>
+		schemaLocation="http://www.springframework.org/schema/integration/ip/spring-integration-ip-3.0.xsd" />
 
 	<xsd:annotation>
 		<xsd:documentation><![CDATA[
@@ -24,90 +22,103 @@
 
 	<xsd:element name="inbound-channel-adapter">
 		<xsd:complexType>
-			<xsd:complexContent>
-				<xsd:extension base="int-ip:smartLifeCycleType">
-					<xsd:sequence minOccurs="0" maxOccurs="1">
-						<xsd:element name="udp-attributes" type="int-ip:udpInboundAdapterType"/>
-					</xsd:sequence>
-					<xsd:attribute name="id" type="xsd:string"/>
-					<xsd:attribute name="connection-factory" type="xsd:string">
-						<xsd:annotation>
-							<xsd:appinfo>
-								<tool:annotation kind="ref">
-									<tool:expected-type type="org.springframework.integration.ip.tcp.connection.AbstractServerConnectionFactory"/>
-								</tool:annotation>
-							</xsd:appinfo>
-							<xsd:documentation>
-		An explicit tcp connection factory; requires protocol="tcp" and incompatible with the 'port' attribute.
-		Use this if you want to set advanced configuration options on the factory. The default factory uses
-		NIO.
-							</xsd:documentation>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="channel" type="xsd:string">
-						<xsd:annotation>
-							<xsd:appinfo>
-								<tool:annotation kind="ref">
-									<tool:expected-type type="org.springframework.integration.MessageChannel"/>
-								</tool:annotation>
-							</xsd:appinfo>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="error-channel" type="xsd:string">
-						<xsd:annotation>
-							<xsd:appinfo>
-								<tool:annotation kind="ref">
-									<tool:expected-type type="org.springframework.integration.MessageChannel"/>
-								</tool:annotation>
-							</xsd:appinfo>
-							<xsd:documentation>
-								If a (synchronous) downstream exception is thrown and an "error-channel" is specified,
-								the MessagingException will be sent to this channel. Otherwise, any such exception
-								will simply be logged by the channel adapter.
-							</xsd:documentation>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="protocol" type="xsd:string" use="optional" default="udp">
-						<xsd:annotation>
-							<xsd:documentation>
-								The protocol used to listen for syslog packets, 'udp' or 'tcp'. Default
-								is 'udp'.
-							</xsd:documentation>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="port" type="xsd:string" use="optional">
-						<xsd:annotation>
-							<xsd:documentation>
-								The port on which this adapter listens for syslog packets. Default is 514. This is
-								standard for UDP, but no standard is esablished for TCP - in many cases 514 is
-								used for TCP, but 514 is actually allocated to another protocol.
-							</xsd:documentation>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="converter" type="xsd:string" use="optional">
-						<xsd:annotation>
-							<xsd:appinfo>
-								<tool:annotation kind="ref">
-									<tool:expected-type type="org.springframework.integration.syslog.MessageConverter"/>
-								</tool:annotation>
-							</xsd:appinfo>
-							<xsd:documentation>
-								A converter used to map the UDP/TCP message to a Spring Integration message.
-								Default is DefaultSyslogMessageConverter.
-							</xsd:documentation>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="send-timeout" type="xsd:string" use="optional">
-						<xsd:annotation>
-							<xsd:documentation>
-								A timeout (milliseconds) when sending messages to 'channel' or 'error-channel'. Only
-								applies if the send might block - such as when sending to a bounded QueueChannel that
-								is currently full. Default is infinity.
-							</xsd:documentation>
-						</xsd:annotation>
-					</xsd:attribute>
-				</xsd:extension>
-			</xsd:complexContent>
+			<xsd:sequence minOccurs="0" maxOccurs="1">
+				<xsd:element name="udp-attributes" type="int-ip:udpInboundAdapterType" />
+			</xsd:sequence>
+			<xsd:attribute name="id" type="xsd:string" />
+			<xsd:attribute name="connection-factory" type="xsd:string">
+				<xsd:annotation>
+					<xsd:appinfo>
+						<tool:annotation kind="ref">
+							<tool:expected-type
+								type="org.springframework.integration.ip.tcp.connection.AbstractServerConnectionFactory" />
+						</tool:annotation>
+					</xsd:appinfo>
+					<xsd:documentation>
+						An explicit tcp connection factory; requires protocol="tcp" and
+						incompatible with the 'port' attribute.
+						Use this if you want to set advanced configuration options on the
+						factory. The default factory uses
+						NIO.
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="channel" type="xsd:string">
+				<xsd:annotation>
+					<xsd:appinfo>
+						<tool:annotation kind="ref">
+							<tool:expected-type
+								type="org.springframework.integration.MessageChannel" />
+						</tool:annotation>
+					</xsd:appinfo>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="error-channel" type="xsd:string">
+				<xsd:annotation>
+					<xsd:appinfo>
+						<tool:annotation kind="ref">
+							<tool:expected-type
+								type="org.springframework.integration.MessageChannel" />
+						</tool:annotation>
+					</xsd:appinfo>
+					<xsd:documentation>
+						If a (synchronous) downstream exception is thrown and an
+						"error-channel" is specified,
+						the MessagingException will be sent to this channel. Otherwise, any
+						such exception
+						will simply be logged by the channel adapter.
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="protocol" type="xsd:string" use="optional"
+				default="udp">
+				<xsd:annotation>
+					<xsd:documentation>
+						The protocol used to listen for syslog packets, 'udp' or 'tcp'.
+						Default
+						is 'udp'.
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="port" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation>
+						The port on which this adapter listens for syslog packets. Default is
+						514. This is
+						standard for UDP, but no standard is esablished for TCP - in many cases
+						514 is
+						used for TCP, but 514 is actually allocated to another protocol.
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="converter" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:appinfo>
+						<tool:annotation kind="ref">
+							<tool:expected-type
+								type="org.springframework.integration.syslog.MessageConverter" />
+						</tool:annotation>
+					</xsd:appinfo>
+					<xsd:documentation>
+						A converter used to map the UDP/TCP message to a Spring Integration
+						message.
+						Default is DefaultSyslogMessageConverter.
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="send-timeout" type="xsd:string"
+				use="optional">
+				<xsd:annotation>
+					<xsd:documentation>
+						A timeout (milliseconds) when sending messages to 'channel' or
+						'error-channel'. Only
+						applies if the send might block - such as when sending to a bounded
+						QueueChannel that
+						is currently full. Default is infinity.
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attributeGroup ref="integration:smartLifeCycleAttributeGroup" />
 		</xsd:complexType>
 	</xsd:element>
 
diff --git a/spring-integration-twitter/src/main/resources/org/springframework/integration/twitter/config/spring-integration-twitter-3.0.xsd b/spring-integration-twitter/src/main/resources/org/springframework/integration/twitter/config/spring-integration-twitter-3.0.xsd
index d8ce45c0c9..3a72f4b8a9 100644
--- a/spring-integration-twitter/src/main/resources/org/springframework/integration/twitter/config/spring-integration-twitter-3.0.xsd
+++ b/spring-integration-twitter/src/main/resources/org/springframework/integration/twitter/config/spring-integration-twitter-3.0.xsd
@@ -123,7 +123,7 @@
 		<xsd:sequence>
 				<xsd:element ref="integration:poller" minOccurs="0" maxOccurs="1" />
 		</xsd:sequence>
-		<xsd:attribute name="id" type="xsd:string"/>
+		<xsd:attributeGroup ref="integration:channelAdapterAttributes"/>
 		<xsd:attribute name="twitter-template"  type="xsd:string">
 			<xsd:annotation>
 				<xsd:appinfo>
@@ -136,33 +136,13 @@
 				</xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="auto-startup" type="xsd:string" default="true">
-			<xsd:annotation>
-					<xsd:documentation>
-					Lifecycle attribute signaling whether this component should be started during Application Context startup.
-					Default is 'true'.
-					</xsd:documentation>
-				</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="channel" type="xsd:string">
-			<xsd:annotation>
-				<xsd:appinfo>
-					<tool:annotation kind="ref">
-						<tool:expected-type type="org.springframework.integration.MessageChannel"/>
-					</tool:annotation>
-				</xsd:appinfo>
-				<xsd:documentation>
-					Message Channel to which messages will be sent by this adapter.
-				</xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
 	</xsd:complexType>
 
 	<xsd:complexType name="outbound-twitter-type">
 		<xsd:all>
 			<xsd:element name="request-handler-advice-chain" type="integration:adviceChainType" minOccurs="0" maxOccurs="1" />
 		</xsd:all>
-		<xsd:attribute name="id" type="xsd:string"/>
+		<xsd:attributeGroup ref="integration:channelAdapterAttributes"/>
 			<xsd:attribute name="twitter-template" use="required" type="xsd:string">
 				<xsd:annotation>
 					<xsd:appinfo>
@@ -175,18 +155,6 @@
 					</xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
-			<xsd:attribute name="channel" type="xsd:string">
-				<xsd:annotation>
-					<xsd:appinfo>
-						<tool:annotation kind="ref">
-							<tool:expected-type type="org.springframework.integration.MessageChannel"/>
-						</tool:annotation>
-					</xsd:appinfo>
-					<xsd:documentation>
-						Message Channel where this adapter receives messages to be handled by performing Twitter operations.
-					</xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
 			<xsd:attribute name="order">
 				<xsd:annotation>
 					<xsd:documentation>
diff --git a/spring-integration-ws/src/main/resources/org/springframework/integration/ws/config/spring-integration-ws-3.0.xsd b/spring-integration-ws/src/main/resources/org/springframework/integration/ws/config/spring-integration-ws-3.0.xsd
index 2c87344730..2acea65f47 100644
--- a/spring-integration-ws/src/main/resources/org/springframework/integration/ws/config/spring-integration-ws-3.0.xsd
+++ b/spring-integration-ws/src/main/resources/org/springframework/integration/ws/config/spring-integration-ws-3.0.xsd
@@ -239,7 +239,6 @@
 				</xsd:annotation>
 			</xsd:attribute>
 			<xsd:attribute name="order" type="xsd:string"/>
-			<xsd:attribute name="auto-startup" type="xsd:string" default="true"/>
 			<xsd:attribute name="header-mapper">
 				<xsd:annotation>
 					<xsd:documentation>
@@ -272,6 +271,7 @@ this list can also be simple patterns to be matched against the header names (e.
 						]]></xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
+			<xsd:attributeGroup ref="integration:smartLifeCycleAttributeGroup"/>
 		</xsd:complexType>
 	</xsd:element>
 
diff --git a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/config/AbstractXmppInboundChannelAdapterParser.java b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/config/AbstractXmppInboundChannelAdapterParser.java
index f27c215d61..373fc51e9d 100644
--- a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/config/AbstractXmppInboundChannelAdapterParser.java
+++ b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/config/AbstractXmppInboundChannelAdapterParser.java
@@ -16,6 +16,8 @@
 
 package org.springframework.integration.xmpp.config;
 
+import org.w3c.dom.Element;
+
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
@@ -24,11 +26,10 @@ import org.springframework.integration.config.xml.AbstractChannelAdapterParser;
 import org.springframework.integration.config.xml.IntegrationNamespaceUtils;
 import org.springframework.integration.xmpp.support.DefaultXmppHeaderMapper;
 import org.springframework.util.StringUtils;
-import org.w3c.dom.Element;
 
 /**
  * Base class for XMPP inbound parsers
- * 
+ *
  * @author Oleg Zhurakousky
  * @author Gary Russell
  * @since 2.0.1
@@ -66,12 +67,11 @@ public abstract class AbstractXmppInboundChannelAdapterParser extends AbstractCh
 					"(e.g., <int-xmpp:xmpp-connection .../>). If 'id' is not provided the default will be 'xmppConnection'.");
 		}
 		builder.addPropertyReference("outputChannel", channelName);
-		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "auto-startup");
 		IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, "error-channel");
 		this.postProcess(element, parserContext, builder);
 		return builder.getBeanDefinition();
 	}
-	
+
 	protected void postProcess(Element element, ParserContext parserContext, BeanDefinitionBuilder builder){
 		// no op
 	}
diff --git a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/config/XmppConnectionParser.java b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/config/XmppConnectionParser.java
index 65b21497d0..d430684842 100644
--- a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/config/XmppConnectionParser.java
+++ b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/config/XmppConnectionParser.java
@@ -27,7 +27,7 @@ import org.springframework.util.StringUtils;
 
 /**
  * Parser for 'xmpp:xmpp-connection' element
- * 
+ *
  * @author Oleg Zhurakousky
  * @since 2.0
  */
@@ -50,8 +50,8 @@ public class XmppConnectionParser extends AbstractSingleBeanDefinitionParser {
 	protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
 		String serviceName = element.getAttribute("service-name");
 		String host = element.getAttribute("host");
-		String port = element.getAttribute("port");	
-		BeanDefinitionBuilder connectionConfigurationBuilder = 
+		String port = element.getAttribute("port");
+		BeanDefinitionBuilder connectionConfigurationBuilder =
 			BeanDefinitionBuilder.genericBeanDefinition("org.jivesoftware.smack.ConnectionConfiguration");
 		if (StringUtils.hasText(host)) {
 			Assert.hasLength(port, "Port must be provided if 'host' is specified");
@@ -67,7 +67,8 @@ public class XmppConnectionParser extends AbstractSingleBeanDefinitionParser {
 		for (String attribute : connectionFactoryAttributes) {
 			IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, attribute);
 		}
-		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "auto-startup");
+		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, IntegrationNamespaceUtils.AUTO_STARTUP);
+		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, IntegrationNamespaceUtils.PHASE);
 		builder.addConstructorArgValue(connectionConfigurationBuilder.getBeanDefinition());
 	}
 
diff --git a/spring-integration-xmpp/src/main/resources/org/springframework/integration/xmpp/config/spring-integration-xmpp-3.0.xsd b/spring-integration-xmpp/src/main/resources/org/springframework/integration/xmpp/config/spring-integration-xmpp-3.0.xsd
index 2957992b59..b0b84522cb 100644
--- a/spring-integration-xmpp/src/main/resources/org/springframework/integration/xmpp/config/spring-integration-xmpp-3.0.xsd
+++ b/spring-integration-xmpp/src/main/resources/org/springframework/integration/xmpp/config/spring-integration-xmpp-3.0.xsd
@@ -28,14 +28,6 @@
 					</xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
-			<xsd:attribute name="auto-startup" type="xsd:string" default="true">
-				<xsd:annotation>
-					<xsd:documentation>
-						Lifecycle attribute signaling if this component should be started during Application Context startup.
-						Default is TRUE
-					</xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
 			<xsd:attribute name="password" type="xsd:string" use="required">
 				<xsd:annotation>
 					<xsd:documentation>
@@ -87,6 +79,13 @@
 					</xsd:restriction>
 				</xsd:simpleType>
 			</xsd:attribute>
+			<xsd:attributeGroup ref="integration:smartLifeCycleAttributeGroup">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+                     Note, the default 'phase' value for XmppConnectionFactoryBean is Integer.MIN_VALUE
+				]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attributeGroup>
 		</xsd:complexType>
 	</xsd:element>
 
@@ -153,28 +152,7 @@
 
 
 	<xsd:complexType name="xmppInboundAdapterType">
-			<xsd:attribute name="id" type="xsd:string"/>
-			<xsd:attribute name="auto-startup" type="xsd:string" default="true">
-				<xsd:annotation>
-					<xsd:documentation>
-						Lifecycle attribute signaling if this component should be started during Application Context startup.
-					</xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
-			<xsd:attribute name="channel" type="xsd:string">
-				<xsd:annotation>
-					<xsd:appinfo>
-						<tool:annotation kind="ref">
-							<tool:expected-type type="org.springframework.integration.MessageChannel"/>
-						</tool:annotation>
-					</xsd:appinfo>
-					<xsd:documentation>
-					Identifies channel attached to this adapter. Depending on the type of the adapter
-					this channel could be the receiving channel (e.g., outbound-channel-adapter) or channel where
-					messages will be sent to by this adapter (e.g., inbound-channel-adapter).
-					</xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
+		<xsd:attributeGroup ref="integration:channelAdapterAttributes"/>
 			<xsd:attribute name="error-channel" type="xsd:string">
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
@@ -218,21 +196,7 @@
 				<xsd:element ref="integration:poller" minOccurs="0" maxOccurs="1" />
 				<xsd:element name="request-handler-advice-chain" type="integration:adviceChainType" minOccurs="0" maxOccurs="1" />
 			</xsd:choice>
-			<xsd:attribute name="id" type="xsd:string"/>
-			<xsd:attribute name="channel"  type="xsd:string">
-				<xsd:annotation>
-					<xsd:appinfo>
-						<tool:annotation kind="ref">
-							<tool:expected-type type="org.springframework.integration.MessageChannel"/>
-						</tool:annotation>
-					</xsd:appinfo>
-					<xsd:documentation>
-					Identifies channel attached to this adapter. Depending on the type of the adapter
-					this channel could be the receiving channel (e.g., outbound-channel-adapter) or channel where
-					messages will be sent to by this adapter (e.g., inbound-channel-adapter).
-					</xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
+			<xsd:attributeGroup ref="integration:channelAdapterAttributes"/>
 			<xsd:attribute name="xmpp-connection" type="xsd:string">
 				<xsd:annotation>
 					<xsd:appinfo>