Commit Graph

49447 Commits

Author SHA1 Message Date
Phillip Webb
fbc68fe145 Tweak EmbeddedServletContainerCustomizer javadoc
Make it a little clearer that a
EmbeddedServletContainerCustomizerBeanPostProcessor is usually involved.

Issue: #53029445
2013-07-10 09:02:04 -07:00
Dave Syer
d260fa6456 [bs-173] Upgrade Thymeleaf layout dialect
[Fixes #52629385]
2013-07-10 11:10:15 +01:00
Dave Syer
a119e2388b Add useful stuff back to startes parent pom 2013-07-10 10:44:38 +01:00
Phillip Webb
324abe88b4 Support running executable-jars exploded
Allow the Launcher to detect ans run exploded (unpacked) jar/war files.
This change is primarily driven by the fact that Cloud Foundry will
unpack uploaded files.

Issue: #53066255
2013-07-09 16:38:32 -07:00
Phillip Webb
3ba700a861 Revert accidentally changed logging.properties 2013-07-09 13:15:43 -07:00
Dave Syer
5b78ebe6e3 Add plugin repos to bootstrap profile 2013-07-09 10:22:42 +01:00
Dave Syer
30802e542f Fix intergration tests spelling 2013-07-09 10:16:39 +01:00
Phillip Webb
02ae46d40e Further attempt to fix CI log test failures 2013-07-08 21:35:00 -07:00
Phillip Webb
83d3b508a8 Revert "@Ignore logging tests that fail on CI"
This reverts commit 2630aa732f.
2013-07-08 20:27:40 -07:00
Phillip Webb
b81dff9214 Increase integration test timeout
Increase time for CLI integration tests to account for @Grab downloads.
2013-07-08 19:32:33 -07:00
Phillip Webb
dbd29f36ec Protect against malformed logging.config
Ensure that any user specified logging.config exists. Required for
CI build as bamboo sets a "LOGGING_CONFIG" environment variable.
2013-07-08 19:30:34 -07:00
Phillip Webb
2630aa732f @Ignore logging tests that fail on CI 2013-07-08 17:56:23 -07:00
Phillip Webb
abad5aa8e4 Attempt to fix logging tests that fail in CI 2013-07-08 17:45:27 -07:00
Phillip Webb
c52972ceec Polish 2013-07-08 16:38:15 -07:00
Phillip Webb
dcd120c477 Merge branch 'zero-restructure'
* zero-restructure:
  Package restructure
  Further maven module restructure
  Polish and fix sonar warnings
  Minor pom tweaks
  Add structure 101 project
  Remove servet/filter class tangle
  Restructure autoconfigure project
  Remove tangles from core + minor polish
  Restructure packages
  Minor change to code formatting
  Move @AssertMissingBean to tests
  Polish Javadoc
  Restructure 'bootstrap' to use 'zero'
  Source formatting and clean-up
  Restructure projects layout
2013-07-08 13:45:30 -07:00
Phillip Webb
0b863611d9 Package restructure 2013-07-08 13:42:46 -07:00
Phillip Webb
cd51f357a3 Further maven module restructure 2013-07-08 13:42:44 -07:00
Phillip Webb
9fde0a3715 Polish and fix sonar warnings 2013-07-08 13:42:42 -07:00
Phillip Webb
346a0bace7 Minor pom tweaks
Fix warnings and include sonar support.
2013-07-08 13:42:42 -07:00
Phillip Webb
f4cab8aaf7 Add structure 101 project 2013-07-08 13:42:42 -07:00
Phillip Webb
4e15d705aa Remove servet/filter class tangle
Remove class tangle between ServletRegistrationBean and
FilterRegistrationBean.
2013-07-08 13:42:42 -07:00
Phillip Webb
beef5ab177 Restructure autoconfigure project 2013-07-08 13:42:42 -07:00
Phillip Webb
b838dc5422 Remove tangles from core + minor polish 2013-07-08 13:42:41 -07:00
Phillip Webb
2c05e9f150 Restructure packages 2013-07-08 13:42:41 -07:00
Phillip Webb
764a0a9af8 Minor change to code formatting 2013-07-08 13:42:41 -07:00
Phillip Webb
a6341dc0af Move @AssertMissingBean to tests
Use @AssertMissingBean only for tests.
2013-07-08 13:42:41 -07:00
Phillip Webb
d91e802139 Polish Javadoc 2013-07-08 13:42:41 -07:00
Phillip Webb
261955c50b Restructure 'bootstrap' to use 'zero' 2013-07-08 13:42:41 -07:00
Phillip Webb
d039822064 Source formatting and clean-up 2013-07-08 13:42:39 -07:00
Phillip Webb
40bf334871 Restructure projects layout 2013-07-08 13:42:39 -07:00
Dave Syer
3996353e35 Make logging config come after config file
...otherwise you can't control the log configuration from
application.properties.
2013-07-08 12:32:32 +01:00
Phillip Webb
618358287a Read artifact descriptor before resolve
Call repositorySystem.readArtifactDescriptor before resolving
launcher dependencies. This change allows remote snapshot dependencies
that are not in the local repo to be downloaded.

Issue: #52901751
2013-07-05 10:13:48 -07:00
Dave Syer
7e579d3652 Revert strange looking DataSource chamge 2013-07-05 12:03:58 +01:00
Phillip Webb
510e16a809 Don't consider system ClassLoader in Tomcat
Modify TomcatEmbeddedServletContainerFactory to ensure that the
system ClassLoader is not considered when loading classes.

This is required to fix issues when working with executable JARs
created with the maven plugin.
2013-07-04 22:37:58 -07:00
Phillip Webb
1dbafae748 Support reading entries without trailing '/'
Update RandomAccessJarFile entries when the name is specified without
a trailing '/'
2013-07-04 22:22:16 -07:00
Phillip Webb
f00eed4b07 Add specific plexus-utils dependency
Add specific plexus-utils dependency in an attempt to fix a
NoSuchMethodError that occurs with some builds.
2013-07-01 09:31:31 -07:00
Dave Syer
d9cc7575c3 Fixes for Security snapshot changes 2013-07-01 15:25:53 +01:00
Dave Syer
f3cb6d46ce Add test for Spring integration tests 2013-07-01 09:14:52 +01:00
Phillip Webb
56bfa30b2c Add setup profile
Add a setup profile allowing the maven plugin to be build alone.
Required to prevent 'unresolveable build extension' errors on a
fresh checkout.

Issue: #52091115
2013-06-20 17:24:47 -07:00
Phillip Webb
51f312f77d Merge pull request #6 from gregturn/BS-157
# By Greg Turnquist
* BS-157:
  Add MultipartAutoConfigure to spring.factories
2013-06-20 15:29:09 -07:00
Greg Turnquist
db05637e06 Add MultipartAutoConfigure to spring.factories
Update META-INF/spring.factories to include MultipartAutoConfigure.
Also tweaked the class @Conditionals and Javadoc.

Issue: BS-157
2013-06-20 15:29:03 -07:00
Phillip Webb
665d07ad74 Migrate to bootstrap maven plugin
Migrate certain samples to make use of the new bootstrap maven plugin

Issue: #52091115
2013-06-20 14:46:50 -07:00
Phillip Webb
19b392bb3d Develop bootstrap maven plugin
Develop a maven plugin that can be used to package executable jar/war
archives. The plugin is intended to be used as a drop-in replacement
for the standard maven-jar-plugin. To use the plugin declare it with
<extensions>true</extensions> then set the project type to
'executable-jar' or 'executable-war'.

Configuration options for 'executable-war' generation are intentionally
much more limited then the standard maven-war-plugin (for example
overlays are not supported). It is anticipated that builds requiring
complex configuration will continue to use the standard plugin in
combination with a custom assembly.

Issue: #52091115
2013-06-20 14:36:11 -07:00
Phillip Webb
898bfe82bb Minor tweaks to code formatting 2013-06-17 20:27:26 -07:00
Phillip Webb
13d2422f19 Merge pull request #5 from gregturn/BS-162
# By Greg Turnquist
* BS-162:
  Tune expected exceptions to support more platforms
2013-06-17 18:53:26 -07:00
Greg Turnquist
9ab2f98df0 Tune expected exceptions to support more platforms
It appears that some machines break when looking for ConnectionException,
but not SocketException, both of which are IOExceptions. This seems to make
tests pass on more machines without compromising the intentions of the API.

[BS-162]
2013-06-17 18:44:10 -07:00
Phillip Webb
19c2a076c2 Merge pull request #4 from gregturn/BS-157
# By Greg Turnquist
* BS-157:
  [BS-157] Fix misnamed method
2013-06-17 10:36:04 -07:00
Greg Turnquist
f8c20919f9 [BS-157] Fix misnamed method
Fix typo in EmbeddedServletContainerFactory.
e enter the commit message for your changes. Lines starting
2013-06-17 10:33:27 -07:00
Phillip Webb
018231d20a Polish 2013-06-17 10:29:44 -07:00
Dave Syer
7bf3e35249 Remove some try/catch blocks from test methods 2013-06-15 07:29:31 +01:00