Commit Graph

2863 Commits

Author SHA1 Message Date
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
Phillip Webb
a4925dabf7 Add property for JNDI DataSource lookup
Add `spring.datasource.jndi-name` property to allow a DataSource to be
looked up from JNDI as an alternative to defining a URL connection.

Fixes gh-989
2014-08-26 11:44:38 -07:00
Phillip Webb
8656402ca6 Polish database docs section 2014-08-26 11:44:37 -07:00
Phillip Webb
c98713ba95 Inject PlatformTransactionManager bean for JMS
Update JmsAutoConfiguration to inject any PlatformTransactionManager
bean into the DefaultJmsListenerContainerFactory.

Fixes gh-1444
2014-08-26 11:44:27 -07:00
Phillip Webb
5b9d45b231 Inject any existing JMS DestinationResolver bean
Update JmsAutoConfiguration to inject any existing DestinationResolver
bean into JmsTemplate and DefaultJmsListenerContainerFactory.

Fixes gh-1443
2014-08-26 11:44:19 -07:00
Phillip Webb
7a5248e38c Polish 2014-08-26 09:43:27 -07:00
Phillip Webb
da9e496818 Merge branch '1.1.x' 2014-08-26 09:43:27 -07:00
Phillip Webb
fdd79907e9 Polish 2014-08-26 09:43:27 -07:00
Phillip Webb
1381fe172e Polish 2014-08-26 09:40:33 -07:00
Andy Wilkinson
2b47d608f3 Merge branch '1.1.x' 2014-08-26 17:06:53 +01:00
Andy Wilkinson
28f7cf4487 Convert URL to File using a URI so that URL-encoding is removed
Fixes #1429
2014-08-26 17:04:50 +01:00
Dave Syer
ef2898a2f9 Fix version in new sample 2014-08-26 14:38:03 +01:00
Dave Syer
3404850b2e Merge branch '1.1.x' 2014-08-26 09:19:38 +01:00
Dave Syer
95d65c2ff5 Add indirection to avoid runtime dependency on MVC in templates
Velocity and Freemarker share some common properties so the base class for
configuring their properties makes some sense. Unfortunately the implementation
pulls in Spring MVC at runtime because of the signature of one method (that
would never be called). We can fix that in a number of ways, but the least
disruptive is probably to change the signature of that method and only refer
to the concrete template view resolver type if the method is called.

Fixes gh-1437
2014-08-26 09:19:07 +01:00
Phillip Webb
fcebf9d360 Merge branch '1.1.x' 2014-08-25 10:08:56 -07:00
Phillip Webb
f4dc090bae Add a little more context to ErrorPageFilter log
Add the servlet and context path along with the exception message to
the error logged in ErrorPageFilter.

See gh-1427
2014-08-25 10:06:22 -07:00
Dave Syer
bb13ebc0a3 Merge branch '1.1.x' 2014-08-25 17:28:12 +01:00
Dave Syer
2d67452128 Log exceptions in ErrorPageFilter
For some reason I thought that the DispatcherServlet default handler
would log all exceptions, so if we did it in the ErrorPageFilter it
would lead to duplicates. That appears not to be the case.

Fixes gh-1427
2014-08-25 17:26:57 +01:00
Dave Syer
43de5f3df8 Bump version in new sample 2014-08-25 17:21:17 +01:00
Dave Syer
5fd9af23d6 Merge branch '1.1.x' 2014-08-25 17:18:36 +01:00
Dave Syer
607f78a779 Add secure sample with JDBC and data.sql
We can't easily solve the problem by not allowing Spring Security to
eagerly instantiate everything, but we can be defensive about data.sql
and make sure it is executed even if the listener isn't yet registered.

Fixes gh-1386
2014-08-25 17:16:32 +01:00
Dave Syer
9da556d5e9 Merge branch '1.1.x' 2014-08-25 16:59:46 +01:00
Dave Syer
00ef26599e Add clarification of logging.file (fixes gh-1416) 2014-08-25 16:59:12 +01:00
Stephane Nicoll
d1f4fd0ecb Add skip parameter to repackage goal
This commit adds a 'skip' parameter to the 'repackage' goal that is
false by default. When this parameter is enabled, the repackage goal
does not run at all.

This can be used when repackaging should occur conditionally or
when a particular module in a hierarchy should not use this feature.

Fixes gh-1424
2014-08-23 10:02:08 +02:00
Phillip Webb
8c030795c2 Merge branch '1.1.x'
Conflicts:
	spring-boot-dependencies/pom.xml
2014-08-22 11:18:36 -07:00
Phillip Webb
939af5e931 Revert "Add activemq-jms-pool managed dependency"
This reverts commit bbdfcd4faa.
2014-08-22 11:16:46 -07:00
Phillip Webb
d6fdc47724 Restore repositories section
Restore repositories section accidentally removed during the merge
2014-08-22 09:49:07 -07:00
Phillip Webb
8f883febd1 Merge branch '1.1.x'
Conflicts:
	spring-boot-dependencies/pom.xml
2014-08-22 09:47:30 -07:00
Phillip Webb
bbdfcd4faa Add activemq-jms-pool managed dependency
Fixes gh-1423
2014-08-22 09:41:18 -07:00
Phillip Webb
658dc10722 Merge branch '1.1.x' 2014-08-21 22:11:40 -07:00
Phillip Webb
d515595ca1 Detect embedded DBs when deducing driver class
Fix DataSourceProperties getUsername() and getPassword() methods to
call getDriverClassName() rather than using `this.driverClassName` to
ensure than deduced driver classes can be used.

Fixes gh-1421
2014-08-21 22:06:01 -07:00
Phillip Webb
e6c18a00a1 Polish 2014-08-21 22:03:19 -07:00
Phillip Webb
77bf558307 Relocate configuration prefix constant
Relocate DataSourceAutoConfiguration.CONFIGURATION_PREFIX to
DataSourceProperties.PREFIX.
2014-08-21 21:44:39 -07:00