Restructure 'bootstrap' to use 'zero'

This commit is contained in:
Phillip Webb
2013-07-05 16:44:24 -07:00
parent d039822064
commit 261955c50b
443 changed files with 1361 additions and 1774 deletions

View File

@@ -14,20 +14,20 @@
* limitations under the License.
*/
package org.springframework.bootstrap.sample.trad;
package org.springframework.zero.sample.traditional;
import org.springframework.bootstrap.SpringApplication;
import org.springframework.bootstrap.context.annotation.EnableAutoConfiguration;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.zero.SpringApplication;
import org.springframework.zero.context.annotation.EnableAutoConfiguration;
@Configuration
@EnableAutoConfiguration
@ComponentScan
public class TradBootstrapApplication {
public class SampleTraditionalApplication {
public static void main(String[] args) throws Exception {
SpringApplication.run(TradBootstrapApplication.class, args);
SpringApplication.run(SampleTraditionalApplication.class, args);
}
}

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.bootstrap.sample.trad.config;
package org.springframework.zero.sample.traditional.config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;

View File

@@ -1,4 +1,4 @@
package org.springframework.bootstrap.sample.trad;
package org.springframework.zero.sample.traditional;
import java.io.IOException;
import java.util.concurrent.Callable;
@@ -9,13 +9,14 @@ 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.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.traditional.SampleTraditionalApplication;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -25,7 +26,7 @@ import static org.junit.Assert.assertTrue;
*
* @author Dave Syer
*/
public class TradBootstrapApplicationTests {
public class SampleTraditionalApplicationTests {
private static ConfigurableApplicationContext context;
@@ -37,7 +38,7 @@ public class TradBootstrapApplicationTests {
@Override
public ConfigurableApplicationContext call() throws Exception {
return (ConfigurableApplicationContext) SpringApplication
.run(TradBootstrapApplication.class);
.run(SampleTraditionalApplication.class);
}
});
context = future.get(30, TimeUnit.SECONDS);