Support for Jmx (and Integration) autoconfig in parent contexts

When there are parent contexts we already had a strategy for registering
the actuator endpoints, but not the regular JMX or Integration MBeans.
This chnage makes the autoconfigs for JMX aware of the parent context.

Also adds a sample with a parent context.

See gh-847

spring-boot-samples/spring-boot-sample-parent-context/src/main/java/sample/parent/HelloWorldService.java

@@ -0,0 +1,32 @@
+/*
+ * Copyright 2012-2013 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package sample.parent;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class HelloWorldService {
+
+	@Autowired
+	private ServiceProperties configuration;
+
+	public String getHelloMessage(String name) {
+		return this.configuration.getGreeting() + " " + name;
+	}
+
+}

spring-boot-samples/spring-boot-sample-parent-context/src/main/java/sample/parent/SampleEndpoint.java

@@ -0,0 +1,41 @@
+/*
+ * Copyright 2012-2013 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package sample.parent;
+
+import java.io.File;
+import java.io.FileInputStream;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.integration.annotation.MessageEndpoint;
+import org.springframework.integration.annotation.ServiceActivator;
+import org.springframework.util.StreamUtils;
+
+@MessageEndpoint
+public class SampleEndpoint {
+
+	@Autowired
+	private HelloWorldService helloWorldService;
+
+	@ServiceActivator
+	public String hello(File input) throws Exception {
+		FileInputStream in = new FileInputStream(input);
+		String name = new String(StreamUtils.copyToByteArray(in));
+		in.close();
+		return this.helloWorldService.getHelloMessage(name);
+	}
+
+}

spring-boot-samples/spring-boot-sample-parent-context/src/main/java/sample/parent/SampleParentContextApplication.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright 2012-2013 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package sample.parent;
+
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.ImportResource;
+
+@Configuration
+@EnableAutoConfiguration
+@EnableConfigurationProperties(ServiceProperties.class)
+@ComponentScan
+public class SampleParentContextApplication {
+
+	public static void main(String[] args) throws Exception {
+		new SpringApplicationBuilder(Parent.class).child(SampleParentContextApplication.class).run(args);
+	}
+	
+	@EnableAutoConfiguration
+	@ImportResource("integration-context.xml")
+	protected static class Parent {
+		
+	}
+
+}

spring-boot-samples/spring-boot-sample-parent-context/src/main/java/sample/parent/ServiceProperties.java

@@ -0,0 +1,38 @@
+/*
+ * Copyright 2012-2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package sample.parent;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.jmx.export.annotation.ManagedAttribute;
+import org.springframework.jmx.export.annotation.ManagedResource;
+
+@ConfigurationProperties(prefix = "service", ignoreUnknownFields = false)
+@ManagedResource
+public class ServiceProperties {
+
+	private String greeting = "Hello";
+
+	@ManagedAttribute
+	public String getGreeting() {
+		return this.greeting;
+	}
+
+	public void setGreeting(String greeting) {
+		this.greeting = greeting;
+	}
+
+}

spring-boot-samples/spring-boot-sample-parent-context/src/main/resources/application.properties

@@ -0,0 +1 @@
+service.greeting: Hello

spring-boot-samples/spring-boot-sample-parent-context/src/main/resources/integration-context.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:int="http://www.springframework.org/schema/integration"
+	xmlns:int-file="http://www.springframework.org/schema/integration/file"
+	xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/integration/file http://www.springframework.org/schema/integration/file/spring-integration-file.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+	<int-file:inbound-channel-adapter channel="input" directory="target/input" filename-pattern="*">
+		<int:poller fixed-rate="500"/>
+	</int-file:inbound-channel-adapter>
+
+	<int:service-activator input-channel="input" ref="sampleEndpoint" output-channel="output"/>
+
+	<int:channel id="output"/>
+
+	<int-file:outbound-channel-adapter channel="output" directory="target/output"/>
+
+</beans>

spring-boot-samples/spring-boot-sample-parent-context/src/main/resources/logback.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+	<include resource="org/springframework/boot/logging/logback/base.xml"/>	
+
+	<logger name="org.springframework.integration.file" level="DEBUG" />
+</configuration>

spring-boot-samples/spring-boot-sample-parent-context/src/test/java/sample/parent/consumer/SampleIntegrationApplicationTests.java

@@ -0,0 +1,88 @@
+/*
+ * Copyright 2012-2013 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package sample.parent.consumer;
+
+import java.util.concurrent.Callable;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.springframework.boot.SpringApplication;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.core.io.DefaultResourceLoader;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.support.ResourcePatternUtils;
+import org.springframework.util.StreamUtils;
+
+import sample.parent.SampleParentContextApplication;
+import sample.parent.producer.ProducerApplication;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Basic integration tests for service demo application.
+ * 
+ * @author Dave Syer
+ */
+public class SampleIntegrationApplicationTests {
+
+	private static ConfigurableApplicationContext context;
+
+	@BeforeClass
+	public static void start() throws Exception {
+		context = SpringApplication.run(SampleParentContextApplication.class);
+	}
+
+	@AfterClass
+	public static void stop() {
+		if (context != null) {
+			context.close();
+		}
+	}
+
+	@Test
+	public void testVanillaExchange() throws Exception {
+		SpringApplication.run(ProducerApplication.class, "World");
+		String output = getOutput();
+		assertTrue("Wrong output: " + output, output.contains("Hello World"));
+	}
+
+	private String getOutput() throws Exception {
+		Future<String> future = Executors.newSingleThreadExecutor().submit(
+				new Callable<String>() {
+					@Override
+					public String call() throws Exception {
+						Resource[] resources = new Resource[0];
+						while (resources.length == 0) {
+							Thread.sleep(200);
+							resources = ResourcePatternUtils.getResourcePatternResolver(
+									new DefaultResourceLoader()).getResources(
+									"file:target/output/**");
+						}
+						StringBuilder builder = new StringBuilder();
+						for (Resource resource : resources) {
+							builder.append(new String(StreamUtils
+									.copyToByteArray(resource.getInputStream())));
+						}
+						return builder.toString();
+					}
+				});
+		return future.get(30, TimeUnit.SECONDS);
+	}
+}

spring-boot-samples/spring-boot-sample-parent-context/src/test/java/sample/parent/producer/ProducerApplication.java

@@ -0,0 +1,47 @@
+/*
+ * Copyright 2012-2013 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package sample.parent.producer;
+
+import java.io.File;
+import java.io.FileOutputStream;
+
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.boot.SpringApplication;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class ProducerApplication implements CommandLineRunner {
+
+	@Override
+	public void run(String... args) throws Exception {
+		new File("target/input").mkdirs();
+		if (args.length > 0) {
+			FileOutputStream stream = new FileOutputStream("target/input/data"
+					+ System.currentTimeMillis() + ".txt");
+			for (String arg : args) {
+				stream.write(arg.getBytes());
+			}
+			stream.flush();
+			stream.close();
+		}
+	}
+
+	public static void main(String[] args) throws Exception {
+		SpringApplication.run(ProducerApplication.class, args);
+	}
+
+}