Commit Graph

4855 Commits

Author SHA1 Message Date
Stephane Nicoll
cb98ee25ff Polish
See gh-2900
2015-06-17 09:27:44 +02:00
Phillip Webb
8b9c38085a Merge pull request #3117 from izeye/metrics
* metrics2:
  Remove duplicate code in new metrics code
2015-06-16 22:03:43 -07:00
izeye
b47634176f Remove duplicate code in new metrics code
Refactor BufferMetricReader, CounterBuffers and GaugeBuffers to reduce
duplicate code.

Closes gh-3117
2015-06-16 22:03:22 -07:00
Phillip Webb
7e5b08e0cd Merge pull request #3119 from izeye/codahale
* codahale:
  Change Codahale to Dropwizard in Javadoc.
2015-06-16 21:40:39 -07:00
izeye
de91dc0de7 Change Codahale to Dropwizard in Javadoc. 2015-06-16 21:39:00 -07:00
Phillip Webb
93e6a7171b Merge pull request #3126 from eddumelendez/gh-3105
* gh-3105:
  Remove deprecated SimpleMongoDbFactory call
2015-06-16 21:38:15 -07:00
Eddú Meléndez
4883a5240a Remove deprecated SimpleMongoDbFactory call
Update MongoAutoConfiguration to create a `MongoClient` bean rather than
`Mongo` and update `MongoDataAutoConfiguration` to remove the call to
the deprecated `SimpleMongoDbFactory`.

Fixes gh-3105
Closes gh-3126
2015-06-16 21:33:36 -07:00
Phillip Webb
73d5a858c5 Polish 2015-06-16 21:01:37 -07:00
Sebastien Deleuze
78a7b6ed66 Add async request timeout property
Add a new `spring.mvc.async.request-timeout` property which can be used
to configure AsyncSupportConfigurer.setDefaultTimeout(..).

Fixes gh-2900
Closes gh-3236
2015-06-16 21:00:43 -07:00
Phillip Webb
295f9c6296 Merge pull request #3245 from dgomesbr/master
* pull3245:
  Upgrade joda-time to 2.8.1
2015-06-16 20:50:25 -07:00
Diego Magalhães
1875192dad Upgrade joda-time to 2.8.1
Fixes gh-3238
Closes gh-3245
2015-06-16 20:49:21 -07:00
Phillip Webb
4db23f69e8 Switch to Spring Framework 4.2 SNAPSHOT 2015-06-16 17:27:00 -07:00
Phillip Webb
af5338f26e Formatting 2015-06-16 17:26:26 -07:00
Stephane Nicoll
a33deee9f3 Merge pull request #3235 from izeye/ehcache
* ehcache:
  Polish
  Fix EhCache hit/miss ratio
2015-06-16 10:31:32 +02:00
Stephane Nicoll
8c7b8afedb Polish 2015-06-16 10:31:24 +02:00
izeye
2b9775d593 Fix EhCache hit/miss ratio
The hitRatio is the ratio of two windowed rates that are calculated
independently. They are not updated or read transactionally, hence the
ratio of the two can drift slightly from what might be expected.

We now make sure that the hit or miss ratio can't be higher than 1

Closes gh-3235
2015-06-16 10:11:46 +02:00
Stephane Nicoll
bbb27cf272 Merge pull request #3247 from eddumelendez/hornetq-typos
* hornetq-typos:
  Fix typos
2015-06-16 10:03:36 +02:00
Eddú Meléndez
6d5ff33bdf Fix typos
Closes gh-3247
2015-06-16 10:00:47 +02:00
Phillip Webb
93a7dc21da Merge branch '1.2.x' 2015-06-15 18:09:41 -07:00
Phillip Webb
cca0b76ac8 Support Velocity toolbox configurations from jar
Create an EmbeddedVelocityToolboxView which supports loading toolbox.xml
files from the application classpath as well as the ServletContext. The
VelocityAutoConfiguration class has been updated to use the new view.

This change allows the `spring.velocity.toolbox-config-location`
property to work with embedded servlet containers.

Fixes gh-2912
2015-06-15 18:08:17 -07:00
Phillip Webb
79179a7773 Merge branch '1.2.x' 2015-06-15 12:41:11 -07:00
Oliver Gierke
1cfc6f64f6 Allow multiple @EntityScan annotations to be used
Update EntityScanRegistrar so that multiple @EntityScan annotations can
be used with a single application. Previously, when an application used
multiple annotations only the first one found would get applied. This
changes alters that to augment the packages that will be scanned.

Fixes gh-2757
2015-06-15 12:21:22 -07:00
Phillip Webb
49039c33ea Polish 2015-06-15 11:44:44 -07:00
Phillip Webb
d87f2713af Merge branch '1.2.x' 2015-06-15 11:38:24 -07:00
Artur Mkrtchyan
d6e24a15de Update logging.path documentation sample
Update appendix example to use the more common `/var/log` folder rather
than `/var/logs`.

Fixes gh-3225
2015-06-15 11:36:03 -07:00
Phillip Webb
20d39f7af2 Polish 2015-06-15 11:31:33 -07:00
Ben Hale
818d3bd230 VcapApplicationListener Boolean Credentials
Previously, the VcapApplicationListener would discard any service
credential value that wasn't a String, Number, Map, Collection, or
null.  This was particularly a problem for services that exposed a
value as a JSON boolean.  This change takes booleans in the credential
payload into account, converting them to Strings so that they will
pass through the properties system properly.  There's no real downside
to this as Spring will coerce them back into Booleans if needed, by
the application.

Fixes gh-3237
2015-06-15 11:24:13 -07:00
Phillip Webb
75ffd1b017 Polish 2015-06-15 11:19:47 -07:00
Phillip Webb
a83d999f27 Add missing MultipartProperties.enabled property
Fixes gh-3209
2015-06-15 11:18:01 -07:00
Phillip Webb
135e9d10a6 Polish 2015-06-15 10:52:02 -07:00
Andy Wilkinson
49e538248b Add dependency management for ActiveMQ’s other modules
Closes gh-3206
2015-06-15 14:43:07 +01:00
Andy Wilkinson
eab599bd38 Merge branch '1.2.x' 2015-06-15 14:25:41 +01:00
Andy Wilkinson
0253f21f2f Update the link to Bitronix's documentation
Closes gh-3207
2015-06-15 14:25:24 +01:00
Stephane Nicoll
961350735b Add test for CacheConfigFileCondition
CacheConfigFileCondition was not properly tested, leading to various
potential source of errors (that last one being gh-3233). This condition
is now tested properly.
2015-06-15 12:06:10 +02:00
Stephane Nicoll
ac14072dba Fix typo in documentation
See gh-3232
2015-06-15 11:29:38 +02:00
Stephane Nicoll
b7742a7267 Merge branch '1.2.x' 2015-06-15 11:21:22 +02:00
Stephane Nicoll
321a149297 Only associate JTA transaction manager
This is related to 38cca9c but for the Rabbit support. Update
RabbitAnnotationDrivenConfiguration to only associate a JTA transaction
manager, if any.

Closes gh-3222
2015-06-15 11:20:03 +02:00
Stephane Nicoll
d93a76cc57 Merge pull request #3227 from izeye/cache-config
* cache-config:
  Fix typo in cache auto-configurations
2015-06-15 09:39:19 +02:00
izeye
0112260767 Fix typo in cache auto-configurations
Make sure that the EhCache support is triggered if
`spring.cache.ehcache.config` is set and the cache type is set to `auto`.

Same thing for Hazelcast.

Closes gh-3227
2015-06-15 09:37:55 +02:00
Stephane Nicoll
79adcc9421 Merge pull request #3224 from eddumelendez/jackson-om-doc
* jackson-om-doc:
  Add documentation for serialization-inclusion
2015-06-15 08:55:54 +02:00
Eddú Meléndez
0682660387 Add documentation for serialization-inclusion
Document `spring.jackson.serialization-inclusion`.

Closes gh-3224
2015-06-15 08:53:26 +02:00
Stephane Nicoll
c2b606de4c Merge branch '1.2.x' 2015-06-14 10:04:20 +02:00
Stephane Nicoll
dc94fafaaa Fix dependency of AmqpAdmin
AmqpAdmin does not require a CachingConnectionFactory. Using the more
general CachingConnectionFactory provides more flexibility.

Closes gh-3220
2015-06-14 10:04:06 +02:00
Stephane Nicoll
bb4c89592d Merge branch '1.2.x' 2015-06-14 09:36:25 +02:00
Stephane Nicoll
01ba732a73 Consistent use of "=" for property key
Closes gh-3218
2015-06-14 09:36:10 +02:00
Stephane Nicoll
253da6f3fe Merge pull request #3211 from izeye/patch-21
* patch-21:
  Fix meta-data for spring.jmx.server
  Fix mbean server property
2015-06-13 18:21:26 +02:00
Stephane Nicoll
bc4ae336f9 Fix meta-data for spring.jmx.server
See gh-3211
2015-06-13 18:20:53 +02:00
izeye
952f34b828 Fix mbean server property
`spring.jmx.server` was incorrectlyt documented as
`spring.jmx.mbean-server` in the documentation.

Closes gh-3211
2015-06-13 18:20:13 +02:00
Stephane Nicoll
641ceca3a9 Lower logging level of audit events
Closes gh-3107
2015-06-12 17:56:21 +02:00
Stephane Nicoll
b384f0360c Use proper product name for Intellij IDEA 2015-06-12 17:08:50 +02:00