Commit Graph

1644 Commits

Author SHA1 Message Date
Spring Buildmaster
3129f10d3f Next development version 2014-03-21 12:36:16 -07:00
Phillip Webb
9d0ac86887 Polish 2014-03-21 11:38:46 -07:00
Phillip Webb
03667c7ddc Rename a few setup methods to configure
Fixes gh-537
2014-03-21 11:25:31 -07:00
Phillip Webb
701bb6ee0a Merge pull request #535 from stringy05/multiple-tomcat-connectors
* multiple-tomcat-connectors:
  Allow multiple connectors with Tomcat
2014-03-21 11:10:40 -07:00
brockwmills
8b77a0298f Allow multiple connectors with Tomcat
Update TomcatEmbeddedServletContainerFactory to allow for additional
containers (e.g. SSL or AJP in addition to HTTP).

Fixes gh-528
2014-03-21 11:10:11 -07:00
Dave Syer
48636e3d6e Add additional grouping of property sources by profile
Before this change the PropertySources loaded from external config
files were just added to the list for resolution in the order that
they were loaded. That worked for simple cases, but when there are
profiles active, and files themselves can activate profiles, it led
to users not being able to change default settings easily (either
on command line or in files, mostly in files).

The solution proposed here is to group PropertySources by profile
and resolve them in order of profile first, and then in order of
the files being loaded.

There are additional shenanigans because the order of the files
being loaded also has to be carefully defined. The rule for users
is that in a list of files to load (e.g. if set via
spring.config.location), the last one wins (natural if you think of
it as a merge of multiple maps). In addition, anything specified
by a user takes precedence over the defaults (which was broken in
some scenarios before).

Additionally, fixes profile ordering in @ConfigurationProperties(path=...)

Fixes gh-483
2014-03-21 17:01:43 +00:00
Phillip Webb
84cc110344 Remove logging from spring-boot-starter-test
Fixes gh-541
2014-03-21 09:33:14 -07:00
Phillip Webb
47eb8180b3 Rename spring-boot-starter-shell -> remote-shell
Fixes gh-462
2014-03-21 09:05:56 -07:00
Phillip Webb
8c0703ad9c Spaces -> Tabs 2014-03-21 09:02:08 -07:00
Christian Dupuis
3cd70b1c19 Fix last polish so that login.groovy is valid groovy code again 2014-03-21 11:38:08 +01:00
Phillip Webb
5ab88b2344 Automatically add schedule annotation imports 2014-03-20 16:30:34 -07:00
Phillip Webb
3193913899 Polish 2014-03-20 09:08:09 -07:00
Dave Syer
63de33ef3e Add further test for activating profiles
The new test asserts that a profile defined in one profile can be
switched off in another. Seems to work.

More gh-483
2014-03-20 15:57:34 +00:00
Christian Dupuis
d08d98492d Add Environment to shell context; disable shell banner if spring.main.show_banner is set to false 2014-03-20 15:23:24 +01:00
Christian Dupuis
99e6503a07 Some polish to the endpoint command 2014-03-20 14:52:14 +01:00
Christian Dupuis
99d6af6cbb Properly serialise output of endpoint command 2014-03-20 11:20:26 +01:00
Christian Dupuis
b760722234 Add endpoint command to shell
fixex #461
2014-03-20 11:05:27 +01:00
Phillip Webb
a79ff19b00 Replace confusing '+' profile syntax.
Replace the confusing `spring.profiles.active` `+` syntax with a new
`spring.profiles.include` property.

Fixes gh-483, Fixes gh-534
2014-03-20 08:27:18 +00:00
Chris Savory
7be2d97d49 Allow multiple MessageSources that are comma separated.
Fixes gh-532, Fixes gh-506
2014-03-20 08:12:11 +00:00
Phillip Webb
632af6b1ab Polish gradle examples
Spaces -> Tabs, version number, whitespace.
2014-03-19 16:50:55 -07:00
Phillip Webb
338b32ebdb Add missing datasource properties to refdocs
Fixes gh-504
2014-03-19 16:47:35 -07:00
Phillip Webb
68e309c14f Remove snapshot repos from starter parent
Fixes gh-419
2014-03-19 16:39:15 -07:00
Phillip Webb
4024450c5f Rename starter-shell-remote to starter-shell
Fixes gh-462
2014-03-19 16:28:36 -07:00
Phillip Webb
77db6c0e06 Add YAML syntax highlighting in docs
Also added JSON and tweaked properties settings.

Fixes gh-511
2014-03-19 16:13:38 -07:00
Andy Wilkinson
a20f8b4be0 Add missing JQuery and Bootstrap dependencies
Fixes #531
2014-03-19 11:42:01 +00:00
Andy Wilkinson
e90bc49988 Add dependency on spring-boot-starter-test
Fixes #530
2014-03-19 11:32:25 +00:00
Dave Syer
a47d5ccd44 Change order of config file locations to be more natural
The most natural order is "more specific locations win". That way
if a use has application.properties in the root of a JAR (as is
normal), overrides can always be made on
classpath:/config/application.properties (as well as
file:./application.properties which has always been the case).

Before this change properties in classpath:/config/* were over
written by those in the root location, not the other way round.

Fixes gh-527
2014-03-19 10:52:12 +00:00
Stephane Nicoll
d6be3dfbb0 Add a note on maven filtering
This commit adds a documentation note explaining how to change
the delimiters used to filter maven tokens as these conflict with the
delimiters used by Spring (i.e. ${foo:default}).
2014-03-19 08:40:28 +00:00
Phillip Webb
24cc51c36f Fix typo 2014-03-18 20:46:13 -07:00
Phillip Webb
98e4008b16 Don't display hint command in options help
Fixes gh-471
2014-03-18 15:47:35 -07:00
Phillip Webb
2929d33e37 Add links in Appendix B
Fixes gh-491
2014-03-18 13:17:37 -07:00
Phillip Webb
bddf38a633 Merge pull request #523 from snicoll/doc-appendix
* doc-appendix:
  Review of the Appendix
2014-03-18 12:16:16 -07:00
Stephane Nicoll
7813726e29 Review of the Appendix
This commit reviews the Appendix of the Spring boot
doc, fixing mostly typos.
2014-03-18 12:16:09 -07:00
Phillip Webb
e23bcdbe29 Update OSX Java 1.6 compatibility fix for plugins
Change the initial fix for OSX Java 1.6 compatibility by removing the
need for a direct `tools.jar` dependency.

It appears that `system` dependencies are always pulled in when
used in a Maven plugin. This makes the the dependency on `tools.jar`
particularly brittle since we need to make assumptions about where
the jar is located.

Since the tools jar is *only* needed for Spring Loaded support, the
plugin has now been updated to locate the jar programmatically and
call it via reflection. This should reduce the risk of problems when
using the plugin and at the very least isolate them to Spring Loaded
support.

(See original commit b8c4720)

Fixes gh-497
2014-03-18 12:05:35 -07:00
Phillip Webb
913b6020d6 Minor doc polish 2014-03-18 11:26:15 -07:00
Phillip Webb
798229f530 Document rabbit.addresses property 2014-03-18 11:15:15 -07:00
Phillip Webb
f4ebf8c80f Add clickable anchors to HTML docs
Fixes gh-525
2014-03-18 10:58:16 -07:00
Phillip Webb
b697191e3e Format docbook css 2014-03-18 10:58:15 -07:00
Dave Syer
01137b6fd6 Add "addresses" to RabbitProperties
If user sets addresses it supercedes anything that was set in host
or port (same as in the native ConnectionFactory).

Fixes gh-524
2014-03-18 17:57:55 +00:00
Phillip Webb
cb52cb5555 Merge pull request #498 from veryangryant/json-sort-keys
* json-sort-keys:
  Add support for sorting json keys
2014-03-18 10:38:34 -07:00
Piotr Maj
2e74251d1b Add support for sorting json keys
Add `jsonSortKeys` property to HttpMapperProperties.

Fixes gh-498
2014-03-18 10:38:00 -07:00
Phillip Webb
ca0a12cedb Polish 2014-03-18 10:23:54 -07:00
Phillip Webb
f55ca99214 Polish zip file detection 2014-03-18 10:23:54 -07:00
Phillip Webb
08b9592606 Polish spaces -> tabs 2014-03-18 10:23:54 -07:00
Phillip Webb
5cb8e4100c Polish docs
Minoir polish for wrapping at 90 and tabs instead of spaces.
2014-03-18 10:23:54 -07:00
Stephane Nicoll
5ce1bdfb7f Review of the How-to part
This commit reviews the How-to part of the Spring boot doc,
fixing mostly typos.

See gh-521
2014-03-18 17:16:52 +00:00
Dave Syer
ae512193bf Add missing test mannifest 2014-03-18 16:37:53 +00:00
Dave Syer
935131cdab Clarification regarding format of loader.path 2014-03-18 15:31:45 +00:00
Dave Syer
a1d3bac7c8 More changes to teh way ExplodedArchive works in non-recursive mode
It is sufficient for most purposes (e.g. the ones PropertieLauncher needs)
to only read the META-INF directory (not the whole file tree). So a quick
fix is to make META-INF a special case when initializing non-recursive
entries.

Fixes gh-520
2014-03-18 14:28:23 +00:00
Dave Syer
2c60449836 Be defensive with File.listFiles() 2014-03-18 14:28:23 +00:00