Merge branch '1.1.x'

2014-09-03 11:45:54 -07:00
parent 383288f1c2 bedb44adc8
commit 6f62fc854b
72 changed files with 315 additions and 34 deletions
--- a/spring-boot-samples/spring-boot-sample-simple/application.properties
+++ b/spring-boot-samples/spring-boot-sample-simple/application.properties
@@ -0,0 +1 @@
+name: Phil
--- a/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/ExecutableArchiveLauncher$1.class
+++ b/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/ExecutableArchiveLauncher$1.class
--- a/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/ExecutableArchiveLauncher.class
+++ b/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/ExecutableArchiveLauncher.class
--- a/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/InputArgumentsJavaAgentDetector$1.class
+++ b/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/InputArgumentsJavaAgentDetector$1.class
--- a/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/InputArgumentsJavaAgentDetector.class
+++ b/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/InputArgumentsJavaAgentDetector.class
--- a/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/JarLauncher.class
+++ b/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/JarLauncher.class
--- a/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/JavaAgentDetector.class
+++ b/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/JavaAgentDetector.class
--- a/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/LaunchedURLClassLoader$1.class
+++ b/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/LaunchedURLClassLoader$1.class
--- a/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/LaunchedURLClassLoader$2.class
+++ b/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/LaunchedURLClassLoader$2.class
--- a/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/LaunchedURLClassLoader.class
+++ b/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/LaunchedURLClassLoader.class
--- a/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/Launcher.class
+++ b/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/Launcher.class
--- a/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/MainMethodRunner.class
+++ b/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/MainMethodRunner.class
--- a/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/PropertiesLauncher$1.class
+++ b/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/PropertiesLauncher$1.class
--- a/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/PropertiesLauncher$ArchiveEntryFilter.class
+++ b/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/PropertiesLauncher$ArchiveEntryFilter.class
--- a/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/PropertiesLauncher$PrefixMatchingArchiveFilter.class
+++ b/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/PropertiesLauncher$PrefixMatchingArchiveFilter.class
--- a/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/PropertiesLauncher.class
+++ b/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/PropertiesLauncher.class
--- a/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/WarLauncher$1.class
+++ b/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/WarLauncher$1.class
--- a/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/WarLauncher.class
+++ b/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/WarLauncher.class
--- a/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/archive/Archive$Entry.class
+++ b/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/archive/Archive$Entry.class
--- a/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/archive/Archive$EntryFilter.class
+++ b/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/archive/Archive$EntryFilter.class
--- a/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/archive/Archive$EntryRenameFilter.class
+++ b/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/archive/Archive$EntryRenameFilter.class
--- a/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/archive/Archive.class
+++ b/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/archive/Archive.class
--- a/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/archive/ExplodedArchive$FileEntry.class
+++ b/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/archive/ExplodedArchive$FileEntry.class
--- a/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/archive/ExplodedArchive$FileNotFoundURLConnection.class
+++ b/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/archive/ExplodedArchive$FileNotFoundURLConnection.class
--- a/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/archive/ExplodedArchive$FilteredURLStreamHandler.class
+++ b/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/archive/ExplodedArchive$FilteredURLStreamHandler.class
--- a/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/archive/ExplodedArchive.class
+++ b/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/archive/ExplodedArchive.class
--- a/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/archive/FilteredArchive$1.class
+++ b/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/archive/FilteredArchive$1.class
--- a/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/archive/FilteredArchive$2.class
+++ b/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/archive/FilteredArchive$2.class
--- a/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/archive/FilteredArchive.class
+++ b/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/archive/FilteredArchive.class
--- a/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/archive/JarFileArchive$1.class
+++ b/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/archive/JarFileArchive$1.class
--- a/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/archive/JarFileArchive$JarFileEntry.class
+++ b/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/archive/JarFileArchive$JarFileEntry.class
--- a/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/archive/JarFileArchive.class
+++ b/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/archive/JarFileArchive.class
--- a/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/data/ByteArrayRandomAccessData.class
+++ b/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/data/ByteArrayRandomAccessData.class
--- a/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/data/RandomAccessData$ResourceAccess.class
+++ b/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/data/RandomAccessData$ResourceAccess.class
--- a/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/data/RandomAccessData.class
+++ b/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/data/RandomAccessData.class
--- a/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/data/RandomAccessDataFile$DataInputStream.class
+++ b/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/data/RandomAccessDataFile$DataInputStream.class
--- a/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/data/RandomAccessDataFile$FilePool.class
+++ b/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/data/RandomAccessDataFile$FilePool.class
--- a/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/data/RandomAccessDataFile.class
+++ b/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/data/RandomAccessDataFile.class
--- a/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/jar/Bytes.class
+++ b/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/jar/Bytes.class
--- a/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/jar/CentralDirectoryEndRecord.class
+++ b/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/jar/CentralDirectoryEndRecord.class
--- a/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/jar/Handler.class
+++ b/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/jar/Handler.class
--- a/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/jar/JarEntry.class
+++ b/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/jar/JarEntry.class
--- a/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/jar/JarEntryData.class
+++ b/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/jar/JarEntryData.class
--- a/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/jar/JarEntryFilter.class
+++ b/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/jar/JarEntryFilter.class
--- a/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/jar/JarFile$1.class
+++ b/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/jar/JarFile$1.class
--- a/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/jar/JarFile$2.class
+++ b/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/jar/JarFile$2.class
--- a/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/jar/JarFile.class
+++ b/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/jar/JarFile.class
--- a/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/jar/JarURLConnection$1.class
+++ b/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/jar/JarURLConnection$1.class
--- a/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/jar/JarURLConnection$JarEntryName.class
+++ b/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/jar/JarURLConnection$JarEntryName.class
--- a/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/jar/JarURLConnection.class
+++ b/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/jar/JarURLConnection.class
--- a/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/jar/ZipInflaterInputStream.class
+++ b/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/jar/ZipInflaterInputStream.class
--- a/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/util/AsciiBytes.class
+++ b/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/util/AsciiBytes.class
--- a/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/util/SystemPropertyUtils.class
+++ b/spring-boot-samples/spring-boot-sample-simple/org/springframework/boot/loader/util/SystemPropertyUtils.class
--- a/spring-boot-samples/spring-boot-sample-simple/sample/simple/SampleSimpleApplication.class
+++ b/spring-boot-samples/spring-boot-sample-simple/sample/simple/SampleSimpleApplication.class
--- a/spring-boot-samples/spring-boot-sample-simple/sample/simple/service/HelloWorldService.class
+++ b/spring-boot-samples/spring-boot-sample-simple/sample/simple/service/HelloWorldService.class