diff --git a/spring-bootstrap-launcher/pom.xml b/spring-bootstrap-launcher/pom.xml index 65c7f80114..46b19cce48 100644 --- a/spring-bootstrap-launcher/pom.xml +++ b/spring-bootstrap-launcher/pom.xml @@ -8,12 +8,4 @@ spring-bootstrap-launcher jar - - - org.apache.maven.plugins - maven-assembly-plugin - 2.4 - maven-plugin - - diff --git a/spring-bootstrap-launcher/src/main/java/org/springframework/bootstrap/launcher/Launcher.java b/spring-bootstrap-launcher/src/main/java/org/springframework/bootstrap/launcher/Launcher.java index 6ada0196af..101cb4b2cc 100644 --- a/spring-bootstrap-launcher/src/main/java/org/springframework/bootstrap/launcher/Launcher.java +++ b/spring-bootstrap-launcher/src/main/java/org/springframework/bootstrap/launcher/Launcher.java @@ -26,6 +26,7 @@ import java.util.ArrayList; import java.util.Enumeration; import java.util.List; import java.util.jar.JarEntry; +import java.util.logging.Logger; import org.springframework.bootstrap.launcher.jar.RandomAccessJarFile; @@ -37,6 +38,8 @@ import org.springframework.bootstrap.launcher.jar.RandomAccessJarFile; */ public abstract class Launcher { + private Logger logger = Logger.getLogger(Launcher.class.getName()); + /** * The main runner class. This must be loaded by the created ClassLoader so cannot be * directly referenced. @@ -93,10 +96,12 @@ public abstract class Launcher { Enumeration jarEntries = jarFile.entries(); while (jarEntries.hasMoreElements()) { JarEntry jarEntry = jarEntries.nextElement(); + this.logger.fine("Adding: " + jarEntry.getName()); if (isNestedJarFile(jarEntry)) { lib.add(jarFile.getNestedJarFile(jarEntry)); } } + this.logger.fine("Done"); postProcessLib(jarFile, lib); ClassLoader classLoader = createClassLoader(lib); launch(args, jarFile, classLoader); diff --git a/spring-bootstrap-samples/spring-bootstrap-trad-sample/pom.xml b/spring-bootstrap-samples/spring-bootstrap-trad-sample/pom.xml index 9b1bf202e8..ff254ddd49 100644 --- a/spring-bootstrap-samples/spring-bootstrap-trad-sample/pom.xml +++ b/spring-bootstrap-samples/spring-bootstrap-trad-sample/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 org.springframework.bootstrap @@ -85,7 +86,7 @@ exec-maven-plugin true - ${start-class} + ${start-class} @@ -114,9 +115,52 @@ org.apache.maven.plugins maven-war-plugin + + + org.springframework.bootstrap.launcher.WarLauncher + + + org.springframework.bootstrap.sample.trad.TradBootstrapApplication + + false + + org.apache.maven.plugins + maven-dependency-plugin + + + unpack + prepare-package + + unpack + + + + + ${project.groupId} + spring-bootstrap-launcher + ${project.version} + jar + + + ${project.build.directory}/${project.artifactId}-${project.version} + + + + copy + prepare-package + + copy-dependencies + + + provided + ${project.build.directory}/${project.artifactId}-${project.version}/WEB-INF/lib-provided + + + +