INT-727, INT-728 Refactored parsers so that default beans (errorChannel, nullChannel, and taskScheduler) will always be configured - even when not using the core namespace. Also added support for the 'auto-startup' attribute on several adapters.

org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/config/AbstractRemotingGatewayParser.java

@@ -61,6 +61,10 @@ public abstract class AbstractRemotingGatewayParser extends AbstractSimpleBeanDe
 		if (StringUtils.hasText(replyChannel)) {
 			builder.addPropertyReference("replyChannel", replyChannel);
 		}
+		String autoStartup = element.getAttribute("auto-startup");
+		if (StringUtils.hasText(autoStartup)) {
+			builder.addPropertyValue("autoStartup", autoStartup);
+		}
 		this.doPostProcess(builder, element);
 	}
 

org.springframework.integration.file/src/main/java/org/springframework/integration/file/config/FileNamespaceHandler.java

@@ -16,7 +16,7 @@
 
 package org.springframework.integration.file.config;
 
-import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
+import org.springframework.integration.config.xml.AbstractIntegrationNamespaceHandler;
 
 /**
  * Namespace handler for Spring Integration's 'file' namespace.
@@ -24,7 +24,7 @@ import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
  * @author Iwein Fuld
  * @author Mark Fisher
  */
-public class FileNamespaceHandler extends NamespaceHandlerSupport {
+public class FileNamespaceHandler extends AbstractIntegrationNamespaceHandler {
 
 	public void init() {
 		registerBeanDefinitionParser("inbound-channel-adapter", new FileInboundChannelAdapterParser());

org.springframework.integration.file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-1.0.xsd

@@ -10,7 +10,8 @@
 
 	<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"/>
+	<xsd:import namespace="http://www.springframework.org/schema/integration"
+			schemaLocation="http://www.springframework.org/schema/integration/spring-integration-1.0.xsd"/>
 
 	<xsd:annotation>
 		<xsd:documentation><![CDATA[

org.springframework.integration.file/src/test/java/org/springframework/integration/file/config/DefaultConfigurationTests-context.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:file="http://www.springframework.org/schema/integration/file"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/integration/file
+			http://www.springframework.org/schema/integration/file/spring-integration-file-1.0.xsd">
+
+	<file:outbound-channel-adapter id="adapter" directory="file:${java.io.tmpdir}" auto-startup="false"/>
+
+</beans>

org.springframework.integration.file/src/test/java/org/springframework/integration/file/config/DefaultConfigurationTests.java

@@ -0,0 +1,66 @@
+/*
+ * Copyright 2002-2009 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.integration.file.config;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.integration.channel.NullChannel;
+import org.springframework.integration.channel.PublishSubscribeChannel;
+import org.springframework.integration.scheduling.SimpleTaskScheduler;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+/**
+ * @author Mark Fisher
+ * @since 1.0.3
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration
+public class DefaultConfigurationTests {
+
+	@Autowired
+	private ApplicationContext context;
+
+
+	@Test
+	public void verifyErrorChannel() {
+		Object errorChannel = context.getBean("errorChannel");
+		assertNotNull(errorChannel);
+		assertEquals(PublishSubscribeChannel.class, errorChannel.getClass());
+	}
+
+	@Test
+	public void verifyNullChannel() {
+		Object nullChannel = context.getBean("nullChannel");
+		assertNotNull(nullChannel);
+		assertEquals(NullChannel.class, nullChannel.getClass());
+	}
+
+	@Test
+	public void verifyTaskScheduler() {
+		Object taskScheduler = context.getBean("taskScheduler");
+		assertNotNull(taskScheduler);
+		assertEquals(SimpleTaskScheduler.class, taskScheduler.getClass());
+	}
+
+}

org.springframework.integration.http/src/main/java/org/springframework/integration/http/config/HttpNamespaceHandler.java

@@ -16,7 +16,7 @@
 
 package org.springframework.integration.http.config;
 
-import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
+import org.springframework.integration.config.xml.AbstractIntegrationNamespaceHandler;
 
 /**
  * Namespace handler for Spring Integration's <em>http</em> namespace.
@@ -24,7 +24,7 @@ import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
  * @author Mark Fisher
  * @since 1.0.2
  */
-public class HttpNamespaceHandler extends NamespaceHandlerSupport {
+public class HttpNamespaceHandler extends AbstractIntegrationNamespaceHandler {
 
 	public void init() {
 		this.registerBeanDefinitionParser("inbound-channel-adapter", new HttpInboundEndpointParser(false));

org.springframework.integration.http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-1.0.xsd

@@ -3,14 +3,12 @@
 		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/http"
 		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/integration"/>
 
 	<xsd:annotation>
 		<xsd:documentation><![CDATA[

org.springframework.integration.http/src/test/java/org/springframework/integration/http/config/DefaultConfigurationTests-context.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:http="http://www.springframework.org/schema/integration/http"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/integration/http
+			http://www.springframework.org/schema/integration/http/spring-integration-http-1.0.xsd">
+
+	<http:outbound-gateway request-channel="testChannel" auto-startup="false"/>
+
+</beans>

org.springframework.integration.http/src/test/java/org/springframework/integration/http/config/DefaultConfigurationTests.java

@@ -0,0 +1,66 @@
+/*
+ * Copyright 2002-2009 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.integration.http.config;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.integration.channel.NullChannel;
+import org.springframework.integration.channel.PublishSubscribeChannel;
+import org.springframework.integration.scheduling.SimpleTaskScheduler;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+/**
+ * @author Mark Fisher
+ * @since 1.0.3
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration
+public class DefaultConfigurationTests {
+
+	@Autowired
+	private ApplicationContext context;
+
+
+	@Test
+	public void verifyErrorChannel() {
+		Object errorChannel = context.getBean("errorChannel");
+		assertNotNull(errorChannel);
+		assertEquals(PublishSubscribeChannel.class, errorChannel.getClass());
+	}
+
+	@Test
+	public void verifyNullChannel() {
+		Object nullChannel = context.getBean("nullChannel");
+		assertNotNull(nullChannel);
+		assertEquals(NullChannel.class, nullChannel.getClass());
+	}
+
+	@Test
+	public void verifyTaskScheduler() {
+		Object taskScheduler = context.getBean("taskScheduler");
+		assertNotNull(taskScheduler);
+		assertEquals(SimpleTaskScheduler.class, taskScheduler.getClass());
+	}
+
+}

org.springframework.integration.httpinvoker/src/main/java/org/springframework/integration/httpinvoker/config/HttpInvokerNamespaceHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2009 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,14 +16,14 @@
 
 package org.springframework.integration.httpinvoker.config;
 
-import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
+import org.springframework.integration.config.xml.AbstractIntegrationNamespaceHandler;
 
 /**
  * Namespace handler for Spring Integration's <em>httpinvoker</em> namespace.
  * 
  * @author Mark Fisher
  */
-public class HttpInvokerNamespaceHandler extends NamespaceHandlerSupport {
+public class HttpInvokerNamespaceHandler extends AbstractIntegrationNamespaceHandler {
 
 	public void init() {
 		this.registerBeanDefinitionParser("inbound-gateway", new HttpInvokerInboundGatewayParser());

org.springframework.integration.httpinvoker/src/main/resources/org/springframework/integration/httpinvoker/config/spring-integration-httpinvoker-1.0.xsd

@@ -10,7 +10,8 @@
 
 	<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"/>
+	<xsd:import namespace="http://www.springframework.org/schema/integration"
+			schemaLocation="http://www.springframework.org/schema/integration/spring-integration-1.0.xsd"/>
 
 	<xsd:annotation>
 		<xsd:documentation><![CDATA[
@@ -79,6 +80,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"/>
 	</xsd:complexType>
 
 </xsd:schema>

org.springframework.integration.httpinvoker/src/test/java/org/springframework/integration/httpinvoker/config/DefaultConfigurationTests-context.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:httpinvoker="http://www.springframework.org/schema/integration/httpinvoker"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/integration/httpinvoker
+			http://www.springframework.org/schema/integration/httpinvoker/spring-integration-httpinvoker-1.0.xsd">
+
+	<httpinvoker:outbound-gateway url="testUrl" request-channel="testChannel" auto-startup="false"/>
+
+</beans>

org.springframework.integration.httpinvoker/src/test/java/org/springframework/integration/httpinvoker/config/DefaultConfigurationTests.java

@@ -0,0 +1,66 @@
+/*
+ * Copyright 2002-2009 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.integration.httpinvoker.config;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.integration.channel.NullChannel;
+import org.springframework.integration.channel.PublishSubscribeChannel;
+import org.springframework.integration.scheduling.SimpleTaskScheduler;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+/**
+ * @author Mark Fisher
+ * @since 1.0.3
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration
+public class DefaultConfigurationTests {
+
+	@Autowired
+	private ApplicationContext context;
+
+
+	@Test
+	public void verifyErrorChannel() {
+		Object errorChannel = context.getBean("errorChannel");
+		assertNotNull(errorChannel);
+		assertEquals(PublishSubscribeChannel.class, errorChannel.getClass());
+	}
+
+	@Test
+	public void verifyNullChannel() {
+		Object nullChannel = context.getBean("nullChannel");
+		assertNotNull(nullChannel);
+		assertEquals(NullChannel.class, nullChannel.getClass());
+	}
+
+	@Test
+	public void verifyTaskScheduler() {
+		Object taskScheduler = context.getBean("taskScheduler");
+		assertNotNull(taskScheduler);
+		assertEquals(SimpleTaskScheduler.class, taskScheduler.getClass());
+	}
+
+}

org.springframework.integration.jms/.classpath

@@ -11,6 +11,7 @@
 	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/2.5.6.A/org.springframework.context-2.5.6.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/2.5.6.A/org.springframework.context-sources-2.5.6.A.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/2.5.6.A/org.springframework.core-2.5.6.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/2.5.6.A/org.springframework.core-sources-2.5.6.A.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.jms/2.5.6.A/org.springframework.jms-2.5.6.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.jms/2.5.6.A/org.springframework.jms-sources-2.5.6.A.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/2.5.6.A/org.springframework.test-2.5.6.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.test/2.5.6.A/org.springframework.test-sources-2.5.6.A.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.transaction/2.5.6.A/org.springframework.transaction-2.5.6.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.transaction/2.5.6.A/org.springframework.transaction-sources-2.5.6.A.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.integration"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.integration.adapter"/>

org.springframework.integration.jms/ivy.xml

@@ -23,6 +23,7 @@
 		<dependency org="javax.jms" name="com.springsource.javax.jms" rev="1.1.0" conf="provided->runtime"/>
 		<dependency org="org.junit" name="com.springsource.org.junit" rev="${junit.version}" conf="test->runtime"/>
 		<dependency org="org.springframework" name="org.springframework.jms" rev="${spring.version}" conf="compile->runtime"/>
+		<dependency org="org.springframework" name="org.springframework.test" rev="${spring.version}" conf="test->runtime"/>
 		<dependency org="org.springframework" name="org.springframework.transaction" rev="${spring.version}" conf="compile->runtime"/>
 		<dependency org="org.springframework.integration" name="org.springframework.integration" rev="latest.integration" conf="compile->compile"/>
 		<dependency org="org.springframework.integration" name="org.springframework.integration.adapter" rev="latest.integration" conf="compile->compile"/>

org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/config/JmsNamespaceHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2009 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 
 package org.springframework.integration.jms.config;
 
-import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
+import org.springframework.integration.config.xml.AbstractIntegrationNamespaceHandler;
 import org.springframework.integration.config.xml.SimpleHeaderEnricherParser;
 import org.springframework.integration.jms.JmsHeaders;
 
@@ -25,7 +25,7 @@ import org.springframework.integration.jms.JmsHeaders;
  * 
  * @author Mark Fisher
  */
-public class JmsNamespaceHandler extends NamespaceHandlerSupport {
+public class JmsNamespaceHandler extends AbstractIntegrationNamespaceHandler {
 
 	public void init() {
 		this.registerBeanDefinitionParser("inbound-gateway", new JmsMessageDrivenEndpointParser(true));

org.springframework.integration.jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-1.0.xsd

@@ -10,7 +10,8 @@
 
 	<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"/>
+	<xsd:import namespace="http://www.springframework.org/schema/integration"
+			schemaLocation="http://www.springframework.org/schema/integration/spring-integration-1.0.xsd"/>
 
 	<xsd:annotation>
 		<xsd:documentation><![CDATA[
@@ -79,7 +80,6 @@
 					<xsd:attribute name="max-concurrent-consumers" type="xsd:string"/>
 					<xsd:attribute name="max-messages-per-task" type="xsd:string"/>
 					<xsd:attribute name="idle-task-execution-limit" type="xsd:string"/>
-					<xsd:attribute name="auto-startup" type="xsd:string" default="true"/>
 				</xsd:extension>
 			</xsd:complexContent>
 		</xsd:complexType>
@@ -214,7 +214,6 @@
 					<xsd:attribute name="max-concurrent-consumers" type="xsd:string"/>
 					<xsd:attribute name="max-messages-per-task" type="xsd:string"/>
 					<xsd:attribute name="idle-task-execution-limit" type="xsd:string"/>
-					<xsd:attribute name="auto-startup" type="xsd:string" default="true"/>
 				</xsd:extension>
 			</xsd:complexContent>
 		</xsd:complexType>
@@ -314,6 +313,7 @@
 			<xsd:attribute name="delivery-mode" type="xsd:string"/>
 			<xsd:attribute name="time-to-live" type="xsd:string"/>
 			<xsd:attribute name="priority" type="xsd:string"/>
+			<xsd:attribute name="auto-startup" type="xsd:string" default="true"/>
 			<xsd:attribute name="order" type="xsd:string">
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
@@ -468,6 +468,7 @@
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="pub-sub-domain" type="xsd:string"/>
+		<xsd:attribute name="auto-startup" type="xsd:string" default="true"/>
 	</xsd:complexType>
 
 	<xsd:complexType name="transformerType">
@@ -489,7 +490,7 @@
 					</tool:annotation>
 				</xsd:appinfo>
 			</xsd:annotation>
-		</xsd:attribute>		
+		</xsd:attribute>
 	</xsd:complexType>
 
 </xsd:schema>

org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/DefaultConfigurationTests-context.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:jms="http://www.springframework.org/schema/integration/jms"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/integration/jms
+			http://www.springframework.org/schema/integration/jms/spring-integration-jms-1.0.xsd">
+
+	<jms:outbound-channel-adapter id="adapter" destination-name="testQueue" auto-startup="false"/>
+
+	<bean id="connectionFactory" class="org.springframework.jms.connection.SingleConnectionFactory">
+		<constructor-arg>
+			<bean class="org.springframework.integration.jms.StubConnection">
+				<constructor-arg value="message-driven-test"/>
+			</bean>
+		</constructor-arg>
+	</bean>
+
+</beans>

org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/DefaultConfigurationTests.java

@@ -0,0 +1,66 @@
+/*
+ * Copyright 2002-2009 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.integration.jms.config;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.integration.channel.NullChannel;
+import org.springframework.integration.channel.PublishSubscribeChannel;
+import org.springframework.integration.scheduling.SimpleTaskScheduler;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+/**
+ * @author Mark Fisher
+ * @since 1.0.3
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration
+public class DefaultConfigurationTests {
+
+	@Autowired
+	private ApplicationContext context;
+
+
+	@Test
+	public void verifyErrorChannel() {
+		Object errorChannel = context.getBean("errorChannel");
+		assertNotNull(errorChannel);
+		assertEquals(PublishSubscribeChannel.class, errorChannel.getClass());
+	}
+
+	@Test
+	public void verifyNullChannel() {
+		Object nullChannel = context.getBean("nullChannel");
+		assertNotNull(nullChannel);
+		assertEquals(NullChannel.class, nullChannel.getClass());
+	}
+
+	@Test
+	public void verifyTaskScheduler() {
+		Object taskScheduler = context.getBean("taskScheduler");
+		assertNotNull(taskScheduler);
+		assertEquals(SimpleTaskScheduler.class, taskScheduler.getClass());
+	}
+
+}

org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/config/MailNamespaceHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2009 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 
 package org.springframework.integration.mail.config;
 
-import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
+import org.springframework.integration.config.xml.AbstractIntegrationNamespaceHandler;
 import org.springframework.integration.config.xml.SimpleHeaderEnricherParser;
 import org.springframework.integration.mail.MailHeaders;
 
@@ -25,7 +25,7 @@ import org.springframework.integration.mail.MailHeaders;
  * 
  * @author Mark Fisher
  */
-public class MailNamespaceHandler extends NamespaceHandlerSupport {
+public class MailNamespaceHandler extends AbstractIntegrationNamespaceHandler {
 
 	public void init() {
 		this.registerBeanDefinitionParser("outbound-channel-adapter", new MailOutboundChannelAdapterParser());

org.springframework.integration.mail/src/main/resources/org/springframework/integration/mail/config/spring-integration-mail-1.0.xsd

@@ -10,7 +10,8 @@
 
 	<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"/>
+	<xsd:import namespace="http://www.springframework.org/schema/integration"
+			schemaLocation="http://www.springframework.org/schema/integration/spring-integration-1.0.xsd"/>
 
 	<xsd:annotation>
 		<xsd:documentation><![CDATA[
@@ -57,6 +58,7 @@
 					</xsd:appinfo>
 				</xsd:annotation>
 			</xsd:attribute>
+			<xsd:attribute name="auto-startup" type="xsd:string" default="true"/>
 		</xsd:complexType>
 	</xsd:element>
 
@@ -137,7 +139,7 @@
 					]]></xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
-			<xsd:attribute name="auto-startup" type="xsd:string"/>
+			<xsd:attribute name="auto-startup" type="xsd:string" default="true"/>
 		</xsd:complexType>
 	</xsd:element>
 

org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/config/DefaultConfigurationTests-context.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:mail="http://www.springframework.org/schema/integration/mail"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/integration/mail
+			http://www.springframework.org/schema/integration/mail/spring-integration-mail-1.0.xsd">
+
+	<mail:outbound-channel-adapter id="adapter" mail-sender="mailSender" auto-startup="false"/>
+
+	<bean id="mailSender" class="org.springframework.integration.mail.StubJavaMailSender">
+		<constructor-arg>
+			<bean class="javax.mail.internet.MimeMessage">
+				<constructor-arg type="javax.mail.Session"><null/></constructor-arg>
+			</bean>
+		</constructor-arg>
+	</bean>
+
+</beans>

org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/config/DefaultConfigurationTests.java

@@ -0,0 +1,66 @@
+/*
+ * Copyright 2002-2009 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.integration.mail.config;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.integration.channel.NullChannel;
+import org.springframework.integration.channel.PublishSubscribeChannel;
+import org.springframework.integration.scheduling.SimpleTaskScheduler;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+/**
+ * @author Mark Fisher
+ * @since 1.0.3
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration
+public class DefaultConfigurationTests {
+
+	@Autowired
+	private ApplicationContext context;
+
+
+	@Test
+	public void verifyErrorChannel() {
+		Object errorChannel = context.getBean("errorChannel");
+		assertNotNull(errorChannel);
+		assertEquals(PublishSubscribeChannel.class, errorChannel.getClass());
+	}
+
+	@Test
+	public void verifyNullChannel() {
+		Object nullChannel = context.getBean("nullChannel");
+		assertNotNull(nullChannel);
+		assertEquals(NullChannel.class, nullChannel.getClass());
+	}
+
+	@Test
+	public void verifyTaskScheduler() {
+		Object taskScheduler = context.getBean("taskScheduler");
+		assertNotNull(taskScheduler);
+		assertEquals(SimpleTaskScheduler.class, taskScheduler.getClass());
+	}
+
+}

org.springframework.integration.rmi/src/main/java/org/springframework/integration/rmi/config/RmiNamespaceHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2009 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,14 +16,14 @@
 
 package org.springframework.integration.rmi.config;
 
-import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
+import org.springframework.integration.config.xml.AbstractIntegrationNamespaceHandler;
 
 /**
  * Namespace handler for Spring Integration's <em>rmi</em> namespace.
  * 
  * @author Mark Fisher
  */
-public class RmiNamespaceHandler extends NamespaceHandlerSupport {
+public class RmiNamespaceHandler extends AbstractIntegrationNamespaceHandler {
 
 	public void init() {
 		this.registerBeanDefinitionParser("inbound-gateway", new RmiInboundGatewayParser());

org.springframework.integration.rmi/src/main/resources/org/springframework/integration/rmi/config/spring-integration-rmi-1.0.xsd

@@ -10,7 +10,8 @@
 
 	<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"/>
+	<xsd:import namespace="http://www.springframework.org/schema/integration"
+			schemaLocation="http://www.springframework.org/schema/integration/spring-integration-1.0.xsd"/>
 
 	<xsd:annotation>
 		<xsd:documentation><![CDATA[
@@ -92,6 +93,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:complexType>
 
 </xsd:schema>

org.springframework.integration.rmi/src/test/java/org/springframework/integration/rmi/config/DefaultConfigurationTests-context.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:rmi="http://www.springframework.org/schema/integration/rmi"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/integration/rmi
+			http://www.springframework.org/schema/integration/rmi/spring-integration-rmi-1.0.xsd">
+
+	<rmi:outbound-gateway remote-channel="remote" request-channel="local" host="testhost" auto-startup="false"/>
+
+</beans>

org.springframework.integration.rmi/src/test/java/org/springframework/integration/rmi/config/DefaultConfigurationTests.java

@@ -0,0 +1,66 @@
+/*
+ * Copyright 2002-2009 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.integration.rmi.config;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.integration.channel.NullChannel;
+import org.springframework.integration.channel.PublishSubscribeChannel;
+import org.springframework.integration.scheduling.SimpleTaskScheduler;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+/**
+ * @author Mark Fisher
+ * @since 1.0.3
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration
+public class DefaultConfigurationTests {
+
+	@Autowired
+	private ApplicationContext context;
+
+
+	@Test
+	public void verifyErrorChannel() {
+		Object errorChannel = context.getBean("errorChannel");
+		assertNotNull(errorChannel);
+		assertEquals(PublishSubscribeChannel.class, errorChannel.getClass());
+	}
+
+	@Test
+	public void verifyNullChannel() {
+		Object nullChannel = context.getBean("nullChannel");
+		assertNotNull(nullChannel);
+		assertEquals(NullChannel.class, nullChannel.getClass());
+	}
+
+	@Test
+	public void verifyTaskScheduler() {
+		Object taskScheduler = context.getBean("taskScheduler");
+		assertNotNull(taskScheduler);
+		assertEquals(SimpleTaskScheduler.class, taskScheduler.getClass());
+	}
+
+}

org.springframework.integration.security/src/main/java/org/springframework/integration/security/config/IntegrationSecurityNamespaceHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2009 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,14 +16,14 @@
 
 package org.springframework.integration.security.config;
 
-import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
+import org.springframework.integration.config.xml.AbstractIntegrationNamespaceHandler;
 
 /**
  * Namespace handler for the security namespace.
  * 
  * @author Jonas Partner
  */
-public class IntegrationSecurityNamespaceHandler extends NamespaceHandlerSupport {
+public class IntegrationSecurityNamespaceHandler extends AbstractIntegrationNamespaceHandler {
 
 	public void init() {
 		registerBeanDefinitionParser("secured-channels", new SecuredChannelsParser());

org.springframework.integration.security/src/test/java/org/springframework/integration/security/config/DefaultConfigurationTests-context.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:security="http://www.springframework.org/schema/integration/security"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/integration/security
+			http://www.springframework.org/schema/integration/security/spring-integration-security-1.0.xsd">
+
+	<import resource="classpath:org/springframework/integration/security/config/commonSecurityConfiguration.xml"/>
+
+	<security:secured-channels>
+		<security:access-policy pattern="test" send-access="ROLE_ADMIN"/>
+	</security:secured-channels>
+
+</beans>

org.springframework.integration.security/src/test/java/org/springframework/integration/security/config/DefaultConfigurationTests.java

@@ -0,0 +1,66 @@
+/*
+ * Copyright 2002-2009 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.integration.security.config;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.integration.channel.NullChannel;
+import org.springframework.integration.channel.PublishSubscribeChannel;
+import org.springframework.integration.scheduling.SimpleTaskScheduler;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+/**
+ * @author Mark Fisher
+ * @since 1.0.3
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration
+public class DefaultConfigurationTests {
+
+	@Autowired
+	private ApplicationContext context;
+
+
+	@Test
+	public void verifyErrorChannel() {
+		Object errorChannel = context.getBean("errorChannel");
+		assertNotNull(errorChannel);
+		assertEquals(PublishSubscribeChannel.class, errorChannel.getClass());
+	}
+
+	@Test
+	public void verifyNullChannel() {
+		Object nullChannel = context.getBean("nullChannel");
+		assertNotNull(nullChannel);
+		assertEquals(NullChannel.class, nullChannel.getClass());
+	}
+
+	@Test
+	public void verifyTaskScheduler() {
+		Object taskScheduler = context.getBean("taskScheduler");
+		assertNotNull(taskScheduler);
+		assertEquals(SimpleTaskScheduler.class, taskScheduler.getClass());
+	}
+
+}

org.springframework.integration.security/src/test/java/org/springframework/integration/security/config/commonSecurityConfiguration.xml

@@ -8,8 +8,6 @@
 			http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
 			http://www.springframework.org/schema/security
 			http://www.springframework.org/schema/security/spring-security-2.0.xsd
-			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
 			http://www.springframework.org/schema/context
 			http://www.springframework.org/schema/context/spring-context-2.5.xsd">
 

org.springframework.integration.stream/.classpath

@@ -9,6 +9,7 @@
 	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/2.5.6.A/org.springframework.beans-2.5.6.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/2.5.6.A/org.springframework.beans-sources-2.5.6.A.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/2.5.6.A/org.springframework.context-2.5.6.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/2.5.6.A/org.springframework.context-sources-2.5.6.A.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/2.5.6.A/org.springframework.core-2.5.6.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/2.5.6.A/org.springframework.core-sources-2.5.6.A.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/2.5.6.A/org.springframework.test-2.5.6.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.test/2.5.6.A/org.springframework.test-sources-2.5.6.A.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.integration"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/config/StreamNamespaceHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2009 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,12 +16,12 @@
 
 package org.springframework.integration.stream.config;
 
-import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
+import org.springframework.integration.config.xml.AbstractIntegrationNamespaceHandler;
 
 /**
  * @author Mark Fisher
  */
-public class StreamNamespaceHandler extends NamespaceHandlerSupport {
+public class StreamNamespaceHandler extends AbstractIntegrationNamespaceHandler {
 
 	public void init() {
 		this.registerBeanDefinitionParser("stdin-channel-adapter", new ConsoleInboundChannelAdapterParser());

org.springframework.integration.stream/src/main/resources/org/springframework/integration/stream/config/spring-integration-stream-1.0.xsd

@@ -10,7 +10,8 @@
 
 	<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"/>
+	<xsd:import namespace="http://www.springframework.org/schema/integration"
+			schemaLocation="http://www.springframework.org/schema/integration/spring-integration-1.0.xsd"/>
 
 	<xsd:annotation>
 		<xsd:documentation><![CDATA[
@@ -66,6 +67,7 @@
 		</xsd:attribute>
 		<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:complexType>
 
 </xsd:schema>

org.springframework.integration.stream/src/test/java/org/springframework/integration/stream/config/DefaultConfigurationTests-context.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:stream="http://www.springframework.org/schema/integration/stream"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/integration/stream
+			http://www.springframework.org/schema/integration/stream/spring-integration-stream-1.0.xsd">
+
+	<stream:stdout-channel-adapter id="adapter" auto-startup="false"/>
+
+</beans>

org.springframework.integration.stream/src/test/java/org/springframework/integration/stream/config/DefaultConfigurationTests.java

@@ -0,0 +1,66 @@
+/*
+ * Copyright 2002-2009 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.integration.stream.config;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.integration.channel.NullChannel;
+import org.springframework.integration.channel.PublishSubscribeChannel;
+import org.springframework.integration.scheduling.SimpleTaskScheduler;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+/**
+ * @author Mark Fisher
+ * @since 1.0.3
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration
+public class DefaultConfigurationTests {
+
+	@Autowired
+	private ApplicationContext context;
+
+
+	@Test
+	public void verifyErrorChannel() {
+		Object errorChannel = context.getBean("errorChannel");
+		assertNotNull(errorChannel);
+		assertEquals(PublishSubscribeChannel.class, errorChannel.getClass());
+	}
+
+	@Test
+	public void verifyNullChannel() {
+		Object nullChannel = context.getBean("nullChannel");
+		assertNotNull(nullChannel);
+		assertEquals(NullChannel.class, nullChannel.getClass());
+	}
+
+	@Test
+	public void verifyTaskScheduler() {
+		Object taskScheduler = context.getBean("taskScheduler");
+		assertNotNull(taskScheduler);
+		assertEquals(SimpleTaskScheduler.class, taskScheduler.getClass());
+	}
+
+}

org.springframework.integration.ws/src/main/java/org/springframework/integration/ws/config/WsNamespaceHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2009 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,13 +16,13 @@
 
 package org.springframework.integration.ws.config;
 
-import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
+import org.springframework.integration.config.xml.AbstractIntegrationNamespaceHandler;
 
 /**
  * @author Mark Fisher
  * @author Iwein Fuld
  */
-public class WsNamespaceHandler extends NamespaceHandlerSupport {
+public class WsNamespaceHandler extends AbstractIntegrationNamespaceHandler {
 
 	public void init() {
 		this.registerBeanDefinitionParser("outbound-gateway", new WebServiceOutboundGatewayParser());

org.springframework.integration.ws/src/main/resources/org/springframework/integration/ws/config/spring-integration-ws-1.0.xsd

@@ -10,7 +10,8 @@
 
 	<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"/>
+	<xsd:import namespace="http://www.springframework.org/schema/integration"
+			schemaLocation="http://www.springframework.org/schema/integration/spring-integration-1.0.xsd"/>
 
 	<xsd:annotation>
 		<xsd:documentation><![CDATA[
@@ -170,7 +171,7 @@
 			</xsd:attribute>
 			<xsd:attribute name="message-senders" type="xsd:string"/>
 			<xsd:attribute name="order" type="xsd:string"/>
-			<xsd:attribute name="auto-startup" type="xsd:string"/>
+			<xsd:attribute name="auto-startup" type="xsd:string" default="true"/>
 		</xsd:complexType>
 	</xsd:element>
 
@@ -221,4 +222,5 @@
 			<xsd:attribute name="extract-payload" type="xsd:boolean"/>
 		</xsd:complexType>
 	</xsd:element>
+
 </xsd:schema>

org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/DefaultConfigurationTests-context.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:ws="http://www.springframework.org/schema/integration/ws"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/integration/ws
+			http://www.springframework.org/schema/integration/ws/spring-integration-ws-1.0.xsd">
+
+	<ws:outbound-gateway request-channel="testChannel" uri="testUri" auto-startup="false"/>
+
+</beans>

org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/DefaultConfigurationTests.java

@@ -0,0 +1,66 @@
+/*
+ * Copyright 2002-2009 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.integration.ws.config;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.integration.channel.NullChannel;
+import org.springframework.integration.channel.PublishSubscribeChannel;
+import org.springframework.integration.scheduling.SimpleTaskScheduler;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+/**
+ * @author Mark Fisher
+ * @since 1.0.3
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration
+public class DefaultConfigurationTests {
+
+	@Autowired
+	private ApplicationContext context;
+
+
+	@Test
+	public void verifyErrorChannel() {
+		Object errorChannel = context.getBean("errorChannel");
+		assertNotNull(errorChannel);
+		assertEquals(PublishSubscribeChannel.class, errorChannel.getClass());
+	}
+
+	@Test
+	public void verifyNullChannel() {
+		Object nullChannel = context.getBean("nullChannel");
+		assertNotNull(nullChannel);
+		assertEquals(NullChannel.class, nullChannel.getClass());
+	}
+
+	@Test
+	public void verifyTaskScheduler() {
+		Object taskScheduler = context.getBean("taskScheduler");
+		assertNotNull(taskScheduler);
+		assertEquals(SimpleTaskScheduler.class, taskScheduler.getClass());
+	}
+
+}

org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/config/IntegrationXmlNamespaceHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2009 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,12 +16,12 @@
 
 package org.springframework.integration.xml.config;
 
-import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
+import org.springframework.integration.config.xml.AbstractIntegrationNamespaceHandler;
 
 /**
  * @author Jonas Partner
  */
-public class IntegrationXmlNamespaceHandler extends NamespaceHandlerSupport {
+public class IntegrationXmlNamespaceHandler extends AbstractIntegrationNamespaceHandler {
 
 	public void init() {
 		registerBeanDefinitionParser("marshalling-transformer", new XmlMarshallingTransformerParser());

org.springframework.integration.xml/src/main/resources/org/springframework/integration/xml/config/spring-integration-xml-1.0.xsd

@@ -3,13 +3,14 @@
 		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:si-core="http://www.springframework.org/schema/integration"
+		xmlns:integration="http://www.springframework.org/schema/integration"
 		targetNamespace="http://www.springframework.org/schema/integration/xml"
 		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/integration" />
+	<xsd:import namespace="http://www.springframework.org/schema/integration"
+			schemaLocation="http://www.springframework.org/schema/integration/spring-integration-1.0.xsd"/>
 
 	<xsd:annotation>
 		<xsd:documentation>
@@ -157,7 +158,7 @@
 			</xsd:annotation>
 			<xsd:sequence>
 				<xsd:element ref="xpath-expression" minOccurs="0" maxOccurs="1"/>
-				<xsd:element ref="si-core:poller" minOccurs="0" maxOccurs="1"/>
+				<xsd:element ref="integration:poller" minOccurs="0" maxOccurs="1"/>
 			</xsd:sequence>
 			<xsd:attribute name="id" type="xsd:string" use="required"/>
 			<xsd:attribute name="input-channel" type="xsd:string">
@@ -292,11 +293,11 @@
 		<xsd:complexType>
 			<xsd:annotation>
 				<xsd:documentation>
-					Defines an validating router.
+	Defines a validating router.
 				</xsd:documentation>
 			</xsd:annotation>
 			<xsd:sequence>
-				<xsd:element ref="si-core:poller" minOccurs="0" maxOccurs="1"/>
+				<xsd:element ref="integration:poller" minOccurs="0" maxOccurs="1"/>
 			</xsd:sequence>
 			<xsd:attribute name="id" type="xsd:string" use="required"/>
 			<xsd:attribute name="input-channel" type="xsd:string">
@@ -321,19 +322,19 @@
 			<xsd:attribute name="invalid-channel" type="xsd:string" use="required" />
 			<xsd:attribute name="schema-location" use="required" />
 			<xsd:attribute name="schema-type" default="xml-schema">
-						<xsd:simpleType>
-							<xsd:restriction base="xsd:string">
-								<xsd:enumeration value="xml-schema"/>
-								<xsd:enumeration value="relax-ng"/>
-							</xsd:restriction>
-						</xsd:simpleType>
-					</xsd:attribute>
+				<xsd:simpleType>
+					<xsd:restriction base="xsd:string">
+						<xsd:enumeration value="xml-schema"/>
+						<xsd:enumeration value="relax-ng"/>
+					</xsd:restriction>
+				</xsd:simpleType>
+			</xsd:attribute>
 		</xsd:complexType>
 	</xsd:element>
 
 	<xsd:complexType name="inputOutputEndpoint">
 		<xsd:sequence>
-			<xsd:element ref="si-core:poller" minOccurs="0" maxOccurs="1"/>
+			<xsd:element ref="integration:poller" minOccurs="0" maxOccurs="1"/>
 		</xsd:sequence>
 		<xsd:attribute name="id" type="xsd:string" use="optional"/>
 		<xsd:attribute name="input-channel" type="xsd:string">

org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/DefaultConfigurationTests-context.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:si-xml="http://www.springframework.org/schema/integration/xml"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/integration/xml
+			http://www.springframework.org/schema/integration/xml/spring-integration-xml-1.0.xsd">
+
+	<si-xml:xpath-expression id="testExpression" expression="test"/>
+
+</beans>

org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/DefaultConfigurationTests.java

@@ -0,0 +1,66 @@
+/*
+ * Copyright 2002-2009 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.integration.xml.config;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.integration.channel.NullChannel;
+import org.springframework.integration.channel.PublishSubscribeChannel;
+import org.springframework.integration.scheduling.SimpleTaskScheduler;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+/**
+ * @author Mark Fisher
+ * @since 1.0.3
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration
+public class DefaultConfigurationTests {
+
+	@Autowired
+	private ApplicationContext context;
+
+
+	@Test
+	public void verifyErrorChannel() {
+		Object errorChannel = context.getBean("errorChannel");
+		assertNotNull(errorChannel);
+		assertEquals(PublishSubscribeChannel.class, errorChannel.getClass());
+	}
+
+	@Test
+	public void verifyNullChannel() {
+		Object nullChannel = context.getBean("nullChannel");
+		assertNotNull(nullChannel);
+		assertEquals(NullChannel.class, nullChannel.getClass());
+	}
+
+	@Test
+	public void verifyTaskScheduler() {
+		Object taskScheduler = context.getBean("taskScheduler");
+		assertNotNull(taskScheduler);
+		assertEquals(SimpleTaskScheduler.class, taskScheduler.getClass());
+	}
+
+}

org.springframework.integration/src/main/java/org/springframework/integration/config/xml/AbstractIntegrationNamespaceHandler.java

@@ -0,0 +1,102 @@
+/*
+ * Copyright 2002-2009 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.integration.config.xml;
+
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.config.BeanDefinitionHolder;
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.support.BeanDefinitionReaderUtils;
+import org.springframework.beans.factory.xml.BeanDefinitionDecorator;
+import org.springframework.beans.factory.xml.BeanDefinitionParser;
+import org.springframework.beans.factory.xml.NamespaceHandler;
+import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
+import org.springframework.beans.factory.xml.ParserContext;
+
+/**
+ * Base class for NamespaceHandlers that registers a BeanFactoryPostProcessor
+ * for configuring default bean definitions.
+ * 
+ * @author Mark Fisher
+ */
+public abstract class AbstractIntegrationNamespaceHandler implements NamespaceHandler {
+
+	private static final String DEFAULT_CONFIGURING_POSTPROCESSOR_SIMPLE_CLASS_NAME =
+			"DefaultConfiguringBeanFactoryPostProcessor";
+
+	private static final String DEFAULT_CONFIGURING_POSTPROCESSOR_BEAN_NAME =
+			IntegrationNamespaceUtils.BASE_PACKAGE + ".internal" + DEFAULT_CONFIGURING_POSTPROCESSOR_SIMPLE_CLASS_NAME;
+
+
+	private final NamespaceHandlerDelegate delegate = new NamespaceHandlerDelegate();
+
+
+	public final BeanDefinition parse(Element element, ParserContext parserContext) {
+		this.registerDefaultConfiguringBeanFactoryPostProcessorIfNecessary(parserContext);
+		return this.delegate.parse(element, parserContext);
+	}
+
+	public final BeanDefinitionHolder decorate(Node source, BeanDefinitionHolder definition, ParserContext parserContext) {
+		return this.delegate.decorate(source, definition, parserContext);
+	}
+
+	private void registerDefaultConfiguringBeanFactoryPostProcessorIfNecessary(ParserContext parserContext) {
+		if (!parserContext.getRegistry().isBeanNameInUse(DEFAULT_CONFIGURING_POSTPROCESSOR_BEAN_NAME)) {
+			BeanDefinitionBuilder postProcessorBuilder = BeanDefinitionBuilder.genericBeanDefinition(
+					IntegrationNamespaceUtils.BASE_PACKAGE + ".config.xml." + DEFAULT_CONFIGURING_POSTPROCESSOR_SIMPLE_CLASS_NAME);
+			BeanDefinitionHolder postProcessorHolder = new BeanDefinitionHolder(
+					postProcessorBuilder.getBeanDefinition(), DEFAULT_CONFIGURING_POSTPROCESSOR_BEAN_NAME);
+			BeanDefinitionReaderUtils.registerBeanDefinition(postProcessorHolder, parserContext.getRegistry());
+		}
+	}
+
+	protected final void registerBeanDefinitionDecorator(String elementName, BeanDefinitionDecorator decorator) {
+		this.delegate.doRegisterBeanDefinitionDecorator(elementName, decorator);
+	}
+
+	protected final void registerBeanDefinitionDecoratorForAttribute(String attributeName, BeanDefinitionDecorator decorator) {
+		this.delegate.doRegisterBeanDefinitionDecoratorForAttribute(attributeName, decorator);
+	}
+
+	protected final void registerBeanDefinitionParser(String elementName, BeanDefinitionParser parser) {
+		this.delegate.doRegisterBeanDefinitionParser(elementName, parser);
+	}
+
+
+	private class NamespaceHandlerDelegate extends NamespaceHandlerSupport {
+
+		public void init() {
+			AbstractIntegrationNamespaceHandler.this.init();
+		}
+
+		private void doRegisterBeanDefinitionDecorator(String elementName, BeanDefinitionDecorator decorator) {
+			super.registerBeanDefinitionDecorator(elementName, decorator);
+		}
+
+		private void doRegisterBeanDefinitionDecoratorForAttribute(String attributeName, BeanDefinitionDecorator decorator) {
+			super.registerBeanDefinitionDecoratorForAttribute(attributeName, decorator);
+		}
+
+		private void doRegisterBeanDefinitionParser(String elementName, BeanDefinitionParser parser) {
+			super.registerBeanDefinitionParser(elementName, parser);
+		}
+
+	}
+
+}

org.springframework.integration/src/main/java/org/springframework/integration/config/xml/IntegrationNamespaceHandler.java

@@ -16,17 +16,6 @@
 
 package org.springframework.integration.config.xml;
 
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.config.BeanDefinitionHolder;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.support.BeanDefinitionReaderUtils;
-import org.springframework.beans.factory.xml.NamespaceHandler;
-import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
-import org.springframework.beans.factory.xml.ParserContext;
-
 /**
  * Namespace handler for the integration namespace.
  * 
@@ -34,74 +23,37 @@ import org.springframework.beans.factory.xml.ParserContext;
  * @author Marius Bogoevici
  * @author Oleg Zhurakousky
  */
-public class IntegrationNamespaceHandler implements NamespaceHandler {
-
-	private static final String DEFAULT_CONFIGURING_POSTPROCESSOR_SIMPLE_CLASS_NAME =
-			"DefaultConfiguringBeanFactoryPostProcessor";
-
-	private static final String DEFAULT_CONFIGURING_POSTPROCESSOR_BEAN_NAME =
-			IntegrationNamespaceUtils.BASE_PACKAGE + ".internal" + DEFAULT_CONFIGURING_POSTPROCESSOR_SIMPLE_CLASS_NAME;
-
-
-	private final NamespaceHandlerSupport delegate = new NamespaceHandlerDelegate();
-
+public class IntegrationNamespaceHandler extends AbstractIntegrationNamespaceHandler {
 
 	public void init() {
-		this.delegate.init();
-	}
-
-	public BeanDefinition parse(Element element, ParserContext parserContext) {
-		this.registerDefaultConfiguringBeanFactoryPostProcessorIfNecessary(parserContext);
-		return this.delegate.parse(element, parserContext);
-	}
-
-	public BeanDefinitionHolder decorate(Node source, BeanDefinitionHolder definition, ParserContext parserContext) {
-		return this.delegate.decorate(source, definition, parserContext);
-	}
-
-	private void registerDefaultConfiguringBeanFactoryPostProcessorIfNecessary(ParserContext parserContext) {
-		if (!parserContext.getRegistry().isBeanNameInUse(DEFAULT_CONFIGURING_POSTPROCESSOR_BEAN_NAME)) {
-			BeanDefinitionBuilder postProcessorBuilder = BeanDefinitionBuilder.genericBeanDefinition(
-					IntegrationNamespaceUtils.BASE_PACKAGE + ".config.xml." + DEFAULT_CONFIGURING_POSTPROCESSOR_SIMPLE_CLASS_NAME);
-			BeanDefinitionHolder postProcessorHolder = new BeanDefinitionHolder(
-					postProcessorBuilder.getBeanDefinition(), DEFAULT_CONFIGURING_POSTPROCESSOR_BEAN_NAME);
-			BeanDefinitionReaderUtils.registerBeanDefinition(postProcessorHolder, parserContext.getRegistry());
-		}
-	}
-
-
-	private static class NamespaceHandlerDelegate extends NamespaceHandlerSupport {
-
-		public void init() {
-			registerBeanDefinitionParser("channel", new PointToPointChannelParser());
-			registerBeanDefinitionParser("thread-local-channel", new ThreadLocalChannelParser());
-			registerBeanDefinitionParser("publish-subscribe-channel", new PublishSubscribeChannelParser());
-			registerBeanDefinitionParser("service-activator", new ServiceActivatorParser());
-			registerBeanDefinitionParser("transformer", new TransformerParser());
-			registerBeanDefinitionParser("filter", new FilterParser());
-			registerBeanDefinitionParser("router", new DefaultRouterParser());
-			registerBeanDefinitionParser("header-value-router", new HeaderValueRouterParser());
-			registerBeanDefinitionParser("payload-type-router", new PayloadTypeRouterParser());
-			registerBeanDefinitionParser("recipient-list-router", new RecipientListRouterParser());		
-			registerBeanDefinitionParser("splitter", new SplitterParser());
-			registerBeanDefinitionParser("aggregator", new AggregatorParser());
-			registerBeanDefinitionParser("resequencer", new ResequencerParser());
-			registerBeanDefinitionParser("header-enricher", new StandardHeaderEnricherParser());
-			registerBeanDefinitionParser("object-to-string-transformer", new ObjectToStringTransformerParser());
-			registerBeanDefinitionParser("payload-serializing-transformer", new PayloadSerializingTransformerParser());
-			registerBeanDefinitionParser("payload-deserializing-transformer", new PayloadDeserializingTransformerParser());
-			registerBeanDefinitionParser("inbound-channel-adapter", new MethodInvokingInboundChannelAdapterParser());
-			registerBeanDefinitionParser("outbound-channel-adapter", new MethodInvokingOutboundChannelAdapterParser());
-			registerBeanDefinitionParser("logging-channel-adapter", new LoggingChannelAdapterParser());
-			registerBeanDefinitionParser("gateway", new GatewayParser());
-			registerBeanDefinitionParser("bridge", new BridgeParser());
-			registerBeanDefinitionParser("chain", new ChainParser());
-			registerBeanDefinitionParser("selector-chain", new SelectorChainParser());
-			registerBeanDefinitionParser("poller", new PollerParser());
-			registerBeanDefinitionParser("annotation-config", new AnnotationConfigParser());
-			registerBeanDefinitionParser("application-event-multicaster", new ApplicationEventMulticasterParser());
-			registerBeanDefinitionParser("thread-pool-task-executor", new ThreadPoolTaskExecutorParser());
-		}
+		registerBeanDefinitionParser("channel", new PointToPointChannelParser());
+		registerBeanDefinitionParser("thread-local-channel", new ThreadLocalChannelParser());
+		registerBeanDefinitionParser("publish-subscribe-channel", new PublishSubscribeChannelParser());
+		registerBeanDefinitionParser("service-activator", new ServiceActivatorParser());
+		registerBeanDefinitionParser("transformer", new TransformerParser());
+		registerBeanDefinitionParser("filter", new FilterParser());
+		registerBeanDefinitionParser("router", new DefaultRouterParser());
+		registerBeanDefinitionParser("header-value-router", new HeaderValueRouterParser());
+		registerBeanDefinitionParser("payload-type-router", new PayloadTypeRouterParser());
+		registerBeanDefinitionParser("recipient-list-router", new RecipientListRouterParser());
+		registerBeanDefinitionParser("splitter", new SplitterParser());
+		registerBeanDefinitionParser("aggregator", new AggregatorParser());
+		registerBeanDefinitionParser("resequencer", new ResequencerParser());
+		registerBeanDefinitionParser("header-enricher", new StandardHeaderEnricherParser());
+		registerBeanDefinitionParser("object-to-string-transformer", new ObjectToStringTransformerParser());
+		registerBeanDefinitionParser("payload-serializing-transformer", new PayloadSerializingTransformerParser());
+		registerBeanDefinitionParser("payload-deserializing-transformer", new PayloadDeserializingTransformerParser());
+		registerBeanDefinitionParser("inbound-channel-adapter", new MethodInvokingInboundChannelAdapterParser());
+		registerBeanDefinitionParser("outbound-channel-adapter", new MethodInvokingOutboundChannelAdapterParser());
+		registerBeanDefinitionParser("logging-channel-adapter", new LoggingChannelAdapterParser());
+		registerBeanDefinitionParser("gateway", new GatewayParser());
+		registerBeanDefinitionParser("bridge", new BridgeParser());
+		registerBeanDefinitionParser("chain", new ChainParser());
+		registerBeanDefinitionParser("selector-chain", new SelectorChainParser());
+		registerBeanDefinitionParser("poller", new PollerParser());
+		registerBeanDefinitionParser("annotation-config", new AnnotationConfigParser());
+		registerBeanDefinitionParser("application-event-multicaster", new ApplicationEventMulticasterParser());
+		registerBeanDefinitionParser("thread-pool-task-executor", new ThreadPoolTaskExecutorParser());
 	}
 
 }