Index: core/src/main/java/com/xpn/xwiki/doc/XWikiAttachment.java
===================================================================
--- core/src/main/java/com/xpn/xwiki/doc/XWikiAttachment.java	(revision 2520)
+++ core/src/main/java/com/xpn/xwiki/doc/XWikiAttachment.java	(working copy)
@@ -174,11 +174,11 @@
     }
 
     public String getComment() {
-        return comment;
+        return comment != null ? comment : "";
     }
 
     public void setComment(String comment) {
-        if (!comment.equals(this.comment)) {
+        if (!getComment().equals(comment)) {
             setMetaDataDirty(true);
         }
         this.comment = comment;
Index: core/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java
===================================================================
--- core/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java	(revision 2520)
+++ core/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java	(working copy)
@@ -321,12 +321,12 @@
 
     public String getParent()
     {
-        return parent.trim();
+        return parent != null ? parent : "";
     }
 
     public void setParent(String parent)
     {
-        if (!parent.equals(this.parent)) {
+        if (parent != null && !parent.equals(this.parent)) {
             setMetaDataDirty(true);
         }
         this.parent = parent;
@@ -397,11 +397,7 @@
 
     public String getTitle()
     {
-        if (title == null) {
-            return "";
-        } else {
-            return title;
-        }
+			return title != null ? title : "";
     }
 
     /**
@@ -472,10 +468,7 @@
 
     public void setTitle(String title)
     {
-        if (title == null) {
-            title = "";
-        }
-        if (!title.equals(this.title)) {
+        if (title != null && !title.equals(this.title)) {
             setContentDirty(true);
         }
         this.title = title;
@@ -483,11 +476,7 @@
 
     public String getFormat()
     {
-        if (format == null) {
-            return "";
-        } else {
-            return format;
-        }
+			return format != null ? format : "";
     }
 
     public void setFormat(String format)
@@ -500,25 +489,17 @@
 
     public String getAuthor()
     {
-        if (author == null) {
-            return "";
-        } else {
-            return author.trim();
-        }
+			return author != null ? author.trim() : "";
     }
 
     public String getContentAuthor()
     {
-        if (contentAuthor == null) {
-            return "";
-        } else {
-            return contentAuthor.trim();
-        }
+			return contentAuthor != null ? contentAuthor.trim() : "";
     }
 
     public void setAuthor(String author)
     {
-        if (!getAuthor().equals(this.author)) {
+        if (!getAuthor().equals(author)) {
             setMetaDataDirty(true);
         }
         this.author = author;
@@ -526,7 +507,7 @@
 
     public void setContentAuthor(String contentAuthor)
     {
-        if (!getContentAuthor().equals(this.contentAuthor)) {
+        if (!getContentAuthor().equals(contentAuthor)) {
             setMetaDataDirty(true);
         }
         this.contentAuthor = contentAuthor;
@@ -534,16 +515,12 @@
 
     public String getCreator()
     {
-        if (creator == null) {
-            return "";
-        } else {
-            return creator.trim();
-        }
+			return creator != null ? creator.trim() : "";
     }
 
     public void setCreator(String creator)
     {
-        if (!getCreator().equals(this.creator)) {
+        if (!getCreator().equals(creator)) {
             setMetaDataDirty(true);
         }
         this.creator = creator;
@@ -581,7 +558,7 @@
 
     public void setCreationDate(Date date)
     {
-        if ((date != null) && (!creationDate.equals(this.creationDate))) {
+        if ((date != null) && (!date.equals(creationDate))) {
             setMetaDataDirty(true);
         }
 
Index: core/src/main/resources/xwiki.hbm.xml
===================================================================
--- core/src/main/resources/xwiki.hbm.xml	(revision 2520)
+++ core/src/main/resources/xwiki.hbm.xml	(working copy)
@@ -7,7 +7,7 @@
     <!-- com.xpn.xwiki.doc.XWikiDocument root -->
     <class name="com.xpn.xwiki.doc.XWikiDocument" table="xwikidoc">
         <id name="id" type="long" unsaved-value="undefined">
-            <column name="XWD_ID" not-null="true"/>
+            <column name="XWD_ID" not-null="true" sql-type="integer"/>
             <generator class="assigned" />
         </id>
         <property name="fullName" type="string">
@@ -15,11 +15,11 @@
         </property>
 
         <property name="name" type="string">
-            <column name="XWD_NAME" length="255" not-null="true"/>
+            <column name="XWD_NAME" length="255"/>
         </property>
 
         <property name="title" type="string">
-            <column name="XWD_TITLE" length="255" not-null="true"/>
+            <column name="XWD_TITLE" length="255"/>
         </property>
 
         <property name="language" type="string">
@@ -43,26 +43,26 @@
         </property>
 
         <property name="creationDate" type="timestamp">
-            <column name="XWD_CREATION_DATE" not-null="true" />
+            <column name="XWD_CREATION_DATE"/>
         </property>
 
         <property name="author" type="string">
-            <column name="XWD_AUTHOR" length="255" not-null="true"/>
+            <column name="XWD_AUTHOR" length="255"/>
         </property>
 
         <property name="contentAuthor" type="string">
-            <column name="XWD_CONTENT_AUTHOR" length="255" not-null="true"/>
+            <column name="XWD_CONTENT_AUTHOR" length="255"/>
         </property>
 
         <property name="creator" type="string">
-            <column name="XWD_CREATOR" length="255" not-null="true" />
+            <column name="XWD_CREATOR" length="255"/>
         </property>
 
         <property name="web" type="string">
             <column name="XWD_WEB" length="255" not-null="true"/>
         </property>
 
-        <property name="content" type="string">
+        <property name="content" type="text">
             <column name="XWD_CONTENT" length="200000" not-null="true"/>
         </property>
 
@@ -71,16 +71,16 @@
         </property>
 
         <property name="customClass" type="string">
-            <column name="XWD_CUSTOM_CLASS" length="255" not-null="true"/>
+            <column name="XWD_CUSTOM_CLASS" length="255"/>
         </property>
 
 
         <property name="parent" type="string">
-            <column name="XWD_PARENT" length="511" not-null="true"/>
+            <column name="XWD_PARENT" length="511"/>
         </property>
 
-        <property name="xWikiClassXML" type="string">
-            <column name="XWD_CLASS_XML" length="20000" not-null="false"/>
+        <property name="xWikiClassXML" type="text">
+            <column name="XWD_CLASS_XML" length="20000"/>
         </property>
 
         <property name="elements" type="integer" not-null="true">
@@ -88,28 +88,28 @@
         </property>
 
         <property name="defaultTemplate" type="string">
-            <column name="XWD_DEFAULT_TEMPLATE"  not-null="true"/>
+            <column name="XWD_DEFAULT_TEMPLATE"/>
         </property>
 
         <property name="validationScript" type="string">
-            <column name="XWD_VALIDATION_SCRIPT"  not-null="true" />
+            <column name="XWD_VALIDATION_SCRIPT"/>
         </property>
 
     </class>
 
     <class name="com.xpn.xwiki.doc.XWikiDocumentArchive" table="xwikidoc">
         <id name="id" type="long" unsaved-value="undefined">
-            <column name="XWD_ID" not-null="true"/>
+            <column name="XWD_ID" not-null="true" sql-type="integer"/>
             <generator class="assigned" />
         </id>
-        <property name="archive" type="string">
+        <property name="archive" type="text">
             <column name="XWD_ARCHIVE" length="200000" not-null="false" />
         </property>
     </class>
 
     <class name="com.xpn.xwiki.doc.XWikiLock" table="xwikilock">
         <id name="docId" type="long" unsaved-value="undefined">
-            <column name="XWL_DOC_ID" not-null="true"/>
+            <column name="XWL_DOC_ID" not-null="true" sql-type="integer"/>
             <generator class="assigned" />
         </id>
         <property name="userName" type="string">
@@ -132,12 +132,12 @@
 
     <class name="com.xpn.xwiki.doc.XWikiAttachment" table="xwikiattachment">
         <id name="id" type="long" unsaved-value="undefined">
-            <column name="XWA_ID" not-null="true"/>
+            <column name="XWA_ID" not-null="true" sql-type="integer"/>
             <generator class="assigned" />
         </id>
 
         <property name="docId" type="long">
-            <column name="XWA_DOC_ID" />
+            <column name="XWA_DOC_ID"  sql-type="integer"/>
         </property>
 
         <property name="filename" type="string">
@@ -167,7 +167,7 @@
 
     <class name="com.xpn.xwiki.doc.XWikiAttachmentContent" table="xwikiattachment_content">
         <id name="id" type="long" unsaved-value="undefined">
-            <column name="XWA_ID" not-null="true"/>
+            <column name="XWA_ID" not-null="true" sql-type="integer"/>
             <generator class="assigned" />
         </id>
 
@@ -178,11 +178,11 @@
 
     <class name="com.xpn.xwiki.doc.XWikiAttachmentArchive" table="xwikiattachment_archive">
         <id name="id" type="long" unsaved-value="undefined">
-            <column name="XWA_ID" not-null="true"/>
+            <column name="XWA_ID" not-null="true" sql-type="integer"/>
             <generator class="assigned" />
         </id>
         <property name="archive" type="binary">
-            <column name="XWA_ARCHIVE" length="4000000" />
+						<column name="XWA_ARCHIVE" length="4000000"/>
         </property>
     </class>
 
@@ -203,7 +203,7 @@
         <property name="number" type="integer">
             <column name="XWP_NUMBER" />
         </property>
-        <property name="customDisplay" type="string">
+        <property name="customDisplay" type="text">
             <column name="XWP_CUSTOMDISPLAY" length="60000" />
         </property>
         <property name="validationRegExp" type="string">
@@ -351,7 +351,7 @@
         <property name="name" type="string">
             <column name="XWO_NAME" not-null="true" length="255"/>
         </property>
-        <property name="customMapping" type="string">
+        <property name="customMapping" type="text">
             <column name="XWO_CUSTOM_MAPPING" length="60000"/>
         </property>
         <property name="customClass" type="string">
@@ -388,7 +388,7 @@
                 <column name="XWL_NAME"  />
             </key>
             <property name="value" type="long">
-                <column name="XWL_VALUE" />
+                <column name="XWL_VALUE"  sql-type="integer"/>
             </property>
         </joined-subclass>
 
@@ -437,7 +437,7 @@
                 <column name="XWL_ID"  />
                 <column name="XWL_NAME"  />
             </key>
-            <property name="value" type="string">
+            <property name="value" type="text">
                 <column name="XWL_VALUE" length="60000" />
             </property>
         </joined-subclass>
@@ -447,7 +447,7 @@
                 <column name="XWL_ID"  />
                 <column name="XWL_NAME"  />
             </key>
-            <property name="textValue" type="string">
+            <property name="textValue" type="text">
                 <column name="XWL_VALUE" length="60000" />
             </property>
         </joined-subclass>
@@ -490,10 +490,10 @@
         </id>
 
         <property name="number" type="integer">
-            <column name="XWS_NUMBER" not-null="false" />
+            <column name="XWS_NUMBER"/>
         </property>
         <property name="name" type="string">
-            <column name="XWS_NAME" not-null="true" length="255"/>
+            <column name="XWS_NAME" length="255"/>
         </property>
         <property name="className" type="string">
             <column name="XWS_CLASSNAME" not-null="true" length="255"/>
@@ -657,10 +657,10 @@
         <property name="version" type="string">
             <column name="XWP_VERSION" length="255"/>
         </property>
-        <property name="menu" type="string">
+        <property name="menu" type="text">
             <column name="XWP_MENU" length="60000" />
         </property>
-        <property name="meta" type="string">
+        <property name="meta" type="text">
             <column name="XWP_META" length="60000" />
         </property>
         <property name="use_email_verification" type="integer">
@@ -672,13 +672,13 @@
         <property name="admin_email" type="string">
             <column name="XWP_ADMIN_EMAIL" length="255"/>
         </property>
-        <property name="validation_email_content" type="string">
+        <property name="validation_email_content" type="text">
             <column name="XWP_VALIDATION_EMAIL_CONTENT" length="60000" />
         </property>
-        <property name="confirmation_email_content" type="string">
+        <property name="confirmation_email_content" type="text">
             <column name="XWP_CONFIRMATION_EMAIL_CONTENT" length="60000" />
         </property>
-        <property name="invitation_email_content" type="string">
+        <property name="invitation_email_content" type="text">
             <column name="XWP_INVITATION_EMAIL_CONTENT" length="60000" />
         </property>
         <property name="macros_languages" type="string">
@@ -693,7 +693,7 @@
         <property name="macros_wiki2" type="string">
             <column name="XWP_MACROS_WIKI2" length="255" />
         </property>
-        <property name="macros_mapping" type="string">
+        <property name="macros_mapping" type="text">
             <column name="XWP_MACROS_MAPPING" length="60000" />
         </property>
         <property name="notification_pages" type="string">
@@ -750,10 +750,10 @@
         <property name="author" type="string">
             <column name="XWC_AUTHOR" length="255"/>
         </property>
-        <property name="highlight" type="string">
+        <property name="highlight" type="text">
             <column name="XWC_HIGHLIGHT" length="60000" />
         </property>
-        <property name="comment" type="string">
+        <property name="comment" type="text">
             <column name="XWC_COMMENT" length="60000" />
         </property>
         <property name="replyto" type="integer">
Index: web/standard/src/main/webapp/WEB-INF/hibernate.cfg.xml
===================================================================
--- web/standard/src/main/webapp/WEB-INF/hibernate.cfg.xml	(revision 2520)
+++ web/standard/src/main/webapp/WEB-INF/hibernate.cfg.xml	(working copy)
@@ -33,14 +33,31 @@
     <property name="connection.driver_class">com.mysql.jdbc.Driver</property>
     <property name="dialect">org.hibernate.dialect.MySQLDialect</property>
 
+	
+		<!-- Oracle - Uncomment if you want to use Oracle with container managed connections
+		<property name="connection.datasource">jdbc/XWikiDS</property>		
+    <property name="dialect">org.hibernate.dialect.Oracle9Dialect</property>
+		-->
+		
+		<!-- Oracle - Uncomment if you want to use Oracle Database
+    <property name="connection.url">jdbc:oracle:thin:@//localhost:1521//ORCL</property>
+    <property name="connection.username">xwiki</property>
+    <property name="connection.password">xwiki</property>
+    <property name="connection.driver_class">oracle.jdbc.OracleDriver</property>
+    <property name="dialect">org.hibernate.dialect.Oracle9Dialect</property>
+    -->
+
+		<!-- This Connection Provider not needed for container managed connections -->
     <property name="connection.provider_class">com.xpn.xwiki.store.DBCPConnectionProvider</property>
     <property name="connection.pool_size">2</property>
     <property name="statement_cache.size">2</property>
 
     <!-- Mapping files -->
     <mapping resource="xwiki.hbm.xml"/>
+		
+		<!-- Oracle - Uncomment if you want to use Oracle Database
+    <mapping resource="xwiki.oracle.hbm.xml"/>
+		-->
     <mapping resource="feeds.hbm.xml"/>
-
-
   </session-factory>
 </hibernate-configuration>