CCM NG: Adjusted several datasets to current db structure

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@5919 8810af33-2d31-482b-a856-94f89814c4df

ccm-cms/src/test/java/org/librecms/contentsection/DatasetsTest.java

@@ -106,7 +106,8 @@ public class DatasetsTest extends DatasetsVerifier {
             "/datasets/org/librecms/contentsection/ItemAttachmentManagerTest/after-attach-shared.xml",
             "/datasets/org/librecms/contentsection/ItemAttachmentManagerTest/after-attach-nonshared.xml",
             "/datasets/org/librecms/contentsection/ItemAttachmentManagerTest/after-unattach-nonshared.xml",
-            "/datasets/org/librecms/contentsection/ItemAttachmentManagerTest/after-unattach-nonshared.xml",});
+            "/datasets/org/librecms/contentsection/ItemAttachmentManagerTest/after-unattach-nonshared.xml"
+        });
     }
 
     public DatasetsTest(final String datasetPath) {
@@ -125,7 +126,12 @@ public class DatasetsTest extends DatasetsVerifier {
 
     @Override
     public String[] getDdlFiles() {
-        return new String[]{"/datasets/create_ccm_cms_schema.sql"};
+        return new String[]{
+            "/sql/ddl/auto/h2.sql"
+//            "/datasets/h2/001_create_schema.sql",
+//            "/datasets/h2/002_create_ccm_cms_tables.sql",
+//            "/datasets/h2/003_init_hibernate_sequence.sql",
+        };
     }
 
     @BeforeClass

ccm-cms/src/test/resources-wildfly-remote-h2-mem/scripts/002_create_ccm_cms_tables.sql

@@ -934,6 +934,7 @@
         CATEGORY_INDEX boolean,
         OBJECT_ORDER bigint,
         TYPE varchar(255),
+        UUID varchar(255) not null,
         OBJECT_ID bigint,
         CATEGORY_ID bigint,
         primary key (CATEGORIZATION_ID)
@@ -989,6 +990,7 @@
     create table CCM_CORE.CCM_ROLES (
        ROLE_ID bigint not null,
         NAME varchar(512) not null,
+        UUID varchar(255) not null,
         primary key (ROLE_ID)
     );
 
@@ -1016,6 +1018,7 @@
         CONTEXT varchar(255),
         DOMAIN_ORDER bigint,
         OWNER_ORDER bigint,
+        UUID varchar(255) not null,
         domain_OBJECT_ID bigint not null,
         owner_OBJECT_ID bigint not null,
         primary key (OWNERSHIP_ID)
@@ -1190,6 +1193,7 @@
 
     create table CCM_CORE.GROUP_MEMBERSHIPS (
        MEMBERSHIP_ID bigint not null,
+        UUID varchar(255) not null,
         GROUP_ID bigint,
         MEMBER_ID bigint,
         primary key (MEMBERSHIP_ID)
@@ -1335,6 +1339,7 @@
     create table CCM_CORE.PARTIES (
        PARTY_ID bigint not null,
         NAME varchar(256) not null,
+        UUID varchar(255) not null,
         primary key (PARTY_ID)
     );
 
@@ -1344,6 +1349,7 @@
         CREATION_IP varchar(255),
         GRANTED_PRIVILEGE varchar(255),
         INHERITED boolean,
+        UUID varchar(255) not null,
         CREATION_USER_ID bigint,
         GRANTEE_ID bigint,
         INHERITED_FROM_ID bigint,
@@ -1402,6 +1408,7 @@
        RESOURCE_TYPE_ID bigint not null,
         SINGLETON boolean,
         TITLE varchar(254) not null,
+        UUID varchar(255) not null,
         EMBEDDED_VIEW boolean,
         FULL_PAGE_VIEW boolean,
         WORKSPACE_APP boolean,
@@ -1425,6 +1432,7 @@
 
     create table CCM_CORE.ROLE_MEMBERSHIPS (
        MEMBERSHIP_ID bigint not null,
+        UUID varchar(255) not null,
         MEMBER_ID bigint,
         ROLE_ID bigint,
         primary key (MEMBERSHIP_ID)
@@ -1435,11 +1443,11 @@
         SETTING_ID bigint not null,
         CONFIGURATION_CLASS varchar(512) not null,
         NAME varchar(512) not null,
-        SETTING_VALUE_LONG bigint,
-        SETTING_VALUE_DOUBLE double,
         SETTING_VALUE_BIG_DECIMAL decimal(19,2),
-        SETTING_VALUE_STRING varchar(1024),
+        SETTING_VALUE_DOUBLE double,
         SETTING_VALUE_BOOLEAN boolean,
+        SETTING_VALUE_LONG bigint,
+        SETTING_VALUE_STRING varchar(1024),
         primary key (SETTING_ID)
     );
 
@@ -1600,6 +1608,7 @@
 
     create table CCM_CORE.WORKFLOW_TASK_ASSIGNMENTS (
        TASK_ASSIGNMENT_ID bigint not null,
+        UUID varchar(255) not null,
         ROLE_ID bigint,
         TASK_ID bigint,
         primary key (TASK_ASSIGNMENT_ID)
@@ -1616,6 +1625,7 @@
 
     create table CCM_CORE.WORKFLOW_TASK_DEPENDENCIES (
        TASK_DEPENDENCY_ID bigint not null,
+        uuid varchar(255) not null,
         BLOCKED_TASK_ID bigint,
         BLOCKING_TASK_ID bigint,
         primary key (TASK_DEPENDENCY_ID)
@@ -1656,6 +1666,9 @@
         primary key (WORKFLOW_ID)
     );
 
+    alter table CCM_CORE.CATEGORIZATIONS 
+       add constraint UK_da7jus3wn1tr8poyaw9btxbrc unique (UUID);
+
     alter table CCM_CORE.CATEGORY_DOMAINS 
        add constraint UK_mb1riernf8a88u3mwl0bgfj8y unique (DOMAIN_KEY);
 
@@ -1665,21 +1678,48 @@
     alter table CCM_CORE.CCM_OBJECTS 
        add constraint UK_1cm71jlagvyvcnkqvxqyit3wx unique (UUID);
 
+    alter table CCM_CORE.CCM_ROLES 
+       add constraint UK_rfmsjqsq6kagolsod3ufkugll unique (UUID);
+
+    alter table CCM_CORE.DOMAIN_OWNERSHIPS 
+       add constraint UK_j86gai9740v9hshascbsboudb unique (UUID);
+
+    alter table CCM_CORE.GROUP_MEMBERSHIPS 
+       add constraint UK_kkdoia60bmiwhhdru169p3n9g unique (UUID);
+
     alter table CCM_CORE.HOSTS 
        add constraint UK9ramlv6uxwt13v0wj7q0tucsx unique (SERVER_NAME, SERVER_PORT);
 
     alter table CCM_CORE.INSTALLED_MODULES 
        add constraint UK_11imwgfojyi4hpr18uw9g3jvx unique (MODULE_CLASS_NAME);
 
+    alter table CCM_CORE.PARTIES 
+       add constraint UK_1hv061qace2mn4loroe3fwdel unique (UUID);
+
+    alter table CCM_CORE.PERMISSIONS 
+       add constraint UK_p50se7rdexv7xnkiqsl6ijyti unique (UUID);
+
+    alter table CCM_CORE.RESOURCE_TYPES 
+       add constraint UK_ioax2ix2xmq3nw7el5k6orggb unique (UUID);
+
+    alter table CCM_CORE.ROLE_MEMBERSHIPS 
+       add constraint UK_82wdq214bfs99eii71fp50s97 unique (UUID);
+
     alter table CCM_CORE.SETTINGS 
        add constraint UK5whinfxdaepqs09e5ia9y71uk unique (CONFIGURATION_CLASS, NAME);
 
     alter table CCM_CORE.SITES 
        add constraint UK_kou1h4y4st2m173he44yy8grx unique (DOMAIN_OF_SITE);
 
+    alter table CCM_CORE.WORKFLOW_TASK_ASSIGNMENTS 
+       add constraint UK_gv93k167pe9qy3go9vjau1q2t unique (UUID);
+
     alter table CCM_CORE.WORKFLOW_TASK_COMMENTS 
        add constraint UK_4nnedf08odyjxalfkg16fmjoi unique (UUID);
 
+    alter table CCM_CORE.WORKFLOW_TASK_DEPENDENCIES 
+       add constraint UK_787va2ep8ucoul29qgsoaxnub unique (uuid);
+
     alter table CCM_CORE.WORKFLOW_TASKS 
        add constraint UK_2u6ruatxij8wfojl8a1eigqqd unique (UUID);
 

ccm-cms/src/test/resources-wildfly-remote-pgsql/scripts/002_create_ccm_cms_tables.sql

@@ -1,13 +1,3 @@
-drop schema if exists CCM_CMS cascade;
-drop schema if exists CCM_CORE cascade;
-
-drop sequence if exists HIBERNATE_SEQUENCE;
-
-
-    create schema CCM_CMS;
-
-    create schema CCM_CORE;
-
 
     create table CCM_CMS.ARTICLE_TEXTS (
        OBJECT_ID int8 not null,
@@ -944,6 +934,7 @@ drop sequence if exists HIBERNATE_SEQUENCE;
         CATEGORY_INDEX boolean,
         OBJECT_ORDER int8,
         TYPE varchar(255),
+        UUID varchar(255) not null,
         OBJECT_ID int8,
         CATEGORY_ID int8,
         primary key (CATEGORIZATION_ID)
@@ -999,6 +990,7 @@ drop sequence if exists HIBERNATE_SEQUENCE;
     create table CCM_CORE.CCM_ROLES (
        ROLE_ID int8 not null,
         NAME varchar(512) not null,
+        UUID varchar(255) not null,
         primary key (ROLE_ID)
     );
 
@@ -1026,6 +1018,7 @@ drop sequence if exists HIBERNATE_SEQUENCE;
         CONTEXT varchar(255),
         DOMAIN_ORDER int8,
         OWNER_ORDER int8,
+        UUID varchar(255) not null,
         domain_OBJECT_ID int8 not null,
         owner_OBJECT_ID int8 not null,
         primary key (OWNERSHIP_ID)
@@ -1200,6 +1193,7 @@ drop sequence if exists HIBERNATE_SEQUENCE;
 
     create table CCM_CORE.GROUP_MEMBERSHIPS (
        MEMBERSHIP_ID int8 not null,
+        UUID varchar(255) not null,
         GROUP_ID int8,
         MEMBER_ID int8,
         primary key (MEMBERSHIP_ID)
@@ -1345,6 +1339,7 @@ drop sequence if exists HIBERNATE_SEQUENCE;
     create table CCM_CORE.PARTIES (
        PARTY_ID int8 not null,
         NAME varchar(256) not null,
+        UUID varchar(255) not null,
         primary key (PARTY_ID)
     );
 
@@ -1354,6 +1349,7 @@ drop sequence if exists HIBERNATE_SEQUENCE;
         CREATION_IP varchar(255),
         GRANTED_PRIVILEGE varchar(255),
         INHERITED boolean,
+        UUID varchar(255) not null,
         CREATION_USER_ID int8,
         GRANTEE_ID int8,
         INHERITED_FROM_ID int8,
@@ -1412,6 +1408,7 @@ drop sequence if exists HIBERNATE_SEQUENCE;
        RESOURCE_TYPE_ID int8 not null,
         SINGLETON boolean,
         TITLE varchar(254) not null,
+        UUID varchar(255) not null,
         EMBEDDED_VIEW boolean,
         FULL_PAGE_VIEW boolean,
         WORKSPACE_APP boolean,
@@ -1435,6 +1432,7 @@ drop sequence if exists HIBERNATE_SEQUENCE;
 
     create table CCM_CORE.ROLE_MEMBERSHIPS (
        MEMBERSHIP_ID int8 not null,
+        UUID varchar(255) not null,
         MEMBER_ID int8,
         ROLE_ID int8,
         primary key (MEMBERSHIP_ID)
@@ -1445,11 +1443,11 @@ drop sequence if exists HIBERNATE_SEQUENCE;
         SETTING_ID int8 not null,
         CONFIGURATION_CLASS varchar(512) not null,
         NAME varchar(512) not null,
-        SETTING_VALUE_LONG int8,
-        SETTING_VALUE_DOUBLE float8,
         SETTING_VALUE_BIG_DECIMAL numeric(19, 2),
-        SETTING_VALUE_STRING varchar(1024),
+        SETTING_VALUE_DOUBLE float8,
         SETTING_VALUE_BOOLEAN boolean,
+        SETTING_VALUE_LONG int8,
+        SETTING_VALUE_STRING varchar(1024),
         primary key (SETTING_ID)
     );
 
@@ -1610,6 +1608,7 @@ drop sequence if exists HIBERNATE_SEQUENCE;
 
     create table CCM_CORE.WORKFLOW_TASK_ASSIGNMENTS (
        TASK_ASSIGNMENT_ID int8 not null,
+        UUID varchar(255) not null,
         ROLE_ID int8,
         TASK_ID int8,
         primary key (TASK_ASSIGNMENT_ID)
@@ -1626,6 +1625,7 @@ drop sequence if exists HIBERNATE_SEQUENCE;
 
     create table CCM_CORE.WORKFLOW_TASK_DEPENDENCIES (
        TASK_DEPENDENCY_ID int8 not null,
+        uuid varchar(255) not null,
         BLOCKED_TASK_ID int8,
         BLOCKING_TASK_ID int8,
         primary key (TASK_DEPENDENCY_ID)
@@ -1666,6 +1666,9 @@ drop sequence if exists HIBERNATE_SEQUENCE;
         primary key (WORKFLOW_ID)
     );
 
+    alter table CCM_CORE.CATEGORIZATIONS 
+       add constraint UK_da7jus3wn1tr8poyaw9btxbrc unique (UUID);
+
     alter table CCM_CORE.CATEGORY_DOMAINS 
        add constraint UK_mb1riernf8a88u3mwl0bgfj8y unique (DOMAIN_KEY);
 
@@ -1675,21 +1678,48 @@ drop sequence if exists HIBERNATE_SEQUENCE;
     alter table CCM_CORE.CCM_OBJECTS 
        add constraint UK_1cm71jlagvyvcnkqvxqyit3wx unique (UUID);
 
+    alter table CCM_CORE.CCM_ROLES 
+       add constraint UK_rfmsjqsq6kagolsod3ufkugll unique (UUID);
+
+    alter table CCM_CORE.DOMAIN_OWNERSHIPS 
+       add constraint UK_j86gai9740v9hshascbsboudb unique (UUID);
+
+    alter table CCM_CORE.GROUP_MEMBERSHIPS 
+       add constraint UK_kkdoia60bmiwhhdru169p3n9g unique (UUID);
+
     alter table CCM_CORE.HOSTS 
        add constraint UK9ramlv6uxwt13v0wj7q0tucsx unique (SERVER_NAME, SERVER_PORT);
 
     alter table CCM_CORE.INSTALLED_MODULES 
        add constraint UK_11imwgfojyi4hpr18uw9g3jvx unique (MODULE_CLASS_NAME);
 
+    alter table CCM_CORE.PARTIES 
+       add constraint UK_1hv061qace2mn4loroe3fwdel unique (UUID);
+
+    alter table CCM_CORE.PERMISSIONS 
+       add constraint UK_p50se7rdexv7xnkiqsl6ijyti unique (UUID);
+
+    alter table CCM_CORE.RESOURCE_TYPES 
+       add constraint UK_ioax2ix2xmq3nw7el5k6orggb unique (UUID);
+
+    alter table CCM_CORE.ROLE_MEMBERSHIPS 
+       add constraint UK_82wdq214bfs99eii71fp50s97 unique (UUID);
+
     alter table CCM_CORE.SETTINGS 
        add constraint UK5whinfxdaepqs09e5ia9y71uk unique (CONFIGURATION_CLASS, NAME);
 
     alter table CCM_CORE.SITES 
        add constraint UK_kou1h4y4st2m173he44yy8grx unique (DOMAIN_OF_SITE);
 
+    alter table CCM_CORE.WORKFLOW_TASK_ASSIGNMENTS 
+       add constraint UK_gv93k167pe9qy3go9vjau1q2t unique (UUID);
+
     alter table CCM_CORE.WORKFLOW_TASK_COMMENTS 
        add constraint UK_4nnedf08odyjxalfkg16fmjoi unique (UUID);
 
+    alter table CCM_CORE.WORKFLOW_TASK_DEPENDENCIES 
+       add constraint UK_787va2ep8ucoul29qgsoaxnub unique (uuid);
+
     alter table CCM_CORE.WORKFLOW_TASKS 
        add constraint UK_2u6ruatxij8wfojl8a1eigqqd unique (UUID);
 

ccm-cms/src/test/resources/datasets/org/librecms/contentsection/AssetManagerTest/after-clean-orphaned.xml

@@ -495,6 +495,7 @@
         revtype="0" />
     
     <ccm_core.categorizations categorization_id="30100" 
+                              uuid="0fe99c16-1bc1-4ae2-be40-e1a5075e7e43"
                               category_id="200" 
                               object_id="600" 
                               category_order="1" 
@@ -502,6 +503,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30200" 
+                              uuid="fd809254-a43b-4876-b4b4-a709b05fa22c"
                               category_id="410" 
                               object_id="700" 
                               category_order="1" 
@@ -509,6 +511,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30300" 
+                              uuid="19314b13-a23f-4286-a50f-1c39e118130c"
                               category_id="410" 
                               object_id="800" 
                               category_order="1" 
@@ -516,6 +519,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30400" 
+                              uuid="3b7bbc6a-251d-49ba-8b6e-27a6f5881e11"
                               category_id="400" 
                               object_id="900" 
                               category_order="1" 
@@ -523,6 +527,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30600" 
+                              uuid="6b62f000-9ecd-4862-89c1-c3d274dff364"
                               category_id="420" 
                               object_id="1100" 
                               category_order="1" 

ccm-cms/src/test/resources/datasets/org/librecms/contentsection/AssetManagerTest/after-copy-to-other-contentsection.xml

@@ -523,6 +523,7 @@
         revtype="0" />
     
     <ccm_core.categorizations categorization_id="30100" 
+                              uuid="0fe99c16-1bc1-4ae2-be40-e1a5075e7e43"
                               category_id="200" 
                               object_id="600" 
                               category_order="1" 
@@ -530,6 +531,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30200" 
+                              uuid="fd809254-a43b-4876-b4b4-a709b05fa22c"
                               category_id="410" 
                               object_id="700" 
                               category_order="1" 
@@ -537,6 +539,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30300" 
+                              uuid="19314b13-a23f-4286-a50f-1c39e118130c"
                               category_id="410" 
                               object_id="800" 
                               category_order="1" 
@@ -544,6 +547,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30400" 
+                              uuid="3b7bbc6a-251d-49ba-8b6e-27a6f5881e11"
                               category_id="400" 
                               object_id="900" 
                               category_order="1" 
@@ -551,6 +555,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30600" 
+                              uuid="6b62f000-9ecd-4862-89c1-c3d274dff364"
                               category_id="420" 
                               object_id="1100" 
                               category_order="1" 
@@ -558,6 +563,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30700" 
+                              uuid="3b1bbcb0-db28-4c5f-a8d1-f1b01a369262"
                               category_id="1600" 
                               object_id="1800" 
                               category_order="1" 

ccm-cms/src/test/resources/datasets/org/librecms/contentsection/AssetManagerTest/after-copy-to-other-folder.xml

@@ -523,6 +523,7 @@
         revtype="0" />
     
     <ccm_core.categorizations categorization_id="30100" 
+                              uuid="0fe99c16-1bc1-4ae2-be40-e1a5075e7e43"
                               category_id="200" 
                               object_id="600" 
                               category_order="1" 
@@ -530,6 +531,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30200" 
+                              uuid="fd809254-a43b-4876-b4b4-a709b05fa22c"
                               category_id="410" 
                               object_id="700" 
                               category_order="1" 
@@ -537,6 +539,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30300" 
+                              uuid="19314b13-a23f-4286-a50f-1c39e118130c"
                               category_id="410" 
                               object_id="800" 
                               category_order="1" 
@@ -544,6 +547,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30400" 
+                              uuid="3b7bbc6a-251d-49ba-8b6e-27a6f5881e11"
                               category_id="400" 
                               object_id="900" 
                               category_order="1" 
@@ -551,6 +555,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30600" 
+                              uuid="6b62f000-9ecd-4862-89c1-c3d274dff364"
                               category_id="420" 
                               object_id="1100" 
                               category_order="1" 
@@ -558,6 +563,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30700" 
+                              uuid="3b1bbcb0-db28-4c5f-a8d1-f1b01a369262"
                               category_id="400" 
                               object_id="1800" 
                               category_order="1" 

ccm-cms/src/test/resources/datasets/org/librecms/contentsection/AssetManagerTest/after-copy-to-same-folder.xml

@@ -76,7 +76,7 @@
     <ccm_core.ccm_objects object_id="1800"
                           display_name="catalog.pdf_copy1"
                           uuid="00000000-0000-0000-0000-000000000000" />
-<!--    <ccm_core.ccm_objects object_id="1900"
+    <!--    <ccm_core.ccm_objects object_id="1900"
     display_name="catalog.pdf_copy2"
     uuid="00000000-0000-0000-0000-000000000001" />-->
     
@@ -112,7 +112,7 @@
                               rev="1"
                               revtype="0"
                               display_name="catalog.pdf_copy1" />
-<!--    <ccm_core.ccm_objects_aud object_id="1900"
+    <!--    <ccm_core.ccm_objects_aud object_id="1900"
     rev="1"
     revtype="0"
     display_name="catalog.pdf_copy2" />-->
@@ -321,7 +321,7 @@
                         rev="0" />
     <ccm_cms.assets_aud object_id="1800" 
                         rev="1" />
-<!--    <ccm_cms.assets_aud object_id="1900" 
+    <!--    <ccm_cms.assets_aud object_id="1900" 
     rev="1" />-->
     
     <ccm_cms.asset_titles asset_id="700" 
@@ -345,7 +345,7 @@
     <ccm_cms.asset_titles asset_id="1800" 
                           localized_value="catalog.pdf" 
                           locale="en" />
-<!--    <ccm_cms.asset_titles asset_id="1900" 
+    <!--    <ccm_cms.asset_titles asset_id="1900" 
     localized_value="catalog.pdf" 
     locale="en" />-->
     
@@ -377,7 +377,7 @@
                            filename="catalog.pdf" 
                            mime_type="application/pdf" 
                            data_size="0"/>
-<!--    <ccm_cms.binary_assets object_id="1900" 
+    <!--    <ccm_cms.binary_assets object_id="1900" 
     filename="catalog.pdf" 
     mime_type="application/pdf" 
     data_size="0"/>-->
@@ -417,7 +417,7 @@
                                filename="catalog.pdf" 
                                mime_type="application/pdf"
                                data_size="0" />
-<!--    <ccm_cms.binary_assets_aud object_id="1900" 
+    <!--    <ccm_cms.binary_assets_aud object_id="1900" 
     rev="1"
     filename="catalog.pdf" 
     mime_type="application/pdf"
@@ -464,7 +464,7 @@
                        rev="0" />
     <ccm_cms.files_aud object_id="1800" 
                        rev="1" />
-<!--    <ccm_cms.files_aud object_id="1900" 
+    <!--    <ccm_cms.files_aud object_id="1900" 
     rev="1" />-->
     
     <ccm_cms.asset_titles_aud asset_id="700" 
@@ -502,7 +502,7 @@
                               revtype="0"
                               localized_value="catalog.pdf" 
                               locale="en" />
-<!--    <ccm_cms.asset_titles_aud asset_id="1900" 
+    <!--    <ccm_cms.asset_titles_aud asset_id="1900" 
     rev="1"
     revtype="0"
     localized_value="catalog.pdf" 
@@ -553,6 +553,7 @@
         revtype="0" />
     
     <ccm_core.categorizations categorization_id="30100" 
+                              uuid="0fe99c16-1bc1-4ae2-be40-e1a5075e7e43"
                               category_id="200" 
                               object_id="600" 
                               category_order="1" 
@@ -560,6 +561,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30200" 
+                              uuid="fd809254-a43b-4876-b4b4-a709b05fa22c"
                               category_id="410" 
                               object_id="700" 
                               category_order="1" 
@@ -567,6 +569,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30300" 
+                              uuid="19314b13-a23f-4286-a50f-1c39e118130c"
                               category_id="410" 
                               object_id="800" 
                               category_order="1" 
@@ -574,6 +577,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30400" 
+                              uuid="3b7bbc6a-251d-49ba-8b6e-27a6f5881e11"
                               category_id="400" 
                               object_id="900" 
                               category_order="1" 
@@ -581,6 +585,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30600" 
+                              uuid="6b62f000-9ecd-4862-89c1-c3d274dff364"
                               category_id="420" 
                               object_id="1100" 
                               category_order="1" 
@@ -588,13 +593,14 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30700" 
+                              uuid="2becbffa-5f94-4f2f-91c0-75f599c4c1d8"
                               category_id="420" 
                               object_id="1800" 
                               category_order="1" 
                               object_order="7" 
                               category_index="false"
                               type="folder" />
-<!--    <ccm_core.categorizations categorization_id="30800" 
+    <!--    <ccm_core.categorizations categorization_id="30800" 
     category_id="420" 
     object_id="1900" 
     category_order="1" 

ccm-cms/src/test/resources/datasets/org/librecms/contentsection/AssetManagerTest/after-move-to-other-contentsection.xml

@@ -491,6 +491,7 @@
         revtype="0" />
     
     <ccm_core.categorizations categorization_id="30100" 
+                              uuid="0fe99c16-1bc1-4ae2-be40-e1a5075e7e43"
                               category_id="200" 
                               object_id="600" 
                               category_order="1" 
@@ -498,6 +499,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30200" 
+                              uuid="fd809254-a43b-4876-b4b4-a709b05fa22c"
                               category_id="410" 
                               object_id="700" 
                               category_order="1" 
@@ -505,6 +507,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30300" 
+                              uuid="19314b13-a23f-4286-a50f-1c39e118130c"
                               category_id="410" 
                               object_id="800" 
                               category_order="1" 
@@ -512,6 +515,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30400" 
+                              uuid="3b7bbc6a-251d-49ba-8b6e-27a6f5881e11"
                               category_id="1600" 
                               object_id="900" 
                               category_order="1" 
@@ -519,6 +523,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30600" 
+                              uuid="6b62f000-9ecd-4862-89c1-c3d274dff364"
                               category_id="420" 
                               object_id="1100" 
                               category_order="1" 

ccm-cms/src/test/resources/datasets/org/librecms/contentsection/AssetManagerTest/after-move-to-other-folder.xml

@@ -491,6 +491,7 @@
         revtype="0" />
     
     <ccm_core.categorizations categorization_id="30100" 
+                              uuid="0fe99c16-1bc1-4ae2-be40-e1a5075e7e43"
                               category_id="200" 
                               object_id="600" 
                               category_order="1" 
@@ -498,6 +499,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30200" 
+                              uuid="fd809254-a43b-4876-b4b4-a709b05fa22c"
                               category_id="410" 
                               object_id="700" 
                               category_order="1" 
@@ -505,6 +507,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30300" 
+                              uuid="19314b13-a23f-4286-a50f-1c39e118130c"
                               category_id="410" 
                               object_id="800" 
                               category_order="1" 
@@ -512,6 +515,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30400" 
+                              uuid="3b7bbc6a-251d-49ba-8b6e-27a6f5881e11"
                               category_id="410" 
                               object_id="900" 
                               category_order="1" 
@@ -519,6 +523,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30600" 
+                              uuid="6b62f000-9ecd-4862-89c1-c3d274dff364"
                               category_id="420" 
                               object_id="1100" 
                               category_order="1" 

ccm-cms/src/test/resources/datasets/org/librecms/contentsection/AssetManagerTest/after-share.xml

@@ -523,6 +523,7 @@
         revtype="0" />
     
     <ccm_core.categorizations categorization_id="30100" 
+                              uuid="0fe99c16-1bc1-4ae2-be40-e1a5075e7e43"
                               category_id="200" 
                               object_id="600" 
                               category_order="1" 
@@ -530,6 +531,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30200" 
+                              uuid="fd809254-a43b-4876-b4b4-a709b05fa22c"
                               category_id="410" 
                               object_id="700" 
                               category_order="1" 
@@ -537,6 +539,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30300" 
+                              uuid="19314b13-a23f-4286-a50f-1c39e118130c"
                               category_id="410" 
                               object_id="800" 
                               category_order="1" 
@@ -544,6 +547,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30400" 
+                              uuid="3b7bbc6a-251d-49ba-8b6e-27a6f5881e11"
                               category_id="400" 
                               object_id="900" 
                               category_order="1" 
@@ -551,6 +555,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30600" 
+                              uuid="6b62f000-9ecd-4862-89c1-c3d274dff364"
                               category_id="420" 
                               object_id="1100" 
                               category_order="1" 
@@ -558,6 +563,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="1800" 
+                              uuid="3b1bbcb0-db28-4c5f-a8d1-f1b01a369262"
                               category_id="420" 
                               object_id="1100" 
                               category_order="1" 

ccm-cms/src/test/resources/datasets/org/librecms/contentsection/AssetManagerTest/data.xml

@@ -491,6 +491,7 @@
         revtype="0" />
     
     <ccm_core.categorizations categorization_id="30100" 
+                              uuid="0fe99c16-1bc1-4ae2-be40-e1a5075e7e43"
                               category_id="200" 
                               object_id="600" 
                               category_order="1" 
@@ -498,6 +499,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30200" 
+                              uuid="fd809254-a43b-4876-b4b4-a709b05fa22c"
                               category_id="410" 
                               object_id="700" 
                               category_order="1" 
@@ -505,6 +507,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30300" 
+                              uuid="19314b13-a23f-4286-a50f-1c39e118130c"
                               category_id="410" 
                               object_id="800" 
                               category_order="1" 
@@ -512,6 +515,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30400" 
+                              uuid="3b7bbc6a-251d-49ba-8b6e-27a6f5881e11"
                               category_id="400" 
                               object_id="900" 
                               category_order="1" 
@@ -519,6 +523,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30600" 
+                              uuid="6b62f000-9ecd-4862-89c1-c3d274dff364"
                               category_id="420" 
                               object_id="1100" 
                               category_order="1" 

ccm-cms/src/test/resources/datasets/org/librecms/contentsection/AssetRepositoryTest/after-delete.xml

@@ -330,39 +330,44 @@
         locale="en" 
         revtype="0" />
     
-    <ccm_core.categorizations categorization_id="30600" 
+    <ccm_core.categorizations categorization_id="30100" 
-                              category_id="400" 
+                              uuid="0fe99c16-1bc1-4ae2-be40-e1a5075e7e43"
-                              object_id="1100" 
+                              category_id="200" 
+                              object_id="600" 
                               category_order="1" 
-                              object_order="6" 
+                              object_order="1" 
-                              category_index="false"
-                              type="folder" />
-    <ccm_core.categorizations categorization_id="30500" 
-                              category_id="400" 
-                              object_id="1000" 
-                              category_order="1" 
-                              object_order="5" 
-                              category_index="false"
-                              type="folder" />
-    <ccm_core.categorizations categorization_id="30400" 
-                              category_id="400" 
-                              object_id="900" 
-                              category_order="1" 
-                              object_order="4" 
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30200" 
+                              uuid="fd809254-a43b-4876-b4b4-a709b05fa22c"
                               category_id="400" 
                               object_id="700" 
                               category_order="1" 
                               object_order="2" 
                               category_index="false"
                               type="folder" />
-    <ccm_core.categorizations categorization_id="30100" 
+    <ccm_core.categorizations categorization_id="30400" 
-                              category_id="200" 
+                              uuid="3b7bbc6a-251d-49ba-8b6e-27a6f5881e11"
-                              object_id="600" 
+                              category_id="400" 
+                              object_id="900" 
                               category_order="1" 
-                              object_order="1" 
+                              object_order="4" 
+                              category_index="false"
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="30500" 
+                              uuid="425abf3a-0b5a-4f45-aeaa-2cfd186c0d6e"
+                              category_id="400" 
+                              object_id="1000" 
+                              category_order="1" 
+                              object_order="5" 
+                              category_index="false"
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="30600" 
+                              uuid="6b62f000-9ecd-4862-89c1-c3d274dff364"
+                              category_id="400" 
+                              object_id="1100" 
+                              category_order="1" 
+                              object_order="6" 
                               category_index="false"
                               type="folder" />
     

ccm-cms/src/test/resources/datasets/org/librecms/contentsection/AssetRepositoryTest/data.xml

@@ -329,6 +329,7 @@
         revtype="0" />
     
     <ccm_core.categorizations categorization_id="30100" 
+                              uuid="0fe99c16-1bc1-4ae2-be40-e1a5075e7e43"
                               category_id="200" 
                               object_id="600" 
                               category_order="1" 
@@ -336,6 +337,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30200" 
+                              uuid="fd809254-a43b-4876-b4b4-a709b05fa22c"
                               category_id="400" 
                               object_id="700" 
                               category_order="1" 
@@ -343,6 +345,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30300" 
+                              uuid="19314b13-a23f-4286-a50f-1c39e118130c"
                               category_id="400" 
                               object_id="800" 
                               category_order="1" 
@@ -350,6 +353,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30400" 
+                              uuid="3b7bbc6a-251d-49ba-8b6e-27a6f5881e11"
                               category_id="400" 
                               object_id="900" 
                               category_order="1" 
@@ -357,6 +361,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30500" 
+                              uuid="425abf3a-0b5a-4f45-aeaa-2cfd186c0d6e"
                               category_id="400" 
                               object_id="1000" 
                               category_order="1" 
@@ -364,6 +369,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30600" 
+                              uuid="6b62f000-9ecd-4862-89c1-c3d274dff364"
                               category_id="400" 
                               object_id="1100" 
                               category_order="1" 

ccm-cms/src/test/resources/datasets/org/librecms/contentsection/AttachmentListManagerTest/after-create-after-last.xml

@@ -309,6 +309,7 @@
                        rev="0" />
         
     <ccm_core.categorizations categorization_id="30100" 
+                              uuid="d84725e0-45de-48d8-a6cc-70ee8235bb3d"
                               category_id="200" 
                               object_id="510" 
                               category_order="1" 
@@ -316,6 +317,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30200" 
+                              uuid="463e960f-2126-4021-9681-1d7d57307fc8"
                               category_id="200" 
                               object_id="520" 
                               category_order="1" 
@@ -323,6 +325,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30300"
+                              uuid="8c537e4f-0956-4fad-b027-c1fed4380afd"
                               category_id="300"
                               object_id="610"
                               category_order="1"
@@ -330,6 +333,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30340"
+                              uuid="aa621ce6-e117-47ac-9866-e9e35bb9088f"
                               category_id="300"
                               object_id="620"
                               category_order="1"
@@ -337,6 +341,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30500"
+                              uuid="ae6a3715-2a68-4286-b91a-936eefac462e"
                               category_id="300"
                               object_id="630"
                               category_order="1"

ccm-cms/src/test/resources/datasets/org/librecms/contentsection/AttachmentListManagerTest/after-create-with-negative-position.xml

@@ -309,6 +309,7 @@
                        rev="0" />
         
     <ccm_core.categorizations categorization_id="30100" 
+                              uuid="d84725e0-45de-48d8-a6cc-70ee8235bb3d"
                               category_id="200" 
                               object_id="510" 
                               category_order="1" 
@@ -316,6 +317,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30200" 
+                              uuid="463e960f-2126-4021-9681-1d7d57307fc8"
                               category_id="200" 
                               object_id="520" 
                               category_order="1" 
@@ -323,6 +325,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30300"
+                              uuid="8c537e4f-0956-4fad-b027-c1fed4380afd"
                               category_id="300"
                               object_id="610"
                               category_order="1"
@@ -330,6 +333,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30340"
+                              uuid="aa621ce6-e117-47ac-9866-e9e35bb9088f"
                               category_id="300"
                               object_id="620"
                               category_order="1"
@@ -337,6 +341,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30500"
+                              uuid="ae6a3715-2a68-4286-b91a-936eefac462e"
                               category_id="300"
                               object_id="630"
                               category_order="1"

ccm-cms/src/test/resources/datasets/org/librecms/contentsection/AttachmentListManagerTest/after-create-with-position.xml

@@ -309,6 +309,7 @@
                        rev="0" />
         
     <ccm_core.categorizations categorization_id="30100" 
+                              uuid="d84725e0-45de-48d8-a6cc-70ee8235bb3d"
                               category_id="200" 
                               object_id="510" 
                               category_order="1" 
@@ -316,6 +317,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30200" 
+                              uuid="463e960f-2126-4021-9681-1d7d57307fc8"
                               category_id="200" 
                               object_id="520" 
                               category_order="1" 
@@ -323,6 +325,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30300"
+                              uuid="8c537e4f-0956-4fad-b027-c1fed4380afd"
                               category_id="300"
                               object_id="610"
                               category_order="1"
@@ -330,6 +333,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30340"
+                              uuid="aa621ce6-e117-47ac-9866-e9e35bb9088f"
                               category_id="300"
                               object_id="620"
                               category_order="1"
@@ -337,6 +341,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30500"
+                              uuid="ae6a3715-2a68-4286-b91a-936eefac462e"
                               category_id="300"
                               object_id="630"
                               category_order="1"

ccm-cms/src/test/resources/datasets/org/librecms/contentsection/AttachmentListManagerTest/after-create.xml

@@ -309,6 +309,7 @@
                        rev="0" />
         
     <ccm_core.categorizations categorization_id="30100" 
+                              uuid="d84725e0-45de-48d8-a6cc-70ee8235bb3d"
                               category_id="200" 
                               object_id="510" 
                               category_order="1" 
@@ -316,6 +317,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30200" 
+                              uuid="463e960f-2126-4021-9681-1d7d57307fc8"
                               category_id="200" 
                               object_id="520" 
                               category_order="1" 
@@ -323,6 +325,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30300"
+                              uuid="8c537e4f-0956-4fad-b027-c1fed4380afd"
                               category_id="300"
                               object_id="610"
                               category_order="1"
@@ -330,6 +333,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30340"
+                              uuid="aa621ce6-e117-47ac-9866-e9e35bb9088f"
                               category_id="300"
                               object_id="620"
                               category_order="1"
@@ -337,6 +341,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30500"
+                              uuid="ae6a3715-2a68-4286-b91a-936eefac462e"
                               category_id="300"
                               object_id="630"
                               category_order="1"

ccm-cms/src/test/resources/datasets/org/librecms/contentsection/AttachmentListManagerTest/after-move-down.xml

@@ -305,6 +305,7 @@
                        rev="0" />
         
     <ccm_core.categorizations categorization_id="30100" 
+                              uuid="d84725e0-45de-48d8-a6cc-70ee8235bb3d"
                               category_id="200" 
                               object_id="510" 
                               category_order="1" 
@@ -312,6 +313,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30200" 
+                              uuid="463e960f-2126-4021-9681-1d7d57307fc8"
                               category_id="200" 
                               object_id="520" 
                               category_order="1" 
@@ -319,6 +321,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30300"
+                              uuid="8c537e4f-0956-4fad-b027-c1fed4380afd"
                               category_id="300"
                               object_id="610"
                               category_order="1"
@@ -326,6 +329,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30340"
+                              uuid="aa621ce6-e117-47ac-9866-e9e35bb9088f"
                               category_id="300"
                               object_id="620"
                               category_order="1"
@@ -333,6 +337,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30500"
+                              uuid="ae6a3715-2a68-4286-b91a-936eefac462e"
                               category_id="300"
                               object_id="630"
                               category_order="1"

ccm-cms/src/test/resources/datasets/org/librecms/contentsection/AttachmentListManagerTest/after-move-up.xml

@@ -305,6 +305,7 @@
                        rev="0" />
         
     <ccm_core.categorizations categorization_id="30100" 
+                              uuid="d84725e0-45de-48d8-a6cc-70ee8235bb3d"
                               category_id="200" 
                               object_id="510" 
                               category_order="1" 
@@ -312,6 +313,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30200" 
+                              uuid="463e960f-2126-4021-9681-1d7d57307fc8"
                               category_id="200" 
                               object_id="520" 
                               category_order="1" 
@@ -319,6 +321,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30300"
+                              uuid="8c537e4f-0956-4fad-b027-c1fed4380afd"
                               category_id="300"
                               object_id="610"
                               category_order="1"
@@ -326,6 +329,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30340"
+                              uuid="aa621ce6-e117-47ac-9866-e9e35bb9088f"
                               category_id="300"
                               object_id="620"
                               category_order="1"
@@ -333,6 +337,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30500"
+                              uuid="ae6a3715-2a68-4286-b91a-936eefac462e"
                               category_id="300"
                               object_id="630"
                               category_order="1"

ccm-cms/src/test/resources/datasets/org/librecms/contentsection/AttachmentListManagerTest/after-remove.xml

@@ -332,6 +332,7 @@
                        rev="0" />
         
     <ccm_core.categorizations categorization_id="30100" 
+                              uuid="d84725e0-45de-48d8-a6cc-70ee8235bb3d"
                               category_id="200" 
                               object_id="510" 
                               category_order="1" 
@@ -339,6 +340,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30200" 
+                              uuid="463e960f-2126-4021-9681-1d7d57307fc8"
                               category_id="200" 
                               object_id="520" 
                               category_order="1" 
@@ -346,6 +348,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30300"
+                              uuid="8c537e4f-0956-4fad-b027-c1fed4380afd"
                               category_id="300"
                               object_id="610"
                               category_order="1"
@@ -353,6 +356,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30340"
+                              uuid="aa621ce6-e117-47ac-9866-e9e35bb9088f"
                               category_id="300"
                               object_id="620"
                               category_order="1"
@@ -360,6 +364,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30500"
+                              uuid="ae6a3715-2a68-4286-b91a-936eefac462e"
                               category_id="300"
                               object_id="630"
                               category_order="1"

ccm-cms/src/test/resources/datasets/org/librecms/contentsection/AttachmentListManagerTest/data.xml

@@ -303,6 +303,7 @@
                        rev="0" />
         
     <ccm_core.categorizations categorization_id="30100" 
+                              uuid="d84725e0-45de-48d8-a6cc-70ee8235bb3d"
                               category_id="200" 
                               object_id="510" 
                               category_order="1" 
@@ -310,6 +311,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30200" 
+                              uuid="463e960f-2126-4021-9681-1d7d57307fc8"
                               category_id="200" 
                               object_id="520" 
                               category_order="1" 
@@ -317,6 +319,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30300"
+                              uuid="8c537e4f-0956-4fad-b027-c1fed4380afd"
                               category_id="300"
                               object_id="610"
                               category_order="1"
@@ -324,6 +327,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30340"
+                              uuid="aa621ce6-e117-47ac-9866-e9e35bb9088f"
                               category_id="300"
                               object_id="620"
                               category_order="1"
@@ -331,6 +335,7 @@
                               category_index="false"
                               type="folder" />
     <ccm_core.categorizations categorization_id="30500"
+                              uuid="ae6a3715-2a68-4286-b91a-936eefac462e"
                               category_id="300"
                               object_id="630"
                               category_order="1"

ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-add-contenttype.xml

@@ -220,6 +220,7 @@
         revtype="0" />
         
     <ccm_core.categorizations categorization_id="12001" 
+                              uuid="25e54ad7-a803-4b96-b835-8b9fe12a9a75"
                               category_id="2100" 
                               object_id="11001" 
                               category_order="1" 

ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-add-role.xml

@@ -178,6 +178,7 @@
         revtype="0" />
         
     <ccm_core.categorizations categorization_id="12001" 
+                              uuid="25e54ad7-a803-4b96-b835-8b9fe12a9a75"
                               category_id="2100" 
                               object_id="11001" 
                               category_order="1" 

ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-create.xml

@@ -230,6 +230,7 @@
         revtype="0" />
         
     <ccm_core.categorizations categorization_id="12001" 
+                              uuid="25e54ad7-a803-4b96-b835-8b9fe12a9a75"
                               category_id="2100" 
                               object_id="11001" 
                               category_order="1" 

ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-remove-contenttype.xml

@@ -202,6 +202,7 @@
         revtype="0" />
         
     <ccm_core.categorizations categorization_id="12001" 
+                              uuid="25e54ad7-a803-4b96-b835-8b9fe12a9a75"
                               category_id="2100" 
                               object_id="11001" 
                               category_order="1" 

ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-remove-role.xml

@@ -212,6 +212,7 @@
         revtype="0" />
         
     <ccm_core.categorizations categorization_id="12001" 
+                              uuid="25e54ad7-a803-4b96-b835-8b9fe12a9a75"
                               category_id="2100" 
                               object_id="11001" 
                               category_order="1" 

ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-rename.xml

@@ -179,6 +179,7 @@
         revtype="0" />
         
     <ccm_core.categorizations categorization_id="12001" 
+                              uuid="25e54ad7-a803-4b96-b835-8b9fe12a9a75"
                               category_id="2100" 
                               object_id="11001" 
                               category_order="1" 

ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/data.xml

@@ -213,6 +213,7 @@
         revtype="0" />
         
     <ccm_core.categorizations categorization_id="12001" 
+                              uuid="25e54ad7-a803-4b96-b835-8b9fe12a9a75"
                               category_id="2100" 
                               object_id="11001" 
                               category_order="1"