root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge branch '1.5.x'

This commit is contained in:
Stephane Nicoll 2017-06-07 18:42:40 +03:00
parent c32fab13fd fc38c1ba4d
commit 040c12bc85
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-samples/spring-boot-sample-cache/README.adoc
View File

@ -84,9 +84,8 @@ TIP: Run sample cache application using Hazelcast with
=== Infinispan === Infinispan
Add the `org.infinispan:infinispan-spring4-embedded` dependency to enable support for Add the `org.infinispan:infinispan-spring4-embedded` dependency to enable support for
Infinispan. There is no default location that Infinispan uses to look for a config Infinispan. There is no default location that Infinispan uses to look for a config
file so if you don't specify anything it will bootstrap on a hardcoded default. You file so this sample is configured to use a the provider `infinispan.xml` configuration
can set the `spring.cache.infinispan.config` property to use the provided file specified via the `spring.cache.infinispan.config` property.
`infinispan.xml` configuration instead.
TIP: Run sample cache application using Infinispan with TIP: Run sample cache application using Infinispan with
`$mvn spring-boot:run -Pinfinispan`. `$mvn spring-boot:run -Pinfinispan`.

4
spring-boot-samples/spring-boot-sample-cache/src/main/resources/application.properties
View File

@ -3,7 +3,7 @@ management.security.enabled=false
# #
# Infinispan configuration file location. # Infinispan configuration file location.
# #
#spring.cache.infinispan.config=infinispan.xml spring.cache.infinispan.config=infinispan.xml
# #
@ -15,4 +15,4 @@ management.security.enabled=false
# #
# Caffeine configuration # Caffeine configuration
# #
#spring.cache.caffeine.spec=maximumSize=200,expireAfterAccess=600s spring.cache.caffeine.spec=maximumSize=200,expireAfterAccess=600s

5
spring-boot-samples/spring-boot-sample-cache/src/main/resources/infinispan.xml
View File

@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<infinispan xmlns="urn:infinispan:config:7.2"> <infinispan xmlns="urn:infinispan:config:8.2">
<cache-container default-cache="default"> <cache-container default-cache="default">
<local-cache name="countries" statistics="true"> <local-cache name="default"/>
<local-cache name="countries">
<eviction max-entries="200"/> <eviction max-entries="200"/>
<expiration lifespan="600000"/> <expiration lifespan="600000"/>
</local-cache> </local-cache>