Remove long package names from samples

Long package names are really unnecessary in samples and they
just clutter things up. Also Spring Loaded doesn't work with
org.sfw packages, so to demo that technology you need a
different package name.

spring-boot-samples/spring-boot-sample-actuator-noweb/src/main/java/org/springframework/boot/sample/actuator/HelloWorldService.java → spring-boot-samples/spring-boot-sample-actuator-log4j/src/main/java/sample/actuator/log4j/HelloWorldService.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.actuator;
+package sample.actuator.log4j;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

spring-boot-samples/spring-boot-sample-actuator/src/main/java/org/springframework/boot/sample/actuator/SampleActuatorApplication.java → spring-boot-samples/spring-boot-sample-actuator-log4j/src/main/java/sample/actuator/log4j/SampleActuatorApplication.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.actuator;
+package sample.actuator.log4j;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;

spring-boot-samples/spring-boot-sample-actuator-log4j/src/main/java/org/springframework/boot/sample/actuator/log4j/SampleController.java → spring-boot-samples/spring-boot-sample-actuator-log4j/src/main/java/sample/actuator/log4j/SampleController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.actuator.log4j;
+package sample.actuator.log4j;
 
 import java.util.Collections;
 import java.util.Map;

spring-boot-samples/spring-boot-sample-actuator/src/main/java/org/springframework/boot/sample/actuator/ServiceProperties.java → spring-boot-samples/spring-boot-sample-actuator-log4j/src/main/java/sample/actuator/log4j/ServiceProperties.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.actuator;
+package sample.actuator.log4j;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;

spring-boot-samples/spring-boot-sample-actuator-log4j/src/test/java/org/springframework/boot/sample/actuator/log4j/SampleActuatorApplicationTests.java → spring-boot-samples/spring-boot-sample-actuator-log4j/src/test/java/sample/actuator/log4j/SampleActuatorApplicationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.actuator.log4j;
+package sample.actuator.log4j;
 
 import java.io.IOException;
 import java.util.Map;

spring-boot-samples/spring-boot-sample-actuator/src/main/java/org/springframework/boot/sample/actuator/HelloWorldService.java → spring-boot-samples/spring-boot-sample-actuator-noweb/src/main/java/sample/actuator/HelloWorldService.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.actuator;
+package sample.actuator;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

spring-boot-samples/spring-boot-sample-actuator-noweb/src/main/java/org/springframework/boot/sample/actuator/SampleActuatorNoWebApplication.java → spring-boot-samples/spring-boot-sample-actuator-noweb/src/main/java/sample/actuator/SampleActuatorNoWebApplication.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.actuator;
+package sample.actuator;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;

spring-boot-samples/spring-boot-sample-actuator-noweb/src/main/java/org/springframework/boot/sample/actuator/ServiceProperties.java → spring-boot-samples/spring-boot-sample-actuator-noweb/src/main/java/sample/actuator/ServiceProperties.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.actuator;
+package sample.actuator;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;

spring-boot-samples/spring-boot-sample-actuator-noweb/src/test/java/org/springframework/boot/sample/actuator/SampleActuatorNoWebApplicationTests.java → spring-boot-samples/spring-boot-sample-actuator-noweb/src/test/java/sample/actuator/SampleActuatorNoWebApplicationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.actuator;
+package sample.actuator;
 
 import static org.junit.Assert.assertNotNull;
 

spring-boot-samples/spring-boot-sample-actuator-ui/src/main/java/org/springframework/boot/sample/actuator/ui/SampleActuatorUiApplication.java → spring-boot-samples/spring-boot-sample-actuator-ui/src/main/java/sample/actuator/ui/SampleActuatorUiApplication.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.actuator.ui;
+package sample.actuator.ui;
 
 import java.util.Date;
 import java.util.Map;

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.actuator.ui;
+package sample.actuator.ui;
 
 import static org.junit.Assert.assertEquals;
 
@@ -29,7 +29,7 @@ import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.sample.actuator.ui.SampleActuatorUiApplication;
+import sample.actuator.ui.SampleActuatorUiApplication;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.actuator.ui;
+package sample.actuator.ui;
 
 import java.io.IOException;
 import java.util.Arrays;
@@ -28,7 +28,7 @@ import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.sample.actuator.ui.SampleActuatorUiApplication;
+import sample.actuator.ui.SampleActuatorUiApplication;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;

spring-boot-samples/spring-boot-sample-actuator-log4j/src/main/java/org/springframework/boot/sample/actuator/log4j/HelloWorldService.java → spring-boot-samples/spring-boot-sample-actuator/src/main/java/sample/actuator/HelloWorldService.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.actuator.log4j;
+package sample.actuator;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

spring-boot-samples/spring-boot-sample-actuator-log4j/src/main/java/org/springframework/boot/sample/actuator/log4j/SampleActuatorApplication.java → spring-boot-samples/spring-boot-sample-actuator/src/main/java/sample/actuator/SampleActuatorApplication.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.actuator.log4j;
+package sample.actuator;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;

spring-boot-samples/spring-boot-sample-actuator/src/main/java/org/springframework/boot/sample/actuator/SampleController.java → spring-boot-samples/spring-boot-sample-actuator/src/main/java/sample/actuator/SampleController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.actuator;
+package sample.actuator;
 
 import java.util.Collections;
 import java.util.Map;

spring-boot-samples/spring-boot-sample-actuator-log4j/src/main/java/org/springframework/boot/sample/actuator/log4j/ServiceProperties.java → spring-boot-samples/spring-boot-sample-actuator/src/main/java/sample/actuator/ServiceProperties.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.actuator.log4j;
+package sample.actuator;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;

spring-boot-samples/spring-boot-sample-actuator/src/test/java/org/springframework/boot/sample/actuator/EndpointsPropertiesSampleActuatorApplicationTests.java → spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/EndpointsPropertiesSampleActuatorApplicationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.actuator;
+package sample.actuator;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -28,7 +28,7 @@ import java.util.concurrent.TimeUnit;
 import org.junit.After;
 import org.junit.Test;
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.sample.actuator.SampleActuatorApplication;
+import sample.actuator.SampleActuatorApplication;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.http.HttpRequest;
 import org.springframework.http.HttpStatus;

spring-boot-samples/spring-boot-sample-actuator/src/test/java/org/springframework/boot/sample/actuator/ManagementAddressSampleActuatorApplicationTests.java → spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/ManagementAddressSampleActuatorApplicationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.actuator;
+package sample.actuator;
 
 import static org.junit.Assert.assertEquals;
 
@@ -32,7 +32,7 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.security.SecurityProperties;
-import org.springframework.boot.sample.actuator.SampleActuatorApplication;
+import sample.actuator.SampleActuatorApplication;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.http.HttpRequest;
 import org.springframework.http.HttpStatus;

spring-boot-samples/spring-boot-sample-actuator/src/test/java/org/springframework/boot/sample/actuator/ManagementSampleActuatorApplicationTests.java → spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/ManagementSampleActuatorApplicationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.actuator;
+package sample.actuator;
 
 import java.io.IOException;
 import java.util.Map;
@@ -27,7 +27,7 @@ import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.sample.actuator.SampleActuatorApplication;
+import sample.actuator.SampleActuatorApplication;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

spring-boot-samples/spring-boot-sample-actuator/src/test/java/org/springframework/boot/sample/actuator/NoManagementSampleActuatorApplicationTests.java → spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/NoManagementSampleActuatorApplicationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.actuator;
+package sample.actuator;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -30,7 +30,7 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.security.SecurityProperties;
-import org.springframework.boot.sample.actuator.SampleActuatorApplication;
+import sample.actuator.SampleActuatorApplication;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.http.HttpRequest;
 import org.springframework.http.HttpStatus;

spring-boot-samples/spring-boot-sample-actuator/src/test/java/org/springframework/boot/sample/actuator/SampleActuatorApplicationTests.java → spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/SampleActuatorApplicationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.actuator;
+package sample.actuator;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -36,7 +36,7 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.security.SecurityProperties;
-import org.springframework.boot.sample.actuator.SampleActuatorApplication;
+import sample.actuator.SampleActuatorApplication;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;

spring-boot-samples/spring-boot-sample-actuator/src/test/java/org/springframework/boot/sample/actuator/ShutdownSampleActuatorApplicationTests.java → spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/ShutdownSampleActuatorApplicationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.actuator;
+package sample.actuator;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -30,7 +30,7 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.security.SecurityProperties;
-import org.springframework.boot.sample.actuator.SampleActuatorApplication;
+import sample.actuator.SampleActuatorApplication;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.http.HttpRequest;
 import org.springframework.http.HttpStatus;

spring-boot-samples/spring-boot-sample-actuator/src/test/java/org/springframework/boot/sample/actuator/UnsecureManagementSampleActuatorApplicationTests.java → spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/UnsecureManagementSampleActuatorApplicationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.actuator;
+package sample.actuator;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -31,7 +31,7 @@ import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.sample.actuator.SampleActuatorApplication;
+import sample.actuator.SampleActuatorApplication;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

spring-boot-samples/spring-boot-sample-actuator/src/test/java/org/springframework/boot/sample/actuator/UnsecureSampleActuatorApplicationTests.java → spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/UnsecureSampleActuatorApplicationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.actuator;
+package sample.actuator;
 
 import java.io.IOException;
 import java.util.Map;
@@ -27,7 +27,7 @@ import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.sample.actuator.SampleActuatorApplication;
+import sample.actuator.SampleActuatorApplication;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

spring-boot-samples/spring-boot-sample-amqp/src/main/java/org/springframework/boot/sample/amqp/SampleAmqpSimpleApplication.java → spring-boot-samples/spring-boot-sample-amqp/src/main/java/sample/amqp/SampleAmqpSimpleApplication.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.amqp;
+package sample.amqp;
 
 import org.springframework.amqp.core.AmqpTemplate;
 import org.springframework.amqp.rabbit.connection.ConnectionFactory;

spring-boot-samples/spring-boot-sample-amqp/src/main/java/org/springframework/boot/sample/amqp/Sender.java → spring-boot-samples/spring-boot-sample-amqp/src/main/java/sample/amqp/Sender.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.amqp;
+package sample.amqp;
 
 import javax.annotation.PostConstruct;
 

spring-boot-samples/spring-boot-sample-aop/src/main/java/org/springframework/boot/sample/aop/SampleAopApplication.java → spring-boot-samples/spring-boot-sample-aop/src/main/java/sample/aop/SampleAopApplication.java

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.aop;
+package sample.aop;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.sample.aop.service.HelloWorldService;
+import sample.aop.service.HelloWorldService;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 

spring-boot-samples/spring-boot-sample-aop/src/main/java/org/springframework/boot/sample/aop/monitor/ServiceMonitor.java → spring-boot-samples/spring-boot-sample-aop/src/main/java/sample/aop/monitor/ServiceMonitor.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.aop.monitor;
+package sample.aop.monitor;
 
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.AfterReturning;

spring-boot-samples/spring-boot-sample-aop/src/main/java/org/springframework/boot/sample/aop/service/HelloWorldService.java → spring-boot-samples/spring-boot-sample-aop/src/main/java/sample/aop/service/HelloWorldService.java

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

spring-boot-samples/spring-boot-sample-aop/src/test/java/org/springframework/boot/sample/aop/SampleAopApplicationTests.java → spring-boot-samples/spring-boot-sample-aop/src/test/java/sample/aop/SampleAopApplicationTests.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.aop;
+package sample.aop;
 
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.springframework.boot.OutputCapture;
-import org.springframework.boot.sample.aop.SampleAopApplication;
+import sample.aop.SampleAopApplication;
 
 import static org.junit.Assert.assertTrue;
 

spring-boot-samples/spring-boot-sample-batch/src/main/java/org/springframework/boot/sample/batch/SampleBatchApplication.java → spring-boot-samples/spring-boot-sample-batch/src/main/java/sample/batch/SampleBatchApplication.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.batch;
+package sample.batch;
 
 import org.springframework.batch.core.Job;
 import org.springframework.batch.core.Step;

spring-boot-samples/spring-boot-sample-batch/src/test/java/org/springframework/boot/sample/batch/SampleBatchApplicationTests.java → spring-boot-samples/spring-boot-sample-batch/src/test/java/sample/batch/SampleBatchApplicationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.batch;
+package sample.batch;
 
 import org.junit.Rule;
 import org.junit.Test;

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.data.jpa;
+package sample.data.jpa;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/service/CityRepository.java → spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/service/CityRepository.java

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.data.jpa.service;
+package sample.data.jpa.service;
 
-import org.springframework.boot.sample.data.jpa.domain.City;
+import sample.data.jpa.domain.City;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.repository.Repository;

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

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

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

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.data.jpa.service;
+package sample.data.jpa.service;
 
-import org.springframework.boot.sample.data.jpa.domain.City;
-import org.springframework.boot.sample.data.jpa.domain.HotelSummary;
+import sample.data.jpa.domain.City;
+import sample.data.jpa.domain.HotelSummary;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 

spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/service/CityServiceImpl.java → spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/service/CityServiceImpl.java

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.data.jpa.service;
+package sample.data.jpa.service;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.sample.data.jpa.domain.City;
-import org.springframework.boot.sample.data.jpa.domain.HotelSummary;
+import sample.data.jpa.domain.City;
+import sample.data.jpa.domain.HotelSummary;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Component;

spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/service/HotelRepository.java → spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/service/HotelRepository.java

@@ -14,28 +14,29 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.data.jpa.service;
+package sample.data.jpa.service;
 
 import java.util.List;
 
-import org.springframework.boot.sample.data.jpa.domain.City;
-import org.springframework.boot.sample.data.jpa.domain.Hotel;
-import org.springframework.boot.sample.data.jpa.domain.HotelSummary;
-import org.springframework.boot.sample.data.jpa.domain.RatingCount;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.Repository;
 
+import sample.data.jpa.domain.City;
+import sample.data.jpa.domain.Hotel;
+import sample.data.jpa.domain.HotelSummary;
+import sample.data.jpa.domain.RatingCount;
+
 interface HotelRepository extends Repository<Hotel, Long> {
 
 	Hotel findByCityAndName(City city, String name);
 
-	@Query("select new org.springframework.boot.sample.data.jpa.domain.HotelSummary(h.city, h.name, avg(r.rating)) "
+	@Query("select new sample.data.jpa.domain.HotelSummary(h.city, h.name, avg(r.rating)) "
 			+ "from Hotel h left outer join h.reviews r where h.city = ?1 group by h")
 	Page<HotelSummary> findByCity(City city, Pageable pageable);
 
-	@Query("select new org.springframework.boot.sample.data.jpa.domain.RatingCount(r.rating, count(r)) "
+	@Query("select new sample.data.jpa.domain.RatingCount(r.rating, count(r)) "
 			+ "from Review r where r.hotel = ?1 group by r.rating order by r.rating DESC")
 	List<RatingCount> findRatingCounts(Hotel hotel);
 }

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

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.data.jpa.service;
+package sample.data.jpa.service;
 
-import org.springframework.boot.sample.data.jpa.domain.City;
-import org.springframework.boot.sample.data.jpa.domain.Hotel;
-import org.springframework.boot.sample.data.jpa.domain.Review;
-import org.springframework.boot.sample.data.jpa.domain.ReviewDetails;
+import sample.data.jpa.domain.City;
+import sample.data.jpa.domain.Hotel;
+import sample.data.jpa.domain.Review;
+import sample.data.jpa.domain.ReviewDetails;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 

spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/service/HotelServiceImpl.java → spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/service/HotelServiceImpl.java

@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.data.jpa.service;
+package sample.data.jpa.service;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.sample.data.jpa.domain.City;
-import org.springframework.boot.sample.data.jpa.domain.Hotel;
-import org.springframework.boot.sample.data.jpa.domain.Rating;
-import org.springframework.boot.sample.data.jpa.domain.RatingCount;
-import org.springframework.boot.sample.data.jpa.domain.Review;
-import org.springframework.boot.sample.data.jpa.domain.ReviewDetails;
+import sample.data.jpa.domain.City;
+import sample.data.jpa.domain.Hotel;
+import sample.data.jpa.domain.Rating;
+import sample.data.jpa.domain.RatingCount;
+import sample.data.jpa.domain.Review;
+import sample.data.jpa.domain.ReviewDetails;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Component;

spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/service/ReviewRepository.java → spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/service/ReviewRepository.java

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.data.jpa.service;
+package sample.data.jpa.service;
 
-import org.springframework.boot.sample.data.jpa.domain.Hotel;
-import org.springframework.boot.sample.data.jpa.domain.Review;
+import sample.data.jpa.domain.Hotel;
+import sample.data.jpa.domain.Review;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.repository.Repository;

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

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

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

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.data.jpa.web;
+package sample.data.jpa.web;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.sample.data.jpa.service.CityService;
+import sample.data.jpa.service.CityService;
 import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestMapping;

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

-package org.springframework.boot.sample.data.jpa;
+package sample.data.jpa;
 
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;

spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/org/springframework/boot/sample/data/jpa/service/CityRepositoryIntegrationTests.java → spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/sample/data/jpa/service/CityRepositoryIntegrationTests.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.boot.sample.data.jpa.service;
+package sample.data.jpa.service;
 
 import static org.hamcrest.Matchers.greaterThan;
 import static org.hamcrest.Matchers.is;
@@ -22,8 +22,8 @@ import static org.junit.Assert.assertThat;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.sample.data.jpa.SampleDataJpaApplication;
-import org.springframework.boot.sample.data.jpa.domain.City;
+import sample.data.jpa.SampleDataJpaApplication;
+import sample.data.jpa.domain.City;
 import org.springframework.boot.test.SpringApplicationConfiguration;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;

spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/org/springframework/boot/sample/data/jpa/service/HotelRepositoryIntegrationTests.java → spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/sample/data/jpa/service/HotelRepositoryIntegrationTests.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.boot.sample.data.jpa.service;
+package sample.data.jpa.service;
 
 import static org.hamcrest.Matchers.greaterThan;
 import static org.hamcrest.Matchers.hasSize;
@@ -25,12 +25,12 @@ import java.util.List;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.sample.data.jpa.SampleDataJpaApplication;
-import org.springframework.boot.sample.data.jpa.domain.City;
-import org.springframework.boot.sample.data.jpa.domain.Hotel;
-import org.springframework.boot.sample.data.jpa.domain.HotelSummary;
-import org.springframework.boot.sample.data.jpa.domain.Rating;
-import org.springframework.boot.sample.data.jpa.domain.RatingCount;
+import sample.data.jpa.SampleDataJpaApplication;
+import sample.data.jpa.domain.City;
+import sample.data.jpa.domain.Hotel;
+import sample.data.jpa.domain.HotelSummary;
+import sample.data.jpa.domain.Rating;
+import sample.data.jpa.domain.RatingCount;
 import org.springframework.boot.test.SpringApplicationConfiguration;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;

spring-boot-samples/spring-boot-sample-data-mongodb/src/main/java/org/springframework/boot/sample/data/mongo/Customer.java → spring-boot-samples/spring-boot-sample-data-mongodb/src/main/java/sample/data/mongo/Customer.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.data.mongo;
+package sample.data.mongo;
 
 import org.springframework.data.annotation.Id;
 

spring-boot-samples/spring-boot-sample-data-mongodb/src/main/java/org/springframework/boot/sample/data/mongo/CustomerRepository.java → spring-boot-samples/spring-boot-sample-data-mongodb/src/main/java/sample/data/mongo/CustomerRepository.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.data.mongo;
+package sample.data.mongo;
 
 import java.util.List;
 

spring-boot-samples/spring-boot-sample-data-mongodb/src/main/java/org/springframework/boot/sample/data/mongo/SampleMongoApplication.java → spring-boot-samples/spring-boot-sample-data-mongodb/src/main/java/sample/data/mongo/SampleMongoApplication.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.data.mongo;
+package sample.data.mongo;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;

spring-boot-samples/spring-boot-sample-data-mongodb/src/test/java/org/springframework/boot/sample/data/mongo/SampleMongoApplicationTests.java → spring-boot-samples/spring-boot-sample-data-mongodb/src/test/java/sample/data/mongo/SampleMongoApplicationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.data.mongo;
+package sample.data.mongo;
 
 import static org.junit.Assert.assertTrue;
 

spring-boot-samples/spring-boot-sample-data-redis/src/main/java/org/springframework/boot/sample/data/redis/SampleRedisApplication.java → spring-boot-samples/spring-boot-sample-data-redis/src/main/java/sample/data/redis/SampleRedisApplication.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.data.redis;
+package sample.data.redis;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;

spring-boot-samples/spring-boot-sample-data-redis/src/test/java/org/springframework/boot/sample/data/redis/SampleRedisApplicationTests.java → spring-boot-samples/spring-boot-sample-data-redis/src/test/java/sample/data/redis/SampleRedisApplicationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.data.redis;
+package sample.data.redis;
 
 import static org.junit.Assert.assertTrue;
 
@@ -23,7 +23,7 @@ import java.io.IOException;
 import org.junit.Rule;
 import org.junit.Test;
 import org.springframework.boot.OutputCapture;
-import org.springframework.boot.sample.data.redis.SampleRedisApplication;
+import sample.data.redis.SampleRedisApplication;
 import org.springframework.core.NestedCheckedException;
 
 /**

spring-boot-samples/spring-boot-sample-integration/src/main/java/org/springframework/boot/sample/integration/HelloWorldService.java → spring-boot-samples/spring-boot-sample-integration/src/main/java/sample/integration/HelloWorldService.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.integration;
+package sample.integration;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

spring-boot-samples/spring-boot-sample-integration/src/main/java/org/springframework/boot/sample/integration/SampleEndpoint.java → spring-boot-samples/spring-boot-sample-integration/src/main/java/sample/integration/SampleEndpoint.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.integration;
+package sample.integration;
 
 import java.io.File;
 import java.io.FileInputStream;

spring-boot-samples/spring-boot-sample-integration/src/main/java/org/springframework/boot/sample/integration/SampleIntegrationApplication.java → spring-boot-samples/spring-boot-sample-integration/src/main/java/sample/integration/SampleIntegrationApplication.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.integration;
+package sample.integration;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;

spring-boot-samples/spring-boot-sample-integration/src/main/java/org/springframework/boot/sample/integration/ServiceProperties.java → spring-boot-samples/spring-boot-sample-integration/src/main/java/sample/integration/ServiceProperties.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.integration;
+package sample.integration;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 

spring-boot-samples/spring-boot-sample-integration/src/test/java/org/springframework/boot/sample/integration/consumer/SampleIntegrationApplicationTests.java → spring-boot-samples/spring-boot-sample-integration/src/test/java/sample/integration/consumer/SampleIntegrationApplicationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.integration.consumer;
+package sample.integration.consumer;
 
 import java.util.concurrent.Callable;
 import java.util.concurrent.Executors;
@@ -25,8 +25,8 @@ import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.sample.integration.SampleIntegrationApplication;
-import org.springframework.boot.sample.integration.producer.ProducerApplication;
+import sample.integration.SampleIntegrationApplication;
+import sample.integration.producer.ProducerApplication;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.core.io.DefaultResourceLoader;
 import org.springframework.core.io.Resource;

spring-boot-samples/spring-boot-sample-integration/src/test/java/org/springframework/boot/sample/integration/producer/ProducerApplication.java → spring-boot-samples/spring-boot-sample-integration/src/test/java/sample/integration/producer/ProducerApplication.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.integration.producer;
+package sample.integration.producer;
 
 import java.io.File;
 import java.io.FileOutputStream;

spring-boot-samples/spring-boot-sample-jetty/src/main/java/org/springframework/boot/sample/jetty/SampleJettyApplication.java → spring-boot-samples/spring-boot-sample-jetty/src/main/java/sample/jetty/SampleJettyApplication.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.jetty;
+package sample.jetty;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;

spring-boot-samples/spring-boot-sample-xml/src/main/java/org/springframework/boot/sample/xml/service/HelloWorldService.java → spring-boot-samples/spring-boot-sample-jetty/src/main/java/sample/jetty/service/HelloWorldService.java

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

spring-boot-samples/spring-boot-sample-jetty/src/main/java/org/springframework/boot/sample/jetty/web/SampleController.java → spring-boot-samples/spring-boot-sample-jetty/src/main/java/sample/jetty/web/SampleController.java

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.jetty.web;
+package sample.jetty.web;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.sample.jetty.service.HelloWorldService;
+import sample.jetty.service.HelloWorldService;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;

spring-boot-samples/spring-boot-sample-jetty/src/test/java/org/springframework/boot/sample/jetty/SampleJettyApplicationTests.java → spring-boot-samples/spring-boot-sample-jetty/src/test/java/sample/jetty/SampleJettyApplicationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.jetty;
+package sample.jetty;
 
 import java.io.IOException;
 import java.util.concurrent.Callable;

spring-boot-samples/spring-boot-sample-profile/src/main/java/org/springframework/boot/sample/profile/SampleProfileApplication.java → spring-boot-samples/spring-boot-sample-profile/src/main/java/sample/profile/SampleProfileApplication.java

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.profile;
+package sample.profile;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.sample.profile.service.MessageService;
+import sample.profile.service.MessageService;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 

spring-boot-samples/spring-boot-sample-profile/src/main/java/org/springframework/boot/sample/profile/service/GenericService.java → spring-boot-samples/spring-boot-sample-profile/src/main/java/sample/profile/service/GenericService.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.profile.service;
+package sample.profile.service;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Profile;

spring-boot-samples/spring-boot-sample-profile/src/main/java/org/springframework/boot/sample/profile/service/GoodbyeWorldService.java → spring-boot-samples/spring-boot-sample-profile/src/main/java/sample/profile/service/GoodbyeWorldService.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.profile.service;
+package sample.profile.service;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Profile;

spring-boot-samples/spring-boot-sample-profile/src/main/java/org/springframework/boot/sample/profile/service/HelloWorldService.java → spring-boot-samples/spring-boot-sample-profile/src/main/java/sample/profile/service/HelloWorldService.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.profile.service;
+package sample.profile.service;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Profile;

spring-boot-samples/spring-boot-sample-profile/src/main/java/org/springframework/boot/sample/profile/service/MessageService.java → spring-boot-samples/spring-boot-sample-profile/src/main/java/sample/profile/service/MessageService.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.profile.service;
+package sample.profile.service;
 
 /**
  * @author Dave Syer

spring-boot-samples/spring-boot-sample-profile/src/test/java/org/springframework/boot/sample/profile/SampleProfileApplicationTests.java → spring-boot-samples/spring-boot-sample-profile/src/test/java/sample/profile/SampleProfileApplicationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.profile;
+package sample.profile;
 
 import org.junit.After;
 import org.junit.Before;

spring-boot-samples/spring-boot-sample-secure/src/main/java/org/springframework/boot/sample/ops/ui/SampleSecureApplication.java → spring-boot-samples/spring-boot-sample-secure/src/main/java/sample/ops/ui/SampleSecureApplication.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.ops.ui;
+package sample.ops.ui;
 
 import java.util.Date;
 import java.util.Map;

spring-boot-samples/spring-boot-sample-secure/src/test/java/org/springframework/boot/sample/ops/ui/SampleSecureApplicationTests.java → spring-boot-samples/spring-boot-sample-secure/src/test/java/sample/ops/ui/SampleSecureApplicationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.ops.ui;
+package sample.ops.ui;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;

spring-boot-samples/spring-boot-sample-servlet/src/main/java/org/springframework/boot/sample/servlet/SampleServletApplication.java → spring-boot-samples/spring-boot-sample-servlet/src/main/java/sample/servlet/SampleServletApplication.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.servlet;
+package sample.servlet;
 
 import java.io.IOException;
 

spring-boot-samples/spring-boot-sample-servlet/src/test/java/org/springframework/boot/sample/servlet/SampleServletApplicationTests.java → spring-boot-samples/spring-boot-sample-servlet/src/test/java/sample/servlet/SampleServletApplicationTests.java

-package org.springframework.boot.sample.servlet;
+package sample.servlet;
 
 import static org.junit.Assert.assertEquals;
 

spring-boot-samples/spring-boot-sample-simple/src/main/java/org/springframework/boot/sample/simple/service/HelloWorldService.java

-/*
- * 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.simple.service;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-@Component
-public class HelloWorldService {
-
-	@Value("${name:World}")
-	private String name;
-
-	public String getHelloMessage() {
-		return "Hello " + this.name;
-	}
-
-}

spring-boot-samples/spring-boot-sample-simple/src/main/java/org/springframework/boot/sample/simple/SampleSimpleApplication.java → spring-boot-samples/spring-boot-sample-simple/src/main/java/sample/simple/SampleSimpleApplication.java

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.simple;
+package sample.simple;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.sample.simple.service.HelloWorldService;
+import sample.simple.service.HelloWorldService;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 

spring-boot-samples/spring-boot-sample-jetty/src/main/java/org/springframework/boot/sample/jetty/service/HelloWorldService.java → spring-boot-samples/spring-boot-sample-simple/src/main/java/sample/simple/service/HelloWorldService.java

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

spring-boot-samples/spring-boot-sample-simple/src/test/java/org/springframework/boot/sample/simple/SampleSimpleApplicationTests.java → spring-boot-samples/spring-boot-sample-simple/src/test/java/sample/simple/SampleSimpleApplicationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.simple;
+package sample.simple;
 
 import org.junit.After;
 import org.junit.Before;

spring-boot-samples/spring-boot-sample-simple/src/test/java/org/springframework/boot/sample/simple/SpringTestSampleSimpleApplicationTests.java → spring-boot-samples/spring-boot-sample-simple/src/test/java/sample/simple/SpringTestSampleSimpleApplicationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.simple;
+package sample.simple;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

spring-boot-samples/spring-boot-sample-tomcat/src/main/java/org/springframework/boot/sample/tomcat/SampleTomcatApplication.java → spring-boot-samples/spring-boot-sample-tomcat/src/main/java/sample/tomcat/SampleTomcatApplication.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.tomcat;
+package sample.tomcat;
 
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;

spring-boot-samples/spring-boot-sample-tomcat/src/main/java/org/springframework/boot/sample/tomcat/service/HelloWorldService.java → spring-boot-samples/spring-boot-sample-tomcat/src/main/java/sample/tomcat/service/HelloWorldService.java

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

spring-boot-samples/spring-boot-sample-tomcat/src/main/java/org/springframework/boot/sample/tomcat/web/SampleController.java → spring-boot-samples/spring-boot-sample-tomcat/src/main/java/sample/tomcat/web/SampleController.java

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.tomcat.web;
+package sample.tomcat.web;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.sample.tomcat.service.HelloWorldService;
+import sample.tomcat.service.HelloWorldService;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;

spring-boot-samples/spring-boot-sample-tomcat/src/test/java/org/springframework/boot/sample/tomcat/NonAutoConfigurationSampleTomcatApplicationTests.java → spring-boot-samples/spring-boot-sample-tomcat/src/test/java/sample/tomcat/NonAutoConfigurationSampleTomcatApplicationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.tomcat;
+package sample.tomcat;
 
 import java.io.IOException;
 import java.util.concurrent.Callable;
@@ -31,8 +31,8 @@ import org.springframework.boot.autoconfigure.web.DispatcherServletAutoConfigura
 import org.springframework.boot.autoconfigure.web.EmbeddedServletContainerAutoConfiguration;
 import org.springframework.boot.autoconfigure.web.HttpMessageConvertersAutoConfiguration;
 import org.springframework.boot.autoconfigure.web.WebMvcAutoConfiguration;
-import org.springframework.boot.sample.tomcat.service.HelloWorldService;
-import org.springframework.boot.sample.tomcat.web.SampleController;
+import sample.tomcat.service.HelloWorldService;
+import sample.tomcat.web.SampleController;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;

spring-boot-samples/spring-boot-sample-tomcat/src/test/java/org/springframework/boot/sample/tomcat/SampleTomcatApplicationTests.java → spring-boot-samples/spring-boot-sample-tomcat/src/test/java/sample/tomcat/SampleTomcatApplicationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.tomcat;
+package sample.tomcat;
 
 import java.io.IOException;
 import java.util.concurrent.Callable;

spring-boot-samples/spring-boot-sample-traditional/src/main/java/org/springframework/boot/sample/traditional/SampleTraditionalApplication.java → spring-boot-samples/spring-boot-sample-traditional/src/main/java/sample/traditional/SampleTraditionalApplication.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.traditional;
+package sample.traditional;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;

spring-boot-samples/spring-boot-sample-traditional/src/main/java/org/springframework/boot/sample/traditional/config/WebConfig.java → spring-boot-samples/spring-boot-sample-traditional/src/main/java/sample/traditional/config/WebConfig.java

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

spring-boot-samples/spring-boot-sample-traditional/src/test/java/org/springframework/boot/sample/traditional/SampleTraditionalApplicationTests.java → spring-boot-samples/spring-boot-sample-traditional/src/test/java/sample/traditional/SampleTraditionalApplicationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.traditional;
+package sample.traditional;
 
 import java.io.IOException;
 import java.util.concurrent.Callable;

spring-boot-samples/spring-boot-sample-web-jsp/src/main/java/org/springframework/boot/sample/jsp/SampleWebJspApplication.java → spring-boot-samples/spring-boot-sample-web-jsp/src/main/java/sample/jsp/SampleWebJspApplication.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.jsp;
+package sample.jsp;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;

spring-boot-samples/spring-boot-sample-web-jsp/src/main/java/org/springframework/boot/sample/jsp/WelcomeController.java → spring-boot-samples/spring-boot-sample-web-jsp/src/main/java/sample/jsp/WelcomeController.java

-package org.springframework.boot.sample.jsp;
+package sample.jsp;
 
 import java.util.Date;
 import java.util.Map;

spring-boot-samples/spring-boot-sample-web-jsp/src/test/java/org/springframework/boot/sample/jsp/SampleWebJspApplicationTests.java → spring-boot-samples/spring-boot-sample-web-jsp/src/test/java/sample/jsp/SampleWebJspApplicationTests.java

-package org.springframework.boot.sample.jsp;
+package sample.jsp;
 
 import java.io.IOException;
 import java.util.concurrent.Callable;

spring-boot-samples/spring-boot-sample-web-static/src/main/java/org/springframework/boot/sample/ui/SampleWebStaticApplication.java → spring-boot-samples/spring-boot-sample-web-static/src/main/java/sample/ui/SampleWebStaticApplication.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.ui;
+package sample.ui;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;

spring-boot-samples/spring-boot-sample-web-static/src/test/java/org/springframework/boot/sample/ui/SampleWebStaticApplicationTests.java → spring-boot-samples/spring-boot-sample-web-static/src/test/java/sample/ui/SampleWebStaticApplicationTests.java

-package org.springframework.boot.sample.ui;
+package sample.ui;
 
 import java.io.IOException;
 import java.util.concurrent.Callable;

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.ui;
+package sample.ui;
 
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;

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

@@ -11,7 +11,7 @@
  * specific language governing permissions and limitations under the License.
  */
 
-package org.springframework.boot.sample.ui;
+package sample.ui;
 
 import java.util.Calendar;
 

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

@@ -11,7 +11,7 @@
  * specific language governing permissions and limitations under the License.
  */
 
-package org.springframework.boot.sample.ui;
+package sample.ui;
 
 /**
  * @author Rob Winch

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.ui;
+package sample.ui;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;

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

@@ -11,13 +11,13 @@
  * specific language governing permissions and limitations under the License.
  */
 
-package org.springframework.boot.sample.ui.mvc;
+package 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 sample.ui.Message;
+import sample.ui.MessageRepository;
 import org.springframework.stereotype.Controller;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.ModelAttribute;

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

-package org.springframework.boot.sample.ui;
+package sample.ui;
 
 import static org.hamcrest.Matchers.containsString;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;

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

-package org.springframework.boot.sample.ui;
+package sample.ui;
 
 import java.io.IOException;
 import java.net.URI;

spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/client/GreetingService.java → spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/client/GreetingService.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.samples.websocket.client;
+package samples.websocket.client;
 
 public interface GreetingService {
 

spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/client/SimpleClientWebSocketHandler.java → spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/client/SimpleClientWebSocketHandler.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.samples.websocket.client;
+package samples.websocket.client;
 
 import java.util.concurrent.CountDownLatch;
 

spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/client/SimpleGreetingService.java → spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/client/SimpleGreetingService.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.samples.websocket.client;
+package samples.websocket.client;
 
 public class SimpleGreetingService implements GreetingService {
 

spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/config/SampleWebSocketsApplication.java → spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/config/SampleWebSocketsApplication.java

@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.samples.websocket.config;
+package samples.websocket.config;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.samples.websocket.client.GreetingService;
-import org.springframework.boot.samples.websocket.client.SimpleGreetingService;
-import org.springframework.boot.samples.websocket.echo.DefaultEchoService;
-import org.springframework.boot.samples.websocket.echo.EchoService;
-import org.springframework.boot.samples.websocket.echo.EchoWebSocketHandler;
-import org.springframework.boot.samples.websocket.snake.SnakeWebSocketHandler;
+import samples.websocket.client.GreetingService;
+import samples.websocket.client.SimpleGreetingService;
+import samples.websocket.echo.DefaultEchoService;
+import samples.websocket.echo.EchoService;
+import samples.websocket.echo.EchoWebSocketHandler;
+import samples.websocket.snake.SnakeWebSocketHandler;
 import org.springframework.boot.web.SpringBootServletInitializer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/echo/DefaultEchoService.java → spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/echo/DefaultEchoService.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.samples.websocket.echo;
+package samples.websocket.echo;
 
 public class DefaultEchoService implements EchoService {
 

spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/echo/EchoService.java → spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/echo/EchoService.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.samples.websocket.echo;
+package samples.websocket.echo;
 
 public interface EchoService {
 

spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/echo/EchoWebSocketHandler.java → spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/echo/EchoWebSocketHandler.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.samples.websocket.echo;
+package samples.websocket.echo;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/snake/Direction.java → spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/snake/Direction.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.samples.websocket.snake;
+package samples.websocket.snake;
 
 public enum Direction {
 	NONE, NORTH, SOUTH, EAST, WEST

spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/snake/Location.java → spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/snake/Location.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.samples.websocket.snake;
+package samples.websocket.snake;
 
 public class Location {
 

spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/snake/Snake.java → spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/snake/Snake.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.samples.websocket.snake;
+package samples.websocket.snake;
 
 import java.util.ArrayDeque;
 import java.util.Collection;

spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/snake/SnakeTimer.java → spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/snake/SnakeTimer.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.samples.websocket.snake;
+package samples.websocket.snake;
 
 import java.util.Collection;
 import java.util.Collections;

spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/snake/SnakeUtils.java → spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/snake/SnakeUtils.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.samples.websocket.snake;
+package samples.websocket.snake;
 
 import java.awt.Color;
 import java.util.Random;

spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/snake/SnakeWebSocketHandler.java → spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/snake/SnakeWebSocketHandler.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.samples.websocket.snake;
+package samples.websocket.snake;
 
 import java.awt.Color;
 import java.util.Iterator;

spring-boot-samples/spring-boot-sample-websocket/src/test/java/org/springframework/boot/samples/websocket/echo/SampleWebSocketsApplicationTests.java → spring-boot-samples/spring-boot-sample-websocket/src/test/java/samples/websocket/echo/SampleWebSocketsApplicationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.samples.websocket.echo;
+package samples.websocket.echo;
 
 import java.util.concurrent.Callable;
 import java.util.concurrent.CountDownLatch;
@@ -29,10 +29,10 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.samples.websocket.client.GreetingService;
-import org.springframework.boot.samples.websocket.client.SimpleClientWebSocketHandler;
-import org.springframework.boot.samples.websocket.client.SimpleGreetingService;
-import org.springframework.boot.samples.websocket.config.SampleWebSocketsApplication;
+import samples.websocket.client.GreetingService;
+import samples.websocket.client.SimpleClientWebSocketHandler;
+import samples.websocket.client.SimpleGreetingService;
+import samples.websocket.config.SampleWebSocketsApplication;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

spring-boot-samples/spring-boot-sample-websocket/src/test/java/org/springframework/boot/samples/websocket/snake/SnakeTimerTests.java → spring-boot-samples/spring-boot-sample-websocket/src/test/java/samples/websocket/snake/SnakeTimerTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.samples.websocket.snake;
+package samples.websocket.snake;
 
 import java.io.IOException;
 

spring-boot-samples/spring-boot-sample-xml/src/main/java/org/springframework/boot/sample/xml/SampleSpringXmlApplication.java → spring-boot-samples/spring-boot-sample-xml/src/main/java/sample/xml/SampleSpringXmlApplication.java

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.xml;
+package sample.xml;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.sample.xml.service.HelloWorldService;
+import sample.xml.service.HelloWorldService;
 
 public class SampleSpringXmlApplication implements CommandLineRunner {
 

spring-boot-samples/spring-boot-sample-xml/src/main/java/sample/xml/service/HelloWorldService.java

+/*
+ * 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 sample.xml.service;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+@Component
+public class HelloWorldService {
+
+	@Value("${name:World}")
+	private String name;
+
+	public String getHelloMessage() {
+		return "Hello " + this.name;
+	}
+
+}

spring-boot-samples/spring-boot-sample-xml/src/main/resources/META-INF/application-context.xml

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

spring-boot-samples/spring-boot-sample-xml/src/test/java/org/springframework/boot/sample/xml/SampleSpringXmlApplicationTests.java → spring-boot-samples/spring-boot-sample-xml/src/test/java/sample/xml/SampleSpringXmlApplicationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.sample.xml;
+package sample.xml;
 
 import org.junit.Rule;
 import org.junit.Test;