Commit Graph

45 Commits (3cee783d7b4aa3a4015df072745039c77fae2672)

Author SHA1 Message Date
Spring Buildmaster 67fa63d0e3 Next Development Version 6 years ago
Spring Buildmaster ca3a864565 Next Development Version 6 years ago
Andy Wilkinson 79c53de30c Merge branch '1.4.x' into 1.5.x 6 years ago
Spring Operator 4e2739eceb Use HTTPS for external links from XML files where possible
See gh-16312
6 years ago
Andy Wilkinson 4b6bddd476 Merge branch '1.4.x' into 1.5.x 6 years ago
Andy Wilkinson 6920c39349 Merge branch '1.3.x' into 1.4.x 6 years ago
Spring Operator 991ba550d3 Update build and setup configuration to use HTTPS
See gh-16245
6 years ago
Spring Operator e2837843e1 Update build and setup configuration to use HTTPS
See gh-16244
6 years ago
Spring Buildmaster b04710d744 Next development version 6 years ago
Spring Buildmaster 9bb64a3493 Next Development Version 6 years ago
Spring Buildmaster 4d24feb443 Next development version 6 years ago
Spring Buildmaster 46df506b0a Next development version 6 years ago
Phillip Webb 9543fcf44d Upgrade to spring-javaformat 0.0.6 6 years ago
Spring Buildmaster 73bf744cb0 Next Development Version 6 years ago
Spring Buildmaster 36b8639853 Next Development Version 7 years ago
Spring Buildmaster 010b4fccbd Next development version 7 years ago
Phillip Webb 99dad81e9a Update copyright header year for changed files 7 years ago
Phillip Webb 3ee777e142 Polish ternary expressions
Consistently format ternary expressions and always favor `!=` as the
the check.
7 years ago
Andy Wilkinson a29a70d2f4 Fix handling of static resource jar paths containing a +
Closes gh-12942
7 years ago
Spring Buildmaster c10aad165f Next Development Version 7 years ago
Spring Buildmaster ade4760842 Next Development Version 7 years ago
Andy Wilkinson 88423c504b Polish "Fix handling of static resource jars with spaces in their paths"
Closes gh-11991
7 years ago
Spring Buildmaster 6414b42335 Next Development Version 7 years ago
Sylwester Lachiewicz 7224d35322 Fix typo in StringUtils import
Closes gh-11189
7 years ago
Spring Buildmaster df2ae7aa19 Next Development Version 7 years ago
Spring Buildmaster c0f9f64776 Next Development Version 7 years ago
Spring Buildmaster 30eb937a83 Next Development Version 7 years ago
Spring Buildmaster 17a5bb0be4 Next development version 7 years ago
Spring Buildmaster 41c5c0e7c9 Next development version 7 years ago
Spring Buildmaster 05d4d0281c Next Development Version 8 years ago
Spring Buildmaster 88e43c8421 Next Development Version 8 years ago
Spring Buildmaster 9768b0a8c2 Next Development Version 8 years ago
Spring Buildmaster d719d2cbbc Next Development Version 8 years ago
Andy Wilkinson 17062f9589 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 2ddcf0e831 Avoid using File.renameTo(File) as it doesn't work on Windows 8 years ago
Andy Wilkinson 50c0204f2d Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson d32c3a7f43 Correct the URL that's called to test servlet context resources
See gh-8299
Closes gh-8525
8 years ago
Andy Wilkinson 1395f38ee7 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson a2cf0455fd Fix static resource handling when run in IDE or using Maven or Gradle
The changes made for gh-8299 attempted to make static resource
handling consistent across Jetty, Tomcat, and Undertow. They did so
for application's launched using JarLauncher or WarLauncher but did
not consider application's launched in an IDE or using spring-boot:run
in Maven or bootRun in Gradle.

Running in an IDE or via Maven or Gradle introduces two new
resource locations:

 - Jars on the classpath with file protocol URLs (they are always
   jar protocol URLs when using either launcher)
 - Directories on the classpath from a project that is depended upon
   and contains resources in META-INF/resources

This commit updates the factories for all three containers to handle
these new resources locations. The integration tests have also been
updated.
8 years ago
Spring Buildmaster d23fa24340 Next Development Version 8 years ago
Spring Buildmaster 2a83e80a9b Next Development Version 8 years ago
Phillip Webb f1012c104a Polish 8 years ago
Phillip Webb 987b6c956e Polish 8 years ago
Andy Wilkinson 68af831059 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson b443b745fb Make static resource handling consistent across embedded containers
Previously, there were a number of inconsistencies in the embedded
containers' handling of static resources. The Servlet spec requires
that static resources can be served from the META-INF/resources/
directory of jars nested inside a war in WEB-INF/lib/. The intention
was also to extend this to cover jar packaging when jars are nested in
BOOT-INF/lib/. This worked when using Tomcat as long as Jasper was on
the classpath. If you didn't have Jasper on the classpath or you
were using Jetty or Undertow it did not work.

This commit updates the configuration of embedded Jetty, Tomcat, and
Undertow so that all three containers handle static resources in the
same way, serving them from jars in WEB-INF/lib/ or /BOOT-INF/lib/.
Numerous intergration tests have been added to verify the behaviour,
including tests for Tomcat 8.0 and 7.0 which is supported in addition
to the default 8.5.x. Note that static resource handling only works
with Jetty 9.3.x and 9.2 and earlier does not support nested jars (
see https://github.com/eclipse/jetty.project/issues/518 for details).

Closes gh-8299
8 years ago