Commit Graph

2099 Commits (8bcda1bcbeefc978fc48c5d73d204c1167c7d0e0)
 

Author SHA1 Message Date
Stephane Nicoll e695e5d637 Revisit JMS support
Since ActiveMQ 5.8.0, the modules structure has been revisited and
activemq-core no longer exists. The activemq-broker is required to
create an embedded broker. Since Boot creates such broker by default
if ConnectionFactory is present, a condition has been added to do so
only when the necessary classes are present in the classpath.

The default embedded broker is now configured to disable message
persistence altogether as this requires an extra jar since 5.8.0, i.e.
activemq-kahadb-store.

Split the ActiveMQ auto configuration from the JmsTemplate auto
configuration so these are totally independent.
ActiveMQAutoConfiguration has been created to detect and configure
the ActiveMQ broker if necessary.

The brokerUrl parameter was ignored as long as the inMemory parameter
was true. The actual brokerUrl to use is now determined by the user
defined values of those parameters: if the brokerUrl is set, it is always
used. If no brokerUrl is set, the value of inMemory determines if an
embedded broker should be used (true) or a tcp connection to an
existing local broker (false).

JmsTemplateAutoConfiguration now creates a JmsTemplate only if a
ConnectionFactory is available.

Fixes gh-872, gh-882, gh-883
11 years ago
Phillip Webb 401e2c8b6f Add codecentric Spring Batch Starter Info
Fixes gh-870
11 years ago
Phillip Webb 7227c0df5f Merge branch '1.0.x'
Conflicts:
	spring-boot-dependencies/pom.xml
11 years ago
Phillip Webb 5205ccf8c6 path->templateLoaderPath 11 years ago
Phillip Webb 08a6efff46 Update Thymeleaf dependencies
- thymeleaf-layout-dialect 1.2.4
- thymeleaf 2.1.3

Fixes gh-866
11 years ago
Dave Syer 0a11459c3e path->templateLoaderPath 11 years ago
Phillip Webb 898250431a Merge pull request #877 from brettwooldridge/master
* pull877:
  Update HikariCP version to latest.
11 years ago
Brett Wooldridge 15f38e773a Update HikariCP version to latest. 11 years ago
Phillip Webb aaf50a768c spring.freemarker.templateLoaderPath -> path
Fixup tests and documentation following the rename of
spring.freemarker.templateLoaderPath to spring.freemarker.path
11 years ago
Dave Syer d2112e27a3 Add FreeMarkerProperties instead of raw Environment access
It's better for readability and tooling. Changed
templateLoaderPath -> path (simpler and unlikely to clash)
11 years ago
Dave Syer 6a10df0933 Fix freeMarker->freemarker 11 years ago
Dave Syer aca0d38f08 Make OnExpressionCondition package private
(consistent with the other Condition implementations)
11 years ago
Phillip Webb a2e628a521 Merge branch '1.0.x' 11 years ago
Phillip Webb f8c1213f0a Add baseDir to git-commit-id-plugin
Fixed gh-873
11 years ago
Phillip Webb b5e7c89ec3 Merge branch '1.0.x' 11 years ago
Phillip Webb 01fcf61140 Polish 11 years ago
Stephane Nicoll 158b6a5c07 Skip the execution of repackage in parent projects
If an execution of the repackage goal is present in a project with
'pom' packaging, it is now skipped. This allows to configure the
plugin in the parent.

Fixes gh-867
11 years ago
Phillip Webb e018f2af25 Add FilterRegistrationBean.setDispatcherTypes(...)
Add setDispatcherTypes method to FilterRegistrationBean.

Fixes gh-871
11 years ago
Dave Syer 7454c4866b Support for @ConfigurationProperties in JPA
Adds JpaProperties to bind to spring.jpa.* (making those
properties easier to reason about and visible in the
/configprops endpoint).

Also allows easy configuration of multiple EntityManagerFactories via new
EntityManagerFactoryBuilder. JpaBaseConfiguration has a @Bean of that type
so users can inject it to create new or additional EntityManagerFactories.
This also simplifies the Hibernate autoconfiguration.

Also renames the DataSourceFactory to DataSourceBuilder (since that's what it
is).
11 years ago
Stephane Nicoll f7397f1d1c Merge pull request #874 from ShawnTuatara/patch-1
* patch-1:
  Fix wrong closing tag
11 years ago
Shawn Clark 4021ad43f7 Fix wrong closing tag
Fixes gh-874
11 years ago
Stephane Nicoll dacad22fd3 Fix jvmArgs usage example
The  configuration within an execution is only applied when that
particular execution is invoked as part of the build. It is not
applied when the plugin is invoked on the command line (i.e.
mvn spring-boot:run).

This commit clarifies the situation so that users can safely copy/paste
those bits and get the expected behavior.

 Fixes gh-875
11 years ago
Christian Dupuis 549daaefa4 Update CRaSH dependency to 1.3.0-beta20
fixes #849
11 years ago
Dave Syer b5e608f102 Remove mention of missing starters 11 years ago
Dave Syer c65337c872 Upgrade Reactor again 11 years ago
Stephane Nicoll a93784207e Add jvmArguments property to maven plugin
The maven plugin now forks a new process when it starts a boot app. This
makes remote debugging of the app impossible without the ability to pass
extra JVM arguments.

This commit adds a "jvmArguments" attribute to the RunMojo that defines
additional JVM arguments to set on the forked process.

Fixes gh-848
11 years ago
Dave Syer 5249f54c5a Integrate @ConfigurationProperties @Beans with DataSource configuration
We now have a much simpler DataSourceAutoConfiguration that binds to whatever
DataSource concrete type it finds at runtime. To be able to quickly switch between
Hikari and the other types of DataSource there's a minute shim for translating
the common properties (username, password, url, driverClassName), but actually
only url is different. The shim and also DataSource initialization is supported
through DataSourceProperties, but the other native properties get bound directly
through the concrete runtime type of the DataSource.

The /configprops endpoint works (and is exposed in the actuator sample).

Fixes gh-840, fixes gh-477, see also gh-808.
11 years ago
Dave Syer 660b73b5c6 Ensure only bindable properties are reported in /configprops
Introspects the properties that are being exposed in the report
and only renders the ones that are a) convertible from String
and b) have a setter. That goes a long way to making it a bullet
proof generic renderer of any Java object that can be bound with
@ConfigurationProperties.
11 years ago
Dave Syer 85719f75e4 Add @Bean-level config properties to /configprops 11 years ago
Dave Syer 0d27ce4850 Enable @ConfigurationProperties on a @Bean definition
This allows multiple beans of the same type to be bound with
different prefixes. As a side effect you get default binding
if the bean class is itself @ConfigurationProperties.
11 years ago
Dave Syer 1b284a0619 Add RelaxedDataSourceFactory 11 years ago
Christian Dupuis 9e56c38b7a Rename DefaulErrorAttributes to DefaultErrorAttributes
fixes #853
11 years ago
Christian Dupuis d8ec2719d7 Fix RedisAutoConfiguration with pool config
fixes #850
11 years ago
Spring Buildmaster b38601a2f2 Next development version 11 years ago
Phillip Webb d09c557e4e Revert "Next development version"
This reverts commit 32d778e508.
11 years ago
Spring Buildmaster 32d778e508 Next development version 11 years ago
Phillip Webb af26a84a8f Use reactor 1.1.0.RELEASE rather than SNAPSHOT
Downgrade from 1.1.1.BUILD-SNAPSHOT to 1.1.0.RELEASE in order to
satisfy enforced release requirements.
11 years ago
Phillip Webb 30ac768cbf Remove @ControllerAdvice from BasicErrorController
Update the BasicErrorController so that it no longer needs to implement
@ControllerAdvice or have an @ExceptionHandler method.

A new ErrorAttributes interface is now used to obtain error details,
the DefaultErrorAttributes implementation uses a
HandlerExceptionResolver to obtain root exception details if the
`javax.servlet.error.*` attributes are missing.

This change also removes the need for the extract(...) method on
ErrorController as classes such as WebRequestTraceFilter can
now use the ErrorAttributes interface directly.

See gh-839, gh-538
Fixes gh-843
11 years ago
Dave Syer 5dd77a725c Enable access log explicitly in sample 11 years ago
Andy Wilkinson fec136e213 Merge branch '1.0.x'
Conflicts:
	spring-boot-dependencies/pom.xml
11 years ago
Andy Wilkinson f761daf253 Upgrade to CRaSH 1.3.0-beta18
Closes #841
11 years ago
Dave Syer 59a899a4da Add @ResponseStatus handler to global exception handler
We might need to revisit this to allow more fine-grained
control by users, but it seems like a sensible default.
The BasicErrorController now uses both of the deafult strategies
(ResponseStatusExceptionResolver and DefaultHandlerExceptionResolver)
from Spring MVC to try and determine an appropriate response.

Fixes gh-839
11 years ago
Lukasz Kryger e7484c66f5 Registering PID file to be deleted on JVM exit 11 years ago
Phillip Webb 61221f84a9 Remove Spring Security BOM
Temporarily remove the Spring Security BOM import as version numbers
for the imported projects don't automatically get resolved by the
gradle plugin.

See gh-838
11 years ago
Phillip Webb 61232395d8 Fixup versions 11 years ago
Phillip Webb 57eec8ccaa Update boot version in other build samples
Add replace goals to update the Spring Boot version in the gradle and
ant samples during the release process.

Fixes gh-425
11 years ago
Phillip Webb af3fb7f080 Fix maven warnings
Fix maven warnings caused by missing version information on the
root POM.
11 years ago
Phillip Webb cba1218f12 Merge pull request #837 from kryger/_data-platform
* _data-platform:
  Read data-{platform}.sql in addition to data.sql
11 years ago
Lukasz Kryger 254b175c0a Read data-{platform}.sql in addition to data.sql
Update DataSourceAutoConfiguration to read platform specific `data.sql`
files in the same way as `schema.sql` files.

Fixes gh-837
11 years ago
Phillip Webb bd38893f55 Rename rabbitHealthIndicator bean
Rename the rabbitHealthIndicator bean which was accidentally named
redisHealthIndicator.
11 years ago