Skip to content
Snippets Groups Projects
Commit 5ef65efc authored by Sergiu Dumitriu's avatar Sergiu Dumitriu
Browse files

XWIKI-5576: Upgrade to Hibernate 3.6.4.Final

Updating configuration
parent 70f6a994
No related branches found
No related tags found
No related merge requests found
Showing
with 144 additions and 225 deletions
<?xml version="1.0"?>
<!DOCTYPE hibernate-mapping PUBLIC
"-//Hibernate/Hibernate Mapping DTD//EN"
"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
<hibernate-mapping>
<class name="com.xpn.xwiki.plugin.activitystream.impl.ActivityEventImpl" table="activitystream_events">
<id name="eventId" type="string" unsaved-value="undefined">
......
......@@ -254,8 +254,37 @@
<!-- Storage -->
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate</artifactId>
<version>3.2.6.ga</version>
<artifactId>hibernate-core</artifactId>
<version>3.6.4.Final</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-c3p0</artifactId>
<version>3.6.4.Final</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-c3p0</artifactId>
<version>3.6.4.Final</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-ehcache</artifactId>
<version>3.6.4.Final</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
<version>4.1.0.Final</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>javassist</groupId>
<artifactId>javassist</artifactId>
<version>3.9.0.GA</version>
</dependency>
<!-- Authentication -->
......
<?xml version="1.0"?>
<!DOCTYPE hibernate-mapping PUBLIC
"-//Hibernate/Hibernate Mapping DTD//EN"
"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
<hibernate-mapping>
<class entity-name="XWiki.AggregatorURLClass" table="feeds_aggregatorurl">
<id name="id" type="integer" unsaved-value="any">
......
<?xml version="1.0"?>
<!DOCTYPE hibernate-mapping PUBLIC
"-//Hibernate/Hibernate Mapping DTD//EN"
"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
<hibernate-mapping>
<class entity-name="XWiki.AggregatorURLClass" table="feeds_aggregatorurl">
<id name="id" type="integer" unsaved-value="any">
......@@ -47,15 +47,9 @@
<property name="feedname" type="text" column="fee_feedname" length="2000" />
<property name="url" type="text" column="fee_url" length="2000" />
<property name="category" type="text" column="fee_category" length="2000" />
<property name="content" type="text" length="30000">
<column name="fee_content" sql-type="clob" />
</property>
<property name="fullContent" type="text" length="30000">
<column name="fee_fullcontent" sql-type="clob" />
</property>
<property name="xml" type="text" length="30000">
<column name="fee_xml" sql-type="clob" />
</property>
<property name="content" type="materialized_clob" column="fee_content" length="30000" />
<property name="fullContent" type="materialized_clob" column="fee_fullcontent" length="30000" />
<property name="xml" type="materialized_clob" column="fee_xml" length="30000" />
<property name="date" type="timestamp" column="fee_date" />
<property name="flag" type="integer">
<column name="fee_flag" default="0" />
......
<?xml version="1.0"?>
<!DOCTYPE hibernate-mapping PUBLIC
"-//Hibernate/Hibernate Mapping DTD//EN"
"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
"-//Hibernate/Hibernate Mapping DTD//EN"
"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
<hibernate-mapping>
<query name="getSpaceDocsName">
select distinct doc.name from XWikiDocument doc where doc.space=:space and (doc.hidden &lt;&gt; true or doc.hidden is null) order by doc.name asc
......
<?xml version="1.0"?>
<!DOCTYPE hibernate-mapping PUBLIC
"-//Hibernate/Hibernate Mapping DTD//EN"
"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
<hibernate-mapping auto-import="true">
<!--
......@@ -33,15 +33,11 @@
<!-- This property is deprecated and should not be used anymore. Use .space instead. -->
<property name="web" type="string" update="false" insert="false" column="XWD_WEB" length="255" not-null="true" />
<property name="space" type="string" column="XWD_WEB" length="255" not-null="true" />
<property name="content" type="string">
<column name="XWD_CONTENT" length="200000" not-null="true" sql-type="clob(200000)" />
</property>
<property name="content" type="materialized_clob" column="XWD_CONTENT" length="200000" not-null="true" />
<property name="version" type="string" column="XWD_VERSION" length="255" not-null="true" />
<property name="customClass" type="string" column="XWD_CUSTOM_CLASS" length="255" not-null="true" />
<property name="parent" type="string" column="XWD_PARENT" length="511" not-null="true" />
<property name="xWikiClassXML" type="string">
<column name="XWD_CLASS_XML" length="40000" not-null="false" sql-type="clob(40000)" />
</property>
<property name="xWikiClassXML" type="materialized_clob" column="XWD_CLASS_XML" length="60000" not-null="false" />
<property name="elements" type="integer" not-null="true" column="XWD_ELEMENTS" />
<property name="defaultTemplate" type="string" column="XWD_DEFAULT_TEMPLATE" not-null="true" />
<property name="validationScript" type="string" column="XWD_VALIDATION_SCRIPT" not-null="true" />
......@@ -58,7 +54,7 @@
<key-property name="version2" column="XWR_VERSION2" type="integer" />
</composite-id>
<property name="date" type="timestamp" column="XWR_DATE" not-null="true" />
<property name="comment" type="text" column="XWR_COMMENT" not-null="true" />
<property name="comment" type="string" column="XWR_COMMENT" not-null="true" />
<property name="author" type="string" column="XWR_AUTHOR" not-null="true" />
<property name="diff" type="boolean" column="XWR_ISDIFF" not-null="false" update="false" insert="false" />
</class>
......@@ -71,7 +67,7 @@
</composite-id>
<component name="patch">
<property name="diff" type="boolean" column="XWR_ISDIFF" not-null="false" />
<property name="content" type="text" column="XWR_PATCH" not-null="false" length="1000000000" />
<property name="content" type="materialized_clob" column="XWR_PATCH" not-null="false" length="1000000000" />
</component>
</class>
......@@ -84,10 +80,8 @@
<property name="language" column="XDD_LANGUAGE" type="string" length="5" />
<property name="date" type="timestamp" column="XDD_DATE" />
</natural-id>
<property name="deleter" type="string" column="XDD_DELETER" index="deleter" />
<property name="xml" type="text">
<column name="XDD_XML" not-null="true" length="1000000000" sql-type="clob(1000000000)" />
</property>
<property name="deleter" type="string" column="XDD_DELETER" index="XDD_DELETER" />
<property name="xml" type="materialized_clob" column="XDD_XML" not-null="true" length="1000000000" />
</class>
<class name="com.xpn.xwiki.doc.DeletedAttachment" table="xwikiattrecyclebin" mutable="false">
......@@ -101,10 +95,8 @@
<property name="date" type="timestamp" column="XDA_DATE" />
</natural-id>
<property name="docName" column="XDA_DOC_NAME" type="string" length="255" />
<property name="deleter" type="string" column="XDA_DELETER" index="deleter" />
<property name="xml" type="text">
<column name="XDA_XML" not-null="true" length="1000000000" sql-type="clob(1000000000)" />
</property>
<property name="deleter" type="string" column="XDA_DELETER" index="XDA_DELETER" />
<property name="xml" type="materialized_clob" column="XDA_XML" not-null="true" length="1000000000" />
</class>
<class name="com.xpn.xwiki.doc.XWikiLock" table="xwikilock">
......@@ -143,9 +135,7 @@
<column name="XWA_ID" not-null="true" />
<generator class="assigned" />
</id>
<property name="content" type="binary">
<column name="XWA_CONTENT" length="1000000000" not-null="true" sql-type="blob(1000000000)" />
</property>
<property name="content" type="materialized_blob" column="XWA_CONTENT" length="1000000000" not-null="true" />
</class>
<class name="com.xpn.xwiki.doc.XWikiAttachmentArchive" table="xwikiattachment_archive">
......@@ -153,9 +143,7 @@
<column name="XWA_ID" not-null="true" />
<generator class="assigned" />
</id>
<property name="archive" type="binary">
<column name="XWA_ARCHIVE" length="1000000000" sql-type="blob(1000000000)" />
</property>
<property name="archive" type="materialized_blob" column="XWA_ARCHIVE" length="1000000000" />
</class>
<class name="com.xpn.xwiki.objects.BaseProperty" table="xwikiproperties">
......@@ -218,9 +206,7 @@
<column name="XWL_ID" />
<column name="XWL_NAME" />
</key>
<property name="value" type="string">
<column name="XWL_VALUE" length="60000" sql-type="clob(60000)" />
</property>
<property name="value" type="materialized_clob" column="XWL_VALUE" length="60000" />
</joined-subclass>
<joined-subclass name="com.xpn.xwiki.objects.StringListProperty" table="xwikilargestrings">
......@@ -228,9 +214,7 @@
<column name="XWL_ID" />
<column name="XWL_NAME" />
</key>
<property name="textValue" type="string">
<column name="XWL_VALUE" length="60000" sql-type="clob(60000)" />
</property>
<property name="textValue" type="materialized_clob" column="XWL_VALUE" length="60000" />
</joined-subclass>
<joined-subclass name="com.xpn.xwiki.objects.DBStringListProperty" table="xwikilists">
......@@ -339,21 +323,13 @@
<property name="webcopyright" type="string" column="XWP_WEBCOPYRIGHT" length="255" />
<property name="title" type="string" column="XWP_TITLE" length="255" />
<property name="version" type="string" column="XWP_VERSION" length="255" />
<property name="meta" type="string">
<column name="XWP_META" length="60000" sql-type="clob(60000)" />
</property>
<property name="meta" type="text" column="XWP_META" length="30000" />
<property name="use_email_verification" type="integer" column="XWP_USE_EMAIL_VERIFICATION" />
<property name="smtp_server" type="string" column="XWP_SMTP_SERVER" length="255" />
<property name="admin_email" type="string" column="XWP_ADMIN_EMAIL" length="255" />
<property name="validation_email_content" type="string">
<column name="XWP_VALIDATION_EMAIL_CONTENT" length="60000" sql-type="clob(60000)" />
</property>
<property name="confirmation_email_content" type="string">
<column name="XWP_CONFIRMATION_EMAIL_CONTENT" length="60000" sql-type="clob(60000)" />
</property>
<property name="invitation_email_content" type="string">
<column name="XWP_INVITATION_EMAIL_CONTENT" length="60000" sql-type="clob(60000)" />
</property>
<property name="validation_email_content" type="text" column="XWP_VALIDATION_EMAIL_CONTENT" length="30000" />
<property name="confirmation_email_content" type="text" column="XWP_CONFIRMATION_EMAIL_CONTENT" length="30000" />
<property name="invitation_email_content" type="text" column="XWP_INVITATION_EMAIL_CONTENT" length="30000" />
<property name="leftPanels" type="string" column="XWP_LEFT_PANELS" length="2000" />
<property name="rightPanels" type="string" column="XWP_RIGHT_PANELS" length="2000" />
<property name="showLeftPanels" type="integer" column="XWP_SHOW_LEFT_PANELS" />
......@@ -375,12 +351,8 @@
<generator class="assigned" />
</id>
<property name="author" type="string" column="XWC_AUTHOR" length="255" />
<property name="highlight" type="string">
<column name="XWC_HIGHLIGHT" length="60000" sql-type="clob(60000)" />
</property>
<property name="comment" type="string">
<column name="XWC_COMMENT" length="60000" sql-type="clob(60000)" />
</property>
<property name="highlight" type="materialized_clob" column="XWC_HIGHLIGHT" length="60000" />
<property name="comment" type="materialized_clob" column="XWC_COMMENT" length="60000" />
<property name="replyto" type="integer" column="XWP_REPLYTO" />
<property name="date" type="timestamp" column="XWP_DATE" />
</class>
......
<?xml version="1.0"?>
<!DOCTYPE hibernate-mapping PUBLIC
"-//Hibernate/Hibernate Mapping DTD//EN"
"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
<hibernate-mapping auto-import="true">
<!-- This file is a copy of xwiki.hbm.xml with the following modifications:
......@@ -41,15 +41,11 @@
<!-- This property is deprecated and should not be used anymore. Use .space instead. -->
<property name="web" type="string" update="false" insert="false" column="XWD_WEB" length="255" not-null="true" />
<property name="space" type="string" column="XWD_WEB" length="255" not-null="true" />
<property name="content" type="string">
<column name="XWD_CONTENT" sql-type="CLOB" length="200000" not-null="true" />
</property>
<property name="content" type="materialized_clob" column="XWD_CONTENT" length="200000" not-null="true" />
<property name="version" type="string" column="XWD_VERSION" length="255" not-null="true" />
<property name="customClass" type="string" column="XWD_CUSTOM_CLASS" length="255" not-null="true" />
<property name="parent" type="string" column="XWD_PARENT" length="511" not-null="true" />
<property name="xWikiClassXML" type="string">
<column name="XWD_CLASS_XML" sql-type="CLOB" length="40000" not-null="false" />
</property>
<property name="xWikiClassXML" type="materialized_clob" column="XWD_CLASS_XML" length="60000" not-null="false" />
<property name="elements" type="integer" not-null="true" column="XWD_ELEMENTS" />
<property name="defaultTemplate" type="string" column="XWD_DEFAULT_TEMPLATE" not-null="true" />
<property name="validationScript" type="string" column="XWD_VALIDATION_SCRIPT" not-null="true" />
......@@ -66,9 +62,7 @@
<key-property name="version2" column="XWR_VERSION2" type="integer" />
</composite-id>
<property name="date" type="timestamp" column="XWR_DATE" not-null="true" />
<property name="comment" type="text">
<column name="XWR_COMMENT" sql-type="clob" not-null="true" />
</property>
<property name="comment" type="string" column="XWR_COMMENT" not-null="true" />
<property name="author" type="string" column="XWR_AUTHOR" not-null="true" />
<property name="diff" type="boolean" column="XWR_ISDIFF" not-null="false" update="false" insert="false" />
</class>
......@@ -81,9 +75,7 @@
</composite-id>
<component name="patch">
<property name="diff" type="boolean" column="XWR_ISDIFF" not-null="false" />
<property name="content" type="text">
<column name="XWR_PATCH" sql-type="clob" not-null="false" length="1000000000" />
</property>
<property name="content" type="materialized_clob" column="XWR_PATCH" not-null="false" length="1000000000" />
</component>
</class>
......@@ -96,10 +88,8 @@
<property name="language" column="XDD_LANGUAGE" type="string" length="5" />
<property name="date" type="timestamp" column="XDD_DATE" />
</natural-id>
<property name="deleter" type="string" column="XDD_DELETER" index="deleter" />
<property name="xml" type="text">
<column name="XDD_XML" sql-type="clob" not-null="true" length="1000000000" />
</property>
<property name="deleter" type="string" column="XDD_DELETER" index="XDD_DELETER" />
<property name="xml" type="materialized_clob" column="XDD_XML" not-null="true" length="1000000000" />
</class>
<class name="com.xpn.xwiki.doc.DeletedAttachment" table="xwikiattrecyclebin" mutable="false">
......@@ -113,10 +103,8 @@
<property name="date" type="timestamp" column="XDA_DATE" />
</natural-id>
<property name="docName" column="XDA_DOC_NAME" type="string" length="255" />
<property name="deleter" type="string" column="XDA_DELETER" index="deleter" />
<property name="xml" type="text">
<column name="XDA_XML" sql-type="clob" not-null="true" length="1000000000" />
</property>
<property name="deleter" type="string" column="XDA_DELETER" index="XDA_DELETER" />
<property name="xml" type="materialized_clob" column="XDA_XML" not-null="true" length="1000000000" />
</class>
<class name="com.xpn.xwiki.doc.XWikiLock" table="xwikilock">
......@@ -155,9 +143,7 @@
<column name="XWA_ID" not-null="true" />
<generator class="assigned" />
</id>
<property name="content" type="binary" >
<column name="XWA_CONTENT" sql-type="BLOB" length="1000000000" not-null="true" />
</property>
<property name="content" type="materialized_blob" column="XWA_CONTENT" length="1000000000" not-null="true" />
</class>
<class name="com.xpn.xwiki.doc.XWikiAttachmentArchive" table="xwikiattachment_archive">
......@@ -165,9 +151,7 @@
<column name="XWA_ID" not-null="true" />
<generator class="assigned" />
</id>
<property name="archive" type="binary">
<column name="XWA_ARCHIVE" sql-type="BLOB" length="1000000000" />
</property>
<property name="archive" type="materialized_blob" column="XWA_ARCHIVE" length="1000000000" />
</class>
<class name="com.xpn.xwiki.objects.BaseProperty" table="xwikiproperties">
......@@ -230,9 +214,7 @@
<column name="XWL_ID" />
<column name="XWL_NAME" />
</key>
<property name="value" type="string">
<column name="XWL_VALUE" sql-type="CLOB" length="60000" />
</property>
<property name="value" type="materialized_clob" column="XWL_VALUE" length="60000" />
</joined-subclass>
<joined-subclass name="com.xpn.xwiki.objects.StringListProperty" table="xwikilargestrings">
......@@ -240,9 +222,7 @@
<column name="XWL_ID" />
<column name="XWL_NAME" />
</key>
<property name="textValue" type="string">
<column name="XWL_VALUE" sql-type="CLOB" length="60000" />
</property>
<property name="textValue" type="materialized_clob" column="XWL_VALUE" length="60000" />
</joined-subclass>
<joined-subclass name="com.xpn.xwiki.objects.DBStringListProperty" table="xwikilists">
......@@ -321,12 +301,8 @@
(new stats) -->
<property name="className" type="string" column="XWV_CLASSNAME" not-null="true" length="255" />
<property name="IP" type="string" column="XWV_IP" not-null="true" length="255" />
<property name="userAgent" type="string">
<column name="XWV_USER_AGENT" sql-type="clob" not-null="true" length="8192" />
</property>
<property name="cookie" type="string">
<column name="XWV_COOKIE" sql-type="clob" not-null="true" length="8192" />
</property>
<property name="userAgent" type="string" column="XWV_USER_AGENT" not-null="true" length="8192" />
<property name="cookie" type="string" column="XWV_COOKIE" not-null="true" length="8192" />
<property name="uniqueID" type="string" column="XWV_UNIQUE_ID" not-null="true" length="255" />
<property name="pageViews" type="integer" column="XWV_PAGE_VIEWS" not-null="false" />
<property name="pageSaves" type="integer" column="XWV_PAGE_SAVES" not-null="false" />
......@@ -355,21 +331,13 @@
<property name="webcopyright" type="string" column="XWP_WEBCOPYRIGHT" length="255" />
<property name="title" type="string" column="XWP_TITLE" length="255" />
<property name="version" type="string" column="XWP_VERSION" length="255" />
<property name="meta" type="string">
<column name="XWP_META" sql-type="CLOB" length="60000" />
</property>
<property name="meta" type="text" column="XWP_META" length="30000" />
<property name="use_email_verification" type="integer" column="XWP_USE_EMAIL_VERIFICATION" />
<property name="smtp_server" type="string" column="XWP_SMTP_SERVER" length="255" />
<property name="admin_email" type="string" column="XWP_ADMIN_EMAIL" length="255" />
<property name="validation_email_content" type="string">
<column name="XWP_VALIDATION_EMAIL_CONTENT" sql-type="CLOB" length="60000" />
</property>
<property name="confirmation_email_content" type="string">
<column name="XWP_CONFIRMATION_EMAIL_CONTENT" sql-type="CLOB" length="60000" />
</property>
<property name="invitation_email_content" type="string">
<column name="XWP_INVITATION_EMAIL_CONTENT" sql-type="CLOB" length="60000" />
</property>
<property name="validation_email_content" type="text" column="XWP_VALIDATION_EMAIL_CONTENT" length="30000" />
<property name="confirmation_email_content" type="text" column="XWP_CONFIRMATION_EMAIL_CONTENT" length="30000" />
<property name="invitation_email_content" type="text" column="XWP_INVITATION_EMAIL_CONTENT" length="30000" />
<property name="leftPanels" type="string" column="XWP_LEFT_PANELS" length="2000" />
<property name="rightPanels" type="string" column="XWP_RIGHT_PANELS" length="2000" />
<property name="showLeftPanels" type="integer" column="XWP_SHOW_LEFT_PANELS" />
......@@ -391,12 +359,8 @@
<generator class="assigned" />
</id>
<property name="author" type="string" column="XWC_AUTHOR" length="255" />
<property name="highlight" type="string">
<column name="XWC_HIGHLIGHT" sql-type="CLOB" length="60000" />
</property>
<property name="comment" type="string">
<column name="XWC_COMMENT" sql-type="CLOB" length="60000" />
</property>
<property name="highlight" type="materialized_clob" column="XWC_HIGHLIGHT" length="60000" />
<property name="comment" type="materialized_clob" column="XWC_COMMENT" length="60000" />
<property name="replyto" type="integer" column="XWP_REPLYTO" />
<property name="date" type="timestamp" column="XWP_DATE" />
</class>
......
<?xml version="1.0"?>
<!DOCTYPE hibernate-mapping PUBLIC
"-//Hibernate/Hibernate Mapping DTD//EN"
"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
<hibernate-mapping auto-import="true">
<!--
......@@ -33,11 +33,11 @@
<!-- This property is deprecated and should not be used anymore. Use .space instead. -->
<property name="web" type="string" update="false" insert="false" column="XWD_WEB" length="255" not-null="true" />
<property name="space" type="string" column="XWD_WEB" length="255" not-null="true" />
<property name="content" type="string" column="XWD_CONTENT" length="200000" not-null="true" />
<property name="content" type="text" column="XWD_CONTENT" length="200000" not-null="true" />
<property name="version" type="string" column="XWD_VERSION" length="255" not-null="true" />
<property name="customClass" type="string" column="XWD_CUSTOM_CLASS" length="255" not-null="true" />
<property name="parent" type="string" column="XWD_PARENT" length="511" not-null="true" />
<property name="xWikiClassXML" type="string" column="XWD_CLASS_XML" length="40000" not-null="false" />
<property name="xWikiClassXML" type="text" column="XWD_CLASS_XML" length="60000" not-null="false" />
<property name="elements" type="integer" not-null="true" column="XWD_ELEMENTS" />
<property name="defaultTemplate" type="string" column="XWD_DEFAULT_TEMPLATE" not-null="true" />
<property name="validationScript" type="string" column="XWD_VALIDATION_SCRIPT" not-null="true" />
......@@ -54,7 +54,7 @@
<key-property name="version2" column="XWR_VERSION2" type="integer" />
</composite-id>
<property name="date" type="timestamp" column="XWR_DATE" not-null="true" />
<property name="comment" type="text" column="XWR_COMMENT" not-null="true" />
<property name="comment" type="string" column="XWR_COMMENT" not-null="true" />
<property name="author" type="string" column="XWR_AUTHOR" not-null="true" />
<property name="diff" type="boolean" column="XWR_ISDIFF" not-null="false" update="false" insert="false" />
</class>
......@@ -67,7 +67,7 @@
</composite-id>
<component name="patch">
<property name="diff" type="boolean" column="XWR_ISDIFF" not-null="false" />
<property name="content" type="text" column="XWR_PATCH" not-null="false" length="1000000000" />
<property name="content" type="materialized_clob" column="XWR_PATCH" not-null="false" length="1000000000" />
</component>
</class>
......@@ -80,8 +80,8 @@
<property name="language" column="XDD_LANGUAGE" type="string" length="5" />
<property name="date" type="timestamp" column="XDD_DATE" />
</natural-id>
<property name="deleter" type="string" column="XDD_DELETER" index="deleter" />
<property name="xml" type="text" column="XDD_XML" not-null="true" length="1000000000" />
<property name="deleter" type="string" column="XDD_DELETER" index="XDD_DELETER" />
<property name="xml" type="materialized_clob" column="XDD_XML" not-null="true" length="1000000000" />
</class>
<class name="com.xpn.xwiki.doc.DeletedAttachment" table="xwikiattrecyclebin" mutable="false">
......@@ -95,8 +95,8 @@
<property name="date" type="timestamp" column="XDA_DATE" />
</natural-id>
<property name="docName" column="XDA_DOC_NAME" type="string" length="255" />
<property name="deleter" type="string" column="XDA_DELETER" index="deleter" />
<property name="xml" type="text" column="XDA_XML" not-null="true" length="1000000000" />
<property name="deleter" type="string" column="XDA_DELETER" index="XDA_DELETER" />
<property name="xml" type="materialized_clob" column="XDA_XML" not-null="true" length="1000000000" />
</class>
<class name="com.xpn.xwiki.doc.XWikiLock" table="xwikilock">
......@@ -135,7 +135,7 @@
<column name="XWA_ID" not-null="true" />
<generator class="assigned" />
</id>
<property name="content" type="binary" column="XWA_CONTENT" length="1000000000" not-null="true" />
<property name="content" type="materialized_blob" column="XWA_CONTENT" length="1000000000" not-null="true" />
</class>
<class name="com.xpn.xwiki.doc.XWikiAttachmentArchive" table="xwikiattachment_archive">
......@@ -143,7 +143,7 @@
<column name="XWA_ID" not-null="true" />
<generator class="assigned" />
</id>
<property name="archive" type="binary" column="XWA_ARCHIVE" length="1000000000" />
<property name="archive" type="materialized_blob" column="XWA_ARCHIVE" length="1000000000" />
</class>
<class name="com.xpn.xwiki.objects.BaseProperty" table="xwikiproperties">
......@@ -206,7 +206,7 @@
<column name="XWL_ID" />
<column name="XWL_NAME" />
</key>
<property name="value" type="string" column="XWL_VALUE" length="60000" />
<property name="value" type="text" column="XWL_VALUE" length="60000" />
</joined-subclass>
<joined-subclass name="com.xpn.xwiki.objects.StringListProperty" table="xwikilargestrings">
......@@ -214,7 +214,7 @@
<column name="XWL_ID" />
<column name="XWL_NAME" />
</key>
<property name="textValue" type="string" column="XWL_VALUE" length="60000" />
<property name="textValue" type="text" column="XWL_VALUE" length="60000" />
</joined-subclass>
<joined-subclass name="com.xpn.xwiki.objects.DBStringListProperty" table="xwikilists">
......@@ -323,13 +323,13 @@
<property name="webcopyright" type="string" column="XWP_WEBCOPYRIGHT" length="255" />
<property name="title" type="string" column="XWP_TITLE" length="255" />
<property name="version" type="string" column="XWP_VERSION" length="255" />
<property name="meta" type="string" column="XWP_META" length="60000" />
<property name="meta" type="text" column="XWP_META" length="30000" />
<property name="use_email_verification" type="integer" column="XWP_USE_EMAIL_VERIFICATION" />
<property name="smtp_server" type="string" column="XWP_SMTP_SERVER" length="255" />
<property name="admin_email" type="string" column="XWP_ADMIN_EMAIL" length="255" />
<property name="validation_email_content" type="string" column="XWP_VALIDATION_EMAIL_CONTENT" length="60000" />
<property name="confirmation_email_content" type="string" column="XWP_CONFIRMATION_EMAIL_CONTENT" length="60000" />
<property name="invitation_email_content" type="string" column="XWP_INVITATION_EMAIL_CONTENT" length="60000" />
<property name="validation_email_content" type="text" column="XWP_VALIDATION_EMAIL_CONTENT" length="30000" />
<property name="confirmation_email_content" type="text" column="XWP_CONFIRMATION_EMAIL_CONTENT" length="30000" />
<property name="invitation_email_content" type="text" column="XWP_INVITATION_EMAIL_CONTENT" length="30000" />
<property name="leftPanels" type="string" column="XWP_LEFT_PANELS" length="2000" />
<property name="rightPanels" type="string" column="XWP_RIGHT_PANELS" length="2000" />
<property name="showLeftPanels" type="integer" column="XWP_SHOW_LEFT_PANELS" />
......@@ -351,8 +351,8 @@
<generator class="assigned" />
</id>
<property name="author" type="string" column="XWC_AUTHOR" length="255" />
<property name="highlight" type="string" column="XWC_HIGHLIGHT" length="60000" />
<property name="comment" type="string" column="XWC_COMMENT" length="60000" />
<property name="highlight" type="text" column="XWC_HIGHLIGHT" length="60000" />
<property name="comment" type="text" column="XWC_COMMENT" length="60000" />
<property name="replyto" type="integer" column="XWP_REPLYTO" />
<property name="date" type="timestamp" column="XWP_DATE" />
</class>
......
<?xml version="1.0"?>
<!DOCTYPE hibernate-mapping PUBLIC
"-//Hibernate/Hibernate Mapping DTD//EN"
"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
<hibernate-mapping auto-import="true">
<!--
......@@ -33,11 +33,11 @@
<!-- This property is deprecated and should not be used anymore. Use .space instead. -->
<property name="web" type="string" update="false" insert="false" column="XWD_WEB" length="255" not-null="true" />
<property name="space" type="string" column="XWD_WEB" length="255" not-null="true" />
<property name="content" type="text" column="XWD_CONTENT" length="200000" not-null="true" />
<property name="content" type="materialized_clob" column="XWD_CONTENT" length="200000" not-null="true" />
<property name="version" type="string" column="XWD_VERSION" length="255" not-null="true" />
<property name="customClass" type="string" column="XWD_CUSTOM_CLASS" length="255" not-null="true" />
<property name="parent" type="string" column="XWD_PARENT" length="511" not-null="true" />
<property name="xWikiClassXML" type="text" column="XWD_CLASS_XML" length="40000" not-null="false" />
<property name="xWikiClassXML" type="materialized_clob" column="XWD_CLASS_XML" length="60000" not-null="false" />
<property name="elements" type="integer" not-null="true" column="XWD_ELEMENTS" />
<property name="defaultTemplate" type="string" column="XWD_DEFAULT_TEMPLATE" not-null="true" />
<property name="validationScript" type="string" column="XWD_VALIDATION_SCRIPT" not-null="true" />
......@@ -54,7 +54,7 @@
<key-property name="version2" column="XWR_VERSION2" type="integer" />
</composite-id>
<property name="date" type="timestamp" column="XWR_DATE" not-null="true" />
<property name="comment" type="text" column="XWR_COMMENT" not-null="true" />
<property name="comment" type="string" column="XWR_COMMENT" not-null="true" />
<property name="author" type="string" column="XWR_AUTHOR" not-null="true" />
<property name="diff" type="boolean" column="XWR_ISDIFF" not-null="false" update="false" insert="false" />
</class>
......@@ -67,7 +67,7 @@
</composite-id>
<component name="patch">
<property name="diff" type="boolean" column="XWR_ISDIFF" not-null="false" />
<property name="content" type="text" column="XWR_PATCH" not-null="false" length="1000000000" />
<property name="content" type="materialized_clob" column="XWR_PATCH" not-null="false" length="1000000000" />
</component>
</class>
......@@ -80,8 +80,8 @@
<property name="language" column="XDD_LANGUAGE" type="string" length="5" />
<property name="date" type="timestamp" column="XDD_DATE" />
</natural-id>
<property name="deleter" type="string" column="XDD_DELETER" index="deleter" />
<property name="xml" type="text" column="XDD_XML" not-null="true" length="1000000000" />
<property name="deleter" type="string" column="XDD_DELETER" index="XDD_DELETER" />
<property name="xml" type="materialized_clob" column="XDD_XML" not-null="true" length="1000000000" />
</class>
<class name="com.xpn.xwiki.doc.DeletedAttachment" table="xwikiattrecyclebin" mutable="false">
......@@ -95,10 +95,8 @@
<property name="date" type="timestamp" column="XDA_DATE" />
</natural-id>
<property name="docName" column="XDA_DOC_NAME" type="string" length="255" />
<property name="deleter" type="string" column="XDA_DELETER" index="deleter" />
<property name="xml" type="text" >
<column name="XDA_XML" sql-type="varchar(max)" not-null="true" />
</property>
<property name="deleter" type="string" column="XDA_DELETER" index="XDA_DELETER" />
<property name="xml" type="materialized_clob" column="XDA_XML" not-null="true" length="1000000000" />
</class>
<class name="com.xpn.xwiki.doc.XWikiLock" table="xwikilock">
......@@ -137,7 +135,7 @@
<column name="XWA_ID" not-null="true" />
<generator class="assigned" />
</id>
<property name="content" type="binary" column="XWA_CONTENT" length="1000000000" not-null="true" />
<property name="content" type="materialized_blob" column="XWA_CONTENT" length="1000000000" not-null="true" />
</class>
<class name="com.xpn.xwiki.doc.XWikiAttachmentArchive" table="xwikiattachment_archive">
......@@ -145,7 +143,7 @@
<column name="XWA_ID" not-null="true" />
<generator class="assigned" />
</id>
<property name="archive" type="binary" column="XWA_ARCHIVE" length="1000000000" />
<property name="archive" type="materialized_blob" column="XWA_ARCHIVE" length="1000000000" />
</class>
<class name="com.xpn.xwiki.objects.BaseProperty" table="xwikiproperties">
......@@ -325,15 +323,15 @@
<property name="webcopyright" type="string" column="XWP_WEBCOPYRIGHT" length="255" />
<property name="title" type="string" column="XWP_TITLE" length="255" />
<property name="version" type="string" column="XWP_VERSION" length="255" />
<property name="meta" type="text" column="XWP_META" length="60000" />
<property name="meta" type="text" column="XWP_META" length="30000" />
<property name="use_email_verification" type="integer" column="XWP_USE_EMAIL_VERIFICATION" />
<property name="smtp_server" type="string" column="XWP_SMTP_SERVER" length="255" />
<property name="admin_email" type="string" column="XWP_ADMIN_EMAIL" length="255" />
<property name="validation_email_content" type="text" column="XWP_VALIDATION_EMAIL_CONTENT" length="60000" />
<property name="confirmation_email_content" type="text" column="XWP_CONFIRMATION_EMAIL_CONTENT" length="60000" />
<property name="invitation_email_content" type="text" column="XWP_INVITATION_EMAIL_CONTENT" length="60000" />
<property name="leftPanels" type="string" column="XWP_LEFT_PANELS" length="2000" />
<property name="rightPanels" type="string" column="XWP_RIGHT_PANELS" length="2000" />
<property name="validation_email_content" type="text" column="XWP_VALIDATION_EMAIL_CONTENT" length="30000" />
<property name="confirmation_email_content" type="text" column="XWP_CONFIRMATION_EMAIL_CONTENT" length="30000" />
<property name="invitation_email_content" type="text" column="XWP_INVITATION_EMAIL_CONTENT" length="30000" />
<property name="leftPanels" type="text" column="XWP_LEFT_PANELS" length="2000" />
<property name="rightPanels" type="text" column="XWP_RIGHT_PANELS" length="2000" />
<property name="showLeftPanels" type="integer" column="XWP_SHOW_LEFT_PANELS" />
<property name="showRightPanels" type="integer" column="XWP_SHOW_RIGHT_PANELS" />
<property name="languages" type="string" column="XWP_LANGUAGES" length="255" />
......@@ -343,7 +341,7 @@
<property name="edit_registered" type="string" column="XWP_EDIT_REGISTERED" length="255" />
<property name="comment_anonymous" type="string" column="XWP_COMMENT_ANONYMOUS" length="255" />
<property name="comment_registered" type="string" column="XWP_COMMENT_REGISTERED" length="255" />
<property name="documentBundles" type="string" column="XWP_DOCUMENT_BUNDLES" length="255" />
<property name="documentBundles" type="text" column="XWP_DOCUMENT_BUNDLES" length="2000" />
</class>
<!-- XWikiComments custom mapping -->
......
<?xml version="1.0"?>
<!DOCTYPE hibernate-mapping PUBLIC
"-//Hibernate/Hibernate Mapping DTD//EN"
"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
<hibernate-mapping auto-import="true">
<!--
......@@ -36,22 +36,14 @@
<!-- This property is deprecated and should not be used anymore. Use .space instead. -->
<property name="web" type="string" update="false" insert="false" column="XWD_WEB" length="255" not-null="true" />
<property name="space" type="string" column="XWD_WEB" length="255" not-null="true" />
<property name="content" type="string">
<column name="XWD_CONTENT" length="200000" not-null="false" sql-type="clob" />
</property>
<property name="content" type="materialized_clob" column="XWD_CONTENT" length="200000" not-null="false" />
<property name="version" type="string" column="XWD_VERSION" length="255" not-null="true" />
<property name="customClass" type="string" column="XWD_CUSTOM_CLASS" length="255" />
<property name="parent" type="string" column="XWD_PARENT" length="511" />
<property name="xWikiClassXML" type="string">
<column name="XWD_CLASS_XML" length="40000" not-null="false" sql-type="clob" />
</property>
<property name="xWikiClassXML" type="materialized_clob" column="XWD_CLASS_XML" length="60000" not-null="false" />
<property name="elements" type="integer" not-null="true" column="XWD_ELEMENTS" />
<property name="defaultTemplate" type="string">
<column name="XWD_DEFAULT_TEMPLATE" sql-type="clob" />
</property>
<property name="validationScript" type="string">
<column name="XWD_VALIDATION_SCRIPT" sql-type="clob" />
</property>
<property name="defaultTemplate" type="string" column="XWD_DEFAULT_TEMPLATE" />
<property name="validationScript" type="string" column="XWD_VALIDATION_SCRIPT" />
<property name="comment" type="string" column="XWD_COMMENT" length="1023" />
<property name="minorEdit1" type="boolean" column="XWD_MINOREDIT" not-null="true" />
<property name="syntaxId" type="string" column="XWD_SYNTAX_ID" length="50" />
......@@ -65,9 +57,7 @@
<key-property name="version2" column="XWR_VERSION2" type="integer" />
</composite-id>
<property name="date" type="timestamp" column="XWR_DATE" not-null="true" />
<property name="comment" type="text">
<column name="XWR_COMMENT" sql-type="clob" />
</property>
<property name="comment" type="string" column="XWR_COMMENT" />
<property name="author" type="string" column="XWR_AUTHOR" />
<property name="diff" type="boolean" column="XWR_ISDIFF" not-null="false" update="false" insert="false" />
</class>
......@@ -80,9 +70,7 @@
</composite-id>
<component name="patch">
<property name="diff" type="boolean" column="XWR_ISDIFF" not-null="false" />
<property name="content" type="text">
<column name="XWR_PATCH" sql-type="clob" not-null="false" length="1000000000" />
</property>
<property name="content" type="materialized_clob" column="XWR_PATCH" not-null="false" length="1000000000" />
</component>
</class>
......@@ -95,10 +83,8 @@
<property name="language" column="XDD_LANGUAGE" type="string" length="5" not-null="false" />
<property name="date" type="timestamp" column="XDD_DATE" />
</natural-id>
<property name="deleter" type="string" column="XDD_DELETER" index="deleter" />
<property name="xml" type="text">
<column name="XDD_XML" sql-type="clob" not-null="true" length="1000000000" />
</property>
<property name="deleter" type="string" column="XDD_DELETER" index="XDD_DELETER" />
<property name="xml" type="materialized_clob" column="XDD_XML" not-null="true" length="1000000000" />
</class>
<class name="com.xpn.xwiki.doc.DeletedAttachment" table="xwikiattrecyclebin" mutable="false">
......@@ -112,10 +98,8 @@
<property name="date" type="timestamp" column="XDA_DATE" />
</natural-id>
<property name="docName" column="XDA_DOC_NAME" type="string" length="255" />
<property name="deleter" type="string" column="XDA_DELETER" index="deleter" />
<property name="xml" type="text">
<column name="XDA_XML" sql-type="clob" not-null="true" length="1000000000" />
</property>
<property name="deleter" type="string" column="XDA_DELETER" index="XDA_DELETER" />
<property name="xml" type="materialized_clob" column="XDA_XML" not-null="true" length="1000000000" />
</class>
<class name="com.xpn.xwiki.doc.XWikiLock" table="xwikilock">
......@@ -146,7 +130,7 @@
<property name="date" type="timestamp" column="XWA_DATE" not-null="true" />
<property name="author" type="string" column="XWA_AUTHOR" length="255" />
<property name="version" type="string" column="XWA_VERSION" length="255" not-null="true" />
<property name="comment" type="string" column="XWA_COMMENT" length="1023" />
<property name="comment" type="string" column="XWA_COMMENT" length="255" />
</class>
<class name="com.xpn.xwiki.doc.XWikiAttachmentContent" table="xwikiattachment_content">
......@@ -154,7 +138,7 @@
<column name="XWA_ID" not-null="true" sql-type="integer" />
<generator class="assigned" />
</id>
<property name="content" type="binary" column="XWA_CONTENT" length="1000000000" not-null="true" />
<property name="content" type="materialized_blob" column="XWA_CONTENT" length="1000000000" not-null="true" />
</class>
<class name="com.xpn.xwiki.doc.XWikiAttachmentArchive" table="xwikiattachment_archive">
......@@ -162,7 +146,7 @@
<column name="XWA_ID" not-null="true" sql-type="integer" />
<generator class="assigned" />
</id>
<property name="archive" type="binary" column="XWA_ARCHIVE" length="1000000000" />
<property name="archive" type="materialized_blob" column="XWA_ARCHIVE" length="1000000000" />
</class>
<class name="com.xpn.xwiki.objects.BaseProperty" table="xwikiproperties">
......@@ -225,9 +209,7 @@
<column name="XWL_ID" />
<column name="XWL_NAME" />
</key>
<property name="value" type="string">
<column name="XWL_VALUE" length="60000" sql-type="clob" />
</property>
<property name="value" type="materialized_clob" column="XWL_VALUE" length="60000" />
</joined-subclass>
<joined-subclass name="com.xpn.xwiki.objects.StringListProperty" table="xwikilargestrings">
......@@ -235,9 +217,7 @@
<column name="XWL_ID" />
<column name="XWL_NAME" />
</key>
<property name="textValue" type="string">
<column name="XWL_VALUE" length="60000" sql-type="clob" />
</property>
<property name="textValue" type="materialized_clob" column="XWL_VALUE" length="60000" />
</joined-subclass>
<joined-subclass name="com.xpn.xwiki.objects.DBStringListProperty" table="xwikilists">
......@@ -298,14 +278,11 @@
name is empty ("") or null. Thus this column can now contain both "internal" (old stats) and ""
(new stats) -->
<property name="className" type="string" column="XWR_CLASSNAME" not-null="true" length="255" />
<property name="referer" type="string">
<column name="XWR_REFERER" not-null="true" length="8192" sql-type="clob" />
</property>
<property name="referer" type="text" column="XWR_REFERER" not-null="true" length="8192" />
<property name="pageViews" type="integer" column="XWR_PAGE_VIEWS" not-null="false" />
<property name="period" type="integer" column="XWR_PERIOD" not-null="false" />
</class>
<class name="com.xpn.xwiki.stats.impl.VisitStats" table="xwikistatsvisit">
<id name="id" type="integer" unsaved-value="undefined">
<column name="XWV_ID" not-null="true" />
......@@ -319,12 +296,8 @@
(new stats) -->
<property name="className" type="string" column="XWV_CLASSNAME" not-null="true" length="255" />
<property name="IP" type="string" column="XWV_IP" not-null="true" length="255" />
<property name="userAgent" type="string">
<column name="XWV_USER_AGENT" sql-type="clob" not-null="true" length="8192" />
</property>
<property name="cookie" type="string">
<column name="XWV_COOKIE" sql-type="clob" not-null="true" length="8192" />
</property>
<property name="userAgent" type="text" column="XWV_USER_AGENT" not-null="true" length="8192" />
<property name="cookie" type="text" column="XWV_COOKIE" not-null="true" length="8192" />
<property name="uniqueID" type="string" column="XWV_UNIQUE_ID" not-null="true" length="255" />
<property name="pageViews" type="integer" column="XWV_PAGE_VIEWS" not-null="false" />
<property name="pageSaves" type="integer" column="XWV_PAGE_SAVES" not-null="false" />
......@@ -353,21 +326,13 @@
<property name="webcopyright" type="string" column="XWP_WEBCOPYRIGHT" length="255" />
<property name="title" type="string" column="XWP_TITLE" length="255" />
<property name="version" type="string" column="XWP_VERSION" length="255" />
<property name="meta" type="string">
<column name="XWP_META" length="60000" sql-type="clob" />
</property>
<property name="meta" type="text" column="XWP_META" length="30000" />
<property name="use_email_verification" type="integer" column="XWP_USE_EMAIL_VERIFICATION" />
<property name="smtp_server" type="string" column="XWP_SMTP_SERVER" length="255" />
<property name="admin_email" type="string" column="XWP_ADMIN_EMAIL" length="255" />
<property name="validation_email_content" type="string">
<column name="XWP_VALIDATION_EMAIL_CONTENT" length="60000" sql-type="clob" />
</property>
<property name="confirmation_email_content" type="string">
<column name="XWP_CONFIRMATION_EMAIL_CONTENT" length="60000" sql-type="clob" />
</property>
<property name="invitation_email_content" type="string">
<column name="XWP_INVITATION_EMAIL_CONTENT" length="60000" sql-type="clob" />
</property>
<property name="validation_email_content" type="text" column="XWP_VALIDATION_EMAIL_CONTENT" length="30000" />
<property name="confirmation_email_content" type="text" column="XWP_CONFIRMATION_EMAIL_CONTENT" length="30000" />
<property name="invitation_email_content" type="text" column="XWP_INVITATION_EMAIL_CONTENT" length="30000" />
<property name="leftPanels" type="string" column="XWP_LEFT_PANELS" length="2000" />
<property name="rightPanels" type="string" column="XWP_RIGHT_PANELS" length="2000" />
<property name="showLeftPanels" type="integer" column="XWP_SHOW_LEFT_PANELS" />
......@@ -389,12 +354,8 @@
<generator class="assigned" />
</id>
<property name="author" type="string" column="XWC_AUTHOR" length="255" />
<property name="highlight" type="string">
<column name="XWC_HIGHLIGHT" length="60000" sql-type="clob" />
</property>
<property name="comment" type="string">
<column name="XWC_COMMENT" length="60000" sql-type="clob" />
</property>
<property name="highlight" type="materialized_clob" column="XWC_HIGHLIGHT" length="60000" />
<property name="comment" type="materialized_clob" column="XWC_COMMENT" length="60000" />
<property name="replyto" type="integer" column="XWP_REPLYTO" />
<property name="date" type="timestamp" column="XWP_DATE" />
</class>
......
<?xml version='1.0' encoding='utf-8'?>
<!DOCTYPE hibernate-configuration PUBLIC "-//Hibernate/Hibernate Configuration DTD//EN"
"http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
<!DOCTYPE hibernate-configuration PUBLIC
"-//Hibernate/Hibernate Configuration DTD//EN"
"http://www.hibernate.org/dtd/hibernate-configuration-3.0.dtd">
## Template for hibernate configuration. processing by maven using profiles.
## Replace original src/main/webapp/WEB-INF/hibernate.cfg.xml
<hibernate-configuration>
......
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