Change package names zero->boot

* actuator -> boot-ops
* cli -> boot-cli
* launcher -> boot-load
* autoconfig -> boot-config
* bootstrap -> boot-strap
* starters -> boot-up

[#54095231] [bs-253] Refactor Zero->Boot

spring-boot-samples/spring-boot-sample-web-ui/src/main/java/org/springframework/boot/sample/ui/InMemoryMessageRespository.java

@@ -0,0 +1,52 @@
+/*
+ * 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 org.springframework.boot.sample.ui;
+
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.atomic.AtomicLong;
+
+/**
+ * @author Dave Syer
+ */
+public class InMemoryMessageRespository implements MessageRepository {
+
+	private static AtomicLong counter = new AtomicLong();
+	private ConcurrentMap<Long, Message> messages = new ConcurrentHashMap<Long, Message>();
+
+	@Override
+	public Iterable<Message> findAll() {
+		return this.messages.values();
+	}
+
+	@Override
+	public Message save(Message message) {
+		Long id = message.getId();
+		if (id == null) {
+			id = counter.incrementAndGet();
+			message.setId(id);
+		}
+		this.messages.put(id, message);
+		return message;
+	}
+
+	@Override
+	public Message findMessage(Long id) {
+		return this.messages.get(id);
+	}
+
+}

spring-boot-samples/spring-boot-sample-web-ui/src/main/java/org/springframework/boot/sample/ui/Message.java

@@ -0,0 +1,66 @@
+/*
+ * Copyright 2012 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 org.springframework.boot.sample.ui;
+
+import java.util.Calendar;
+
+import org.hibernate.validator.constraints.NotEmpty;
+
+/**
+ * @author Rob Winch
+ */
+public class Message {
+
+	private Long id;
+
+	@NotEmpty(message = "Message is required.")
+	private String text;
+
+	@NotEmpty(message = "Summary is required.")
+	private String summary;
+
+	private Calendar created = Calendar.getInstance();
+
+	public Long getId() {
+		return this.id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public Calendar getCreated() {
+		return this.created;
+	}
+
+	public void setCreated(Calendar created) {
+		this.created = created;
+	}
+
+	public String getText() {
+		return this.text;
+	}
+
+	public void setText(String text) {
+		this.text = text;
+	}
+
+	public String getSummary() {
+		return this.summary;
+	}
+
+	public void setSummary(String summary) {
+		this.summary = summary;
+	}
+}

spring-boot-samples/spring-boot-sample-web-ui/src/main/java/org/springframework/boot/sample/ui/MessageRepository.java

@@ -0,0 +1,27 @@
+/*
+ * Copyright 2012 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 org.springframework.boot.sample.ui;
+
+/**
+ * @author Rob Winch
+ */
+public interface MessageRepository {
+
+	Iterable<Message> findAll();
+
+	Message save(Message message);
+
+	Message findMessage(Long id);
+
+}

spring-boot-samples/spring-boot-sample-web-ui/src/main/java/org/springframework/boot/sample/ui/SampleWebUiApplication.java

@@ -0,0 +1,50 @@
+/*
+ * Copyright 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 org.springframework.boot.sample.ui;
+
+import org.springframework.boot.config.EnableAutoConfiguration;
+import org.springframework.boot.strap.SpringApplication;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.convert.converter.Converter;
+
+@Configuration
+@EnableAutoConfiguration
+@ComponentScan
+public class SampleWebUiApplication {
+
+	@Bean
+	public MessageRepository messageRepository() {
+		return new InMemoryMessageRespository();
+	}
+
+	@Bean
+	public Converter<String, Message> messageConverter() {
+		return new Converter<String, Message>() {
+			@Override
+			public Message convert(String id) {
+				return messageRepository().findMessage(Long.valueOf(id));
+			}
+		};
+	}
+
+	public static void main(String[] args) throws Exception {
+		SpringApplication.run(SampleWebUiApplication.class, args);
+	}
+
+}

spring-boot-samples/spring-boot-sample-web-ui/src/main/java/org/springframework/boot/sample/ui/mvc/MessageController.java

@@ -0,0 +1,69 @@
+/*
+ * Copyright 2012 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 org.springframework.boot.sample.ui.mvc;
+
+import javax.validation.Valid;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.sample.ui.Message;
+import org.springframework.boot.sample.ui.MessageRepository;
+import org.springframework.stereotype.Controller;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
+/**
+ * @author Rob Winch
+ */
+@Controller
+@RequestMapping("/")
+public class MessageController {
+	private MessageRepository messageRepository;
+
+	@Autowired
+	public MessageController(MessageRepository messageRepository) {
+		this.messageRepository = messageRepository;
+	}
+
+	@RequestMapping
+	public ModelAndView list() {
+		Iterable<Message> messages = this.messageRepository.findAll();
+		return new ModelAndView("messages/list", "messages", messages);
+	}
+
+	@RequestMapping("{id}")
+	public ModelAndView view(@PathVariable("id") Message message) {
+		return new ModelAndView("messages/view", "message", message);
+	}
+
+	@RequestMapping(params = "form", method = RequestMethod.GET)
+	public String createForm(@ModelAttribute Message message) {
+		return "messages/form";
+	}
+
+	@RequestMapping(method = RequestMethod.POST)
+	public ModelAndView create(@Valid Message message, BindingResult result,
+			RedirectAttributes redirect) {
+		if (result.hasErrors()) {
+			return new ModelAndView("messages/form", "formErrors", result.getAllErrors());
+		}
+		message = this.messageRepository.save(message);
+		redirect.addFlashAttribute("globalMessage", "Successfully created a new message");
+		return new ModelAndView("redirect:/{message.id}", "message.id", message.getId());
+	}
+}

spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/application.properties

@@ -0,0 +1,2 @@
+# Allow Thymeleaf templates to be reloaded at dev time
+spring.template.cache: false

spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/logback.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+	<property name="CONSOLE_LOG_PATTERN" value="%d{yyyy-MM-dd HH:mm:ss.SSS} %5p ${PID:- } [%t] --- %-40.40logger{39} : %m%n%wex"/>
+
+	<conversionRule conversionWord="wex" converterClass="org.springframework.boot.strap.logging.logback.WhitespaceThrowableProxyConverter" />
+
+	<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>${CONSOLE_LOG_PATTERN}</pattern>
+		</encoder>
+	</appender>
+
+	<root level="INFO">
+		<appender-ref ref="CONSOLE" />
+	</root>
+	
+	<!-- logger name="org.springframework" level="DEBUG"/ -->
+	
+</configuration>

spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/layout.html

@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/web/thymeleaf/layout">
+  <head>
+    <title>Layout</title>
+    <link rel="stylesheet"
+      th:href="@{/resources/css/bootstrap.min.css}"
+      href="../../resources/css/bootstrap.min.css"/>
+  </head>
+  <body>
+    <div class="container">
+      <div class="navbar">
+        <div class="navbar-inner">
+          <a class="brand"
+              href="https://github.com/ultraq/thymeleaf-layout-dialect">
+              Thymeleaf - Layout
+          </a>
+          <ul class="nav">
+            <li>
+              <a th:href="@{/}" href="messages.html">
+                Messages
+              </a>
+            </li>
+          </ul>
+        </div>
+      </div>
+      <h1 layout:fragment="header">Layout</h1>
+      <div layout:fragment="content">
+        Fake content
+      </div>
+    </div>
+  </body>
+</html>

spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/messages/form.html

@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org"
+  xmlns:layout="http://www.ultraq.net.nz/web/thymeleaf/layout"
+  layout:decorator="layout">
+  <head>
+    <title>Messages : Create</title>
+  </head>
+  <body>
+    <h1 layout:fragment="header">Messages : Create</h1>
+    <div layout:fragment="content"
+        class="container">
+      <form id="messageForm"
+          th:action="@{/(form)}"
+          th:object="${message}"
+          action="#"
+          method="post">
+        <div th:if="${#fields.hasErrors('*')}"
+            class="alert alert-error">
+          <p th:each="error : ${#fields.errors('*')}"
+              th:text="${error}">
+            Validation error
+          </p>
+        </div>
+        <div class="pull-right">
+          <a th:href="@{/}" href="messages.html">
+            Messages
+          </a>
+        </div>
+        <label for="summary">Summary</label>
+        <input type="text"
+            th:field="*{summary}"
+            th:class="${#fields.hasErrors('summary')} ? 'field-error'"/>
+        <label for="text">Message</label>
+        <textarea
+            th:field="*{text}"
+            th:class="${#fields.hasErrors('text')} ? 'field-error'"></textarea>
+        <div class="form-actions">
+          <input type="submit" value="Create"/>
+        </div>
+      </form>
+    </div>
+  </body>
+</html>

spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/messages/list.html

@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org"
+  xmlns:layout="http://www.ultraq.net.nz/web/thymeleaf/layout"
+  layout:decorator="layout">
+  <head>
+    <title>Messages : View all</title>
+  </head>
+  <body>
+    <h1 layout:fragment="header">Messages : View all</h1>
+    <div layout:fragment="content" class="container">
+      <div class="pull-right">
+        <a href="form.html" th:href="@{/(form)}">Create Message</a>
+       </div>
+      <table class="table table-bordered table-striped">
+        <thead>
+          <tr>
+            <td>ID</td>
+            <td>Created</td>
+            <td>Summary</td>
+          </tr>
+        </thead>
+        <tbody>
+          <tr th:if="${messages.empty}">
+            <td colspan="3">
+              No messages
+            </td>
+          </tr>
+          <tr th:each="message : ${messages}">
+            <td th:text="${message.id}">1</td>
+            <td th:text="${#calendars.format(message.created)}">
+              July 11, 2012 2:17:16 PM CDT
+            </td>
+            <td>
+              <a href="view.html"
+                  th:href="@{'/' + ${message.id}}"
+                  th:text="${message.summary}">
+                The summary
+              </a>
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+  </body>
+</html>

spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/messages/view.html

@@ -0,0 +1,42 @@
+<html xmlns:th="http://www.thymeleaf.org"
+  xmlns:layout="http://www.ultraq.net.nz/web/thymeleaf/layout"
+  layout:decorator="layout">
+  <head>
+    <title>Messages : View</title>
+  </head>
+  <body>
+    <h1 layout:fragment="header">Messages : Create</h1>
+    <div layout:fragment="content"
+        class="container">
+      <div class="alert alert-success"
+          th:if="${globalMessage}"
+          th:text="${globalMessage}">
+        Some Success message
+      </div>
+      <div class="pull-right">
+        <a th:href="@{/}" href="list.html">
+          Messages
+        </a>
+      </div>
+      <dl>
+        <dt>ID</dt>
+        <dd id="id" th:text="${message.id}">123</dd>
+        <dt>Date</dt>
+        <dd id="created"
+            th:text="${#calendars.format(message.created)}">
+          July 11, 2012 2:17:16 PM CDT
+        </dd>
+        <dt>Summary</dt>
+        <dd id="summary"
+            th:text="${message.summary}">
+          A short summary...
+        </dd>
+        <dt>Message</dt>
+        <dd id="text"
+            th:text="${message.text}">
+          A detailed message that is longer than the summary.
+        </dd>
+      </dl>
+    </div>
+  </body>
+</html>

spring-boot-samples/spring-boot-sample-web-ui/src/test/java/org/springframework/boot/sample/ui/SampleWebUiApplicationTests.java

@@ -0,0 +1,98 @@
+package org.springframework.boot.sample.ui;
+
+import java.io.IOException;
+import java.net.URI;
+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.sample.ui.SampleWebUiApplication;
+import org.springframework.boot.strap.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.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.DefaultResponseErrorHandler;
+import org.springframework.web.client.RestTemplate;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Basic integration tests for demo application.
+ * 
+ * @author Dave Syer
+ */
+public class SampleWebUiApplicationTests {
+
+	private static ConfigurableApplicationContext context;
+
+	@BeforeClass
+	public static void start() throws Exception {
+		Future<ConfigurableApplicationContext> future = Executors
+				.newSingleThreadExecutor().submit(
+						new Callable<ConfigurableApplicationContext>() {
+							@Override
+							public ConfigurableApplicationContext call() throws Exception {
+								return (ConfigurableApplicationContext) SpringApplication
+										.run(SampleWebUiApplication.class);
+							}
+						});
+		context = future.get(30, TimeUnit.SECONDS);
+	}
+
+	@AfterClass
+	public static void stop() {
+		if (context != null) {
+			context.close();
+		}
+	}
+
+	@Test
+	public void testHome() throws Exception {
+		ResponseEntity<String> entity = getRestTemplate().getForEntity(
+				"http://localhost:8080", String.class);
+		assertEquals(HttpStatus.OK, entity.getStatusCode());
+		assertTrue("Wrong body (title doesn't match):\n" + entity.getBody(), entity
+				.getBody().contains("<title>Messages"));
+		assertFalse("Wrong body (found layout:fragment):\n" + entity.getBody(), entity
+				.getBody().contains("layout:fragment"));
+	}
+
+	@Test
+	public void testCreate() throws Exception {
+		MultiValueMap<String, String> map = new LinkedMultiValueMap<String, String>();
+		map.set("text", "FOO text");
+		map.set("summary", "FOO");
+		URI location = getRestTemplate().postForLocation("http://localhost:8080", map);
+		assertTrue("Wrong location:\n" + location,
+				location.toString().contains("localhost:8080"));
+	}
+
+	@Test
+	public void testCss() throws Exception {
+		ResponseEntity<String> entity = getRestTemplate().getForEntity(
+				"http://localhost:8080/resources/css/bootstrap.min.css", String.class);
+		assertEquals(HttpStatus.OK, entity.getStatusCode());
+		assertTrue("Wrong body:\n" + entity.getBody(), entity.getBody().contains("body"));
+	}
+
+	private RestTemplate getRestTemplate() {
+		RestTemplate restTemplate = new RestTemplate();
+		restTemplate.setErrorHandler(new DefaultResponseErrorHandler() {
+			@Override
+			public void handleError(ClientHttpResponse response) throws IOException {
+			}
+		});
+		return restTemplate;
+
+	}
+
+}