dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #24232
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 11835: Added missing ehcache entries and removed certain hibernate association caches
------------------------------------------------------------
revno: 11835
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2013-08-29 20:09:46 +0200
message:
Added missing ehcache entries and removed certain hibernate association caches
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseIdentifiableObject.java
dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataset/hibernate/DataSet.hbm.xml
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/sms/hibernate/SMSCommand.hbm.xml
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/user/hibernate/UserGroup.hbm.xml
dhis-2/dhis-services/dhis-service-eventreporting/src/main/resources/org/hisp/dhis/patientreport/hibernate/PatientAggregateReport.hbm.xml
dhis-2/dhis-services/dhis-service-eventreporting/src/main/resources/org/hisp/dhis/patientreport/hibernate/PatientTabularReport.hbm.xml
dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patient/hibernate/PatientRegistrationForm.hbm.xml
dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/Program.hbm.xml
dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/ProgramExpression.hbm.xml
dhis-2/dhis-services/dhis-service-reporting/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/dashboard/hibernate/DashboardContent.hbm.xml
dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/interpretation/hibernate/InterpretationComment.hbm.xml
dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/ehcache.xml
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/WEB-INF/classes/log4j.properties
--
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-api/src/main/java/org/hisp/dhis/common/BaseIdentifiableObject.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseIdentifiableObject.java 2013-08-28 11:29:37 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseIdentifiableObject.java 2013-08-29 18:09:46 +0000
@@ -28,27 +28,24 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.commons.lang.Validate;
+import org.hisp.dhis.common.view.DetailedView;
+import org.hisp.dhis.user.User;
+import org.hisp.dhis.user.UserGroupAccess;
+
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonView;
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
-import org.apache.commons.lang.Validate;
-import org.hisp.dhis.common.view.BasicView;
-import org.hisp.dhis.common.view.DetailedView;
-import org.hisp.dhis.common.view.ExportView;
-import org.hisp.dhis.user.User;
-import org.hisp.dhis.user.UserGroupAccess;
-
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
/**
* @author Bob Jolliffe
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml 2013-08-21 09:27:39 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml 2013-08-29 18:09:46 +0000
@@ -217,6 +217,7 @@
<bean id="org.hisp.dhis.user.UserGroupStore" class="org.hisp.dhis.common.hibernate.HibernateIdentifiableObjectStore">
<property name="clazz" value="org.hisp.dhis.user.UserGroup" />
<property name="sessionFactory" ref="sessionFactory" />
+ <property name="cacheable" value="true" />
</bean>
<bean id="org.hisp.dhis.user.UserGroupAccessStore" class="org.hisp.dhis.hibernate.HibernateGenericStore">
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataset/hibernate/DataSet.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataset/hibernate/DataSet.hbm.xml 2013-08-13 16:43:37 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataset/hibernate/DataSet.hbm.xml 2013-08-29 18:09:46 +0000
@@ -51,7 +51,6 @@
</set>
<set name="organisationUnitGroups" table="orgunitgroupdatasets" inverse="true">
- <cache usage="read-write" />
<key column="datasetid" />
<many-to-many class="org.hisp.dhis.organisationunit.OrganisationUnitGroup" column="orgunitgroupid"/>
</set>
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/sms/hibernate/SMSCommand.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/sms/hibernate/SMSCommand.hbm.xml 2013-08-12 03:29:54 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/sms/hibernate/SMSCommand.hbm.xml 2013-08-29 18:09:46 +0000
@@ -7,7 +7,7 @@
<hibernate-mapping package="org.hisp.dhis.smscommand">
<class name="SMSCommand" table="smscommands">
- <cache usage="read-write" />
+
<id name="id" column="smscommandid">
<generator class="increment" />
</id>
@@ -21,18 +21,15 @@
</type>
</property>
-
<property name="separator" type="text" column="separatorkey" />
<property name="codeSeparator" type="text" />
<property name="defaultMessage" type="text" />
<property name="receivedMessage" type="text" />
<property name="currentPeriodUsedForReporting" type="boolean" />
-
<many-to-one name="dataset" class="org.hisp.dhis.dataset.DataSet" column="datasetid" foreign-key="fk_dataset_datasetid" />
<set name="codes" table="smscommandcodes">
- <cache usage="read-write" />
<key column="id" />
<many-to-many class="org.hisp.dhis.smscommand.SMSCode" column="codeid" unique="true" />
</set>
@@ -41,5 +38,4 @@
</class>
-
</hibernate-mapping>
\ No newline at end of file
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/user/hibernate/UserGroup.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/user/hibernate/UserGroup.hbm.xml 2013-02-12 06:55:14 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/user/hibernate/UserGroup.hbm.xml 2013-08-29 18:09:46 +0000
@@ -8,6 +8,8 @@
<hibernate-mapping>
<class name="org.hisp.dhis.user.UserGroup" table="usergroup">
+ <cache usage="read-write" />
+
<id name="id" column="usergroupid">
<generator class="native" />
</id>
=== modified file 'dhis-2/dhis-services/dhis-service-eventreporting/src/main/resources/org/hisp/dhis/patientreport/hibernate/PatientAggregateReport.hbm.xml'
--- dhis-2/dhis-services/dhis-service-eventreporting/src/main/resources/org/hisp/dhis/patientreport/hibernate/PatientAggregateReport.hbm.xml 2013-08-21 12:29:12 +0000
+++ dhis-2/dhis-services/dhis-service-eventreporting/src/main/resources/org/hisp/dhis/patientreport/hibernate/PatientAggregateReport.hbm.xml 2013-08-29 18:09:46 +0000
@@ -84,7 +84,6 @@
<property name="publicAccess" length="8" />
<set name="userGroupAccesses" table="patientaggregatereportusergroupaccesses">
- <cache usage="read-write" />
<key column="patientaggregatereportid" />
<many-to-many class="org.hisp.dhis.user.UserGroupAccess" column="usergroupaccessid" unique="true" />
</set>
=== modified file 'dhis-2/dhis-services/dhis-service-eventreporting/src/main/resources/org/hisp/dhis/patientreport/hibernate/PatientTabularReport.hbm.xml'
--- dhis-2/dhis-services/dhis-service-eventreporting/src/main/resources/org/hisp/dhis/patientreport/hibernate/PatientTabularReport.hbm.xml 2013-08-29 09:34:09 +0000
+++ dhis-2/dhis-services/dhis-service-eventreporting/src/main/resources/org/hisp/dhis/patientreport/hibernate/PatientTabularReport.hbm.xml 2013-08-29 18:09:46 +0000
@@ -29,7 +29,6 @@
<property name="endDate" />
<set name="organisationUnits" table="patienttabularreport_organisationUnits">
- <cache usage="read-write" />
<key column="patienttabularreportid" foreign-key="fk_patienttabularreport_organisationUnitid" />
<many-to-many column="organisationunitid"
class="org.hisp.dhis.organisationunit.OrganisationUnit" foreign-key="fk_patienttabularreportid_organisationunit" />
@@ -57,7 +56,6 @@
<property name="publicAccess" length="8" />
<set name="userGroupAccesses" table="patienttabularreportusergroupaccesses">
- <cache usage="read-write" />
<key column="patienttabularreportid" />
<many-to-many class="org.hisp.dhis.user.UserGroupAccess"
column="usergroupaccessid" unique="true" />
=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patient/hibernate/PatientRegistrationForm.hbm.xml'
--- dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patient/hibernate/PatientRegistrationForm.hbm.xml 2013-07-04 05:57:36 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patient/hibernate/PatientRegistrationForm.hbm.xml 2013-08-29 18:09:46 +0000
@@ -23,7 +23,6 @@
foreign-key="fk_patientregistrationform_dataentryformid" cascade="all" />
<list name="fixedAttributes" table="patientregistrationform_fixedAttributes">
- <cache usage="read-write" />
<key column="patientregistrationformid" foreign-key="fk_patientregistrationform_fixedAttributes_patientregistrationformid" />
<list-index column="sort_order" />
<element type="text" column="fixedattribute" />
=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/Program.hbm.xml'
--- dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/Program.hbm.xml 2013-07-25 02:32:32 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/Program.hbm.xml 2013-08-29 18:09:46 +0000
@@ -101,7 +101,6 @@
<property name="publicAccess" length="8" />
<set name="userGroupAccesses" table="programusergroupaccesses">
- <cache usage="read-write" />
<key column="programid" />
<many-to-many class="org.hisp.dhis.user.UserGroupAccess" column="usergroupaccessid" unique="true" />
</set>
=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/ProgramExpression.hbm.xml'
--- dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/ProgramExpression.hbm.xml 2012-11-08 13:33:53 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/ProgramExpression.hbm.xml 2013-08-29 18:09:46 +0000
@@ -6,8 +6,6 @@
<hibernate-mapping>
<class name="org.hisp.dhis.program.ProgramExpression" table="programexpression">
- <cache usage="read-write" />
-
<id name="id" column="programexpressionid">
<generator class="native" />
</id>
=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/resources/META-INF/dhis/beans.xml 2013-07-24 16:25:21 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/resources/META-INF/dhis/beans.xml 2013-08-29 18:09:46 +0000
@@ -161,7 +161,6 @@
<bean id="org.hisp.dhis.interpretation.InterpretationStore" class="org.hisp.dhis.interpretation.hibernate.HibernateInterpretationStore">
<property name="clazz" value="org.hisp.dhis.interpretation.Interpretation" />
<property name="sessionFactory" ref="sessionFactory" />
- <property name="cacheable" value="true" />
</bean>
<!-- Scheduling -->
=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/dashboard/hibernate/DashboardContent.hbm.xml'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/dashboard/hibernate/DashboardContent.hbm.xml 2012-11-06 07:01:56 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/dashboard/hibernate/DashboardContent.hbm.xml 2013-08-29 18:09:46 +0000
@@ -6,8 +6,6 @@
<hibernate-mapping>
<class name="org.hisp.dhis.dashboard.DashboardContent" table="dashboardcontent">
- <cache usage="read-write" />
-
<id name="id" column="dashboardcontentid">
<generator class="foreign">
<param name="property">user</param>
=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/interpretation/hibernate/InterpretationComment.hbm.xml'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/interpretation/hibernate/InterpretationComment.hbm.xml 2012-05-29 20:06:58 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/interpretation/hibernate/InterpretationComment.hbm.xml 2013-08-29 18:09:46 +0000
@@ -6,8 +6,6 @@
<hibernate-mapping>
<class name="org.hisp.dhis.interpretation.InterpretationComment" table="interpretationcomment">
- <cache usage="read-write" />
-
<id name="id" column="interpretationcommentid">
<generator class="native" />
</id>
=== modified 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 2013-08-09 14:10:43 +0000
+++ dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/ehcache.xml 2013-08-29 18:09:46 +0000
@@ -40,9 +40,13 @@
<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="100" />
@@ -70,6 +74,8 @@
<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" />
@@ -92,7 +98,9 @@
<cache name="org.hisp.dhis.document.Document" maxElementsInMemory="100" />
- <cache name="org.hisp.dhis.dashboard.DashboardContent" maxElementsInMemory="1000" />
+ <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" />
@@ -116,14 +124,22 @@
<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.DataElementCategoryOptionCombo.categoryOptions" 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.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" />
@@ -132,17 +148,33 @@
<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.IndicatorGroupSet.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" />
@@ -160,10 +192,16 @@
<cache name="org.hisp.dhis.organisationunit.OrganisationUnit.attributeValues" maxElementsInMemory="20000" />
- <cache name="org.hisp.dhis.organisationunit.OrganisationUnitGroup.members" 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.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" />
@@ -190,6 +228,10 @@
<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" />
@@ -212,8 +254,14 @@
<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.attribute.Attribute.attributeValues" maxElementsInMemory="5000" />
<cache name="org.hisp.dhis.option.OptionSet.options" maxElementsInMemory="2000" />
@@ -222,6 +270,12 @@
<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.UserGroup.attributeValues" maxElementsInMemory="200" />
+
+ <cache name="org.hisp.dhis.user.UserGroup.userGroupAccesses" maxElementsInMemory="200" />
+
<cache name="org.hisp.dhis.user.UserCredentials.userAuthorityGroups" maxElementsInMemory="200" />
<cache name="org.hisp.dhis.user.UserAuthorityGroup.authorities" maxElementsInMemory="500" />
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/WEB-INF/classes/log4j.properties'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/WEB-INF/classes/log4j.properties 2013-08-29 17:04:34 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/WEB-INF/classes/log4j.properties 2013-08-29 18:09:46 +0000
@@ -31,6 +31,3 @@
# Spring framework logging level
log4j.logger.org.springframework = WARN
log4j.logger.org.springframework.web = WARN
-
-# Quick logging level
-# log4j.logger.org.amplecode.quick = DEBUG
\ No newline at end of file
