diff --git a/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-4.3.xsd b/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-4.3.xsd index 16839a3aa8..980a446bf0 100644 --- a/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-4.3.xsd +++ b/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-4.3.xsd @@ -14,7 +14,9 @@ - Configures an endpoint that will publish an AMQP Message to the provided Exchange. + Configures a Consumer Endpoint for the + 'org.springframework.integration.amqp.outbound.AmqpOutboundEndpoint' + with the 'expectReply = false' that will publish an AMQP Message to the provided Exchange. @@ -64,7 +66,10 @@ - Configures an endpoint that will receive AMQP Messages sent to a given queue and then forward those messages to a Message Channel. + Configures a Message Producing Endpoint for the + 'org.springframework.integration.amqp.inbound.AmqpInboundChannelAdapter' + that will receive AMQP Messages sent to a given queue and then forward those messages to a Message + Channel. @@ -92,9 +97,9 @@ - Configures a gateway that will publish an AMQP Message to the provided Exchange - and expect a reply Message. The thread blocks waiting for a reply or timeout; uses - 'RabbitTemplate.sendAndReceive()'. + Configures a Consumer Endpoint for the 'org.springframework.integration.amqp.outbound.AmqpOutboundEndpoint' + that will publish an AMQP Message to the provided Exchange and expect a reply Message. + The thread blocks waiting for a reply or timeout; uses 'RabbitTemplate.sendAndReceive()'. @@ -121,9 +126,9 @@ - Configures a gateway that will publish an AMQP Message to the provided Exchange - and expect a reply Message. The sending thread returns immediately; the reply - is sent asynchronously; uses 'AsyncRabbitTemplate.sendAndReceive()'. + Configures a Consumer Endpoint for the 'org.springframework.integration.amqp.outbound.AsyncAmqpOutboundGateway' + that will publish an AMQP Message to the provided Exchange and expect a reply Message. + The sending thread returns immediately; the reply is sent asynchronously; uses 'AsyncRabbitTemplate.sendAndReceive()'. @@ -150,8 +155,11 @@ - Configures a gateway that will receive AMQP Messages sent to a given queue and then forward those messages to a Message Channel. - If a reply Message is returned, it will also send that to the 'replyTo' provide by the AMQP request Message. + Configures a Messaging Gateway Endpoint for the + 'org.springframework.integration.amqp.inbound.AmqpInboundGateway' that will receive AMQP Messages + sent to a given queue and then forward those messages to a Message Channel. + If a reply Message is returned, it will also send that to the 'replyTo' provide by the AMQP request + Message. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/EnableIntegration.java b/spring-integration-core/src/main/java/org/springframework/integration/config/EnableIntegration.java index 7d09cdf786..b42d2f01bf 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/EnableIntegration.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/EnableIntegration.java @@ -1,5 +1,5 @@ /* - * Copyright 2014 the original author or authors. + * Copyright 2014-2016 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. @@ -23,9 +23,14 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import org.springframework.context.annotation.Import; -import org.springframework.integration.config.IntegrationRegistrar; /** + * The main configuration annotation to enable Spring Integration infrastructure: + * - Registers some built-in beans; + * - Adds several {@code BeanFactoryPostProcessor}s; + * - Adds several {@code BeanPostProcessor}s; + * - Adds annotations processors. + *

* Add this annotation to an {@code @Configuration} class to have * the imported Spring Integration configuration : * 

@@ -38,6 +43,7 @@ import org.springframework.integration.config.IntegrationRegistrar;
  *
  * @author Artem Bilan
  * @since 4.0
+ * @see IntegrationRegistrar
  */
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/spring-integration-core/src/main/resources/org/springframework/integration/config/spring-integration-4.3.xsd b/spring-integration-core/src/main/resources/org/springframework/integration/config/spring-integration-4.3.xsd
index 3f7627ed9d..8aecead2e1 100644
--- a/spring-integration-core/src/main/resources/org/springframework/integration/config/spring-integration-4.3.xsd
+++ b/spring-integration-core/src/main/resources/org/springframework/integration/config/spring-integration-4.3.xsd
@@ -134,6 +134,7 @@
 		
 			
 				Defines a Point-to-Point MessageChannel.
+				See 'PointToPointChannelParser' source code for 'MessageChannel' implementaitons.
 			
 			
 				
@@ -410,8 +411,8 @@
 	
 		
 			
-				Defines a Publish-Subscribe channel that broadcasts messages to its
-				subscribers.
+				Defines a 'org.springframework.integration.channel.PublishSubscribeChannel' that broadcasts messages to
+				its subscribers.
 			
 			
 				
@@ -555,7 +556,7 @@
 	
 		
 			
-				Defines a Messaging Gateway.
+				Defines a Messaging Gateway - 'org.springframework.integration.gateway.GatewayProxyFactoryBean'.
 			
 		
 		
@@ -901,7 +902,11 @@
 	
 		
 			
-				Defines a Channel Adapter that receives from a MessageSource and sends to a
+				Defines a Polling Channel Adapter for the
+				'org.springframework.integration.endpoint.MethodInvokingMessageSource',
+				or 'org.springframework.integration.endpoint.ExpressionEvaluatingMessageSource'
+				or 'org.springframework.integration.scripting.ScriptExecutingMessageSource'
+				that receives from a MessageSource and sends to a
 				MessageChannel.
 				Note, when using the 'expression' attribute, or 'expression' or 'script' sub-element,
 				there is not yet a root Message object and therefore
@@ -947,8 +952,9 @@
 	
 		
 			
-				Defines a Channel Adapter that receives Resource(s) and sends them to a
-				MessageChannel identified via 'channel' attribute.
+				Defines a Polling Channel Adapter for the
+				'org.springframework.integration.resource.ResourceRetrievingMessageSource' that receives Resource(s)
+				and sends them to a MessageChannel identified via 'channel' attribute.
 			
 		
 		
@@ -1013,14 +1019,20 @@
 	
 		
 			
-				Defines a Channel Adapter that receives from a MessageChannel and passes to
-				a method-invoking
-				MessageHandler.
+				Defines an endpoint for the
+				'org.springframework.integration.handler.ExpressionEvaluatingMessageHandler'
+				or 'org.springframework.integration.handler.MethodInvokingMessageHandler'.
 			
 		
 	
 
 	
+		
+			
+				Defines a Message Producing Endpoint for the
+				'org.springframework.integration.handler.LoggingHandler'.
+			
+		
 		
 			
 				
@@ -1182,7 +1194,8 @@
 	
 		
 			
-				Defines an endpoint for exposing any bean reference as a service that
+				Defines an endpoint for the 'org.springframework.integration.handler.ServiceActivatingHandler'
+				for exposing any bean reference as a service that
 				receives request Messages
 				from an 'input-channel' and may send reply
 				Messages to an 'output-channel'. The 'ref' may point to an instance
@@ -1300,7 +1313,8 @@
 	
 		
 			
-				Defines an endpoint that passes a Message to its request-channel
+				Defines a Consumer Endpoint for the 'org.springframework.integration.transformer.ContentEnricher'
+				that passes a Message to its request-channel
 				and then expects a reply Message. The reply Message then becomes
 				the root object for evaluation of expressions to enrich the
 				target payload.
@@ -1544,9 +1558,9 @@
 	
 		
 			
-				Defines an endpoint that passes a Message to the output-channel after a
-				delay. The delay may
-				be dynamically determined by evaluating an expression
+				Defines a Consumer Endpoint for the 'org.springframework.integration.handler.DelayHandler'
+				that passes a Message to the output-channel after a delay.
+				The delay may be dynamically determined by evaluating an expression
 				(such as a Message header) or fallback to the
 				'default-delay' of this endpoint.
 			
@@ -1649,7 +1663,8 @@
 	
 		
 			
-				Defines an endpoint that suspends a thread until a corresponding release message is received.
+				Defines a Consumer Endpoint for the 'org.springframework.integration.aggregator.BarrierMessageHandler'
+				that suspends a thread until a corresponding release message is received.
 				The endpoint's message handler is a 'BarrierMessageHandler'.
 			
 		
@@ -1734,9 +1749,8 @@
 	
 		
 			
-				Defines an endpoint that passes a Message to the
-				output-channel without
-				modifying it.
+				Defines a Consumer Endpoint for the 'org.springframework.integration.handler.BridgeHandler'
+				that passes a Message to the output-channel without modifying it.
 			
 		
 		
@@ -1752,8 +1766,8 @@
 	
 		
 			
-				Defines an endpoint composed of a chain of Message
-				Handlers.
+				Defines a Consumer Endpoint for the 'org.springframework.integration.handler.MessageHandlerChain'
+				composed of a chain of Message Handlers.
 			
 		
 		
@@ -1826,7 +1840,7 @@
 	
 		
 			
-				Defines a top-level poller.
+				Defines a top-level poller - 'org.springframework.integration.scheduling.PollerMetadata'.
 			
 		
 		
@@ -2038,7 +2052,8 @@
 	
 		
 			
-				Defines a HeaderEnricher endpoint for values defined in the MessageHeader.
+				Defines a Consumer Endpoint for the 'org.springframework.integration.transformer.HeaderEnricher'
+				for values defined in the MessageHeaders.
 			
 		
 		
@@ -2314,7 +2329,8 @@
 	
 		
 			
-				Defines a HeaderFilter endpoint to remove values defined in the MessageHeaders.
+				Defines a Consumer Endpoint for the 'org.springframework.integration.transformer.HeaderFilter'
+				to remove values defined in the MessageHeaders.
 			
 		
 		
@@ -2357,7 +2373,9 @@
 	
 		
 			
-				Defines a Transformer.
+				Defines a Consumer Endpoint for the
+				'org.springframework.integration.transformer.MessageTransformingHandler'
+				based on the 'org.springframework.integration.transformer.Transformer' strategy.
 			
 		
 		
@@ -2372,7 +2390,9 @@
 	
 		
 			
-				Defines a Transformer that converts any Object payload to a String by
+				Defines a Consumer Endpoint for the
+				'org.springframework.integration.transformer.ObjectToStringTransformer'
+				that converts any Object payload to a String by
 				invoking its toString()
 				method.
 			
@@ -2385,10 +2405,13 @@
 			
 		
 	
+
 	
 		
 			
-				Defines a Transformer that converts any Object payload to a SpEL Map.
+				Defines a Consumer Endpoint for the
+				'org.springframework.integration.transformer.ObjectToMapTransformer' that converts any Object payload to
+				a SpEL Map.
 			
 		
 		
@@ -2408,10 +2431,13 @@
 			
 		
 	
+
 	
 		
 			
-				Defines a Transformer that converts SpEL-based Map to an object.
+				Defines a Consumer Endpoint for the
+				'org.springframework.integration.transformer.MapToObjectTransformer' that converts SpEL-based Map to an
+				object.
 			
 		
 		
@@ -2454,7 +2480,9 @@
 	
 		
 			
-				Defines a Transformer that converts any Object payload to a JSON String.
+				Defines a Consumer Endpoint for the
+				'org.springframework.integration.json.ObjectToJsonTransformer'
+				that converts any Object payload to a JSON String.
 			
 		
 		
@@ -2521,11 +2549,11 @@
 		
 	
 
-
 	
 		
 			
-				Defines a Transformer that converts a JSON String to an object.
+				Defines a Consumer Endpoint for the
+				'org.springframework.integration.json.JsonToObjectTransformer' that converts a JSON String to an object.
 			
 		
 		
@@ -2567,7 +2595,9 @@
 	
 		
 			
-				Defines a Transformer that converts an object payload to a byte array.
+				Defines a Consumer Endpoint for the
+				'org.springframework.integration.transformer.PayloadSerializingTransformer' that converts an object
+				payload to a byte array.
 			
 		
 		
@@ -2603,7 +2633,9 @@
 	
 		
 			
-				Defines a Transformer that converts a byte array to an object.
+				Defines a Consumer Endpoint for the
+				'org.springframework.integration.transformer.PayloadDeserializingTransformer' that converts a byte array
+				to an object.
 			
 		
 		
@@ -2639,7 +2671,9 @@
 	
 		
 			
-				Defines a Transformer that converts an RFC5424 packet to a Map.
+				Defines a Consumer Endpoint for the
+				'org.springframework.integration.transformer.SyslogToMapTransformer' that converts an RFC5424 packet to a
+				Map.
 			
 		
 		
@@ -2653,8 +2687,9 @@
 	
 		
 			
-				Defines a Transformer that stores a Message and returns a new
-				Message, whose payload is the id of the stored Message.
+				Defines a Consumer Endpoint for the
+				'org.springframework.integration.transformer.ClaimCheckInTransformer' that stores a Message and returns
+				a new Message, whose payload is the id of the stored Message.
 			
 		
 	
@@ -2680,8 +2715,9 @@
 	
 		
 			
-				Defines a Transformer that accepts a Message whose payload is a
-				UUID and retrieves the Message associated with that id from a
+				Defines a Consumer Endpoint for the
+				'org.springframework.integration.transformer.ClaimCheckOutTransformer' that accepts a Message whose
+				payload is a UUID and retrieves the Message associated with that id from a
 				MessageStore if available (else null).
 			
 		
@@ -2769,7 +2805,9 @@
 	
 		
 			
-				Defines a Message Filters that is used to decide whether a Message should be passed
+				Defines a Consumer Endpoint for the
+				'org.springframework.integration.filter.MessageFilter'
+				that is used to decide whether a Message should be passed
 				along or dropped based on some criteria
 			
 		
@@ -2833,19 +2871,23 @@
 
     
         
-            
+            
+				Defines a Consumer Endpoint for the
+				'org.springframework.integration.router.HeaderValueRouter'.
+				The 'header-name' attribute specifies which
+				header value to lookup. That header value can then provide the name of a
+				channel to be resolved. Alternatively, 1 or more 'mapping' sub-elements
+				may be provided with expected header values mapped to channels.
+			
         
     
 
     
         
-            
+                Defines a Consumer Endpoint for the
+				'org.springframework.integration.router.RecipientListRouter'.
+                A RecipientListRouter will send
                 each received Message to a statically defined list of Message Channels.
 
                 Another convenient option when configuring a RecipientListRouter
@@ -2856,35 +2898,41 @@
                 This is similar to using a Filter at the beginning of 'chain' to
                 act as a "Selective Consumer". However, in this case, it's all
                 combined rather concisely into the router's configuration.
-            ]]>
+            
         
     
 
     
         
-            
+            
+				Defines a Consumer Endpoint for the
+				'org.springframework.integration.router.PayloadTypeRouter'.
+				The 'mapping' sub-elements specify the
+				associations between Java types and target channels.
+			
         
     
 
     
         
-            
+            
+				Defines a Consumer Endpoint for the
+				'org.springframework.integration.router.ErrorMessageExceptionTypeRouter'
+				which resolves the target MessageChannel for
+				messages whose payload is an Exception. The channel resolution is based upon
+				the most specific cause of the error for which a channel mapping exists.
+			
         
     
 
     
         
-            
+            
+				Defines a Consumer Endpoint for the
+				'org.springframework.integration.router.AbstractMessageProcessingRouter' implementation
+				that serves as an adapter for invoking a method on any
+				Spring-managed object as specified by the "ref" and "method" attributes.
+			
         
     
 
@@ -3468,7 +3516,9 @@
 	
 		
 			
-				Defines a Splitter.
+				Defines a Consumer Endpoint for the
+				'org.springframework.integration.splitter.AbstractMessageProcessingSplitter'
+				implementation or 'org.springframework.integration.splitter.DefaultMessageSplitter'.
 			
 		
 		
@@ -3520,7 +3570,8 @@
 	
 		
 			
-				Defines an aggregating message endpoint.
+				Defines a Consumer Endpoint for the
+				'org.springframework.integration.config.AggregatorFactoryBean'.
 			
 		
 		
@@ -3769,7 +3820,8 @@
 	
 		
 			
-				Defines a resequencing message endpoint.
+				Defines a Consumer Endpoint for the
+				'org.springframework.integration.aggregator.ResequencingMessageHandler'.
 			
 		
 		
@@ -4154,6 +4206,11 @@
 	
 
     
+		
+			
+				Defines a 'org.springframework.integration.channel.interceptor.WireTap' bean.
+			
+		
       
         
            
@@ -4187,7 +4244,9 @@
 	
 		
 			
-				Allows you to define channel interceptors to be applied globally.
+				Allows you to define channel interceptors
+				('org.springframework.messaging.support.ChannelInterceptor' implementation)
+				to be applied globally.
 			
 		
 		
@@ -4262,10 +4321,9 @@ unless bean with this name is already registered.
 	
 		
 			
-				
+				Will register a Message History writer which will track the message history. There can
+				only be one Message History writer per ApplicationContext hierarchy.
+				See also @EnableMessageHistory annotation.
 			
 		
 		
@@ -4282,6 +4340,11 @@ The list of component name patterns you want to track (e.g.,  tracked-components
 	
 
 	
+		
+			
+				Defines a bean for the 'org.springframework.integration.config.ExpressionControlBusFactoryBean'.
+			
+		
 		
 			
 				
@@ -4295,6 +4358,11 @@ The list of component name patterns you want to track (e.g.,  tracked-components
 	
 
 	
+		
+			
+				Defines a bean for the 'org.springframework.integration.config.SpelFunctionFactoryBean'.
+			
+		
 		
 				
                     
@@ -4355,9 +4423,9 @@ The list of component name patterns you want to track (e.g.,  tracked-components
 
 	
 		
-			
+			
+				Defines a Consumer Endpoint for the 'org.springframework.integration.scattergather.ScatterGatherHandler'.
+			
 		
 		
 			
@@ -4437,9 +4505,9 @@ The list of component name patterns you want to track (e.g.,  tracked-components
 
 	
 		
-			
+			
+                Defines an 'org.springframework.integration.handler.advice.IdempotentReceiverInterceptor' bean.
+            
 		
 		
 			
diff --git a/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-4.3.xsd b/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-4.3.xsd
index 7d219764d0..1ce723d2e5 100644
--- a/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-4.3.xsd
+++ b/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-4.3.xsd
@@ -19,9 +19,11 @@
 	
 		
 			
-				Configures an inbound Channel Adapter which listens for Application Context
-				events, converts them to Messages and sends them to a Message Channel.
-            
+				Configures a Message Producing Endpoint for the
+				'org.springframework.integration.event.inbound.ApplicationEventListeningMessageProducer'
+				which listens for Application Context events, converts them to Messages and
+				sends them to a Message Channel.
+			
 		
 		
 			
@@ -64,8 +66,9 @@
 	
 		
 			
-				Defines a Channel Adapter that receives Messages from a MessageChannel and then publishes
-				MessagingEvents containing those Messages.
+				Configures a Consumer Endpoint for the
+				'org.springframework.integration.event.outbound.ApplicationEventPublishingMessageHandler' that receives
+				Messages from a MessageChannel and then publishes Events containing those Messages.
 			
 		
 		
diff --git a/spring-integration-feed/src/main/resources/org/springframework/integration/feed/config/spring-integration-feed-4.3.xsd b/spring-integration-feed/src/main/resources/org/springframework/integration/feed/config/spring-integration-feed-4.3.xsd
index ed477fe62b..7460f91b89 100644
--- a/spring-integration-feed/src/main/resources/org/springframework/integration/feed/config/spring-integration-feed-4.3.xsd
+++ b/spring-integration-feed/src/main/resources/org/springframework/integration/feed/config/spring-integration-feed-4.3.xsd
@@ -14,7 +14,9 @@
 	
 		
 			
 		
diff --git a/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-4.3.xsd b/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-4.3.xsd
index 0a4ee677ad..836b693756 100644
--- a/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-4.3.xsd
+++ b/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-4.3.xsd
@@ -21,9 +21,11 @@
     
         
             
-                Configures an inbound Channel Adapter that polls a directory and sends Messages whose payloads are
-                instances of java.io.File.
-            
+				Configures a 'SourcePollingChannelAdapter' Endpoint for the
+				'org.springframework.integration.file.FileReadingMessageSource' that
+				polls a directory and sends Messages whose payloads are
+				instances of java.io.File.
+			
         
         
             
@@ -151,8 +153,11 @@ Only files matching this regular expression will be picked up by this adapter.
     
         
             
-                Configures an outbound Channel Adapter that writes Message payloads to a File.
-            
+				Configures a Consumer Endpoint for the
+				'org.springframework.integration.file.FileWritingMessageHandler'
+				with 'expectReply = false'
+				that writes Message payloads to a File.
+			
         
         
             
@@ -175,8 +180,10 @@ Only files matching this regular expression will be picked up by this adapter.
     
         
             
-                Configures an inbound channel adapter that 'tails' a file on the filesystem.
-            
+				Configures a Message Producing Endpoint for the
+				'org.springframework.integration.file.tail.FileTailingMessageProducerSupport that 'tails' a file on the
+				filesystem.
+			
         
         
 			
@@ -292,7 +299,9 @@ Only files matching this regular expression will be picked up by this adapter.
     
         
             
-                Configures an outbound Gateway that writes request Message payloads to a File and then generates a
+				Configures a Consumer Endpoint for the
+				'org.springframework.integration.file.FileWritingMessageHandler'
+				that writes request Message payloads to a File and then generates a
                 reply Message containing the newly written File as its payload.
             
         
@@ -506,8 +515,9 @@ Only files matching this regular expression will be picked up by this adapter.
     
         
             
-                Creates a Transformer that converts a File payload to a String.
-            
+				Creates a 'org.springframework.integration.file.transformer.FileToStringTransformer'
+				that converts a File payload to a String.
+			
         
         
             
@@ -529,8 +539,9 @@ Only files matching this regular expression will be picked up by this adapter.
     
         
             
-                Creates a Transformer that converts a File payload to an array of bytes.
-            
+				Creates a 'org.springframework.integration.file.transformer.FileToByteArrayTransformer'
+				that converts a File payload to an array of bytes.
+			
         
         
             
@@ -584,7 +595,8 @@ Only files matching this regular expression will be picked up by this adapter.
 	
 		
 			
-				Defines a Splitter that splits text-based files into lines.
+				Creates a 'org.springframework.integration.file.splitter.FileSplitter'
+				that splits text-based files into lines.
 			
 		
 		
diff --git a/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-4.3.xsd b/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-4.3.xsd
index aac3c2a17d..aa89f5b6a2 100644
--- a/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-4.3.xsd
+++ b/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-4.3.xsd
@@ -16,9 +16,11 @@
 
 	
 		
-			
+			
+				Configures a Consumer Endpoint for the
+				'org.springframework.integration.file.remote.handler.FileTransferringMessageHandler'
+				for the 'FtpRemoteFileTemplate' that writes files to a remote FTP endpoint.
+			
 		
 		
 			
@@ -68,9 +70,11 @@
 
 	
 		
-			
+			
+				Configures a 'SourcePollingChannelAdapter' Endpoint for the
+				'org.springframework.integration.ftp.inbound.FtpInboundFileSynchronizingMessageSource' that
+				synchronizes a local directory with the contents of a remote FTP endpoint.
+			
 		
 		
 			
@@ -235,9 +239,11 @@
 
 	
 		
-			
+			
+				Configures a Consumer Endpoint for the
+				'org.springframework.integration.ftp.gateway.FtpOutboundGateway'
+				used to issue FTP commands.
+			
 		
 		
 			
diff --git a/spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-4.3.xsd b/spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-4.3.xsd
index cbbcc6a480..98570a2f27 100644
--- a/spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-4.3.xsd
+++ b/spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-4.3.xsd
@@ -20,7 +20,8 @@
 	
 		
 			
-				Configures an inbound Channel Adapter backed by a
+				Configures a Message Producing Endpoint for the
+				'org.springframework.integration.gemfire.inbound.CacheListeningMessageProducer' that backed by a
 				GemFire CacheListener
 			
 		
@@ -46,7 +47,7 @@
 						Enabled cache entry event types
 				]]>
 							
-								
+								
 									
 								
@@ -62,7 +63,9 @@
 	
 		
 			
-				Configures an inbound Channel Adapter backed by a
+				Configures a 'SourcePollingChannelAdapter' Endpoint for the
+				'org.springframework.integration.gemfire.inbound.ContinuousQueryMessageProducer'
+				that backed by a
 				Spring Gemfire QueryListener
 			
 		
@@ -75,7 +78,7 @@
 						Reference to a ContinuousQueryListenerContainer
 				]]>
 							
-								
+								
 									
 								
@@ -89,7 +92,7 @@
 						Enabled continuous query event types
 				]]>
 							
-								
+								
 									
 								
@@ -130,7 +133,8 @@
 		
 			
 				
-					Configures an outbound Channel Adapter that
+					Configures a Consumer Endpoint for the
+					'org.springframework.integration.gemfire.outbound.CacheWritingMessageHandler' that
 					writes Message to a Gemfire cache
 				
 			
@@ -175,20 +179,17 @@
 
 	
 		
-
-		
+		
 			
 				
-					
-						
 							Identifies the channel to which error messages will be sent if a failure occurs in this
 							component's invocation. If no "error-channel" reference is provided, this component will
 							propagate Exceptions to the caller. To completely suppress Exceptions, provide a
 							reference to the "nullChannel" here.
-						]]>
-						
+						
+					
+						
 					
 				
 			
diff --git a/spring-integration-groovy/src/main/resources/org/springframework/integration/groovy/config/spring-integration-groovy-4.3.xsd b/spring-integration-groovy/src/main/resources/org/springframework/integration/groovy/config/spring-integration-groovy-4.3.xsd
index 1683b53425..6fd489e6f2 100644
--- a/spring-integration-groovy/src/main/resources/org/springframework/integration/groovy/config/spring-integration-groovy-4.3.xsd
+++ b/spring-integration-groovy/src/main/resources/org/springframework/integration/groovy/config/spring-integration-groovy-4.3.xsd
@@ -16,8 +16,9 @@
 	
 		
 			
-				Configures an inner bean that will generate a
-				Groovy Script.
+				Configures an inner bean
+				('org.springframework.integration.groovy.GroovyScriptExecutingMessageProcessor')
+				that will generate a Groovy Script.
 			
 		
 	
@@ -67,17 +68,19 @@
 
 	
 		
-			
+				Control bus ('org.springframework.integration.groovy.config.GroovyControlBusFactoryBean') that accepts
+				messages in the form of Groovy scripts. The scripts should be provided as
 				String payload in incoming messages. The variable bindings will include any @ManagedResource, Lifecycle,
 				or CustomizableThreadCreator instances from within the ApplicationContext.
-			]]>
+			
 		
 		
 			
 				
-				
+				
 			
 			
 			
diff --git a/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-4.3.xsd b/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-4.3.xsd
index 38dc0c9e65..522c1f2479 100644
--- a/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-4.3.xsd
+++ b/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-4.3.xsd
@@ -19,7 +19,9 @@
 	
 		
 			
-				Defines an inbound HTTP-based Channel Adapter.
+				Configures a Message Producing Endpoint for the
+				'org.springframework.integration.http.inbound.HttpRequestHandlingEndpointSupport' that
+				receives HTTP requests and doesn't produce responses.
 			
 		
 		
@@ -83,7 +85,9 @@
 	
 		
 			
-				Defines an inbound HTTP-based Messaging Gateway.
+				Configures a Messaging Gateway Endpoint for the
+				'org.springframework.integration.http.inbound.HttpRequestHandlingEndpointSupport' that
+				receives HTTP requests and produces responses.
 			
 		
 		
@@ -363,7 +367,9 @@
 	
 		
 			
-				Defines an outbound HTTP-based Channel Adapter.
+				Configures a Consumer Endpoint for the
+				'org.springframework.integration.http.outbound.HttpRequestExecutingMessageHandler'
+				with 'expectReply = false' that sends HTTP requests based on incoming messages.
 			
 		
 		
@@ -397,7 +403,9 @@
 	
 		
 			
-				Defines an outbound HTTP-based Messaging Gateway.
+				Configures a Consumer Endpoint for the
+				'org.springframework.integration.http.outbound.HttpRequestExecutingMessageHandler'
+				that sends HTTP requests based on incoming messages and expects HTTP responses.
 			
 		
 		
diff --git a/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-4.3.xsd b/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-4.3.xsd
index fec0ae2e35..033b044364 100644
--- a/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-4.3.xsd
+++ b/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-4.3.xsd
@@ -20,7 +20,8 @@
 	
 		
 			
-				Defines a udp inbound Channel Adapter for receiving incoming udp packets.
+				Defines a Message Producing Endpoint for the
+				'org.springframework.integration.ip.udp.UnicastReceivingChannelAdapter' for receiving incoming udp packets.
 			
 		
 		
@@ -61,7 +62,8 @@
 	
 		
 			
-				Defines an outbound UDP packet-sending Channel Adapter.
+				Configures a Consumer Endpoint for the
+				'org.springframework.integration.ip.udp.UnicastSendingMessageHandler' to send UDP packets.
 			
 		
 		
@@ -135,6 +137,12 @@
 	
 
 	
+		
+			
+				Defines a Message Producing Endpoint for the
+				'org.springframework.integration.ip.tcp.TcpReceivingChannelAdapter' for receiving incoming tcp packets.
+			
+		
 		
 			
 			
@@ -202,6 +210,12 @@
 	
 
 	
+		
+			
+				Defines a Message Producing Endpoint for the
+				'org.springframework.integration.ip.tcp.TcpSendingMessageHandler' for sending TCP packets.
+			
+		
 		
 			
 				
@@ -264,6 +278,13 @@
 	
 
 	
+		
+			
+				Defines a Messaging Gateway Endpoint for the
+				'org.springframework.integration.ip.tcp.TcpInboundGateway' for receiving incoming TCP packets
+				and producing replies for them.
+			
+		
 		
 			
 			
@@ -343,6 +364,13 @@
 	
 
 	
+		
+			
+				Defines a Message Producing Endpoint for the
+				'org.springframework.integration.ip.tcp.TcpOutboundGateway' for sending TCP packets
+				and waiting for replies.
+			
+		
 		
 			
 				
@@ -454,6 +482,11 @@
 	
 
 	
+		
+			
+				Defines a 'org.springframework.integration.ip.tcp.connection.ConnectionFactory' implementation bean.
+			
+		
 		
 			
 			
diff --git a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-4.3.xsd b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-4.3.xsd
index 646c49e936..e6464787a8 100644
--- a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-4.3.xsd
+++ b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-4.3.xsd
@@ -18,7 +18,7 @@
 	
 		
 			
-				Defines a MessageStore (and MessageGroupStore)
+				Defines a MessageStore ('org.springframework.integration.jdbc.JdbcMessageStore')
 				backed by a database.
 			
 		
@@ -124,7 +124,9 @@
 	
 		
 			
-				Defines an inbound Channel Adapter for polling a database.
+				Defines a Polling Channel Adapter for the
+				'org.springframework.integration.jdbc.JdbcPollingChannelAdapter'
+				for polling a database.
 			
 		
 		
@@ -222,7 +224,8 @@
 	
 		
 			
-				Defines an outbound Channel Adapter for updating a
+				Configures a Consumer Endpoint for the
+				'org.springframework.integration.jdbc.JdbcMessageHandler' for updating a
 				database.
 			
 		
@@ -289,7 +292,8 @@
 	
 		
 			
-				Defines an outbound Channel Gateway for updating a
+				Configures a Consumer Endpoint for the
+				'org.springframework.integration.jdbc.JdbcOutboundGateway' for updating a
 				database in response to a message on the request channel, and/or
 				for retrieving data from the database using the input message as
 				a source of parameters for the specified SQL select query.
@@ -589,7 +593,8 @@
 	
 		
 			
-				Defines an outbound Channel Adapter for updating a
+				Configures a Consumer Endpoint for the
+				'org.springframework.integration.jdbc.StoredProcMessageHandler' for updating a
 				database using stored procedures.
 			
 		
@@ -713,7 +718,8 @@
 	
 		
 			
-				Defines an Outbound Channel Gateway for updating a database using
+				Configures a Consumer Endpoint for the
+				'org.springframework.integration.jdbc.StoredProcOutboundGateway' for updating a database using
 				a stored procedure. The response of the stored procedure is used
 				to populate the Message for the reply channel.
 			
@@ -972,7 +978,8 @@
 	
 		
 			
-				Defines an inbound Channel Adapter for polling a
+				Defines a Polling Channel Adapter for the
+				'org.springframework.integration.jdbc.StoredProcPollingChannelAdapter' for polling a
 				database using a stored procedure or function.
 			
 		
diff --git a/spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-4.3.xsd b/spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-4.3.xsd
index d2ebb13fd2..4b3eee5a9e 100644
--- a/spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-4.3.xsd
+++ b/spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-4.3.xsd
@@ -22,7 +22,8 @@
 	
 		
 			
-	Defines a Message Channel that is backed by a JMS Queue.
+				Defines a Message Channel ('org.springframework.integration.jms.config.JmsChannelFactoryBean')
+				that is backed by a JMS Queue.
 			
 		
 		
@@ -59,7 +60,8 @@
 	
 		
 			
-	Defines a Message Channel that is backed by a JMS Topic.
+				Defines a Message Channel ('org.springframework.integration.jms.config.JmsChannelFactoryBean')
+				that is backed by a JMS Topic.
 			
 		
 		
@@ -272,7 +274,7 @@
 				]]>
 			
 			
-									
+				
 			
 		
 		
@@ -363,7 +365,9 @@
 	
 		
 			
-	Defines a JMS Message-Driven inbound Channel Adapter.
+				Defines a Message Producing Endpoint for the
+				'org.springframework.integration.jms.JmsMessageDrivenEndpoint' (one-way) to listen form message
+				on the JMS destination.
 			
 		
 		
@@ -519,7 +523,9 @@
 	
 		
 			
-	Defines an inbound Channel Adapter for polling a JMS Destination.
+				Defines a Polling Channel Adapter for the
+				'org.springframework.integration.jms.JmsDestinationPollingSource'
+				for polling a JMS Destination.
 			
 		
 		
@@ -596,7 +602,9 @@
 	
 		
 			
-	Defines an inbound JMS-based Messaging Gateway.
+				Defines a Messaging Gateway Endpoint for the
+				'org.springframework.integration.jms.JmsMessageDrivenEndpoint' to listen for messages in the JMS
+				destination and produce replies.
 			
 		
 		
@@ -780,13 +788,16 @@
 	
 		
 			
-	Defines an outbound JMS-based Messaging Gateway.
+				Configures a Consumer Endpoint for the
+				'org.springframework.integration.jms.JmsSendingMessageHandler'
+				to send messages to the JMS destination and wait for replies.
 			
 		
 		
 			
 				
-				
+				
 				
 					
 						
 		
 			
-	Defines an outbound JMS Message-sending Channel Adapter.
+				Configures a Consumer Endpoint for the
+				'org.springframework.integration.jms.JmsSendingMessageHandler'
+				to send messages to the JMS destination without waiting for replies.
 			
 		
 		
@@ -1132,7 +1145,8 @@
 				
 					
 						
-						
+						
 					
 					
 						
@@ -1342,7 +1356,7 @@
 		
 			
 				
-	Defines a Transformer for adding statically configured JMS Headers.
+	Defines a 'org.springframework.integration.transformer.HeaderEnricher' for adding statically configured JMS Headers.
 				
 			
 			
@@ -1552,7 +1566,7 @@
 		
 
 	
-	
+
 	
 		
 			
@@ -1562,14 +1576,14 @@
 			
 		
 	
-	
-	 
+
+	
 		
 			 
 			 
 		
 	
-	
+
 	
  		
 			
@@ -1578,5 +1592,5 @@
 			
 		
 	
-	
+
 
diff --git a/spring-integration-jmx/src/main/resources/org/springframework/integration/jmx/config/spring-integration-jmx-4.3.xsd b/spring-integration-jmx/src/main/resources/org/springframework/integration/jmx/config/spring-integration-jmx-4.3.xsd
index 86d043277e..b3aa574391 100644
--- a/spring-integration-jmx/src/main/resources/org/springframework/integration/jmx/config/spring-integration-jmx-4.3.xsd
+++ b/spring-integration-jmx/src/main/resources/org/springframework/integration/jmx/config/spring-integration-jmx-4.3.xsd
@@ -1,7 +1,8 @@
 
 
 
 	
@@ -18,7 +19,9 @@
 	
 		
 			
-				Defines an inbound Channel Adapter that polls for JMX attribute values.
+				Defines a Polling Channel Adapter for the
+				'org.springframework.integration.jmx.AttributePollingMessageSource'
+				that polls for JMX attribute values.
 			
 		
 		
@@ -36,7 +39,8 @@
 	
 		
 			
-				Defines an inbound Channel Adapter that polls for JMX MBeans.
+				Defines a Polling Channel Adapter for the
+				'org.springframework.integration.jmx.MBeanTreePollingMessageSource' that polls for JMX MBeans.
 			
 		
 		
@@ -49,7 +53,8 @@
 								
 									
 										
-											
+											
 										
 									
 								
@@ -64,8 +69,10 @@
 	
 		
 			
-				Defines an outbound Gateway which allows for Message-driven invocation of managed operations that
-				return values
+				Configures a Consumer Endpoint for the
+				'org.springframework.integration.jmx.OperationInvokingMessageHandler'
+				which allows for Message-driven invocation of managed operations that
+				return values.
 			
 		
 		
@@ -73,7 +80,8 @@
 				
 					
 						
-						
+						
 					
 					
 					
@@ -94,7 +102,9 @@
 	
 		
 			
-				Defines an outbound Channel Adapter for invoking JMX operations.
+				Configures a Consumer Endpoint for the
+				'org.springframework.integration.jmx.OperationInvokingMessageHandler' for invoking JMX operations
+				without waiting for results.
 			
 		
 		
@@ -102,7 +112,8 @@
 				
 					
 						
-						
+						
 					
 					
 				
@@ -113,7 +124,9 @@
 	
 		
 			 of ObjectNames or ObjectName patterns.
@@ -133,7 +146,9 @@
 	
 		
 			
-				Defines an outbound Channel Adapter that publishes JMX notifications.
+				Configures a Consumer Endpoint for the
+				'org.springframework.integration.jmx.NotificationPublishingMessageHandler' that publishes JMX
+				notifications.
 			
 		
 		
@@ -141,7 +156,8 @@
 				
 					
 						
-						
+						
 					
 					
 				
@@ -152,7 +168,8 @@
 	
 		
 			
-				Exports Message Channels and Endpoints as MBeans.
+				Defines a 'org.springframework.integration.monitor.IntegrationMBeanExporter' that exports Message
+				Channels and Endpoints as MBeans.
 			
 		
 		
diff --git a/spring-integration-jpa/src/main/resources/org/springframework/integration/jpa/config/spring-integration-jpa-4.3.xsd b/spring-integration-jpa/src/main/resources/org/springframework/integration/jpa/config/spring-integration-jpa-4.3.xsd
index 11928bbc5a..e831ac508b 100644
--- a/spring-integration-jpa/src/main/resources/org/springframework/integration/jpa/config/spring-integration-jpa-4.3.xsd
+++ b/spring-integration-jpa/src/main/resources/org/springframework/integration/jpa/config/spring-integration-jpa-4.3.xsd
@@ -20,7 +20,9 @@
 	
 		
 			
-				The definition for the Spring Integration JPA Inbound Channel Adapter.
+				Defines a Polling Channel Adapter for the
+				'org.springframework.integration.jpa.inbound.JpaPollingChannelAdapter'
+				that poll data from the database via JPA specification.
 			
 		
 		
@@ -75,8 +77,9 @@
 	
 			
 					
-							Defines an outbound Channel Adapter for updating a
-							database using the Java Persistence API (JPA).
+						Configures a Consumer Endpoint for the
+						'org.springframework.integration.jpa.outbound.JpaOutboundGatewayFactoryBean' (one-way)
+						updating a database using the Java Persistence API (JPA).
 					
 			
 			
@@ -168,7 +171,9 @@
 	
 		
 			
-				Defines the Spring Integration JPA Outbound Gateway
+				Configures a Consumer Endpoint for the
+				'org.springframework.integration.jpa.outbound.JpaOutboundGatewayFactoryBean'
+				to update a database using JPA and produce the updating results.
 			
 		
 		
@@ -200,7 +205,9 @@
 	
 		
 			
-				Defines a Spring Integration JPA Outbound Gateway
+				Configures a Consumer Endpoint for the
+				'org.springframework.integration.jpa.outbound.JpaOutboundGatewayFactoryBean'
+				to read database via JPA.
 			
 		
 		
diff --git a/spring-integration-mail/src/main/resources/org/springframework/integration/mail/config/spring-integration-mail-4.3.xsd b/spring-integration-mail/src/main/resources/org/springframework/integration/mail/config/spring-integration-mail-4.3.xsd
index af8906e680..8fb2c5764a 100644
--- a/spring-integration-mail/src/main/resources/org/springframework/integration/mail/config/spring-integration-mail-4.3.xsd
+++ b/spring-integration-mail/src/main/resources/org/springframework/integration/mail/config/spring-integration-mail-4.3.xsd
@@ -23,7 +23,9 @@
 		
 			
 				
-	Defines an outbound mail-sending Channel Adapter.
+					Configures a Consumer Endpoint for the
+					'org.springframework.integration.mail.MailSendingMessageHandler' that
+					sends mails according te provided options.
 				
 			
 			
@@ -67,7 +69,9 @@
 	
 		
 			
-	Defines an inbound Channel Adapter that polls a mailbox for mail messages.
+				Defines a Polling Channel Adapter for the
+				'org.springframework.integration.mail.MailReceivingMessageSource'
+				that polls a mailbox for mail messages.
 			
 		
 		
@@ -109,7 +113,9 @@
 	
 		
 			
-	Defines an IMAP IDLE channel adapter.
+				Defines a Message Producing Endpoint for the
+				'org.springframework.integration.mail.ImapIdleChannelAdapter' that listens to the changes in the mail
+				box via IMAP protocol.
 			
 		
 		
@@ -269,7 +275,8 @@
 		
 			
 				
-	Defines a Transformer that converts a javax.mail.Message payload to a String.
+					Defines a Transformer ('org.springframework.integration.mail.transformer.MailToStringTransformer')
+					that converts a javax.mail.Message payload to a String.
 				
 			
 			
@@ -284,7 +291,8 @@
 		
 			
 				
-	Defines a Transformer for adding statically configured Mail Headers.
+					Defines a 'org.springframework.integration.transformer.HeaderEnricher' for adding statically
+					configured Mail Headers.
 				
 			
 			
diff --git a/spring-integration-mongodb/src/main/resources/org/springframework/integration/mongodb/config/spring-integration-mongodb-4.3.xsd b/spring-integration-mongodb/src/main/resources/org/springframework/integration/mongodb/config/spring-integration-mongodb-4.3.xsd
index 17738f9e3e..1ce5ee8235 100644
--- a/spring-integration-mongodb/src/main/resources/org/springframework/integration/mongodb/config/spring-integration-mongodb-4.3.xsd
+++ b/spring-integration-mongodb/src/main/resources/org/springframework/integration/mongodb/config/spring-integration-mongodb-4.3.xsd
@@ -19,8 +19,9 @@
 	
 		
 			
-				Defines mongodb inbound channel adapter that
-				creates
+				Defines a Polling Channel Adapter for the
+				'org.springframework.integration.mongodb.inbound.MongoDbMessageSource'
+				that queries data from the MongoDB collection and produces messages to the channel.
 			
 		
 		
@@ -84,10 +85,9 @@
 	
 		
 			
-				Defines mongodb outbound channel adapter that
-				writes the contents of the
-				Message into
-				org.springframework.data.mongodb.support.collections.mongodbStore
+				Configures a Consumer Endpoint for the
+				'org.springframework.integration.mongodb.outbound.MongoDbStoringMessageHandler' that
+				stores a data from incoming messages to the MongoDB collection.
 			
 		
 		
@@ -95,7 +95,8 @@
 				
 					
 						
-						
+						
 					
 				
 			
@@ -112,13 +113,12 @@
 		
 			
 				
+					
+						Reference to an instance of
+						org.springframework.data.mongodb.MongoDbFactory
+					
 					
-						
-							Reference to an instance of
-							org.springframework.data.mongodb.MongoDbFactory
-						
-						
+						
 					
 				
 			
@@ -126,13 +126,12 @@
 		
 			
 				
+					
+						Reference to an instance of
+						org.springframework.data.mongodb.core.MongoTemplate
+					
 					
-						
-							Reference to an instance of
-							org.springframework.data.mongodb.core.MongoTemplate
-						
-						
+						
 					
 				
 			
@@ -174,4 +173,5 @@
 			
 		
 	
+
 
diff --git a/spring-integration-mqtt/src/main/resources/org/springframework/integration/mqtt/config/spring-integration-mqtt-4.3.xsd b/spring-integration-mqtt/src/main/resources/org/springframework/integration/mqtt/config/spring-integration-mqtt-4.3.xsd
index 997f2ac855..a883f310f2 100644
--- a/spring-integration-mqtt/src/main/resources/org/springframework/integration/mqtt/config/spring-integration-mqtt-4.3.xsd
+++ b/spring-integration-mqtt/src/main/resources/org/springframework/integration/mqtt/config/spring-integration-mqtt-4.3.xsd
@@ -21,8 +21,9 @@
 	
 		
 			
-				The definition for the Spring Integration MqttAdapter
-				Inbound Channel Adapter.
+				Defines a Message Producing Endpoint for the
+				'org.springframework.integration.mqtt.inbound.MqttPahoMessageDrivenChannelAdapter' that
+				subscribes to the MQTT topic(s) and produces messages to the channel.
 			
 		
 		
@@ -94,7 +95,9 @@
 	
 			
 					
-							Defines an outbound Channel Adapter.
+						Configures a Consumer Endpoint for the
+						'org.springframework.integration.mqtt.outbound.MqttPahoMessageDrivenChannelAdapter'
+						that sends messages to the MQTT topic.
 					
 			
 			
diff --git a/spring-integration-redis/src/main/resources/org/springframework/integration/redis/config/spring-integration-redis-4.3.xsd b/spring-integration-redis/src/main/resources/org/springframework/integration/redis/config/spring-integration-redis-4.3.xsd
index ec78f2268e..424c3ec471 100644
--- a/spring-integration-redis/src/main/resources/org/springframework/integration/redis/config/spring-integration-redis-4.3.xsd
+++ b/spring-integration-redis/src/main/resources/org/springframework/integration/redis/config/spring-integration-redis-4.3.xsd
@@ -19,7 +19,7 @@
 	
 		
 			
-	Defines a publish-subscribe Message Channel that is backed by a Redis topic.
+	Defines a 'org.springframework.integration.redis.channel.SubscribableRedisChannel' that is backed by a Redis topic.
 			
 		
 		
@@ -122,7 +122,9 @@
 	
 		
 			
-	Defines an inbound Channel Adapter for subscribing to a Redis topic.
+				Defines a Message Producing Endpoint for the
+				'org.springframework.integration.redis.inbound.RedisInboundChannelAdapter' for subscribing to a Redis
+				channel.
 			
 		
 		
@@ -197,7 +199,9 @@
 	
 		
 			
-	Defines an outbound Redis Message-sending Channel Adapter.
+				Configures a Consumer Endpoint for the
+				'org.springframework.integration.redis.outbound.RedisPublishingMessageHandler' that
+				a data to the Redis channel.
 			
 		
 		
@@ -265,9 +269,10 @@
 	
 		
 			
-	Defines Redis inbound channel adapter that creates a Message which contains
-	a view into a redis store. THe view could be one of the subclasses of
-	org.springframework.data.redis.support.collections.RedisStore
+				Defines a Polling Channel Adapter for the
+				'org.springframework.integration.redis.inbound.RedisStoreMessageSource' that creates a Message which
+				contains a view into a redis store. THe view could be one of the subclasses of
+				org.springframework.data.redis.support.collections.RedisStore
 			
 		
 		
@@ -291,8 +296,10 @@
 	
 		
 			
-	Defines Redis outbound channel adapter that writes the contents of the Message into
-	org.springframework.data.redis.support.collections.RedisStore
+				Configures a Consumer Endpoint for the
+				'org.springframework.integration.redis.outbound.RedisStoreWritingMessageHandler'
+				that writes the contents of the Message into
+				'org.springframework.data.redis.support.collections.RedisStore'
 			
 		
 		
@@ -324,7 +331,9 @@
 	
 		
 			
-				Defines a Message Driven Endpoint for listening a Redis queue.
+				Defines a Message Producing Endpoint for the
+				'org.springframework.integration.redis.inbound.RedisQueueMessageDrivenEndpoint' for listening a Redis
+				queue.
 			
 		
 		
@@ -419,8 +428,9 @@
 	
 		
 			
-				Configures a gateway that adapts incoming Redis values to Spring Integration Messages
-				and returns a reply.
+				Defines a Messaging Gateway Endpoint for the
+				'org.springframework.integration.redis.inbound.RedisQueueInboundGateway' that adapts incoming Redis
+				values to Spring Integration Messages and returns a reply.
 			
 		
 		
@@ -562,7 +572,9 @@
 	
 		
 			
-				Defines an outbound Redis Queue Message-sending Channel Adapter.
+				Configures a Consumer Endpoint for the
+				'org.springframework.integration.redis.outbound.RedisQueueOutboundChannelAdapter'
+				to store data into the Redis List in a queue manner.
 			
 		
 		
@@ -636,7 +648,9 @@
 	
 		
 			.reply' as its key. A new UUID is used for each interaction.
 			]]>
@@ -753,7 +767,9 @@
 	
 		
 			
-				Defines an outbound Redis Command Sending Gateway.
+				Configures a Consumer Endpoint for the
+				'org.springframework.integration.redis.outbound.RedisOutboundGateway' that
+				perform a Redis command based on the 'command-expression' evaluation result.
 			
 		
 		
diff --git a/spring-integration-rmi/src/main/resources/org/springframework/integration/rmi/config/spring-integration-rmi-4.3.xsd b/spring-integration-rmi/src/main/resources/org/springframework/integration/rmi/config/spring-integration-rmi-4.3.xsd
index 228cd1aeb6..beb705e4f3 100644
--- a/spring-integration-rmi/src/main/resources/org/springframework/integration/rmi/config/spring-integration-rmi-4.3.xsd
+++ b/spring-integration-rmi/src/main/resources/org/springframework/integration/rmi/config/spring-integration-rmi-4.3.xsd
@@ -1,7 +1,6 @@
 
 
 			
 				
-	Defines an RMI-based inbound MessagingGateway.
+					Configures a Messaging Gateway Endpoint for the
+					'org.springframework.integration.rmi.RmiInboundGateway' to receive RMI
+					requests and produce RMI responses.
 				
 			
 			
@@ -72,14 +73,17 @@
 		
 			
 				
-	Defines an RMI-based outbound Messaging Gateway.
+					Configures a Consumer Endpoint for the
+					'org.springframework.integration.rmi.RmiOutboundGateway' to send RMI requests and wait for
+					RMI replies.
 				
 			
 			
 				
 					
 						
-						
+						
 					
 					
 						
diff --git a/spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-4.3.xsd b/spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-4.3.xsd
index 6574e73610..2eb73b0c92 100644
--- a/spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-4.3.xsd
+++ b/spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-4.3.xsd
@@ -10,8 +10,9 @@
 	
 		
 			
-				Configures an inner bean that will generate a
-				JSR 223 compliant script.
+				Configures an inner bean
+				('org.springframework.integration.scripting.jsr223.ScriptExecutingMessageProcessor')
+				that will generate a JSR 223 compliant script.
 			
 		
 	
@@ -22,8 +23,8 @@
 				
 					
 						
-							The script language or JSR 223 scripting engine name. Required only for inline scripts. If a script location is
-							referenced, the language may be derived from the file extension
+							The script language or JSR 223 scripting engine name. Required only for inline scripts.
+							If a script location is referenced, the language may be derived from the file extension
 							(.rb: ruby, .groovy, js: javascript (ECMAScript), .py: python).
 					
 					
diff --git a/spring-integration-security/src/main/resources/org/springframework/integration/security/config/spring-integration-security-4.3.xsd b/spring-integration-security/src/main/resources/org/springframework/integration/security/config/spring-integration-security-4.3.xsd
index f0ce6af405..3eccba2450 100644
--- a/spring-integration-security/src/main/resources/org/springframework/integration/security/config/spring-integration-security-4.3.xsd
+++ b/spring-integration-security/src/main/resources/org/springframework/integration/security/config/spring-integration-security-4.3.xsd
@@ -13,7 +13,8 @@
 		
 			
 				
-	Defines security requirements for one or more Message Channels.
+					Defines a 'org.springframework.integration.security.channel.ChannelSecurityInterceptor' security
+					requirements for one or more Message Channels.
 				
 			
 			
diff --git a/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-4.3.xsd b/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-4.3.xsd
index 22813c3bc3..8b24efd1f1 100644
--- a/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-4.3.xsd
+++ b/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-4.3.xsd
@@ -16,9 +16,11 @@
 
 	
 		
-			
+			
+                Configures a Consumer Endpoint for the
+				'org.springframework.integration.file.remote.handler.FileTransferringMessageHandler'
+				for the 'SftpRemoteFileTemplate' that writes files to a remote SFTP endpoint.
+            
 		
 		
 			
@@ -71,9 +73,11 @@
 
 	
 		
-			
+			
+				Configures a 'SourcePollingChannelAdapter' Endpoint for the
+				'org.springframework.integration.sftp.inbound.FtpInboundFileSynchronizingMessageSource'
+				that synchronizes with a remote SFTP endpoint.
+            
 		
 		
 			
@@ -238,9 +242,10 @@
 
 	
 		
-			
+			
+				Configures a Consumer Endpoint for the
+				'org.springframework.integration.sftp.gateway.SftpOutboundGateway used to issue SFTP commands.
+			
 		
 		
 			
diff --git a/spring-integration-stomp/src/main/resources/org/springframework/integration/stomp/config/spring-integration-stomp-4.3.xsd b/spring-integration-stomp/src/main/resources/org/springframework/integration/stomp/config/spring-integration-stomp-4.3.xsd
index 60692cb417..99291e5d17 100644
--- a/spring-integration-stomp/src/main/resources/org/springframework/integration/stomp/config/spring-integration-stomp-4.3.xsd
+++ b/spring-integration-stomp/src/main/resources/org/springframework/integration/stomp/config/spring-integration-stomp-4.3.xsd
@@ -19,10 +19,11 @@
 	
 
 	
-
 		
 			
-				Configures an endpoint that will receive STOMP Messages using the provided
+				Defines a Message Producing Endpoint for the
+				'org.springframework.integration.stomp.inbound.StompInboundChannelAdapter' that
+				subscribes to the STOMP destination(s) and produces messages throughout the provided
 				'StompSessionManager'.
 			
 		
@@ -77,8 +78,9 @@
 	
 		
 			
-				Configures an endpoint that will send a STOMP Message to the provided
-				'StompSessionManager'.
+				Configures a Consumer Endpoint for the
+				'org.springframework.integration.stomp.outbound.StompMessageHandler' that sends STOMP Messages to
+				the provided 'StompSessionManager'.
 			
 		
 		
diff --git a/spring-integration-stream/src/main/resources/org/springframework/integration/stream/config/spring-integration-stream-4.3.xsd b/spring-integration-stream/src/main/resources/org/springframework/integration/stream/config/spring-integration-stream-4.3.xsd
index 975a0164cb..80a9ca4713 100644
--- a/spring-integration-stream/src/main/resources/org/springframework/integration/stream/config/spring-integration-stream-4.3.xsd
+++ b/spring-integration-stream/src/main/resources/org/springframework/integration/stream/config/spring-integration-stream-4.3.xsd
@@ -22,7 +22,9 @@
 	
 		
 			
-	Configures a source that reads from stdin (System.in).
+				Defines a Polling Channel Adapter for the
+				'org.springframework.integration.stream.CharacterStreamReadingMessageSource'
+				that reads from stdin (System.in).
 			
 		
 		
@@ -41,8 +43,9 @@
 	
 		
 			
-	Configures an outbound Channel Adapter that writes to stdout (System.out)
-	or to stderr (System.err) depending on the element name.
+				Configures a Consumer Endpoint for the
+				'org.springframework.integration.stream.CharacterStreamWritingMessageHandler' that writes to stdout
+				(System.out) or to stderr (System.err) depending on the element name.
 			
 		
 		
diff --git a/spring-integration-syslog/src/main/resources/org/springframework/integration/syslog/config/spring-integration-syslog-4.3.xsd b/spring-integration-syslog/src/main/resources/org/springframework/integration/syslog/config/spring-integration-syslog-4.3.xsd
index c62f14b177..4b45a72f9e 100644
--- a/spring-integration-syslog/src/main/resources/org/springframework/integration/syslog/config/spring-integration-syslog-4.3.xsd
+++ b/spring-integration-syslog/src/main/resources/org/springframework/integration/syslog/config/spring-integration-syslog-4.3.xsd
@@ -21,6 +21,13 @@
 	
 
 	
+		
+			
+				Configures a Message Producing Endpoint for the
+				'org.springframework.integration.syslog.inbound.SyslogReceivingChannelAdapterSupport' that
+				listens syslogs from the provided port and convert them to the messages.
+			
+		
 		
 			
 				
diff --git a/spring-integration-twitter/src/main/resources/org/springframework/integration/twitter/config/spring-integration-twitter-4.3.xsd b/spring-integration-twitter/src/main/resources/org/springframework/integration/twitter/config/spring-integration-twitter-4.3.xsd
index c0fd51954f..d18cf17ead 100644
--- a/spring-integration-twitter/src/main/resources/org/springframework/integration/twitter/config/spring-integration-twitter-4.3.xsd
+++ b/spring-integration-twitter/src/main/resources/org/springframework/integration/twitter/config/spring-integration-twitter-4.3.xsd
@@ -20,8 +20,9 @@
 	
 		
 			
-				Configures an inbound channel adapter that consumes your friends' timeline updates
-				from Twitter and sends Messages whose payloads are Tweet objects.
+				Defines a Polling Channel Adapter for the
+				'org.springframework.integration.twitter.inbound.TimelineReceivingMessageSource' that consumes your
+				friends' timeline updates from Twitter and sends Messages whose payloads are Tweet objects.
 			
 		
 		
@@ -34,8 +35,9 @@
 	
 		
 			
-				Configures an inbound channel adapter that consumes mentions of your handle
-				from Twitter and sends Messages whose payloads are Tweet objects.
+				Defines a Polling Channel Adapter for the
+				'org.springframework.integration.twitter.inbound.MentionsReceivingMessageSource' that consumes mentions
+				of your handle from Twitter and sends Messages whose payloads are Tweet objects.
 			
 		
 		
@@ -49,8 +51,9 @@
 	
 		
 			
-				Configures an inbound channel adapter that consumes search results for a given query
-				from Twitter and sends Messages whose payloads are Tweet objects.
+				Defines a Polling Channel Adapter for the
+				'org.springframework.integration.twitter.inbound.SearchReceivingMessageSource' that consumes search
+				results for a given query from Twitter and sends Messages whose payloads are Tweet objects.
 			
 		
 		
@@ -72,8 +75,9 @@
 	
 		
 			
-				Configures an inbound channel adapter that consumes direct messages from Twitter
-				and sends Messages whose payloads are DirectMessage objects.
+				Defines a Polling Channel Adapter for the
+				'org.springframework.integration.twitter.inbound.DirectMessageReceivingMessageSource' that consumes
+				direct messages from Twitter and sends Messages whose payloads are DirectMessage objects.
 			
 		
 		
@@ -90,7 +94,9 @@
 	
 		
 			
-				Configures an outbound channel adapter that sends Direct Messages to a Twitter user as
+				Configures a Consumer Endpoint for the
+				'org.springframework.integration.twitter.outbound.DirectMessageSendingMessageHandler'
+				that sends Direct Messages to a Twitter user as
 				specified in the header whose name is defined by the TwitterHeaders.DM_TARGET_USER_ID constant.
 			
 		
@@ -107,7 +113,9 @@
 	
 		
 			
-				Configures an outbound channel adapter that posts a status update to the authorized user's timeline.
+				Configures a Consumer Endpoint for the
+				'org.springframework.integration.twitter.outbound.StatusUpdatingMessageHandler'
+				that posts a status update to the authorized user's timeline.
 			
 		
 		
@@ -132,7 +140,9 @@
 	
 		
 			
 		
 		
@@ -282,7 +292,8 @@
 
 	
 		
-			
+			
 			
 		
 		
@@ -306,4 +317,5 @@
 			
 		
 	
+
 
diff --git a/spring-integration-websocket/src/main/resources/org/springframework/integration/websocket/config/spring-integration-websocket-4.3.xsd b/spring-integration-websocket/src/main/resources/org/springframework/integration/websocket/config/spring-integration-websocket-4.3.xsd
index 39f1e12063..e6308ebdda 100644
--- a/spring-integration-websocket/src/main/resources/org/springframework/integration/websocket/config/spring-integration-websocket-4.3.xsd
+++ b/spring-integration-websocket/src/main/resources/org/springframework/integration/websocket/config/spring-integration-websocket-4.3.xsd
@@ -317,7 +317,9 @@
 	
 		
 			
-				Configures an endpoint that will send a WebSocket Message to the provided
+				Configures a Consumer Endpoint for the
+				'org.springframework.integration.websocket.outbound.WebSocketOutboundMessageHandler' that
+				that will send WebSocket Messages to the provided
 				'IntegrationWebSocketContainer'.
 			
 		
@@ -337,7 +339,9 @@
 	
 		
 			
-				Configures an endpoint that will receive WebSocket Messages from the provided
+				Configures a Message Producing Endpoint for the
+				'org.springframework.integration.websocket.inbound.WebSocketInboundChannelAdapter'
+				that will receive WebSocket Messages from the provided
 				'IntegrationWebSocketContainer' forward converted messages to a Message Channel.
 			
 		
diff --git a/spring-integration-ws/src/main/resources/org/springframework/integration/ws/config/spring-integration-ws-4.3.xsd b/spring-integration-ws/src/main/resources/org/springframework/integration/ws/config/spring-integration-ws-4.3.xsd
index c4b34fe1a7..472f346056 100644
--- a/spring-integration-ws/src/main/resources/org/springframework/integration/ws/config/spring-integration-ws-4.3.xsd
+++ b/spring-integration-ws/src/main/resources/org/springframework/integration/ws/config/spring-integration-ws-4.3.xsd
@@ -23,7 +23,9 @@
 		
 			
 				
-	Defines a Web Service based outbound Messaging Gateway.
+					Configures a Consumer Endpoint for the
+					'org.springframework.integration.ws.AbstractWebServiceOutboundGateway' implementation that
+					sends SOAP requests and expects responses.
 				
 			
 			
@@ -316,7 +318,9 @@ this list can also be simple patterns to be matched against the header names (e.
 		
 			
 				
-	Defines a Web Service based inbound Messaging Gateway.
+					Configures a Messaging Gateway Endpoint for the
+					'org.springframework.integration.ws.AbstractWebServiceInboundGateway' implementation that
+					receives SOAP requests and produce responses.
 				
 			
 			
@@ -418,7 +422,7 @@ this list can also be simple patterns to be matched against the header names (e.
 		
 			
 				
-	Defines a Transformer for adding a SOAP Action value.
+	Defines a 'org.springframework.integration.transformer.HeaderEnricher'  for adding a SOAP Action value.
 				
 			
 			
diff --git a/spring-integration-xml/src/main/resources/org/springframework/integration/xml/config/spring-integration-xml-4.3.xsd b/spring-integration-xml/src/main/resources/org/springframework/integration/xml/config/spring-integration-xml-4.3.xsd
index 72e011e535..f32604c86c 100644
--- a/spring-integration-xml/src/main/resources/org/springframework/integration/xml/config/spring-integration-xml-4.3.xsd
+++ b/spring-integration-xml/src/main/resources/org/springframework/integration/xml/config/spring-integration-xml-4.3.xsd
@@ -21,7 +21,8 @@
 	
 		
 			
-				Defines an XML marshalling transformer.
+				Defines an XML ('org.springframework.integration.xml.transformer.MarshallingTransformer')
+				marshalling transformer.
 			
 		
 		
@@ -75,7 +76,8 @@
 	
 		
 			
-				Defines an XML unmarshalling transformer.
+				Defines an XML ('org.springframework.integration.xml.transformer.UnmarshallingTransformer')
+				unmarshalling transformer.
 			
 		
 		
@@ -98,7 +100,7 @@
 	
 		
 			
-				Defines an XSLT transformer.
+				Defines an XSLT ('org.springframework.integration.xml.transformer.XsltPayloadTransformer') transformer.
 			
 		
 		
@@ -254,7 +256,7 @@
 	
 		
 			
-				Defines an XPath transformer.
+				Defines an XPath ('org.springframework.integration.xml.transformer.XPathTransformer') transformer.
 			
 		
 		
@@ -330,8 +332,8 @@
 	
 		
 			
-	Defines a Header Enricher Message Transformer that evaluates XPath expressions against the
-	message payload and inserts the result of the evaluation into a message header.
+				Defines an 'org.springframework.integration.xml.transformer.XPathHeaderEnricher' that evaluates XPath
+				expressions against the message payload and inserts the result of the evaluation into a message header.
 			
 		
 		
@@ -542,7 +544,7 @@
 		
 			
 				
-					
+					
 						
 							
 		
-			
+				Configures a Consumer Endpoint for the
+				'org.springframework.integration.xml.router.XPathRouter' which allows for the routing of messages
 				using XPath expressions. This Message Endpoint has no output
 				channel. Instead, one or more output channels are determined
 				dynamically using the provided XPath Expression.
-			]]>
+			
 		
 	
 
 	
 		
 			
-	Defines an XPath-based Message Filter. If the XPath expression will evaluate to a boolean,
-	no configuration attributes are required. If the XPath expression will evaluate to a String,
-	a "match-value" should be provided against which the evaluation result will be matched.
-	There are three options for the "match-type": exact, case-insensitive, and regex. These
-	correspond to the equals, equals-ignore-case, and matches operations on java.lang.String,
-	respectively. When providing a 'match-type' value of 'regex', the value provided in
-	'match-value' must be a valid Regular Expression.
+				Configures a Consumer Endpoint for the
+				'org.springframework.integration.filter.MessageFilter'
+				with an 'org.springframework.integration.xml.selector.AbstractXPathMessageSelector'
+				implementation based on the configuration options.
+				If the XPath expression will evaluate to a boolean,
+				no configuration attributes are required. If the XPath expression will evaluate to a String,
+				a "match-value" should be provided against which the evaluation result will be matched.
+				There are three options for the "match-type": exact, case-insensitive, and regex. These
+				correspond to the equals, equals-ignore-case, and matches operations on java.lang.String,
+				respectively. When providing a 'match-type' value of 'regex', the value provided in
+				'match-value' must be a valid Regular Expression.
 			
 		
 		
@@ -665,7 +672,8 @@
 	
 		
 			
@@ -697,7 +705,8 @@
 	
 		
 			
-	Defines an XPath splitter.
+				Configures a Consumer Endpoint for the
+				'org.springframework.integration.xml.splitter.XPathMessageSplitter'
 			
 		
 		
@@ -783,7 +792,9 @@
 	
 		
 			
-	Defines an XML validating filter.
+				Configures a Consumer Endpoint for the
+				'org.springframework.integration.filter.MessageFilter'
+				with an 'org.springframework.integration.xml.selector.XmlValidatingMessageSelector'
 			
 		
 		
diff --git a/spring-integration-xmpp/src/main/resources/org/springframework/integration/xmpp/config/spring-integration-xmpp-4.3.xsd b/spring-integration-xmpp/src/main/resources/org/springframework/integration/xmpp/config/spring-integration-xmpp-4.3.xsd
index e60e4c9d4b..5506b1e90b 100644
--- a/spring-integration-xmpp/src/main/resources/org/springframework/integration/xmpp/config/spring-integration-xmpp-4.3.xsd
+++ b/spring-integration-xmpp/src/main/resources/org/springframework/integration/xmpp/config/spring-integration-xmpp-4.3.xsd
@@ -16,7 +16,8 @@
 	
 		
 			
-				Configures an XMPP connection that can in turn be referenced by other components
+				Configures an XMPP connection ('org.springframework.integration.xmpp.config.XmppConnectionFactoryBean')
+				that can in turn be referenced by other components
 			
 		
 		
@@ -96,7 +97,10 @@
 	
 		
 			
-				Configures an endpoint that will receive chat messages sent to a given account and then forward those messages to a MessageChannel.
+				Configures a Message Producing Endpoint for the
+				'org.springframework.integration.xmpp.inbound.ChatMessageListeningEndpoint' that
+				that will receive chat messages sent to a given account and then forward those messages
+				to a MessageChannel.
 			
 		
 		
@@ -118,7 +122,9 @@
 	
 		
 			
-				Outbound Channel Adapter that sends chat messages.
+				Configures a Consumer Endpoint for the
+				'org.springframework.integration.xmpp.outbound.ChatMessageSendingMessageHandler' that sends chat
+				messages.
 			
 		
 		
@@ -131,7 +137,9 @@
 	
 		
 			
-				Configures an endpoint that will forward Presence state changes to a MessageChannel.
+				Configures a Message Producing Endpoint for the
+				'org.springframework.integration.xmpp.inbound.PresenceListeningEndpoint'
+				that will forward Presence state changes to a MessageChannel.
 			
 		
 		
@@ -144,7 +152,9 @@
 	
 		
 			
-				Configures an endpoint that will publish an updated {@link org.jivesoftware.smack.packet.Presence} state on your {@link XMPPConnection } object.
+				Configures a Consumer Endpoint for the
+				'org.springframework.integration.xmpp.outbound.PresenceSendingMessageHandler'
+				that will publish an updated 'Presence' state on the 'XMPPConnection' object.
 			
 		
 		
@@ -243,7 +253,7 @@
 		
 			
 				
-					Defines a Transformer for adding XMPP headers.
+					Defines a 'org.springframework.integration.transformer.HeaderEnricher' for adding XMPP headers.
 				
 			
 			
diff --git a/spring-integration-zookeeper/src/main/resources/org/springframework/integration/zookeeper/config/spring-integration-zookeeper-4.3.xsd b/spring-integration-zookeeper/src/main/resources/org/springframework/integration/zookeeper/config/spring-integration-zookeeper-4.3.xsd
index 2850a2fd79..269ef2b28c 100644
--- a/spring-integration-zookeeper/src/main/resources/org/springframework/integration/zookeeper/config/spring-integration-zookeeper-4.3.xsd
+++ b/spring-integration-zookeeper/src/main/resources/org/springframework/integration/zookeeper/config/spring-integration-zookeeper-4.3.xsd
@@ -21,8 +21,9 @@
 	
 		
 			
-				The definition for the Spring Integration Zookeeper leader listener to automatically start/stop
-				endpoints based on the Role.
+				The definition for the Spring Integration Zookeeper leader listener
+				'org.springframework.integration.zookeeper.leader.LeaderInitiator'
+				to automatically start/stop endpoints based on the Role.
 				The 'role' attribute here is matched to 'role' attributes on associated 'SmartLifecycle'
 				beans.
 				Endpoint roles can be defined in XML configuration or via '@Role' annotations.
diff --git a/src/reference/asciidoc/gateway.adoc b/src/reference/asciidoc/gateway.adoc
index f6db8c52a3..0b40c3a104 100644
--- a/src/reference/asciidoc/gateway.adoc
+++ b/src/reference/asciidoc/gateway.adoc
@@ -283,6 +283,10 @@ The standard `@ComponentScan` infrastructure doesn't deal with interfaces, there
 to determine `@MessagingGateway` annotation on the interfaces and register `GatewayProxyFactoryBean` s for them.
 See also <>
 
+NOTE: If you have no XML configuration, the `@EnableIntegration` annotation is required on at least one `@Configuration`
+class.
+See <> for more information.
+
 [[gateway-calling-no-argument-methods]]
 ==== Invoking No-Argument Methods
 
diff --git a/src/reference/asciidoc/overview.adoc b/src/reference/asciidoc/overview.adoc
index 355bd56d12..c490dc18e7 100644
--- a/src/reference/asciidoc/overview.adoc
+++ b/src/reference/asciidoc/overview.adoc
@@ -91,7 +91,7 @@ Whereas "Point-to-Point" and "Publish/Subscribe" define the two options for _how
 The advantage of buffering is that it allows for throttling the inbound Messages and thereby prevents overloading a consumer.
 However, as the name suggests, this also adds some complexity, since a consumer can only receive the Messages from such a channel if a _poller_ is configured.
 On the other hand, a consumer connected to a _Subscribable Channel_ is simply Message-driven.
-The variety of channel implementations available in Spring Integration will be discussed in detail in<>.
+The variety of channel implementations available in Spring Integration will be discussed in detail in <>.
 
 [[overview-components-endpoint]]
 ==== Message Endpoint
@@ -182,7 +182,7 @@ Whenever the service object's method returns a value, that return value will lik
 That reply Message is sent to the output channel.
 If no output channel has been configured, then the reply will be sent to the channel specified in the Message's "return address" if available.
 
-.A request-reply "Service Activator" endpoint connects a target object's method to input and output Message Channels.
+A request-reply "Service Activator" endpoint connects a target object's method to input and output Message Channels.
 
 image::images/handler-endpoint.jpg[align="center", scaledwidth=100%]
 
@@ -203,7 +203,8 @@ image::images/source-endpoint.jpg[align="center", scaledwidth=100%]
 
 image::images/target-endpoint.jpg[align="center", scaledwidth=100%]
 
-=== Configuration
+[[configuration-enable-integration]]
+=== Configuration and @EnableIntegration
 
 Throughout this document you will see references to XML namespace support for declaring elements in a Spring Integration flow.
 This support is provided by a series of namespace parsers that generate appropriate bean definitions to implement a particular component.
@@ -211,12 +212,24 @@ For example, many endpoints consist of a `MessageHandler` bean and a `ConsumerEn
 
 The first time a Spring Integration namespace element is encountered, the framework automatically declares a number of beans that are used to support the runtime environment (task scheduler, implicit channel creator, etc).
 
-Starting with _version 4.0_, these support beans can also be defined when using `@Configuration` classes, by adding a new annotation `@EnableIntegration`.
-This is useful when declaring a simple Spring Integration flow using purely Java Configuration.
-For example; you can declare an endpoint with a `MessageHandler` `@Bean` as well as a `ConsumerEndpointFactoryBean` `@Bean`.
+IMPORTANT: Starting with _version 4.0_, the `@EnableIntegration` annotation has been introduced, to allow the
+registration of Spring Integration infrastructure beans (see
+http://docs.spring.io/spring-integration/docs/latest-ga/api/org/springframework/integration/config/EnableIntegration.html[JavaDocs]).
+This annotation is required when only Java & Annotation configuration is used, e.g. with Spring Boot and/or
+Spring Integration Messaging Annotation support and Spring Integration Java DSL with no XML integration configuration.
 
-`@EnableIntegration` is also useful when you have a parent context with no Spring Integration components and 2 or more child contexts that do use Spring Integration.
-It would enable these common components to be declared once only, in the parent context.
+The `@EnableIntegration` annotation is also useful when you have a parent context with no Spring Integration components
+and 2 or more child contexts that use Spring Integration.
+It enables these common components to be declared once only, in the parent context.
+
+The `@EnableIntegration` annotation registers many infrastructure components with the application context:
+
+- Registers some built-in beans, e.g. `errorChannel` and its `LoggingHandler`, `taskScheduler` for pollers,
+`jsonPath` SpEL-function etc.;
+- Adds several `BeanFactoryPostProcessor` s to enhance the `BeanFactory` for global and default integration environment;
+- Adds several `BeanPostProcessor` s to enhance and/or convert and wrap particular beans for integration purposes;
+- Adds annotations processors to parse Messaging Annotations and registers components for them with the application
+context.
 
 The `@IntegrationComponentScan` annotation has also been introduced to permit classpath scanning.
 This annotation plays a similar role as the standard Spring Framework `@ComponentScan` annotation, but it is restricted just to Spring Integration specific components and annotations, which aren't reachable by the standard Spring Framework component scan mechanism.
@@ -235,6 +248,8 @@ The `@IntegrationConverter` annotation has been introduced to mark `Converter`,
 This annotation is an analogue of the `` xml element (see <>).
 `@IntegrationConverter` annotations can be placed at the class level (with a `@Component` stereotype annotation), or on `@Bean` methods within `@Configuration` classes.
 
+Also see <> for more information about Messaging Annotations.
+
 [[programming-considerations]]
 === Programming Considerations
 
@@ -244,7 +259,123 @@ If you do expose the framework to your classes, there are some considerations th
 
 * If your component is `ApplicationContextAware`, you should generally not "use" the `ApplicationContext` in the `setApplicationContext()` method; just store a reference and defer such uses until later in the context lifecycle.
 
-
 * If your component is an `InitializingBean` or uses `@PostConstruct` methods, do not send any messages from these initialization methods - the application context is not yet initialized when these methods are called, and sending such messages will likely fail.
 If you need to send a messages during startup, implement `ApplicationListener` and wait for the `ContextRefreshedEvent`.
 Alternatively, implement `SmartLifecycle`, put your bean in a late phase, and send the messages from the `start()` method.
+
+
+[[programming-tips]]
+=== Programming Tips and Tricks
+
+With XML configuration and Spring Integration Namespace support, the XML Parsers hide how
+target beans are built and wired together.
+For Java & Annotation Configuration, it is important to understand the Framework API for the target end-user
+applications.
+
+The first class citizens for EIP implementation are `Message`, `Channel` and `Endpoint` (see <>
+ above).
+Their implementations (contracts) are:
+
+- `org.springframework.messaging.Message` - see <>;
+- `org.springframework.messaging.MessageChannel` - see <>;
+- `org.springframework.integration.endpoint.AbstractEndpoint` - see <>.
+
+The first two are simple enough to understand how to implement, configure and use, respectively;
+the last one deserves more review.
+
+The `AbstractEndpoint` is widely used throughout the Framework for different component implementations;
+its main implementations are:
+
+- `EventDrivenConsumer`, when we subscribe to a `SubscribableChannel` to _listen_ for messages;
+- `PollingConsumer`, when we _poll_ for messages from a `PollableChannel`.
+
+Using Messaging Annotations and/or Java DSL, you shouldn't worry about these components, because the Framework produces
+them automatically via appropriate annotations and `BeanPostProcessor` s.
+When building components manually, the `ConsumerEndpointFactoryBean` should be used to help to determine the target
+`AbstractEndpoint` implementation based on the provided `inputChannel` property.
+
+On the other hand, the `ConsumerEndpointFactoryBean` exhibits an another first class citizens in the Framework -
+`org.springframework.messaging.MessageHandler`.
+The goal of the implementation of this class is to _handle the message consumed by the endpoint from the channel_.
+All EIP components in Spring Integration are `MessageHandler` implementations,
+e.g. `AggregatingMessageHandler`, `MessageTransformingHandler`, `AbstractMessageSplitter` etc.; as well as the target
+protocol outbound adapters are implementations, too, e.g. `FileWritingMessageHandler`,
+`HttpRequestExecutingMessageHandler`, `AbstractMqttMessageHandler` etc.
+When you develop Spring Integration applications with Java & Annotation Configuration, you should take a look into the
+Spring Integration module to find an appropriate `MessageHandler` implementation to be used for the `@ServiceActivator`
+configuration.
+For example to send an XMPP message (see <>) we should configure something like this:
+
+[source,java]
+----
+@Bean
+@ServiceActivator(inputChannel = "input")
+public MessageHandler sendChatMessageHandler(XMPPConnection xmppConnection) {
+    ChatMessageSendingMessageHandler handler = new ChatMessageSendingMessageHandler(xmppConnection);
+
+    DefaultXmppHeaderMapper xmppHeaderMapper = new DefaultXmppHeaderMapper();
+    xmppHeaderMapper.setRequestHeaderNames("*");
+    handler.setHeaderMapper(xmppHeaderMapper);
+
+    return handler;
+}
+----
+
+The `MessageHandler` implementations represent the _outbound_ and _processing_ part of the message flow.
+
+The _inbound_ message flow side has its own components, which are divided to the _polling_ and _listening_ behavior.
+The listening components are pretty simple and typically requires only one target class implementation to be ready to
+produce messages.
+Listening components can be one-way `MessageProducerSupport` implementations,
+e.g. `AbstractMqttMessageDrivenChannelAdapter` and `ImapIdleChannelAdapter`; and request-reply -
+`MessagingGatewaySupport` implementations, e.g. `AmqpInboundGateway` and `AbstractWebServiceInboundGateway`.
+
+_Polling_ inbound endpoints are for those protocols which don't provide a listener API or aren't intended for
+such a behavior.
+For example any File based protocol, as an FTP, any data bases (RDBMS or NoSQL) etc.
+
+These inbound endpoints consist with two components: the poller configuration, to initiate the polling task periodically,
+and message source class to read data from the target protocol and produce a message for the downstream integration flow.
+The first class, for poller configuration, is `SourcePollingChannelAdapter`.
+It is one more `AbstractEndpoint` implementation, but especially for the polling purpose for initiating an integration
+flow.
+Typically, with the Messaging Annotations or Java DSL, you shouldn't worry about this class, the Framework produces
+a bean for it, based on the `@InboundChannelAdapter` configuration or Java DSL particular Builder.
+
+The _message source_ components are more important for the target application development and they all implement
+the `MessageSource` interface, e.g. `MongoDbMessageSource` and `AbstractTwitterMessageSource`.
+With that in mind, our config for reading data from an RDBMS table with JDBC may look like:
+
+[source,java]
+----
+@Bean
+@InboundChannelAdapter(value = "fooChannel", poller = @Poller(fixedDelay="5000"))
+public MessageSource storedProc(DataSource dataSource) {
+    return new JdbcPollingChannelAdapter(dataSource, "SELECT * FROM foo where status = 0");
+}
+----
+
+All the required _inbound_ and _outbound_ classes for the target protocols you can find in the particular Spring
+Integration module, in most cases in the respective package.
+For example `spring-integration-websocket` adapters are:
+
+- `o.s.i.websocket.inbound.WebSocketInboundChannelAdapter` - implements `MessageProducerSupport`
+implementation to listen frames on the socket and produce message to the channel;
+- `o.s.i.websocket.outbound.WebSocketOutboundMessageHandler` - the one-way
+`AbstractMessageHandler` implementation to convert incoming messages to the appropriate frame and send over websocket.
+
+If you are familiar with Spring Integration XML configuration already, starting with _version 4.3_, we provide in the
+XSD elements definitions the description with the pointer which target classes are used to produce beans for the adapter
+or gateway, for example:
+
+[source,xml]
+----
+
+    
+		
+Configures a Consumer Endpoint for the 'o.s.i.amqp.outbound.AsyncAmqpOutboundGateway'
+that will publish an AMQP Message to the provided Exchange and expect a reply Message.
+The sending thread returns immediately; the reply is sent asynchronously; uses 'AsyncRabbitTemplate.sendAndReceive()'.
+       
+	
+----
diff --git a/src/reference/asciidoc/preface.adoc b/src/reference/asciidoc/preface.adoc
index 25c23bfb58..dcd7eb6451 100644
--- a/src/reference/asciidoc/preface.adoc
+++ b/src/reference/asciidoc/preface.adoc
@@ -23,12 +23,12 @@ see https://github.com/spring-projects/spring-integration#checking-out-and-build
 [[supported-spring-versions]]
 === Compatible Versions of the Spring Framework
 
-_Spring Integration_ *4.3.x* requires _Spring Framework_ *4.2.3* or later.
+_Spring Integration_ *4.3.x* requires _Spring Framework_ *4.3* or later.
 
 [[code-conventions]]
 === Code Conventions
 
-The Spring Framework 2.0 introduced support for namespaces, which simplifies the Xml configuration of the application context, and consequently Spring Integration provides broad namespace support.
+The Spring Framework 2.0 introduced support for namespaces, which simplifies the XML configuration of the application context, and consequently Spring Integration provides broad namespace support.
 This reference guide applies the following conventions for all code examples that use namespace support:
 
 The *int* namespace prefix will be used for Spring Integration's core namespace support.