INT-4390: Fix tangle betweewn dsl and dsl.context

JIRA: https://jira.spring.io/browse/INT-4390

Move IFBPP and lifecycle advice to `....dsl.context`.

Author: garyrussell

spring-integration-core/src/main/java/org/springframework/integration/dsl/IntegrationFlowDefinition.java

@@ -110,7 +110,7 @@
  *
  * @since 5.0
  *
- * @see org.springframework.integration.dsl.IntegrationFlowBeanPostProcessor
+ * @see org.springframework.integration.dsl.context.IntegrationFlowBeanPostProcessor
  */
 public abstract class IntegrationFlowDefinition<B extends IntegrationFlowDefinition<B>> {
 
@@ -200,7 +200,7 @@ public B channel(MessageChannelSpec<?, ?> messageChannelSpec) {
 	 * Populate the provided {@link MessageChannel} instance
 	 * at the current {@link IntegrationFlow} chain position.
 	 * The {@code messageChannel} can be an existing bean, or fresh instance, in which case
-	 * the {@link org.springframework.integration.dsl.IntegrationFlowBeanPostProcessor}
+	 * the {@link org.springframework.integration.dsl.context.IntegrationFlowBeanPostProcessor}
 	 * will populate it as a bean with a generated name.
 	 * @param messageChannel the {@link MessageChannel} to populate.
 	 * @return the current {@link IntegrationFlowDefinition}.

spring-integration-core/src/main/java/org/springframework/integration/dsl/IntegrationFlows.java

@@ -45,7 +45,7 @@
  *
  * @since 5.0
  *
- * @see org.springframework.integration.dsl.IntegrationFlowBeanPostProcessor
+ * @see org.springframework.integration.dsl.context.IntegrationFlowBeanPostProcessor
  */
 public final class IntegrationFlows {
 

spring-integration-core/src/main/java/org/springframework/integration/dsl/StandardIntegrationFlow.java

@@ -61,7 +61,7 @@
  * @since 5.0
  *
  * @see IntegrationFlows
- * @see org.springframework.integration.dsl.IntegrationFlowBeanPostProcessor
+ * @see org.springframework.integration.dsl.context.IntegrationFlowBeanPostProcessor
  * @see org.springframework.integration.dsl.context.IntegrationFlowContext
  */
 public class StandardIntegrationFlow implements IntegrationFlow, SmartLifecycle {

spring-integration-core/src/main/java/org/springframework/integration/dsl/context/DslIntegrationConfigurationInitializer.java

@@ -24,7 +24,6 @@
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.integration.config.IntegrationConfigurationInitializer;
 import org.springframework.integration.dsl.IntegrationComponentSpec;
-import org.springframework.integration.dsl.IntegrationFlowBeanPostProcessor;
 import org.springframework.util.Assert;
 
 /**

spring-integration-core/src/main/java/org/springframework/integration/dsl/IntegrationFlowBeanPostProcessor.java renamed to spring-integration-core/src/main/java/org/springframework/integration/dsl/context/IntegrationFlowBeanPostProcessor.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.dsl;
+package org.springframework.integration.dsl.context;
 
 import java.util.Collection;
 import java.util.LinkedHashMap;
@@ -44,7 +44,15 @@
 import org.springframework.integration.config.IntegrationConfigUtils;
 import org.springframework.integration.config.SourcePollingChannelAdapterFactoryBean;
 import org.springframework.integration.core.MessageSource;
-import org.springframework.integration.dsl.context.IntegrationFlowContext;
+import org.springframework.integration.dsl.ComponentsRegistration;
+import org.springframework.integration.dsl.ConsumerEndpointSpec;
+import org.springframework.integration.dsl.IntegrationComponentSpec;
+import org.springframework.integration.dsl.IntegrationFlow;
+import org.springframework.integration.dsl.IntegrationFlowAdapter;
+import org.springframework.integration.dsl.IntegrationFlowBuilder;
+import org.springframework.integration.dsl.IntegrationFlows;
+import org.springframework.integration.dsl.SourcePollingChannelAdapterSpec;
+import org.springframework.integration.dsl.StandardIntegrationFlow;
 import org.springframework.integration.dsl.support.MessageChannelReference;
 import org.springframework.integration.gateway.AnnotationGatewayProxyFactoryBean;
 import org.springframework.integration.support.context.NamedComponent;

spring-integration-core/src/main/java/org/springframework/integration/dsl/IntegrationFlowLifecycleAdvice.java renamed to spring-integration-core/src/main/java/org/springframework/integration/dsl/context/IntegrationFlowLifecycleAdvice.java

@@ -14,12 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.dsl;
+package org.springframework.integration.dsl.context;
 
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
 
 import org.springframework.context.SmartLifecycle;
+import org.springframework.integration.dsl.IntegrationFlow;
+import org.springframework.integration.dsl.StandardIntegrationFlow;
 import org.springframework.util.ObjectUtils;
 
 /**

spring-integration-core/src/main/java/org/springframework/integration/dsl/support/FixedSubscriberChannelPrototype.java

@@ -28,7 +28,7 @@
  * @author Artem Bilan
  * @since 5.0
  *
- * @see org.springframework.integration.dsl.IntegrationFlowBeanPostProcessor
+ * @see org.springframework.integration.dsl.context.IntegrationFlowBeanPostProcessor
  */
 public class FixedSubscriberChannelPrototype implements MessageChannel {
 

spring-integration-core/src/main/java/org/springframework/integration/dsl/support/MessageChannelReference.java

@@ -29,7 +29,7 @@
  *
  * @since 5.0
  *
- * @see org.springframework.integration.dsl.IntegrationFlowBeanPostProcessor
+ * @see org.springframework.integration.dsl.context.IntegrationFlowBeanPostProcessor
  */
 public class MessageChannelReference implements MessageChannel {