Skip to content
Snippets Groups Projects
Commit bdeaa7c3 authored by srosse's avatar srosse
Browse files

OO-2903: upgrade the configuration files for Infinispan and replace deprecated attributes

parent 4d1081b6
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/main/resources/infinispan-config.xml
+ 20
− 20
View file @ bdeaa7c3
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:infinispan:config:7.2" xmlns="urn:infinispan:config:8.0"
xsi:schemaLocation="urn:infinispan:config:7.2 http://www.infinispan.org/schemas/infinispan-config-7.2.xsd"> xsi:schemaLocation="urn:infinispan:config:8.2 http://www.infinispan.org/schemas/infinispan-config-8.2.xsd">
<cache-container name="NonTransactionalCacheManager" default-cache="default"> <cache-container name="NonTransactionalCacheManager" default-cache="default">
<jmx duplicate-domains="true" /> <jmx duplicate-domains="true" />
...@@ -10,14 +10,14 @@ ...@@ -10,14 +10,14 @@
<local-cache name="MapperService@mapper" statistics="true"> <local-cache name="MapperService@mapper" statistics="true">
<locking isolation="READ_COMMITTED" concurrency-level="1000" acquire-timeout="15000" striping="false" /> <locking isolation="READ_COMMITTED" concurrency-level="1000" acquire-timeout="15000" striping="false" />
<transaction mode="NONE" auto-commit="true" /> <transaction mode="NONE" auto-commit="true" />
<eviction max-entries="10000" strategy="LRU" /> <eviction size="10000" strategy="LRU" />
<expiration max-idle="300000" interval="5000" /> <expiration max-idle="300000" interval="5000" />
</local-cache> </local-cache>
<local-cache name="OpenMeetingsManager@session" statistics="true"> <local-cache name="OpenMeetingsManager@session" statistics="true">
<locking isolation="READ_COMMITTED" concurrency-level="1000" acquire-timeout="15000" striping="false" /> <locking isolation="READ_COMMITTED" concurrency-level="1000" acquire-timeout="15000" striping="false" />
<transaction mode="NONE" auto-commit="true" /> <transaction mode="NONE" auto-commit="true" />
<eviction max-entries="10000" strategy="LRU" /> <eviction size="10000" strategy="LRU" />
<expiration max-idle="300000" interval="5000" /> <expiration max-idle="300000" interval="5000" />
</local-cache> </local-cache>
...@@ -31,28 +31,28 @@ ...@@ -31,28 +31,28 @@
<local-cache name="CalendarManager@calendar" statistics="true"> <local-cache name="CalendarManager@calendar" statistics="true">
<locking isolation="READ_COMMITTED" concurrency-level="1000" acquire-timeout="15000" striping="false" /> <locking isolation="READ_COMMITTED" concurrency-level="1000" acquire-timeout="15000" striping="false" />
<transaction mode="NONE" auto-commit="true" /> <transaction mode="NONE" auto-commit="true" />
<eviction max-entries="500" strategy="LRU" /> <eviction size="500" strategy="LRU" />
<expiration max-idle="900000" interval="5000" /> <expiration max-idle="900000" interval="5000" />
</local-cache> </local-cache>
<local-cache name="AssessmentManager@newpersisting" statistics="true"> <local-cache name="AssessmentManager@newpersisting" statistics="true">
<locking isolation="READ_COMMITTED" concurrency-level="1000" acquire-timeout="15000" striping="false" /> <locking isolation="READ_COMMITTED" concurrency-level="1000" acquire-timeout="15000" striping="false" />
<transaction mode="NONE" auto-commit="true" /> <transaction mode="NONE" auto-commit="true" />
<eviction max-entries="20000" strategy="LRU" /> <eviction size="20000" strategy="LRU" />
<expiration max-idle="900000" interval="5000" /> <expiration max-idle="900000" interval="5000" />
</local-cache> </local-cache>
<local-cache name="QTIHelper@QTI_xml_Documents" statistics="true"> <local-cache name="QTIHelper@QTI_xml_Documents" statistics="true">
<locking isolation="READ_COMMITTED" concurrency-level="1000" acquire-timeout="15000" striping="false" /> <locking isolation="READ_COMMITTED" concurrency-level="1000" acquire-timeout="15000" striping="false" />
<transaction mode="NONE" auto-commit="true" /> <transaction mode="NONE" auto-commit="true" />
<eviction max-entries="200" strategy="LRU" /> <eviction size="200" strategy="LRU" />
<expiration max-idle="180000" interval="15000" /> <expiration max-idle="180000" interval="15000" />
</local-cache> </local-cache>
<local-cache name="WebDAVManager@webdav" statistics="true"> <local-cache name="WebDAVManager@webdav" statistics="true">
<locking isolation="READ_COMMITTED" concurrency-level="1000" acquire-timeout="15000" striping="false" /> <locking isolation="READ_COMMITTED" concurrency-level="1000" acquire-timeout="15000" striping="false" />
<transaction mode="NONE" auto-commit="true" /> <transaction mode="NONE" auto-commit="true" />
<eviction max-entries="2013" strategy="LIRS" /> <eviction size="2013" strategy="LIRS" />
<expiration max-idle="300000" interval="5000" /> <expiration max-idle="300000" interval="5000" />
<!-- max-idle same as session time out for WebDAV session in UserSessionManager --> <!-- max-idle same as session time out for WebDAV session in UserSessionManager -->
</local-cache> </local-cache>
...@@ -60,84 +60,84 @@ ...@@ -60,84 +60,84 @@
<local-cache name="UserManager@username" statistics="true"> <local-cache name="UserManager@username" statistics="true">
<locking isolation="READ_COMMITTED" concurrency-level="1000" acquire-timeout="15000" striping="false" /> <locking isolation="READ_COMMITTED" concurrency-level="1000" acquire-timeout="15000" striping="false" />
<transaction mode="NONE" auto-commit="true" /> <transaction mode="NONE" auto-commit="true" />
<eviction max-entries="20000" strategy="LIRS" /> <eviction size="20000" strategy="LIRS" />
<expiration max-idle="2700000" interval="15000" /> <expiration max-idle="2700000" interval="15000" />
</local-cache> </local-cache>
<local-cache name="UserManager@userfullname" statistics="true"> <local-cache name="UserManager@userfullname" statistics="true">
<locking isolation="READ_COMMITTED" concurrency-level="1000" acquire-timeout="15000" striping="false" /> <locking isolation="READ_COMMITTED" concurrency-level="1000" acquire-timeout="15000" striping="false" />
<transaction mode="NONE" auto-commit="true" /> <transaction mode="NONE" auto-commit="true" />
<eviction max-entries="20000" strategy="LIRS" /> <eviction size="20000" strategy="LIRS" />
<expiration max-idle="2700000" interval="15000" /> <expiration max-idle="2700000" interval="15000" />
</local-cache> </local-cache>
<local-cache name="Velocity@templates" statistics="true"> <local-cache name="Velocity@templates" statistics="true">
<locking isolation="READ_COMMITTED" concurrency-level="1000" acquire-timeout="15000" striping="false" /> <locking isolation="READ_COMMITTED" concurrency-level="1000" acquire-timeout="15000" striping="false" />
<transaction mode="NONE" auto-commit="true" /> <transaction mode="NONE" auto-commit="true" />
<eviction max-entries="7700" strategy="LRU" /> <eviction size="7700" strategy="LRU" />
<expiration max-idle="-1" lifespan="-1" interval="-1" /> <expiration max-idle="-1" lifespan="-1" interval="-1" />
</local-cache> </local-cache>
<local-cache name="LoginModule@blockafterfailedattempts" statistics="true"> <local-cache name="LoginModule@blockafterfailedattempts" statistics="true">
<locking isolation="READ_COMMITTED" concurrency-level="1000" acquire-timeout="15000" striping="false" /> <locking isolation="READ_COMMITTED" concurrency-level="1000" acquire-timeout="15000" striping="false" />
<transaction mode="NONE" auto-commit="true" /> <transaction mode="NONE" auto-commit="true" />
<eviction max-entries="10000" strategy="LRU" /> <eviction size="10000" strategy="LRU" />
<expiration max-idle="300000" lifespan="300000" interval="5000" /> <expiration max-idle="300000" lifespan="300000" interval="5000" />
</local-cache> </local-cache>
<local-cache name="NotificationHelper@userPropertiesCache" statistics="true"> <local-cache name="NotificationHelper@userPropertiesCache" statistics="true">
<locking isolation="READ_COMMITTED" concurrency-level="1000" acquire-timeout="15000" striping="false" /> <locking isolation="READ_COMMITTED" concurrency-level="1000" acquire-timeout="15000" striping="false" />
<transaction mode="NONE" auto-commit="true" /> <transaction mode="NONE" auto-commit="true" />
<eviction max-entries="2000" strategy="LRU" /> <eviction size="2000" strategy="LRU" />
<expiration max-idle="120000" interval="15000" /> <expiration max-idle="120000" interval="15000" />
</local-cache> </local-cache>
<local-cache name="GlossaryItemManager@glossary" statistics="true"> <local-cache name="GlossaryItemManager@glossary" statistics="true">
<locking isolation="READ_COMMITTED" concurrency-level="1000" acquire-timeout="15000" striping="false" /> <locking isolation="READ_COMMITTED" concurrency-level="1000" acquire-timeout="15000" striping="false" />
<transaction mode="NONE" auto-commit="true" /> <transaction mode="NONE" auto-commit="true" />
<eviction max-entries="500" strategy="LRU" /> <eviction size="500" strategy="LRU" />
<expiration max-idle="3600000" interval="15000" /> <expiration max-idle="3600000" interval="15000" />
</local-cache> </local-cache>
<local-cache name="WikiManager@wiki" statistics="true"> <local-cache name="WikiManager@wiki" statistics="true">
<locking isolation="READ_COMMITTED" concurrency-level="1000" acquire-timeout="15000" striping="false" /> <locking isolation="READ_COMMITTED" concurrency-level="1000" acquire-timeout="15000" striping="false" />
<transaction mode="NONE" auto-commit="true" /> <transaction mode="NONE" auto-commit="true" />
<eviction max-entries="500" strategy="LRU" /> <eviction size="500" strategy="LRU" />
<expiration max-idle="3600000" interval="15000" /> <expiration max-idle="3600000" interval="15000" />
</local-cache> </local-cache>
<local-cache name="CollaborationToolsFactory@tools" statistics="true"> <local-cache name="CollaborationToolsFactory@tools" statistics="true">
<locking isolation="READ_COMMITTED" concurrency-level="1000" acquire-timeout="15000" striping="false" /> <locking isolation="READ_COMMITTED" concurrency-level="1000" acquire-timeout="15000" striping="false" />
<transaction mode="NONE" auto-commit="true" /> <transaction mode="NONE" auto-commit="true" />
<eviction max-entries="5000" strategy="LRU" /> <eviction size="5000" strategy="LRU" />
<expiration max-idle="1800000" interval="15000" /> <expiration max-idle="1800000" interval="15000" />
</local-cache> </local-cache>
<local-cache name="CourseFactory@courses" statistics="true"> <local-cache name="CourseFactory@courses" statistics="true">
<locking isolation="READ_COMMITTED" concurrency-level="1000" acquire-timeout="15000" striping="false" /> <locking isolation="READ_COMMITTED" concurrency-level="1000" acquire-timeout="15000" striping="false" />
<transaction mode="NONE" auto-commit="true" /> <transaction mode="NONE" auto-commit="true" />
<eviction max-entries="1000" strategy="LRU" /> <eviction size="1000" strategy="LRU" />
<expiration max-idle="3600000" interval="15000" /> <expiration max-idle="3600000" interval="15000" />
</local-cache> </local-cache>
<local-cache name="ProjectBrokerManager@pb" statistics="true"> <local-cache name="ProjectBrokerManager@pb" statistics="true">
<locking isolation="READ_COMMITTED" concurrency-level="1000" acquire-timeout="15000" striping="false" /> <locking isolation="READ_COMMITTED" concurrency-level="1000" acquire-timeout="15000" striping="false" />
<transaction mode="NONE" auto-commit="true" /> <transaction mode="NONE" auto-commit="true" />
<eviction max-entries="100" strategy="LRU" /> <eviction size="100" strategy="LRU" />
<expiration max-idle="3600000" interval="15000" /> <expiration max-idle="3600000" interval="15000" />
</local-cache> </local-cache>
<local-cache name="FeedManager@feed" statistics="true"> <local-cache name="FeedManager@feed" statistics="true">
<locking isolation="READ_COMMITTED" concurrency-level="1000" acquire-timeout="15000" striping="false" /> <locking isolation="READ_COMMITTED" concurrency-level="1000" acquire-timeout="15000" striping="false" />
<transaction mode="NONE" auto-commit="true" /> <transaction mode="NONE" auto-commit="true" />
<eviction max-entries="1000" strategy="LRU" /> <eviction size="1000" strategy="LRU" />
<expiration max-idle="900000" interval="15000" /> <expiration max-idle="900000" interval="15000" />
</local-cache> </local-cache>
<local-cache name="Path@feed" statistics="true"> <local-cache name="Path@feed" statistics="true">
<locking isolation="READ_COMMITTED" concurrency-level="1000" acquire-timeout="15000" striping="false" /> <locking isolation="READ_COMMITTED" concurrency-level="1000" acquire-timeout="15000" striping="false" />
<transaction mode="NONE" auto-commit="true" /> <transaction mode="NONE" auto-commit="true" />
<eviction max-entries="1000" strategy="LRU" /> <eviction size="1000" strategy="LRU" />
<expiration max-idle="900000" interval="15000" /> <expiration max-idle="900000" interval="15000" />
</local-cache> </local-cache>
</cache-container> </cache-container>
......
src/main/resources/org/hibernate/cache/infinispan/builder/infinispan-configs-local.xml
+ 4
− 4
View file @ bdeaa7c3
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
~ See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>. ~ See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
--> -->
<infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:infinispan:config:8.0" xmlns="urn:infinispan:config:8.2"
xsi:schemaLocation="urn:infinispan:config:8.0 http://www.infinispan.org/schemas/infinispan-config-8.0.xsd"> xsi:schemaLocation="urn:infinispan:config:8.2 http://www.infinispan.org/schemas/infinispan-config-8.2.xsd">
<!-- This configuration is suitable for non-clustered environments, where only single instance accesses the DB --> <!-- This configuration is suitable for non-clustered environments, where only single instance accesses the DB -->
<cache-container name="SampleCacheManager" statistics="false" default-cache="the-default-cache" shutdown-hook="DEFAULT"> <cache-container name="SampleCacheManager" statistics="false" default-cache="the-default-cache" shutdown-hook="DEFAULT">
...@@ -18,14 +18,14 @@ ...@@ -18,14 +18,14 @@
<!-- Default configuration is appropriate for entity/collection caching. --> <!-- Default configuration is appropriate for entity/collection caching. -->
<local-cache-configuration name="entity" statistics="false" statistics-available="false"> <local-cache-configuration name="entity" statistics="false" statistics-available="false">
<transaction mode="NONE" /> <transaction mode="NONE" />
<eviction max-entries="10000" strategy="LRU"/> <eviction size="10000" strategy="LRU"/>
<expiration max-idle="100000" interval="5000"/> <expiration max-idle="100000" interval="5000"/>
</local-cache-configuration> </local-cache-configuration>
<!-- A config appropriate for query caching. Does not replicate queries. --> <!-- A config appropriate for query caching. Does not replicate queries. -->
<local-cache-configuration name="local-query" statistics="false" statistics-available="false"> <local-cache-configuration name="local-query" statistics="false" statistics-available="false">
<transaction mode="NONE" /> <transaction mode="NONE" />
<eviction max-entries="10000" strategy="LRU"/> <eviction size="10000" strategy="LRU"/>
<expiration max-idle="100000" interval="5000"/> <expiration max-idle="100000" interval="5000"/>
</local-cache-configuration> </local-cache-configuration>
......
src/main/resources/org/hibernate/cache/infinispan/builder/infinispan-configs.xml
+ 4
− 4
View file @ bdeaa7c3
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
~ See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>. ~ See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
--> -->
<infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:infinispan:config:8.0" xmlns="urn:infinispan:config:8.2"
xsi:schemaLocation="urn:infinispan:config:8.0 http://www.infinispan.org/schemas/infinispan-config-8.0.xsd"> xsi:schemaLocation="urn:infinispan:config:8.2 http://www.infinispan.org/schemas/infinispan-config-8.2.xsd">
<!-- This configuration is suitable for non-clustered environments, where only single instance accesses the DB --> <!-- This configuration is suitable for non-clustered environments, where only single instance accesses the DB -->
<cache-container name="SampleCacheManager" statistics="false" default-cache="the-default-cache" shutdown-hook="DEFAULT"> <cache-container name="SampleCacheManager" statistics="false" default-cache="the-default-cache" shutdown-hook="DEFAULT">
...@@ -18,14 +18,14 @@ ...@@ -18,14 +18,14 @@
<!-- Default configuration is appropriate for entity/collection caching. --> <!-- Default configuration is appropriate for entity/collection caching. -->
<local-cache-configuration name="entity" statistics="false" statistics-available="false"> <local-cache-configuration name="entity" statistics="false" statistics-available="false">
<transaction mode="NONE" /> <transaction mode="NONE" />
<eviction max-entries="10000" strategy="LRU"/> <eviction size="10000" strategy="LRU"/>
<expiration max-idle="100000" interval="5000"/> <expiration max-idle="100000" interval="5000"/>
</local-cache-configuration> </local-cache-configuration>
<!-- A config appropriate for query caching. Does not replicate queries. --> <!-- A config appropriate for query caching. Does not replicate queries. -->
<local-cache-configuration name="local-query" statistics="false" statistics-available="false"> <local-cache-configuration name="local-query" statistics="false" statistics-available="false">
<transaction mode="NONE" /> <transaction mode="NONE" />
<eviction max-entries="10000" strategy="LRU"/> <eviction size="10000" strategy="LRU"/>
<expiration max-idle="100000" interval="5000"/> <expiration max-idle="100000" interval="5000"/>
</local-cache-configuration> </local-cache-configuration>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment