Commit Graph

2898 Commits (3dc932db888d4b8da0a0c47a593e328dfbc28811)
 

Author SHA1 Message Date
Stephane Nicoll 3dc932db88 DataSource metrics
This commit adds an abstraction that provides a standard manner to
retrieve various metadata that are shared by most data sources.

DataSourceMetadata is implemented by the three data source
implementations that boot supports out-of-the-box: Tomcat, Hikari and
Commons dbcp.

This abstraction is used to provide two additional metrics per data
source defined in the application: the number of allocated
connection(s) (.active) and the current usage of the connection pool
(.usage).

All such metrics share the 'datasource.' prefix. The prefix is further
qualified for each data source:

* If the data source is the primary data source (that is either the
  only available data source or the one flagged @Primary amongst the
  existing ones), the prefix is "datasource.primary"
* If the data source bean name ends with "dataSource", the prefix is
  the name of the bean without it (i.e. batchDataSource becomes batch)
* In all other cases, the name of the bean is used

It is possible to override part or all of those defaults by
registering a bean with a customized version of
DataSourcePublicMetrics.

Additional DataSourceMetadata implementations for other data source
types can be added very easily, check
DataourceMetadataProvidersConfiguration for more details.

Fixes gh-1013
10 years ago
Stephane Nicoll 85c95744f9 Avoid duplicate script
This commit avoids a script duplication: the integration test runs the
sample instead of a copy of it in the repro directory.

Also switched the sample from ActiveMQ to HornetQ as #323 revealed
some locking on CI. Hopefully that should fix it as HornetQ is non
persistent and can be embedded several times in the same VM.

Fixes gh-1456
10 years ago
Phillip Webb 0dc389f5b3 1.Z -> 1.2 10 years ago
Phillip Webb 505795d6c7 Update CONTRIBUTING with commit message tips 10 years ago
Phillip Webb 0143bec831 Polish 10 years ago
Phillip Webb 5b36484b10 Merge pull request #1433 from liujiong1982/spring-boot-1379
* spring-boot-1379:
  Add database property to RedisProperties
10 years ago
David Liu b1ceb8a43b Add database property to RedisProperties
Add database property to RedisProperties and use it in
RedisAutoConfiguration.

Fixes gh-1379
10 years ago
Phillip Webb 2186da453f Merge branch '1.1.x' 10 years ago
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
10 years ago
Phillip Webb f8a4df0838 Polish 10 years ago
Phillip Webb 544bc64d64 Merge branch '1.1.x' 10 years ago
Phillip Webb a07f0272f9 Polish 10 years ago
Mattias Severson 04c3e9979f Fix typo
Fixes gh-1463
10 years ago
Phillip Webb a5484e47cd Extract getServletContextInitializerBeans logic
Extract the hairy logic from getServletContextInitializerBeans() to a
new class and refactor things a little.
10 years ago
Stephane Nicoll dd6bf5730d Add support for EnableCaching in the cli
Fixes gh-1431
10 years ago
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
10 years ago
Stephane Nicoll 6fedcc3aca Merge pull request #1463 from matsev/typo-correction
* typo-correction:
  Fix typo
10 years ago
Mattias Severson 5dcc4c3829 Fix typo
Fixes gh-1463
10 years ago
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
10 years ago
Andy Wilkinson bf249d4205 Provide dependency management for all of Spring Cloud
Closes #1462
10 years ago
Stephane Nicoll aa0f90ec2e Document JMS auto configuration
Fixes gh-1445
10 years ago
Dave Syer 538cd90657 Merge branch '1.1.x' 10 years ago
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
10 years ago
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
10 years ago
Phillip Webb 1024d5d42a Polish 10 years ago
David Liu f4ccaa874a Provide auto-configuration for Gson
Closes #1339
10 years ago
Dave Syer 9f37dfcd9b Merge branch '1.1.x' 10 years ago
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
10 years ago
Dave Syer a4da3e975e Merge branch '1.1.x' 10 years ago
Dave Syer 1ddcf3657b Be defensive about resolving properties in PropertySourcesPropertyValues 10 years ago
Andy Wilkinson d16ae2afd4 Merge branch '1.1.x' 10 years ago
Andy Wilkinson 37aa532617 Upgrade to Spring Data Dijkstra SR4
Closes #1419
10 years ago
Andy Wilkinson 2d4e68a977 Merge branch '1.1.x' 10 years ago
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
10 years ago
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
10 years ago
Andy Wilkinson 954da9cd72 Merge branch '1.1.x' 10 years ago
Andy Wilkinson d0a85dd477 Add Elasticsearch starter to table of starters in the documentation
Fixes #1446
10 years ago
Andy Wilkinson 2d2ccb7ea0 Merge branch '1.1.x' 10 years ago
Andy Wilkinson 993a43ee8c Remove non-existent starter from dependencies pom 10 years ago
Phillip Webb c24667f6b1 Merge branch 'gh-947'
Fixes gh-947
10 years ago
Phillip Webb 40d8dde202 Document distributed transaction support
See gh-947
10 years ago
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
10 years ago
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
10 years ago
Josh Long c15e3a7e2f Add Atomikos and Bitronix JTA samples
Add samples and integration tests for Atomikos and Bitronix JTA.

See gh-947
10 years ago
Josh Long e1160922f9 Add Atomikos and Bitronix starter POMs
Add starters for Atomikos and Bitronix JTA libraries.

See gh-947
10 years ago
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
10 years ago
Phillip Webb 8219f2be4c Update DataSource auto-configuration to support XA
Update DataSource and JPA auto-configuration to consider XA datasources.

See gh-947
10 years ago
Josh Long 5ef136511f Add Atomikos and Bitronix JTA auto-configuration
Add auto-configuration for the Atomikos and Bitronix JTA libraries.

See gh-947
10 years ago
Josh Long 508bd14ad9 Add SpringJtaPlatform for Hibernate
Add SpringJtaPlatform Hibernate AbstractJtaPlatform implementation. Also
relocated SpringNamingStrategy to the `hibernate` sub-package.

See gh-947
10 years ago
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
10 years ago