dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #30002
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 15214: Changed hibernate second level cache provider from ehcache to hazelcast. Hz is fully open source ...
------------------------------------------------------------
revno: 15214
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2014-05-10 16:24:03 +0200
message:
Changed hibernate second level cache provider from ehcache to hazelcast. Hz is fully open source and provides clustering capabilities.
removed:
dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/ehcache.xml
added:
dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/hazelcast.xml
modified:
dhis-2/dhis-support/dhis-support-hibernate/pom.xml
dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/hibernate-default.properties
dhis-2/pom.xml
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-support/dhis-support-hibernate/pom.xml'
--- dhis-2/dhis-support/dhis-support-hibernate/pom.xml 2014-04-22 15:46:19 +0000
+++ dhis-2/dhis-support/dhis-support-hibernate/pom.xml 2014-05-10 14:24:03 +0000
@@ -33,9 +33,13 @@
<artifactId>hibernate-core</artifactId>
</dependency>
<dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-ehcache</artifactId>
- </dependency>
+ <groupId>com.hazelcast</groupId>
+ <artifactId>hazelcast</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.hazelcast</groupId>
+ <artifactId>hazelcast-hibernate4</artifactId>
+ </dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
=== removed file 'dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/ehcache.xml'
--- dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/ehcache.xml 2014-04-08 19:36:25 +0000
+++ dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/ehcache.xml 1970-01-01 00:00:00 +0000
@@ -1,385 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ehcache>
-
- <defaultCache maxElementsInMemory="800000" eternal="false" timeToIdleSeconds="360" timeToLiveSeconds="720"
- overflowToDisk="false" diskPersistent="false" />
-
- <!-- Hibernate Query Cache -->
-
- <cache name="org.hibernate.cache.internal.StandardQueryCache" maxElementsInMemory="250000" />
-
- <cache name="org.hibernate.cache.spi.UpdateTimestampsCache" maxElementsInMemory="3000" />
-
- <!-- Hibernate entities -->
-
- <cache name="org.hisp.dhis.configuration.Configuration" maxElementsInMemory="1" />
-
- <cache name="org.hisp.dhis.dataelement.DataElement" maxElementsInMemory="4000" />
-
- <cache name="org.hisp.dhis.dataelement.DataElement.userGroupAccesses" maxElementsInMemory="200" />
-
- <cache name="org.hisp.dhis.dataelement.DataElementCategoryCombo" maxElementsInMemory="100" />
-
- <cache name="org.hisp.dhis.dataelement.DataElementCategory" maxElementsInMemory="200" />
-
- <cache name="org.hisp.dhis.dataelement.DataElementCategoryOption" maxElementsInMemory="400" />
-
- <cache name="org.hisp.dhis.dataelement.DataElementCategoryOptionCombo" maxElementsInMemory="800" />
-
- <cache name="org.hisp.dhis.dataelement.CategoryOptionGroup" maxElementsInMemory="1000" />
-
- <cache name="org.hisp.dhis.dataelement.CategoryOptionGroupSet" maxElementsInMemory="50" />
-
- <cache name="org.hisp.dhis.dataelement.DataElementCategoryDimension" maxElementsInMemory="2000" />
-
- <cache name="org.hisp.dhis.dataelement.DataElementGroup" maxElementsInMemory="200" />
-
- <cache name="org.hisp.dhis.dataelement.DataElementGroupSet" maxElementsInMemory="100" />
-
- <cache name="org.hisp.dhis.indicator.Indicator" maxElementsInMemory="1000" />
-
- <cache name="org.hisp.dhis.indicator.IndicatorGroup" maxElementsInMemory="200" />
-
- <cache name="org.hisp.dhis.indicator.IndicatorGroupSet" maxElementsInMemory="100" />
-
- <cache name="org.hisp.dhis.indicator.IndicatorType" maxElementsInMemory="100" />
-
- <cache name="org.hisp.dhis.datadictionary.DataDictionary" maxElementsInMemory="200" />
-
- <cache name="org.hisp.dhis.datadictionary.DataDictionary.userGroupAccesses" maxElementsInMemory="200" />
-
- <cache name="org.hisp.dhis.period.Period" maxElementsInMemory="200" />
-
- <cache name="org.hisp.dhis.period.PeriodType" maxElementsInMemory="50" />
-
- <cache name="org.hisp.dhis.period.RelativePeriods" maxElementsInMemory="30" />
-
- <cache name="org.hisp.dhis.dataset.DataSet" maxElementsInMemory="400" />
-
- <cache name="org.hisp.dhis.dataset.Section" maxElementsInMemory="400" />
-
- <cache name="org.hisp.dhis.dataelement.DataElementOperand" maxElementsInMemory="4000" />
-
- <cache name="org.hisp.dhis.expression.Expression" maxElementsInMemory="200" />
-
- <cache name="org.hisp.dhis.validation.ValidationRule" maxElementsInMemory="1000" />
-
- <cache name="org.hisp.dhis.validation.ValidationRuleGroup" maxElementsInMemory="50" />
-
- <cache name="org.hisp.dhis.organisationunit.OrganisationUnit" maxElementsInMemory="60000" />
-
- <cache name="org.hisp.dhis.organisationunit.OrganisationUnitGroup" maxElementsInMemory="100" />
-
- <cache name="org.hisp.dhis.organisationunit.OrganisationUnitGroup.userGroupAccesses" maxElementsInMemory="100" />
-
- <cache name="org.hisp.dhis.organisationunit.OrganisationUnitGroupSet" maxElementsInMemory="50" />
-
- <cache name="org.hisp.dhis.organisationunit.OrganisationUnitGroupSet.attributeValues" maxElementsInMemory="1000" />
-
- <cache name="org.hisp.dhis.organisationunit.OrganisationUnitLevel" maxElementsInMemory="20" />
-
- <cache name="org.hisp.dhis.user.User" maxElementsInMemory="200" />
-
- <cache name="org.hisp.dhis.user.UserSetting" maxElementsInMemory="200" />
-
- <cache name="org.hisp.dhis.user.UserCredentials" maxElementsInMemory="200" />
-
- <cache name="org.hisp.dhis.user.UserAuthorityGroup" maxElementsInMemory="200" />
-
- <cache name="org.hisp.dhis.user.UserGroup" maxElementsInMemory="200" />
-
- <cache name="org.hisp.dhis.setting.SystemSetting" maxElementsInMemory="200" />
-
- <cache name="org.hisp.dhis.translation.Translation" maxElementsInMemory="200000" />
-
- <cache name="org.hisp.dhis.message.MessageConversation" maxElementsInMemory="500" />
-
- <cache name="org.hisp.dhis.message.Message" maxElementsInMemory="1000" />
-
- <cache name="org.hisp.dhis.message.UserMessage" maxElementsInMemory="50000" />
-
- <cache name="org.hisp.dhis.chart.Chart" maxElementsInMemory="1000" />
-
- <cache name="org.hisp.dhis.mapping.Map" maxElementsInMemory="1000" />
-
- <cache name="org.hisp.dhis.reporttable.ReportTable" maxElementsInMemory="100" />
-
- <cache name="org.hisp.dhis.eventreport.EventReport" maxElementsInMemory="1000" />
-
- <cache name="org.hisp.dhis.report.Report" maxElementsInMemory="100" />
-
- <cache name="org.hisp.dhis.document.Document" maxElementsInMemory="100" />
-
- <cache name="org.hisp.dhis.dashboard.Dashboard" maxElementsInMemory="1000" />
-
- <cache name="org.hisp.dhis.dashboard.DashboardItem" maxElementsInMemory="4000" />
-
- <cache name="org.hisp.dhis.constant.Constant" maxElementsInMemory="200" />
-
- <cache name="org.hisp.dhis.version.Version" maxElementsInMemory="100" />
-
- <cache name="org.hisp.dhis.attribute.Attribute" maxElementsInMemory="500" />
-
- <cache name="org.hisp.dhis.attribute.AttributeValue" maxElementsInMemory="5000" />
-
- <cache name="org.hisp.dhis.option.OptionSet" maxElementsInMemory="50" />
-
- <cache name="org.hisp.dhis.dataset.LockException" maxElementsInMemory="1000" />
-
- <cache name="org.hisp.dhis.dataapproval.DataApprovalLevel" maxElementsInMemory="20" />
-
- <cache name="org.hisp.dhis.filter.MetaDataFilter" maxElementsInMemory="100" />
-
- <cache name="org.hisp.dhis.program.Program" maxElementsInMemory="100" />
-
- <cache name="org.hisp.dhis.program.ProgramStage" maxElementsInMemory="500" />
-
- <cache name="org.hisp.dhis.sqlview.SqlView" maxElementsInMemory="50" />
-
- <cache name="org.hisp.dhis.trackedentity.TrackedEntityAttribute" maxElementsInMemory="50" />
-
- <!-- Hibernate Associations -->
-
- <cache name="org.hisp.dhis.dataelement.DataElementCategoryCombo.categories" maxElementsInMemory="300" />
-
- <cache name="org.hisp.dhis.dataelement.DataElementCategoryCombo.optionCombos" maxElementsInMemory="500" />
-
- <cache name="org.hisp.dhis.dataelement.DataElementCategoryCombo.userGroupAccesses" maxElementsInMemory="500" />
-
- <cache name="org.hisp.dhis.dataelement.DataElementCategory.categoryOptions" maxElementsInMemory="300" />
-
- <cache name="org.hisp.dhis.dataelement.DataElementCategory.userGroupAccesses" maxElementsInMemory="300" />
-
- <cache name="org.hisp.dhis.dataelement.DataElementCategoryOption.categoryOptionCombos" maxElementsInMemory="500" />
-
- <cache name="org.hisp.dhis.dataelement.DataElementCategoryOption.categories" maxElementsInMemory="300" />
-
- <cache name="org.hisp.dhis.dataelement.DataElementCategoryOption.groups" maxElementsInMemory="300" />
-
- <cache name="org.hisp.dhis.dataelement.DataElementCategoryOption.userGroupAccesses" maxElementsInMemory="300" />
-
- <cache name="org.hisp.dhis.dataelement.DataElementCategoryOptionCombo.categoryOptions" maxElementsInMemory="500" />
-
- <cache name="org.hisp.dhis.dataelement.CategoryOptionGroup.userGroupAccesses" maxElementsInMemory="500" />
-
- <cache name="org.hisp.dhis.dataelement.CategoryOptionGroup.members" maxElementsInMemory="500" />
-
- <cache name="org.hisp.dhis.dataelement.CategoryOptionGroupSet.members" maxElementsInMemory="500" />
-
- <cache name="org.hisp.dhis.dataelement.CategoryOptionGroupSet.userGroupAccesses" maxElementsInMemory="500" />
-
- <cache name="org.hisp.dhis.dataelement.DataElementCategoryDimension.items" maxElementsInMemory="500" />
-
- <cache name="org.hisp.dhis.dataset.DataSet.dataElements" maxElementsInMemory="3000" />
-
- <cache name="org.hisp.dhis.dataset.DataSet.sources" maxElementsInMemory="120000" />
-
- <cache name="org.hisp.dhis.dataset.DataSet.sections" maxElementsInMemory="3000" />
-
- <cache name="org.hisp.dhis.dataset.DataSet.userGroupAccesses" maxElementsInMemory="200" />
-
- <cache name="org.hisp.dhis.dataset.DataSet.attributeValues" maxElementsInMemory="1000" />
-
- <cache name="org.hisp.dhis.dashboard.Dashboard.userGroupAccesses" maxElementsInMemory="500" />
-
- <cache name="org.hisp.dhis.dataelement.DataElement.groups" maxElementsInMemory="3000" />
-
- <cache name="org.hisp.dhis.dataelement.DataElement.dataSets" maxElementsInMemory="3000" />
-
- <cache name="org.hisp.dhis.dataelement.DataElement.attributeValues" maxElementsInMemory="1000" />
-
- <cache name="org.hisp.dhis.dataelement.DataElementGroup.members" maxElementsInMemory="3000" />
-
- <cache name="org.hisp.dhis.dataelement.DataElementGroup.attributeValues" maxElementsInMemory="200" />
-
- <cache name="org.hisp.dhis.dataelement.DataElementGroup.userGroupAccesses" maxElementsInMemory="200" />
-
- <cache name="org.hisp.dhis.dataelement.DataElementGroupSet.members" maxElementsInMemory="500" />
-
- <cache name="org.hisp.dhis.dataelement.DataElementGroupSet.userGroupAccesses" maxElementsInMemory="500" />
-
- <cache name="org.hisp.dhis.document.Document.userGroupAccesses" maxElementsInMemory="100" />
-
- <cache name="org.hisp.dhis.indicator.Indicator.groups" maxElementsInMemory="500" />
-
- <cache name="org.hisp.dhis.indicator.Indicator.dataSets" maxElementsInMemory="400" />
-
- <cache name="org.hisp.dhis.indicator.Indicator.attributeValues" maxElementsInMemory="1000" />
-
- <cache name="org.hisp.dhis.indicator.Indicator.userGroupAccesses" maxElementsInMemory="500" />
-
- <cache name="org.hisp.dhis.indicator.IndicatorGroup.members" maxElementsInMemory="500" />
-
- <cache name="org.hisp.dhis.indicator.IndicatorGroup.attributeValues" maxElementsInMemory="200" />
-
- <cache name="org.hisp.dhis.indicator.IndicatorGroup.userGroupAccesses" maxElementsInMemory="200" />
-
- <cache name="org.hisp.dhis.indicator.IndicatorGroupSet.members" maxElementsInMemory="200" />
-
- <cache name="org.hisp.dhis.indicator.IndicatorGroupSet.userGroupAccesses" maxElementsInMemory="200" />
-
- <cache name="org.hisp.dhis.dataset.Section.dataElements" maxElementsInMemory="4000" />
-
- <cache name="org.hisp.dhis.dataset.Section.greyedFields" maxElementsInMemory="1000" />
-
- <cache name="org.hisp.dhis.expression.Expression.dataElementsInExpression" maxElementsInMemory="1000" />
-
- <cache name="org.hisp.dhis.organisationunit.OrganisationUnit.children" maxElementsInMemory="60000" />
-
- <cache name="org.hisp.dhis.organisationunit.OrganisationUnit.dataSets" maxElementsInMemory="120000" />
-
- <cache name="org.hisp.dhis.organisationunit.OrganisationUnit.groups" maxElementsInMemory="20000" />
-
- <cache name="org.hisp.dhis.organisationunit.OrganisationUnit.users" maxElementsInMemory="20000" />
-
- <cache name="org.hisp.dhis.organisationunit.OrganisationUnit.attributeValues" maxElementsInMemory="20000" />
-
- <cache name="org.hisp.dhis.organisationunit.OrganisationUnitGroup.members" maxElementsInMemory="200" />
-
- <cache name="org.hisp.dhis.organisationunit.OrganisationUnitGroup.attributeValues" maxElementsInMemory="20000" />
-
- <cache name="org.hisp.dhis.organisationunit.OrganisationUnitGroup.dataSets" maxElementsInMemory="100" />
-
- <cache name="org.hisp.dhis.organisationunit.OrganisationUnitGroupSet.organisationUnitGroups" maxElementsInMemory="500" />
-
- <cache name="org.hisp.dhis.organisationunit.OrganisationUnitGroupSet.userGroupAccesses" maxElementsInMemory="200" />
-
- <cache name="org.hisp.dhis.report.Report.userGroupAccesses" maxElementsInMemory="200" />
-
- <cache name="org.hisp.dhis.reporttable.ReportTable.indicators" maxElementsInMemory="500" />
-
- <cache name="org.hisp.dhis.reporttable.ReportTable.dataElements" maxElementsInMemory="1500" />
-
- <cache name="org.hisp.dhis.reporttable.ReportTable.dataElementOperands" maxElementsInMemory="1500" />
-
- <cache name="org.hisp.dhis.reporttable.ReportTable.dataSets" maxElementsInMemory="200" />
-
- <cache name="org.hisp.dhis.reporttable.ReportTable.periods" maxElementsInMemory="200" />
-
- <cache name="org.hisp.dhis.reporttable.ReportTable.organisationUnits" maxElementsInMemory="2000" />
-
- <cache name="org.hisp.dhis.reporttable.ReportTable.dataElementGroups" maxElementsInMemory="500" />
-
- <cache name="org.hisp.dhis.reporttable.ReportTable.organisationUnitGroups" maxElementsInMemory="500" />
-
- <cache name="org.hisp.dhis.reporttable.ReportTable.categoryOptionGroups" maxElementsInMemory="500" />
-
- <cache name="org.hisp.dhis.reporttable.ReportTable.itemOrganisationUnitGroups" maxElementsInMemory="500" />
-
- <cache name="org.hisp.dhis.reporttable.ReportTable.categoryDimensions" maxElementsInMemory="500" />
-
- <cache name="org.hisp.dhis.reporttable.ReportTable.columnDimensions" maxElementsInMemory="500" />
-
- <cache name="org.hisp.dhis.reporttable.ReportTable.rowDimensions" maxElementsInMemory="500" />
-
- <cache name="org.hisp.dhis.reporttable.ReportTable.filterDimensions" maxElementsInMemory="500" />
-
- <cache name="org.hisp.dhis.reporttable.ReportTable.organisationUnitLevels" maxElementsInMemory="500" />
-
- <cache name="org.hisp.dhis.reporttable.ReportTable.userGroupAccesses" maxElementsInMemory="500" />
-
- <cache name="org.hisp.dhis.chart.Chart.indicators" maxElementsInMemory="500" />
-
- <cache name="org.hisp.dhis.chart.Chart.dataElements" maxElementsInMemory="1500" />
-
- <cache name="org.hisp.dhis.chart.Chart.dataElementOperands" maxElementsInMemory="1500" />
-
- <cache name="org.hisp.dhis.chart.Chart.dataSets" maxElementsInMemory="200" />
-
- <cache name="org.hisp.dhis.chart.Chart.periods" maxElementsInMemory="200" />
-
- <cache name="org.hisp.dhis.chart.Chart.organisationUnits" maxElementsInMemory="2000" />
-
- <cache name="org.hisp.dhis.chart.Chart.dataElementGroups" maxElementsInMemory="500" />
-
- <cache name="org.hisp.dhis.chart.Chart.organisationUnitGroups" maxElementsInMemory="500" />
-
- <cache name="org.hisp.dhis.chart.Chart.categoryOptionGroups" maxElementsInMemory="500" />
-
- <cache name="org.hisp.dhis.chart.Chart.itemOrganisationUnitGroups" maxElementsInMemory="500" />
-
- <cache name="org.hisp.dhis.chart.Chart.categoryDimensions" maxElementsInMemory="500" />
-
- <cache name="org.hisp.dhis.chart.Chart.filterDimensions" maxElementsInMemory="500" />
-
- <cache name="org.hisp.dhis.chart.Chart.organisationUnitLevels" maxElementsInMemory="500" />
-
- <cache name="org.hisp.dhis.chart.Chart.userGroupAccesses" maxElementsInMemory="500" />
-
- <cache name="org.hisp.dhis.mapping.Map.mapViews" maxElementsInMemory="1000" />
-
- <cache name="org.hisp.dhis.mapping.Map.userGroupAccesses" maxElementsInMemory="500" />
-
- <cache name="org.hisp.dhis.mapping.MapView" maxElementsInMemory="1000" />
-
- <cache name="org.hisp.dhis.mapping.MapView.dataSets" maxElementsInMemory="500" />
-
- <cache name="org.hisp.dhis.mapping.MapView.indicators" maxElementsInMemory="500" />
-
- <cache name="org.hisp.dhis.mapping.MapView.dataElements" maxElementsInMemory="1500" />
-
- <cache name="org.hisp.dhis.mapping.MapView.dataElementOperands" maxElementsInMemory="1500" />
-
- <cache name="org.hisp.dhis.mapping.MapView.periods" maxElementsInMemory="200" />
-
- <cache name="org.hisp.dhis.mapping.MapView.organisationUnits" maxElementsInMemory="2000" />
-
- <cache name="org.hisp.dhis.mapping.MapView.organisationUnitLevels" maxElementsInMemory="500" />
-
- <cache name="org.hisp.dhis.mapping.MapView.itemOrganisationUnitGroups" maxElementsInMemory="500" />
-
- <cache name="org.hisp.dhis.eventreport.EventReport.columnDimensions" maxElementsInMemory="500" />
-
- <cache name="org.hisp.dhis.eventreport.EventReport.rowDimensions" maxElementsInMemory="500" />
-
- <cache name="org.hisp.dhis.eventreport.EventReport.filterDimensions" maxElementsInMemory="500" />
-
- <cache name="org.hisp.dhis.eventreport.EventReport.periods" maxElementsInMemory="500" />
-
- <cache name="org.hisp.dhis.eventreport.EventReport.organisationUnits" maxElementsInMemory="500" />
-
- <cache name="org.hisp.dhis.eventreport.EventReport.organisationUnitLevels" maxElementsInMemory="500" />
-
- <cache name="org.hisp.dhis.eventreport.EventReport.itemOrganisationUnitGroups" maxElementsInMemory="500" />
-
- <cache name="org.hisp.dhis.eventreport.EventReport.userGroupAccesses" maxElementsInMemory="500" />
-
- <cache name="org.hisp.dhis.attribute.Attribute.attributeValues" maxElementsInMemory="5000" />
-
- <cache name="org.hisp.dhis.option.OptionSet.options" maxElementsInMemory="2000" />
-
- <cache name="org.hisp.dhis.option.OptionSet.userGroupAccesses" maxElementsInMemory="200" />
-
- <cache name="org.hisp.dhis.dataapproval.DataApprovalLevel.userGroupAccesses" maxElementsInMemory="500" />
-
- <cache name="org.hisp.dhis.interpretation.Interpretation.userGroupAccesses" maxElementsInMemory="200" />
-
- <cache name="org.hisp.dhis.user.User.organisationUnits" maxElementsInMemory="20000" />
-
- <cache name="org.hisp.dhis.user.User.dataViewOrganisationUnits" maxElementsInMemory="20000" />
-
- <cache name="org.hisp.dhis.user.User.attributeValues" maxElementsInMemory="1000" />
-
- <cache name="org.hisp.dhis.user.User.groups" maxElementsInMemory="1000" />
-
- <cache name="org.hisp.dhis.user.User.apps" maxElementsInMemory="1000" />
-
- <cache name="org.hisp.dhis.user.UserGroup.attributeValues" maxElementsInMemory="200" />
-
- <cache name="org.hisp.dhis.user.UserGroup.userGroupAccesses" maxElementsInMemory="200" />
-
- <cache name="org.hisp.dhis.user.UserCredentials.userAuthorityGroups" maxElementsInMemory="2000" />
-
- <cache name="org.hisp.dhis.user.UserCredentials.cogsDimensionConstraints" maxElementsInMemory="2000" />
-
- <cache name="org.hisp.dhis.user.UserAuthorityGroup.authorities" maxElementsInMemory="500" />
-
- <cache name="org.hisp.dhis.user.UserAuthorityGroup.userGroupAccesses" maxElementsInMemory="200" />
-
- <cache name="org.hisp.dhis.validation.ValidationRuleGroup.userGroupAccesses" maxElementsInMemory="200" />
-
- <cache name="org.hisp.dhis.sqlview.SqlView.userGroupAccesses" maxElementsInMemory="200" />
-
- <cache name="org.hisp.dhis.trackedentity.TrackedEntityAttribute.userGroupAccesses" maxElementsInMemory="200" />
-
-</ehcache>
=== added file 'dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/hazelcast.xml'
--- dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/hazelcast.xml 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/hazelcast.xml 2014-05-10 14:24:03 +0000
@@ -0,0 +1,4 @@
+<hazelcast xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-3.2.xsd"
+ xmlns="http://www.hazelcast.com/schema/config";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+</hazelcast>
\ No newline at end of file
=== modified file 'dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/hibernate-default.properties'
--- dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/hibernate-default.properties 2014-04-28 19:23:37 +0000
+++ dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/hibernate-default.properties 2014-05-10 14:24:03 +0000
@@ -26,14 +26,18 @@
#hibernate.c3p0.idle_test_period = 300
# Caching
-
-hibernate.cache.region.factory_class = org.hibernate.cache.ehcache.EhCacheRegionFactory
hibernate.cache.use_second_level_cache = true
hibernate.cache.use_query_cache = true
+hibernate.cache.region.factory_class = com.hazelcast.hibernate.HazelcastCacheRegionFactory
+#hibernate.cache.region.factory_class = org.hibernate.cache.ehcache.EhCacheRegionFactory
# hibernate.cache.region.factory_class = net.sf.ehcache.hibernate.EhCacheRegionFactory
# hibernate.cache.provider_class = org.hibernate.cache.EhCacheProvider
+# Caching cluster settings
+# hibernate.cache.use_minimal_puts = true
+# hibernate.cache.hazelcast.use_lite_member = true
+
# MySQL setup:
#
# hibernate.dialect = org.hibernate.dialect.MySQLDialect
=== modified file 'dhis-2/pom.xml'
--- dhis-2/pom.xml 2014-04-29 12:04:04 +0000
+++ dhis-2/pom.xml 2014-05-10 14:24:03 +0000
@@ -693,10 +693,15 @@
<version>${hibernate.version}</version>
</dependency>
<dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-ehcache</artifactId>
- <version>${hibernate.version}</version>
- </dependency>
+ <groupId>com.hazelcast</groupId>
+ <artifactId>hazelcast</artifactId>
+ <version>3.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>com.hazelcast</groupId>
+ <artifactId>hazelcast-hibernate4</artifactId>
+ <version>3.2.1</version>
+ </dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
