MIR-1094 get rid of MIRWizardLoadClassifications

MyCoRe-Org · Aug 1, 2024 · 583f831 · 583f831
1 parent b566058
commit 583f831
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 146 deletions.
diff --git a/mir-wizard/src/main/java/org/mycore/mir/wizard/command/MIRWizardLoadClassifications.java b/mir-wizard/src/main/java/org/mycore/mir/wizard/command/MIRWizardLoadClassifications.java
diff --git a/mir-wizard/src/main/resources/setup/classifications-wizard-commands.xml b/mir-wizard/src/main/resources/setup/classifications-wizard-commands.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<commands>
+  <command uri="resource:mycore-classifications/XMetaDissPlusThesisLevel.xml">load classification from uri {uri}</command>
+  <command uri="resource:mycore-classifications/derivate_types.xml">load classification from uri {uri}</command>
+  <command uri="resource:mycore-classifications/diniPublType.xml">load classification from uri {uri}</command>
+  <command uri="resource:mycore-classifications/diniPublType2022.xml">load classification from uri {uri}</command>
+  <command uri="resource:mycore-classifications/marcrelator.xml">load classification from uri {uri}</command>
+  <command uri="resource:mycore-classifications/marcgt.xml">load classification from uri {uri}</command>
+  <command uri="resource:mycore-classifications/mcr-roles.xml">load classification from uri {uri}</command>
+  <command uri="resource:mycore-classifications/mir_access.xml">load classification from uri {uri}</command>
+  <command uri="resource:mycore-classifications/mir_filetype.xml">load classification from uri {uri}</command>
+  <command uri="resource:mycore-classifications/mir_genres.xml">load classification from uri {uri}</command>
+  <command uri="resource:mycore-classifications/mir_institutes.xml">load classification from uri {uri}</command>
+  <command uri="resource:mycore-classifications/mir_licenses.xml">load classification from uri {uri}</command>
+  <command uri="resource:mycore-classifications/rfc5646.xml">load classification from uri {uri}</command>
+  <command uri="resource:mycore-classifications/schemaOrg.xml" >load classification from uri {uri}</command>
+  <command uri="resource:mycore-classifications/sdnb.xml">load classification from uri {uri}</command>
+  <command uri="resource:mycore-classifications/state.xml">load classification from uri {uri}</command>
+  <command uri="resource:mycore-classifications/typeOfResource.xml">load classification from uri {uri}</command>
+  <command uri="resource:mycore-classifications/nameIdentifier.xml">load classification from uri {uri}</command>
+  <command uri="resource:mycore-classifications/noteTypes.xml">load classification from uri {uri}</command>
+  <command uri="resource:mycore-classifications/identifier.xml">load classification from uri {uri}</command>
+  <command uri="resource:mycore-classifications/author_roles.xml">load classification from uri {uri}</command>
+  <command uri="resource:mycore-classifications/mir_relateditem.xml">load classification from uri {uri}</command>
+</commands>
diff --git a/mir-wizard/src/main/resources/setup/classifications.xml b/mir-wizard/src/main/resources/setup/classifications.xml
diff --git a/mir-wizard/src/main/resources/setup/install.xml b/mir-wizard/src/main/resources/setup/install.xml
@@ -5,9 +5,9 @@
   <command class="org.mycore.mir.wizard.command.MIRWizardDownloadDBLib" />
   <command class="org.mycore.mir.wizard.command.MIRWizardInitDatabase" />
   <command class="org.mycore.mir.wizard.command.MIRWizardSolr" />
-  <command class="org.mycore.mir.wizard.command.MIRWizardLoadClassifications" />
+  <command class="org.mycore.mir.wizard.command.MIRWizardMCRCommand" name="load.classifications" src="resource:setup/classifications-wizard-commands.xml"/>
   <command class="org.mycore.mir.wizard.command.MIRWizardInitSuperuser" />
   <command class="org.mycore.mir.wizard.command.MIRWizardMCRCommand" name="import.acls" src="resource:setup/defaultrules-wizard-commands.xml" />
   <command class="org.mycore.mir.wizard.command.MIRWizardMCRCommand" name="import.webacls" src="resource:setup/webacl-wizard-commands.xml" />
   <command class="org.mycore.mir.wizard.command.MIRWizardMCRCommand" name="import.restapiacls" src="resource:setup/restapiacl-wizard-commands.xml" />
-</install>
+</install>
diff --git a/mir-wizard/src/test/java/org/mycore/mir/wizard/TestCommands.java b/mir-wizard/src/test/java/org/mycore/mir/wizard/TestCommands.java
@@ -34,7 +34,6 @@
 import org.mycore.common.MCRJPATestCase;
 import org.mycore.common.MCRStreamUtils;
 import org.mycore.common.xml.MCRURIResolver;
-import org.mycore.mir.wizard.command.MIRWizardLoadClassifications;
 import org.mycore.mir.wizard.command.MIRWizardMCRCommand;
 
 /**
@@ -46,7 +45,9 @@ public class TestCommands extends MCRJPATestCase {
     @Test
     public void testLoadClassifications() throws Exception {
         MIRWizardCommandChain chain = new MIRWizardCommandChain();
-        chain.addCommand(new MIRWizardLoadClassifications());
+        MIRWizardMCRCommand loadClassifications = new MIRWizardMCRCommand("load.classifications");
+        loadClassifications.setInputXML(MCRURIResolver.instance().resolve("resource:setup/classifications-wizard-commands.xml"));
+        chain.addCommand(loadClassifications);
 
         endTransaction();
         chain.execute(null);