Commit Graph

49265 Commits

Author SHA1 Message Date
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
Greg Turnquist
4b1c58d736 [BS-157] Add MultipartConfig support
Use Servlet 3.0 features to autodetect a MultipartConfigElement and
hence autowire multipart support in the servlet container.
2013-06-15 07:23:28 +01:00
Dave Syer
1f17ac3e34 Add some security managed dependencies 2013-06-14 15:32:47 +01:00
Gonçalo Silva and Scott Andrews
ed513ee846 Fix compile dependency on commons-logging 2013-06-14 15:20:42 +01:00
Dave Syer
697c210155 Add cacheable switch to Thymeleaf template resolver
User can set spring.template.cache=false to change the behaviour
2013-06-13 13:46:21 +01:00
Dave Syer
e1bac589fb Use available Converters for @ConfigurationProperties binding 2013-06-13 06:54:11 +01:00
Phillip Webb
002c4e0ff4 Add security starter pom 2013-06-12 17:36:14 -07:00
Phillip Webb
5ce220b51c Add Jackson 2 to web starter 2013-06-12 15:47:45 -07:00
Phillip Webb
9782747027 Use SpringZero Banner 2013-06-12 15:46:20 -07:00
Phillip Webb
8c347fc99b Numerous changes to actuator
Numerous changes to the actuator project, including:
- Specific Endpoint interface
- Spring MVC/Enpoint adapter
- Management server context changes
- Consistent auto-configuration class naming
- Auto-configuration ordering
- Javadoc, code formatting and tests
2013-06-12 15:42:56 -07:00
Phillip Webb
dd69d0f660 Polish and Fixup
Polish and fixup:
- Ordered auto-configuration
- @ConditionalOnBean default on @Bean methods
- Improved separation of auto-configure classes
- Consistent naming
- Javadoc, code formatting and tests
2013-06-12 15:42:55 -07:00
Phillip Webb
2f84df66b6 Always store @ComponentScan details
Refactor JpaComponentScanDetector to a more general use utility and
ensure that details are always stored.
2013-06-12 15:42:55 -07:00
Phillip Webb
b572d98cbf Support ordering of auto-configuration classes
Update EnableAutoConfigurationImportSelector to sort auto-configuration
classes based on @Order and @AutoConfigureAfter annotations.
2013-06-12 15:42:55 -07:00
Phillip Webb
3536fc68f5 Update On(Missing)Bean Condition logic
Update OnBeanCondition and OnMissingBeanCondition to work better
with @Configuration classes and to support an optional considerHierarchy
annotation value.

The class value for conditions can now also be inferred when used on
@Bean methods.
2013-06-12 15:42:55 -07:00
Phillip Webb
7d7dc5107d Use Spring 4.0 snapshot 2013-06-12 15:42:55 -07:00
Phillip Webb
ced99ff18c Polish pom.xml
Polish pom.xml formatting and pull version numbers into parent pom
when possible.
2013-06-12 15:42:55 -07:00
Phillip Webb
6a2f36a68a Obtain ServletContextInitializer beans later
Update EmbeddedWebApplicationContext to obtain ServletContextInitializer
beans after self initialization. Allows @Configuration beans to be
ServletContextAware.
2013-06-12 15:42:54 -07:00
Dave Syer
4923717524 Fix for Security snapshots 2013-06-12 05:59:50 +01:00
Dave Syer
b761fa8ede Add tomcat starter and tweak spring CLI 2013-06-12 04:37:14 +01:00
Dave Syer
20cce0c69c [bs-52] Added support for SpringApplication in a ServletContextInitializer
WAR applications should extend SpringServletInitializer to take advantage
of Servlet 3.0 initialization and SpringApplication context loading features.

[#48386505] [bs-52] Support for running "traditional" webapps in place
2013-06-11 07:40:33 +01:00
Dave Syer
7bd1aeb514 Add global properties for versions 2013-06-07 14:14:22 +01:00
Dave Syer
4ee6a90edd [bs-148] Add /env endpoint for Spring Environment
Any enumerable property source is enumerated.  Plus all
properties are available through /env/{name}.

[Fixes #51141441]
2013-06-07 13:29:35 +01:00
Dave Syer
6c5f9a5961 [bs-150] Add HTML error page to Actuator UI apps
The ErrorEndpoint now handles text/html requests differently, delegating
to a View named "error". This view will not exist by default so the user
will see an ugly 500 error, but it's easy to fix and there isn't a good
to provide a default.

[Fixes #51214943]
2013-06-07 12:46:04 +01:00
Dave Syer
7ca2a18ab9 [bs-138] Add explicit @Order to auto security filter
Now users can provide a fallback filter with default @Order
and it won't affect the operation of the default secure endpoints.

[Fixes #50721675]
2013-06-07 09:11:10 +01:00
Dave Syer
a7ea0f643a Updates for Spring Security snapshots 2013-06-07 07:29:54 +01:00
Dave Syer
e011312c68 [bs-138] Make it easy to secure only the management endpoints
Example: web UI with publicly available static assets

    # application.properties:
    security.ignored: /css/**,/script/**

Example: web UI with publicly available everything, but secure
management endpoints.

    # application.properties:
    # Empty path for basic security (default is /**)
    security.basic.path=

[Fixes #50721675]
2013-06-06 22:10:20 +01:00
Dave Syer
7b0ec252dd Revert to Spring 4.0.0.M1 2013-06-05 09:31:15 +01:00
Dave Syer
fc021fc86a Some javadocs 2013-06-05 06:58:35 +01:00
Dave Syer
e60efc7e55 [bs-17], [bs-146] Add some ApplicationContextInitializers
* One for Cloud Foundry and one for the application context ID
* If app runs in Cloud Foundry vcap.application.* and vcap.services.*
will be populated in the Environment
* The ApplicationContext ID is set to something supposedly unique
(e.g. name:index in a Cloud Foundry app)

[#50968415] [#48153639]
2013-06-04 16:33:20 +01:00
Dave Syer
e0d7fc2240 Tweaks to config file intializer 2013-06-04 10:51:11 +01:00
Phillip Webb
9cf33c33fa [bs-52] Allow war files to run in place
Update RandomAccessJarFile to work around EOFExceptio on JDK 6

[#48386505] [bs-52] Support for running "traditional" webapps in place
2013-06-03 22:03:49 -07:00
Dave Syer
a6c03e72e6 [bs-138] Add categories (secure,open) to EndpointsProperties 2013-06-03 09:48:40 +01:00
Dave Syer
c99d7a0a09 Use ResourceLoader from condition context if avilable 2013-06-03 09:41:15 +01:00