Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

MERGE: PR 634 XML-hul code review fixes #724

Merged
merged 9 commits into from
Apr 8, 2022
Merged

MERGE: PR 634 XML-hul code review fixes #724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4f81dce
XML: Fix reporting of schema location attributes
david-russo Jun 22, 2020
c2f4a45
XML: Move submessage text to resource file
david-russo Jun 22, 2020
a878b6a
XML: Improve config parsing and documentation
david-russo Jun 23, 2020
d223a28
XML: Fix ClassCastException when resolving local files
david-russo Jun 26, 2020
afbac9d
XML: Housekeeping Edition
david-russo Jun 26, 2020
5e67f2c
XML: Fix declaration parsing for documents with BOMs
david-russo Jul 9, 2020
3f703ea
Merge remote-tracking branch 'bldpt/xml-fixes' into merge/bl-dpt/xml-…
carlwilson Apr 8, 2022
24cbd7f
TEST: Patched integration tests for PR 634.
carlwilson Apr 8, 2022
aa788ec
Merge remote-tracking branch 'origin/integration' into merge/bl-dpt/x…
carlwilson Apr 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions jhove-bbt/scripts/create-1.25-target.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,3 +119,21 @@ fi
echo " - ISSUE:662 PDF result patch 1."
find "${targetRoot}" -type f -name "issue_662.pdf.jhove.xml" -exec sed -i 's/^ <value>AutoCAD Architecture 2010 2010 (18.0s (LMS Tech<\/value>$/ <value>AutoCAD Architecture 2010 2010 (18.0s (LMS Tech))<\/value>/' {} \;

# Copy the XML result of examples/modules/XML-hul/jhoveconf.xml.jhove.xml
# changed by https://github.com/openpreserve/jhove/pull/634
if [[ -f "${candidateRoot}/examples/modules/XML-hul/jhoveconf.xml.jhove.xml" ]]; then
echo " - PR:634 XML result patch 1."
cp "${candidateRoot}/examples/modules/XML-hul/jhoveconf.xml.jhove.xml" "${targetRoot}/examples/modules/XML-hul/jhoveconf.xml.jhove.xml"
fi
if [[ -f "${candidateRoot}/examples/modules/XML-hul/external-parsed-entity.ent.jhove.xml" ]]; then
echo " - PR:634 XML result patch 2."
cp "${candidateRoot}/examples/modules/XML-hul/external-parsed-entity.ent.jhove.xml" "${targetRoot}/examples/modules/XML-hul/external-parsed-entity.ent.jhove.xml"
fi
if [[ -f "${candidateRoot}/examples/modules/XML-hul/external-unparsed-entity.ent.jhove.xml" ]]; then
echo " - PR:634 XML result patch 3."
cp "${candidateRoot}/examples/modules/XML-hul/external-unparsed-entity.ent.jhove.xml" "${targetRoot}/examples/modules/XML-hul/external-unparsed-entity.ent.jhove.xml"
fi
if [[ -f "${candidateRoot}/examples/modules/XML-hul/valid-external.dtd.jhove.xml" ]]; then
echo " - PR:634 XML result patch 4."
cp "${candidateRoot}/examples/modules/XML-hul/valid-external.dtd.jhove.xml" "${targetRoot}/examples/modules/XML-hul/valid-external.dtd.jhove.xml"
fi
1 change: 0 additions & 1 deletion jhove-installer/src/main/config/ext-modules/jhove.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
</module>
<module>
<class>edu.harvard.hul.ois.jhove.module.XmlModule</class>
<param>schema=http://www.example.com/schema;/home/schemas/exampleschema.xsd</param>
</module>
<module>
<class>edu.harvard.hul.ois.jhove.module.HtmlModule</class>
Expand Down
1 change: 0 additions & 1 deletion jhove-installer/src/main/config/jhove.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
</module>
<module>
<class>edu.harvard.hul.ois.jhove.module.XmlModule</class>
<param>schema=http://www.example.com/schema;/home/schemas/exampleschema.xsd</param>
</module>
<module>
<class>edu.harvard.hul.ois.jhove.module.HtmlModule</class>
Expand Down
Loading