Restructure 'bootstrap' to use 'zero'

spring-zero-samples/spring-zero-sample-actuator-ui/src/test/java/org/springframework/zero/sample/actuator/ui/SampleActuatorUiApplicationPortTests.java

@@ -1,4 +1,4 @@
-package org.springframework.bootstrap.sample.ui;
+package org.springframework.zero.sample.actuator.ui;
 
 import java.io.IOException;
 import java.util.Map;
@@ -11,13 +11,14 @@ import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
-import org.springframework.bootstrap.SpringApplication;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.client.ClientHttpResponse;
 import org.springframework.web.client.DefaultResponseErrorHandler;
 import org.springframework.web.client.RestTemplate;
+import org.springframework.zero.SpringApplication;
+import org.springframework.zero.sample.actuator.ui.SampleActuatorUiApplication;
 
 import static org.junit.Assert.assertEquals;
 
@@ -27,7 +28,7 @@ import static org.junit.Assert.assertEquals;
  * @author Dave Syer
  * 
  */
-public class ManagementServiceBootstrapApplicationTests {
+public class SampleActuatorUiApplicationPortTests {
 
 	private static ConfigurableApplicationContext context;
 
@@ -44,7 +45,7 @@ public class ManagementServiceBootstrapApplicationTests {
 							@Override
 							public ConfigurableApplicationContext call() throws Exception {
 								return (ConfigurableApplicationContext) SpringApplication
-										.run(ActuatorUiBootstrapApplication.class, args);
+										.run(SampleActuatorUiApplication.class, args);
 							}
 						});
 		context = future.get(10, TimeUnit.SECONDS);

spring-zero-samples/spring-zero-sample-actuator-ui/src/test/java/org/springframework/zero/sample/actuator/ui/SampleActuatorUiApplicationTests.java

@@ -1,4 +1,4 @@
-package org.springframework.bootstrap.sample.ui;
+package org.springframework.zero.sample.actuator.ui;
 
 import java.io.IOException;
 import java.util.Arrays;
@@ -11,7 +11,6 @@ import java.util.concurrent.TimeUnit;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.springframework.bootstrap.SpringApplication;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
@@ -22,6 +21,7 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.http.client.ClientHttpResponse;
 import org.springframework.web.client.DefaultResponseErrorHandler;
 import org.springframework.web.client.RestTemplate;
+import org.springframework.zero.SpringApplication;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -30,9 +30,8 @@ import static org.junit.Assert.assertTrue;
  * Basic integration tests for demo application.
  * 
  * @author Dave Syer
- * 
  */
-public class ActuatorUiBootstrapApplicationTests {
+public class SampleActuatorUiApplicationTests {
 
 	private static ConfigurableApplicationContext context;
 
@@ -44,7 +43,7 @@ public class ActuatorUiBootstrapApplicationTests {
 							@Override
 							public ConfigurableApplicationContext call() throws Exception {
 								return (ConfigurableApplicationContext) SpringApplication
-										.run(ActuatorUiBootstrapApplication.class);
+										.run(SampleActuatorUiApplication.class);
 							}
 						});
 		context = future.get(30, TimeUnit.SECONDS);

spring-zero-samples/spring-zero-sample-actuator-ui/src/test/resources/logging.properties

@@ -3,5 +3,5 @@ handlers = java.util.logging.ConsoleHandler
 
 java.util.logging.ConsoleHandler.level = FINE
 sun.net.www.protocol.http.HttpURLConnection.level = ALL
-org.springframework.bootstrap.context.annotation.level = ALL
-org.springframework.bootstrap.actuate.autoconfigure.level = ALL
+org.springframework.zero.context.annotation.level = ALL
+org.springframework.zero.actuate.autoconfigure.level = ALL