Revert "file-split-ftp Move errorChannel to Poller"

This reverts commit 7b84810388.

basic/amqp/src/main/resources/META-INF/spring/integration/spring-integration-context.xml

@@ -25,7 +25,7 @@
 
 	<!-- From RabbitMQ To STDOUT -->
 
-	<int-amqp:inbound-channel-adapter channel="fromRabbit" consumers-per-queue="1"
+	<int-amqp:inbound-channel-adapter channel="fromRabbit"
 		queue-names="si.test.queue" connection-factory="connectionFactory" />
 
 	<int:channel id="fromRabbit">

basic/amqp/src/main/resources/log4j.xml

@@ -11,10 +11,6 @@
 	</appender>
 
 	<!-- Loggers -->
-	<logger name="org.springframework.amqp">
-		<level value="debug" />
-	</logger>
-
 	<logger name="org.springframework.integration">
 		<level value="warn" />
 	</logger>
@@ -33,4 +29,4 @@
 		<appender-ref ref="console" />
 	</root>
 
-</log4j:configuration>
+</log4j:configuration>

basic/barrier/src/main/java/org/springframework/integration/samples/barrier/Application.java

@@ -23,14 +23,12 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.ImportResource;
-import org.springframework.integration.http.config.EnableIntegrationGraphController;
 
 /**
  * @author Gary Russell
  * @since 4.2
  */
 @SpringBootApplication
-@EnableIntegrationGraphController
 @ImportResource("/META-INF/spring/integration/server-context.xml")
 public class Application {
 
@@ -53,9 +51,9 @@ public class Application {
 		System.out.println("\n\n++++++++++++ Sending: " + request + " ++++++++++++\n");
 		String reply = requestGateway.echo(request);
 		System.out.println("\n\n++++++++++++ Replied with: " + reply + " ++++++++++++\n");
-//		client.close();
-//		server.close();
-//		System.exit(0); // AMQP-519
+		client.close();
+		server.close();
+		System.exit(0); // AMQP-519
 	}
 
 

basic/barrier/src/main/resources/application.properties

@@ -0,0 +1 @@
+spring.output.ansi.enabled=always

basic/http/src/main/webapp/WEB-INF/servlet-config.xml

@@ -12,16 +12,11 @@
 
 	<int-http:inbound-gateway request-channel="receiveChannel"
                           path="/receiveGateway"
-                          mapped-request-headers="Content-Type"
                           supported-methods="POST"/>
 
 	<int:channel id="receiveChannel"/>
 
 	<int:chain input-channel="receiveChannel">
-		<int:header-enricher>
-			<int:header name="contentType" expression="headers['content-type']" />
-			<int:header name="conent-type" expression="null" overwrite="true" />
-		</int:header-enricher>
 		<int:header-filter header-names="content-type" />
 		<int:service-activator expression="payload + ' from the other side'"/>
 	</int:chain>

basic/kafka/src/main/java/org/springframework/integration/samples/kafka/Application.java

@@ -46,7 +46,6 @@ import org.springframework.kafka.listener.KafkaMessageListenerContainer;
 import org.springframework.kafka.listener.config.ContainerProperties;
 import org.springframework.kafka.support.KafkaNull;
 import org.springframework.kafka.support.TopicPartitionInitialOffset;
-import org.springframework.kafka.support.serializer.JsonDeserializer;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageChannel;
 import org.springframework.messaging.MessageHandler;
@@ -141,9 +140,7 @@ public class Application {
 		props.put(ConsumerConfig.SESSION_TIMEOUT_MS_CONFIG, 15000);
 		props.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class);
 		props.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class);
-		final DefaultKafkaConsumerFactory<String, String> cf = new DefaultKafkaConsumerFactory<>(props);
-		cf.setValueDeserializer(new JsonDeserializer<>(String.class));
-		return cf;
+		return new DefaultKafkaConsumerFactory<>(props);
 	}
 
 	@Bean