From c973847d1f744ae76d0d732d57c31f49c567d0cc Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Tue, 18 Feb 2014 13:07:22 +0000 Subject: [PATCH] Revert change that breaks tests in werid way --- .../embedded/AbstractEmbeddedServletContainerFactory.java | 8 ++------ .../jetty/JettyEmbeddedServletContainerFactory.java | 7 +------ 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactory.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactory.java index 21619ea157..72916108dd 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactory.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactory.java @@ -304,7 +304,7 @@ public abstract class AbstractEmbeddedServletContainerFactory implements // Or maybe there is a document root in a well-known location file = file != null ? file : getCommonDocumentRoot(); if (file == null && this.logger.isWarnEnabled()) { - this.logger.info("None of the document roots " + this.logger.debug("None of the document roots " + Arrays.asList(COMMON_DOC_ROOTS) + " point to a directory and will be ignored."); } @@ -340,11 +340,7 @@ public abstract class AbstractEmbeddedServletContainerFactory implements } private File getWarFileDocumentRoot() { - File file = getArchiveFileDocumentRoot(".war"); - if (file != null) { - return file; - } - return getArchiveFileDocumentRoot(".jar"); + return getArchiveFileDocumentRoot(".war"); } private File getCommonDocumentRoot() { diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java index d470e096a6..829299b917 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java @@ -131,12 +131,7 @@ public class JettyEmbeddedServletContainerFactory extends File root = getValidDocumentRoot(); if (root != null) { try { - if (!root.isDirectory()) { - handler.setBaseResource(Resource.newClassPathResource("")); - } - else { - handler.setBaseResource(Resource.newResource(root)); - } + handler.setBaseResource(Resource.newResource(root)); } catch (Exception ex) { throw new IllegalStateException(ex);