root
/
spring-boot
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch '1.4.x' into 1.5.x

Browse Source
pull/8585/merge
Andy Wilkinson 8 years ago
parent 6a137260c1 2ddcf0e831
commit 17062f9589
2 changed files with 34 additions and 18 deletions
Show Stats Download Patch File Download Diff File

26
spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/BootRunApplicationLauncher.java
Unescape Escape View File

@ -27,6 +27,7 @@ import java.util.List;
import java.util.jar.JarEntry; import java.util.jar.JarEntry;
import java.util.jar.JarFile; import java.util.jar.JarFile;
import org.springframework.util.FileCopyUtils;
import org.springframework.util.FileSystemUtils; import org.springframework.util.FileSystemUtils;
import org.springframework.util.StreamUtils; import org.springframework.util.StreamUtils;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
@ -52,7 +53,9 @@ class BootRunApplicationLauncher extends AbstractApplicationLauncher {
deleteLauncherClasses(); deleteLauncherClasses();
File targetClasses = populateTargetClasses(archive); File targetClasses = populateTargetClasses(archive);
File dependencies = populateDependencies(archive); File dependencies = populateDependencies(archive);
populateSrcMainWebapp(); if (archive.getName().endsWith(".war")) {
populateSrcMainWebapp();
}
List<String> classpath = new ArrayList<String>(); List<String> classpath = new ArrayList<String>();
classpath.add(targetClasses.getAbsolutePath()); classpath.add(targetClasses.getAbsolutePath());
for (File dependency : dependencies.listFiles()) { for (File dependency : dependencies.listFiles()) {
@ -72,30 +75,35 @@ class BootRunApplicationLauncher extends AbstractApplicationLauncher {
FileSystemUtils.deleteRecursively(new File(this.exploded, "org")); FileSystemUtils.deleteRecursively(new File(this.exploded, "org"));
} }
private File populateTargetClasses(File archive) { private File populateTargetClasses(File archive) throws IOException {
File targetClasses = new File(this.exploded, "target/classes"); File targetClasses = new File(this.exploded, "target/classes");
targetClasses.mkdirs(); targetClasses.mkdirs();
new File(this.exploded, getClassesPath(archive)).renameTo(targetClasses); File source = new File(this.exploded, getClassesPath(archive));
FileSystemUtils.copyRecursively(source, targetClasses);
FileSystemUtils.deleteRecursively(source);
return targetClasses; return targetClasses;
} }
private File populateDependencies(File archive) { private File populateDependencies(File archive) throws IOException {
File dependencies = new File(this.exploded, "dependencies"); File dependencies = new File(this.exploded, "dependencies");
dependencies.mkdirs(); dependencies.mkdirs();
List<String> libPaths = getLibPaths(archive); List<String> libPaths = getLibPaths(archive);
for (String libPath : libPaths) { for (String libPath : libPaths) {
for (File jar : new File(this.exploded, libPath).listFiles()) { File libDirectory = new File(this.exploded, libPath);
jar.renameTo(new File(dependencies, jar.getName())); for (File jar : libDirectory.listFiles()) {
FileCopyUtils.copy(jar, new File(dependencies, jar.getName()));
} }
FileSystemUtils.deleteRecursively(libDirectory);
} }
return dependencies; return dependencies;
} }
private void populateSrcMainWebapp() { private void populateSrcMainWebapp() throws IOException {
File srcMainWebapp = new File(this.exploded, "src/main/webapp"); File srcMainWebapp = new File(this.exploded, "src/main/webapp");
srcMainWebapp.mkdirs(); srcMainWebapp.mkdirs();
new File(this.exploded, "webapp-resource.txt") File source = new File(this.exploded, "webapp-resource.txt");
.renameTo(new File(srcMainWebapp, "webapp-resource.txt")); FileCopyUtils.copy(source, new File(srcMainWebapp, "webapp-resource.txt"));
source.delete();
} }
private String getClassesPath(File archive) { private String getClassesPath(File archive) {

26
spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/IdeApplicationLauncher.java
Unescape Escape View File

@ -27,6 +27,7 @@ import java.util.List;
import java.util.jar.JarEntry; import java.util.jar.JarEntry;
import java.util.jar.JarFile; import java.util.jar.JarFile;
import org.springframework.util.FileCopyUtils;
import org.springframework.util.FileSystemUtils; import org.springframework.util.FileSystemUtils;
import org.springframework.util.StreamUtils; import org.springframework.util.StreamUtils;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
@ -63,7 +64,9 @@ class IdeApplicationLauncher extends AbstractApplicationLauncher {
File targetClasses = populateTargetClasses(archive); File targetClasses = populateTargetClasses(archive);
File dependencies = populateDependencies(archive); File dependencies = populateDependencies(archive);
File resourcesProject = explodedResourcesProject(dependencies); File resourcesProject = explodedResourcesProject(dependencies);
populateSrcMainWebapp(); if (archive.getName().endsWith(".war")) {
populateSrcMainWebapp();
}
List<String> classpath = new ArrayList<String>(); List<String> classpath = new ArrayList<String>();
classpath.add(targetClasses.getAbsolutePath()); classpath.add(targetClasses.getAbsolutePath());
for (File dependency : dependencies.listFiles()) { for (File dependency : dependencies.listFiles()) {
@ -80,21 +83,25 @@ class IdeApplicationLauncher extends AbstractApplicationLauncher {
} }
} }
private File populateTargetClasses(File archive) { private File populateTargetClasses(File archive) throws IOException {
File targetClasses = new File(this.exploded, "target/classes"); File targetClasses = new File(this.exploded, "target/classes");
targetClasses.mkdirs(); targetClasses.mkdirs();
new File(this.exploded, getClassesPath(archive)).renameTo(targetClasses); File source = new File(this.exploded, getClassesPath(archive));
FileSystemUtils.copyRecursively(source, targetClasses);
FileSystemUtils.deleteRecursively(source);
return targetClasses; return targetClasses;
} }
private File populateDependencies(File archive) { private File populateDependencies(File archive) throws IOException {
File dependencies = new File(this.exploded, "dependencies"); File dependencies = new File(this.exploded, "dependencies");
dependencies.mkdirs(); dependencies.mkdirs();
List<String> libPaths = getLibPaths(archive); List<String> libPaths = getLibPaths(archive);
for (String libPath : libPaths) { for (String libPath : libPaths) {
for (File jar : new File(this.exploded, libPath).listFiles()) { File libDirectory = new File(this.exploded, libPath);
jar.renameTo(new File(dependencies, jar.getName())); for (File jar : libDirectory.listFiles()) {
FileCopyUtils.copy(jar, new File(dependencies, jar.getName()));
} }
FileSystemUtils.deleteRecursively(libDirectory);
} }
return dependencies; return dependencies;
} }
@ -108,11 +115,12 @@ class IdeApplicationLauncher extends AbstractApplicationLauncher {
return resourcesProject; return resourcesProject;
} }
private void populateSrcMainWebapp() { private void populateSrcMainWebapp() throws IOException {
File srcMainWebapp = new File(this.exploded, "src/main/webapp"); File srcMainWebapp = new File(this.exploded, "src/main/webapp");
srcMainWebapp.mkdirs(); srcMainWebapp.mkdirs();
new File(this.exploded, "webapp-resource.txt") File source = new File(this.exploded, "webapp-resource.txt");
.renameTo(new File(srcMainWebapp, "webapp-resource.txt")); FileCopyUtils.copy(source, new File(srcMainWebapp, "webapp-resource.txt"));
source.delete();
} }
private void deleteLauncherClasses() { private void deleteLauncherClasses() {

Write Preview
Loading…
Cancel
Save