Merge pull request #4 from Edirom/feature/mei-dev-version-profiler

Feature/mei dev version profiler
Edirom · May 4, 2022 · ec4b173 · ec4b173
2 parents b982689 + bbb6f35
commit ec4b173
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -11,8 +11,7 @@
 
     <groupId>de.edirom.meigarage</groupId>
     <artifactId>mei-customization</artifactId>
-    <version>0.6.1</version>
-
+    <version>0.6.2-SNAPSHOT</version>
     <properties>
 
         <project.build.sourceEncoding>
@@ -22,8 +21,8 @@
         <project.reporting.outputEncoding>
             UTF-8
         </project.reporting.outputEncoding>
-  	<maven.compiler.source>11</maven.compiler.source>
- 	<maven.compiler.target>11</maven.compiler.target>
+    <maven.compiler.source>11</maven.compiler.source>
+    <maven.compiler.target>11</maven.compiler.target>
     </properties>
 
     <url>/multiprojects/mei-customization</url>

diff --git a/required.sh b/required.sh
@@ -55,3 +55,6 @@ mkdir -p  ${MEI_SOURCES_HOME}/music-encoding/mei401
 cp -r /tmp/mei401/*/*  ${MEI_SOURCES_HOME}/music-encoding/mei401
 rm -r /tmp/mei401
 xmllint -xinclude ${MEI_SOURCES_HOME}/music-encoding/mei401/source/mei-source.xml -o ${MEI_SOURCES_HOME}/music-encoding/mei401/source/mei-source_canonicalized.xml
+mkdir -p  ${MEI_SOURCES_HOME}/music-stylesheets/meidev
+git clone -b develop https://github.com/music-encoding/music-encoding ${MEI_SOURCES_HOME}/music-encoding/meidev 
+xmllint -xinclude ${MEI_SOURCES_HOME}/music-encoding/meidev/source/mei-source.xml -o ${MEI_SOURCES_HOME}/music-encoding/meidev/source/mei-source_canonicalized.xml
diff --git a/src/main/java/de/edirom/meigarage/mei/MEICustomization.java b/src/main/java/de/edirom/meigarage/mei/MEICustomization.java
@@ -41,6 +41,7 @@ public class MEICustomization implements Customization, ErrorHandler {
         List<CustomizationSourceInputType> customizations = new ArrayList<CustomizationSourceInputType>();
         List<String> outputFormats = new ArrayList<String>();
 
+        sources.add(new CustomizationSourceInputType("meidev", "MEI dev", CustomizationSourceInputType.TYPE_SERVER_FILE, "source/mei-source_canonicalized.xml"));
         sources.add(new CustomizationSourceInputType("mei401", "MEI v4.0.1", CustomizationSourceInputType.TYPE_SERVER_FILE, "source/mei-source_canonicalized.xml"));
         sources.add(new CustomizationSourceInputType("mei300", "MEI v3.0.0", CustomizationSourceInputType.TYPE_SERVER_FILE, "source/mei-source_canonicalized.xml"));
         sources.add(new CustomizationSourceInputType("mei211", "MEI v2.1.1", CustomizationSourceInputType.TYPE_SERVER_FILE, "source/mei-source_canonicalized.xml"));

diff --git a/src/test/java/de/edirom/meigarage/mei/MEICustomizationTest.java b/src/test/java/de/edirom/meigarage/mei/MEICustomizationTest.java
@@ -36,14 +36,15 @@ public void tearDown() throws Exception {
     public void customize() throws IOException, EGEException {
         OutputStream os = new FileOutputStream("src/test/resources/test-output.odd");
         String outputFormat = "Compiled ODD";
-        CustomizationSourceInputType sourceInputType = new CustomizationSourceInputType("mei401","MEI v4.0.1", "type_server-file", "source/mei-source_canonicalized.xml");
+        //String outputFormat = "RelaxNG";
         CustomizationSourceInputType customizationInputType = new CustomizationSourceInputType("mei401","MEI v4.0.1", "type_server-file", "source/mei-source_canonicalized.xml");
+        CustomizationSourceInputType sourceInputType = new CustomizationSourceInputType("mei401","MEI v4.0.1", "type_server-file", "source/mei-source_canonicalized.xml");
+        //CustomizationSourceInputType sourceInputType = new CustomizationSourceInputType("meidev","MEI dev", "type_server-file", "source/mei-source_canonicalized.xml");
+        //CustomizationSourceInputType customizationInputType = new CustomizationSourceInputType("meidev","MEI dev", "type_server-file", "source/mei-source_canonicalized.xml");
         List<CustomizationSourceInputType> sources = new ArrayList<>();
         sources.add(sourceInputType);
         List<CustomizationSourceInputType> customizations = new ArrayList<>();
         customizations.add(customizationInputType);
-        List<String> outputFormats = new ArrayList<>();
-        outputFormats.add(outputFormat);
         String tempDir = "src/test/temp";
         customization.customize(null, sourceInputType, customizationInputType, outputFormat, os, null, null, tempDir);
         assertNotNull(new File("src/test/resources/test-output.odd"));