Commit Graph

2059 Commits

Author SHA1 Message Date
Phillip Webb
e471759be8 Update README with issues information 2014-05-16 12:05:39 +01:00
Phillip Webb
7b170368e5 Require single main class
Update run tasks to ensure that only a single main class is required
when performing a class search.

See gh-886
2014-05-16 10:45:17 +01:00
Dave Syer
7c7d1f55e0 Add RequestContext to Groovy template view model 2014-05-16 09:41:50 +01:00
Dave Syer
f572992c5d Relax requirement for groovy template directory to exist
Since groovy-templates is included with groovy-all it is unreasonable
to expect anyone who has it on their classpath to have resolvable templates.
We may need to revisit this decision, but since the origain feature
that drove this was thymeleaf and idaiotic users having it on their
classpath but not using it, maybe we don't need to.
2014-05-15 22:12:27 +01:00
Dave Syer
15303a2de6 Add GroovyTemplates to autconfig 2014-05-15 18:42:44 +01:00
Dave Syer
da2e25f90d Add Groovy template engine support for Spring MVC apps
Default suffix .tpl. If groovy-templates is on the classpath user
can now add templates and get them rendered and resolved in an MVC
app.

TODO: Macro helpers for message rendering etc.

See gh-878
2014-05-15 17:42:53 +01:00
Phillip Webb
938609fdc0 Merge branch '1.0.x'
Conflicts:
	spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/CrshAutoConfiguration.java
	spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfiguration.java
2014-05-15 16:35:43 +01:00
Phillip Webb
0b4e2b3667 Polish revisted JMS support
- Add createConnectionFactory method on ActiveMQProperties
- Change getBrokerUrl to return the broker URL and add new deduce method
- Move static methods to end of class
- Apply source formatting
2014-05-15 16:32:30 +01:00
Christian Dupuis
875e77d420 Correctly decode URL coming into the Jolokia endpoint
fixes #869
2014-05-15 17:29:21 +02:00
Phillip Webb
fa7da5925b Remove checked exceptions from @PostConstructs
Update all @PostConstruct methods to ensure that they don't throw
checked exceptions. Required to allow deployment of Spring Boot
applications on Glassfish.

Fixes gh-868
2014-05-15 15:47:44 +01:00
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
2014-05-15 16:18:41 +02:00
Phillip Webb
401e2c8b6f Add codecentric Spring Batch Starter Info
Fixes gh-870
2014-05-15 15:16:15 +01:00
Phillip Webb
7227c0df5f Merge branch '1.0.x'
Conflicts:
	spring-boot-dependencies/pom.xml
2014-05-15 15:09:24 +01:00
Phillip Webb
5205ccf8c6 path->templateLoaderPath 2014-05-15 15:07:47 +01:00
Phillip Webb
08a6efff46 Update Thymeleaf dependencies
- thymeleaf-layout-dialect 1.2.4
- thymeleaf 2.1.3

Fixes gh-866
2014-05-15 15:04:04 +01:00
Dave Syer
0a11459c3e path->templateLoaderPath 2014-05-15 15:03:51 +01:00
Phillip Webb
898250431a Merge pull request #877 from brettwooldridge/master
* pull877:
  Update HikariCP version to latest.
2014-05-15 14:56:33 +01:00
Brett Wooldridge
15f38e773a Update HikariCP version to latest. 2014-05-15 14:55:40 +01:00
Phillip Webb
aaf50a768c spring.freemarker.templateLoaderPath -> path
Fixup tests and documentation following the rename of
spring.freemarker.templateLoaderPath to spring.freemarker.path
2014-05-15 14:54:14 +01:00
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)
2014-05-15 13:10:53 +01:00
Dave Syer
6a10df0933 Fix freeMarker->freemarker 2014-05-15 12:39:37 +01:00
Dave Syer
aca0d38f08 Make OnExpressionCondition package private
(consistent with the other Condition implementations)
2014-05-15 10:16:46 +01:00
Phillip Webb
a2e628a521 Merge branch '1.0.x' 2014-05-15 09:56:21 +01:00
Phillip Webb
f8c1213f0a Add baseDir to git-commit-id-plugin
Fixed gh-873
2014-05-15 09:54:43 +01:00
Phillip Webb
b5e7c89ec3 Merge branch '1.0.x' 2014-05-15 09:51:29 +01:00
Phillip Webb
01fcf61140 Polish 2014-05-15 09:51:16 +01:00
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
2014-05-15 10:36:41 +02:00
Phillip Webb
e018f2af25 Add FilterRegistrationBean.setDispatcherTypes(...)
Add setDispatcherTypes method to FilterRegistrationBean.

Fixes gh-871
2014-05-15 09:30:22 +01:00
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).
2014-05-15 09:18:38 +01:00
Stephane Nicoll
f7397f1d1c Merge pull request #874 from ShawnTuatara/patch-1
* patch-1:
  Fix wrong closing tag
2014-05-15 10:02:32 +02:00
Shawn Clark
4021ad43f7 Fix wrong closing tag
Fixes gh-874
2014-05-15 10:02:01 +02:00
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
2014-05-15 09:59:46 +02:00
Christian Dupuis
549daaefa4 Update CRaSH dependency to 1.3.0-beta20
fixes #849
2014-05-14 15:45:47 +02:00
Dave Syer
b5e608f102 Remove mention of missing starters 2014-05-14 13:42:04 +01:00
Dave Syer
c65337c872 Upgrade Reactor again 2014-05-14 13:42:04 +01:00
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
2014-05-14 13:26:11 +02:00
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.
2014-05-13 16:46:04 +01:00
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.
2014-05-13 16:46:03 +01:00
Dave Syer
85719f75e4 Add @Bean-level config properties to /configprops 2014-05-13 16:45:48 +01:00
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.
2014-05-13 16:45:48 +01:00
Dave Syer
1b284a0619 Add RelaxedDataSourceFactory 2014-05-13 16:45:48 +01:00
Christian Dupuis
9e56c38b7a Rename DefaulErrorAttributes to DefaultErrorAttributes
fixes #853
2014-05-13 17:43:28 +02:00
Christian Dupuis
d8ec2719d7 Fix RedisAutoConfiguration with pool config
fixes #850
2014-05-13 17:32:53 +02:00
Spring Buildmaster
b38601a2f2 Next development version 2014-05-12 15:28:30 -07:00
Phillip Webb
d09c557e4e Revert "Next development version"
This reverts commit 32d778e508.
2014-05-12 22:46:25 +01:00
Spring Buildmaster
32d778e508 Next development version 2014-05-12 13:40:01 -07:00
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.
2014-05-12 21:03:22 +01:00
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
2014-05-12 19:46:57 +01:00
Dave Syer
5dd77a725c Enable access log explicitly in sample 2014-05-12 10:51:47 +01:00
Andy Wilkinson
fec136e213 Merge branch '1.0.x'
Conflicts:
	spring-boot-dependencies/pom.xml
2014-05-12 10:37:06 +01:00