Author: amelentev
Date: 2007-10-09 17:14:11 +0200 (Tue, 09 Oct 2007)
New Revision: 5332
Modified:
xwiki-platform/core/trunk/xwiki-core/src/main/resources/xwiki.derby.hbm.xml
xwiki-platform/core/trunk/xwiki-core/src/main/resources/xwiki.hbm.xml
xwiki-platform/core/trunk/xwiki-core/src/main/resources/xwiki.oracle.hbm.xml
Log:
Sync standard,derby&oracle hbm configurations. (RCS,recyclebin,migrations)
Fix some formatting.
Modified:
xwiki-platform/core/trunk/xwiki-core/src/main/resources/xwiki.derby.hbm.xml
===================================================================
--- xwiki-platform/core/trunk/xwiki-core/src/main/resources/xwiki.derby.hbm.xml
2007-10-09 13:24:49 UTC (rev 5331)
+++ xwiki-platform/core/trunk/xwiki-core/src/main/resources/xwiki.derby.hbm.xml
2007-10-09 15:14:11 UTC (rev 5332)
@@ -114,11 +114,11 @@
<class name="com.xpn.xwiki.doc.rcs.XWikiRCSNodeInfo" table="xwikircs">
<composite-id name="id" class="com.xpn.xwiki.doc.rcs.XWikiRCSNodeId">
- <key-property name="docId" column="XWR_DOCID" type="long" />
+ <key-property name="docId" column="XWR_DOCID" type="long" />
<key-property name="version1" column="XWR_VERSION1" type="integer"
/>
<key-property name="version2" column="XWR_VERSION2" type="integer"
/>
</composite-id>
- <property name="date" type="timestamp" column="XWR_UPDATE_DATE"
not-null="true" />
+ <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>
@@ -127,31 +127,31 @@
</class>
<class name="com.xpn.xwiki.doc.rcs.XWikiRCSNodeContent" table="xwikircs">
<composite-id name="id" class="com.xpn.xwiki.doc.rcs.XWikiRCSNodeId">
- <key-property name="docId" column="XWR_DOCID" type="long" />
+ <key-property name="docId" column="XWR_DOCID" type="long" />
<key-property name="version1" column="XWR_VERSION1" type="integer"
/>
<key-property name="version2" column="XWR_VERSION2" type="integer"
/>
</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" />
- </property>
+ <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>
</component>
</class>
<class name="com.xpn.xwiki.doc.XWikiDeletedDocument"
table="xwikirecyclebin" mutable="false">
- <id name="id" column="XDD_ID">
- <generator class="native" />
- </id>
- <natural-id mutable="false">
+ <id name="id" column="XDD_ID">
+ <generator class="native" />
+ </id>
+ <natural-id mutable="false">
<property name="fullName" column="XDD_FULLNAME" type="string"
length="255" />
- <property name="language" column="XDD_LANGUAGE" type="string"
length="5" />
+ <property name="language" column="XDD_LANGUAGE" type="string"
length="5" />
<property name="date" type="timestamp" column="XDD_DATE" />
- <property name="deleter" type="string" column="XDD_DELETER" />
- </natural-id>
- <property name="xml" type="text">
- <column name="XDD_XML" sql-type="clob" not-null="true" />
- </property>
+ </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>
</class>
<class name="com.xpn.xwiki.doc.XWikiLock" table="xwikilock">
@@ -859,5 +859,12 @@
</property>
</class>
-->
+
+ <class name="com.xpn.xwiki.store.migration.XWikiDBVersion"
table="xwikidbversion">
+ <id name="version" type="integer" unsaved-value="undefined">
+ <column name="XWV_VERSION" not-null="true" />
+ <generator class="assigned" />
+ </id>
+ </class>
</hibernate-mapping>
Modified: xwiki-platform/core/trunk/xwiki-core/src/main/resources/xwiki.hbm.xml
===================================================================
--- xwiki-platform/core/trunk/xwiki-core/src/main/resources/xwiki.hbm.xml
2007-10-09 13:24:49 UTC (rev 5331)
+++ xwiki-platform/core/trunk/xwiki-core/src/main/resources/xwiki.hbm.xml
2007-10-09 15:14:11 UTC (rev 5332)
@@ -106,7 +106,7 @@
<class name="com.xpn.xwiki.doc.rcs.XWikiRCSNodeInfo" table="xwikircs">
<composite-id name="id" class="com.xpn.xwiki.doc.rcs.XWikiRCSNodeId">
- <key-property name="docId" column="XWR_DOCID" type="long" />
+ <key-property name="docId" column="XWR_DOCID" type="long" />
<key-property name="version1" column="XWR_VERSION1" type="integer"
/>
<key-property name="version2" column="XWR_VERSION2" type="integer"
/>
</composite-id>
@@ -123,24 +123,24 @@
<key-property name="version2" column="XWR_VERSION2" type="integer"
/>
</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" />
+ <property name="diff" type="boolean" column="XWR_ISDIFF"
not-null="false" />
+ <property name="content" type="text" column="XWR_PATCH"
not-null="false" length="1000000000" />
</component>
</class>
<class name="com.xpn.xwiki.doc.XWikiDeletedDocument"
table="xwikirecyclebin" mutable="false">
- <id name="id" column="XDD_ID">
- <generator class="native" />
- </id>
+ <id name="id" column="XDD_ID">
+ <generator class="native" />
+ </id>
<natural-id mutable="false">
<property name="fullName" column="XDD_FULLNAME" type="string"
length="255" />
- <property name="language" column="XDD_LANGUAGE" type="string"
length="5" />
+ <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"/>
- </property>
+ <property name="xml" type="text">
+ <column name="XDD_XML" not-null="true" length="1000000000"/>
+ </property>
</class>
<class name="com.xpn.xwiki.doc.XWikiLock" table="xwikilock">
Modified:
xwiki-platform/core/trunk/xwiki-core/src/main/resources/xwiki.oracle.hbm.xml
===================================================================
---
xwiki-platform/core/trunk/xwiki-core/src/main/resources/xwiki.oracle.hbm.xml
2007-10-09 13:24:49 UTC (rev 5331)
+++
xwiki-platform/core/trunk/xwiki-core/src/main/resources/xwiki.oracle.hbm.xml
2007-10-09 15:14:11 UTC (rev 5332)
@@ -108,43 +108,44 @@
<class name="com.xpn.xwiki.doc.rcs.XWikiRCSNodeInfo" table="xwikircs">
<composite-id name="id" class="com.xpn.xwiki.doc.rcs.XWikiRCSNodeId">
- <key-property name="docId" column="XWR_DOCID" type="long" />
+ <key-property name="docId" column="XWR_DOCID" type="long" />
<key-property name="version1" column="XWR_VERSION1" type="integer"
/>
<key-property name="version2" column="XWR_VERSION2" type="integer"
/>
</composite-id>
- <property name="date" type="timestamp" column="XWR_UPDATE_DATE"
not-null="true" />
+ <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="author" type="string" column="XWR_AUTHOR"
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>
+
<class name="com.xpn.xwiki.doc.rcs.XWikiRCSNodeContent" table="xwikircs">
<composite-id name="id" class="com.xpn.xwiki.doc.rcs.XWikiRCSNodeId">
- <key-property name="docId" column="XWR_DOCID" type="long" />
+ <key-property name="docId" column="XWR_DOCID" type="long" />
<key-property name="version1" column="XWR_VERSION1" type="integer"
/>
<key-property name="version2" column="XWR_VERSION2" type="integer"
/>
</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" />
- </property>
+ <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>
</component>
</class>
<class name="com.xpn.xwiki.doc.XWikiDeletedDocument"
table="xwikirecyclebin" mutable="false">
- <id name="id" column="XDD_ID">
+ <id name="id" column="XDD_ID">
<generator class="native" />
- </id>
- <natural-id mutable="false">
+ </id>
+ <natural-id mutable="false">
<property name="fullName" column="XDD_FULLNAME" type="string"
length="255" />
- <property name="language" column="XDD_LANGUAGE" type="string"
length="5" />
+ <property name="language" column="XDD_LANGUAGE" type="string"
length="5" />
<property name="date" type="timestamp" column="XDD_DATE" />
- <property name="deleter" type="string" column="XDD_DELETER" />
- </natural-id>
- <property name="xml" type="text">
- <column name="XDD_XML" sql-type="clob" not-null="true" />
+ </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>
</class>
@@ -853,6 +854,11 @@
</property>
</class>
-->
+
+ <class name="com.xpn.xwiki.store.migration.XWikiDBVersion"
table="xwikidbversion">
+ <id name="version" type="integer" unsaved-value="undefined">
+ <column name="XWV_VERSION" not-null="true" />
+ <generator class="assigned" />
+ </id>
+ </class>
</hibernate-mapping>
-
-
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
