root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Merge branch '1.1.x'

This commit is contained in:
Dave Syer 2014-07-31 15:58:30 -07:00
parent b78d43e0b8 6ba8269db8
commit 67ba66dc4c
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/DependencyCustomizer.java
View File

@ -255,4 +255,11 @@ public class DependencyCustomizer {
protected boolean canAdd() { protected boolean canAdd() {
return true; return true;
} }
/**
* @return the dependencyResolutionContext
*/
public DependencyResolutionContext getDependencyResolutionContext() {
return this.dependencyResolutionContext;
}
} }

20
spring-boot-cli/src/main/java/org/springframework/boot/cli/jar/PackagedSpringApplicationLauncher.java
View File

@ -19,6 +19,7 @@ package org.springframework.boot.cli.jar;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.net.URL; import java.net.URL;
import java.net.URLClassLoader; import java.net.URLClassLoader;
import java.util.Enumeration;
import java.util.jar.Manifest; import java.util.jar.Manifest;
/** /**
@ -31,6 +32,8 @@ public class PackagedSpringApplicationLauncher {
public static final String SOURCE_MANIFEST_ENTRY = "Spring-Application-Source-Classes"; public static final String SOURCE_MANIFEST_ENTRY = "Spring-Application-Source-Classes";
public static final String MAIN_CLASS_MANIFEST_ENTRY = "Start-Class";
private static final String SPRING_APPLICATION_CLASS = "org.springframework.boot.SpringApplication"; private static final String SPRING_APPLICATION_CLASS = "org.springframework.boot.SpringApplication";
private void run(String[] args) throws Exception { private void run(String[] args) throws Exception {
@ -42,10 +45,19 @@ public class PackagedSpringApplicationLauncher {
} }
private Object[] getSources(URLClassLoader classLoader) throws Exception { private Object[] getSources(URLClassLoader classLoader) throws Exception {
URL url = classLoader.findResource("META-INF/MANIFEST.MF"); for (Enumeration<URL> urls = classLoader.findResources("META-INF/MANIFEST.MF"); urls
Manifest manifest = new Manifest(url.openStream()); .hasMoreElements();) {
String attribute = manifest.getMainAttributes().getValue(SOURCE_MANIFEST_ENTRY); URL url = urls.nextElement();
return loadClasses(classLoader, attribute.split(",")); Manifest manifest = new Manifest(url.openStream());
if (getClass().getName().equals(
manifest.getMainAttributes().getValue(MAIN_CLASS_MANIFEST_ENTRY))) {
String attribute = manifest.getMainAttributes().getValue(
SOURCE_MANIFEST_ENTRY);
return loadClasses(classLoader, attribute.split(","));
}
}
throw new IllegalStateException("Cannot locate " + SOURCE_MANIFEST_ENTRY
+ " in MANIFEST.MF");
} }
private Class<?>[] loadClasses(ClassLoader classLoader, String[] names) private Class<?>[] loadClasses(ClassLoader classLoader, String[] names)