diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
index dec668ef1613f0726e4df238ad1bbdf1b089a517..6124ef01c3fb880c99ca1271f584d996d6a1b50e 100644
--- a/META-INF/MANIFEST.MF
+++ b/META-INF/MANIFEST.MF
@@ -1 +1,65 @@
Main-Class: org.slub.rosetta.dps.repository.plugin.SLUBTechnicalMetadataExtractorMediaConchPlugin
+Name: org/apache/xalan/
+Comment: Main Xalan engine implementing TrAX/JAXP
+Specification-Title: Java API for XML Processing
+Specification-Vendor: Sun Microsystems Inc.
+Specification-Version: 1.3
+Implementation-Title: org.apache.xalan
+Implementation-Version: 2.7.2
+Implementation-Vendor: Apache Software Foundation
+Implementation-URL: http://xml.apache.org/xalan-j/
+
+Name: org/apache/xpath/
+Comment: XPath engine
+Implementation-Title: org.apache.xpath
+Implementation-Version: 2.7.2
+Implementation-Vendor: Apache Software Foundation
+Implementation-URL: http://xml.apache.org/xalan-j/
+
+Name: org/apache/xml/
+Comment: DTM implementation and utilities
+Implementation-Title: org.apache.xml
+Implementation-Version: 2.7.2
+Implementation-Vendor: Apache Software Foundation
+Implementation-URL: http://xml.apache.org/xalan-j/
+
+Name: org/apache/xalan/xsltc/
+Comment: Main XSLTC engine implementing TrAX/JAXP
+Specification-Title: Java API for XML Processing
+Specification-Vendor: Sun Microsystems Inc.
+Specification-Version: 1.3
+Implementation-Title: org.apache.xalan.xsltc
+Implementation-Version: 2.7.2
+Implementation-Vendor: Apache Software Foundation
+Implementation-URL: http://xml.apache.org/xalan-j/
+
+Name: java_cup/runtime/
+Comment: Runtime component of JCup
+Specification-Title: Runtime component of JCup
+Specification-Vendor: Princeton University
+Specification-Version: 0.10k
+Implementation-Title: runtime
+Implementation-Version: 2.7.2
+Implementation-Vendor: Princeton University
+Implementation-URL: http://www.cs.princeton.edu/~appel/modern/java/CUP
+ /
+
+Name: org/apache/bcel/
+Comment: Byte Code Engineering Library
+Specification-Title: Byte Code Engineering Library
+Specification-Vendor: Markus Dahm
+Specification-Version: 5.0 rc1
+Implementation-Title: org.apache.bcel
+Implementation-Version: 2.7.2
+Implementation-Vendor: Apache Software Foundation
+Implementation-URL: http://jakarta.apache.org/bcel
+
+Name: org/apache/regexp/
+Comment: Java Regular Expression package
+Specification-Title: Java Regular Expression package
+Specification-Vendor: Apache Software Foundation
+Specification-Version: 1.2
+Implementation-Title: org.apache.regexp
+Implementation-Version: 2.7.2
+Implementation-Vendor: Apache Software Foundation
+Implementation-URL: http://jakarta.apache.org/regexp
diff --git a/Makefile b/Makefile
index 62ee8dd32f8f16e112334f123b95fd20727aa416..8342d0c4edd5638291145ca737025b0ca3fc8b60 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
# Pfad zu Java 11
JAVAPATH=/usr/lib/jvm/java-11-*/bin
-
+JAVARELEASE=11
# Verwendete Rosetta-Version
ROSETTAVERSION=7.1.0
@@ -12,11 +12,14 @@ ROSETTASDK=/exlibris/dps/d4_1/system.dir/dps-sdk-${ROSETTAVERSION}/lib/
# Pfad zum Rosetta-SDK, Deposit-Module
ROSETTASDKDEPOSIT=${ROSETTASDK}/../dps-sdk-projects/dps-sdk-deposit/lib
ROSETTASDKPLUGINS=${ROSETTASDK}/../../bundled_plugins/
-
+XALAN_JAR=$(shell find /usr/share/java/ -name "xalan2.jar" )
+XERCES_JAR=$(shell find /usr/share/java/ -name "xercesImpl.jar")
+XML_JAR=$(shell find /usr/share/java/ -name "xml-apis.jar")
# classpath
JUNITCLASSPATH=/usr/share/java/junit4.jar
#SOURCESCLASSPATH=org/slub/rosetta/dps/repository/plugin/storage/nfs
CLASSPATH=./java:${ROSETTASDKDEPOSIT}/../src/:${ROSETTASDKDEPOSIT}/xmlbeans-2.3.0.jar:${ROSETTASDKDEPOSIT}/dps-sdk-${ROSETTAVERSION}.jar:${ROSETTASDKDEPOSIT}/log4j-1.2.14.jar:/usr/share/java/commons-lang.jar
+#BUILDPATH=$(CLASSPATH)
# sources
SOURCES=java/org/slub/rosetta/dps/repository/plugin/SLUBTechnicalMetadataExtractorMediaConchPlugin.java
@@ -57,10 +60,23 @@ $(JAR): $(OBJS)
@cd java; find ./ -name "*.class" -print -exec cp --parents -r \{\} $(PWD)/$(BUILD) \; ; cd ..
# @cd resources; find ./ -type f -print -exec cp --parents -r \{\} $(PWD)/build \; ; cd ..
cp -a resources/ $(PWD)/$(BUILD)
+ifdef XALAN_JAR
+ echo "XALAN_JAR: unzip '$(XALAN_JAR)'"
+ unzip $(XALAN_JAR) '*.class' -d $(BUILD);
+ unzip $(XALAN_JAR) 'META-INF/services/*' -d $(BUILD)
+endif
+ifdef XERCES_JAR
+ echo "XERCES_JAR: unzip '$(XERCES_JAR)'"
+ unzip $(XERCES_JAR) '*.class' -d $(BUILD);
+endif
+ifdef XML_JAR
+ echo "XML_JAR: unzip '$(XML_JAR)'"
+ unzip $(XML_JAR) '*.class' -d $(BUILD);
+endif
@cd $(BUILD); ${JAVAPATH}/jar cfvM ../$@ ./* ; cd ..
%.class: %.java
- ${JAVAPATH}/javac -classpath ${CLASSPATH}:${JUNITCLASSPATH} -Xlint:all $<
+ ${JAVAPATH}/javac --release ${JAVARELEASE} -g -classpath ${CLASSPATH}:${JUNITCLASSPATH} -Xlint:all $<
doc: $(SOURCES)
javadoc -d doc/ $^
diff --git a/PLUGIN-INF/metadata_SLUBTechnicalMetadataExtractorMediaConchPlugin.xml b/PLUGIN-INF/metadata_SLUBTechnicalMetadataExtractorMediaConchPlugin.xml
index b6471fa3f03db7d11365a200176c0afd959acc97..43ab92e948acf0a4d49cb88682eb13147729dfed 100644
--- a/PLUGIN-INF/metadata_SLUBTechnicalMetadataExtractorMediaConchPlugin.xml
+++ b/PLUGIN-INF/metadata_SLUBTechnicalMetadataExtractorMediaConchPlugin.xml
@@ -34,13 +34,13 @@
</x_field>
<x_field>
- <field_name>ffprobe_binary_path</field_name>
- <label>Path to ffprobe</label>
- <ui_tool_tip>add full path to ffprobe (part of FFMPEG, hint: use at least version 3.3</ui_tool_tip>
+ <field_name>mediainfo_binary_path</field_name>
+ <label>Path to mediainfo</label>
+ <ui_tool_tip>add full path to mediainfo</ui_tool_tip>
<mandatory>true</mandatory>
<x_logic_type>String</x_logic_type>
<x_ui_type>TextField</x_ui_type>
- <default_value>/usr/bin/ffprobe</default_value>
+ <default_value>/usr/bin/mediainfo</default_value>
<css_class>width40</css_class>
<x_options></x_options>
</x_field>
@@ -48,7 +48,7 @@
</fr:x_form>
</pl:initParameters>
<pl:description>SLUB Technical Metadata Extractor Plugin, using MediaConch to validate FFV1/Matroska-files</pl:description>
- <pl:version>1.0</pl:version>
+ <pl:version>1.1</pl:version>
<pl:materialType>DIGITAL</pl:materialType>
<pl:module>Preservation</pl:module>
<pl:generalType>TASK</pl:generalType>