Commit Graph

2895 Commits

Author SHA1 Message Date
Phillip Webb
505795d6c7 Update CONTRIBUTING with commit message tips 2014-08-28 17:41:24 -07:00
Phillip Webb
0143bec831 Polish 2014-08-28 16:58:37 -07:00
Phillip Webb
5b36484b10 Merge pull request #1433 from liujiong1982/spring-boot-1379
* spring-boot-1379:
  Add database property to RedisProperties
2014-08-28 16:52:15 -07:00
David Liu
b1ceb8a43b Add database property to RedisProperties
Add database property to RedisProperties and use it in
RedisAutoConfiguration.

Fixes gh-1379
2014-08-28 16:52:01 -07:00
Phillip Webb
2186da453f Merge branch '1.1.x' 2014-08-28 14:27:09 -07:00
Phillip Webb
0c0a0a7738 Convert session timeout to minutes for Tomcat
Convert any session timeout values from seconds to minutes when
configuring Tomcat.

Fixes gh-1422
2014-08-28 14:24:55 -07:00
Phillip Webb
f8a4df0838 Polish 2014-08-28 12:07:44 -07:00
Phillip Webb
544bc64d64 Merge branch '1.1.x' 2014-08-28 11:31:50 -07:00
Phillip Webb
a07f0272f9 Polish 2014-08-28 11:15:14 -07:00
Mattias Severson
04c3e9979f Fix typo
Fixes gh-1463
2014-08-28 11:13:33 -07:00
Phillip Webb
a5484e47cd Extract getServletContextInitializerBeans logic
Extract the hairy logic from getServletContextInitializerBeans() to a
new class and refactor things a little.
2014-08-28 10:06:47 -07:00
Stephane Nicoll
dd6bf5730d Add support for EnableCaching in the cli
Fixes gh-1431
2014-08-28 17:13:16 +02:00
Stephane Nicoll
a0c316d392 Improve RepositoryRestConfiguration customization
This commit binds RepositoryRestConfiguration to the spring.data.rest
prefix so that any of its property can be customized through the
environment.

If a RepositoryRestMvcConfiguration is defined in the context, those
customization do not apply, as it was the case before.

Fixes gh-1171
2014-08-28 16:45:32 +02:00
Stephane Nicoll
6fedcc3aca Merge pull request #1463 from matsev/typo-correction
* typo-correction:
  Fix typo
2014-08-28 14:30:32 +02:00
Mattias Severson
5dcc4c3829 Fix typo
Fixes gh-1463
2014-08-28 14:30:13 +02:00
Stephane Nicoll
affb202e74 Improve JMS support in cli
This commit deprecates the proprietary EnableJmsMessaging annotation in
favour of the standard @EnableJms introduced as of Spring 4.1. This
commit also updates the sample and adds an integration test as the
feature was actually broken.

Fixes gh-1456
2014-08-28 14:25:14 +02:00
Andy Wilkinson
bf249d4205 Provide dependency management for all of Spring Cloud
Closes #1462
2014-08-28 10:25:34 +01:00
Stephane Nicoll
aa0f90ec2e Document JMS auto configuration
Fixes gh-1445
2014-08-28 09:52:46 +02:00
Dave Syer
538cd90657 Merge branch '1.1.x' 2014-08-28 07:54:14 +01:00
Dave Syer
c2444aecd6 Continue with default location if CONFIG_LOGGING fails
Tomcat in particular sets an environment variable in it's shell scripts
that people commonly use to start the container. So if people deploy a war
file to a stock Tomcat server they can't override the logging config, even
with the default location. With this change at least that should work
(for logback and log4j anyway). Tested with logback.

See gh-1432
2014-08-28 07:50:46 +01:00
Phillip Webb
ff870de0f0 Fix a few JTA issues
- Search for ConnectionFactories in java:/JmsXA and
  java:/XAConnectionFactory
- Remove javax.transaction:jta managed dependency
- Removed unused JtaProperties argument

Fixes gh-947
2014-08-27 10:09:34 -07:00
Phillip Webb
1024d5d42a Polish 2014-08-27 10:09:34 -07:00
David Liu
f4ccaa874a Provide auto-configuration for Gson
Closes #1339
2014-08-27 16:57:21 +01:00
Dave Syer
9f37dfcd9b Merge branch '1.1.x' 2014-08-27 16:31:50 +01:00
Dave Syer
47b59046bd Order Filters, Servlets etc. separately in EmbeddedWebApplicationContext
Users could be surpised if they register a Filter with an @Order and it
isn't apparently respected. This change accumulates all Filters and
FilterRegistrations (for instance) before sorting them.

Fixes gh-1455
2014-08-27 16:29:59 +01:00
Dave Syer
a4da3e975e Merge branch '1.1.x' 2014-08-27 16:05:02 +01:00
Dave Syer
1ddcf3657b Be defensive about resolving properties in PropertySourcesPropertyValues 2014-08-27 16:04:21 +01:00
Andy Wilkinson
d16ae2afd4 Merge branch '1.1.x' 2014-08-27 13:34:28 +01:00
Andy Wilkinson
37aa532617 Upgrade to Spring Data Dijkstra SR4
Closes #1419
2014-08-27 13:34:03 +01:00
Andy Wilkinson
2d4e68a977 Merge branch '1.1.x' 2014-08-27 12:24:32 +01:00
Andy Wilkinson
adc8cdf16a Fix generics warnings triggered by upgrade to Tomcat 7.0.55
See changes made in revision 1602507 [1]

[1] https://svn.apache.org/viewvc?view=revision&revision=1602507
2014-08-27 12:22:13 +01:00
Andy Wilkinson
a9c2eb3919 Update JTA sample tests to work on Windows
Rather than hard-coding assumptions about the line endings, use a
PrintWriter to produce the multi-line expected output
2014-08-27 11:42:21 +01:00
Andy Wilkinson
954da9cd72 Merge branch '1.1.x' 2014-08-27 10:07:01 +01:00
Andy Wilkinson
d0a85dd477 Add Elasticsearch starter to table of starters in the documentation
Fixes #1446
2014-08-27 10:06:45 +01:00
Andy Wilkinson
2d2ccb7ea0 Merge branch '1.1.x' 2014-08-27 10:03:44 +01:00
Andy Wilkinson
993a43ee8c Remove non-existent starter from dependencies pom 2014-08-27 09:47:25 +01:00
Phillip Webb
c24667f6b1 Merge branch 'gh-947'
Fixes gh-947
2014-08-26 22:35:36 -07:00
Phillip Webb
40d8dde202 Document distributed transaction support
See gh-947
2014-08-26 22:34:16 -07:00
Josh Long
85cfd016a6 Add JNDI Sample
Add a sample application that can be deployed to WildFly to demonstrate
how JTA can be used when running in a application server.

See gh-947
2014-08-26 22:34:16 -07:00
Phillip Webb
239d19d38c Support JNDI for JTA and JMS.
Update auto-configuration for JMS and JTA to support a ConnectionFactory
and TransactionManager exposed via JNDI.

JTA configuration now attempts a simple JtaTransactionManager before
attempting Bitronix or Atomikos configuration.

The JMS auto-configuration also now attempts to find a ConnectionFactory
from JNDI before falling back to the previous strategies. If JNDI is
present a JndiDestinationResolver is also configured instead of the
default DestinationResolver.

See gh-947
2014-08-26 22:34:10 -07:00
Josh Long
c15e3a7e2f Add Atomikos and Bitronix JTA samples
Add samples and integration tests for Atomikos and Bitronix JTA.

See gh-947
2014-08-26 22:34:04 -07:00
Josh Long
e1160922f9 Add Atomikos and Bitronix starter POMs
Add starters for Atomikos and Bitronix JTA libraries.

See gh-947
2014-08-26 22:34:04 -07:00
Phillip Webb
da88bb4791 Update JMS auto-configuration to support XA
Update JMS auto-configuration for ActiveMQ and HornetQ to support XA
transactions.

See gh-947
2014-08-26 22:33:58 -07:00
Phillip Webb
8219f2be4c Update DataSource auto-configuration to support XA
Update DataSource and JPA auto-configuration to consider XA datasources.

See gh-947
2014-08-26 22:33:57 -07:00
Josh Long
5ef136511f Add Atomikos and Bitronix JTA auto-configuration
Add auto-configuration for the Atomikos and Bitronix JTA libraries.

See gh-947
2014-08-26 22:33:51 -07:00
Josh Long
508bd14ad9 Add SpringJtaPlatform for Hibernate
Add SpringJtaPlatform Hibernate AbstractJtaPlatform implementation. Also
relocated SpringNamingStrategy to the `hibernate` sub-package.

See gh-947
2014-08-26 22:33:45 -07:00
Phillip Webb
b91274c0db Add Bitronix support classes
Add support classes for the Bitronix JTA library, including:

- A Spring friendly ConnectionFactoryBean and DataSourceBean with
  support for setting a direct XA source.
- A PostProcessor to apply shutdown ordering automatically.

See gh-947
2014-08-26 22:33:45 -07:00
Phillip Webb
983ec0ebc8 Add Atomikos support classes
Add support classes for the Atomikos JTA library, including:

- A Spring friendly ConnectionFactoryBean and DataSourceBean.
- A PostProcessor to apply "depends-on" ordering automatically.
- A bindable properties class for type-safe configuration.

See gh-947
2014-08-26 22:33:37 -07:00
Phillip Webb
bacdd5a408 Polish 2014-08-26 17:28:57 -07:00
Phillip Webb
b3ce079ea1 Automatically apply @EnableJMS
Automatically apply @EnableJMS when spring-jms is on the classpath
and the annotation hasn't already been applied. This allow for Spring's
new @JmsListener annotation to just work.

Fixes gh-1425
2014-08-26 14:55:22 -07:00