Update packaged JARs to use standard JarLauncher
Change CLI generated JARs to use the standard `JarLauncher` instead of a custom `JarRunner`. The `PackagedSpringApplicationLauncher` is used as the `Start-Class` which in turn calls `SpringApplication.run()`.pull/272/merge
Phillip Webb
11 years ago
parent
5cf2387e58
commit
c852fb5a79
@ -1,98 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 2012-2014 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.cli.command.jar;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.lang.reflect.InvocationTargetException;
|
|
||||||
import java.lang.reflect.Method;
|
|
||||||
import java.net.MalformedURLException;
|
|
||||||
import java.net.URISyntaxException;
|
|
||||||
import java.net.URL;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import org.springframework.boot.loader.ArchiveResolver;
|
|
||||||
import org.springframework.boot.loader.AsciiBytes;
|
|
||||||
import org.springframework.boot.loader.LaunchedURLClassLoader;
|
|
||||||
import org.springframework.boot.loader.archive.Archive;
|
|
||||||
import org.springframework.boot.loader.archive.Archive.Entry;
|
|
||||||
import org.springframework.boot.loader.archive.Archive.EntryFilter;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A runner for a CLI application that has been compiled and packaged as a jar file
|
|
||||||
*
|
|
||||||
* @author Andy Wilkinson
|
|
||||||
*/
|
|
||||||
public class JarRunner {
|
|
||||||
|
|
||||||
private static final AsciiBytes LIB = new AsciiBytes("lib/");
|
|
||||||
|
|
||||||
public static void main(String[] args) throws URISyntaxException, IOException,
|
|
||||||
ClassNotFoundException, SecurityException, NoSuchMethodException,
|
|
||||||
IllegalArgumentException, IllegalAccessException, InvocationTargetException {
|
|
||||||
|
|
||||||
Archive archive = new ArchiveResolver().resolveArchive(JarRunner.class);
|
|
||||||
|
|
||||||
ClassLoader classLoader = createClassLoader(archive);
|
|
||||||
Class<?>[] classes = loadApplicationClasses(archive, classLoader);
|
|
||||||
|
|
||||||
Thread.currentThread().setContextClassLoader(classLoader);
|
|
||||||
|
|
||||||
// Use reflection to load and call Spring
|
|
||||||
Class<?> application = classLoader
|
|
||||||
.loadClass("org.springframework.boot.SpringApplication");
|
|
||||||
Method method = application.getMethod("run", Object[].class, String[].class);
|
|
||||||
method.invoke(null, classes, args);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
private static ClassLoader createClassLoader(Archive archive) throws IOException,
|
|
||||||
MalformedURLException {
|
|
||||||
List<Archive> nestedArchives = archive.getNestedArchives(new EntryFilter() {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean matches(Entry entry) {
|
|
||||||
return entry.getName().startsWith(LIB);
|
|
||||||
}
|
|
||||||
|
|
||||||
});
|
|
||||||
|
|
||||||
List<URL> urls = new ArrayList<URL>();
|
|
||||||
urls.add(archive.getUrl());
|
|
||||||
for (Archive nestedArchive : nestedArchives) {
|
|
||||||
urls.add(nestedArchive.getUrl());
|
|
||||||
}
|
|
||||||
|
|
||||||
ClassLoader classLoader = new LaunchedURLClassLoader(urls.toArray(new URL[urls
|
|
||||||
.size()]), JarRunner.class.getClassLoader());
|
|
||||||
return classLoader;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static Class<?>[] loadApplicationClasses(Archive archive,
|
|
||||||
ClassLoader classLoader) throws ClassNotFoundException, IOException {
|
|
||||||
String[] classNames = archive.getManifest().getMainAttributes()
|
|
||||||
.getValue("Application-Classes").split(",");
|
|
||||||
|
|
||||||
Class<?>[] classes = new Class<?>[classNames.length];
|
|
||||||
|
|
||||||
for (int i = 0; i < classNames.length; i++) {
|
|
||||||
Class<?> applicationClass = classLoader.loadClass(classNames[i]);
|
|
||||||
classes[i] = applicationClass;
|
|
||||||
}
|
|
||||||
return classes;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -0,0 +1,62 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2012-2014 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.cli.jar;
|
||||||
|
|
||||||
|
import java.lang.reflect.Method;
|
||||||
|
import java.net.URL;
|
||||||
|
import java.net.URLClassLoader;
|
||||||
|
import java.util.jar.Manifest;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A launcher for a CLI application that has been compiled and packaged as a jar file.
|
||||||
|
*
|
||||||
|
* @author Andy Wilkinson
|
||||||
|
* @author Phillip Webb
|
||||||
|
*/
|
||||||
|
public class PackagedSpringApplicationLauncher {
|
||||||
|
|
||||||
|
private static final String SPRING_APPLICATION_CLASS = "org.springframework.boot.SpringApplication";
|
||||||
|
|
||||||
|
private void run(String[] args) throws Exception {
|
||||||
|
URLClassLoader classLoader = (URLClassLoader) Thread.currentThread()
|
||||||
|
.getContextClassLoader();
|
||||||
|
Class<?> application = classLoader.loadClass(SPRING_APPLICATION_CLASS);
|
||||||
|
Method method = application.getMethod("run", Object[].class, String[].class);
|
||||||
|
method.invoke(null, getSources(classLoader), args);
|
||||||
|
}
|
||||||
|
|
||||||
|
private Object[] getSources(URLClassLoader classLoader) throws Exception {
|
||||||
|
URL url = classLoader.findResource("META-INF/MANIFEST.MF");
|
||||||
|
Manifest manifest = new Manifest(url.openStream());
|
||||||
|
String attribute = manifest.getMainAttributes().getValue("Application-Classes");
|
||||||
|
return loadClasses(classLoader, attribute.split(","));
|
||||||
|
}
|
||||||
|
|
||||||
|
private Class<?>[] loadClasses(ClassLoader classLoader, String[] names)
|
||||||
|
throws ClassNotFoundException {
|
||||||
|
Class<?>[] classes = new Class<?>[names.length];
|
||||||
|
for (int i = 0; i < names.length; i++) {
|
||||||
|
classes[i] = classLoader.loadClass(names[i]);
|
||||||
|
}
|
||||||
|
return classes;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void main(String[] args) throws Exception {
|
||||||
|
new PackagedSpringApplicationLauncher().run(args);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,22 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2012-2014 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.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Class that are packaged as part of CLI generated JARs.
|
||||||
|
* @see org.springframework.boot.cli.command.jar.JarCommand
|
||||||
|
*/
|
||||||
|
package org.springframework.boot.cli.jar;
|
||||||
|
|
||||||
@ -1,83 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 2012-2014 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.loader;
|
|
||||||
|
|
||||||
import java.io.File;
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.net.JarURLConnection;
|
|
||||||
import java.net.URL;
|
|
||||||
import java.net.URLConnection;
|
|
||||||
import java.security.CodeSource;
|
|
||||||
import java.security.ProtectionDomain;
|
|
||||||
|
|
||||||
import org.springframework.boot.loader.archive.Archive;
|
|
||||||
import org.springframework.boot.loader.archive.ExplodedArchive;
|
|
||||||
import org.springframework.boot.loader.archive.JarFileArchive;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Resolves the {@link Archive} from which a {@link Class} was loaded.
|
|
||||||
*
|
|
||||||
* @author Andy Wilkinson
|
|
||||||
* @author Phillip Webb
|
|
||||||
*/
|
|
||||||
public class ArchiveResolver {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Resolves the {@link Archive} that contains the given {@code clazz}.
|
|
||||||
* @param clazz The class whose containing archive is to be resolved
|
|
||||||
*
|
|
||||||
* @return The class's containing archive
|
|
||||||
* @throws IOException if an error occurs when resolving the containing archive
|
|
||||||
*/
|
|
||||||
public Archive resolveArchive(Class<?> clazz) throws IOException {
|
|
||||||
File root = resolveArchiveLocation(clazz);
|
|
||||||
return (root.isDirectory() ? new ExplodedArchive(root) : new JarFileArchive(root));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Resolves the location of the archive that contains the given {@code clazz}.
|
|
||||||
* @param clazz The class for which the location of the containing archive is to be
|
|
||||||
* resolved
|
|
||||||
*
|
|
||||||
* @return The location of the class's containing archive
|
|
||||||
* @throws IOException if an error occurs when resolving the containing archive's
|
|
||||||
* location
|
|
||||||
*/
|
|
||||||
public File resolveArchiveLocation(Class<?> clazz) throws IOException {
|
|
||||||
ProtectionDomain protectionDomain = getClass().getProtectionDomain();
|
|
||||||
CodeSource codeSource = protectionDomain.getCodeSource();
|
|
||||||
|
|
||||||
if (codeSource != null) {
|
|
||||||
File root;
|
|
||||||
URL location = codeSource.getLocation();
|
|
||||||
URLConnection connection = location.openConnection();
|
|
||||||
if (connection instanceof JarURLConnection) {
|
|
||||||
root = new File(((JarURLConnection) connection).getJarFile().getName());
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
root = new File(location.getPath());
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!root.exists()) {
|
|
||||||
throw new IllegalStateException(
|
|
||||||
"Unable to determine code source archive from " + root);
|
|
||||||
}
|
|
||||||
return root;
|
|
||||||
}
|
|
||||||
throw new IllegalStateException("Unable to determine code source archive");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue