Restructure 'bootstrap' to use 'zero'

spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/SampleDataJpaApplication.java

@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-package org.springframework.bootstrap.sample.data;
+package org.springframework.zero.sample.data.jpa;
 
-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
 @ComponentScan
 @EnableAutoConfiguration
-public class DataBootstrapApplication {
+public class SampleDataJpaApplication {
 
 	public static void main(String[] args) throws Exception {
-		SpringApplication.run(DataBootstrapApplication.class, args);
+		SpringApplication.run(SampleDataJpaApplication.class, args);
 	}
 
 }

spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/City.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.bootstrap.sample.data.domain;
+package org.springframework.zero.sample.data.jpa.domain;
 
 import java.io.Serializable;
 

spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/Hotel.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.bootstrap.sample.data.domain;
+package org.springframework.zero.sample.data.jpa.domain;
 
 import java.io.Serializable;
 import java.util.Set;

spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/HotelSummary.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.bootstrap.sample.data.domain;
+package org.springframework.zero.sample.data.jpa.domain;
 
 import java.io.Serializable;
 import java.math.BigDecimal;

spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/Rating.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.bootstrap.sample.data.domain;
+package org.springframework.zero.sample.data.jpa.domain;
 
 public enum Rating {
 	TERRIBLE, POOR, AVERAGE, GOOD, EXCELLENT,

spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/RatingCount.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.bootstrap.sample.data.domain;
+package org.springframework.zero.sample.data.jpa.domain;
 
 import java.io.Serializable;
 

spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/Review.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.bootstrap.sample.data.domain;
+package org.springframework.zero.sample.data.jpa.domain;
 
 import java.io.Serializable;
 import java.util.Date;

spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/ReviewDetails.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.bootstrap.sample.data.domain;
+package org.springframework.zero.sample.data.jpa.domain;
 
 import java.io.Serializable;
 import java.util.Date;

spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/TripType.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.bootstrap.sample.data.domain;
+package org.springframework.zero.sample.data.jpa.domain;
 
 public enum TripType {
 	BUSINESS, COUPLES, FAMILY, FRIENDS, SOLO

spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/repository/CityRepository.java

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.bootstrap.sample.data.domain.repository;
+package org.springframework.zero.sample.data.jpa.domain.repository;
 
-import org.springframework.bootstrap.sample.data.domain.City;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.repository.Repository;
+import org.springframework.zero.sample.data.jpa.domain.City;
 
 public interface CityRepository extends Repository<City, Long> {
 

spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/repository/HotelRepository.java

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.bootstrap.sample.data.domain.repository;
+package org.springframework.zero.sample.data.jpa.domain.repository;
 
-import org.springframework.bootstrap.sample.data.domain.City;
-import org.springframework.bootstrap.sample.data.domain.Hotel;
 import org.springframework.data.repository.Repository;
+import org.springframework.zero.sample.data.jpa.domain.City;
+import org.springframework.zero.sample.data.jpa.domain.Hotel;
 
 public interface HotelRepository extends Repository<Hotel, Long> {
 

spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/repository/HotelSummaryRepository.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.bootstrap.sample.data.domain.repository;
+package org.springframework.zero.sample.data.jpa.domain.repository;
 
 import java.util.List;
 import java.util.Locale;
@@ -23,16 +23,16 @@ import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 import javax.persistence.Query;
 
-import org.springframework.bootstrap.sample.data.domain.City;
-import org.springframework.bootstrap.sample.data.domain.Hotel;
-import org.springframework.bootstrap.sample.data.domain.HotelSummary;
-import org.springframework.bootstrap.sample.data.domain.RatingCount;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Order;
 import org.springframework.stereotype.Repository;
+import org.springframework.zero.sample.data.jpa.domain.City;
+import org.springframework.zero.sample.data.jpa.domain.Hotel;
+import org.springframework.zero.sample.data.jpa.domain.HotelSummary;
+import org.springframework.zero.sample.data.jpa.domain.RatingCount;
 
 @Repository
 public class HotelSummaryRepository {

spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/repository/ReviewRepository.java

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.bootstrap.sample.data.domain.repository;
+package org.springframework.zero.sample.data.jpa.domain.repository;
 
-import org.springframework.bootstrap.sample.data.domain.Hotel;
-import org.springframework.bootstrap.sample.data.domain.Review;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.repository.Repository;
+import org.springframework.zero.sample.data.jpa.domain.Hotel;
+import org.springframework.zero.sample.data.jpa.domain.Review;
 
 public interface ReviewRepository extends Repository<Review, Long> {
 

spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/service/CitySearchCriteria.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.bootstrap.sample.data.service;
+package org.springframework.zero.sample.data.jpa.service;
 
 import java.io.Serializable;
 

spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/service/CityService.java

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.bootstrap.sample.data.service;
+package org.springframework.zero.sample.data.jpa.service;
 
-import org.springframework.bootstrap.sample.data.domain.City;
-import org.springframework.bootstrap.sample.data.domain.HotelSummary;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
+import org.springframework.zero.sample.data.jpa.domain.City;
+import org.springframework.zero.sample.data.jpa.domain.HotelSummary;
 
 public interface CityService {
 

spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/service/HotelService.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.bootstrap.sample.data.service;
+package org.springframework.zero.sample.data.jpa.service;
 
-import org.springframework.bootstrap.sample.data.domain.City;
-import org.springframework.bootstrap.sample.data.domain.Hotel;
-import org.springframework.bootstrap.sample.data.domain.Review;
-import org.springframework.bootstrap.sample.data.domain.ReviewDetails;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
+import org.springframework.zero.sample.data.jpa.domain.City;
+import org.springframework.zero.sample.data.jpa.domain.Hotel;
+import org.springframework.zero.sample.data.jpa.domain.Review;
+import org.springframework.zero.sample.data.jpa.domain.ReviewDetails;
 
 public interface HotelService {
 

spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/service/ReviewsSummary.java

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.springframework.bootstrap.sample.data.service;
+package org.springframework.zero.sample.data.jpa.service;
 
-import org.springframework.bootstrap.sample.data.domain.Rating;
+import org.springframework.zero.sample.data.jpa.domain.Rating;
 
 public interface ReviewsSummary {
 

spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/service/impl/CityServiceImpl.java

@@ -14,21 +14,21 @@
  * limitations under the License.
  */
 
-package org.springframework.bootstrap.sample.data.service.impl;
+package org.springframework.zero.sample.data.jpa.service.impl;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.bootstrap.sample.data.domain.City;
-import org.springframework.bootstrap.sample.data.domain.HotelSummary;
-import org.springframework.bootstrap.sample.data.domain.repository.CityRepository;
-import org.springframework.bootstrap.sample.data.domain.repository.HotelSummaryRepository;
-import org.springframework.bootstrap.sample.data.service.CitySearchCriteria;
-import org.springframework.bootstrap.sample.data.service.CityService;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
+import org.springframework.zero.sample.data.jpa.domain.City;
+import org.springframework.zero.sample.data.jpa.domain.HotelSummary;
+import org.springframework.zero.sample.data.jpa.domain.repository.CityRepository;
+import org.springframework.zero.sample.data.jpa.domain.repository.HotelSummaryRepository;
+import org.springframework.zero.sample.data.jpa.service.CitySearchCriteria;
+import org.springframework.zero.sample.data.jpa.service.CityService;
 
 @Component("cityService")
 @Transactional

spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/service/impl/HotelServiceImpl.java

@@ -14,29 +14,29 @@
  * limitations under the License.
  */
 
-package org.springframework.bootstrap.sample.data.service.impl;
+package org.springframework.zero.sample.data.jpa.service.impl;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.bootstrap.sample.data.domain.City;
-import org.springframework.bootstrap.sample.data.domain.Hotel;
-import org.springframework.bootstrap.sample.data.domain.Rating;
-import org.springframework.bootstrap.sample.data.domain.RatingCount;
-import org.springframework.bootstrap.sample.data.domain.Review;
-import org.springframework.bootstrap.sample.data.domain.ReviewDetails;
-import org.springframework.bootstrap.sample.data.domain.repository.HotelRepository;
-import org.springframework.bootstrap.sample.data.domain.repository.HotelSummaryRepository;
-import org.springframework.bootstrap.sample.data.domain.repository.ReviewRepository;
-import org.springframework.bootstrap.sample.data.service.HotelService;
-import org.springframework.bootstrap.sample.data.service.ReviewsSummary;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
+import org.springframework.zero.sample.data.jpa.domain.City;
+import org.springframework.zero.sample.data.jpa.domain.Hotel;
+import org.springframework.zero.sample.data.jpa.domain.Rating;
+import org.springframework.zero.sample.data.jpa.domain.RatingCount;
+import org.springframework.zero.sample.data.jpa.domain.Review;
+import org.springframework.zero.sample.data.jpa.domain.ReviewDetails;
+import org.springframework.zero.sample.data.jpa.domain.repository.HotelRepository;
+import org.springframework.zero.sample.data.jpa.domain.repository.HotelSummaryRepository;
+import org.springframework.zero.sample.data.jpa.domain.repository.ReviewRepository;
+import org.springframework.zero.sample.data.jpa.service.HotelService;
+import org.springframework.zero.sample.data.jpa.service.ReviewsSummary;
 
 @Component("hotelService")
 @Transactional

spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/web/SampleController.java

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.bootstrap.sample.data.web;
+package org.springframework.zero.sample.data.jpa.web;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.bootstrap.sample.data.service.CityService;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.zero.sample.data.jpa.service.CityService;
 
 @Controller
 public class SampleController {

spring-zero-samples/spring-zero-sample-data-jpa/src/test/java/org/springframework/zero/sample/data/jpa/SampleDataJpaApplicationTests.java

@@ -1,4 +1,4 @@
-package org.springframework.bootstrap.sample.data;
+package org.springframework.zero.sample.data.jpa;
 
 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.data.jpa.SampleDataJpaApplication;
 
 import static org.junit.Assert.assertEquals;
 
@@ -24,7 +25,7 @@ import static org.junit.Assert.assertEquals;
  * 
  * @author Dave Syer
  */
-public class DataBootstrapApplicationTests {
+public class SampleDataJpaApplicationTests {
 
 	private static ConfigurableApplicationContext context;
 
@@ -36,7 +37,7 @@ public class DataBootstrapApplicationTests {
 							@Override
 							public ConfigurableApplicationContext call() throws Exception {
 								return (ConfigurableApplicationContext) SpringApplication
-										.run(DataBootstrapApplication.class);
+										.run(SampleDataJpaApplication.class);
 							}
 						});
 		context = future.get(10, TimeUnit.SECONDS);