Index: src/test/java/com/xpn/xwiki/doc/XWikiDocumentArchiveTest.java
===================================================================
--- src/test/java/com/xpn/xwiki/doc/XWikiDocumentArchiveTest.java	(revision 3951)
+++ src/test/java/com/xpn/xwiki/doc/XWikiDocumentArchiveTest.java	(working copy)
@@ -19,6 +19,10 @@
  */
 package com.xpn.xwiki.doc;
 
+import java.util.Arrays;
+
+import com.xpn.xwiki.XWikiException;
+
 import junit.framework.TestCase;
 
 /**
@@ -37,117 +41,6 @@
      */
     public void testUpdateArchiveWhenSpaceInUsername() throws Exception
     {
-        String originalText = "\"<?xml version=\\\"1.0\\\" encoding=\\\"ISO-8859-1\\\"?>\\n\\n"
-            + "<xwikidoc>\\n<web>KnowledgeBase</web>\\n<name>WebHome</name>\\n<language></language>"
-            + "\\n<defaultLanguage>en</defaultLanguage>\\n<translation>0</translation>\\n<parent>"
-            + "Main.Notes</parent>\\n<creator>XWiki.Admin</creator>\\n<author>XWiki.Admin</author>"
-            + "\\n<customClass></customClass>\\n<contentAuthor>XWiki.Admin</contentAuthor>\\n"
-            + "<creationDate>1165874272000</creationDate>\\n<date>1172011434000</date>\\n"
-            + "<contentUpdateDate>1172011434000</contentUpdateDate>\\n<version>1.8</version>\\n"
-            + "<title></title>\\n<template></template>\\n<defaultTemplate></defaultTemplate>\\n"
-            + "<validationScript></validationScript>\\n<object>\\n<class>\\n<name>XWiki.TagClass"
-            + "</name>\\n<customClass></customClass>\\n<customMapping></customMapping>\\n"
-            + "<defaultViewSheet></defaultViewSheet>\\n<defaultEditSheet></defaultEditSheet>\\n"
-            + "<defaultWeb></defaultWeb>\\n<nameField></nameField>\\n<validationScript>"
-            + "</validationScript>\\n<tags>\\n<name>tags</name>\\n<prettyName>Tags</prettyName>\\n"
-            + "<unmodifiable>0</unmodifiable>\\n<relationalStorage>1</relationalStorage>\\n"
-            + "<displayType>input</displayType>\\n<multiSelect>1</multiSelect>\\n<size>30</size>\\n"
-            + "<separator> </separator>\\n<separators> ,|</separators>\\n<values></values>\\n"
-            + "<number>1</number>\\n<classType>com.xpn.xwiki.objects.classes.StaticListClass"
-            + "</classType>\\n</tags>\\n</class>\\n<name>KnowledgeBase.WebHome</name>\\n"
-            + "<number>0</number>\\n<className>XWiki.TagClass</className>\\n<property>\\n<tags/>\\n"
-            + "</property>\\n</object>\\n<content>1 Wiki Knowledge Base\\r\\n\\r\\nThis is the "
-            + "Wiki Knowledge Base, where you can start writing about your favorite subjects.\\r\\n"
-            + "\\r\\nTo create new pages, click edit button and write links using brackets around "
-            + "words.\\r\\n\\r\\n* [Example Link 1]\\r\\n* [Example Link 2]</content>\\n</xwikidoc>"
-            + "\\n\"";
-        
-        String originalArchive = "head\t1.1;\n" +
-            "access;\n" +
-            "symbols;\n" +
-            "locks; strict;\n" +
-            "comment\t@# @;\n" +
-            "\n" +
-            "\n" +
-            "1.1\n" +
-            "date\t2007.02.14.14.01.57;\tauthor vmassol;\tstate Exp;\n" +
-            "branches;\n" +
-            "next\t;\n" +
-            "\n" +
-            "\n" +
-            "desc\n" +
-            "@@\n" +
-            "\n" +
-            "\n" +
-            "1.1\n" +
-            "log\n" +
-            "@KnowledgeBase.WebHome\n" +
-            "@\n" +
-            "text\n" +
-            "@<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n" +
-            "\n" +
-            "<xwikidoc>\n" +
-            "<web>KnowledgeBase</web>\n" +
-            "<name>WebHome</name>\n" +
-            "<language></language>\n" +
-            "<defaultLanguage>en</defaultLanguage>\n" +
-            "<translation>0</translation>\n" +
-            "<parent>Main.Notes</parent>\n" +
-            "<creator>XWiki.Admin</creator>\n" +
-            "<author>XWiki.Admin</author>\n" +
-            "<customClass></customClass>\n" +
-            "<contentAuthor>XWiki.Admin</contentAuthor>\n" +
-            "<creationDate>1165874272000</creationDate>\n" +
-            "<date>1166177448000</date>\n" +
-            "<contentUpdateDate>1171458116000</contentUpdateDate>\n" +
-            "<version>1.1</version>\n" +
-            "<title></title>\n" +
-            "<template></template>\n" +
-            "<defaultTemplate></defaultTemplate>\n" +
-            "<validationScript></validationScript>\n" +
-            "<object>\n" +
-            "<class>\n" +
-            "<name>XWiki.TagClass</name>\n" +
-            "<customClass></customClass>\n" +
-            "<customMapping></customMapping>\n" +
-            "<defaultViewSheet></defaultViewSheet>\n" +
-            "<defaultEditSheet></defaultEditSheet>\n" +
-            "<defaultWeb></defaultWeb>\n" +
-            "<nameField></nameField>\n" +
-            "<validationScript></validationScript>\n" +
-            "<tags>\n" +
-            "<name>tags</name>\n" +
-            "<prettyName>Tags</prettyName>\n" +
-            "<unmodifiable>0</unmodifiable>\n" +
-            "<relationalStorage>1</relationalStorage>\n" +
-            "<displayType>checkbox</displayType>\n" +
-            "<multiSelect>1</multiSelect>\n" +
-            "<size>30</size>\n" +
-            "<separator> </separator>\n" +
-            "<separators> ,|</separators>\n" +
-            "<values></values>\n" +
-            "<number>1</number>\n" +
-            "<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>\n" +
-            "</tags>\n" +
-            "</class>\n" +
-            "<name>KnowledgeBase.WebHome</name>\n" +
-            "<number>0</number>\n" +
-            "<className>XWiki.TagClass</className>\n" +
-            "<property>\n" +
-            "<tags/>\n" +
-            "</property>\n" +
-            "</object>\n" +
-            "<content>1 Wiki Knowledge Base\n" +
-            "\n" +
-            "This is the Wiki Knowledge Base, where you can start writing about your favorite subjects.\n" +
-            "\n" +
-            "To create new pages, click edit button and write links using brackets around words.\n" +
-            "\n" +
-            "* [Example Link 1]\n" +
-            "* [Example Link 2]</content>\n" +
-            "</xwikidoc>\n" +
-            "@";
-
         XWikiDocumentArchive archive = new XWikiDocumentArchive(123456789L);
         archive.setArchive(originalArchive);
 
@@ -161,4 +54,133 @@
         // with a space works.
         new XWikiDocumentArchive(123456789L).setArchive(archive.getArchive());
     }
+    
+    public void testSetNodeDiffs() throws XWikiException {
+        XWikiDocumentArchive archive = new XWikiDocumentArchive(123456789L);
+        XWikiDocumentArchive archive2 = new XWikiDocumentArchive(123456789L);
+        archive.setArchive(originalArchive);
+        archive2.setDiffs(archive.getDiffs());
+        assertEquals(archive.getArchive(), archive2.getArchive());
+        assertTrue(Arrays.equals(archive.getDiffs(), archive2.getDiffs()));
+        
+        archive.updateArchive("Main.WebHome", originalText);
+        archive2.updateArchive("Main.WebHome", originalText);
+        assertEquals(archive.getArchive(), archive2.getArchive());
+        assertTrue(Arrays.equals(archive.getDiffs(), archive2.getDiffs()));
+        
+        archive2.setDiffs(archive.getDiffs());
+        assertEquals(archive.getArchive(), archive2.getArchive());
+        assertTrue(Arrays.equals(archive.getDiffs(), archive2.getDiffs()));
+    }
+    
+    String originalText = "\"<?xml version=\\\"1.0\\\" encoding=\\\"ISO-8859-1\\\"?>\\n\\n"
+        + "<xwikidoc>\\n<web>KnowledgeBase</web>\\n<name>WebHome</name>\\n<language></language>"
+        + "\\n<defaultLanguage>en</defaultLanguage>\\n<translation>0</translation>\\n<parent>"
+        + "Main.Notes</parent>\\n<creator>XWiki.Admin</creator>\\n<author>XWiki.Admin</author>"
+        + "\\n<customClass></customClass>\\n<contentAuthor>XWiki.Admin</contentAuthor>\\n"
+        + "<creationDate>1165874272000</creationDate>\\n<date>1172011434000</date>\\n"
+        + "<contentUpdateDate>1172011434000</contentUpdateDate>\\n<version>1.8</version>\\n"
+        + "<title></title>\\n<template></template>\\n<defaultTemplate></defaultTemplate>\\n"
+        + "<validationScript></validationScript>\\n<object>\\n<class>\\n<name>XWiki.TagClass"
+        + "</name>\\n<customClass></customClass>\\n<customMapping></customMapping>\\n"
+        + "<defaultViewSheet></defaultViewSheet>\\n<defaultEditSheet></defaultEditSheet>\\n"
+        + "<defaultWeb></defaultWeb>\\n<nameField></nameField>\\n<validationScript>"
+        + "</validationScript>\\n<tags>\\n<name>tags</name>\\n<prettyName>Tags</prettyName>\\n"
+        + "<unmodifiable>0</unmodifiable>\\n<relationalStorage>1</relationalStorage>\\n"
+        + "<displayType>input</displayType>\\n<multiSelect>1</multiSelect>\\n<size>30</size>\\n"
+        + "<separator> </separator>\\n<separators> ,|</separators>\\n<values></values>\\n"
+        + "<number>1</number>\\n<classType>com.xpn.xwiki.objects.classes.StaticListClass"
+        + "</classType>\\n</tags>\\n</class>\\n<name>KnowledgeBase.WebHome</name>\\n"
+        + "<number>0</number>\\n<className>XWiki.TagClass</className>\\n<property>\\n<tags/>\\n"
+        + "</property>\\n</object>\\n<content>1 Wiki Knowledge Base\\r\\n\\r\\nThis is the "
+        + "Wiki Knowledge Base, where you can start writing about your favorite subjects.\\r\\n"
+        + "\\r\\nTo create new pages, click edit button and write links using brackets around "
+        + "words.\\r\\n\\r\\n* [Example Link 1]\\r\\n* [Example Link 2]</content>\\n</xwikidoc>"
+        + "\\n\"";
+    
+    String originalArchive = "head\t1.1;\n" +
+        "access;\n" +
+        "symbols;\n" +
+        "locks; strict;\n" +
+        "comment\t@# @;\n" +
+        "\n" +
+        "\n" +
+        "1.1\n" +
+        "date\t2007.02.14.14.01.57;\tauthor vmassol;\tstate Exp;\n" +
+        "branches;\n" +
+        "next\t;\n" +
+        "\n" +
+        "\n" +
+        "desc\n" +
+        "@@\n" +
+        "\n" +
+        "\n" +
+        "1.1\n" +
+        "log\n" +
+        "@KnowledgeBase.WebHome\n" +
+        "@\n" +
+        "text\n" +
+        "@<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n" +
+        "\n" +
+        "<xwikidoc>\n" +
+        "<web>KnowledgeBase</web>\n" +
+        "<name>WebHome</name>\n" +
+        "<language></language>\n" +
+        "<defaultLanguage>en</defaultLanguage>\n" +
+        "<translation>0</translation>\n" +
+        "<parent>Main.Notes</parent>\n" +
+        "<creator>XWiki.Admin</creator>\n" +
+        "<author>XWiki.Admin</author>\n" +
+        "<customClass></customClass>\n" +
+        "<contentAuthor>XWiki.Admin</contentAuthor>\n" +
+        "<creationDate>1165874272000</creationDate>\n" +
+        "<date>1166177448000</date>\n" +
+        "<contentUpdateDate>1171458116000</contentUpdateDate>\n" +
+        "<version>1.1</version>\n" +
+        "<title></title>\n" +
+        "<template></template>\n" +
+        "<defaultTemplate></defaultTemplate>\n" +
+        "<validationScript></validationScript>\n" +
+        "<object>\n" +
+        "<class>\n" +
+        "<name>XWiki.TagClass</name>\n" +
+        "<customClass></customClass>\n" +
+        "<customMapping></customMapping>\n" +
+        "<defaultViewSheet></defaultViewSheet>\n" +
+        "<defaultEditSheet></defaultEditSheet>\n" +
+        "<defaultWeb></defaultWeb>\n" +
+        "<nameField></nameField>\n" +
+        "<validationScript></validationScript>\n" +
+        "<tags>\n" +
+        "<name>tags</name>\n" +
+        "<prettyName>Tags</prettyName>\n" +
+        "<unmodifiable>0</unmodifiable>\n" +
+        "<relationalStorage>1</relationalStorage>\n" +
+        "<displayType>checkbox</displayType>\n" +
+        "<multiSelect>1</multiSelect>\n" +
+        "<size>30</size>\n" +
+        "<separator> </separator>\n" +
+        "<separators> ,|</separators>\n" +
+        "<values></values>\n" +
+        "<number>1</number>\n" +
+        "<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>\n" +
+        "</tags>\n" +
+        "</class>\n" +
+        "<name>KnowledgeBase.WebHome</name>\n" +
+        "<number>0</number>\n" +
+        "<className>XWiki.TagClass</className>\n" +
+        "<property>\n" +
+        "<tags/>\n" +
+        "</property>\n" +
+        "</object>\n" +
+        "<content>1 Wiki Knowledge Base\n" +
+        "\n" +
+        "This is the Wiki Knowledge Base, where you can start writing about your favorite subjects.\n" +
+        "\n" +
+        "To create new pages, click edit button and write links using brackets around words.\n" +
+        "\n" +
+        "* [Example Link 1]\n" +
+        "* [Example Link 2]</content>\n" +
+        "</xwikidoc>\n" +
+        "@";
 }
Index: src/main/java/com/xpn/xwiki/store/XWikiHibernateVersioningStore.java
===================================================================
--- src/main/java/com/xpn/xwiki/store/XWikiHibernateVersioningStore.java	(revision 3951)
+++ src/main/java/com/xpn/xwiki/store/XWikiHibernateVersioningStore.java	(working copy)
@@ -1,18 +1,27 @@
 package com.xpn.xwiki.store;
 
+import java.util.List;
+
 import com.xpn.xwiki.XWiki;
 import com.xpn.xwiki.XWikiContext;
 import com.xpn.xwiki.XWikiException;
 import com.xpn.xwiki.doc.XWikiDocument;
 import com.xpn.xwiki.doc.XWikiDocumentArchive;
+import com.xpn.xwiki.doc.rcs.XWikiRCSArchive;
+import com.xpn.xwiki.doc.rcs.XWikiRCSNode;
+import com.xpn.xwiki.doc.rcs.XWikiRCSStoreNode;
 import com.xpn.xwiki.monitor.api.MonitorPlugin;
 import com.xpn.xwiki.util.Util;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.hibernate.Criteria;
+import org.hibernate.HibernateException;
+import org.hibernate.LockMode;
 import org.hibernate.ObjectNotFoundException;
 import org.hibernate.Session;
+import org.hibernate.criterion.Restrictions;
 import org.suigeneris.jrcs.rcs.Archive;
-import org.suigeneris.jrcs.rcs.Node;
+import org.suigeneris.jrcs.rcs.impl.Node;
 import org.suigeneris.jrcs.rcs.Version;
 
 /**
@@ -48,7 +57,7 @@
 
     public Version[] getXWikiDocVersions(XWikiDocument doc, XWikiContext context) throws XWikiException {
         try {
-            Archive archive = getXWikiDocumentArchive(doc, context).getRCSArchive();
+            XWikiRCSArchive archive = getXWikiDocumentArchive(doc, context).getRCSArchive();
             if (archive==null)
                 return new Version[0];
 
@@ -107,13 +116,21 @@
                 bTransaction = beginTransaction(false, context);
             }
             Session session = getSession(context);
-
-            try {
-                session.load(archivedoc, new Long(archivedoc.getId()));
+            
+            List diffs = session.createCriteria(XWikiRCSStoreNode.class)
+                .add(Restrictions.eq("id", Long.valueOf(archivedoc.getId())))
+                .list();
+            if (diffs.size()>0) {
+                XWikiRCSNode[] nodes = new XWikiRCSNode[diffs.size()];
+                for (int i=0; i<nodes.length; i++)
+                    nodes[i] = ((XWikiRCSStoreNode) diffs.get(i)).getRCSNode();
+                archivedoc.setDiffs(nodes);
+            } else {
+                try {
+                    session.load(archivedoc, new Long(archivedoc.getId()));
+                } 
+                catch (ObjectNotFoundException e) {}
             }
-            catch (ObjectNotFoundException e) {
-                return;
-            }
             if (bTransaction) {
                 endTransaction(context, false, false);
             }
@@ -136,7 +153,20 @@
                 bTransaction = beginTransaction(false, context);
             }
             Session session = getSession(context);
-            session.update(archivedoc);
+            //session.update(archivedoc);
+            
+            XWikiRCSNode[] diffs = archivedoc.getDiffs();
+            for (int i=0; i<diffs.length; i++) {
+                XWikiRCSStoreNode node =  diffs[i].getStoreNode();
+                if (node==null) {
+                    node = new XWikiRCSStoreNode(archivedoc.getId(), diffs[i]);
+                    session.save(node);
+                } else {
+                    node.init(archivedoc.getId(), diffs[i]);
+                    session.update(node);
+                }
+            }
+            
             if (bTransaction) {
                 endTransaction(context, true, false);
             }
@@ -162,7 +192,7 @@
                 monitor.startTimer("hibernate");
             doc.setStore(basedoc.getStore());
 
-            Archive archive = getXWikiDocumentArchive(doc, context).getRCSArchive();
+            XWikiRCSArchive archive = getXWikiDocumentArchive(doc, context).getRCSArchive();
             Version v = null;
             try {
                 v = archive.getRevisionVersion(version);
@@ -256,4 +286,3 @@
         }
     }
 }
-
Index: src/main/java/com/xpn/xwiki/store/jcr/XWikiJcrPropertyVersioningStore.java
===================================================================
--- src/main/java/com/xpn/xwiki/store/jcr/XWikiJcrPropertyVersioningStore.java	(revision 3951)
+++ src/main/java/com/xpn/xwiki/store/jcr/XWikiJcrPropertyVersioningStore.java	(working copy)
@@ -5,6 +5,7 @@
 import com.xpn.xwiki.XWikiException;
 import com.xpn.xwiki.doc.XWikiDocument;
 import com.xpn.xwiki.doc.XWikiDocumentArchive;
+import com.xpn.xwiki.doc.rcs.XWikiRCSArchive;
 import com.xpn.xwiki.monitor.api.MonitorPlugin;
 import com.xpn.xwiki.store.XWikiVersioningStoreInterface;
 import com.xpn.xwiki.util.Util;
@@ -100,7 +101,7 @@
                 monitor.startTimer("jcr");
             doc.setStore(basedoc.getStore());
 
-            Archive archive = getXWikiDocumentArchive(doc, context).getRCSArchive();
+            XWikiRCSArchive archive = getXWikiDocumentArchive(doc, context).getRCSArchive();
             Version v = null;
             try {
                 v = archive.getRevisionVersion(version);
@@ -143,11 +144,11 @@
 	}
 	public Version[] getXWikiDocVersions(XWikiDocument doc, XWikiContext context) throws XWikiException {
 		try {
-            Archive archive = getXWikiDocumentArchive(doc, context).getRCSArchive();
+            XWikiRCSArchive archive = getXWikiDocumentArchive(doc, context).getRCSArchive();
             if (archive==null)
                 return new Version[0];
 
-            org.suigeneris.jrcs.rcs.Node[] nodes = archive.changeLog();
+            org.suigeneris.jrcs.rcs.impl.Node[] nodes = archive.changeLog();
             Version[] versions = new Version[nodes.length];
             for (int i=0;i<nodes.length;i++) {
                 versions[i] = nodes[i].getVersion();
Index: src/main/java/com/xpn/xwiki/doc/XWikiAttachment.java
===================================================================
--- src/main/java/com/xpn/xwiki/doc/XWikiAttachment.java	(revision 3951)
+++ src/main/java/com/xpn/xwiki/doc/XWikiAttachment.java	(working copy)
@@ -34,7 +34,7 @@
 import org.dom4j.io.XMLWriter;
 import org.hibernate.ObjectNotFoundException;
 import org.suigeneris.jrcs.rcs.Archive;
-import org.suigeneris.jrcs.rcs.Node;
+import org.suigeneris.jrcs.rcs.impl.Node;
 import org.suigeneris.jrcs.rcs.Version;
 
 import java.io.IOException;
Index: src/main/java/com/xpn/xwiki/doc/rcs/XWikiRCSArchive.java
===================================================================
--- src/main/java/com/xpn/xwiki/doc/rcs/XWikiRCSArchive.java	(revision 0)
+++ src/main/java/com/xpn/xwiki/doc/rcs/XWikiRCSArchive.java	(revision 0)
@@ -0,0 +1,73 @@
+package com.xpn.xwiki.doc.rcs;
+
+import java.util.Iterator;
+
+import org.apache.tools.ant.filters.StringInputStream;
+import org.suigeneris.jrcs.rcs.Archive;
+import org.suigeneris.jrcs.rcs.HeadAlreadySetException;
+import org.suigeneris.jrcs.rcs.InvalidVersionNumberException;
+import org.suigeneris.jrcs.rcs.Version;
+import org.suigeneris.jrcs.rcs.impl.Node;
+import org.suigeneris.jrcs.rcs.impl.NodeNotFoundException;
+import org.suigeneris.jrcs.rcs.impl.TrunkNode;
+import org.suigeneris.jrcs.rcs.parse.ParseException;
+
+public class XWikiRCSArchive extends Archive
+{
+    /**
+     * @param diffs - nodes in any order
+     * */
+    public XWikiRCSArchive(XWikiRCSNode[] diffs) {
+        super(new Object[0], "");
+        nodes.clear();
+        head = null;
+        for (int i=0; i<diffs.length; i++) {
+            Node d = diffs[i];
+            nodes.put(d.getVersion(), d);
+        }
+        XWikiRCSNode last = null;
+        for (Iterator it = nodes.keySet().iterator(); it.hasNext(); ) {
+            Version ver = (Version) it.next();
+            XWikiRCSNode node = (XWikiRCSNode) nodes.get(ver);
+            if (last!=null)
+                last.setRCSNext(node);
+            last = node;
+            if (head==null)
+                head = node;
+        }
+    }
+
+    public XWikiRCSArchive(Object[] lines, String docname, String version)
+    {
+        super(lines, docname, version);
+    }
+
+    public XWikiRCSArchive(String string, StringInputStream is) throws ParseException
+    {
+        super(string, is);
+    }
+    
+    protected Node newNode(Version vernum, Node prev) throws InvalidVersionNumberException,
+        NodeNotFoundException
+    {
+        if (!vernum.isRevision())
+        {
+            throw new InvalidVersionNumberException(vernum);
+        }
+        Node node = (Node) nodes.get(vernum);
+        if (node == null)
+        {
+            node = new XWikiRCSNode(vernum, (TrunkNode) prev);
+            nodes.put(vernum, node);
+        }
+        return node;
+    }
+    
+    protected void setHead(Version vernum) throws InvalidVersionNumberException
+    {
+        if (head != null)
+            throw new HeadAlreadySetException(head.getVersion());
+        head = new XWikiRCSNode(vernum, null);
+        nodes.put(vernum, head);
+    }
+}

Property changes on: src/main/java/com/xpn/xwiki/doc/rcs/XWikiRCSArchive.java
___________________________________________________________________
Name: svn:eol-style
   + native

Index: src/main/java/com/xpn/xwiki/doc/rcs/XWikiRCSStoreNode.java
===================================================================
--- src/main/java/com/xpn/xwiki/doc/rcs/XWikiRCSStoreNode.java	(revision 0)
+++ src/main/java/com/xpn/xwiki/doc/rcs/XWikiRCSStoreNode.java	(revision 0)
@@ -0,0 +1,102 @@
+package com.xpn.xwiki.doc.rcs;
+
+import java.io.Serializable;
+
+import org.suigeneris.jrcs.rcs.Version;
+
+public class XWikiRCSStoreNode implements Serializable
+{
+    private long    docId;
+    private String  delta;
+    private Version version;
+    
+    public XWikiRCSStoreNode(long id, XWikiRCSNode node)
+    {
+        init(id, node);        
+    }
+    
+    public XWikiRCSStoreNode() {}
+    
+    public void init(long id, XWikiRCSNode node) {
+        setId(id);
+        setDelta(node.getDelta());
+        setVersion(node.getVersion());
+        node.setStoreNode(this);
+    }
+
+    public long getId()
+    {
+        return docId;
+    }
+    
+    public void setId(long docId)
+    {
+        this.docId = docId;
+    }
+    
+    public String getDelta()
+    {
+        return delta;
+    }
+    
+    public void setDelta(String delta)
+    {
+        this.delta = delta;
+    }
+    
+    public String getVersion()
+    {
+        return version==null? "1.1" : version.toString();
+    }
+
+    public void setVersion(String ver)
+    {
+        this.version = new Version(ver);
+    }
+    public void setVersion(Version ver)
+    {
+        this.version = ver;
+    }
+
+    public XWikiRCSNode getRCSNode()
+    {
+        XWikiRCSNode node = new XWikiRCSNode(version, null);
+        node.setText(delta);
+        node.setStoreNode(this);
+        return node;
+    }
+
+    public int hashCode()
+    {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((delta == null) ? 0 : delta.hashCode());
+        result = prime * result + (int) (docId ^ (docId >>> 32));
+        result = prime * result + ((version == null) ? 0 : version.hashCode());
+        return result;
+    }
+
+    public boolean equals(Object obj)
+    {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        final XWikiRCSStoreNode other = (XWikiRCSStoreNode) obj;
+        if (delta == null) {
+            if (other.delta != null)
+                return false;
+        } else if (!delta.equals(other.delta))
+            return false;
+        if (docId != other.docId)
+            return false;
+        if (version == null) {
+            if (other.version != null)
+                return false;
+        } else if (!version.equals(other.version))
+            return false;
+        return true;
+    }
+}

Property changes on: src/main/java/com/xpn/xwiki/doc/rcs/XWikiRCSStoreNode.java
___________________________________________________________________
Name: svn:eol-style
   + native

Index: src/main/java/com/xpn/xwiki/doc/rcs/XWikiRCSNode.java
===================================================================
--- src/main/java/com/xpn/xwiki/doc/rcs/XWikiRCSNode.java	(revision 0)
+++ src/main/java/com/xpn/xwiki/doc/rcs/XWikiRCSNode.java	(revision 0)
@@ -0,0 +1,37 @@
+package com.xpn.xwiki.doc.rcs;
+
+import org.suigeneris.jrcs.rcs.InvalidTrunkVersionNumberException;
+import org.suigeneris.jrcs.rcs.Version;
+import org.suigeneris.jrcs.rcs.impl.TrunkNode;
+
+public class XWikiRCSNode extends TrunkNode
+{
+    public XWikiRCSNode(Version vernum, TrunkNode next) throws InvalidTrunkVersionNumberException
+    {
+        super(vernum, next);
+    }
+    
+    public String getDelta() {
+        return text;
+    }
+    
+    XWikiRCSStoreNode storeNode;
+    public XWikiRCSStoreNode getStoreNode()
+    {
+        return storeNode;
+    }
+
+    public void setStoreNode(XWikiRCSStoreNode storeNode)
+    {
+        this.storeNode = storeNode;
+    }
+    
+    public boolean equals(Object obj)
+    {
+        if (obj instanceof XWikiRCSNode) {
+            XWikiRCSNode node = (XWikiRCSNode) obj;
+            return getVersion().equals( node.getVersion() )
+                && getDelta().equals( node.getDelta() );
+        } else return false;
+    }
+}

Property changes on: src/main/java/com/xpn/xwiki/doc/rcs/XWikiRCSNode.java
___________________________________________________________________
Name: svn:eol-style
   + native

Index: src/main/java/com/xpn/xwiki/doc/XWikiDocument.java
===================================================================
--- src/main/java/com/xpn/xwiki/doc/XWikiDocument.java	(revision 3951)
+++ src/main/java/com/xpn/xwiki/doc/XWikiDocument.java	(working copy)
@@ -54,7 +54,6 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.ecs.filter.CharacterFilter;
-import org.apache.oro.text.regex.MalformedPatternException;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.tools.VelocityFormatter;
 import org.dom4j.Document;
Index: src/main/java/com/xpn/xwiki/doc/XWikiDocumentArchive.java
===================================================================
--- src/main/java/com/xpn/xwiki/doc/XWikiDocumentArchive.java	(revision 3951)
+++ src/main/java/com/xpn/xwiki/doc/XWikiDocumentArchive.java	(working copy)
@@ -1,17 +1,20 @@
 package com.xpn.xwiki.doc;
 
 import com.xpn.xwiki.XWikiException;
+import com.xpn.xwiki.doc.rcs.XWikiRCSArchive;
+import com.xpn.xwiki.doc.rcs.XWikiRCSNode;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.tools.ant.filters.StringInputStream;
-import org.suigeneris.jrcs.rcs.Archive;
+import org.suigeneris.jrcs.rcs.impl.Node;
 import org.suigeneris.jrcs.util.ToString;
 
 public class XWikiDocumentArchive {
     private static final Log log = LogFactory.getLog(XWikiDocumentArchive.class);
 
     private long id;
-    private Archive archive;
+    private XWikiRCSArchive archive;
 
     public XWikiDocumentArchive() {
     }
@@ -28,11 +31,11 @@
         this.id = id;
     }
 
-    public Archive getRCSArchive() {
+    public XWikiRCSArchive getRCSArchive() {
         return archive;
     }
 
-    public void setRCSArchive(Archive archive) {
+    public void setRCSArchive(XWikiRCSArchive archive) {
         this.archive = archive;
     }
 
@@ -45,22 +48,21 @@
             return buffer.toString();
         }
     }
-
     public void setArchive(String text) throws XWikiException {
         try {
             if ((text!=null)&&(!text.trim().equals(""))) {
                 StringInputStream is = new StringInputStream(text);
-                archive = new Archive("", is);
+                archive = new XWikiRCSArchive("", is);
             } else
             if (text == null){
                 Object[] lines = new Object[1];
                 lines[0] = "";
-                archive = new Archive(lines, "", "1.0");
+                archive = new XWikiRCSArchive(lines, "", "1.0");
             }
             else
             {
                 Object[] lines = ToString.stringToArray(text);
-                archive = new Archive(lines, "", "1.0");
+                archive = new XWikiRCSArchive(lines, "", "1.0");
             }
         }
         catch (Exception e) {
@@ -90,7 +92,7 @@
             if (archive != null)
                 archive.addRevision(lines, "");
             else
-                archive = new Archive(lines, docname, "1.0");
+                archive = new XWikiRCSArchive(lines, docname, "1.0");
         }
         catch (Exception e) {
             Object[] args = { docname };
@@ -134,7 +136,7 @@
 
     public void resetArchive(String docname, String text, String version) throws XWikiException {
         Object[] lines = ToString.stringToArray(text);
-        archive = new Archive(lines, docname, version);
+        archive = new XWikiRCSArchive(lines, docname, version);
     }
 
     /**
@@ -146,4 +148,15 @@
         return "id = [" + getId() + "], archive = ["
             + (getRCSArchive() == null ? "null" : getRCSArchive().toString()) + "]"; 
     }
+    
+    public void setDiffs(XWikiRCSNode[] diffs) {
+        archive = new XWikiRCSArchive(diffs);
+    }
+    public XWikiRCSNode[] getDiffs() {
+        Node[] changelog = getRCSArchive().changeLog();
+        XWikiRCSNode[] diffs = new XWikiRCSNode[changelog.length];
+        for (int i=0; i<diffs.length; i++)
+            diffs[i] = (XWikiRCSNode) changelog[i];
+        return diffs;
+    }
 }
Index: src/main/java/com/xpn/xwiki/api/XWiki.java
===================================================================
--- src/main/java/com/xpn/xwiki/api/XWiki.java	(revision 3951)
+++ src/main/java/com/xpn/xwiki/api/XWiki.java	(working copy)
@@ -34,7 +34,7 @@
 import com.xpn.xwiki.stats.impl.DocumentStats;
 import com.xpn.xwiki.web.Utils;
 import com.xpn.xwiki.web.XWikiEngineContext;
-import org.suigeneris.jrcs.diff.Chunk;
+import org.suigeneris.jrcs.diff.delta.Chunk;
 
 import java.awt.image.BufferedImage;
 import java.io.IOException;
Index: src/main/resources/xwiki.hbm.xml
===================================================================
--- src/main/resources/xwiki.hbm.xml	(revision 3951)
+++ src/main/resources/xwiki.hbm.xml	(working copy)
@@ -111,6 +111,16 @@
         </property>
     </class>
 
+    <class name="com.xpn.xwiki.doc.rcs.XWikiRCSStoreNode" table="xwikircs">
+    	<composite-id unsaved-value="undefined">
+            <key-property name="id" column="XWR_DOCID" type="long" />
+            <key-property name="version" column="XWR_VERSION" type="string"  length="10" />
+        </composite-id>
+        <property name="delta" type="text">
+            <column name="XWR_DELTA" 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"/>
Index: pom.xml
===================================================================
--- pom.xml	(revision 3951)
+++ pom.xml	(working copy)
@@ -83,14 +83,12 @@
     <dependency>
       <groupId>org.suigeneris</groupId>
       <artifactId>jrcs.diff</artifactId>
-      <version>0.3.0</version>
-      <classifier>xwiki</classifier>
+      <version>0.4.1</version>
     </dependency>
     <dependency>
       <groupId>org.suigeneris</groupId>
       <artifactId>jrcs.rcs</artifactId>
-      <version>0.3.0</version>
-      <classifier>xwiki</classifier>
+      <version>0.4.1</version>
     </dependency>
 
     <!-- Version 2.3.2 of oscache needs to be uploaded to central repository and XWiki's patch to be applied
@@ -556,4 +554,4 @@
     </profile>
   </profiles>
 </project>
-       
\ No newline at end of file
+