diff --git a/10/mysql-tomcat/xwiki/hibernate.cfg.xml b/10/mysql-tomcat/xwiki/hibernate.cfg.xml index 402e96f77fa42e6e6b32bcbd1445c63c0be7c70a..baff61e187681799954ca69a5b8654421c260b5b 100644 --- a/10/mysql-tomcat/xwiki/hibernate.cfg.xml +++ b/10/mysql-tomcat/xwiki/hibernate.cfg.xml @@ -97,7 +97,6 @@ <mapping resource="instance.hbm.xml"/> <mapping resource="mailsender.hbm.xml"/> <mapping resource="activitystream.hbm.xml"/> - <mapping resource="notification-filter-preferences.hbm.xml"/> </session-factory> </hibernate-configuration> diff --git a/10/postgres-tomcat/xwiki/hibernate.cfg.xml b/10/postgres-tomcat/xwiki/hibernate.cfg.xml index 3efb6013a828851a552e749ccb5ffa18fb62b0a2..a5afc016ed823ae0e6072367fdaabb55e9fbc9f2 100644 --- a/10/postgres-tomcat/xwiki/hibernate.cfg.xml +++ b/10/postgres-tomcat/xwiki/hibernate.cfg.xml @@ -99,7 +99,6 @@ <mapping resource="instance.hbm.xml"/> <mapping resource="mailsender.hbm.xml"/> <mapping resource="activitystream.hbm.xml"/> - <mapping resource="notification-filter-preferences.hbm.xml"/> </session-factory> </hibernate-configuration> diff --git a/11/mysql-tomcat/xwiki/hibernate.cfg.xml b/11/mysql-tomcat/xwiki/hibernate.cfg.xml index ef2cdce60e57730ac1ba5ef85e7416e6b9e6cc0b..56947518186ec54413c21160d36a8519da65e0f1 100644 --- a/11/mysql-tomcat/xwiki/hibernate.cfg.xml +++ b/11/mysql-tomcat/xwiki/hibernate.cfg.xml @@ -97,7 +97,6 @@ <mapping resource="instance.hbm.xml"/> <mapping resource="mailsender.hbm.xml"/> <mapping resource="eventstream.hbm.xml"/> - <mapping resource="notification-filter-preferences.hbm.xml"/> </session-factory> </hibernate-configuration> diff --git a/11/postgres-tomcat/xwiki/hibernate.cfg.xml b/11/postgres-tomcat/xwiki/hibernate.cfg.xml index 481e530942d4d31f5134a5991125f00945b80fdc..5c6dc7d69335e0eca568f07e0806ce13e73b0b84 100644 --- a/11/postgres-tomcat/xwiki/hibernate.cfg.xml +++ b/11/postgres-tomcat/xwiki/hibernate.cfg.xml @@ -99,7 +99,6 @@ <mapping resource="instance.hbm.xml"/> <mapping resource="mailsender.hbm.xml"/> <mapping resource="eventstream.hbm.xml"/> - <mapping resource="notification-filter-preferences.hbm.xml"/> </session-factory> </hibernate-configuration> diff --git a/template/xwiki/hibernate.cfg.xml b/template/xwiki/hibernate.cfg.xml index 181c124c5f0a6832653d5e132c4dc5d268634061..ad8b3f7a3e0b04584da8d13ee3681b769bb16fb4 100644 --- a/template/xwiki/hibernate.cfg.xml +++ b/template/xwiki/hibernate.cfg.xml @@ -118,9 +118,9 @@ <mapping resource="instance.hbm.xml"/> <mapping resource="mailsender.hbm.xml"/>''' %> <% if (xwikiVersion.startsWith('11.')) - println '<mapping resource="eventstream.hbm.xml"/>' + print '<mapping resource="eventstream.hbm.xml"/>' else - println '<mapping resource="activitystream.hbm.xml"/>' + print '<mapping resource="activitystream.hbm.xml"/>' %> <mapping resource="notification-filter-preferences.hbm.xml"/> </session-factory>