Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Restructure 'bootstrap' to use 'zero'

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-zero-samples/spring-zero-sample-xml/src/main/java/org/springframework/bootstrap/sample/xml/XmlBootstrapApplication.java → spring-zero-samples/spring-zero-sample-xml/src/main/java/org/springframework/zero/sample/xml/SampleSpringXmlApplication.java
View File

@@ -14,14 +14,14 @@
* limitations under the License.
*/
package org.springframework.bootstrap.sample.xml;
package org.springframework.zero.sample.xml;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.bootstrap.CommandLineRunner;
import org.springframework.bootstrap.SpringApplication;
import org.springframework.bootstrap.sample.xml.service.HelloWorldService;
import org.springframework.zero.CommandLineRunner;
import org.springframework.zero.SpringApplication;
import org.springframework.zero.sample.xml.service.HelloWorldService;
public class XmlBootstrapApplication implements CommandLineRunner {
public class SampleSpringXmlApplication implements CommandLineRunner {
@Autowired
private HelloWorldService helloWorldService;
@@ -32,7 +32,7 @@ public class XmlBootstrapApplication implements CommandLineRunner {
}
public static void main(String[] args) throws Exception {
// TODO: to make this a pure XML example, will need <bootstrap:auto-configure/>
// TODO: to make this a pure XML example, will need <zero:auto-configure/>
SpringApplication.run("classpath:/META-INF/application-context.xml", args);
}
}

2
spring-zero-samples/spring-zero-sample-xml/src/main/java/org/springframework/bootstrap/sample/xml/service/HelloWorldService.java → spring-zero-samples/spring-zero-sample-xml/src/main/java/org/springframework/zero/sample/xml/service/HelloWorldService.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.bootstrap.sample.xml.service;
package org.springframework.zero.sample.xml.service;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;

4
spring-zero-samples/spring-zero-sample-xml/src/main/resources/META-INF/application-context.xml
View File

@@ -8,7 +8,7 @@
<context:annotation-config/>
<context:property-placeholder/>
<bean id="helloService" class="org.springframework.bootstrap.sample.xml.service.HelloWorldService"/>
<bean id="application" class="org.springframework.bootstrap.sample.xml.XmlBootstrapApplication"/>
<bean id="helloService" class="org.springframework.zero.sample.xml.service.HelloWorldService"/>
<bean id="application" class="org.springframework.zero.sample.xml.SampleSpringXmlApplication"/>
</beans>

7
spring-zero-samples/spring-zero-sample-xml/src/test/java/org/springframework/bootstrap/sample/xml/XmlBootstrapApplicationTests.java → spring-zero-samples/spring-zero-sample-xml/src/test/java/org/springframework/zero/sample/xml/SampleSpringXmlApplicationTests.java
View File

@@ -1,4 +1,4 @@
package org.springframework.bootstrap.sample.xml;
package org.springframework.zero.sample.xml;
import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
@@ -6,10 +6,11 @@ import java.io.PrintStream;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import org.springframework.zero.sample.xml.SampleSpringXmlApplication;
import static org.junit.Assert.assertTrue;
public class XmlBootstrapApplicationTests {
public class SampleSpringXmlApplicationTests {
private static PrintStream savedOutput;
private static ByteArrayOutputStream output;
@@ -32,7 +33,7 @@ public class XmlBootstrapApplicationTests {
@Test
public void testDefaultSettings() throws Exception {
XmlBootstrapApplication.main(new String[0]);
SampleSpringXmlApplication.main(new String[0]);
String output = getOutput();
assertTrue("Wrong output: " + output, output.contains("Hello World"));
}