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

Merge OpenOLAT 10.2 to OpenOLAT default branch with baa3d1715662149cd720a64f33dfa0c3edb88737

parents d15ecbc4 736a0ff8
No related branches found
No related tags found
No related merge requests found
Showing
with 6 additions and 33 deletions
...@@ -108,3 +108,4 @@ d439e94e9a8f99fbfe9a0e61720189185dde1ba1 OpenOLAT 10.2.1 ...@@ -108,3 +108,4 @@ d439e94e9a8f99fbfe9a0e61720189185dde1ba1 OpenOLAT 10.2.1
3003411d7470026b202274abecd2e65c012c9b96 OpenOLAT 10.2.2 3003411d7470026b202274abecd2e65c012c9b96 OpenOLAT 10.2.2
12a83272ceab2dec4ba03903e90a7cddd6cffc2c OpenOLAT 10.2.3 12a83272ceab2dec4ba03903e90a7cddd6cffc2c OpenOLAT 10.2.3
dddaecac3f7ad507a77d5d2df5ded499b06baf0f OpenOLAT 10.2.4 dddaecac3f7ad507a77d5d2df5ded499b06baf0f OpenOLAT 10.2.4
aafe04c808cfdd7a75d436dfeabc36e37823b83c OpenOLAT 10.2.5
...@@ -4,8 +4,7 @@ ...@@ -4,8 +4,7 @@
"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
<hibernate-mapping default-lazy="false"> <hibernate-mapping default-lazy="false">
<class name="org.olat.commons.info.model.InfoMessageImpl" table="o_info_message"> <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"> <id name="key" type="long" column="info_id" unsaved-value="null">
<generator class="hilo"/> <generator class="hilo"/>
</id> </id>
......
...@@ -4,8 +4,7 @@ ...@@ -4,8 +4,7 @@
"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
<hibernate-mapping default-lazy="false"> <hibernate-mapping default-lazy="false">
<class name="org.olat.core.commons.services.mark.impl.MarkImpl" table="o_mark"> <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"> <id name="key" type="long" column="mark_id" unsaved-value="null">
<generator class="hilo"/> <generator class="hilo"/>
</id> </id>
......
...@@ -4,8 +4,7 @@ ...@@ -4,8 +4,7 @@
"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
<hibernate-mapping default-lazy="false"> <hibernate-mapping default-lazy="false">
<class name="org.olat.core.commons.services.tagging.model.TagImpl" table="o_tag"> <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"> <id name="key" type="long" column="tag_id" unsaved-value="null">
<generator class="hilo"/> <generator class="hilo"/>
</id> </id>
......
...@@ -4,8 +4,7 @@ ...@@ -4,8 +4,7 @@
"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
<hibernate-mapping default-lazy="false"> <hibernate-mapping default-lazy="false">
<class name="org.olat.course.assessment.model.UserEfficiencyStatementImpl" table="o_as_eff_statement"> <class name="org.olat.course.assessment.model.UserEfficiencyStatementImpl" table="o_as_eff_statement">
<cache usage="transactional" />
<id name="key" type="long" column="id" unsaved-value="null"> <id name="key" type="long" column="id" unsaved-value="null">
<generator class="hilo"/> <generator class="hilo"/>
...@@ -44,8 +43,7 @@ ...@@ -44,8 +43,7 @@
cascade="none"/> cascade="none"/>
</class> </class>
<class name="org.olat.course.assessment.model.UserEfficiencyStatementStandalone" table="o_as_eff_statement"> <class name="org.olat.course.assessment.model.UserEfficiencyStatementStandalone" table="o_as_eff_statement">
<cache usage="transactional" />
<id name="key" type="long" column="id" unsaved-value="null"> <id name="key" type="long" column="id" unsaved-value="null">
<generator class="hilo"/> <generator class="hilo"/>
......
...@@ -5,8 +5,6 @@ ...@@ -5,8 +5,6 @@
<hibernate-mapping default-lazy="false"> <hibernate-mapping default-lazy="false">
<class name="org.olat.group.BusinessGroupImpl" table="o_gp_business"> <class name="org.olat.group.BusinessGroupImpl" table="o_gp_business">
<cache usage="transactional" />
<!-- <!--
key (see Interface org.olat.core.commons.persistence.Persistable), key (see Interface org.olat.core.commons.persistence.Persistable),
lastModified (see Interface org.olat.core.commons.persistence.Auditable) lastModified (see Interface org.olat.core.commons.persistence.Auditable)
...@@ -62,7 +60,6 @@ ...@@ -62,7 +60,6 @@
</class> </class>
<class name="org.olat.group.model.BusinessGroupShortImpl" table="o_gp_business" mutable="false"> <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"> <id name="key" type="long" column="group_id" unsaved-value="null">
<generator class="hilo"/> <generator class="hilo"/>
</id> </id>
......
...@@ -5,9 +5,6 @@ ...@@ -5,9 +5,6 @@
<hibernate-mapping default-lazy="false"> <hibernate-mapping default-lazy="false">
<class name="org.olat.group.area.BGAreaImpl" table="o_gp_bgarea"> <class name="org.olat.group.area.BGAreaImpl" table="o_gp_bgarea">
<cache usage="transactional" />
<id name="key" <id name="key"
type="long" type="long"
column="area_id" column="area_id"
......
...@@ -3,9 +3,6 @@ ...@@ -3,9 +3,6 @@
<hibernate-mapping default-lazy="false"> <hibernate-mapping default-lazy="false">
<class name="org.olat.group.area.BGtoAreaRelationImpl" table="o_gp_bgtoarea_rel"> <class name="org.olat.group.area.BGtoAreaRelationImpl" table="o_gp_bgtoarea_rel">
<cache usage="transactional" />
<id name="key" <id name="key"
type="long" type="long"
column="bgtoarea_id" column="bgtoarea_id"
......
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
<hibernate-mapping default-lazy="false"> <hibernate-mapping default-lazy="false">
<class name="org.olat.group.model.BusinessGroupViewImpl" table="o_gp_business_v" mutable="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"> <id name="key" type="long" column="group_id" unsaved-value="null">
<generator class="hilo"/> <generator class="hilo"/>
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
<hibernate-mapping> <hibernate-mapping>
<class name="org.olat.repository.model.RepositoryEntryShortImpl" table="o_repositoryentry" mutable="false"> <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"> <id name="key" column="repositoryentry_id" type="long" unsaved-value="null">
<generator class="hilo"/> <generator class="hilo"/>
</id> </id>
......
...@@ -6,8 +6,6 @@ ...@@ -6,8 +6,6 @@
<hibernate-mapping default-lazy="false"> <hibernate-mapping default-lazy="false">
<class name="org.olat.repository.model.CatalogEntryImpl" table="o_catentry"> <class name="org.olat.repository.model.CatalogEntryImpl" table="o_catentry">
<cache usage="transactional" />
<id name="key" column="id" type="long" unsaved-value="null"> <id name="key" column="id" type="long" unsaved-value="null">
<generator class="hilo"/> <generator class="hilo"/>
......
...@@ -4,8 +4,6 @@ ...@@ -4,8 +4,6 @@
"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
<hibernate-mapping default-lazy="false"> <hibernate-mapping default-lazy="false">
<class name="org.olat.resource.OLATResourceImpl" table="o_olatresource"> <class name="org.olat.resource.OLATResourceImpl" table="o_olatresource">
<cache usage="transactional" />
<id name="key" type="long" column="resource_id" unsaved-value="null"> <id name="key" type="long" column="resource_id" unsaved-value="null">
<generator class="hilo"/> <generator class="hilo"/>
......
...@@ -5,8 +5,6 @@ ...@@ -5,8 +5,6 @@
<hibernate-mapping default-lazy="false"> <hibernate-mapping default-lazy="false">
<class name="org.olat.upgrade.model.BGAreaUpgrade" table="o_gp_bgarea"> <class name="org.olat.upgrade.model.BGAreaUpgrade" table="o_gp_bgarea">
<cache usage="transactional" />
<id name="key" <id name="key"
type="long" type="long"
......
...@@ -5,8 +5,6 @@ ...@@ -5,8 +5,6 @@
<hibernate-mapping default-lazy="false"> <hibernate-mapping default-lazy="false">
<class name="org.olat.upgrade.model.BGResourceRelation" table="o_gp_business_to_resource"> <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"> <id name="key" type="long" column="g_id" unsaved-value="null">
<generator class="hilo"/> <generator class="hilo"/>
</id> </id>
......
...@@ -5,8 +5,6 @@ ...@@ -5,8 +5,6 @@
<hibernate-mapping default-lazy="false"> <hibernate-mapping default-lazy="false">
<class name="org.olat.upgrade.model.BusinessGroupUpgrade" table="o_gp_business"> <class name="org.olat.upgrade.model.BusinessGroupUpgrade" table="o_gp_business">
<cache usage="transactional" />
<!-- <!--
key (see Interface org.olat.core.commons.persistence.Persistable), key (see Interface org.olat.core.commons.persistence.Persistable),
lastModified (see Interface org.olat.core.commons.persistence.Auditable) lastModified (see Interface org.olat.core.commons.persistence.Auditable)
......
...@@ -2,8 +2,6 @@ ...@@ -2,8 +2,6 @@
<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
<hibernate-mapping default-lazy="false"> <hibernate-mapping default-lazy="false">
<class name="org.olat.upgrade.model.RepositoryEntryUpgrade" table="o_repositoryentry"> <class name="org.olat.upgrade.model.RepositoryEntryUpgrade" table="o_repositoryentry">
<cache usage="transactional" />
<id name="key" column="repositoryentry_id" type="long" unsaved-value="null"> <id name="key" column="repositoryentry_id" type="long" unsaved-value="null">
<generator class="hilo"/> <generator class="hilo"/>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment