Commit Graph

4122 Commits (7ecbbc11f2a712d9af91c1196fa53d796979fe4e)
 

Author SHA1 Message Date
Phillip Webb 0702b4e7e3 Merge branch '1.1.x'
Conflicts:
	spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java
	spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfiguration.java
10 years ago
Phillip Webb 96d479c3d9 Make RequestMappingHandlerMapping @Primary
Update WebMvcAutoConfiguration so that the RequestMappingHandlerMapping
bean is @Primary. Prior to this commit a NoUniqueBeanDefinitionException
would be thrown then using the MvcUriComponentsBuilder.

Fixes gh-2237
10 years ago
Stephane Nicoll 79413bf9ef Merge pull request #2236 from izeye/master
* pull2236:
  Remove unecessary semicolon
10 years ago
izeye bff41358bf Remove unecessary semicolon 10 years ago
Phillip Webb 98135c964b Remove Principal handler logic from security
Update ManagementSecurityAutoConfiguration so that MVC Endpoints that
have Principal arguments are not treated in any special way. This
restores Spring Boot 1.1.x behavior where the 'sensitive' flag is used
to determine access rules.

The HealthMvcEndpoint still uses the Principal (when available) to
determine if full status information can be displayed. It now also
explicitly checks the environment for `endpoints.health.sensitive`
to determine if the user has opted-out and requires complete health
details.

The health MVC endpoint should now work as follows:

* Default configuration - No login is required, full information is only
  displayed if a Principal is available.
* endpoints.health.sensitive=true - Login is required, full information
  is displayed.
* endpoints.health.sensitive=false - Login is not required, full
  information is displayed.

Fixes gh-2211
10 years ago
Phillip Webb 22bb6f7598 Fix accidental fork logic change
Fix accidental change from commit b42c7fca.
10 years ago
Phillip Webb b42c7fca64 Polish 10 years ago
Phillip Webb 291a8d422b Fix incorrect BitronixJtaConfiguration bean name
Fixes gh-2231
10 years ago
Phillip Webb 45c5e25a05 Polish 10 years ago
Stephane Nicoll 05d47c65db Fix wrong link
Closes gh-2223
10 years ago
Stephane Nicoll 4a314321d7 Merge branch '1.1.x' 10 years ago
Stephane Nicoll ed1db855c0 Upgrade to Thymeleaf 2.1.4
Closes gh-2215
10 years ago
Domingo Suarez Torres dbb795298c Restore proper use of the fork parameter
Previously, disabling forking was not possible if JVM arguments or an
agent are specified, even if the fork attribute is explicitly set to
`false`.

The  fork attribute is now detected as it should and forking is disabled
when the fork attribute is set to false, even if JVM arguments or an
agent is either specified or discovered.

Fixes gh-2220
10 years ago
Phillip Webb 8628adcb74 Order EmbeddedServletContainerCustomizers
Add Ordered interface to all EmbeddedServletContainerCustomizers with
a value of 0. Prior to this commit it was difficult for a user to
define a customizer that would be applied before ours, even if they
implemented Ordered or added @Order annotations.

Fixes gh-2123
10 years ago
Phillip Webb ef621c9271 Protect against NoClassDefFoundError on WAS
Update HibernateJpaAutoConfiguration to catch NoClassDefFoundError when
setting the JTA_PLATFORM. The exception can occur when running on WAS
since it ships with Hibernate 4.2 and SpringJtaPlatform extends from
AbstractJtaPlatform which is not present.

The exception is now ignored if a JDNI environment is available,
otherwise it is re-thrown.

Fixes gh-2218
10 years ago
Phillip Webb fd97c7553c Apply HATEOAS module to primary ObjectMapper
Update HypermediaAutoConfiguration to apply the Jackson2HalModule to
the primary ObjectMapper. This restores the behavior of Spring Boot
1.1 where HATEOAS types could be serialized for both `application/json`
and `application/json+hal` content types.

A `spring.hateoas.apply-to-primary-object-mapper` property has also been
provided to opt-out if necessary.

Fixes gh-2147
10 years ago
Phillip Webb ea84479e9a Fix HATEOAS sample application version number 10 years ago
Phillip Webb 4ed42aac37 Merge branch '1.1.x' 10 years ago
Phillip Webb 7d017a2a6b Add HATEOAS sample application 10 years ago
Andy Wilkinson e57b0e00f2 Use ServletContainerInitializers to start servers
The Servlet spec prohibits ServletContextListeners from being registered
programatically other than from with a call to
`ServletContainerInitializer.onStartup`. This restriction is not
consistently enforced by the various embedded servlet containers that
Boot supports:

- Jetty 8 does not enforce the restriction.
- Jetty 9 enforces the restriction. We were working around it be calling
  setExendedListenerTypes(true) on the context.
- Tomcat somewhat enforces the restriction: it doesn't allow a
  ServletContextListener to be added once the first
  ServletContextListener has been called. We were using a
  LifecycleListener to drive the ServletContextListeners.
- Undertow enforces the restriction and we were not working around it.
  This resulted in gh-2192 being raised.

ServletListenerRegistrationBean is a ServletContextListener and is used
to register listeners, including ServletContextListeners, with the
servlet context. To adhere to the letter of the servlet spec this means
that ServletListenerRegistrationBeans need to be called from with
ServletContainerInitializer.onStartup. This commit updates all of the
embedded servlet container implementations to use a
ServletContainerInitializer to drive any ServletContextInitializers.

This makes the lifecycle more consistent across the supported containers
and allows ServletListenerRegistrationBeans to be able to register
ServletContextListeners on all supported embedded containers.

Fixes gh-2192
10 years ago
Phillip Webb d4fb8ad6a8 Polish POM artifact order 10 years ago
Stephane Nicoll 20c8e54c5f Revert dea1ca9855
Actually collection types are not harmonized to their interface
counterpart; this was implemented in the first proposal but wasn't
applied in the final review.

See gh-2206
10 years ago
Phillip Webb 425f989a26 Polish velocity sample POM name 10 years ago
Phillip Webb 5afd0b4858 Polish sample POM names 10 years ago
Phillip Webb 82bf60400a Fix OnPropertyCondition no havingValue message
See gh-2193
10 years ago
Phillip Webb 57442f5b12 Improve formatting of Tomcat port(s) logging
Align Tomcat logging with the recent Jetty and Undertow updates.
10 years ago
Phillip Webb d857323ff1 Improve logging of Jetty port(s)
Fixes gh-2194
10 years ago
Phillip Webb 4e5ac2c110 Log port(s) used by Undertow
Fixes gh-2195
10 years ago
Phillip Webb 1da918f388 Fix TypeNotPresentExceptionProxy error with Mongo
Update MongoAutoConfiguration so that a TypeNotPresentExceptionProxy
error is not thrown when Spring Data Mongo is not used.

Fixes gh-2196
10 years ago
Phillip Webb bfa984ccd5 Fix PersistenceExceptionTranslation INFO message
Update PersistenceExceptionTranslationAutoConfiguration so that the
PersistenceExceptionTranslation @Bean method is static.

Fixes gh-2210
10 years ago
Phillip Webb 8d12130a2b Add `exclude` attribute to @SpringBootApplication
Fixes gh-2207
10 years ago
Stephane Nicoll 0e88e1b86e Merge pull request #2203 from pauldub/master
* pull2203:
  Fix typo in howto.adoc
10 years ago
pauldub b865539adc Fix typo in howto.adoc 10 years ago
Andy Wilkinson ed0038f3c7 Merge branch '1.1.x' 10 years ago
Andy Wilkinson e72f3c0215 Upgrade to Jetty 8.1.16.v20140903
Closes gh-2199
10 years ago
Andy Wilkinson ddaec013bd Merge branch '1.1.x' 10 years ago
Andy Wilkinson 950eafe9cc Improve diagnostics when ServletContext.addListener fails
The various servlet containers that we support vary in the quality
of their diagnostics when ServletContext.addListener fails. To make
problem diagnosis easier, this commit ensures that the toString of the
the listener that was being added is included in the exception that's
thrown when a failure occurs.

Closes gh-2197
10 years ago
Stephane Nicoll 9a55cc49b5 Fix typo 10 years ago
Phillip Webb 0f3b959686 Scan full classpath with /templates checks
Update template auto configurations to search for template folders in
the entire classpath rather than just the root jar.

Fixes gh-2184
10 years ago
Phillip Webb 7e7acea548 Don't check for /templates when using groovy-all
Update GroovyTemplateAutoConfiguration so that the `/template`
folder check only occurs when the groovy-all jar is not being
used.

Fixes gh-2190
See gh-1915
10 years ago
Phillip Webb 6ad23b1cc4 Merge pull request #2113 from BigMichi1/thymleaf-conditional-comments
* thymleaf-conditional-comments:
  Auto-configure for Thymeleaf conditionalcomments
10 years ago
Michael Cramer 3b858edfa9 Auto-configure for Thymeleaf conditionalcomments
Add auto-configuration for thymeleaf-extras-conditionalcomments which
allows parsing of conditional comments for IE.

Example:

	<!--[if lt IE 8]>
		<link rel="stylesheet" th:href="@{/styleIE.css}"
		type="text/css"/>
	<![endif]-->

Without this dialect all Thymeleaf attributes are ignored inside the
comment.

Fixes gh-2113
10 years ago
Phillip Webb 5c27cba86b Merge pull request #2172 from ceefour/patch-1
* patch-1:
  Clarify SSL "How-to" documentation
10 years ago
Hendy Irawan ba97090375 Clarify SSL "How-to" documentation
Update the SSL "How-to" documentation to make it clearer that SSL
configuration replaces the usual connector.

Closes gh-2172
See gh-2167
10 years ago
Phillip Webb a663f07375 Upgrade to Jersey 2.14
Closes gh-2166
10 years ago
Phillip Webb b27d500934 Merge pull request #2179 from izeye/master
* pull2179:
  Rename SecurityPrequisite -> SecurityPrerequisite
10 years ago
izeye 3784959b6f Rename SecurityPrequisite -> SecurityPrerequisite
Closes gh-2179
10 years ago
Stephane Nicoll cdbc0c7f46 Harmonize JTA dependency
Mixing Hibernate and a JTA provider may lead to duplicate JTA
dependencies as the API is published with different coordinates.

The following has been applied:

* We now use `javax.transaction:javax.transaction-api` everywhere.
* The `data-jpa` starter has been updated to replace the JBoss JTA
  dependency with the standard one.
* The `jta-bitronix` starter has been updated to use JTA 1.2 instead of
  JTA 1.1 (unfortunately, JTA 1.1 is published with different
  coordinates).
* The `jta-atomikos` starter has been updated to define a dependency on
  JTA as the current version does not do it at all.
* The HornetQ JMS server is also relying on JTA but that dependency
  should have been optional. It has been excluded for the time being as
  it was using (yet) another set of coordinates.

Fixes gh-2092
10 years ago
Andy Wilkinson 843ee14cea Merge branch '1.1.x' 10 years ago
Andy Wilkinson 5c67e6f141 Update war layout to package custom scope dependencies in WEB-INF/lib/
Fixes gh-2187
10 years ago