From c2fa4743edeb91622bc0046d0c0454d0e75516cd Mon Sep 17 00:00:00 2001
From: Andreas Romeyke <andreas.romeyke@slub-dresden.de>
Date: Fri, 17 Nov 2017 11:27:51 +0100
Subject: [PATCH] - fixed default paths in Rosetta UI - adapted Dockerfile
using updated checkit_tiff_upcoming_version - removed META-INF directory,
because not longer needed for Rosetta
---
META-INF/MANIFEST.MF | 1 -
Makefile | 2 +-
...SLUBTechnicalMetadataExtractorCheckItTiffPlugin.xml | 10 +++++-----
deploy_checkit_tiff/Dockerfile | 2 +-
4 files changed, 7 insertions(+), 8 deletions(-)
delete mode 100644 META-INF/MANIFEST.MF
diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
deleted file mode 100644
index 17df0b0..0000000
--- a/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1 +0,0 @@
-Main-Class: org.slub.rosetta.dps.repository.plugin.SLUBTechnicalMetadataExtractorCheckItTiffPlugin
diff --git a/Makefile b/Makefile
index 22eb364..75cb2b6 100644
--- a/Makefile
+++ b/Makefile
@@ -53,7 +53,7 @@ distclean: clean
$(JAR): $(OBJS)
@mkdir build;
@cp -r PLUGIN-INF/ build/
- @cp -r META-INF/ build/
+# @cp -r META-INF/ build/
@cd java; find ./ -name "*.class" -print -exec cp --parents -r \{\} $(PWD)/build \; ; cd ..
@cd build; ${JAVAPATH}/jar cfvM ../$@ ./* ; cd ..
diff --git a/PLUGIN-INF/metadata_SLUBTechnicalMetadataExtractorCheckItTiffPlugin.xml b/PLUGIN-INF/metadata_SLUBTechnicalMetadataExtractorCheckItTiffPlugin.xml
index ede6e86..fc3742a 100644
--- a/PLUGIN-INF/metadata_SLUBTechnicalMetadataExtractorCheckItTiffPlugin.xml
+++ b/PLUGIN-INF/metadata_SLUBTechnicalMetadataExtractorCheckItTiffPlugin.xml
@@ -17,7 +17,7 @@
<mandatory>true</mandatory>
<x_logic_type>String</x_logic_type>
<x_ui_type>TextField</x_ui_type>
- <default_value>/operational_shared/software/checkit_tiff_stable</default_value>
+ <default_value>/operational_shared/software/checkit_tiff_current</default_value>
<css_class>width40</css_class>
<x_options></x_options>
</x_field>
@@ -26,7 +26,7 @@
<label>Path to current config file used for checkit_tiff</label>
<ui_tool_tip>add full path to configfile for checkit_tiff</ui_tool_tip>
<mandatory>true</mandatory>
- <default_value>/operational_shared/software/cit_tiff6_baseline_SLUB_stable.cfg</default_value>
+ <default_value>/operational_shared/software/cit_tiff6_baseline_SLUB_current.cfg</default_value>
<x_logic_type>String</x_logic_type>
<x_ui_type>TextField</x_ui_type>
<css_class>width40</css_class>
@@ -39,7 +39,7 @@
<mandatory>true</mandatory>
<x_logic_type>String</x_logic_type>
<x_ui_type>TextField</x_ui_type>
- <default_value>/operational_shared/software/checkit_tiff_unstable</default_value>
+ <default_value>/operational_shared/software/checkit_tiff_upcoming</default_value>
<css_class>width40</css_class>
<x_options></x_options>
</x_field>
@@ -48,7 +48,7 @@
<label>Path to config file used for checkit_tiff</label>
<ui_tool_tip>add full path to configfile for checkit_tiff</ui_tool_tip>
<mandatory>true</mandatory>
- <default_value>/operational_shared/software/cit_tiff6_baseline_SLUB_unstable.cfg</default_value>
+ <default_value>/operational_shared/software/cit_tiff6_baseline_SLUB_upcoming.cfg</default_value>
<x_logic_type>String</x_logic_type>
<x_ui_type>TextField</x_ui_type>
<css_class>width40</css_class>
@@ -69,7 +69,7 @@
</fr:x_form>
</pl:initParameters>
<pl:description>SLUB Technical Metadata Extractor Plugin, using check_it_tiff to validate tiff-files</pl:description>
- <pl:version>1.95</pl:version>
+ <pl:version>1.96</pl:version>
<pl:materialType>DIGITAL</pl:materialType>
<pl:module>Preservation</pl:module>
<pl:generalType>TASK</pl:generalType>
diff --git a/deploy_checkit_tiff/Dockerfile b/deploy_checkit_tiff/Dockerfile
index af6a50a..2681c0f 100644
--- a/deploy_checkit_tiff/Dockerfile
+++ b/deploy_checkit_tiff/Dockerfile
@@ -1,7 +1,7 @@
FROM centos:6.8
MAINTAINER Andreas Romeyke <romeyke@slub-dresden.de>
ENV checkit_tiff_current_version=v0.2.4
-ENV checkit_tiff_upcoming_version=v0.3.0
+ENV checkit_tiff_upcoming_version=v0.3.1
ENV checkit_tiff_gitrepository=https://github.com/SLUB-digitalpreservation/checkit_tiff.git
ENV pcre_version=8.41
ENV PATCH="\
--
GitLab