Skip to content
Snippets Groups Projects
Commit 436ab98b authored by srosse's avatar srosse
Browse files

OO-611: exclude the metaDataElements list from RepositoryEntry (as backward compatibility)

parent c27f5588
No related branches found
No related tags found
No related merge requests found
...@@ -32,6 +32,7 @@ import org.olat.core.util.resource.Resourceable; ...@@ -32,6 +32,7 @@ import org.olat.core.util.resource.Resourceable;
import org.olat.core.util.xml.XStreamHelper; import org.olat.core.util.xml.XStreamHelper;
import org.olat.group.BusinessGroup; import org.olat.group.BusinessGroup;
import org.olat.group.BusinessGroupImpl; import org.olat.group.BusinessGroupImpl;
import org.olat.repository.RepositoryEntry;
import com.thoughtworks.xstream.XStream; import com.thoughtworks.xstream.XStream;
...@@ -52,6 +53,7 @@ public class HistoryManager extends BasicManager { ...@@ -52,6 +53,7 @@ public class HistoryManager extends BasicManager {
//xstream config //xstream config
historyReadStream.omitField(BusinessGroup.class, "groupContext"); historyReadStream.omitField(BusinessGroup.class, "groupContext");
historyReadStream.omitField(BusinessGroupImpl.class, "groupContext"); historyReadStream.omitField(BusinessGroupImpl.class, "groupContext");
historyReadStream.omitField(RepositoryEntry.class, "metaDataElements");
historyReadStream.alias("org.olat.core.util.resource.OresHelper$1", Resourceable.class); historyReadStream.alias("org.olat.core.util.resource.OresHelper$1", Resourceable.class);
historyReadStream.alias("org.olat.core.util.resource.OresHelper$2", Resourceable.class); historyReadStream.alias("org.olat.core.util.resource.OresHelper$2", Resourceable.class);
historyReadStream.alias("org.olat.core.util.resource.OresHelper$3", Resourceable.class); historyReadStream.alias("org.olat.core.util.resource.OresHelper$3", Resourceable.class);
......
...@@ -98,4 +98,18 @@ public class HistoryManagerTest extends OlatTestCase { ...@@ -98,4 +98,18 @@ public class HistoryManagerTest extends OlatTestCase {
Assert.assertNotNull(history); Assert.assertNotNull(history);
} }
/**
* Test the compatibility with version 8.3
* @throws IOException
* @throws URISyntaxException
*/
@Test
public void testRead_v83_repoMetadaElements() throws IOException, URISyntaxException {
URL xmlUrl = HistoryManagerTest.class.getResource("resume_ver83b.xml");
assertNotNull(xmlUrl);
File resumeXml = new File(xmlUrl.toURI());
HistoryPoint history = historyManager.readHistory(resumeXml);
Assert.assertNotNull(history);
}
} }
<org.olat.core.id.context.HistoryPointImpl>
<uuid>11</uuid>
<businessPath>[RepositorySite:0][search.my:0][RepositoryEntry:16547840]</businessPath>
<entries>
<org.olat.core.id.context.MyContextEntry>
<olatResourceable class="org.olat.core.util.resource.OresHelper$1">
<val_-type>RepositorySite</val_-type>
<val_-key>0</val_-key>
</olatResourceable>
<state class="org.olat.core.id.context.StateSite"/>
</org.olat.core.id.context.MyContextEntry>
<org.olat.core.id.context.MyContextEntry>
<olatResourceable class="org.olat.core.util.resource.OresHelper$1">
<val_-type>search.my</val_-type>
<val_-key>0</val_-key>
</olatResourceable>
</org.olat.core.id.context.MyContextEntry>
<org.olat.core.id.context.MyContextEntry>
<olatResourceable class="org.olat.repository.RepositoryEntry">
<key>16547840</key>
<version defined-in="org.olat.core.commons.persistence.PersistentObject">0</version>
<creationDate class="sql-timestamp">2013-02-11 10:52:37.0</creationDate>
<softkey>sroo83_1_87076880944174</softkey>
<olatResource class="org.olat.resource.OLATResourceImpl">
<key>16416768</key>
<version>0</version>
<creationDate class="sql-timestamp">2013-02-11 10:52:37.0</creationDate>
<resName>CourseModule</resName>
<resId>87076880944173</resId>
</olatResource>
<ownerGroup class="org.olat.basesecurity.SecurityGroupImpl">
<key>16449536</key>
<version>0</version>
<creationDate class="sql-timestamp">2013-02-11 10:52:37.0</creationDate>
</ownerGroup>
<tutorGroup class="org.olat.basesecurity.SecurityGroupImpl">
<key>16449537</key>
<version>0</version>
<creationDate class="sql-timestamp">2013-02-11 10:52:37.0</creationDate>
</tutorGroup>
<participantGroup class="org.olat.basesecurity.SecurityGroupImpl">
<key>16449538</key>
<version>0</version>
<creationDate class="sql-timestamp">2013-02-11 10:52:37.0</creationDate>
</participantGroup>
<resourcename>-</resourcename>
<displayname>1 Person Kurs</displayname>
<description>&lt;p&gt;1 Person Kurs&lt;/p&gt;</description>
<initialAuthor>kanu</initialAuthor>
<access>1</access>
<canCopy>false</canCopy>
<canReference>false</canReference>
<canLaunch>true</canLaunch>
<canDownload>false</canDownload>
<membersOnly>false</membersOnly>
<statusCode>0</statusCode>
<metaDataElements class="org.hibernate.collection.internal.PersistentList">
<initialized>false</initialized>
<owner class="org.olat.repository.RepositoryEntry" reference="../.."/>
<cachedSize>-1</cachedSize>
<role>org.olat.repository.RepositoryEntry.metaDataElements</role>
<key class="long">16547840</key>
<dirty>false</dirty>
<specjLazyLoad>false</specjLazyLoad>
</metaDataElements>
<launchCounter>3</launchCounter>
<downloadCounter>0</downloadCounter>
<lastUsage>2013-05-29 10:20:36.347 UTC</lastUsage>
<version>5</version>
<lastModified class="sql-timestamp">2013-02-11 10:52:37.0</lastModified>
</olatResourceable>
</org.olat.core.id.context.MyContextEntry>
</entries>
</org.olat.core.id.context.HistoryPointImpl>
\ No newline at end of file
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