diff --git a/.hgtags b/.hgtags
index ac3b0728bb51125968bf3df5c97064f097eae4d3..68514aecb65b1fffabea4a531920d9105ee793dc 100644
--- a/.hgtags
+++ b/.hgtags
@@ -108,3 +108,4 @@ d439e94e9a8f99fbfe9a0e61720189185dde1ba1 OpenOLAT 10.2.1
3003411d7470026b202274abecd2e65c012c9b96 OpenOLAT 10.2.2
12a83272ceab2dec4ba03903e90a7cddd6cffc2c OpenOLAT 10.2.3
dddaecac3f7ad507a77d5d2df5ded499b06baf0f OpenOLAT 10.2.4
+aafe04c808cfdd7a75d436dfeabc36e37823b83c OpenOLAT 10.2.5
diff --git a/src/main/java/org/olat/commons/info/model/InfoMessageImpl.hbm.xml b/src/main/java/org/olat/commons/info/model/InfoMessageImpl.hbm.xml
index d9bf54d650330cb211db39b8367072f5d42ee360..c2c8b64ba055ab86e912f15f5e2e448b5f7458be 100644
--- a/src/main/java/org/olat/commons/info/model/InfoMessageImpl.hbm.xml
+++ b/src/main/java/org/olat/commons/info/model/InfoMessageImpl.hbm.xml
@@ -4,8 +4,7 @@
"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
<hibernate-mapping default-lazy="false">
<class name="org.olat.commons.info.model.InfoMessageImpl" table="o_info_message">
- <cache usage="transactional" />
-
+
<id name="key" type="long" column="info_id" unsaved-value="null">
<generator class="hilo"/>
</id>
diff --git a/src/main/java/org/olat/core/commons/services/mark/impl/MarkImpl.hbm.xml b/src/main/java/org/olat/core/commons/services/mark/impl/MarkImpl.hbm.xml
index f6ad34f10b470b5aaaa3a60916bb52b0686f6b60..cc0a96221078ffa5bbe52f82a71bcd8531cbb0a7 100644
--- a/src/main/java/org/olat/core/commons/services/mark/impl/MarkImpl.hbm.xml
+++ b/src/main/java/org/olat/core/commons/services/mark/impl/MarkImpl.hbm.xml
@@ -4,8 +4,7 @@
"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
<hibernate-mapping default-lazy="false">
<class name="org.olat.core.commons.services.mark.impl.MarkImpl" table="o_mark">
- <cache usage="transactional" />
-
+
<id name="key" type="long" column="mark_id" unsaved-value="null">
<generator class="hilo"/>
</id>
diff --git a/src/main/java/org/olat/core/commons/services/tagging/model/TagImpl.hbm.xml b/src/main/java/org/olat/core/commons/services/tagging/model/TagImpl.hbm.xml
index 8925334433099ee09d8e2ed57c20153bafc98f9f..42916092e1f401802c92754e2344fcfdfb2fc190 100644
--- a/src/main/java/org/olat/core/commons/services/tagging/model/TagImpl.hbm.xml
+++ b/src/main/java/org/olat/core/commons/services/tagging/model/TagImpl.hbm.xml
@@ -4,8 +4,7 @@
"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
<hibernate-mapping default-lazy="false">
<class name="org.olat.core.commons.services.tagging.model.TagImpl" table="o_tag">
- <cache usage="transactional" />
-
+
<id name="key" type="long" column="tag_id" unsaved-value="null">
<generator class="hilo"/>
</id>
diff --git a/src/main/java/org/olat/course/assessment/model/UserEfficiencyStatementImpl.hbm.xml b/src/main/java/org/olat/course/assessment/model/UserEfficiencyStatementImpl.hbm.xml
index 49d14c41a12a5f60901cb4daf47e376c9697f147..1915514580fcb64c894aff4222aaa11e89896fd8 100644
--- a/src/main/java/org/olat/course/assessment/model/UserEfficiencyStatementImpl.hbm.xml
+++ b/src/main/java/org/olat/course/assessment/model/UserEfficiencyStatementImpl.hbm.xml
@@ -4,8 +4,7 @@
"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
<hibernate-mapping default-lazy="false">
- <class name="org.olat.course.assessment.model.UserEfficiencyStatementImpl" table="o_as_eff_statement">
- <cache usage="transactional" />
+ <class name="org.olat.course.assessment.model.UserEfficiencyStatementImpl" table="o_as_eff_statement">
<id name="key" type="long" column="id" unsaved-value="null">
<generator class="hilo"/>
@@ -44,8 +43,7 @@
cascade="none"/>
</class>
- <class name="org.olat.course.assessment.model.UserEfficiencyStatementStandalone" table="o_as_eff_statement">
- <cache usage="transactional" />
+ <class name="org.olat.course.assessment.model.UserEfficiencyStatementStandalone" table="o_as_eff_statement">
<id name="key" type="long" column="id" unsaved-value="null">
<generator class="hilo"/>
diff --git a/src/main/java/org/olat/group/BusinessGroupImpl.hbm.xml b/src/main/java/org/olat/group/BusinessGroupImpl.hbm.xml
index aa5ad79eaca56414561de157fdb11bea4aad1342..884901a0a1cfba3b51989f3ecaf5da1561259689 100644
--- a/src/main/java/org/olat/group/BusinessGroupImpl.hbm.xml
+++ b/src/main/java/org/olat/group/BusinessGroupImpl.hbm.xml
@@ -5,8 +5,6 @@
<hibernate-mapping default-lazy="false">
<class name="org.olat.group.BusinessGroupImpl" table="o_gp_business">
-
- <cache usage="transactional" />
<!--
key (see Interface org.olat.core.commons.persistence.Persistable),
lastModified (see Interface org.olat.core.commons.persistence.Auditable)
@@ -62,7 +60,6 @@
</class>
<class name="org.olat.group.model.BusinessGroupShortImpl" table="o_gp_business" mutable="false">
- <cache usage="transactional" />
<id name="key" type="long" column="group_id" unsaved-value="null">
<generator class="hilo"/>
</id>
diff --git a/src/main/java/org/olat/group/area/BGAreaImpl.hbm.xml b/src/main/java/org/olat/group/area/BGAreaImpl.hbm.xml
index 01c5fb3fc44454d920a283c9e769629cb5fc0e08..f3167027da80128adadf7d540c61b170b9cac70a 100644
--- a/src/main/java/org/olat/group/area/BGAreaImpl.hbm.xml
+++ b/src/main/java/org/olat/group/area/BGAreaImpl.hbm.xml
@@ -5,9 +5,6 @@
<hibernate-mapping default-lazy="false">
<class name="org.olat.group.area.BGAreaImpl" table="o_gp_bgarea">
-
- <cache usage="transactional" />
-
<id name="key"
type="long"
column="area_id"
diff --git a/src/main/java/org/olat/group/area/BGtoAreaRelationImpl.hbm.xml b/src/main/java/org/olat/group/area/BGtoAreaRelationImpl.hbm.xml
index d929c9e915fb3b47a7546788436d0d36b0fee3c5..079584da58a09e58ae91f1470209f071f7a0c6e5 100644
--- a/src/main/java/org/olat/group/area/BGtoAreaRelationImpl.hbm.xml
+++ b/src/main/java/org/olat/group/area/BGtoAreaRelationImpl.hbm.xml
@@ -3,9 +3,6 @@
<hibernate-mapping default-lazy="false">
<class name="org.olat.group.area.BGtoAreaRelationImpl" table="o_gp_bgtoarea_rel">
-
- <cache usage="transactional" />
-
<id name="key"
type="long"
column="bgtoarea_id"
diff --git a/src/main/java/org/olat/group/model/BusinessGroupViewImpl.hbm.xml b/src/main/java/org/olat/group/model/BusinessGroupViewImpl.hbm.xml
index 28936fb5fbf438e317ddf58c19756006d47176aa..74bebc08d5dd323dc562771f720a336de9459434 100644
--- a/src/main/java/org/olat/group/model/BusinessGroupViewImpl.hbm.xml
+++ b/src/main/java/org/olat/group/model/BusinessGroupViewImpl.hbm.xml
@@ -5,7 +5,6 @@
<hibernate-mapping default-lazy="false">
<class name="org.olat.group.model.BusinessGroupViewImpl" table="o_gp_business_v" mutable="false">
- <cache usage="transactional" />
<id name="key" type="long" column="group_id" unsaved-value="null">
<generator class="hilo"/>
diff --git a/src/main/java/org/olat/repository/RepositoryEntry.hbm.xml b/src/main/java/org/olat/repository/RepositoryEntry.hbm.xml
index 7964ac792d77fbdac6d68db174bc64418f5f0ffb..4c71338f30167c6f4c624482396ef94b3bc89760 100644
--- a/src/main/java/org/olat/repository/RepositoryEntry.hbm.xml
+++ b/src/main/java/org/olat/repository/RepositoryEntry.hbm.xml
@@ -2,7 +2,6 @@
<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
<hibernate-mapping>
<class name="org.olat.repository.model.RepositoryEntryShortImpl" table="o_repositoryentry" mutable="false">
- <cache usage="transactional" />
<id name="key" column="repositoryentry_id" type="long" unsaved-value="null">
<generator class="hilo"/>
</id>
diff --git a/src/main/java/org/olat/repository/model/CatalogEntryImpl.hbm.xml b/src/main/java/org/olat/repository/model/CatalogEntryImpl.hbm.xml
index b981971b3eb8d55aa597377d8e6dd1bbde4077ab..8943281bbea6ae6f72071c5698347f180d426a4b 100644
--- a/src/main/java/org/olat/repository/model/CatalogEntryImpl.hbm.xml
+++ b/src/main/java/org/olat/repository/model/CatalogEntryImpl.hbm.xml
@@ -6,8 +6,6 @@
<hibernate-mapping default-lazy="false">
<class name="org.olat.repository.model.CatalogEntryImpl" table="o_catentry">
-
- <cache usage="transactional" />
<id name="key" column="id" type="long" unsaved-value="null">
<generator class="hilo"/>
diff --git a/src/main/java/org/olat/resource/OLATResourceImpl.hbm.xml b/src/main/java/org/olat/resource/OLATResourceImpl.hbm.xml
index ef7532c5535682550d68f43be4e8a0fb25e14a9e..8917f91f493986fc2ebfaa2640ea80c748ce9561 100644
--- a/src/main/java/org/olat/resource/OLATResourceImpl.hbm.xml
+++ b/src/main/java/org/olat/resource/OLATResourceImpl.hbm.xml
@@ -4,8 +4,6 @@
"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
<hibernate-mapping default-lazy="false">
<class name="org.olat.resource.OLATResourceImpl" table="o_olatresource">
-
- <cache usage="transactional" />
<id name="key" type="long" column="resource_id" unsaved-value="null">
<generator class="hilo"/>
diff --git a/src/main/java/org/olat/upgrade/model/BGAreaUpgrade.hbm.xml b/src/main/java/org/olat/upgrade/model/BGAreaUpgrade.hbm.xml
index e6a133fbd243eb6fddcbe4f7023e2088f428565e..9bdf3401cf6fa2c57fd5e58719e4c219b6338ba5 100644
--- a/src/main/java/org/olat/upgrade/model/BGAreaUpgrade.hbm.xml
+++ b/src/main/java/org/olat/upgrade/model/BGAreaUpgrade.hbm.xml
@@ -5,8 +5,6 @@
<hibernate-mapping default-lazy="false">
<class name="org.olat.upgrade.model.BGAreaUpgrade" table="o_gp_bgarea">
-
- <cache usage="transactional" />
<id name="key"
type="long"
diff --git a/src/main/java/org/olat/upgrade/model/BGResourceRelation.hbm.xml b/src/main/java/org/olat/upgrade/model/BGResourceRelation.hbm.xml
index 213a970586c365ce24f099174f9e3d59cf64dd96..2bbd7396c2f56c0025ce763701c32c09a1ea0822 100644
--- a/src/main/java/org/olat/upgrade/model/BGResourceRelation.hbm.xml
+++ b/src/main/java/org/olat/upgrade/model/BGResourceRelation.hbm.xml
@@ -5,8 +5,6 @@
<hibernate-mapping default-lazy="false">
<class name="org.olat.upgrade.model.BGResourceRelation" table="o_gp_business_to_resource">
- <cache usage="transactional" />
-
<id name="key" type="long" column="g_id" unsaved-value="null">
<generator class="hilo"/>
</id>
diff --git a/src/main/java/org/olat/upgrade/model/BusinessGroupUpgrade.hbm.xml b/src/main/java/org/olat/upgrade/model/BusinessGroupUpgrade.hbm.xml
index c70d328087f0559069522a448ca35f1f912923f7..89b896409df61a9f5e32cf3a651558780bb1fd22 100644
--- a/src/main/java/org/olat/upgrade/model/BusinessGroupUpgrade.hbm.xml
+++ b/src/main/java/org/olat/upgrade/model/BusinessGroupUpgrade.hbm.xml
@@ -5,8 +5,6 @@
<hibernate-mapping default-lazy="false">
<class name="org.olat.upgrade.model.BusinessGroupUpgrade" table="o_gp_business">
-
- <cache usage="transactional" />
<!--
key (see Interface org.olat.core.commons.persistence.Persistable),
lastModified (see Interface org.olat.core.commons.persistence.Auditable)
diff --git a/src/main/java/org/olat/upgrade/model/RepositoryEntryUpgrade.hbm.xml b/src/main/java/org/olat/upgrade/model/RepositoryEntryUpgrade.hbm.xml
index ea0a510413e589068609077cd48b1a5bf1661223..a62d920640bf04744a38fc129fc21790da5d4fa6 100644
--- a/src/main/java/org/olat/upgrade/model/RepositoryEntryUpgrade.hbm.xml
+++ b/src/main/java/org/olat/upgrade/model/RepositoryEntryUpgrade.hbm.xml
@@ -2,8 +2,6 @@
<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
<hibernate-mapping default-lazy="false">
<class name="org.olat.upgrade.model.RepositoryEntryUpgrade" table="o_repositoryentry">
-
- <cache usage="transactional" />
<id name="key" column="repositoryentry_id" type="long" unsaved-value="null">
<generator class="hilo"/>