[libpdfbox-java] 02/02: Import Debian changes 1:1.8.13-1

Markus Koschany apo at moszumanska.debian.org
Wed Jul 26 22:00:00 UTC 2017


This is an automated email from the git hooks/post-receive script.

apo pushed a commit to branch master
in repository libpdfbox-java.

commit 81c62c64bedebfc62907f94d3a85746ff90bbc18
Merge: fdd6c0d 5e8039c
Author: Markus Koschany <apo at debian.org>
Date:   Wed Jul 26 22:13:10 2017 +0200

    Import Debian changes 1:1.8.13-1
    
    libpdfbox-java (1:1.8.13-1) unstable; urgency=medium
    
      * Team upload.
      * New upstream version 1.8.13.
      * Switch to compat level 10.
      * Declare compliance with Debian Policy 4.0.0.
      * Use https for Format field.
      * get-orig-source: Use --download-current-version option.
      * Ignore com.github.jai-imageio artifacts.
      * Refresh 01-bouncycastle-compatibility.patch.
    
    libpdfbox-java (1:1.8.12-1) unstable; urgency=high
    
      * New upstream release
        - Fixes CVE-2016-2175: XML External Entity vulnerability
      * Build with maven-debian-helper instead of ant
      * Removed the non-free 'sRGB Color Space Profile.icm' file from the tarball
      * Merged the BouncyCastle patches
      * Standards-Version updated to 3.9.8 (no changes)
      * Use a secure Vcs-Git URL
    
    libpdfbox-java (1:1.8.11+dfsg-1) unstable; urgency=medium
    
      * debian/watch: add repacksuffix to get back +dfsg in the version.
      * Import upstream version 1.8.11+dfsg.
      * Refresh patches.
      * debian/copyright: drop stanza about debian/repack.stub which was
        removed in 1:1.8.10-1. Also drop now unneeded license paragraphs.
      * Update years of packaging copyright.
    
    libpdfbox-java (1:1.8.10-2) unstable; urgency=medium
    
      * Team upload.
      * Add 05_bc1.51.patch to build against bouncycastle 1.51.
    
    libpdfbox-java (1:1.8.10-1) unstable; urgency=medium
    
      * New upstream release.
        - Refreshed the patches
        - Adapted debian/*.poms to work with any version
      * Improved the reproducibility:
        - Set the locale when generating the javadoc
        - Removed the timestamp from pdfbox.version
      * Removed the unused build dependency on liblucene2-java
      * Changed the priority from extra to optional
      * Clean the upstream tarball using the Files-Excluded field
        in debian/copyright
      * Switch to debhelper level 9
    
    libpdfbox-java (1:1.8.7+dfsg-1) unstable; urgency=medium
    
      * New upstream release.
      * Refresh patches (offset, fuzz).
      * Update version number in debian/*.poms.
      * Use cgit URL for Vcs-Browser in debian/control.
      * Declare compliance with Debian Policy 3.9.6.
    
    libpdfbox-java (1:1.8.6+dfsg-1) unstable; urgency=medium
    
      * New upstream release.
      * Update version number in debian/*.poms.
      * Refresh patches (offset).
    
    libpdfbox-java (1:1.8.5+dfsg-1) unstable; urgency=medium
    
      * New upstream release.
      * Refresh build.xml.patch.
      * Update years of upstream copyright.
      * Update version number in debian/*.poms.
      * debian/copyright: update URL in Source field.
      * debian/control: update URL in Vcs-Browser field.
    
    libpdfbox-java (1:1.8.4+dfsg-1) unstable; urgency=medium
    
      * New upstream release.
      * Update jar version in debian/*.poms.
      * Refresh build.xml.patch (fuzz due to version number).
      * Update years of packaging copyright.
      * Add pgpsigurlmangle and filenamemangle in debian/watch and
        debian/upstream/signing-key.asc.
    
    libpdfbox-java (1:1.8.3+dfsg-1) unstable; urgency=low
    
      * New upstream release.
      * Remove another non-free file during repackaging,
        that appears in 1.8.3.
      * Refresh patches (offset).
      * Update debian/*.pom. Bump version in jar filenames.
      * Don't install empty examples directory.
      * Declare compliance with Debian Policy 3.9.5.
    
    libpdfbox-java (1:1.8.2+dfsg-2) unstable; urgency=low
    
      * Updated bc-1.47.patch to also work with Bouncy Castle 1.49
      * Install the jars and the poms in /usr/share/maven-repo
      * Removed the test classes from the jars
    
    libpdfbox-java (1:1.8.2+dfsg-1) unstable; urgency=low
    
      * New upstream release.
      * Refresh build.xml.patch (offset).
      * Update years of upstream and packaging copyright.
      * Update filenames in .install and .links files.
      * Adjust to newer Bouncy Castle:
        - add patch bc-1.47.patch to handle changed method names
        - add build dependency on libbcpkix-java
        - make build dependencies on libbc.*-java versioned
        - add /usr/share/java/bcpkix.jar to CLASSPATH in debian/rules
        This fixes a not-yet-reported FTBFS bug.
      * debian/control:
        - set Standards-Version to 3.9.4 (no changes)
        - make URLs in Vcs-* files canonical
        - add Built-Using field to libpdfbox-java binary package
      * Update debian/repack.stub.
    
    libpdfbox-java (1:1.7.0+dfsg-4) unstable; urgency=low
    
      * Fix installation of CMap tables during build:
        - debian/control:
          replace build-dependeny on removed packages cmap-adobe-* and
          gs-cjk-resource with their successor poppler-data.
        - debian/rules:
          adjust path to CMap files accordingly; and guard against future failures
          by using the idiomatic "find -print0 | xargs -r0" construct.
        Thanks to Lucas Nussbaum for the bug report.
        (Closes: #699254)
    
    libpdfbox-java (1:1.7.0+dfsg-3) unstable; urgency=low
    
      * debian/libpdfbox-java.classpath: add libfontbox-java to manifest
      * debian/control: add javahelper to build-depends
    
    libpdfbox-java (1:1.7.0+dfsg-2) unstable; urgency=low
    
      * debian/control: add dependency on libfontbox-java to libpdfbox-java.
        Thanks to Tom Parker for the bug report. (Closes: #680778)
    
    libpdfbox-java (1:1.7.0+dfsg-1) unstable; urgency=low
    
      * New upstream release.
      * Refresh patches.
      * Update filename (versioned jar) in debian/*.{install,links} files.
      * Install new examples into libpdfbox-java-doc package.
      * Update years of upstream and packaging copyright, add new third-party
        copyright.
      * debian/copyright: update to Copyright-Format 1.0.
      * Update package descritpions according to new upstream wording.
    
    libpdfbox-java (1:1.6.0+dfsg-2) unstable; urgency=low
    
      [ gregor herrmann ]
      * Update Vcs-* headers.
    
      [ tony mancill ]
      * Update Maintainer field for Java team maintenance.
      * Add gregor to Uploaders.
      * Set Standards-Version to 3.9.3 (no changes).
    
    libpdfbox-java (1:1.6.0+dfsg-1) unstable; urgency=low
    
      * New upstream release.
      * Refresh patches.
      * Set Standards-Version to 3.9.2 (no changes).
      * Bump debhelper compatibility level to 8.
      * Update filenames in debian/*.{install,links}.
      * Remove runtime dependency on JRE (thanks lintian).
    
    libpdfbox-java (1:1.5.0+dfsg-2) unstable; urgency=low
    
      * libfontbox-java-doc: add Breaks/Replaces on libfontbox-java.
    
    libpdfbox-java (1:1.5.0+dfsg-1) unstable; urgency=low
    
      [ gregor herrmann ]
      * New upstream release (closes: #618534).
      * debian/watch: update to new download location.
      * debian/repack.local, debian/clean and debian/rules: adjust paths to
        third-party resources.
      * Update debian/copyright.
      * Install RELEASE-NOTES.txt as upstream changelog.
      * Remove old patches; add new patch build.xml to build again against Debian
        libraries.
      * Remove javahelper support and build with ant.
      * Remove unused lintian override.
      * Adjust .install and .links files.
      * debian/control:
        - update homepage
        - update build dependencies
        - the upstream source now also includes JempBox and FontBox, create the
          libjempbox-java and libfontbox-java (and -doc) packages from the
          libpdfbox-java source package
        - add versioned Breaks on jabref
      * Register API docs with doc-base system.
    
      [ tony mancill ]
      * Add separate API doc packages libjempbox-java-doc and
        libfontbox-java-doc.
    
    libpdfbox-java (1:0.7.3+dfsg-4) unstable; urgency=low
    
      * debian/rules: Add ant properties to compile code with target JVM 1.4.
        Closes: #592118. Thanks to Artur Rona for forwarding this patch from
        Ubuntu.
      * More conversion to javahelper: change some files to use jh_* instead of
        dh_*.
      * Add a lintian override for a false positive warning about doc-base
        registration.
    
    libpdfbox-java (1:0.7.3+dfsg-3) unstable; urgency=low
    
      [ gregor herrmann ]
      * debian/control: change build dependency from default-jdk-builddep to
        default-jdk.
      * Remove spurious hunks from 01_buildxml.patch, refresh other patches.
      * Adjust package description to reality (i.e. there are no command line
        tools included); thanks to Achim Gädke for the bug report
        (closes: #568936).
    
      [ tony mancill ]
      * Bump standards version to 3.9.1 (no changes).
      * Depend on javahelper.
      * Convert to source format 3.0 (quilt); remove b-d on quilt.
    
    libpdfbox-java (1:0.7.3+dfsg-2) unstable; urgency=low
    
      * Add back build dependency on gs-cjk-resource, now that it has moved to
        main.
      * debian/copyright: update formatting and years of packaging copyright.
      * Remove debian/dirs, dh_install takes care of it anyway.
    
    libpdfbox-java (1:0.7.3+dfsg-1) unstable; urgency=low
    
      * Switch repacking framework from dh_wraporig to repack.sh; remove
        dh_wraporig part from debian/README.source.
      * Change repacking suffix to '+dfsg'; add epoch to version.
      * Drop build dependency on gs-cjk-resource and move package from contrib to
        main (closes: #548186). Remove note about the reason for being in contrib
        from debian/copyright.
      * Set Standards-Version to 3.8.3 (no changes).
      * Switch to debhelper 7 (debian/{control,compat,rules,clean}).
      * debian/control: (build) depend on default-jdk-builddep/
        default-jre-headless.
      * Install upstream changelog.
    
    libpdfbox-java (0.7.3.dfsg-3) unstable; urgency=low
    
      * Change XS-Vcs-* fields to Vcs-*.
      * Set Standards-Version to 3.8.2: Rename debian/README.Debian-source to
        debian/README.source and mention quilt usage.
      * debian/rules: explicitly set JAVA_HOME; create install-stamp target.
      * Change debian/copyright to some version of the new machine-readable
        format.
      * Change patch system from dpatch to quilt.
      * debian/control: set Section to java.
      * Change my email address in debian/rules and debian/copyright.
      * debian/copyright: add a note why libpdfbox-java is in contrib; thanks to
        Bastien ROUCARIES for the bug report (closes: #539311).
      * debian/rules: add "-n" to the "cp" command.
    
    libpdfbox-java (0.7.3.dfsg-2) unstable; urgency=low
    
      * Move upstream URL from the description to the new Homepage field.
      * Fix typo in short description, thanks to Marco van Zwetselaar
        (closes: #444772).
    
    libpdfbox-java (0.7.3.dfsg-1) unstable; urgency=low
    
      * Initial release (closes: #404519).

 LICENSE.txt                                        |    79 +-
 NOTICE.txt                                         |    12 +-
 README.md                                          |   125 -
 README.txt                                         |   104 +
 RELEASE-NOTES.txt                                  |   104 +-
 ant/pom.xml                                        |    46 +
 ant/src/main/appended-resources/META-INF/LICENSE   |    33 +
 ant/src/main/appended-resources/META-INF/NOTICE    |     2 +
 .../java/org/apache/pdfbox/ant/PDFToTextTask.java  |    86 +
 .../main/java/org/apache/pdfbox/ant/package.html   |    34 +
 app/pom.xml                                        |    20 +-
 app/src/main/appended-resources/META-INF/LICENSE   |    58 +-
 app/src/main/appended-resources/META-INF/NOTICE    |    16 +-
 cacerts_jdk8u101                                   |   Bin 0 -> 112860 bytes
 debian/changelog                                   |    18 +-
 debian/control                                     |    23 +-
 debian/copyright                                   |     4 +
 debian/libjempbox-java-doc.doc-base                |     8 +
 debian/libjempbox-java-doc.install                 |     1 +
 debian/libpdfbox-java.poms                         |     7 +-
 debian/maven.ignoreRules                           |     4 +-
 debian/maven.publishedRules                        |     1 +
 debian/patches/01-bouncycastle-compatibility.patch |    98 +
 debian/patches/02-jar-packaging.patch              |    36 +
 debian/patches/05_bc1.51.patch                     |    44 +
 debian/patches/build-subproject-docs.patch         |    79 +
 debian/patches/build.xml.patch                     |    94 +
 debian/patches/jar-packaging.patch                 |    35 -
 debian/patches/reproducible-build.patch            |    40 +
 debian/patches/series                              |     4 +-
 debian/patches/use-local-jars.patch                |    21 -
 debian/rules                                       |     2 +-
 debugger-app/pom.xml                               |    74 -
 .../src/main/appended-resources/META-INF/LICENSE   |   166 -
 .../src/main/appended-resources/META-INF/NOTICE    |    14 -
 debugger/pom.xml                                   |    81 -
 .../org/apache/pdfbox/debugger/PDFDebugger.java    |  1393 --
 .../pdfbox/debugger/colorpane/CSArrayBased.java    |    99 -
 .../pdfbox/debugger/colorpane/CSDeviceN.java       |   128 -
 .../pdfbox/debugger/colorpane/CSIndexed.java       |   155 -
 .../pdfbox/debugger/colorpane/CSSeparation.java    |   272 -
 .../debugger/colorpane/ColorBarCellRenderer.java   |    43 -
 .../pdfbox/debugger/colorpane/DeviceNColorant.java |    66 -
 .../debugger/colorpane/DeviceNTableModel.java      |    91 -
 .../pdfbox/debugger/colorpane/IndexedColorant.java |    69 -
 .../debugger/colorpane/IndexedTableModel.java      |    93 -
 .../pdfbox/debugger/flagbitspane/AnnotFlag.java    |    73 -
 .../pdfbox/debugger/flagbitspane/EncryptFlag.java  |    69 -
 .../pdfbox/debugger/flagbitspane/FieldFlag.java    |   141 -
 .../apache/pdfbox/debugger/flagbitspane/Flag.java  |    34 -
 .../pdfbox/debugger/flagbitspane/FlagBitsPane.java |    96 -
 .../debugger/flagbitspane/FlagBitsPaneView.java    |   117 -
 .../pdfbox/debugger/flagbitspane/FontFlag.java     |    70 -
 .../pdfbox/debugger/flagbitspane/PanoseFlag.java   |   267 -
 .../pdfbox/debugger/flagbitspane/SigFlag.java      |    64 -
 .../FontEncodingPaneController.java                |   115 -
 .../fontencodingpane/FontEncodingView.java         |   225 -
 .../debugger/fontencodingpane/SimpleFont.java      |   100 -
 .../debugger/fontencodingpane/Type0Font.java       |   157 -
 .../debugger/fontencodingpane/Type3Font.java       |   187 -
 .../pdfbox/debugger/hexviewer/ASCIIPane.java       |   130 -
 .../pdfbox/debugger/hexviewer/AddressPane.java     |   118 -
 .../debugger/hexviewer/HexChangeListener.java      |    28 -
 .../pdfbox/debugger/hexviewer/HexChangedEvent.java |    50 -
 .../pdfbox/debugger/hexviewer/HexEditor.java       |   226 -
 .../apache/pdfbox/debugger/hexviewer/HexModel.java |   167 -
 .../debugger/hexviewer/HexModelChangeListener.java |    26 -
 .../debugger/hexviewer/HexModelChangedEvent.java   |    55 -
 .../apache/pdfbox/debugger/hexviewer/HexPane.java  |   387 -
 .../apache/pdfbox/debugger/hexviewer/HexView.java  |    87 -
 .../pdfbox/debugger/hexviewer/SelectEvent.java     |    58 -
 .../hexviewer/SelectionChangeListener.java         |    26 -
 .../pdfbox/debugger/hexviewer/StatusPane.java      |    68 -
 .../pdfbox/debugger/hexviewer/UpperPane.java       |    65 -
 .../apache/pdfbox/debugger/pagepane/PagePane.java  |   283 -
 .../pdfbox/debugger/streampane/OperatorMarker.java |    91 -
 .../apache/pdfbox/debugger/streampane/Stream.java  |   250 -
 .../debugger/streampane/StreamImageView.java       |   152 -
 .../pdfbox/debugger/streampane/StreamPane.java     |   518 -
 .../pdfbox/debugger/streampane/StreamPaneView.java |    70 -
 .../pdfbox/debugger/streampane/StreamTextView.java |   130 -
 .../debugger/streampane/tooltip/ColorToolTip.java  |    89 -
 .../debugger/streampane/tooltip/FontToolTip.java   |    77 -
 .../debugger/streampane/tooltip/GToolTip.java      |    46 -
 .../debugger/streampane/tooltip/KToolTip.java      |    94 -
 .../debugger/streampane/tooltip/RGToolTip.java     |    46 -
 .../debugger/streampane/tooltip/SCNToolTip.java    |    75 -
 .../streampane/tooltip/ToolTipController.java      |   196 -
 .../pdfbox/debugger/stringpane/StringPane.java     |    78 -
 .../pdfbox/debugger/treestatus/TreeStatus.java     |   219 -
 .../pdfbox/debugger/treestatus/TreeStatusPane.java |   127 -
 .../org/apache/pdfbox/debugger/ui/ArrayEntry.java  |    91 -
 .../apache/pdfbox/debugger/ui/DocumentEntry.java   |    62 -
 .../org/apache/pdfbox/debugger/ui/ErrorDialog.java |   304 -
 .../pdfbox/debugger/ui/ExtensionFileFilter.java    |    76 -
 .../pdfbox/debugger/ui/FileOpenSaveDialog.java     |   121 -
 .../debugger/ui/HighResolutionImageIcon.java       |    53 -
 .../org/apache/pdfbox/debugger/ui/ImageUtil.java   |    72 -
 .../org/apache/pdfbox/debugger/ui/MapEntry.java    |   108 -
 .../org/apache/pdfbox/debugger/ui/MenuBase.java    |    82 -
 .../org/apache/pdfbox/debugger/ui/OSXAdapter.java  |   225 -
 .../pdfbox/debugger/ui/PDFTreeCellRenderer.java    |   359 -
 .../apache/pdfbox/debugger/ui/PDFTreeModel.java    |   348 -
 .../org/apache/pdfbox/debugger/ui/PageEntry.java   |    74 -
 .../pdfbox/debugger/ui/ReaderBottomPanel.java      |    59 -
 .../org/apache/pdfbox/debugger/ui/RecentFiles.java |   205 -
 .../apache/pdfbox/debugger/ui/RotationMenu.java    |   170 -
 .../java/org/apache/pdfbox/debugger/ui/Tree.java   |   424 -
 .../org/apache/pdfbox/debugger/ui/ZoomMenu.java    |   168 -
 .../debugger/ui/textsearcher/SearchEngine.java     |   106 -
 .../debugger/ui/textsearcher/SearchPanel.java      |   205 -
 .../pdfbox/debugger/ui/textsearcher/Searcher.java  |   267 -
 .../resources/org/apache/pdfbox/debugger/array.png |   Bin 2858 -> 0 bytes
 .../org/apache/pdfbox/debugger/boolean.png         |   Bin 2966 -> 0 bytes
 .../resources/org/apache/pdfbox/debugger/dict.png  |   Bin 2994 -> 0 bytes
 .../resources/org/apache/pdfbox/debugger/hex.png   |   Bin 2969 -> 0 bytes
 .../org/apache/pdfbox/debugger/indirect.png        |   Bin 2986 -> 0 bytes
 .../org/apache/pdfbox/debugger/integer.png         |   Bin 3002 -> 0 bytes
 .../resources/org/apache/pdfbox/debugger/name.png  |   Bin 2964 -> 0 bytes
 .../resources/org/apache/pdfbox/debugger/null.png  |   Bin 2912 -> 0 bytes
 .../resources/org/apache/pdfbox/debugger/page.png  |   Bin 275 -> 0 bytes
 .../resources/org/apache/pdfbox/debugger/pdf.png   |   Bin 480 -> 0 bytes
 .../resources/org/apache/pdfbox/debugger/real.png  |   Bin 3026 -> 0 bytes
 .../org/apache/pdfbox/debugger/stream-dict.png     |   Bin 2995 -> 0 bytes
 .../org/apache/pdfbox/debugger/string.png          |   Bin 2977 -> 0 bytes
 examples/pom.xml                                   |    48 +-
 .../src/main/appended-resources/META-INF/LICENSE   |     5 +-
 .../src/main/appended-resources/META-INF/NOTICE    |     4 +-
 .../apache/pdfbox/examples/AbstractExample.java    |   111 +
 .../apache/pdfbox/examples/ant/PDFToTextTask.java  |    85 -
 .../org/apache/pdfbox/examples/ant/package.html    |    34 -
 .../documentmanipulation/SuperimposePage.java      |   101 +
 .../documentmanipulation/package-info.java         |    23 +
 .../apache/pdfbox/examples/fdf/PrintFields.java    |   163 +
 .../org/apache/pdfbox/examples/fdf/SetField.java   |   121 +
 .../org/apache/pdfbox/examples/fdf/package.html    |    25 +
 .../interactive/form/AddBorderToField.java         |    70 -
 .../interactive/form/CreateMultiWidgetsForm.java   |   144 -
 .../interactive/form/CreateSimpleForm.java         |   114 -
 .../examples/interactive/form/FieldTriggers.java   |   129 -
 .../examples/interactive/form/FillFormField.java   |    64 -
 .../examples/interactive/form/PrintFields.java     |   133 -
 .../pdfbox/examples/interactive/form/SetField.java |   130 -
 .../form/UpdateFieldOnDocumentOpen.java            |    62 -
 .../examples/interactive/form/package-info.java    |    23 -
 .../pdfbox/examples/lucene/IndexPDFFiles.java      |   234 -
 .../pdfbox/examples/lucene/LucenePDFDocument.java  |   454 -
 .../org/apache/pdfbox/examples/lucene/package.html |    25 -
 .../java/org/apache/pdfbox/examples/package.html   |    25 +
 .../apache/pdfbox/examples/pdfa/CreatePDFA.java    |   171 +
 .../pdfbox/examples/pdmodel/AddAnnotations.java    |   272 -
 .../pdfbox/examples/pdmodel/AddImageToPDF.java     |    79 +-
 .../pdfbox/examples/pdmodel/AddJavascript.java     |    16 +-
 .../examples/pdmodel/AddMessageToEachPage.java     |    58 +-
 .../examples/pdmodel/AddMetadataFromDocInfo.java   |    23 +-
 .../apache/pdfbox/examples/pdmodel/Annotation.java |   262 +
 .../pdfbox/examples/pdmodel/CreateBlankPDF.java    |    78 +-
 .../pdfbox/examples/pdmodel/CreateBookmarks.java   |    38 +-
 .../examples/pdmodel/CreateGradientShadingPDF.java |   156 +-
 .../examples/pdmodel/CreateLandscapePDF.java       |    70 +-
 .../apache/pdfbox/examples/pdmodel/CreatePDFA.java |   136 -
 .../pdfbox/examples/pdmodel/CreatePatternsPDF.java |   119 -
 .../pdfbox/examples/pdmodel/EmbeddedFiles.java     |    34 +-
 .../pdfbox/examples/pdmodel/EmbeddedFonts.java     |    75 -
 .../examples/pdmodel/ExtractEmbeddedFiles.java     |   365 +-
 .../pdfbox/examples/pdmodel/ExtractMetadata.java   |    67 +-
 .../pdfbox/examples/pdmodel/ExtractTTFFonts.java   |   180 +-
 .../examples/pdmodel/GoToSecondBookmarkOnOpen.java |    22 +-
 .../apache/pdfbox/examples/pdmodel/HelloWorld.java |   107 +-
 .../pdfbox/examples/pdmodel/HelloWorldTTF.java     |   112 +-
 .../pdfbox/examples/pdmodel/HelloWorldType1.java   |    75 -
 .../examples/pdmodel/HelloWorldType1AfmPfb.java    |   120 +
 .../apache/pdfbox/examples/pdmodel/ImageToPDF.java |   137 +-
 .../pdfbox/examples/pdmodel/PrintBookmarks.java    |    31 +-
 .../examples/pdmodel/PrintDocumentMetaData.java    |    36 +-
 .../apache/pdfbox/examples/pdmodel/PrintURLs.java  |    98 +-
 .../pdfbox/examples/pdmodel/RemoveFirstPage.java   |    14 +-
 .../pdfbox/examples/pdmodel/ReplaceString.java     |   172 +
 .../pdfbox/examples/pdmodel/ReplaceURLs.java       |    38 +-
 .../pdfbox/examples/pdmodel/RubberStamp.java       |    24 +-
 .../examples/pdmodel/RubberStampWithImage.java     |    86 +-
 .../pdfbox/examples/pdmodel/ShowColorBoxes.java    |   110 +-
 .../pdfbox/examples/pdmodel/SuperimposePage.java   |   104 -
 .../pdfbox/examples/pdmodel/UsingTextMatrix.java   |    77 +-
 .../pdfbox/examples/persistence/CopyDoc.java       |   126 +
 .../pdfbox/examples/persistence/package.html       |    25 +
 .../apache/pdfbox/examples/printing/Printing.java  |   149 -
 .../rendering/CustomGraphicsStreamEngine.java      |   197 -
 .../examples/rendering/CustomPageDrawer.java       |   192 -
 .../signature/CMSProcessableInputStream.java       |    71 -
 .../signature/CreateEmptySignatureForm.java        |    84 -
 .../pdfbox/examples/signature/CreateSignature.java |   423 +-
 .../examples/signature/CreateSignatureBase.java    |   347 -
 .../examples/signature/CreateVisibleSignature.java |   562 +-
 .../pdfbox/examples/signature/ShowSignature.java   |   220 +-
 .../pdfbox/examples/signature/TSAClient.java       |   201 -
 .../examples/util/DrawPrintTextLocations.java      |   341 -
 .../pdfbox/examples/util/ExtractTextByArea.java    |    30 +-
 .../pdfbox/examples/util/PDFHighlighter.java       |   173 -
 .../pdfbox/examples/util/PDFMergerExample.java     |   174 -
 .../pdfbox/examples/util/PrintImageLocations.java  |   150 +-
 .../pdfbox/examples/util/PrintTextColors.java      |   139 -
 .../pdfbox/examples/util/PrintTextLocations.java   |    80 +-
 .../apache/pdfbox/examples/util/RemoveAllText.java |   142 +-
 .../examples/interactive/form/FillFormField.pdf    |   315 -
 .../examples/rendering/custom-render-demo.pdf      |   Bin 34062 -> 0 bytes
 .../pdfbox/examples/pdfa/CreatePDFATest.java       |    27 +-
 .../examples/pdmodel/TestCreateSignature.java      |   257 -
 .../examples/pdmodel/TestRubberStampWithImage.java |    41 -
 .../apache/pdfbox/examples/pdmodel/document.pdf    |    38 -
 .../org/apache/pdfbox/examples/pdmodel/stamp.jpg   |   Bin 24160 -> 0 bytes
 .../apache/pdfbox/examples/signature/keystore.p12  |   Bin 2608 -> 0 bytes
 .../apache/pdfbox/examples/signature/sign_me.pdf   |   Bin 18159 -> 0 bytes
 .../pdfbox/examples/signature/sign_me_tsa.pdf      |   Bin 18465 -> 0 bytes
 .../pdfbox/examples/signature/sign_me_visible.pdf  |   Bin 18941 -> 0 bytes
 .../org/apache/pdfbox/examples/signature/stamp.jpg |   Bin 24160 -> 0 bytes
 .../pdfbox/examples/signature/tsa_response.asn1    |   Bin 4680 -> 0 bytes
 fontbox/README.txt                                 |     2 +-
 fontbox/pom.xml                                    |    14 +-
 .../main/java/org/apache/fontbox/EncodedFont.java  |    34 -
 .../main/java/org/apache/fontbox/FontBoxFont.java  |    69 -
 .../java/org/apache/fontbox/afm/AFMParser.java     |   199 +-
 .../java/org/apache/fontbox/afm/CharMetric.java    |     3 +-
 .../java/org/apache/fontbox/afm/Composite.java     |     3 +-
 .../java/org/apache/fontbox/afm/CompositePart.java |     3 +-
 .../java/org/apache/fontbox/afm/FontMetric.java    |   911 +
 .../java/org/apache/fontbox/afm/FontMetrics.java   |   888 -
 .../main/java/org/apache/fontbox/afm/KernPair.java |     3 +-
 .../main/java/org/apache/fontbox/afm/Ligature.java |     3 +-
 .../java/org/apache/fontbox/afm/TrackKern.java     |     3 +-
 .../java/org/apache/fontbox/cff/AFMFormatter.java  |   170 +
 .../java/org/apache/fontbox/cff/CFFCIDFont.java    |   296 -
 .../java/org/apache/fontbox/cff/CFFCharset.java    |   210 -
 .../java/org/apache/fontbox/cff/CFFDataInput.java  |     1 +
 .../java/org/apache/fontbox/cff/CFFEncoding.java   |    78 -
 .../org/apache/fontbox/cff/CFFExpertCharset.java   |   225 -
 .../org/apache/fontbox/cff/CFFExpertEncoding.java  |   314 -
 .../apache/fontbox/cff/CFFExpertSubsetCharset.java |   148 -
 .../main/java/org/apache/fontbox/cff/CFFFont.java  |   596 +-
 .../java/org/apache/fontbox/cff/CFFFontROS.java    |   189 +
 .../org/apache/fontbox/cff/CFFISOAdobeCharset.java |   289 -
 .../java/org/apache/fontbox/cff/CFFOperator.java   |    15 +-
 .../java/org/apache/fontbox/cff/CFFParser.java     |  2828 ++-
 .../apache/fontbox/cff/CFFStandardEncoding.java    |   313 -
 .../org/apache/fontbox/cff/CFFStandardString.java  |     3 +-
 .../java/org/apache/fontbox/cff/CFFType1Font.java  |   235 -
 .../org/apache/fontbox/cff/CIDKeyedFDSelect.java   |    38 +
 .../fontbox/cff/CIDKeyedType2CharString.java       |    57 -
 .../org/apache/fontbox/cff/CharStringCommand.java  |   624 +-
 .../apache/fontbox/cff/CharStringConverter.java    |   392 +
 .../org/apache/fontbox/cff/CharStringHandler.java  |    56 +-
 .../org/apache/fontbox/cff/CharStringRenderer.java |   679 +
 .../java/org/apache/fontbox/cff/DataInput.java     |    52 +-
 .../java/org/apache/fontbox/cff/DataOutput.java    |     2 +
 .../main/java/org/apache/fontbox/cff/FDSelect.java |    40 -
 .../java/org/apache/fontbox/cff/IndexData.java     |   107 +
 .../org/apache/fontbox/cff/Type1CharString.java    |   521 -
 .../fontbox/cff/Type1CharStringFormatter.java      |   102 +
 .../apache/fontbox/cff/Type1CharStringParser.java  |   386 +-
 .../org/apache/fontbox/cff/Type1FontFormatter.java |   249 +
 .../java/org/apache/fontbox/cff/Type1FontUtil.java |     7 +-
 .../org/apache/fontbox/cff/Type2CharString.java    |   392 -
 .../apache/fontbox/cff/Type2CharStringParser.java  |   537 +-
 .../org/apache/fontbox/cff/charset/CFFCharset.java |   149 +
 .../fontbox/cff/charset/CFFExpertCharset.java      |   211 +
 .../cff/charset/CFFExpertSubsetCharset.java        |   133 +
 .../fontbox/cff/charset/CFFISOAdobeCharset.java    |   275 +
 .../org/apache/fontbox/cff/charset/package.html    |    25 +
 .../apache/fontbox/cff/encoding/CFFEncoding.java   |   150 +
 .../fontbox/cff/encoding/CFFExpertEncoding.java    |   302 +
 .../fontbox/cff/encoding/CFFStandardEncoding.java  |   302 +
 .../org/apache/fontbox/cff/encoding/package.html   |    25 +
 .../java/org/apache/fontbox/cmap/CIDRange.java     |    32 +-
 .../main/java/org/apache/fontbox/cmap/CMap.java    |   299 +-
 .../java/org/apache/fontbox/cmap/CMapParser.java   |   639 +-
 .../org/apache/fontbox/cmap/CodespaceRange.java    |    82 +-
 .../apache/fontbox/encoding/BuiltInEncoding.java   |    40 -
 .../java/org/apache/fontbox/encoding/Encoding.java |   168 +-
 .../apache/fontbox/encoding/MacRomanEncoding.java  |   429 +-
 .../apache/fontbox/encoding/StandardEncoding.java  |   200 -
 .../java/org/apache/fontbox/pfb/PfbParser.java     |    38 +-
 .../org/apache/fontbox/ttf/AbstractTTFParser.java  |   242 +
 .../fontbox/ttf/BufferedRandomAccessFile.java      |   197 -
 .../main/java/org/apache/fontbox/ttf/CFFTable.java |    84 -
 .../org/apache/fontbox/ttf/CIDFontType2Parser.java |    30 +
 .../org/apache/fontbox/ttf/CMAPEncodingEntry.java  |   610 +
 .../java/org/apache/fontbox/ttf/CMAPTable.java     |   118 +
 .../java/org/apache/fontbox/ttf/CmapSubtable.java  |   739 -
 .../java/org/apache/fontbox/ttf/CmapTable.java     |   120 -
 .../apache/fontbox/ttf/DigitalSignatureTable.java  |     8 +-
 .../org/apache/fontbox/ttf/GlyfCompositeComp.java  |    12 +-
 .../apache/fontbox/ttf/GlyfCompositeDescript.java  |   559 +-
 .../java/org/apache/fontbox/ttf/GlyfDescript.java  |     4 +-
 .../org/apache/fontbox/ttf/GlyfSimpleDescript.java |   427 +-
 .../main/java/org/apache/fontbox/ttf/Glyph2D.java  |   252 +
 .../java/org/apache/fontbox/ttf/GlyphData.java     |    24 +-
 .../org/apache/fontbox/ttf/GlyphDescription.java   |    16 +-
 .../java/org/apache/fontbox/ttf/GlyphRenderer.java |   221 -
 .../java/org/apache/fontbox/ttf/GlyphTable.java    |   184 +-
 .../java/org/apache/fontbox/ttf/HeaderTable.java   |    21 +-
 .../apache/fontbox/ttf/HorizontalHeaderTable.java  |    11 +-
 .../apache/fontbox/ttf/HorizontalMetricsTable.java |    58 +-
 .../apache/fontbox/ttf/IndexToLocationTable.java   |    11 +-
 .../org/apache/fontbox/ttf/KerningSubtable.java    |   327 -
 .../java/org/apache/fontbox/ttf/KerningTable.java  |   117 -
 .../apache/fontbox/ttf/MaximumProfileTable.java    |    11 +-
 .../apache/fontbox/ttf/MemoryTTFDataStream.java    |    21 +-
 .../java/org/apache/fontbox/ttf/NameRecord.java    |    82 +-
 .../java/org/apache/fontbox/ttf/NamingTable.java   |   247 +-
 .../apache/fontbox/ttf/OS2WindowsMetricsTable.java |   131 +-
 .../java/org/apache/fontbox/ttf/OTFParser.java     |   113 -
 .../main/java/org/apache/fontbox/ttf/OTLTable.java |    31 -
 .../java/org/apache/fontbox/ttf/OpenTypeFont.java  |    97 -
 .../org/apache/fontbox/ttf/PostScriptTable.java    |    47 +-
 .../java/org/apache/fontbox/ttf/RAFDataStream.java |   346 +-
 .../java/org/apache/fontbox/ttf/TTCDataStream.java |    91 -
 .../java/org/apache/fontbox/ttf/TTFDataStream.java |    40 +-
 .../java/org/apache/fontbox/ttf/TTFParser.java     |   300 +-
 .../java/org/apache/fontbox/ttf/TTFSubFont.java    |  1159 ++
 .../java/org/apache/fontbox/ttf/TTFSubsetter.java  |  1100 --
 .../main/java/org/apache/fontbox/ttf/TTFTable.java |    39 +-
 .../org/apache/fontbox/ttf/TrueTypeCollection.java |   155 -
 .../java/org/apache/fontbox/ttf/TrueTypeFont.java  |   546 +-
 .../apache/fontbox/ttf/VerticalHeaderTable.java    |   215 -
 .../apache/fontbox/ttf/VerticalMetricsTable.java   |   115 -
 .../apache/fontbox/ttf/VerticalOriginTable.java    |   103 -
 .../java/org/apache/fontbox/ttf/WGL4Names.java     |    98 -
 .../apache/fontbox/type1/DamagedFontException.java |    33 -
 .../main/java/org/apache/fontbox/type1/Token.java  |   140 -
 .../fontbox/type1/Type1CharStringReader.java       |    37 -
 .../java/org/apache/fontbox/type1/Type1Font.java   |   554 -
 .../java/org/apache/fontbox/type1/Type1Lexer.java  |   469 -
 .../java/org/apache/fontbox/type1/Type1Parser.java |   915 -
 .../java/org/apache/fontbox/type1/package.html     |    25 -
 .../java/org/apache/fontbox/util/BoundingBox.java  |    35 +-
 .../java/org/apache/fontbox/util/Charsets.java     |    50 -
 .../java/org/apache/fontbox/util/FontManager.java  |   340 +
 .../org/apache/fontbox/util/ResourceLoader.java    |   150 +
 .../fontbox/util/autodetect/FontDirFinder.java     |    20 +-
 .../fontbox/util/autodetect/FontFileFinder.java    |    47 +-
 .../fontbox/util/autodetect/MacFontDirFinder.java  |    33 +-
 .../util/autodetect/NativeFontDirFinder.java       |    16 +-
 .../fontbox/util/autodetect/UnixFontDirFinder.java |    32 +-
 .../util/autodetect/WindowsFontDirFinder.java      |    76 +-
 .../resources/org/apache/fontbox/cmap/83pv-RKSJ-H  |   314 -
 .../resources/org/apache/fontbox/cmap/90ms-RKSJ-H  |   259 -
 .../resources/org/apache/fontbox/cmap/90ms-RKSJ-V  |   156 -
 .../resources/org/apache/fontbox/cmap/90msp-RKSJ-H |   257 -
 .../resources/org/apache/fontbox/cmap/90msp-RKSJ-V |   155 -
 .../resources/org/apache/fontbox/cmap/90pv-RKSJ-H  |   355 -
 .../resources/org/apache/fontbox/cmap/90pv-RKSJ-V  |   129 -
 .../resources/org/apache/fontbox/cmap/Add-RKSJ-H   |   738 -
 .../resources/org/apache/fontbox/cmap/Add-RKSJ-V   |   135 -
 .../resources/org/apache/fontbox/cmap/Adobe-CNS1-0 |   136 -
 .../resources/org/apache/fontbox/cmap/Adobe-CNS1-1 |   147 -
 .../resources/org/apache/fontbox/cmap/Adobe-CNS1-2 |   148 -
 .../resources/org/apache/fontbox/cmap/Adobe-CNS1-3 |   153 -
 .../resources/org/apache/fontbox/cmap/Adobe-CNS1-4 |   154 -
 .../resources/org/apache/fontbox/cmap/Adobe-CNS1-5 |   154 -
 .../resources/org/apache/fontbox/cmap/Adobe-CNS1-6 |   154 -
 .../org/apache/fontbox/cmap/Adobe-CNS1-UCS2        | 18209 ------------------
 .../resources/org/apache/fontbox/cmap/Adobe-GB1-0  |   111 -
 .../resources/org/apache/fontbox/cmap/Adobe-GB1-1  |   119 -
 .../resources/org/apache/fontbox/cmap/Adobe-GB1-2  |   167 -
 .../resources/org/apache/fontbox/cmap/Adobe-GB1-3  |   167 -
 .../resources/org/apache/fontbox/cmap/Adobe-GB1-4  |   197 -
 .../resources/org/apache/fontbox/cmap/Adobe-GB1-5  |   202 -
 .../org/apache/fontbox/cmap/Adobe-GB1-UCS2         | 14267 --------------
 .../org/apache/fontbox/cmap/Adobe-Japan1-0         |   113 -
 .../org/apache/fontbox/cmap/Adobe-Japan1-1         |   113 -
 .../org/apache/fontbox/cmap/Adobe-Japan1-2         |   115 -
 .../org/apache/fontbox/cmap/Adobe-Japan1-3         |   116 -
 .../org/apache/fontbox/cmap/Adobe-Japan1-4         |   140 -
 .../org/apache/fontbox/cmap/Adobe-Japan1-5         |   159 -
 .../org/apache/fontbox/cmap/Adobe-Japan1-6         |   170 -
 .../org/apache/fontbox/cmap/Adobe-Japan1-UCS2      | 19159 -------------------
 .../org/apache/fontbox/cmap/Adobe-Japan2-0         |   104 -
 .../org/apache/fontbox/cmap/Adobe-Korea1-0         |   116 -
 .../org/apache/fontbox/cmap/Adobe-Korea1-1         |   151 -
 .../org/apache/fontbox/cmap/Adobe-Korea1-2         |   151 -
 .../org/apache/fontbox/cmap/Adobe-Korea1-UCS2      |  9267 ---------
 .../main/resources/org/apache/fontbox/cmap/B5pc-H  |   337 -
 .../main/resources/org/apache/fontbox/cmap/B5pc-V  |    90 -
 .../resources/org/apache/fontbox/cmap/CNS-EUC-H    |   490 -
 .../resources/org/apache/fontbox/cmap/CNS-EUC-V    |   538 -
 .../resources/org/apache/fontbox/cmap/ETen-B5-H    |   343 -
 .../resources/org/apache/fontbox/cmap/ETen-B5-V    |    91 -
 .../resources/org/apache/fontbox/cmap/ETenms-B5-H  |    79 -
 .../resources/org/apache/fontbox/cmap/ETenms-B5-V  |    99 -
 .../main/resources/org/apache/fontbox/cmap/EUC-H   |   207 -
 .../main/resources/org/apache/fontbox/cmap/EUC-V   |   105 -
 .../resources/org/apache/fontbox/cmap/Ext-RKSJ-H   |   768 -
 .../resources/org/apache/fontbox/cmap/Ext-RKSJ-V   |   117 -
 .../resources/org/apache/fontbox/cmap/GB-EUC-H     |   173 -
 .../resources/org/apache/fontbox/cmap/GB-EUC-V     |    98 -
 .../resources/org/apache/fontbox/cmap/GBK-EUC-H    |  4273 -----
 .../resources/org/apache/fontbox/cmap/GBK-EUC-V    |    97 -
 .../main/resources/org/apache/fontbox/cmap/GBK2K-H |  5325 ------
 .../main/resources/org/apache/fontbox/cmap/GBK2K-V |   118 -
 .../resources/org/apache/fontbox/cmap/GBKp-EUC-H   |  4272 -----
 .../resources/org/apache/fontbox/cmap/GBKp-EUC-V   |    97 -
 .../resources/org/apache/fontbox/cmap/GBpc-EUC-H   |   175 -
 .../resources/org/apache/fontbox/cmap/GBpc-EUC-V   |    98 -
 .../resources/org/apache/fontbox/cmap/HKscs-B5-H   |  1331 --
 .../resources/org/apache/fontbox/cmap/HKscs-B5-V   |    90 -
 .../resources/org/apache/fontbox/cmap/Identity-H   |   339 -
 .../resources/org/apache/fontbox/cmap/Identity-V   |    73 -
 .../resources/org/apache/fontbox/cmap/KSC-EUC-H    |   562 -
 .../resources/org/apache/fontbox/cmap/KSC-EUC-V    |    94 -
 .../resources/org/apache/fontbox/cmap/KSCms-UHC-H  |   776 -
 .../org/apache/fontbox/cmap/KSCms-UHC-HW-H         |   775 -
 .../org/apache/fontbox/cmap/KSCms-UHC-HW-V         |    93 -
 .../resources/org/apache/fontbox/cmap/KSCms-UHC-V  |    94 -
 .../resources/org/apache/fontbox/cmap/KSCpc-EUC-H  |   608 -
 .../resources/org/apache/fontbox/cmap/KSCpc-EUC-V  |    94 -
 .../org/apache/fontbox/cmap/UniCNS-UCS2-H          | 16992 ----------------
 .../org/apache/fontbox/cmap/UniCNS-UCS2-V          |    90 -
 .../org/apache/fontbox/cmap/UniCNS-UTF16-H         | 19107 ------------------
 .../org/apache/fontbox/cmap/UniCNS-UTF16-V         |    94 -
 .../resources/org/apache/fontbox/cmap/UniGB-UCS2-H | 14321 --------------
 .../resources/org/apache/fontbox/cmap/UniGB-UCS2-V |   101 -
 .../org/apache/fontbox/cmap/UniGB-UTF16-H          | 14378 --------------
 .../org/apache/fontbox/cmap/UniGB-UTF16-V          |   104 -
 .../org/apache/fontbox/cmap/UniJIS-UCS2-H          |  8870 ---------
 .../org/apache/fontbox/cmap/UniJIS-UCS2-HW-H       |    81 -
 .../org/apache/fontbox/cmap/UniJIS-UCS2-HW-V       |   279 -
 .../org/apache/fontbox/cmap/UniJIS-UCS2-V          |   275 -
 .../org/apache/fontbox/cmap/UniJIS-UTF16-H         | 14445 --------------
 .../org/apache/fontbox/cmap/UniJIS-UTF16-V         |   299 -
 .../resources/org/apache/fontbox/cmap/UniKS-UCS2-H |  8725 ---------
 .../resources/org/apache/fontbox/cmap/UniKS-UCS2-V |    95 -
 .../org/apache/fontbox/cmap/UniKS-UTF16-H          |  8892 ---------
 .../org/apache/fontbox/cmap/UniKS-UTF16-V          |    99 -
 fontbox/src/main/site/apt/index.apt                |    29 +
 fontbox/src/main/site/resources/images/Logo.gif    |   Bin 0 -> 11762 bytes
 fontbox/src/main/site/resources/images/Logo.png    |   Bin 0 -> 200813 bytes
 fontbox/src/main/site/resources/images/group.svg   |    82 +
 .../apache/fontbox/cff/Type1CharStringTest.java    |    95 +
 .../org/apache/fontbox/cff/Type1FontUtilTest.java  |    83 +-
 .../java/org/apache/fontbox/cmap/TestCMap.java     |     5 +-
 .../org/apache/fontbox/cmap/TestCMapParser.java    |    61 +-
 .../fontbox/ttf/BufferedRandomAccessFileTest.java  |    60 -
 .../org/apache/fontbox/ttf/TTFSubsetterTest.java   |   276 -
 .../java/org/apache/fontbox/ttf/TestTTFParser.java |    10 +-
 .../test/resources/ttf/LiberationSans-Regular.ttf  |   Bin 350200 -> 0 bytes
 fontbox/src/test/resources/ttf/testTrueType.ttf    |   Bin 0 -> 98724 bytes
 jempbox/README.txt                                 |    43 +
 jempbox/eclipse-formatter.xml                      |   267 +
 jempbox/jempbox-checkstyle.xml                     |   187 +
 jempbox/pom.xml                                    |    58 +
 .../src/main/appended-resources/META-INF/LICENSE   |    34 +
 .../src/main/appended-resources/META-INF/NOTICE    |     2 +
 .../org/apache/jempbox/impl/DateConverter.java     |   300 +
 .../main/java/org/apache/jempbox/impl/XMLUtil.java |   447 +
 .../main/java/org/apache/jempbox/impl/package.html |    25 +
 .../java/org/apache/jempbox/xmp/Elementable.java   |    35 +
 .../java/org/apache/jempbox/xmp/ResourceEvent.java |   322 +
 .../java/org/apache/jempbox/xmp/ResourceRef.java   |   257 +
 .../java/org/apache/jempbox/xmp/Thumbnail.java     |   154 +
 .../java/org/apache/jempbox/xmp/XMPMetadata.java   |   773 +
 .../java/org/apache/jempbox/xmp/XMPSchema.java     |  1097 ++
 .../org/apache/jempbox/xmp/XMPSchemaBasic.java     |   374 +
 .../jempbox/xmp/XMPSchemaBasicJobTicket.java       |    53 +
 .../apache/jempbox/xmp/XMPSchemaDublinCore.java    |   531 +
 .../apache/jempbox/xmp/XMPSchemaDynamicMedia.java  |    53 +
 .../apache/jempbox/xmp/XMPSchemaIptc4xmpCore.java  |   314 +
 .../jempbox/xmp/XMPSchemaMediaManagement.java      |   283 +
 .../java/org/apache/jempbox/xmp/XMPSchemaPDF.java  |   114 +
 .../org/apache/jempbox/xmp/XMPSchemaPagedText.java |    53 +
 .../org/apache/jempbox/xmp/XMPSchemaPhotoshop.java |   358 +
 .../jempbox/xmp/XMPSchemaRightsManagement.java     |   220 +
 .../main/java/org/apache/jempbox/xmp/package.html  |    25 +
 .../apache/jempbox/xmp/pdfa/XMPMetadataPDFA.java   |   191 +
 .../jempbox/xmp/pdfa/XMPSchemaPDFAField.java       |    58 +
 .../apache/jempbox/xmp/pdfa/XMPSchemaPDFAId.java   |   119 +
 .../jempbox/xmp/pdfa/XMPSchemaPDFAProperty.java    |    57 +
 .../jempbox/xmp/pdfa/XMPSchemaPDFASchema.java      |    98 +
 .../apache/jempbox/xmp/pdfa/XMPSchemaPDFAType.java |    57 +
 .../java/org/apache/jempbox/xmp/pdfa/package.html  |    25 +
 .../test/java/org/apache/jempbox/xmp/AllTests.java |    54 +
 .../org/apache/jempbox/xmp/XMPMetadataTest.java    |   139 +
 .../java/org/apache/jempbox/xmp/XMPSchemaTest.java |   341 +
 .../test/java/org/apache/jempbox/xmp/package.html  |    25 +
 lucene/pom.xml                                     |    56 +
 .../src/main/appended-resources/META-INF/LICENSE   |    33 +
 lucene/src/main/appended-resources/META-INF/NOTICE |     2 +
 .../java/org/apache/pdfbox/lucene/IndexFiles.java  |   270 +
 .../apache/pdfbox/lucene/LucenePDFDocument.java    |   491 +
 .../java/org/apache/pdfbox/lucene/package.html     |    25 +
 .../pdfbox/searchengine/lucene/IndexFiles.java     |    28 +
 .../searchengine/lucene/LucenePDFDocument.java     |    24 +
 parent/pom.xml                                     |   657 +-
 pdfbox-checkstyle-5.xml                            |     6 +-
 pdfbox-checkstyle.xml                              |   185 +
 pdfbox-eclipse-formatter.xml                       |     8 +-
 pdfbox/build.xml                                   |   860 +
 pdfbox/pom.xml                                     |   121 +-
 .../src/main/appended-resources/META-INF/LICENSE   |   127 -
 pdfbox/src/main/appended-resources/META-INF/NOTICE |    12 -
 .../java/org/apache/pdfbox/ConvertColorspace.java  |   452 +
 .../src/main/java/org/apache/pdfbox/Decrypt.java   |   191 +
 .../src/main/java/org/apache/pdfbox/Encrypt.java   |   230 +
 .../src/main/java/org/apache/pdfbox/ExportFDF.java |   141 +
 .../main/java/org/apache/pdfbox/ExportXFDF.java    |   141 +
 .../main/java/org/apache/pdfbox/ExtractImages.java |   310 +
 .../main/java/org/apache/pdfbox/ExtractText.java   |   381 +
 .../src/main/java/org/apache/pdfbox/ImportFDF.java |   152 +
 .../main/java/org/apache/pdfbox/ImportXFDF.java    |   142 +
 .../src/main/java/org/apache/pdfbox/Overlay.java   |   504 +
 .../main/java/org/apache/pdfbox/OverlayPDF.java    |   183 +
 pdfbox/src/main/java/org/apache/pdfbox/PDFBox.java |   151 +
 .../main/java/org/apache/pdfbox/PDFDebugger.java   |   458 +
 .../src/main/java/org/apache/pdfbox/PDFMerger.java |    98 +
 .../src/main/java/org/apache/pdfbox/PDFReader.java |   430 +
 .../src/main/java/org/apache/pdfbox/PDFSplit.java  |   254 +
 .../main/java/org/apache/pdfbox/PDFToImage.java    |   302 +
 .../java/org/apache/pdfbox/PdfDecompressor.java    |    89 +
 .../src/main/java/org/apache/pdfbox/PrintPDF.java  |   150 +
 .../src/main/java/org/apache/pdfbox/TextToPDF.java |   363 +
 .../src/main/java/org/apache/pdfbox/Version.java   |    87 +
 .../java/org/apache/pdfbox/WriteDecodedDoc.java    |   220 +
 .../pdfbox/contentstream/PDContentStream.java      |    55 -
 .../contentstream/PDFGraphicsStreamEngine.java     |   258 -
 .../pdfbox/contentstream/PDFStreamEngine.java      |  1036 -
 .../pdfbox/contentstream/operator/DrawObject.java  |    74 -
 .../operator/MissingOperandException.java          |    33 -
 .../pdfbox/contentstream/operator/Operator.java    |   147 -
 .../contentstream/operator/OperatorProcessor.java  |    90 -
 .../contentstream/operator/color/SetColor.java     |    76 -
 .../operator/color/SetNonStrokingColor.java        |    64 -
 .../operator/color/SetNonStrokingColorN.java       |    33 -
 .../operator/color/SetNonStrokingColorSpace.java   |    51 -
 .../color/SetNonStrokingDeviceCMYKColor.java       |    48 -
 .../color/SetNonStrokingDeviceGrayColor.java       |    48 -
 .../color/SetNonStrokingDeviceRGBColor.java        |    48 -
 .../operator/color/SetStrokingColor.java           |    64 -
 .../operator/color/SetStrokingColorN.java          |    33 -
 .../operator/color/SetStrokingColorSpace.java      |    54 -
 .../operator/color/SetStrokingDeviceCMYKColor.java |    47 -
 .../operator/color/SetStrokingDeviceGrayColor.java |    47 -
 .../operator/color/SetStrokingDeviceRGBColor.java  |    54 -
 .../operator/graphics/AppendRectangleToPath.java   |    71 -
 .../operator/graphics/BeginInlineImage.java        |    52 -
 .../operator/graphics/ClipEvenOddRule.java         |    44 -
 .../operator/graphics/ClipNonZeroRule.java         |    44 -
 .../operator/graphics/CloseAndStrokePath.java      |    45 -
 .../graphics/CloseFillEvenOddAndStrokePath.java    |    44 -
 .../graphics/CloseFillNonZeroAndStrokePath.java    |    44 -
 .../contentstream/operator/graphics/ClosePath.java |    52 -
 .../contentstream/operator/graphics/CurveTo.java   |    79 -
 .../graphics/CurveToReplicateFinalPoint.java       |    64 -
 .../graphics/CurveToReplicateInitialPoint.java     |    78 -
 .../operator/graphics/DrawObject.java              |    79 -
 .../contentstream/operator/graphics/EndPath.java   |    43 -
 .../graphics/FillEvenOddAndStrokePath.java         |    44 -
 .../operator/graphics/FillEvenOddRule.java         |    44 -
 .../graphics/FillNonZeroAndStrokePath.java         |    46 -
 .../operator/graphics/FillNonZeroRule.java         |    44 -
 .../graphics/GraphicsOperatorProcessor.java        |    39 -
 .../operator/graphics/LegacyFillNonZeroRule.java   |    32 -
 .../contentstream/operator/graphics/LineTo.java    |    78 -
 .../contentstream/operator/graphics/MoveTo.java    |    63 -
 .../operator/graphics/ShadingFill.java             |    49 -
 .../operator/graphics/StrokePath.java              |    44 -
 .../contentstream/operator/graphics/package.html   |    25 -
 .../markedcontent/BeginMarkedContentSequence.java  |    57 -
 .../BeginMarkedContentSequenceWithProperties.java  |    63 -
 .../operator/markedcontent/DrawObject.java         |    72 -
 .../markedcontent/EndMarkedContentSequence.java    |    48 -
 .../contentstream/operator/state/Concatenate.java  |    67 -
 .../state/EmptyGraphicsStackException.java         |    36 -
 .../contentstream/operator/state/Restore.java      |    52 -
 .../pdfbox/contentstream/operator/state/Save.java  |    43 -
 .../contentstream/operator/state/SetFlatness.java  |    55 -
 .../operator/state/SetGraphicsStateParameters.java |    64 -
 .../operator/state/SetLineCapStyle.java            |    50 -
 .../operator/state/SetLineDashPattern.java         |    92 -
 .../operator/state/SetLineJoinStyle.java           |    51 -
 .../operator/state/SetLineMiterLimit.java          |    51 -
 .../contentstream/operator/state/SetLineWidth.java |    52 -
 .../contentstream/operator/state/SetMatrix.java    |    66 -
 .../operator/state/SetRenderingIntent.java         |    57 -
 .../contentstream/operator/text/BeginText.java     |    48 -
 .../contentstream/operator/text/EndText.java       |    46 -
 .../contentstream/operator/text/MoveText.java      |    76 -
 .../operator/text/MoveTextSetLeading.java          |    64 -
 .../contentstream/operator/text/NextLine.java      |    53 -
 .../operator/text/SetCharSpacing.java              |    59 -
 .../operator/text/SetFontAndSize.java              |    69 -
 .../operator/text/SetTextHorizontalScaling.java    |    52 -
 .../operator/text/SetTextLeading.java              |    45 -
 .../operator/text/SetTextRenderingMode.java        |    63 -
 .../contentstream/operator/text/SetTextRise.java   |    56 -
 .../operator/text/SetWordSpacing.java              |    54 -
 .../contentstream/operator/text/ShowText.java      |    63 -
 .../operator/text/ShowTextAdjusted.java            |    60 -
 .../contentstream/operator/text/ShowTextLine.java  |    46 -
 .../operator/text/ShowTextLineAndSpace.java        |    52 -
 .../org/apache/pdfbox/contentstream/package.html   |    25 -
 .../main/java/org/apache/pdfbox/cos/COSArray.java  |    46 +-
 .../main/java/org/apache/pdfbox/cos/COSBase.java   |    45 +-
 .../java/org/apache/pdfbox/cos/COSBoolean.java     |    17 +-
 .../java/org/apache/pdfbox/cos/COSDictionary.java  |   764 +-
 .../pdfbox/cos/COSDictionaryLateBinding.java       |    61 +
 .../java/org/apache/pdfbox/cos/COSDocument.java    |   398 +-
 .../main/java/org/apache/pdfbox/cos/COSFloat.java  |    59 +-
 .../java/org/apache/pdfbox/cos/COSInputStream.java |   121 -
 .../java/org/apache/pdfbox/cos/COSInteger.java     |    80 +-
 .../main/java/org/apache/pdfbox/cos/COSName.java   |  2162 ++-
 .../main/java/org/apache/pdfbox/cos/COSNull.java   |    23 +-
 .../main/java/org/apache/pdfbox/cos/COSNumber.java |    12 +-
 .../main/java/org/apache/pdfbox/cos/COSObject.java |   119 +-
 .../java/org/apache/pdfbox/cos/COSObjectKey.java   |   126 -
 .../org/apache/pdfbox/cos/COSOutputStream.java     |    95 -
 .../main/java/org/apache/pdfbox/cos/COSStream.java |   609 +-
 .../main/java/org/apache/pdfbox/cos/COSString.java |   494 +-
 .../main/java/org/apache/pdfbox/cos/COSUnread.java |   100 +
 .../java/org/apache/pdfbox/cos/COSUpdateInfo.java  |    37 -
 .../java/org/apache/pdfbox/cos/ICOSVisitor.java    |    43 +-
 .../java/org/apache/pdfbox/cos/PDFDocEncoding.java |   154 -
 .../pdfbox/cos/UnmodifiableCOSDictionary.java      |   290 -
 .../org/apache/pdfbox/encoding/AFMEncoding.java    |    61 +
 .../apache/pdfbox/encoding/DictionaryEncoding.java |    98 +
 .../java/org/apache/pdfbox/encoding/Encoding.java  |   409 +
 .../apache/pdfbox/encoding/EncodingManager.java    |    70 +
 .../apache/pdfbox/encoding/MacOSRomanEncoding.java |    68 +
 .../apache/pdfbox/encoding/MacRomanEncoding.java   |   264 +
 .../pdfbox/encoding/PDFBoxCharsetProvider.java     |    66 +
 .../pdfbox/encoding/PDFDocEncodingCharset.java     |   100 +
 .../org/apache/pdfbox/encoding/PdfDocEncoding.java |   283 +
 .../apache/pdfbox/encoding/SingleByteCharset.java  |   199 +
 .../apache/pdfbox/encoding/StandardEncoding.java   |   203 +
 .../org/apache/pdfbox/encoding/Type1Encoding.java  |    43 +
 .../apache/pdfbox/encoding/WinAnsiEncoding.java    |   281 +
 .../pdfbox/encoding/conversion/CJKConverter.java   |   113 +
 .../pdfbox/encoding/conversion/CJKEncoding.java    |   200 +
 .../encoding/conversion/CMapSubstitution.java      |    84 +
 .../conversion/EncodingConversionManager.java      |    72 +
 .../encoding/conversion/EncodingConverter.java     |    49 +
 .../apache/pdfbox/encoding/conversion/package.html |    25 +
 .../java/org/apache/pdfbox/encoding/package.html   |    25 +
 .../java/org/apache/pdfbox/encryption/ARCFour.java |   168 +
 .../pdfbox/encryption/DocumentEncryption.java      |   408 +
 .../apache/pdfbox/encryption/PDFEncryption.java    |   589 +
 .../java/org/apache/pdfbox/encryption/package.html |    25 +
 .../pdfbox/exceptions/COSVisitorException.java     |    39 +
 .../pdfbox/exceptions/CryptographyException.java   |    68 +
 .../exceptions/InvalidPasswordException.java       |    37 +
 .../exceptions/OutlineNotLocalException.java       |    41 +
 .../pdfbox/exceptions/SignatureException.java      |    95 +
 .../apache/pdfbox/exceptions/WrappedException.java |    39 +
 .../pdfbox/exceptions/WrappedIOException.java      |    50 +
 .../java/org/apache/pdfbox/exceptions/package.html |    25 +
 .../org/apache/pdfbox/filter/ASCII85Filter.java    |    52 +-
 .../apache/pdfbox/filter/ASCII85InputStream.java   |   274 -
 .../apache/pdfbox/filter/ASCII85OutputStream.java  |   246 -
 .../org/apache/pdfbox/filter/ASCIIHexFilter.java   |   219 +-
 .../apache/pdfbox/filter/CCITTFaxDecodeFilter.java |   160 +
 .../pdfbox/filter/CCITTFaxDecoderStream.java       |   819 -
 .../pdfbox/filter/CCITTFaxEncoderStream.java       |   323 -
 .../org/apache/pdfbox/filter/CCITTFaxFilter.java   |   149 -
 .../java/org/apache/pdfbox/filter/CryptFilter.java |    41 +-
 .../java/org/apache/pdfbox/filter/DCTFilter.java   |   305 +-
 .../org/apache/pdfbox/filter/DecodeResult.java     |    70 -
 .../main/java/org/apache/pdfbox/filter/Filter.java |   121 +-
 .../org/apache/pdfbox/filter/FilterFactory.java    |   103 -
 .../org/apache/pdfbox/filter/FilterManager.java    |   125 +
 .../java/org/apache/pdfbox/filter/FlateFilter.java |   117 +-
 .../org/apache/pdfbox/filter/IdentityFilter.java   |    43 +-
 .../java/org/apache/pdfbox/filter/JBIG2Filter.java |   156 +-
 .../java/org/apache/pdfbox/filter/JPXFilter.java   |   166 +-
 .../java/org/apache/pdfbox/filter/LZWFilter.java   |   137 +-
 .../pdfbox/filter/MissingImageReaderException.java |    37 -
 .../java/org/apache/pdfbox/filter/Predictor.java   |    10 +-
 .../pdfbox/filter/RunLengthDecodeFilter.java       |    80 +-
 .../org/apache/pdfbox/filter/TIFFExtension.java    |   106 -
 .../org/apache/pdfbox/filter/TIFFFaxDecoder.java   |  1455 ++
 .../org/apache/pdfbox/io/ASCII85InputStream.java   |   266 +
 .../org/apache/pdfbox/io/ASCII85OutputStream.java  |   243 +
 .../pdfbox/io/ByteArrayPushBackInputStream.java    |   390 +
 .../pdfbox/io/FastByteArrayOutputStream.java       |    48 +
 .../main/java/org/apache/pdfbox/io/IOUtils.java    |    87 +-
 .../org/apache/pdfbox/io/MemoryUsageSetting.java   |   281 -
 .../org/apache/pdfbox/io/PushBackInputStream.java  |   237 +
 .../java/org/apache/pdfbox/io/RandomAccess.java    |    29 +-
 .../org/apache/pdfbox/io/RandomAccessBuffer.java   |   335 +-
 .../io/RandomAccessBufferedFileInputStream.java    |   174 +-
 .../org/apache/pdfbox/io/RandomAccessFile.java     |   145 +-
 .../pdfbox/io/RandomAccessFileInputStream.java     |   117 +
 .../pdfbox/io/RandomAccessFileOutputStream.java    |   141 +
 .../apache/pdfbox/io/RandomAccessInputStream.java  |    96 -
 .../apache/pdfbox/io/RandomAccessOutputStream.java |    60 -
 .../org/apache/pdfbox/io/RandomAccessRead.java     |    83 +-
 .../org/apache/pdfbox/io/RandomAccessWrite.java    |    58 -
 .../java/org/apache/pdfbox/io/ScratchFile.java     |   513 -
 .../org/apache/pdfbox/io/ScratchFileBuffer.java    |   525 -
 .../java/org/apache/pdfbox/io/SequentialRead.java  |    23 +-
 .../apache/pdfbox/io/ccitt/CCITTFaxConstants.java  |    82 +
 .../io/ccitt/CCITTFaxG31DDecodeInputStream.java    |   471 +
 .../io/ccitt/FillOrderChangeInputStream.java       |   108 +
 .../org/apache/pdfbox/io/ccitt/PackedBitArray.java |   259 +
 .../java/org/apache/pdfbox/io/ccitt/package.html   |    26 +
 .../org/apache/pdfbox/multipdf/LayerUtility.java   |   273 -
 .../java/org/apache/pdfbox/multipdf/Overlay.java   |   642 -
 .../apache/pdfbox/multipdf/PDFCloneUtility.java    |   238 -
 .../apache/pdfbox/multipdf/PDFMergerUtility.java   |   822 -
 .../org/apache/pdfbox/multipdf/PageExtractor.java  |   127 -
 .../java/org/apache/pdfbox/multipdf/Splitter.java  |   258 -
 .../src/main/java/org/apache/pdfbox/package.html   |    25 +
 .../org/apache/pdfbox/pdfparser/BaseParser.java    |  1264 +-
 .../org/apache/pdfbox/pdfparser/COSParser.java     |  2230 ---
 .../pdfbox/pdfparser/ConformingPDFParser.java      |   694 +
 .../pdfbox/pdfparser/EndstreamOutputStream.java    |    12 +-
 .../org/apache/pdfbox/pdfparser/FDFParser.java     |   174 -
 .../apache/pdfbox/pdfparser/InputStreamSource.java |   125 -
 .../pdfbox/pdfparser/NonSequentialPDFParser.java   |  2290 +++
 .../pdfbox/pdfparser/PDFObjectStreamParser.java    |    64 +-
 .../org/apache/pdfbox/pdfparser/PDFParser.java     |  1151 +-
 .../apache/pdfbox/pdfparser/PDFStreamParser.java   |   327 +-
 .../java/org/apache/pdfbox/pdfparser/PDFXRef.java  |     1 +
 .../org/apache/pdfbox/pdfparser/PDFXRefStream.java |   114 +-
 .../pdfbox/pdfparser/PDFXrefStreamParser.java      |   231 +-
 .../pdfbox/pdfparser/RandomAccessSource.java       |    99 -
 .../apache/pdfbox/pdfparser/SequentialSource.java  |   105 -
 .../pdfbox/pdfparser/VisualSignatureParser.java    |   319 +
 .../pdfbox/pdfparser/XrefTrailerResolver.java      |   696 +-
 .../org/apache/pdfbox/pdfviewer/ArrayEntry.java    |    69 +
 .../java/org/apache/pdfbox/pdfviewer/MapEntry.java |    91 +
 .../org/apache/pdfbox/pdfviewer/PDFPagePanel.java  |   128 +
 .../pdfbox/pdfviewer/PDFTreeCellRenderer.java      |   130 +
 .../org/apache/pdfbox/pdfviewer/PDFTreeModel.java  |   319 +
 .../org/apache/pdfbox/pdfviewer/PageDrawer.java    |   745 +
 .../org/apache/pdfbox/pdfviewer/PageWrapper.java   |   104 +
 .../apache/pdfbox/pdfviewer/ReaderBottomPanel.java |    72 +
 .../java/org/apache/pdfbox/pdfviewer/package.html  |    25 +
 .../pdfbox/pdfwriter/COSFilterInputStream.java     |   119 +
 .../pdfbox/pdfwriter/COSStandardOutputStream.java  |   113 +-
 .../org/apache/pdfbox/pdfwriter/COSWriter.java     |  1434 +-
 .../pdfbox/pdfwriter/COSWriterXRefEntry.java       |    41 +-
 .../pdfbox/pdfwriter/ContentStreamWriter.java      |    97 +-
 .../pdfbox/pdmodel/ConformingPDDocument.java       |   114 +
 .../pdfbox/pdmodel/DefaultResourceCache.java       |   180 -
 .../pdfbox/pdmodel/MissingResourceException.java   |    31 -
 .../pdfbox/pdmodel/PDDestinationNameTreeNode.java  |    26 +-
 .../java/org/apache/pdfbox/pdmodel/PDDocument.java |  2123 +-
 .../apache/pdfbox/pdmodel/PDDocumentCatalog.java   |   509 +-
 .../pdfbox/pdmodel/PDDocumentInformation.java      |    41 +-
 .../PDDocumentNameDestinationDictionary.java       |    28 +-
 .../pdfbox/pdmodel/PDDocumentNameDictionary.java   |    31 +-
 .../pdmodel/PDEmbeddedFilesNameTreeNode.java       |    23 +-
 .../pdfbox/pdmodel/PDJavascriptNameTreeNode.java   |    26 +-
 .../java/org/apache/pdfbox/pdmodel/PDPage.java     |   822 +-
 .../apache/pdfbox/pdmodel/PDPageContentStream.java |  2406 ---
 .../java/org/apache/pdfbox/pdmodel/PDPageNode.java |   474 +
 .../java/org/apache/pdfbox/pdmodel/PDPageTree.java |   526 -
 .../java/org/apache/pdfbox/pdmodel/PDPageable.java |   212 +
 .../org/apache/pdfbox/pdmodel/PDResources.java     |   988 +-
 .../pdmodel/PDStructureElementNameTreeNode.java    |    62 -
 .../java/org/apache/pdfbox/pdmodel/PageLayout.java |    88 -
 .../java/org/apache/pdfbox/pdmodel/PageMode.java   |    88 -
 .../org/apache/pdfbox/pdmodel/ResourceCache.java   |   107 -
 .../apache/pdfbox/pdmodel/common/COSArrayList.java |   157 +-
 .../pdfbox/pdmodel/common/COSDictionaryMap.java    |    35 +-
 .../pdfbox/pdmodel/common/COSObjectable.java       |     5 +-
 .../pdfbox/pdmodel/common/COSStreamArray.java      |   314 +
 .../pdfbox/pdmodel/common/DualCOSObjectable.java   |    42 +
 .../pdmodel/common/PDDestinationOrAction.java      |     3 +-
 .../pdfbox/pdmodel/common/PDDictionaryWrapper.java |    19 +-
 .../org/apache/pdfbox/pdmodel/common/PDMatrix.java |   115 +
 .../pdfbox/pdmodel/common/PDMemoryStream.java      |   270 +
 .../apache/pdfbox/pdmodel/common/PDMetadata.java   |    46 +-
 .../pdfbox/pdmodel/common/PDNameTreeNode.java      |   102 +-
 .../pdfbox/pdmodel/common/PDNamedTextStream.java   |   123 +
 .../pdfbox/pdmodel/common/PDNumberTreeNode.java    |    87 +-
 .../pdfbox/pdmodel/common/PDObjectStream.java      |    21 +-
 .../pdfbox/pdmodel/common/PDPageLabelRange.java    |    17 +-
 .../apache/pdfbox/pdmodel/common/PDPageLabels.java |    37 +-
 .../org/apache/pdfbox/pdmodel/common/PDRange.java  |    14 +-
 .../apache/pdfbox/pdmodel/common/PDRectangle.java  |   132 +-
 .../org/apache/pdfbox/pdmodel/common/PDStream.java |   356 +-
 .../apache/pdfbox/pdmodel/common/PDTextStream.java |   166 +
 .../pdmodel/common/PDTypedDictionaryWrapper.java   |     7 +-
 .../apache/pdfbox/pdmodel/common/XrefEntry.java    |    43 +
 .../PDComplexFileSpecification.java                |    66 +-
 .../common/filespecification/PDEmbeddedFile.java   |    60 +-
 .../filespecification/PDFileSpecification.java     |     3 +-
 .../PDSimpleFileSpecification.java                 |     6 +-
 .../pdfbox/pdmodel/common/function/PDFunction.java |   103 +-
 .../pdmodel/common/function/PDFunctionType0.java   |   102 +-
 .../pdmodel/common/function/PDFunctionType2.java   |   128 +-
 .../pdmodel/common/function/PDFunctionType3.java   |    18 +-
 .../pdmodel/common/function/PDFunctionType4.java   |    11 +-
 .../common/function/PDFunctionTypeIdentity.java    |    56 -
 .../common/function/type4/ArithmeticOperators.java |    13 +-
 .../common/function/type4/BitwiseOperators.java    |     1 +
 .../function/type4/ConditionalOperators.java       |     1 +
 .../common/function/type4/ExecutionContext.java    |     7 +-
 .../common/function/type4/InstructionSequence.java |     9 +-
 .../function/type4/InstructionSequenceBuilder.java |    19 +-
 .../pdmodel/common/function/type4/Operator.java    |     1 +
 .../pdmodel/common/function/type4/Operators.java   |     3 +-
 .../pdmodel/common/function/type4/Parser.java      |    25 +-
 .../common/function/type4/RelationalOperators.java |     1 +
 .../common/function/type4/StackOperators.java      |     1 +
 .../logicalstructure/PDAttributeObject.java        |    17 +-
 .../logicalstructure/PDDefaultAttributeObject.java |    11 +-
 .../logicalstructure/PDMarkInfo.java               |    19 +-
 .../logicalstructure/PDMarkedContentReference.java |   239 +-
 .../logicalstructure/PDObjectReference.java        |   286 +-
 .../logicalstructure/PDStructureElement.java       |    99 +-
 .../logicalstructure/PDStructureNode.java          |   845 +-
 .../logicalstructure/PDStructureTreeRoot.java      |    40 +-
 .../logicalstructure/PDUserAttributeObject.java    |    22 +-
 .../logicalstructure/PDUserProperty.java           |    69 +-
 .../logicalstructure/Revisions.java                |    13 +-
 .../markedcontent/PDMarkedContent.java             |   404 +-
 .../markedcontent/PDPropertyList.java              |    70 -
 .../documentinterchange/prepress/PDBoxStyle.java   |    71 +-
 .../taggedpdf/PDArtifactMarkedContent.java         |     3 +-
 .../taggedpdf/PDExportFormatAttributeObject.java   |    12 +-
 .../taggedpdf/PDFourColours.java                   |     6 +-
 .../taggedpdf/PDLayoutAttributeObject.java         |   117 +-
 .../taggedpdf/PDListAttributeObject.java           |     3 +-
 .../taggedpdf/PDPrintFieldAttributeObject.java     |     3 +-
 .../taggedpdf/PDStandardAttributeObject.java       |    97 +-
 .../taggedpdf/PDTableAttributeObject.java          |     8 +-
 .../taggedpdf/StandardStructureTypes.java          |    10 +-
 .../pdfbox/pdmodel/edit/PDPageContentStream.java   |  1587 ++
 .../org/apache/pdfbox/pdmodel/edit/package.html    |    25 +
 .../pdmodel/encryption/AccessPermission.java       |    20 +-
 .../encryption/BadSecurityHandlerException.java    |    58 +
 .../pdmodel/encryption/DecryptionMaterial.java     |     3 +-
 .../encryption/InvalidPasswordException.java       |    35 -
 .../pdfbox/pdmodel/encryption/MessageDigests.java  |    63 -
 .../encryption/PDCryptFilterDictionary.java        |    17 +-
 .../pdfbox/pdmodel/encryption/PDEncryption.java    |   603 -
 .../pdmodel/encryption/PDEncryptionDictionary.java |   417 +-
 .../pdmodel/encryption/PDEncryptionManager.java    |   119 +
 .../pdmodel/encryption/PDStandardEncryption.java   |   403 +
 .../pdmodel/encryption/ProtectionPolicy.java       |     7 +-
 .../encryption/PublicKeyDecryptionMaterial.java    |    33 +-
 .../encryption/PublicKeyProtectionPolicy.java      |    69 +-
 .../pdmodel/encryption/PublicKeyRecipient.java     |     3 +-
 .../encryption/PublicKeySecurityHandler.java       |   435 +-
 .../pdfbox/pdmodel/encryption/RC4Cipher.java       |   166 -
 .../pdfbox/pdmodel/encryption/SecurityHandler.java |   750 +-
 .../pdmodel/encryption/SecurityHandlerFactory.java |   163 -
 .../encryption/SecurityHandlersManager.java        |   230 +
 .../encryption/StandardDecryptionMaterial.java     |    12 +-
 .../encryption/StandardProtectionPolicy.java       |    92 +-
 .../encryption/StandardSecurityHandler.java        |  1298 +-
 .../apache/pdfbox/pdmodel/fdf/FDFAnnotation.java   |   659 +-
 .../pdfbox/pdmodel/fdf/FDFAnnotationCaret.java     |   105 +-
 .../pdfbox/pdmodel/fdf/FDFAnnotationCircle.java    |   121 +-
 .../pdmodel/fdf/FDFAnnotationFileAttachment.java   |    21 +-
 .../pdfbox/pdmodel/fdf/FDFAnnotationFreeText.java  |   267 +-
 .../pdfbox/pdmodel/fdf/FDFAnnotationHighlight.java |    23 +-
 .../pdfbox/pdmodel/fdf/FDFAnnotationInk.java       |   111 +-
 .../pdfbox/pdmodel/fdf/FDFAnnotationLine.java      |   433 +-
 .../pdfbox/pdmodel/fdf/FDFAnnotationLink.java      |    66 -
 .../pdfbox/pdmodel/fdf/FDFAnnotationPolygon.java   |   130 +-
 .../pdfbox/pdmodel/fdf/FDFAnnotationPolyline.java  |   231 +-
 .../pdfbox/pdmodel/fdf/FDFAnnotationSound.java     |    21 +-
 .../pdfbox/pdmodel/fdf/FDFAnnotationSquare.java    |   120 +-
 .../pdfbox/pdmodel/fdf/FDFAnnotationSquiggly.java  |    23 +-
 .../pdfbox/pdmodel/fdf/FDFAnnotationStamp.java     |    21 +-
 .../pdfbox/pdmodel/fdf/FDFAnnotationStrikeOut.java |    23 +-
 .../pdfbox/pdmodel/fdf/FDFAnnotationText.java      |   100 +-
 .../pdmodel/fdf/FDFAnnotationTextMarkup.java       |   114 -
 .../pdfbox/pdmodel/fdf/FDFAnnotationUnderline.java |    23 +-
 .../org/apache/pdfbox/pdmodel/fdf/FDFCatalog.java  |    63 +-
 .../apache/pdfbox/pdmodel/fdf/FDFDictionary.java   |   368 +-
 .../org/apache/pdfbox/pdmodel/fdf/FDFDocument.java |   135 +-
 .../org/apache/pdfbox/pdmodel/fdf/FDFField.java    |   511 +-
 .../org/apache/pdfbox/pdmodel/fdf/FDFIconFit.java  |    87 +-
 .../apache/pdfbox/pdmodel/fdf/FDFJavaScript.java   |   126 +-
 .../pdfbox/pdmodel/fdf/FDFNamedPageReference.java  |    40 +-
 .../pdfbox/pdmodel/fdf/FDFOptionElement.java       |    32 +-
 .../org/apache/pdfbox/pdmodel/fdf/FDFPage.java     |    56 +-
 .../org/apache/pdfbox/pdmodel/fdf/FDFPageInfo.java |    21 +-
 .../org/apache/pdfbox/pdmodel/fdf/FDFTemplate.java |    59 +-
 .../org/apache/pdfbox/pdmodel/fdf/XMLUtil.java     |   105 -
 .../apache/pdfbox/pdmodel/font/CIDFontMapping.java |    54 -
 .../apache/pdfbox/pdmodel/font/CIDSystemInfo.java  |    58 -
 .../apache/pdfbox/pdmodel/font/CMapManager.java    |    77 -
 .../pdmodel/font/FileSystemFontProvider.java       |   782 -
 .../org/apache/pdfbox/pdmodel/font/FontCache.java  |    52 -
 .../org/apache/pdfbox/pdmodel/font/FontFormat.java |    41 -
 .../org/apache/pdfbox/pdmodel/font/FontInfo.java   |   124 -
 .../apache/pdfbox/pdmodel/font/FontManager.java    |   351 +
 .../org/apache/pdfbox/pdmodel/font/FontMapper.java |    54 -
 .../apache/pdfbox/pdmodel/font/FontMapperImpl.java |   711 -
 .../apache/pdfbox/pdmodel/font/FontMappers.java    |    58 -
 .../apache/pdfbox/pdmodel/font/FontMapping.java    |    54 -
 .../apache/pdfbox/pdmodel/font/FontProvider.java   |    38 -
 .../org/apache/pdfbox/pdmodel/font/PDCIDFont.java  |   529 +-
 .../apache/pdfbox/pdmodel/font/PDCIDFontType0.java |   451 -
 .../pdfbox/pdmodel/font/PDCIDFontType0Font.java    |    85 +
 .../apache/pdfbox/pdmodel/font/PDCIDFontType2.java |   457 -
 .../pdmodel/font/PDCIDFontType2Embedder.java       |   417 -
 .../pdfbox/pdmodel/font/PDCIDFontType2Font.java    |   182 +
 .../pdfbox/pdmodel/font/PDCIDSystemInfo.java       |    73 -
 .../org/apache/pdfbox/pdmodel/font/PDFont.java     |  1106 +-
 .../pdfbox/pdmodel/font/PDFontDescriptor.java      |   610 +-
 .../pdfbox/pdmodel/font/PDFontDescriptorAFM.java   |   432 +
 .../pdmodel/font/PDFontDescriptorDictionary.java   |   605 +
 .../apache/pdfbox/pdmodel/font/PDFontFactory.java  |   143 +-
 .../org/apache/pdfbox/pdmodel/font/PDFontLike.java |   117 -
 .../apache/pdfbox/pdmodel/font/PDMMType1Font.java  |    25 +-
 .../org/apache/pdfbox/pdmodel/font/PDPanose.java   |    58 -
 .../pdmodel/font/PDPanoseClassification.java       |   103 -
 .../apache/pdfbox/pdmodel/font/PDSimpleFont.java   |   976 +-
 .../apache/pdfbox/pdmodel/font/PDTrueTypeFont.java |  1026 +-
 .../pdmodel/font/PDTrueTypeFontEmbedder.java       |   128 -
 .../apache/pdfbox/pdmodel/font/PDType0Font.java    |   488 +-
 .../pdfbox/pdmodel/font/PDType1AfmPfbFont.java     |   246 +
 .../apache/pdfbox/pdmodel/font/PDType1CFont.java   |   774 +-
 .../apache/pdfbox/pdmodel/font/PDType1Font.java    |   917 +-
 .../pdfbox/pdmodel/font/PDType1FontEmbedder.java   |   175 -
 .../pdfbox/pdmodel/font/PDType3CharProc.java       |   189 -
 .../apache/pdfbox/pdmodel/font/PDType3Font.java    |   344 +-
 .../apache/pdfbox/pdmodel/font/PDVectorFont.java   |    44 -
 .../pdfbox/pdmodel/font/Standard14Fonts.java       |   166 -
 .../org/apache/pdfbox/pdmodel/font/Subsetter.java  |    40 -
 .../pdfbox/pdmodel/font/ToUnicodeWriter.java       |   186 -
 .../pdfbox/pdmodel/font/TrueTypeEmbedder.java      |   376 -
 .../pdfbox/pdmodel/font/Type3StreamParser.java     |   594 +
 .../org/apache/pdfbox/pdmodel/font/UniUtil.java    |    47 -
 .../pdmodel/font/encoding/BuiltInEncoding.java     |    54 -
 .../pdmodel/font/encoding/DictionaryEncoding.java  |   185 -
 .../pdfbox/pdmodel/font/encoding/Encoding.java     |   184 -
 .../pdfbox/pdmodel/font/encoding/GlyphList.java    |   289 -
 .../pdmodel/font/encoding/MacExpertEncoding.java   |   229 -
 .../pdmodel/font/encoding/MacOSRomanEncoding.java  |    81 -
 .../pdmodel/font/encoding/MacRomanEncoding.java    |   277 -
 .../pdmodel/font/encoding/StandardEncoding.java    |   218 -
 .../pdmodel/font/encoding/SymbolEncoding.java      |   253 -
 .../pdmodel/font/encoding/Type1Encoding.java       |    80 -
 .../pdmodel/font/encoding/WinAnsiEncoding.java     |   297 -
 .../font/encoding/ZapfDingbatsEncoding.java        |   252 -
 .../pdmodel/graphics/PDExtendedGraphicsState.java  |   564 +
 .../pdfbox/pdmodel/graphics/PDFontSetting.java     |     4 +-
 .../pdfbox/pdmodel/graphics/PDGraphicsState.java   |   530 +
 .../pdfbox/pdmodel/graphics/PDLineDashPattern.java |   162 +-
 .../pdmodel/graphics/PDPostScriptXObject.java      |    38 -
 .../apache/pdfbox/pdmodel/graphics/PDShading.java  |   245 +
 .../apache/pdfbox/pdmodel/graphics/PDXObject.java  |   170 -
 .../pdmodel/graphics/blend/BlendComposite.java     |   228 -
 .../pdfbox/pdmodel/graphics/blend/BlendMode.java   |   213 -
 .../graphics/blend/NonSeparableBlendMode.java      |    31 -
 .../pdmodel/graphics/blend/SeparableBlendMode.java |    31 -
 .../pdmodel/graphics/color/ColorSpaceCMYK.java     |   150 +
 .../pdmodel/graphics/color/ColorSpaceCalRGB.java   |   142 +
 .../pdmodel/graphics/color/ColorSpaceLab.java      |   186 +
 .../graphics/color/PDCIEBasedColorSpace.java       |    80 -
 .../color/PDCIEDictionaryBasedColorSpace.java      |   169 -
 .../pdfbox/pdmodel/graphics/color/PDCalGray.java   |   192 +-
 .../pdfbox/pdmodel/graphics/color/PDCalRGB.java    |   282 +-
 .../pdfbox/pdmodel/graphics/color/PDColor.java     |   184 -
 .../pdmodel/graphics/color/PDColorSpace.java       |   287 +-
 .../graphics/color/PDColorSpaceFactory.java        |   271 +
 .../pdmodel/graphics/color/PDColorState.java       |   351 +
 .../pdmodel/graphics/color/PDDeviceCMYK.java       |   207 +-
 .../pdmodel/graphics/color/PDDeviceColorSpace.java |    40 -
 .../pdmodel/graphics/color/PDDeviceGray.java       |   116 +-
 .../pdfbox/pdmodel/graphics/color/PDDeviceN.java   |   590 +-
 .../graphics/color/PDDeviceNAttributes.java        |   129 +-
 .../pdmodel/graphics/color/PDDeviceNProcess.java   |   119 -
 .../pdfbox/pdmodel/graphics/color/PDDeviceRGB.java |   126 +-
 .../pdfbox/pdmodel/graphics/color/PDGamma.java     |    78 +-
 .../pdfbox/pdmodel/graphics/color/PDICCBased.java  |   459 +-
 .../pdfbox/pdmodel/graphics/color/PDIndexed.java   |   401 +-
 .../pdmodel/graphics/color/PDJPXColorSpace.java    |    93 -
 .../pdfbox/pdmodel/graphics/color/PDLab.java       |   294 +-
 .../pdmodel/graphics/color/PDOutputIntent.java     |   219 +-
 .../pdfbox/pdmodel/graphics/color/PDPattern.java   |   139 +-
 .../pdmodel/graphics/color/PDSeparation.java       |   294 +-
 .../graphics/color/PDSpecialColorSpace.java        |    33 -
 .../pdmodel/graphics/color/PDTristimulus.java      |    81 +-
 .../pdmodel/graphics/form/PDFormXObject.java       |   262 -
 .../pdmodel/graphics/form/PDTransparencyGroup.java |    59 -
 .../form/PDTransparencyGroupAttributes.java        |    92 -
 .../pdfbox/pdmodel/graphics/form/package.html      |    25 -
 .../pdmodel/graphics/image/CCITTFactory.java       |   523 -
 .../pdfbox/pdmodel/graphics/image/JPEGFactory.java |   367 -
 .../pdmodel/graphics/image/LosslessFactory.java    |   270 -
 .../pdfbox/pdmodel/graphics/image/PDImage.java     |   157 -
 .../pdmodel/graphics/image/PDImageXObject.java     |   755 -
 .../pdmodel/graphics/image/PDInlineImage.java      |   380 -
 .../pdmodel/graphics/image/SampledImageReader.java |   520 -
 .../optionalcontent/PDOptionalContentGroup.java    |    30 +-
 .../PDOptionalContentProperties.java               |    10 +-
 .../graphics/pattern/PDAbstractPattern.java        |   160 -
 .../graphics/pattern/PDPatternResources.java       |   194 +
 .../pdmodel/graphics/pattern/PDShadingPattern.java |   115 -
 .../pattern/PDShadingPatternResources.java         |   242 +
 .../pdmodel/graphics/pattern/PDTilingPattern.java  |   229 -
 .../graphics/pattern/PDTilingPatternResources.java |   286 +
 .../pdfbox/pdmodel/graphics/predictor/Average.java |    65 +
 .../pdfbox/pdmodel/graphics/predictor/None.java    |    88 +
 .../pdfbox/pdmodel/graphics/predictor/Optimum.java |   137 +
 .../pdfbox/pdmodel/graphics/predictor/Paeth.java   |   106 +
 .../graphics/predictor/PredictorAlgorithm.java     |   322 +
 .../pdfbox/pdmodel/graphics/predictor/Sub.java     |    72 +
 .../pdfbox/pdmodel/graphics/predictor/Up.java      |    86 +
 .../pdfbox/pdmodel/graphics/predictor/package.html |    26 +
 .../graphics/shading/AxialShadingContext.java      |   650 +-
 .../graphics/shading/AxialShadingPaint.java        |   159 +-
 .../pdmodel/graphics/shading/CoonsPatch.java       |    20 +-
 .../pdmodel/graphics/shading/CubicBezierCurve.java |    19 +-
 .../graphics/shading/GouraudShadingContext.java    |   143 +-
 .../pdfbox/pdmodel/graphics/shading/Line.java      |    25 +-
 .../pdfbox/pdmodel/graphics/shading/PDShading.java |   431 -
 .../graphics/shading/PDShadingResources.java       |   446 +
 .../pdmodel/graphics/shading/PDShadingType1.java   |    44 +-
 .../pdmodel/graphics/shading/PDShadingType2.java   |    59 +-
 .../pdmodel/graphics/shading/PDShadingType3.java   |    20 +-
 .../pdmodel/graphics/shading/PDShadingType4.java   |   142 +-
 .../pdmodel/graphics/shading/PDShadingType5.java   |    27 +-
 .../pdmodel/graphics/shading/PDShadingType6.java   |    94 +-
 .../pdmodel/graphics/shading/PDShadingType7.java   |    96 +-
 .../shading/PDTriangleBasedShadingType.java        |    16 +-
 .../pdfbox/pdmodel/graphics/shading/Patch.java     |     9 +-
 .../shading/PatchMeshesShadingContext.java         |   311 +-
 .../graphics/shading/RadialShadingContext.java     |   252 +-
 .../graphics/shading/RadialShadingPaint.java       |    35 +-
 .../pdmodel/graphics/shading/ShadedTriangle.java   |    50 +-
 .../pdmodel/graphics/shading/ShadingContext.java   |   177 +-
 .../pdmodel/graphics/shading/TensorPatch.java      |    20 +-
 .../shading/TriangleBasedShadingContext.java       |   161 +-
 .../graphics/shading/Type1ShadingContext.java      |   131 +-
 .../graphics/shading/Type1ShadingPaint.java        |    37 +-
 .../graphics/shading/Type4ShadingContext.java      |   190 +-
 .../graphics/shading/Type4ShadingPaint.java        |    29 +-
 .../graphics/shading/Type5ShadingContext.java      |    96 +-
 .../graphics/shading/Type5ShadingPaint.java        |    37 +-
 .../graphics/shading/Type6ShadingContext.java      |    41 +-
 .../graphics/shading/Type6ShadingPaint.java        |    30 +-
 .../graphics/shading/Type7ShadingContext.java      |    39 +-
 .../graphics/shading/Type7ShadingPaint.java        |    30 +-
 .../pdfbox/pdmodel/graphics/shading/Vertex.java    |    12 +-
 .../graphics/state/PDExtendedGraphicsState.java    |   680 -
 .../pdmodel/graphics/state/PDGraphicsState.java    |   668 -
 .../pdfbox/pdmodel/graphics/state/PDSoftMask.java  |   182 -
 .../pdfbox/pdmodel/graphics/state/PDTextState.java |   234 -
 .../pdmodel/graphics/state/RenderingIntent.java    |    84 -
 .../pdmodel/graphics/state/RenderingMode.java      |   120 -
 .../pdfbox/pdmodel/graphics/state/package.html     |    25 -
 .../pdmodel/graphics/xobject/CompositeImage.java   |   156 +
 .../pdfbox/pdmodel/graphics/xobject/PDCcitt.java   |   814 +
 .../pdmodel/graphics/xobject/PDInlinedImage.java   |   250 +
 .../pdfbox/pdmodel/graphics/xobject/PDJpeg.java    |   565 +
 .../pdmodel/graphics/xobject/PDPixelMap.java       |   473 +
 .../pdfbox/pdmodel/graphics/xobject/PDXObject.java |   242 +
 .../pdmodel/graphics/xobject/PDXObjectForm.java    |   209 +
 .../pdmodel/graphics/xobject/PDXObjectImage.java   |   525 +
 .../graphics/{image => xobject}/package.html       |     0
 .../pdmodel/interactive/action/PDAction.java       |   160 -
 .../interactive/action/PDActionFactory.java        |    45 +-
 .../pdmodel/interactive/action/PDActionGoTo.java   |    97 -
 .../pdmodel/interactive/action/PDActionHide.java   |    92 -
 .../interactive/action/PDActionImportData.java     |    77 -
 .../interactive/action/PDActionJavaScript.java     |    94 -
 .../pdmodel/interactive/action/PDActionLaunch.java |   234 -
 .../pdmodel/interactive/action/PDActionMovie.java  |    79 -
 .../pdmodel/interactive/action/PDActionNamed.java  |    69 -
 .../interactive/action/PDActionRemoteGoTo.java     |   161 -
 .../interactive/action/PDActionResetForm.java      |    93 -
 .../pdmodel/interactive/action/PDActionSound.java  |   230 -
 .../interactive/action/PDActionSubmitForm.java     |   118 -
 .../pdmodel/interactive/action/PDActionThread.java |   114 -
 .../pdmodel/interactive/action/PDActionURI.java    |   126 -
 .../interactive/action/PDAdditionalActions.java    |    26 +-
 .../action/PDAnnotationAdditionalActions.java      |    28 +-
 .../action/PDDocumentCatalogAdditionalActions.java |    23 +-
 .../action/PDFormFieldAdditionalActions.java       |    40 +-
 .../action/PDPageAdditionalActions.java            |    28 +-
 .../interactive/action/PDURIDictionary.java        |    90 -
 .../interactive/action/PDWindowsLaunchParams.java  |   156 -
 .../pdmodel/interactive/action/type/PDAction.java  |   174 +
 .../interactive/action/type/PDActionGoTo.java      |    98 +
 .../action/type/PDActionJavaScript.java            |    88 +
 .../interactive/action/type/PDActionLaunch.java    |   234 +
 .../interactive/action/type/PDActionNamed.java     |    92 +
 .../action/type/PDActionRemoteGoTo.java            |   177 +
 .../interactive/action/type/PDActionURI.java       |   173 +
 .../interactive/action/type/PDURIDictionary.java   |   100 +
 .../action/type/PDWindowsLaunchParams.java         |   166 +
 .../pdmodel/interactive/action/type/package.html   |    25 +
 .../interactive/annotation/PDAnnotation.java       |   278 +-
 .../annotation/PDAnnotationFileAttachment.java     |    29 +-
 .../interactive/annotation/PDAnnotationLine.java   |   225 +-
 .../interactive/annotation/PDAnnotationLink.java   |   121 +-
 .../interactive/annotation/PDAnnotationMarkup.java |   206 +-
 .../interactive/annotation/PDAnnotationPopup.java  |    41 +-
 .../annotation/PDAnnotationRubberStamp.java        |    29 +-
 .../annotation/PDAnnotationSquareCircle.java       |   133 +-
 .../interactive/annotation/PDAnnotationText.java   |    60 +-
 .../annotation/PDAnnotationTextMarkup.java         |    49 +-
 .../annotation/PDAnnotationUnknown.java            |     9 +-
 .../interactive/annotation/PDAnnotationWidget.java |   188 +-
 .../PDAppearanceCharacteristicsDictionary.java     |   113 +-
 .../annotation/PDAppearanceDictionary.java         |   230 +-
 .../interactive/annotation/PDAppearanceEntry.java  |   116 -
 .../interactive/annotation/PDAppearanceStream.java |   167 +-
 .../annotation/PDBorderEffectDictionary.java       |    46 +-
 .../annotation/PDBorderStyleDictionary.java        |    65 +-
 .../annotation/PDExternalDataDictionary.java       |    30 +-
 .../digitalsignature/COSFilterInputStream.java     |   131 -
 .../digitalsignature/ExternalSigningSupport.java   |    46 -
 .../interactive/digitalsignature/PDPropBuild.java  |    27 +-
 .../digitalsignature/PDPropBuildDataDict.java      |    36 +-
 .../interactive/digitalsignature/PDSeedValue.java  |    58 +-
 .../digitalsignature/PDSeedValueMDP.java           |    23 +-
 .../digitalsignature/PDSeedValueTimeStamp.java     |    18 +-
 .../interactive/digitalsignature/PDSignature.java  |   807 +-
 .../digitalsignature/SignatureInterface.java       |    25 +-
 .../digitalsignature/SignatureOptions.java         |   118 +-
 .../digitalsignature/SigningSupport.java           |    66 -
 .../visible/PDFTemplateBuilder.java                |   133 +-
 .../visible/PDFTemplateCreator.java                |   133 +-
 .../visible/PDFTemplateStructure.java              |   194 +-
 .../visible/PDVisibleSigBuilder.java               |   332 +-
 .../visible/PDVisibleSigProperties.java            |    22 +-
 .../visible/PDVisibleSignDesigner.java             |   403 +-
 .../destination/PDDestination.java                 |    14 +-
 .../destination/PDNamedDestination.java            |    12 +-
 .../destination/PDPageDestination.java             |    53 +-
 .../destination/PDPageFitDestination.java          |     3 +-
 .../destination/PDPageFitHeightDestination.java    |     6 +-
 .../destination/PDPageFitRectangleDestination.java |    12 +-
 .../destination/PDPageFitWidthDestination.java     |     6 +-
 .../destination/PDPageXYZDestination.java          |     9 +-
 .../outline/PDDocumentOutline.java                 |    28 +-
 .../documentnavigation/outline/PDOutlineItem.java  |   239 +-
 .../outline/PDOutlineItemIterator.java             |    64 -
 .../documentnavigation/outline/PDOutlineNode.java  |   318 +-
 .../form/AppearanceGeneratorHelper.java            |   788 -
 .../pdmodel/interactive/form/AppearanceStyle.java  |   102 -
 .../pdmodel/interactive/form/FieldUtils.java       |   211 -
 .../pdmodel/interactive/form/PDAcroForm.java       |   718 +-
 .../pdmodel/interactive/form/PDAppearance.java     |  1064 +
 .../pdfbox/pdmodel/interactive/form/PDButton.java  |   420 -
 .../pdmodel/interactive/form/PDCheckBox.java       |   123 -
 .../pdmodel/interactive/form/PDCheckbox.java       |   155 +
 .../pdfbox/pdmodel/interactive/form/PDChoice.java  |   494 -
 .../pdmodel/interactive/form/PDChoiceButton.java   |    81 +
 .../pdmodel/interactive/form/PDChoiceField.java    |   193 +
 .../pdmodel/interactive/form/PDComboBox.java       |    94 -
 .../form/PDDefaultAppearanceString.java            |   332 -
 .../pdfbox/pdmodel/interactive/form/PDField.java   |   614 +-
 .../pdmodel/interactive/form/PDFieldFactory.java   |   190 +-
 .../pdmodel/interactive/form/PDFieldTree.java      |   107 -
 .../pdfbox/pdmodel/interactive/form/PDListBox.java |    88 -
 .../interactive/form/PDNonTerminalField.java       |   257 -
 .../pdmodel/interactive/form/PDPushButton.java     |    88 +-
 .../pdmodel/interactive/form/PDRadioButton.java    |   123 -
 .../interactive/form/PDRadioCollection.java        |   171 +
 .../pdmodel/interactive/form/PDSignature.java      |    80 +
 .../pdmodel/interactive/form/PDSignatureField.java |   255 +-
 .../pdmodel/interactive/form/PDTerminalField.java  |   240 -
 .../pdmodel/interactive/form/PDTextField.java      |   265 -
 .../pdfbox/pdmodel/interactive/form/PDTextbox.java |    73 +
 .../pdmodel/interactive/form/PDUnknownField.java   |    58 +
 .../pdmodel/interactive/form/PDVariableText.java   |   362 +-
 .../pdfbox/pdmodel/interactive/form/PDXFA.java     |   162 +
 .../pdmodel/interactive/form/PDXFAResource.java    |   163 -
 .../pdfbox/pdmodel/interactive/form/PlainText.java |   290 -
 .../interactive/form/PlainTextFormatter.java       |   287 -
 .../pdfbox/pdmodel/interactive/form/package.html   |     2 +-
 .../measurement/PDMeasureDictionary.java           |    22 +-
 .../measurement/PDNumberFormatDictionary.java      |    54 +-
 .../measurement/PDRectlinearMeasureDictionary.java |    62 +-
 .../measurement/PDViewportDictionary.java          |    26 +-
 .../interactive/pagenavigation/PDThread.java       |    17 +-
 .../interactive/pagenavigation/PDThreadBead.java   |    23 +-
 .../interactive/pagenavigation/PDTransition.java   |   189 -
 .../pagenavigation/PDTransitionDimension.java      |    37 -
 .../pagenavigation/PDTransitionDirection.java      |    73 -
 .../pagenavigation/PDTransitionMotion.java         |    36 -
 .../pagenavigation/PDTransitionStyle.java          |    29 -
 .../viewerpreferences/PDViewerPreferences.java     |    31 +-
 .../pdmodel/markedcontent/PDPropertyList.java      |    93 +
 .../apache/pdfbox/pdmodel/text/PDTextState.java    |   272 +
 .../org/apache/pdfbox/pdmodel/text/package.html    |    25 +
 .../pdfbox/persistence/util/COSHEXTable.java       |   557 +
 .../pdfbox/persistence/util/COSObjectKey.java      |   145 +
 .../apache/pdfbox/persistence/util/package.html    |    25 +
 .../org/apache/pdfbox/printing/Orientation.java    |    34 -
 .../org/apache/pdfbox/printing/PDFPageable.java    |   167 -
 .../org/apache/pdfbox/printing/PDFPrintable.java   |   261 -
 .../java/org/apache/pdfbox/printing/Scaling.java   |    37 -
 .../apache/pdfbox/rendering/CIDType0Glyph2D.java   |    85 -
 .../java/org/apache/pdfbox/rendering/Glyph2D.java  |    44 -
 .../org/apache/pdfbox/rendering/ImageType.java     |    67 -
 .../org/apache/pdfbox/rendering/PDFRenderer.java   |   225 -
 .../org/apache/pdfbox/rendering/PageDrawer.java    |  1609 --
 .../pdfbox/rendering/PageDrawerParameters.java     |    58 -
 .../java/org/apache/pdfbox/rendering/SoftMask.java |   211 -
 .../org/apache/pdfbox/rendering/TTFGlyph2D.java    |   171 -
 .../org/apache/pdfbox/rendering/TilingPaint.java   |   252 -
 .../pdfbox/rendering/TilingPaintFactory.java       |   154 -
 .../org/apache/pdfbox/rendering/Type1Glyph2D.java  |    88 -
 .../apache/pdfbox/text/LegacyPDFStreamEngine.java  |   337 -
 .../pdfbox/text/PDFMarkedContentExtractor.java     |   228 -
 .../org/apache/pdfbox/text/PDFTextStripper.java    |  2175 ---
 .../apache/pdfbox/text/PDFTextStripperByArea.java  |   168 -
 .../java/org/apache/pdfbox/text/TextPosition.java  |   869 -
 .../apache/pdfbox/text/TextPositionComparator.java |    84 -
 .../java/org/apache/pdfbox/util/BitFlagHelper.java |   104 +
 .../main/java/org/apache/pdfbox/util/Charsets.java |    48 -
 .../java/org/apache/pdfbox/util/DateConverter.java |   530 +-
 .../java/org/apache/pdfbox/util/ErrorLogger.java   |    58 +
 .../apache/pdfbox/util/ExtensionFileFilter.java    |    75 +
 .../src/main/java/org/apache/pdfbox/util/Hex.java  |   176 -
 .../java/org/apache/pdfbox/util/ICU4JImpl.java     |   159 +
 .../java/org/apache/pdfbox/util/ImageIOUtil.java   |   332 +
 .../org/apache/pdfbox/util/ImageParameters.java    |   316 +
 .../main/java/org/apache/pdfbox/util/JPEGUtil.java |    91 +
 .../java/org/apache/pdfbox/util/LayerUtility.java  |   311 +
 .../main/java/org/apache/pdfbox/util/MapUtil.java  |    51 +
 .../main/java/org/apache/pdfbox/util/Matrix.java   |   469 +-
 .../main/java/org/apache/pdfbox/util/MetaUtil.java |    77 +
 .../org/apache/pdfbox/util/NullOutputStream.java   |    42 +
 .../org/apache/pdfbox/util/NumberFormatUtil.java   |   174 -
 .../main/java/org/apache/pdfbox/util/Overlay.java  |   686 +
 .../org/apache/pdfbox/util/PDFCloneUtility.java    |   264 +
 .../org/apache/pdfbox/util/PDFHighlighter.java     |   230 +
 .../org/apache/pdfbox/util/PDFImageWriter.java     |   138 +
 .../pdfbox/util/PDFMarkedContentExtractor.java     |   270 +
 .../org/apache/pdfbox/util/PDFMergerUtility.java   |   725 +
 .../java/org/apache/pdfbox/util/PDFOperator.java   |   143 +
 .../org/apache/pdfbox/util/PDFStreamEngine.java    |   729 +
 .../java/org/apache/pdfbox/util/PDFText2HTML.java  |   422 +
 .../org/apache/pdfbox/util/PDFTextStripper.java    |  2093 ++
 .../apache/pdfbox/util/PDFTextStripperByArea.java  |   204 +
 .../java/org/apache/pdfbox/util/PageExtractor.java |   120 +
 .../org/apache/pdfbox/util/PositionWrapper.java    |   138 +
 .../java/org/apache/pdfbox/util/QuickSort.java     |     6 +-
 .../org/apache/pdfbox/util/ResourceLoader.java     |   171 +
 .../main/java/org/apache/pdfbox/util/Splitter.java |   292 +
 .../java/org/apache/pdfbox/util/StringUtil.java    |    39 +
 .../main/java/org/apache/pdfbox/util/TIFFUtil.java |   194 +
 .../java/org/apache/pdfbox/util/TextNormalize.java |   181 +
 .../java/org/apache/pdfbox/util/TextPosition.java  |   825 +
 .../apache/pdfbox/util/TextPositionComparator.java |    90 +
 .../main/java/org/apache/pdfbox/util/Vector.java   |    65 -
 .../main/java/org/apache/pdfbox/util/Version.java  |    58 -
 .../main/java/org/apache/pdfbox/util/XMLUtil.java  |    95 +
 .../pdfbox/util/filetypedetector/ByteTrie.java     |   134 -
 .../pdfbox/util/filetypedetector/FileType.java     |    57 -
 .../util/filetypedetector/FileTypeDetector.java    |   118 -
 .../util/operator/BeginMarkedContentSequence.java  |    56 +
 .../BeginMarkedContentSequenceWithProperties.java  |    61 +
 .../org/apache/pdfbox/util/operator/BeginText.java |    44 +
 .../pdfbox/util/operator/CloseAndStrokePath.java   |    47 +
 .../apache/pdfbox/util/operator/Concatenate.java   |    67 +
 .../util/operator/EndMarkedContentSequence.java    |    46 +
 .../org/apache/pdfbox/util/operator/EndText.java   |    42 +
 .../org/apache/pdfbox/util/operator/GRestore.java  |    57 +
 .../org/apache/pdfbox/util/operator/GSave.java     |    43 +
 .../org/apache/pdfbox/util/operator/Invoke.java    |    87 +
 .../apache/pdfbox/util/operator/MoveAndShow.java   |    47 +
 .../org/apache/pdfbox/util/operator/MoveText.java  |    63 +
 .../pdfbox/util/operator/MoveTextSetLeading.java   |    63 +
 .../org/apache/pdfbox/util/operator/NextLine.java  |    53 +
 .../pdfbox/util/operator/OperatorProcessor.java    |    73 +
 .../pdfbox/util/operator/SetCharSpacing.java       |    53 +
 .../util/operator/SetGraphicsStateParameters.java  |    52 +
 .../util/operator/SetHorizontalTextScaling.java    |    49 +
 .../pdfbox/util/operator/SetLineCapStyle.java      |    48 +
 .../pdfbox/util/operator/SetLineDashPattern.java   |    65 +
 .../pdfbox/util/operator/SetLineJoinStyle.java     |    48 +
 .../pdfbox/util/operator/SetLineMiterLimit.java    |    49 +
 .../apache/pdfbox/util/operator/SetLineWidth.java  |    49 +
 .../org/apache/pdfbox/util/operator/SetMatrix.java |    59 +
 .../pdfbox/util/operator/SetMoveAndShow.java       |    51 +
 .../util/operator/SetNonStrokingCMYKColor.java     |    55 +
 .../util/operator/SetNonStrokingCalRGBColor.java   |    51 +
 .../pdfbox/util/operator/SetNonStrokingColor.java  |   120 +
 .../util/operator/SetNonStrokingColorSpace.java    |    70 +
 .../util/operator/SetNonStrokingDeviceN.java       |    55 +
 .../util/operator/SetNonStrokingGrayColor.java     |    59 +
 .../util/operator/SetNonStrokingICCBasedColor.java |    53 +
 .../util/operator/SetNonStrokingIndexed.java       |    55 +
 .../util/operator/SetNonStrokingLabColor.java      |    49 +
 .../util/operator/SetNonStrokingPattern.java       |    66 +
 .../util/operator/SetNonStrokingRGBColor.java      |    55 +
 .../util/operator/SetNonStrokingSeparation.java    |    56 +
 .../pdfbox/util/operator/SetStrokingCMYKColor.java |    55 +
 .../util/operator/SetStrokingCalRGBColor.java      |    53 +
 .../pdfbox/util/operator/SetStrokingColor.java     |   120 +
 .../util/operator/SetStrokingColorSpace.java       |    73 +
 .../pdfbox/util/operator/SetStrokingDeviceN.java   |    55 +
 .../pdfbox/util/operator/SetStrokingGrayColor.java |    59 +
 .../util/operator/SetStrokingICCBasedColor.java    |    53 +
 .../pdfbox/util/operator/SetStrokingIndexed.java   |    55 +
 .../pdfbox/util/operator/SetStrokingLabColor.java  |    48 +
 .../pdfbox/util/operator/SetStrokingPattern.java   |    66 +
 .../pdfbox/util/operator/SetStrokingRGBColor.java  |    55 +
 .../util/operator/SetStrokingSeparation.java       |    56 +
 .../apache/pdfbox/util/operator/SetTextFont.java   |    79 +
 .../pdfbox/util/operator/SetTextLeading.java       |    43 +
 .../pdfbox/util/operator/SetTextRenderingMode.java |    58 +
 .../apache/pdfbox/util/operator/SetTextRise.java   |    58 +
 .../pdfbox/util/operator/SetWordSpacing.java       |    53 +
 .../org/apache/pdfbox/util/operator/ShowText.java  |    59 +
 .../apache/pdfbox/util/operator/ShowTextGlyph.java |    80 +
 .../{contentstream => util}/operator/package.html  |     0
 .../operator/pagedrawer/AppendRectangleToPath.java |    77 +
 .../util/operator/pagedrawer/BeginInlineImage.java |   120 +
 .../util/operator/pagedrawer/ClipEvenOddRule.java  |    64 +
 .../util/operator/pagedrawer/ClipNonZeroRule.java  |    64 +
 .../pagedrawer/CloseFillEvenOddAndStrokePath.java  |    48 +
 .../pagedrawer/CloseFillNonZeroAndStrokePath.java  |    49 +
 .../pdfbox/util/operator/pagedrawer/ClosePath.java |    62 +
 .../pdfbox/util/operator/pagedrawer/CurveTo.java   |    61 +
 .../pagedrawer/CurveToReplicateFinalPoint.java     |    58 +
 .../pagedrawer/CurveToReplicateInitialPoint.java   |    61 +
 .../pdfbox/util/operator/pagedrawer/EndPath.java   |    46 +
 .../pagedrawer/FillEvenOddAndStrokePath.java       |    54 +
 .../util/operator/pagedrawer/FillEvenOddRule.java  |    64 +
 .../pagedrawer/FillNonZeroAndStrokePath.java       |    54 +
 .../util/operator/pagedrawer/FillNonZeroRule.java  |    65 +
 .../pdfbox/util/operator/pagedrawer/Invoke.java    |   179 +
 .../pdfbox/util/operator/pagedrawer/LineTo.java    |    54 +
 .../pdfbox/util/operator/pagedrawer/MoveTo.java    |    66 +
 .../pdfbox/util/operator/pagedrawer/SHFill.java    |    64 +
 .../util/operator/pagedrawer/SetLineCapStyle.java  |    61 +
 .../operator/pagedrawer/SetLineDashPattern.java    |    80 +
 .../util/operator/pagedrawer/SetLineJoinStyle.java |    61 +
 .../operator/pagedrawer/SetLineMiterLimit.java     |    61 +
 .../util/operator/pagedrawer/SetLineWidth.java     |    60 +
 .../util/operator/pagedrawer/StrokePath.java       |    49 +
 .../operator/pagedrawer}/package.html              |     0
 pdfbox/src/main/javadoc/overview.html              |    25 -
 .../services/java.nio.charset.spi.CharsetProvider  |     1 +
 .../apache/pdfbox/resources/FontMapping.properties |    33 +
 .../resources/PDFBox_External_Fonts.properties     |    19 +
 .../resources/PDFMarkedContentExtractor.properties |    98 +
 .../pdfbox/resources/PDFTextStripper.properties    |    97 +
 .../apache/pdfbox/resources/PageDrawer.properties  |    92 +
 .../pdfbox/resources/additional_glyphlist.txt      |   160 +
 .../apache/pdfbox/resources/afm/Courier-Bold.afm   |   684 -
 .../pdfbox/resources/afm/Courier-BoldOblique.afm   |   684 -
 .../pdfbox/resources/afm/Courier-Oblique.afm       |   684 -
 .../org/apache/pdfbox/resources/afm/Courier.afm    |   684 -
 .../apache/pdfbox/resources/afm/Helvetica-Bold.afm |  5654 ------
 .../pdfbox/resources/afm/Helvetica-BoldOblique.afm |  5654 ------
 .../pdfbox/resources/afm/Helvetica-Oblique.afm     |  6102 ------
 .../org/apache/pdfbox/resources/afm/Helvetica.afm  |  6102 ------
 .../org/apache/pdfbox/resources/afm/MustRead.html  |    19 -
 .../org/apache/pdfbox/resources/afm/Symbol.afm     |   426 -
 .../org/apache/pdfbox/resources/afm/Times-Bold.afm |  5176 -----
 .../pdfbox/resources/afm/Times-BoldItalic.afm      |  4768 -----
 .../apache/pdfbox/resources/afm/Times-Italic.afm   |  5334 ------
 .../apache/pdfbox/resources/afm/Times-Roman.afm    |  4838 -----
 .../apache/pdfbox/resources/afm/ZapfDingbats.afm   |   450 -
 .../pdfbox/resources/glyphlist/additional.txt      |   146 -
 .../pdfbox/resources/glyphlist/glyphlist.txt       |  4327 -----
 .../pdfbox/resources/glyphlist/zapfdingbats.txt    |   248 -
 .../pdfbox/resources/icc/ISOcoated_v2_300_bas.icc  |   Bin 1053552 -> 0 bytes
 .../{version.properties => pdfbox.properties}      |     0
 .../apache/pdfbox/resources/text/BidiMirroring.txt |   604 -
 .../pdfbox/resources/ttf/Arial-BoldItalicMT.ttf    |   Bin 0 -> 63208 bytes
 .../apache/pdfbox/resources/ttf/Arial-BoldMT.ttf   |   Bin 0 -> 58716 bytes
 .../org/apache/pdfbox/resources/ttf/ArialMT.ttf    |   Bin 0 -> 65932 bytes
 .../resources/ttf/LiberationSans-Regular.ttf       |   Bin 350200 -> 0 bytes
 .../org/apache/pdfbox/ParallelParameterized.java   |    88 -
 .../src/test/java/org/apache/pdfbox/TestAll.java   |   147 +
 .../java/org/apache/pdfbox/TestExtractText.java    |    55 +
 .../test/java/org/apache/pdfbox/TestTextToPdf.java |    87 +
 .../org/apache/pdfbox/cos/PDFDocEncodingTest.java  |    93 -
 .../java/org/apache/pdfbox/cos/TestCOSBase.java    |    27 +-
 .../java/org/apache/pdfbox/cos/TestCOSFloat.java   |   569 +-
 .../java/org/apache/pdfbox/cos/TestCOSInteger.java |    11 +-
 .../java/org/apache/pdfbox/cos/TestCOSStream.java  |   162 -
 .../java/org/apache/pdfbox/cos/TestCOSString.java  |   253 +-
 .../org/apache/pdfbox/cos/TestCOSUpdateInfo.java   |    63 -
 .../pdfbox/encoding/PDFDocEncodingCharsetTest.java |    92 +
 .../java/org/apache/pdfbox/encoding/package.html   |    25 +
 .../pdfbox/encryption/TestPublicKeyEncryption.java |   137 +-
 .../encryption/TestSymmetricKeyEncryption.java     |   251 +-
 .../org/apache/pdfbox/filter/PredictorTest.java    |    88 -
 .../java/org/apache/pdfbox/filter/TestFilters.java |    29 +-
 .../java/org/apache/pdfbox/io/TestIOUtils.java     |     3 +-
 .../apache/pdfbox/io/TestRandomAccessBuffer.java   |   141 +-
 .../io/TestRandomAccessFileOutputStream.java       |   219 +
 .../pdfbox/io/TestRandomAccessOutputStream.java    |   118 -
 .../pdfbox/io/ccitt/AbstractCCITTFaxTestCase.java  |    68 +
 .../ccitt/TestCCITTFaxG31DDecodeInputStream.java   |   196 +
 .../apache/pdfbox/io/ccitt/TestPackedBitArray.java |    82 +
 .../java/org/apache/pdfbox/io/ccitt/package.html   |    25 +
 .../apache/pdfbox/multipdf/MergeAcroFormsTest.java |   118 -
 .../pdfbox/multipdf/MergeAnnotationsTest.java      |   127 -
 .../pdfbox/multipdf/PDFCloneUtilityTest.java       |   100 -
 .../pdfbox/multipdf/PDFMergerUtilityTest.java      |   180 -
 .../apache/pdfbox/multipdf/PageExtractorTest.java  |   107 -
 .../apache/pdfbox/multipdf/TestLayerUtility.java   |   213 -
 .../pdfparser/EndstreamOutputStreamTest.java       |    44 +-
 .../pdfbox/pdfparser/PDFStreamParserTest.java      |    21 +-
 .../pdfparser/TestNonSequentialPDFParser.java      |   107 +
 .../org/apache/pdfbox/pdfparser/TestPDFParser.java |   201 +-
 .../org/apache/pdfbox/pdmodel/PageLayoutTest.java  |    46 -
 .../java/org/apache/pdfbox/pdmodel/TestFDF.java    |    74 +-
 .../org/apache/pdfbox/pdmodel/TestPDDocument.java  |   142 +-
 .../pdfbox/pdmodel/TestPDDocumentCatalog.java      |   122 +-
 .../pdfbox/pdmodel/TestPDDocumentInformation.java  |    43 +-
 .../pdfbox/pdmodel/TestPDPageContentStream.java    |    99 -
 .../pdfbox/pdmodel/TestPDPageTransitions.java      |    76 -
 .../org/apache/pdfbox/pdmodel/TestPDPageTree.java  |    86 -
 .../pdmodel/common/PDIntegerNameTreeNode.java      |    61 -
 .../apache/pdfbox/pdmodel/common/PDStreamTest.java |   104 -
 .../pdfbox/pdmodel/common/TestEmbeddedFiles.java   |    37 +-
 .../pdfbox/pdmodel/common/TestPDNameTreeNode.java  |    16 +-
 .../pdmodel/common/TestPDNumberTreeNode.java       |    49 +-
 .../pdmodel/common/function/TestFunctions.java     |     2 +
 .../common/function/TestPDFunctionType4.java       |    51 +-
 .../common/function/type4/TestOperators.java       |     1 +
 .../pdmodel/common/function/type4/TestParser.java  |     1 +
 .../pdmodel/common/function/type4/Type4Tester.java |     4 +-
 .../pdmodel/edit/TestPDPageContentStream.java      |    96 +
 .../pdfbox/pdmodel/fdf/FDFAnnotationTest.java      |    63 -
 .../apache/pdfbox/pdmodel/fdf/FDFFieldTest.java    |   105 -
 .../org/apache/pdfbox/pdmodel/font/PDFontTest.java |   141 -
 .../pdfbox/pdmodel/font/PDSimpleFontTest.java      |    74 +
 .../pdfbox/pdmodel/font/TestFontEmbedding.java     |    98 -
 .../pdfbox/pdmodel/font/TestFontEncoding.java      |    63 -
 .../apache/pdfbox/pdmodel/font/TestTTFParser.java  |   115 +-
 .../pdmodel/graphics/color/PDColorStateTest.java   |    75 +
 .../pdmodel/graphics/color/PDDeviceCMYKTest.java   |    41 -
 .../pdmodel/graphics/color/PDICCBasedTest.java     |    21 +-
 .../pdfbox/pdmodel/graphics/color/PDLabTest.java   |    22 +-
 .../pdmodel/graphics/image/CCITTFactoryTest.java   |   269 -
 .../pdmodel/graphics/image/JPEGFactoryTest.java    |   220 -
 .../graphics/image/LosslessFactoryTest.java        |   388 -
 .../pdmodel/graphics/image/PDInlineImageTest.java  |   187 -
 .../pdmodel/graphics/image/ValidateXImage.java     |   155 -
 .../optionalcontent/TestOptionalContentGroups.java |    72 +-
 .../pdmodel/graphics/xobject/NullOutputStream.java |    42 +
 .../pdmodel/graphics/xobject/PDCcittTest.java      |   151 +
 .../pdmodel/graphics/xobject/PDJpegTest.java       |   370 +
 .../pdmodel/graphics/xobject/PDPixelMapTest.java   |   550 +
 .../pdfbox/pdmodel/graphics/xobject/PDUtils.java   |   128 +
 .../interactive/annotation/PDAnnotationTest.java   |    54 -
 .../interactive/annotation/package-info.java       |    21 -
 .../outline/PDDocumentOutlineTest.java             |    64 -
 .../outline/PDOutlineItemIteratorTest.java         |    68 -
 .../outline/PDOutlineItemTest.java                 |   191 -
 .../outline/PDOutlineNodeTest.java                 |   376 -
 .../interactive/form/AcroFormsRotationTest.java    |   114 -
 .../pdmodel/interactive/form/AlignmentTest.java    |   121 -
 .../interactive/form/ControlCharacterTest.java     |   197 -
 .../form/HandleDifferentDALevelsTest.java          |   127 -
 .../interactive/form/MultilineFieldsTest.java      |   104 -
 .../pdmodel/interactive/form/PDAcroFormTest.java   |   250 +-
 .../pdmodel/interactive/form/PDButtonTest.java     |   444 -
 .../pdmodel/interactive/form/PDChoiceTest.java     |    65 -
 .../form/PDDefaultAppearanceStringTest.java        |    74 -
 .../interactive/form/PDSignatureFieldTest.java     |    77 -
 .../pdmodel/interactive/form/PDTextFieldTest.java  |    70 -
 .../pdmodel/interactive/form/PlainTextTest.java    |    72 -
 .../pdmodel/interactive/form/TestCheckBox.java     |   119 -
 .../pdmodel/interactive/form/TestFields.java       |   148 +-
 .../pdmodel/interactive/form/TestListBox.java      |   231 -
 .../pdmodel/interactive/form/TestRadioButtons.java |   121 -
 .../pagenavigation/PDTransitionDirectionTest.java  |    47 -
 .../pagenavigation/PDTransitionTest.java           |   121 -
 .../apache/pdfbox/rendering/TestPDFToImage.java    |   403 -
 .../org/apache/pdfbox/rendering/TestRendering.java |    88 -
 .../test/java/org/apache/pdfbox/text/BidiTest.java |   303 -
 .../org/apache/pdfbox/text/TestTextStripper.java   |   628 -
 .../java/org/apache/pdfbox/util/MatrixTest.java    |    48 -
 .../apache/pdfbox/util/PDFCloneUtilityTest.java    |    97 +
 .../apache/pdfbox/util/PDFMergerUtilityTest.java   |   149 +
 .../org/apache/pdfbox/util/PageExtractorTest.java  |   104 +
 .../java/org/apache/pdfbox/util/TestDateUtil.java  |    80 +-
 .../java/org/apache/pdfbox/util/TestHexUtil.java   |    87 -
 .../org/apache/pdfbox/util/TestImageIOUtils.java   |   385 +
 .../org/apache/pdfbox/util/TestLayerUtility.java   |   222 +
 .../java/org/apache/pdfbox/util/TestMatrix.java    |    16 +-
 .../apache/pdfbox/util/TestNumberFormatUtil.java   |   201 -
 .../org/apache/pdfbox/util/TestPDFText2HTML.java   |    69 +
 .../org/apache/pdfbox/util/TestPDFToImage.java     |   281 +
 .../org/apache/pdfbox/util/TestTextStripper.java   |   556 +
 .../pdfbox/util/TestTextStripperPerformance.java   |   153 +
 .../test/resources/input/FC60_Times.pdf-sorted.txt |     2 +-
 pdfbox/src/test/resources/input/FC60_Times.pdf.txt |     2 +-
 .../test/resources/input/PDFBOX-2984-rotations.pdf |   245 -
 .../input/PDFBOX-2984-rotations.pdf-sorted.txt     |    12 -
 .../resources/input/PDFBOX-2984-rotations.pdf.txt  |    12 -
 pdfbox/src/test/resources/input/PDFBOX-3025.pdf    |   569 -
 .../resources/input/PDFBOX-3025.pdf-sorted.txt     |     1 -
 .../src/test/resources/input/PDFBOX-3025.pdf.txt   |     1 -
 .../test/resources/input/PDFBOX-3038-001033-p2.pdf |   Bin 56750 -> 0 bytes
 .../input/PDFBOX-3038-001033-p2.pdf-sorted.txt     |    25 -
 .../resources/input/PDFBOX-3038-001033-p2.pdf.txt  |    25 -
 .../test/resources/input/PDFBOX-3042-003177-p2.pdf |   Bin 394897 -> 0 bytes
 .../input/PDFBOX-3042-003177-p2.pdf-sorted.txt     |    24 -
 .../resources/input/PDFBOX-3042-003177-p2.pdf.txt  |    24 -
 .../input/PDFBOX-3044-010197-p5-ligatures.pdf      |   Bin 24624 -> 0 bytes
 .../PDFBOX-3044-010197-p5-ligatures.pdf-sorted.txt |    51 -
 .../input/PDFBOX-3044-010197-p5-ligatures.pdf.txt  |    51 -
 .../test/resources/input/PDFBOX-3053-reduced.pdf   |   Bin 50134 -> 0 bytes
 .../input/PDFBOX-3053-reduced.pdf-sorted.txt       |     2 -
 .../resources/input/PDFBOX-3053-reduced.pdf.txt    |     2 -
 .../resources/input/PDFBOX-3061-092465-reduced.pdf |   Bin 23266 -> 0 bytes
 .../PDFBOX-3061-092465-reduced.pdf-sorted.txt      |     1 -
 .../input/PDFBOX-3061-092465-reduced.pdf.txt       |     1 -
 .../test/resources/input/PDFBOX-3062-002207-p1.pdf |   Bin 52066 -> 0 bytes
 .../input/PDFBOX-3062-002207-p1.pdf-sorted.txt     |    26 -
 .../resources/input/PDFBOX-3062-002207-p1.pdf.txt  |    26 -
 .../test/resources/input/PDFBOX-3062-005717-p1.pdf |   Bin 11976 -> 0 bytes
 .../input/PDFBOX-3062-005717-p1.pdf-sorted.txt     |     9 -
 .../resources/input/PDFBOX-3062-005717-p1.pdf.txt  |    10 -
 ...62-N2MOQ7YZICIYGTPLQJAWJ4HLN6CCEMHZ-reduced.pdf |   Bin 111124 -> 0 bytes
 ...ICIYGTPLQJAWJ4HLN6CCEMHZ-reduced.pdf-sorted.txt |     2 -
 ...2MOQ7YZICIYGTPLQJAWJ4HLN6CCEMHZ-reduced.pdf.txt |     2 -
 .../resources/input/PDFBOX-3067-negativeTf.pdf     |   Bin 2459 -> 0 bytes
 .../input/PDFBOX-3067-negativeTf.pdf-sorted.txt    |     1 -
 .../resources/input/PDFBOX-3067-negativeTf.pdf.txt |     1 -
 ...23-ADSFWTRB3HBZBZKEVESVTBRZC2MNKZF5_reduced.pdf |   Bin 13363 -> 0 bytes
 ...3HBZBZKEVESVTBRZC2MNKZF5_reduced.pdf-sorted.txt |     1 -
 ...DSFWTRB3HBZBZKEVESVTBRZC2MNKZF5_reduced.pdf.txt |     1 -
 ...3127-RAU4G6QMOVRYBISJU7R6MOVZCRFUO7P4-VFont.pdf |   Bin 80944 -> 0 bytes
 ...QMOVRYBISJU7R6MOVZCRFUO7P4-VFont.pdf-sorted.txt |    16 -
 ...-RAU4G6QMOVRYBISJU7R6MOVZCRFUO7P4-VFont.pdf.txt |    14 -
 pdfbox/src/test/resources/input/PDFBOX-3195.pdf    |   115 -
 .../resources/input/PDFBOX-3195.pdf-sorted.txt     |     2 -
 .../src/test/resources/input/PDFBOX-3195.pdf.txt   |     2 -
 ...DFBOX-3498-Y5TLCWTIAE3FYDVJTV2TXRZGXLEDUNSW.pdf |   Bin 44136 -> 0 bytes
 ...Y5TLCWTIAE3FYDVJTV2TXRZGXLEDUNSW.pdf-sorted.txt |     1 -
 ...X-3498-Y5TLCWTIAE3FYDVJTV2TXRZGXLEDUNSW.pdf.txt |     1 -
 pdfbox/src/test/resources/input/allah2.pdf         |   Bin 0 -> 146975 bytes
 .../src/test/resources/input/allah2.pdf-sorted.txt |    12 +
 pdfbox/src/test/resources/input/allah2.pdf.txt     |    12 +
 .../src/test/resources/input/cweb.pdf-sorted.txt   |     4 +-
 pdfbox/src/test/resources/input/cweb.pdf.txt       |     4 +-
 .../src/test/resources/input/hello3.pdf-sorted.txt |     2 +-
 pdfbox/src/test/resources/input/hello3.pdf.txt     |     2 +-
 .../merge/PDFBox.GlobalResourceMergeTest.Doc01.pdf |   Bin 9511 -> 0 bytes
 .../merge/PDFBox.GlobalResourceMergeTest.Doc02.pdf |   282 -
 pdfbox/src/test/resources/input/merge/jpegrgb.pdf  |   Bin 41204 -> 0 bytes
 .../src/test/resources/input/merge/multitiff.pdf   |   Bin 2928 -> 0 bytes
 .../test/resources/input/rendering}/JBIG2Image.pdf |   Bin
 .../resources/input/rendering}/JPXTestCMYK.pdf     |     0
 .../resources/input/rendering}/JPXTestGrey.pdf     |   Bin
 .../test/resources/input/rendering}/JPXTestRGB.pdf |     0
 .../resources/input/rendering}/ccitt4-cib-test.pdf |   Bin
 .../test/resources/input/rendering}/jpeg_demo.pdf  |   Bin
 .../test/resources/input/rendering}/png_demo.pdf   |   Bin
 .../resources/input/rendering}/raw_image_demo.pdf  |   Bin
 pdfbox/src/test/resources/logging.properties       |     5 +-
 .../org/apache/pdfbox/pdfparser/MissingCatalog.pdf |    38 -
 .../org/apache/pdfbox/pdfparser/gdb-refcard.pdf    |   Bin 0 -> 76590 bytes
 .../org/apache/pdfbox/pdmodel/badpagelabels.pdf    |    87 -
 .../pdmodel/fdf/xfdf-test-document-annotations.xml |    69 -
 .../ccittg3-garbage-padded-fields-bigendian.tif    |   Bin 6554 -> 0 bytes
 .../image/ccittg3-garbage-padded-fields.tif        |   Bin 6554 -> 0 bytes
 .../pdfbox/pdmodel/graphics/xobject/bitonal.gif    |   Bin 0 -> 6182 bytes
 .../graphics/{image => xobject}/ccittg3.tif        |   Bin
 .../graphics/{image => xobject}/ccittg4.tif        |   Bin
 .../graphics/{image => xobject}/ccittg4multi.tif   |   Bin
 .../pdfbox/pdmodel/graphics/xobject/color.gif      |   Bin 0 -> 11035 bytes
 .../pdmodel/graphics/{image => xobject}/gif.gif    |   Bin
 .../pdmodel/graphics/{image => xobject}/jpeg.jpg   |   Bin
 .../graphics/{image => xobject}/jpeg256.jpg        |   Bin
 .../pdmodel/graphics/{image => xobject}/png.png    |   Bin
 .../interactive/form/AcroFormsBasicFields.pdf      |   Bin 170599 -> 0 bytes
 .../pdmodel/interactive/form/AcroFormsRotation.pdf |   Bin 42637 -> 0 bytes
 .../interactive/form/AcroFormsRotation.pdf-1.png   |   Bin 80737 -> 0 bytes
 .../interactive/form/AcroFormsRotation.pdf-2.png   |   Bin 83051 -> 0 bytes
 .../form/AlignmentTests-flattened-noRef.pdf-1.png  |   Bin 64491 -> 0 bytes
 .../form/AlignmentTests-flattened.pdf-1.png        |   Bin 64491 -> 0 bytes
 .../pdmodel/interactive/form/AlignmentTests.pdf    |   Bin 959227 -> 0 bytes
 .../interactive/form/AlignmentTests.pdf-1.png      |   Bin 89118 -> 0 bytes
 .../pdmodel/interactive/form/ControlCharacters.pdf |   Bin 43916 -> 0 bytes
 .../pdmodel/interactive/form/DifferentDALevels.pdf |   Bin 9021 -> 0 bytes
 .../pdmodel/interactive/form/MultilineFields.pdf   |   Bin 978227 -> 0 bytes
 .../interactive/form/MultilineFields.pdf-1.png     |   Bin 109739 -> 0 bytes
 .../pagenavigation/transitions_test.pdf            |   Bin 1795 -> 0 bytes
 .../pdfbox/pdmodel/page_tree_multiple_levels.pdf   |   Bin 2346 -> 0 bytes
 .../resources/org/apache/pdfbox/testPDFPackage.pdf |   Bin
 .../org/apache/pdfbox/text/BidiSample.pdf          |   Bin 21130 -> 0 bytes
 .../apache/pdfbox/text/BidiSample.pdf-sorted.txt   |     8 -
 .../org/apache/pdfbox/text/BidiSample.pdf.txt      |     8 -
 .../apache/pdfbox/ttf/LiberationSans-Regular.ttf   |   Bin 350200 -> 0 bytes
 pom.xml                                            |    25 +-
 preflight-app/pom.xml                              |    28 +-
 .../src/main/appended-resources/META-INF/LICENSE   |    38 +-
 .../src/main/appended-resources/META-INF/NOTICE    |     5 +-
 preflight/README.txt                               |     2 +-
 preflight/pom.xml                                  |   235 +-
 .../pdfbox/preflight/PreflightConfiguration.java   |    52 +-
 .../pdfbox/preflight/PreflightConstants.java       |   119 +-
 .../apache/pdfbox/preflight/PreflightContext.java  |   106 +-
 .../apache/pdfbox/preflight/PreflightDocument.java |    31 +-
 .../org/apache/pdfbox/preflight/PreflightPath.java |     8 +-
 .../apache/pdfbox/preflight/ValidationResult.java  |   155 +-
 .../org/apache/pdfbox/preflight/Validator_A1b.java |   142 +-
 .../preflight/action/AbstractActionManager.java    |    14 +-
 .../preflight/action/ActionManagerFactory.java     |    65 +-
 .../apache/pdfbox/preflight/action/GoToAction.java |    42 +-
 .../pdfbox/preflight/action/GoToRemoteAction.java  |   100 +-
 .../pdfbox/preflight/action/NamedAction.java       |    12 +-
 .../pdfbox/preflight/action/SubmitAction.java      |    12 +-
 .../pdfbox/preflight/action/ThreadAction.java      |    12 +-
 .../apache/pdfbox/preflight/action/UriAction.java  |    12 +-
 .../preflight/annotation/AnnotationValidator.java  |   181 +-
 .../annotation/AnnotationValidatorFactory.java     |    12 +-
 .../annotation/FreeTextAnnotationValidator.java    |    29 +-
 .../annotation/InkAnnotationValdiator.java         |    70 +
 .../annotation/InkAnnotationValidator.java         |    53 -
 .../annotation/LineAnnotationValidator.java        |    47 +-
 .../annotation/LinkAnnotationValidator.java        |    55 +-
 .../annotation/MarkupAnnotationValidator.java      |    23 +-
 .../annotation/PopupAnnotationValidator.java       |    22 +
 .../annotation/PrintMarkAnnotationValidator.java   |    22 +
 .../annotation/RubberStampAnnotationValidator.java |    24 +
 .../SquareCircleAnnotationValidator.java           |    55 +-
 .../annotation/TextAnnotationValidator.java        |    25 +
 .../annotation/TrapNetAnnotationValidator.java     |    23 +
 .../annotation/WidgetAnnotationValidator.java      |    32 +-
 .../annotation/pdfa/PDFAbAnnotationFactory.java    |     5 +-
 .../preflight/content/ContentStreamEngine.java     |   600 +
 .../preflight/content/ContentStreamWrapper.java    |   394 +
 .../preflight/content/PreflightContentStream.java  |   357 -
 .../preflight/content/PreflightStreamEngine.java   |   658 -
 .../pdfbox/preflight/content/StubOperator.java     |    28 +-
 .../preflight/exception/BodyParseException.java    |   109 +
 .../exception/CrossRefParseException.java          |    80 +
 .../preflight/exception/HeaderParseException.java  |    81 +
 .../MissingValidationProcessException.java         |     2 +-
 .../preflight/exception/PdfParseException.java     |   100 +
 .../preflight/exception/TrailerParseException.java |    82 +
 .../preflight/exception/ValidationException.java   |    18 +-
 .../preflight/font/CIDType0FontValidator.java      |     4 +-
 .../preflight/font/CIDType2FontValidator.java      |    10 +-
 .../preflight/font/DescendantFontValidator.java    |    65 +-
 .../pdfbox/preflight/font/FontValidator.java       |    21 +-
 .../pdfbox/preflight/font/SimpleFontValidator.java |    75 +-
 .../preflight/font/TrueTypeFontValidator.java      |    33 +-
 .../pdfbox/preflight/font/Type0FontValidator.java  |   123 +-
 .../pdfbox/preflight/font/Type1FontValidator.java  |    28 +-
 .../pdfbox/preflight/font/Type3FontValidator.java  |   287 +-
 .../font/container/CIDType0Container.java          |    82 +-
 .../font/container/CIDType2Container.java          |    70 +-
 .../preflight/font/container/FontContainer.java    |   143 +-
 .../font/container/TrueTypeContainer.java          |   174 +-
 .../preflight/font/container/Type0Container.java   |    28 +-
 .../preflight/font/container/Type1Container.java   |    91 +-
 .../preflight/font/container/Type3Container.java   |    13 +-
 .../font/descriptor/CIDType0DescriptorHelper.java  |    64 +-
 .../font/descriptor/CIDType2DescriptorHelper.java  |    55 +-
 .../font/descriptor/FontDescriptorHelper.java      |   155 +-
 .../font/descriptor/TrueTypeDescriptorHelper.java  |    67 +-
 .../font/descriptor/Type1DescriptorHelper.java     |   133 +-
 .../pdfbox/preflight/font/util/CIDToGIDMap.java    |    76 +
 .../font/util/FontMetaDataValidation.java          |    89 +-
 .../preflight/font/util/GlyphDescription.java      |    80 +
 .../pdfbox/preflight/font/util/GlyphDetail.java    |    33 +-
 .../pdfbox/preflight/font/util/GlyphException.java |    19 +-
 .../preflight/font/util/PDFAType3StreamParser.java |   182 +
 .../preflight/font/util/PeekInputStream.java       |    84 +
 .../preflight/font/util/PreflightType3Stream.java  |   164 -
 .../apache/pdfbox/preflight/font/util/Type1.java   |   470 +
 .../pdfbox/preflight/font/util/Type1Parser.java    |   724 +
 .../pdfbox/preflight/graphic/ColorSpaceHelper.java |     3 +-
 .../preflight/graphic/ColorSpaceHelperFactory.java |     2 +-
 .../pdfbox/preflight/graphic/ColorSpaces.java      |    16 +-
 .../preflight/graphic/DeviceColorSpaceHelper.java  |    47 +-
 .../preflight/graphic/ICCProfileWrapper.java       |    40 +-
 .../graphic/NoPatternColorSpaceHelper.java         |     7 +-
 .../graphic/StandardColorSpaceHelper.java          |   230 +-
 .../metadata/PDFAIdentificationValidation.java     |     9 +-
 .../RDFAboutAttributeConcordanceValidation.java    |     8 +-
 .../metadata/SynchronizedMetaDataValidation.java   |   304 +-
 .../pdfbox/preflight/parser/PreflightParser.java   |   451 +-
 .../pdfbox/preflight/parser/XmlResultParser.java   |    68 +-
 .../pdfbox/preflight/process/AbstractProcess.java  |    55 -
 .../process/AcroFormValidationProcess.java         |   114 +-
 .../process/BookmarkValidationProcess.java         |   199 +-
 .../process/CatalogValidationProcess.java          |   319 +-
 .../preflight/process/EmptyValidationProcess.java  |     1 -
 .../FileSpecificationValidationProcess.java        |     9 +-
 .../process/MetadataValidationProcess.java         |   152 +-
 .../process/PageTreeValidationProcess.java         |    23 +-
 .../preflight/process/StreamValidationProcess.java |    81 +-
 .../process/TrailerValidationProcess.java          |    45 +-
 .../preflight/process/XRefValidationProcess.java   |     6 +-
 .../process/reflect/ActionsValidationProcess.java  |     4 +-
 .../reflect/AnnotationValidationProcess.java       |     4 +-
 .../reflect/DestinationValidationProcess.java      |   125 -
 .../reflect/ExtGStateValidationProcess.java        |   212 +-
 .../process/reflect/FontValidationProcess.java     |    52 +-
 .../GraphicObjectPageValidationProcess.java        |    39 +-
 .../reflect/ResourcesValidationProcess.java        |   115 +-
 .../reflect/ShaddingPatternValidationProcess.java  |   113 +
 .../reflect/ShadingPatternValidationProcess.java   |   118 -
 .../reflect/SinglePageValidationProcess.java       |    84 +-
 .../reflect/TilingPatternValidationProcess.java    |    41 +-
 .../preflight/utils/ByteArrayDataSource.java       |     4 +-
 .../apache/pdfbox/preflight/utils/COSUtils.java    |   141 +-
 .../pdfbox/preflight/utils/ContextHelper.java      |    37 +-
 .../pdfbox/preflight/utils/FilterHelper.java       |    47 +-
 .../pdfbox/preflight/utils/PdfElementParser.java   |    73 +
 .../pdfbox/preflight/utils/RenderingIntents.java   |    12 +-
 .../preflight/xobject/AbstractXObjValidator.java   |    20 +-
 .../preflight/xobject/XObjFormValidator.java       |    35 +-
 .../preflight/xobject/XObjImageValidator.java      |    24 +-
 .../preflight/xobject/XObjPostscriptValidator.java |    20 +-
 .../pdfbox/preflight/xobject/XObjectValidator.java |     2 +-
 preflight/src/main/javacc/pdf_extractor.jj         |   119 +
 preflight/src/main/javacc/pdf_full_grammar.jj      |   546 +
 .../org/apache/pdfbox/preflight/Benchmark.java     |     6 +-
 .../pdfbox/preflight/TestInvalidDirectory.java     |     7 +-
 .../pdfbox/preflight/TestIsartorBavaria.java       |   288 -
 .../TestIsartorValidationFromClasspath.java        |   207 +
 .../apache/pdfbox/preflight/TestPDFBox3743.java    |    55 -
 .../preflight/TestPreflightConfiguration.java      |    24 +-
 .../apache/pdfbox/preflight/TestPreflightPath.java |     6 +-
 .../pdfbox/preflight/TestValidDirectory.java       |     7 +-
 .../action/pdfa1b/AbstractTestAction.java          |     9 +-
 .../preflight/action/pdfa1b/TestGotoAction.java    |     6 +-
 .../action/pdfa1b/TestGotoRemoteAction.java        |     2 +-
 .../preflight/action/pdfa1b/TestUriAction.java     |     8 +-
 .../integration/AbstractInvalidFileTester.java     |    10 +-
 .../preflight/integration/TestInvalidFiles.java    |     2 +-
 .../integration/TestIsartorValidation.java         |     2 +-
 .../preflight/integration/TestValidFiles.java      |    12 +-
 .../preflight/metadata/TestMetadataFiles.java      |    28 +-
 .../TestSynchronizedMetadataValidation.java        |     6 +-
 .../preflight/parser/TestXmlResultParser.java      |    18 +-
 .../pdfbox/preflight/util/ByteArrayDataSource.java |    85 +
 .../pdfbox/preflight/util/IsartorPdfProvider.java  |    61 +
 .../pdfbox/preflight/util/NOCatalogDocument.java   |    47 +
 .../pdfbox/preflight/utils/TestCOSUtils.java       |    40 +-
 preflight/src/test/resources/PDFBOX-3743.pdf       |   Bin 12451 -> 0 bytes
 preflight/src/test/resources/expected_errors.txt   |   122 +-
 preflight/src/test/resources/log4j.xml             |    27 +-
 tools/pom.xml                                      |    96 -
 .../pdfbox/tools/DecompressObjectstreams.java      |   132 -
 .../main/java/org/apache/pdfbox/tools/Decrypt.java |   189 -
 .../main/java/org/apache/pdfbox/tools/Encrypt.java |   248 -
 .../java/org/apache/pdfbox/tools/ExportFDF.java    |   146 -
 .../java/org/apache/pdfbox/tools/ExportXFDF.java   |   147 -
 .../org/apache/pdfbox/tools/ExtractImages.java     |   379 -
 .../java/org/apache/pdfbox/tools/ExtractText.java  |   338 -
 .../java/org/apache/pdfbox/tools/ImportFDF.java    |   151 -
 .../java/org/apache/pdfbox/tools/ImportXFDF.java   |   144 -
 .../java/org/apache/pdfbox/tools/OverlayPDF.java   |   191 -
 .../main/java/org/apache/pdfbox/tools/PDFBox.java  |   142 -
 .../java/org/apache/pdfbox/tools/PDFMerger.java    |    87 -
 .../java/org/apache/pdfbox/tools/PDFSplit.java     |   236 -
 .../java/org/apache/pdfbox/tools/PDFText2HTML.java |   415 -
 .../java/org/apache/pdfbox/tools/PDFToImage.java   |   323 -
 .../java/org/apache/pdfbox/tools/PrintPDF.java     |   193 -
 .../java/org/apache/pdfbox/tools/TextToPDF.java    |   430 -
 .../main/java/org/apache/pdfbox/tools/Version.java |    75 -
 .../org/apache/pdfbox/tools/WriteDecodedDoc.java   |   198 -
 .../apache/pdfbox/tools/imageio/ImageIOUtil.java   |   319 -
 .../org/apache/pdfbox/tools/imageio/JPEGUtil.java  |    95 -
 .../org/apache/pdfbox/tools/imageio/MetaUtil.java  |    80 -
 .../org/apache/pdfbox/tools/imageio/TIFFUtil.java  |   194 -
 .../org/apache/pdfbox/tools/TestExtractText.java   |    55 -
 .../org/apache/pdfbox/tools/TestPDFText2HTML.java  |    73 -
 .../org/apache/pdfbox/tools/TestTextToPdf.java     |    83 -
 .../pdfbox/tools/imageio/TestImageIOUtils.java     |   401 -
 tools/src/test/resources/logging.properties        |    25 -
 war/pom.xml                                        |    42 +
 war/src/main/webapp/WEB-INF/web.xml                |    23 +
 war/src/main/webapp/bookmarks.xml                  |    28 +
 war/src/main/webapp/highlight.jsp                  |    47 +
 war/src/main/webapp/index.html                     |    63 +
 xmpbox/README.txt                                  |     2 +-
 xmpbox/pom.xml                                     |    71 +-
 .../main/java/org/apache/xmpbox/DateConverter.java |   157 +-
 .../main/java/org/apache/xmpbox/XMPMetadata.java   |   283 +-
 .../main/java/org/apache/xmpbox/XmpConstants.java  |    48 -
 .../org/apache/xmpbox/schema/DublinCoreSchema.java |    56 +-
 .../java/org/apache/xmpbox/schema/ExifSchema.java  |   333 -
 .../xmpbox/schema/PDFAIdentificationSchema.java    |    30 +-
 .../org/apache/xmpbox/schema/PhotoshopSchema.java  |    40 +-
 .../java/org/apache/xmpbox/schema/TiffSchema.java  |   247 -
 .../org/apache/xmpbox/schema/XMPBasicSchema.java   |    42 +-
 .../xmpbox/schema/XMPMediaManagementSchema.java    |   128 +-
 .../xmpbox/schema/XMPRightsManagementSchema.java   |    55 +
 .../java/org/apache/xmpbox/schema/XMPSchema.java   |   461 +-
 .../org/apache/xmpbox/schema/XMPSchemaFactory.java |    14 +-
 .../org/apache/xmpbox/schema/XMPageTextSchema.java |    55 -
 .../xmpbox/type/AbstractComplexProperty.java       |     4 +-
 .../java/org/apache/xmpbox/type/AbstractField.java |    15 +-
 .../apache/xmpbox/type/AbstractSimpleProperty.java |    18 +-
 .../apache/xmpbox/type/AbstractStructuredType.java |     2 +-
 .../java/org/apache/xmpbox/type/ArrayProperty.java |    10 +-
 .../java/org/apache/xmpbox/type/Attribute.java     |     4 +-
 .../java/org/apache/xmpbox/type/BooleanType.java   |     4 +-
 .../org/apache/xmpbox/type/CFAPatternType.java     |    45 -
 .../java/org/apache/xmpbox/type/Cardinality.java   |     2 +-
 .../xmpbox/type/ComplexPropertyContainer.java      |    72 +-
 .../main/java/org/apache/xmpbox/type/DateType.java |    15 +-
 .../org/apache/xmpbox/type/DeviceSettingsType.java |    45 -
 .../org/apache/xmpbox/type/DimensionsType.java     |    45 -
 .../java/org/apache/xmpbox/type/FlashType.java     |    51 -
 .../org/apache/xmpbox/type/GPSCoordinateType.java  |    34 -
 .../java/org/apache/xmpbox/type/IntegerType.java   |     6 +-
 .../main/java/org/apache/xmpbox/type/OECFType.java |    49 -
 .../org/apache/xmpbox/type/PDFASchemaType.java     |     4 +-
 .../java/org/apache/xmpbox/type/PDFATypeType.java  |     2 +-
 .../apache/xmpbox/type/PropertiesDescription.java  |     4 +-
 .../java/org/apache/xmpbox/type/PropertyType.java  |     3 +-
 .../java/org/apache/xmpbox/type/RationalType.java  |    34 -
 .../main/java/org/apache/xmpbox/type/RealType.java |     6 +-
 .../main/java/org/apache/xmpbox/type/TextType.java |     1 -
 .../java/org/apache/xmpbox/type/TypeMapping.java   |   981 +-
 .../main/java/org/apache/xmpbox/type/Types.java    |    15 +-
 .../main/java/org/apache/xmpbox/xml/DomHelper.java |     8 +-
 .../java/org/apache/xmpbox/xml/DomXmpParser.java   |  1785 +-
 .../org/apache/xmpbox/xml/PdfaExtensionHelper.java |   271 +-
 .../java/org/apache/xmpbox/xml/XmpSerializer.java  |    85 +-
 .../java/org/apache/xmpbox/DateConverterTest.java  |   102 -
 .../apache/xmpbox/DoubleSameTypeSchemaTest.java    |     4 +-
 .../xmpbox/TestValidatePermitedMetadata.java       |   129 -
 .../apache/xmpbox/TestXMPWithDefinedSchemas.java   |     2 +-
 .../java/org/apache/xmpbox/XMPMetaDataTest.java    |     5 +-
 .../apache/xmpbox/parser/DeserializationTest.java  |     3 +-
 .../apache/xmpbox/schema/AbstractSchemaTester.java |   509 +-
 .../xmpbox/schema/AbstractXMPSchemaTest.java       |     4 +-
 .../apache/xmpbox/schema/AdobePDFErrorsTest.java   |     3 +-
 .../xmpbox/schema/BasicJobTicketSchemaTest.java    |    22 +-
 .../org/apache/xmpbox/schema/DublinCoreTest.java   |     5 +-
 .../schema/PDFAIdentificationOthersTest.java       |     3 +-
 .../apache/xmpbox/schema/PhotoshopSchemaTest.java  |     9 +-
 .../java/org/apache/xmpbox/schema/TestExifXmp.java |    68 -
 .../xmpbox/schema/XMPMediaManagementTest.java      |     2 +-
 .../org/apache/xmpbox/schema/XMPSchemaTest.java    |    23 +-
 .../xmpbox/type/AbstractStructuredTypeTester.java  |   299 +-
 .../org/apache/xmpbox/type/AbstractTypeTester.java |   140 -
 .../java/org/apache/xmpbox/type/AttributeTest.java |     3 +-
 .../xmpbox/type/TestAbstractStructuredType.java    |     4 +-
 .../org/apache/xmpbox/type/TestDerivedType.java    |   212 +-
 .../java/org/apache/xmpbox/type/TestJobType.java   |   135 +-
 .../java/org/apache/xmpbox/type/TestLayerType.java |   133 +-
 .../apache/xmpbox/type/TestResourceEventType.java  |   141 +-
 .../apache/xmpbox/type/TestResourceRefType.java    |   163 +-
 .../xmpbox/type/TestSimpleMetadataProperties.java  |    14 +-
 .../org/apache/xmpbox/type/TestThumbnailType.java  |   137 +-
 .../org/apache/xmpbox/type/TestVersionType.java    |   135 +-
 .../org/apache/xmpbox/type/TypeTestingHelper.java  |   134 +
 xmpbox/src/test/resources/permited_metadata.txt    |   205 -
 xmpbox/src/test/resources/validxmp/exif.xmp        |    46 -
 1851 files changed, 123903 insertions(+), 389338 deletions(-)

diff --cc debian/changelog
index 3f32139,0000000..a77beeb
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,326 -1,0 +1,322 @@@
- libpdfbox-java (1:2.0.6-1) UNRELEASED; urgency=medium
++libpdfbox-java (1:1.8.13-1) unstable; urgency=medium
 +
 +  * Team upload.
-   * New upstream version 2.0.6.
++  * New upstream version 1.8.13.
 +  * Switch to compat level 10.
 +  * Declare compliance with Debian Policy 4.0.0.
 +  * Use https for Format field.
-   * Drop 01-bouncycastle-compatibility.patch.
-   * Refresh 02-jar-packaging.patch and rename it to jar-packaging.patch.
-   * Drop jempbox package which is unsupported now and was removed upstream.
-   * Drop all unused patches that were not applied anyway.
-   * Add use-local-jars.patch and fix a bootstrapping issue with version 2.0.6.
-     Can be dropped after this upload.
-   * Ignore tools, debugger and debugger-app and preflight modules.
++  * get-orig-source: Use --download-current-version option.
++  * Ignore com.github.jai-imageio artifacts.
++  * Refresh 01-bouncycastle-compatibility.patch.
 +
-  -- Markus Koschany <apo at debian.org>  Fri, 30 Jun 2017 15:27:57 +0200
++ -- Markus Koschany <apo at debian.org>  Wed, 26 Jul 2017 22:13:10 +0200
 +
 +libpdfbox-java (1:1.8.12-1) unstable; urgency=high
 +
 +  * New upstream release
 +    - Fixes CVE-2016-2175: XML External Entity vulnerability
 +  * Build with maven-debian-helper instead of ant
 +  * Removed the non-free 'sRGB Color Space Profile.icm' file from the tarball
 +  * Merged the BouncyCastle patches
 +  * Standards-Version updated to 3.9.8 (no changes)
 +  * Use a secure Vcs-Git URL
 +
 + -- Emmanuel Bourg <ebourg at apache.org>  Wed, 01 Jun 2016 08:31:37 +0200
 +
 +libpdfbox-java (1:1.8.11+dfsg-1) unstable; urgency=medium
 +
 +  * debian/watch: add repacksuffix to get back +dfsg in the version.
 +  * Import upstream version 1.8.11+dfsg.
 +  * Refresh patches.
 +  * debian/copyright: drop stanza about debian/repack.stub which was
 +    removed in 1:1.8.10-1. Also drop now unneeded license paragraphs.
 +  * Update years of packaging copyright.
 +
 + -- gregor herrmann <gregoa at debian.org>  Sat, 23 Jan 2016 18:27:24 +0100
 +
 +libpdfbox-java (1:1.8.10-2) unstable; urgency=medium
 +
 +  * Team upload.
 +  * Add 05_bc1.51.patch to build against bouncycastle 1.51.
 +
 + -- tony mancill <tmancill at debian.org>  Mon, 07 Dec 2015 18:17:16 -0800
 +
 +libpdfbox-java (1:1.8.10-1) unstable; urgency=medium
 +
 +  * New upstream release.
 +    - Refreshed the patches
 +    - Adapted debian/*.poms to work with any version
 +  * Improved the reproducibility:
 +    - Set the locale when generating the javadoc
 +    - Removed the timestamp from pdfbox.version
 +  * Removed the unused build dependency on liblucene2-java
 +  * Changed the priority from extra to optional
 +  * Clean the upstream tarball using the Files-Excluded field
 +    in debian/copyright
 +  * Switch to debhelper level 9
 +
 + -- Emmanuel Bourg <ebourg at apache.org>  Wed, 18 Nov 2015 19:07:11 +0100
 +
 +libpdfbox-java (1:1.8.7+dfsg-1) unstable; urgency=medium
 +
 +  * New upstream release.
 +  * Refresh patches (offset, fuzz).
 +  * Update version number in debian/*.poms.
 +  * Use cgit URL for Vcs-Browser in debian/control.
 +  * Declare compliance with Debian Policy 3.9.6.
 +
 + -- gregor herrmann <gregoa at debian.org>  Fri, 19 Sep 2014 17:21:41 +0200
 +
 +libpdfbox-java (1:1.8.6+dfsg-1) unstable; urgency=medium
 +
 +  * New upstream release.
 +  * Update version number in debian/*.poms.
 +  * Refresh patches (offset).
 +
 + -- gregor herrmann <gregoa at debian.org>  Mon, 23 Jun 2014 17:28:59 +0200
 +
 +libpdfbox-java (1:1.8.5+dfsg-1) unstable; urgency=medium
 +
 +  * New upstream release.
 +  * Refresh build.xml.patch.
 +  * Update years of upstream copyright.
 +  * Update version number in debian/*.poms.
 +  * debian/copyright: update URL in Source field.
 +  * debian/control: update URL in Vcs-Browser field.
 +
 + -- gregor herrmann <gregoa at debian.org>  Fri, 02 May 2014 19:04:00 +0200
 +
 +libpdfbox-java (1:1.8.4+dfsg-1) unstable; urgency=medium
 +
 +  * New upstream release.
 +  * Update jar version in debian/*.poms.
 +  * Refresh build.xml.patch (fuzz due to version number).
 +  * Update years of packaging copyright.
 +  * Add pgpsigurlmangle and filenamemangle in debian/watch and
 +    debian/upstream/signing-key.asc.
 +
 + -- gregor herrmann <gregoa at debian.org>  Wed, 05 Feb 2014 19:09:51 +0100
 +
 +libpdfbox-java (1:1.8.3+dfsg-1) unstable; urgency=low
 +
 +  * New upstream release.
 +  * Remove another non-free file during repackaging,
 +    that appears in 1.8.3.
 +  * Refresh patches (offset).
 +  * Update debian/*.pom. Bump version in jar filenames.
 +  * Don't install empty examples directory.
 +  * Declare compliance with Debian Policy 3.9.5.
 +
 + -- gregor herrmann <gregoa at debian.org>  Fri, 29 Nov 2013 18:30:14 +0100
 +
 +libpdfbox-java (1:1.8.2+dfsg-2) unstable; urgency=low
 +
 +  * Updated bc-1.47.patch to also work with Bouncy Castle 1.49
 +  * Install the jars and the poms in /usr/share/maven-repo
 +  * Removed the test classes from the jars
 +
 + -- Emmanuel Bourg <ebourg at apache.org>  Mon, 22 Jul 2013 15:33:02 +0200
 +
 +libpdfbox-java (1:1.8.2+dfsg-1) unstable; urgency=low
 +
 +  * New upstream release.
 +  * Refresh build.xml.patch (offset).
 +  * Update years of upstream and packaging copyright.
 +  * Update filenames in .install and .links files.
 +  * Adjust to newer Bouncy Castle:
 +    - add patch bc-1.47.patch to handle changed method names
 +    - add build dependency on libbcpkix-java
 +    - make build dependencies on libbc.*-java versioned
 +    - add /usr/share/java/bcpkix.jar to CLASSPATH in debian/rules
 +    This fixes a not-yet-reported FTBFS bug.
 +  * debian/control:
 +    - set Standards-Version to 3.9.4 (no changes)
 +    - make URLs in Vcs-* files canonical
 +    - add Built-Using field to libpdfbox-java binary package
 +  * Update debian/repack.stub.
 +
 + -- gregor herrmann <gregoa at debian.org>  Sun, 02 Jun 2013 19:19:52 +0200
 +
 +libpdfbox-java (1:1.7.0+dfsg-4) unstable; urgency=low
 +
 +  * Fix installation of CMap tables during build:
 +    - debian/control:
 +      replace build-dependeny on removed packages cmap-adobe-* and
 +      gs-cjk-resource with their successor poppler-data.
 +    - debian/rules:
 +      adjust path to CMap files accordingly; and guard against future failures
 +      by using the idiomatic "find -print0 | xargs -r0" construct.
 +    Thanks to Lucas Nussbaum for the bug report.
 +    (Closes: #699254)
 +
 + -- gregor herrmann <gregoa at debian.org>  Tue, 29 Jan 2013 17:07:45 +0100
 +
 +libpdfbox-java (1:1.7.0+dfsg-3) unstable; urgency=low
 +
 +  * debian/libpdfbox-java.classpath: add libfontbox-java to manifest
 +  * debian/control: add javahelper to build-depends
 +
 + -- tony mancill <tmancill at debian.org>  Thu, 12 Jul 2012 19:27:17 -0700
 +
 +libpdfbox-java (1:1.7.0+dfsg-2) unstable; urgency=low
 +
 +  * debian/control: add dependency on libfontbox-java to libpdfbox-java.
 +    Thanks to Tom Parker for the bug report. (Closes: #680778)
 +
 + -- gregor herrmann <gregoa at debian.org>  Thu, 12 Jul 2012 12:20:11 -0600
 +
 +libpdfbox-java (1:1.7.0+dfsg-1) unstable; urgency=low
 +
 +  * New upstream release.
 +  * Refresh patches.
 +  * Update filename (versioned jar) in debian/*.{install,links} files.
 +  * Install new examples into libpdfbox-java-doc package.
 +  * Update years of upstream and packaging copyright, add new third-party
 +    copyright.
 +  * debian/copyright: update to Copyright-Format 1.0.
 +  * Update package descritpions according to new upstream wording.
 +
 + -- gregor herrmann <gregoa at debian.org>  Sat, 02 Jun 2012 03:51:29 +0200
 +
 +libpdfbox-java (1:1.6.0+dfsg-2) unstable; urgency=low
 +
 +  [ gregor herrmann ]
 +  * Update Vcs-* headers.
 +
 +  [ tony mancill ]
 +  * Update Maintainer field for Java team maintenance.
 +  * Add gregor to Uploaders.
 +  * Set Standards-Version to 3.9.3 (no changes).
 +
 + -- tony mancill <tmancill at debian.org>  Tue, 29 May 2012 11:20:57 -0700
 +
 +libpdfbox-java (1:1.6.0+dfsg-1) unstable; urgency=low
 +
 +  * New upstream release.
 +  * Refresh patches.
 +  * Set Standards-Version to 3.9.2 (no changes).
 +  * Bump debhelper compatibility level to 8.
 +  * Update filenames in debian/*.{install,links}.
 +  * Remove runtime dependency on JRE (thanks lintian).
 +
 + -- gregor herrmann <gregoa at debian.org>  Sat, 02 Jul 2011 18:12:58 +0200
 +
 +libpdfbox-java (1:1.5.0+dfsg-2) unstable; urgency=low
 +
 +  * libfontbox-java-doc: add Breaks/Replaces on libfontbox-java.
 +
 + -- gregor herrmann <gregoa at debian.org>  Thu, 31 Mar 2011 16:40:03 +0200
 +
 +libpdfbox-java (1:1.5.0+dfsg-1) unstable; urgency=low
 +
 +  [ gregor herrmann ]
 +  * New upstream release (closes: #618534).
 +  * debian/watch: update to new download location.
 +  * debian/repack.local, debian/clean and debian/rules: adjust paths to
 +    third-party resources.
 +  * Update debian/copyright.
 +  * Install RELEASE-NOTES.txt as upstream changelog.
 +  * Remove old patches; add new patch build.xml to build again against Debian
 +    libraries.
 +  * Remove javahelper support and build with ant.
 +  * Remove unused lintian override.
 +  * Adjust .install and .links files.
 +  * debian/control:
 +    - update homepage
 +    - update build dependencies
 +    - the upstream source now also includes JempBox and FontBox, create the
 +      libjempbox-java and libfontbox-java (and -doc) packages from the
 +      libpdfbox-java source package
 +    - add versioned Breaks on jabref
 +  * Register API docs with doc-base system.
 +
 +  [ tony mancill ]
-   * Add separate API doc packages libjempbox-java-doc and
++  * Add separate API doc packages libjempbox-java-doc and 
 +    libfontbox-java-doc.
 +
 + -- gregor herrmann <gregoa at debian.org>  Wed, 30 Mar 2011 20:18:16 +0200
 +
 +libpdfbox-java (1:0.7.3+dfsg-4) unstable; urgency=low
 +
 +  * debian/rules: Add ant properties to compile code with target JVM 1.4.
 +    Closes: #592118. Thanks to Artur Rona for forwarding this patch from
 +    Ubuntu.
 +  * More conversion to javahelper: change some files to use jh_* instead of
 +    dh_*.
 +  * Add a lintian override for a false positive warning about doc-base
 +    registration.
 +
 + -- gregor herrmann <gregoa at debian.org>  Sun, 22 Aug 2010 11:48:41 +0200
 +
 +libpdfbox-java (1:0.7.3+dfsg-3) unstable; urgency=low
 +
 +  [ gregor herrmann ]
 +  * debian/control: change build dependency from default-jdk-builddep to
 +    default-jdk.
 +  * Remove spurious hunks from 01_buildxml.patch, refresh other patches.
 +  * Adjust package description to reality (i.e. there are no command line
 +    tools included); thanks to Achim Gädke for the bug report
 +    (closes: #568936).
 +
 +  [ tony mancill ]
 +  * Bump standards version to 3.9.1 (no changes).
 +  * Depend on javahelper.
 +  * Convert to source format 3.0 (quilt); remove b-d on quilt.
 +
 + -- tony mancill <tmancill at debian.org>  Fri, 06 Aug 2010 17:47:17 -0700
 +
 +libpdfbox-java (1:0.7.3+dfsg-2) unstable; urgency=low
 +
 +  * Add back build dependency on gs-cjk-resource, now that it has moved to
 +    main.
 +  * debian/copyright: update formatting and years of packaging copyright.
 +  * Remove debian/dirs, dh_install takes care of it anyway.
 +
 + -- gregor herrmann <gregoa at debian.org>  Sun, 17 Jan 2010 17:43:46 +0100
 +
 +libpdfbox-java (1:0.7.3+dfsg-1) unstable; urgency=low
 +
 +  * Switch repacking framework from dh_wraporig to repack.sh; remove
 +    dh_wraporig part from debian/README.source.
 +  * Change repacking suffix to '+dfsg'; add epoch to version.
 +  * Drop build dependency on gs-cjk-resource and move package from contrib to
 +    main (closes: #548186). Remove note about the reason for being in contrib
 +    from debian/copyright.
 +  * Set Standards-Version to 3.8.3 (no changes).
 +  * Switch to debhelper 7 (debian/{control,compat,rules,clean}).
 +  * debian/control: (build) depend on default-jdk-builddep/
 +    default-jre-headless.
 +  * Install upstream changelog.
 +
 + -- gregor herrmann <gregoa at debian.org>  Sun, 27 Dec 2009 21:32:11 +0100
 +
 +libpdfbox-java (0.7.3.dfsg-3) unstable; urgency=low
 +
 +  * Change XS-Vcs-* fields to Vcs-*.
 +  * Set Standards-Version to 3.8.2: Rename debian/README.Debian-source to
 +    debian/README.source and mention quilt usage.
 +  * debian/rules: explicitly set JAVA_HOME; create install-stamp target.
 +  * Change debian/copyright to some version of the new machine-readable
 +    format.
 +  * Change patch system from dpatch to quilt.
 +  * debian/control: set Section to java.
 +  * Change my email address in debian/rules and debian/copyright.
 +  * debian/copyright: add a note why libpdfbox-java is in contrib; thanks to
 +    Bastien ROUCARIES for the bug report (closes: #539311).
 +  * debian/rules: add "-n" to the "cp" command.
 +
 + -- gregor herrmann <gregoa at debian.org>  Mon, 10 Aug 2009 18:39:40 +0200
 +
 +libpdfbox-java (0.7.3.dfsg-2) unstable; urgency=low
 +
 +  * Move upstream URL from the description to the new Homepage field.
 +  * Fix typo in short description, thanks to Marco van Zwetselaar
 +    (closes: #444772).
 +
 + -- gregor herrmann <gregor+debian at comodo.priv.at>  Sun, 30 Sep 2007 22:19:47 +0200
 +
 +libpdfbox-java (0.7.3.dfsg-1) unstable; urgency=low
 +
 +  * Initial release (closes: #404519).
 +
 + -- gregor herrmann <gregor+debian at comodo.priv.at>  Sun, 26 Aug 2007 18:12:52 +0200
diff --cc debian/control
index 0393423,0000000..90503e4
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,72 -1,0 +1,93 @@@
 +Source: libpdfbox-java
 +Section: java
 +Priority: optional
 +Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 +Uploaders: tony mancill <tmancill at debian.org>,
 +           gregor herrmann <gregoa at debian.org>,
 +           Emmanuel Bourg <ebourg at apache.org>
 +Build-Depends: debhelper (>= 10), maven-debian-helper
 +Build-Depends-Indep: default-jdk,
 +                     htmldoc-common,
 +                     javahelper,
 +                     junit4,
 +                     lcdf-typetools,
 +                     libbcmail-java (>= 1.47),
 +                     libbcpkix-java (>= 1.47),
 +                     libbcprov-java (>= 1.47),
 +                     libcommons-beanutils-java,
 +                     libcommons-logging-java,
 +                     libicu4j-java,
 +                     libmaven-javadoc-plugin-java,
 +                     poppler-data
 +Standards-Version: 4.0.0
 +Vcs-Git: https://anonscm.debian.org/git/pkg-java/libpdfbox-java.git
 +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/libpdfbox-java.git
 +Homepage: http://pdfbox.apache.org
 +
 +Package: libpdfbox-java
 +Architecture: all
 +Depends: ${misc:Depends},
 +         libfontbox-java
 +Breaks: jabref (<< 2.7~beta1+ds-4)
 +Built-Using: ${misc:Built-Using}
 +Description: PDF library for Java
 + The Apache PDFBox library is an open source Java tool for working with PDF
 + documents. This project allows creation of new PDF documents, manipulation
 + of existing documents and the ability to extract content from documents.
 + .
 + This package contains the library itself.
 +
 +Package: libpdfbox-java-doc
 +Architecture: all
 +Section: doc
 +Depends: ${misc:Depends}
 +Suggests: libpdfbox-java (= ${source:Version})
 +Description: PDF library for Java (documentation)
 + The Apache PDFBox library is an open source Java tool for working with PDF
 + documents. This project allows creation of new PDF documents, manipulation
 + of existing documents and the ability to extract content from documents.
 + .
 + This package contains the documentation for the library.
 +
++Package: libjempbox-java
++Architecture: all
++Depends: ${misc:Depends}
++Breaks: jabref (<< 2.7~beta1+ds-4)
++Description: XMP Compatible Java Library
++ The Apache JempBox library is an open source Java tool for working with  XMP
++ metadata.
++ .
++ This package contains the library itself.
++
++Package: libjempbox-java-doc
++Architecture: all
++Section: doc
++Depends: ${misc:Depends}
++Suggests: libjempbox-java (= ${source:Version}) 
++Description: XMP Compatible Java Library (documentation)
++ The Apache JempBox library is an open source Java tool for working with  XMP
++ metadata.
++ .
++ This package contains the documentation for the library.
++
 +Package: libfontbox-java
 +Architecture: all
 +Depends: ${misc:Depends}
 +Description: Java font library
 + The Apache FontBox library is an open source Java tool to obtain low level
 + information from font files.
 + .
 + This package contains the library itself.
 +
 +Package: libfontbox-java-doc
 +Architecture: all
 +Section: doc
 +Depends: ${misc:Depends}
- Suggests: libfontbox-java (= ${source:Version})
++Suggests: libfontbox-java (= ${source:Version}) 
 +Breaks: libfontbox-java (<< 1:1.5.0)
 +Replaces: libfontbox-java (<< 1:1.5.0)
 +Description: Java font library (Documentation)
 + The Apache FontBox library is an open source Java tool to obtain low level
 + information from font files.
 + .
 + This package contains the documentation for the library.
diff --cc debian/copyright
index 0108a69,0000000..7862e8f
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,101 -1,0 +1,105 @@@
 +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 +Upstream-Name: Apache PDFBox
 +Upstream-Contact: The Apache Software Foundation
 +Source: https://pdfbox.apache.org/downloads.html
 +Files-Excluded: */pdfbox/src/main/resources/org/apache/pdfbox/resources/cmap/*
 +                */pdfbox/src/test/resources/org/apache/pdfbox/pdmodel/sRGB*
 +                */examples/src/main/resources/org/apache/pdfbox/resources/pdfa/sRGB*
 +Comment:
 + The tarball has been created by removing non-free cmap files
 + (we use the ones already in Debian instead) and non-free color
 + space profiles.
 + .
 + The content of the zip file mentions several other third-party copyright
 + holders but the relevant files are not included.
 +
 +Files: *
 +Copyright: 2010-2014, The Apache Software Foundation
 + 2002-2007, www.pdfbox.org
 + 2006-2007, www.jempbox.org
 +License: Apache-2.0
 +
++Files: pdfbox/src/main/java/org/apache/pdfbox/PdfDecompressor.java
++Copyright: 2010, adam
++License: Apache-2.0
++
 +Files: pdfbox/src/main/resources/org/apache/pdfbox/resources/ttf/*
 +Copyright: 2003, Bitstream, Inc.
 +License: other
 + Permission is hereby granted, free of charge, to any person obtaining a copy
 + of the fonts accompanying this license ("Fonts") and associated
 + documentation files (the "Font Software"), to reproduce and distribute the
 + Font Software, including without limitation the rights to use, copy, merge,
 + publish, distribute, and/or sell copies of the Font Software, and to permit
 + persons to whom the Font Software is furnished to do so, subject to the
 + following conditions:
 + .
 + The above copyright and trademark notices and this permission notice shall
 + be included in all copies of one or more of the Font Software typefaces.
 + .
 + The Font Software may be modified, altered, or added to, and in particular
 + the designs of glyphs or characters in the Fonts may be modified and
 + additional glyphs or characters may be added to the Fonts, only if the fonts
 + are renamed to names not containing either the words "Bitstream" or the word
 + "Vera".
 + .
 + This License becomes null and void to the extent applicable to Fonts or Font
 + Software that has been modified and is distributed under the "Bitstream
 + Vera" names.
 + .
 + The Font Software may be sold as part of a larger software package but no
 + copy of one or more of the Font Software typefaces may be sold by itself.
 + .
 + THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 + OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY,
 + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT,
 + TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME
 + FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING
 + ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES,
 + WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
 + THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE
 + FONT SOFTWARE.
 + .
 + Except as contained in this notice, the names of Gnome, the Gnome
 + Foundation, and Bitstream Inc., shall not be used in advertising or
 + otherwise to promote the sale, use or other dealings in this Font Software
 + without prior written authorization from the Gnome Foundation or Bitstream
 + Inc., respectively. For further information, contact: fonts at gnome dot
 + org.
 + .
 + http://www.bitstream.com
 +
 +Files: preflight/* xmpbox/*
 +Copyright: 2010, Atos Worldline SAS
 +License: Apache-2.0
 +
 +Files: debian/*
 +Copyright:
 + 2007-2016, gregor herrmann <gregoa at debian.org>
 + 2007-2016, tony mancill <tmancill at debian.org>
 +License: GPL-2+
 +
 +License: Apache-2.0
 + Licensed under the Apache License, Version 2.0 (the "License");
 + you may not use this file except in compliance with the License.
 + You may obtain a copy of the License at
 + .
 + http://www.apache.org/licenses/LICENSE-2.0
 + .
 + Unless required by applicable law or agreed to in writing, software
 + distributed under the License is distributed on an "AS IS" BASIS,
 + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 + See the License for the specific language governing permissions and
 + limitations under the License.
 + .
 + On Debian systems, the complete text of version 2 of the Apache License can
 + be found in `/usr/share/common-licenses/Apache-2.0'.
 +
 +License: GPL-2+
 + This program is free software; you can redistribute it and/or modify
 + it under the terms of the GNU General Public License as published by
 + the Free Software Foundation; either version 2, or (at your option)
 + any later version.
 + .
 + On Debian systems, the complete text of version 2 of the GNU General Public
 + License can be found in `/usr/share/common-licenses/GPL-2'.
diff --cc debian/libjempbox-java-doc.doc-base
index 0000000,0000000..c7636c0
new file mode 100644
--- /dev/null
+++ b/debian/libjempbox-java-doc.doc-base
@@@ -1,0 -1,0 +1,8 @@@
++Document: libjempbox-java-doc
++Title: JempBox API Documentation
++Abstract: Javadocs containing the JempBox API documentation.
++Section: Programming/Java
++
++Format: HTML
++Index: /usr/share/doc/libjempbox-java/api/index.html
++Files: /usr/share/doc/libjempbox-java/api/*.html
diff --cc debian/libjempbox-java-doc.install
index 0000000,0000000..062797d
new file mode 100644
--- /dev/null
+++ b/debian/libjempbox-java-doc.install
@@@ -1,0 -1,0 +1,1 @@@
++jempbox/target/apidocs/* usr/share/doc/libjempbox-java/api
diff --cc debian/libpdfbox-java.poms
index 00e8915,0000000..3fe0440
mode 100644,000000..100644
--- a/debian/libpdfbox-java.poms
+++ b/debian/libpdfbox-java.poms
@@@ -1,39 -1,0 +1,40 @@@
 +# List of POM files for the package
 +# Format of this file is:
 +# <path to pom file> [option]*
 +# where option can be:
 +#   --ignore: ignore this POM and its artifact if any
 +#   --ignore-pom: don't install the POM. To use on POM files that are created
 +#     temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms]
 +#   --no-parent: remove the <parent> tag from the POM
 +#   --package=<package>: an alternative package to use when installing this POM
 +#      and its artifact
 +#   --has-package-version: to indicate that the original version of the POM is the same as the upstream part
 +#      of the version for the package.
 +#   --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
 +#      during a clean operation with mh_cleanpom or mh_installpom
 +#   --artifact=<path>: path to the build artifact associated with this POM,
 +#      it will be installed when using the command mh_install. [mh_install]
 +#   --java-lib: install the jar into /usr/share/java to comply with Debian
 +#      packaging guidelines
 +#   --usj-name=<name>: name to use when installing the library in /usr/share/java
 +#   --usj-version=<version>: version to use when installing the library in /usr/share/java
 +#   --no-usj-versionless: don't install the versionless link in /usr/share/java
 +#   --dest-jar=<path>: the destination for the real jar.
 +#     It will be installed with mh_install. [mh_install]
 +#   --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
 +#   --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
 +#     Empty by default. [mh_install]
 +#
 +pom.xml --no-parent
 +pdfbox/pom.xml --no-parent --has-package-version --package=libpdfbox-java --java-lib
++jempbox/pom.xml --no-parent --has-package-version --package=libjempbox-java --java-lib
 +fontbox/pom.xml --no-parent --has-package-version --package=libfontbox-java --java-lib
 +parent/pom.xml --ignore
 +xmpbox/pom.xml --ignore
 +preflight/pom.xml --ignore
 +preflight-app/pom.xml --ignore
++lucene/pom.xml --ignore
++ant/pom.xml --ignore
++war/pom.xml --ignore
 +app/pom.xml --ignore
 +examples/pom.xml --ignore
- tools/pom.xml --ignore
- debugger/pom.xml --ignore
- debugger-app/pom.xml --ignore
diff --cc debian/maven.ignoreRules
index ad28f90,0000000..3a12b6e
mode 100644,000000..100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@@ -1,21 -1,0 +1,19 @@@
 +
 +com.levigo.jbig2 levigo-jbig2-imageio * * * *
 +commons-io commons-io * * * *
 +net.java.dev.jai-imageio jai-imageio-core-standalone * * * *
 +org.apache.ant ant-nodeps * * * *
++org.apache.felix maven-bundle-plugin * * * *
 +org.apache.maven.plugins maven-antrun-plugin * * * *
 +org.apache.maven.plugins maven-assembly-plugin * * * *
 +org.apache.maven.plugins maven-checkstyle-plugin * * * *
 +org.apache.maven.plugins maven-deploy-plugin * * * *
 +org.apache.maven.plugins maven-release-plugin * * * *
 +org.apache.maven.plugins maven-site-plugin * * * *
 +org.apache.maven.plugins maven-surefire-plugin * * * *
 +org.apache.maven.plugins maven-surefire-report-plugin * * * *
- org.apache.felix maven-bundle-plugin * * * *
 +org.apache.rat apache-rat-plugin * * * *
 +org.codehaus.mojo cobertura-maven-plugin * * * *
 +org.codehaus.mojo taglist-maven-plugin * * * *
- org.apache.maven.plugins maven-scm-publish-plugin * * * *
- com.googlecode.java-diff-utils diffutils * * * *
 +com.github.jai-imageio jai-imageio-core * * * *
 +com.github.jai-imageio jai-imageio-jpeg2000 * * * *
diff --cc debian/maven.publishedRules
index 33c1c6c,0000000..2d3eaff
mode 100644,000000..100644
--- a/debian/maven.publishedRules
+++ b/debian/maven.publishedRules
@@@ -1,4 -1,0 +1,5 @@@
 +
 +org.apache.pdfbox fontbox s/jar/bundle/ s/.*/debian/ * *
++org.apache.pdfbox jempbox s/jar/bundle/ s/.*/debian/ * *
 +org.apache.pdfbox pdfbox s/jar/bundle/ s/.*/debian/ * *
 +org.apache.pdfbox xmpbox s/jar/bundle/ s/.*/debian/ * *
diff --cc debian/patches/01-bouncycastle-compatibility.patch
index 0000000,0000000..fe88cea
new file mode 100644
--- /dev/null
+++ b/debian/patches/01-bouncycastle-compatibility.patch
@@@ -1,0 -1,0 +1,98 @@@
++Description: Fix the compatibility with the latest version of BouncyCastle in Debian
++Origin: vendor
++Bug: https://issues.apache.org/jira/browse/PDFBOX-1587
++     https://issues.apache.org/jira/browse/PDFBOX-1669
++Author: Gregor Herrmann <gregoa at debian.org>, Tony Mancill <tmancill at debian.org>
++--- a/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.java
+++++ b/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.java
++@@ -27,6 +27,7 @@ import java.security.KeyStoreException;
++ import java.security.MessageDigest;
++ import java.security.NoSuchAlgorithmException;
++ import java.security.NoSuchProviderException;
+++import java.security.PrivateKey;
++ import java.security.SecureRandom;
++ import java.security.cert.X509Certificate;
++ import java.util.Iterator;
++@@ -38,8 +39,8 @@ import org.apache.commons.logging.Log;
++ import org.apache.commons.logging.LogFactory;
++ 
++ import org.bouncycastle.asn1.ASN1InputStream;
++-import org.bouncycastle.asn1.DERObject;
++-import org.bouncycastle.asn1.DERObjectIdentifier;
+++import org.bouncycastle.asn1.ASN1Primitive;
+++import org.bouncycastle.asn1.ASN1ObjectIdentifier;
++ import org.bouncycastle.asn1.DEROctetString;
++ import org.bouncycastle.asn1.DEROutputStream;
++ import org.bouncycastle.asn1.DERSet;
++@@ -56,6 +57,7 @@ import org.bouncycastle.asn1.x509.TBSCer
++ import org.bouncycastle.cms.CMSEnvelopedData;
++ import org.bouncycastle.cms.CMSException;
++ import org.bouncycastle.cms.RecipientInformation;
+++import org.bouncycastle.cms.jcajce.JceKeyTransEnvelopedRecipient;
++ import org.apache.pdfbox.cos.COSArray;
++ import org.apache.pdfbox.cos.COSString;
++ import org.apache.pdfbox.exceptions.CryptographyException;
++@@ -185,7 +187,7 @@ public class PublicKeySecurityHandler ex
++                     if (ri.getRID().match(material.getCertificate()) && !foundRecipient)
++                     {
++                         foundRecipient = true;
++-                        envelopedData = ri.getContent(material.getPrivateKey(), "BC");
+++                        envelopedData = ri.getContent(new JceKeyTransEnvelopedRecipient((PrivateKey) material.getPrivateKey()).setProvider("BC"));
++                         break;
++                     }
++                 }
++@@ -239,10 +241,6 @@ public class PublicKeySecurityHandler ex
++         {
++             throw new CryptographyException(e);
++         }
++-        catch (NoSuchProviderException e)
++-        {
++-            throw new CryptographyException(e);
++-        }
++         catch (NoSuchAlgorithmException e)
++         {
++             throw new CryptographyException(e);
++@@ -311,7 +309,7 @@ public class PublicKeySecurityHandler ex
++                 pkcs7input[22] = two;
++                 pkcs7input[23] = one;
++ 
++-                DERObject obj = createDERForRecipient(pkcs7input, certificate);
+++                ASN1Primitive obj = createDERForRecipient(pkcs7input, certificate);
++ 
++                 ByteArrayOutputStream baos = new ByteArrayOutputStream();
++ 
++@@ -378,7 +376,7 @@ public class PublicKeySecurityHandler ex
++ 
++     }
++ 
++-    private DERObject createDERForRecipient(byte[] in, X509Certificate cert)
+++    private ASN1Primitive createDERForRecipient(byte[] in, X509Certificate cert)
++         throws IOException,
++                GeneralSecurityException
++     {
++@@ -389,7 +387,7 @@ public class PublicKeySecurityHandler ex
++         AlgorithmParameters algorithmparameters = algorithmparametergenerator.generateParameters();
++         ByteArrayInputStream bytearrayinputstream = new ByteArrayInputStream(algorithmparameters.getEncoded("ASN.1"));
++         ASN1InputStream asn1inputstream = new ASN1InputStream(bytearrayinputstream);
++-        DERObject derobject = asn1inputstream.readObject();
+++        ASN1Primitive derobject = asn1inputstream.readObject();
++         KeyGenerator keygenerator;
++         try
++         {
++@@ -409,13 +407,13 @@ public class PublicKeySecurityHandler ex
++         DEROctetString deroctetstring = new DEROctetString(abyte1);
++         KeyTransRecipientInfo keytransrecipientinfo = computeRecipientInfo(cert, secretkey.getEncoded());
++         DERSet derset = new DERSet(new RecipientInfo(keytransrecipientinfo));
++-        AlgorithmIdentifier algorithmidentifier = new AlgorithmIdentifier(new DERObjectIdentifier(s), derobject);
+++        AlgorithmIdentifier algorithmidentifier = new AlgorithmIdentifier(new ASN1ObjectIdentifier(s), derobject);
++         EncryptedContentInfo encryptedcontentinfo =
++             new EncryptedContentInfo(PKCSObjectIdentifiers.data, algorithmidentifier, deroctetstring);
++-        EnvelopedData env = new EnvelopedData(null, derset, encryptedcontentinfo, null);
+++        EnvelopedData env = new EnvelopedData(null, derset, encryptedcontentinfo, (org.bouncycastle.asn1.ASN1Set) null);
++         ContentInfo contentinfo =
++             new ContentInfo(PKCSObjectIdentifiers.envelopedData, env);
++-        return contentinfo.getDERObject();
+++        return contentinfo.toASN1Primitive();
++     }
++ 
++     private KeyTransRecipientInfo computeRecipientInfo(X509Certificate x509certificate, byte[] abyte0)
diff --cc debian/patches/02-jar-packaging.patch
index 0000000,0000000..45070f3
new file mode 100644
--- /dev/null
+++ b/debian/patches/02-jar-packaging.patch
@@@ -1,0 -1,0 +1,36 @@@
++Description: Change the packaging type since the bundle plugin is disabled
++Author: Emmanuel Bourg <ebourg at apache.org>
++Forwarded: not-needed
++--- a/fontbox/pom.xml
+++++ b/fontbox/pom.xml
++@@ -26,7 +26,7 @@
++   </parent>
++ 
++   <artifactId>fontbox</artifactId>
++-  <packaging>bundle</packaging>
+++  <packaging>jar</packaging>
++ 
++   <name>Apache FontBox</name>
++   <description>
++--- a/jempbox/pom.xml
+++++ b/jempbox/pom.xml
++@@ -26,7 +26,7 @@
++   </parent>
++ 
++   <artifactId>jempbox</artifactId>
++-  <packaging>bundle</packaging>
+++  <packaging>jar</packaging>
++ 
++   <name>Apache JempBox</name>
++   <description>
++--- a/pdfbox/pom.xml
+++++ b/pdfbox/pom.xml
++@@ -28,7 +28,7 @@
++     </parent>
++ 
++     <artifactId>pdfbox</artifactId>
++-    <packaging>bundle</packaging>
+++    <packaging>jar</packaging>
++ 
++     <name>Apache PDFBox</name>
++     <description>
diff --cc debian/patches/05_bc1.51.patch
index 0000000,0000000..7134e8b
new file mode 100644
--- /dev/null
+++ b/debian/patches/05_bc1.51.patch
@@@ -1,0 -1,0 +1,44 @@@
++Description: patch for bouncycastle 1.51
++Forwarded: no
++Author: tony mancill <tmancill at debian.org>
++Reviewed-by: gregor herrmann <gregoa at debian.org>
++Last-Update: 2016-01-23
++
++--- a/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.java
+++++ b/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.java
++@@ -27,6 +27,7 @@
++ import java.security.MessageDigest;
++ import java.security.NoSuchAlgorithmException;
++ import java.security.NoSuchProviderException;
+++import java.security.PrivateKey;
++ import java.security.SecureRandom;
++ import java.security.cert.X509Certificate;
++ import java.util.Iterator;
++@@ -56,6 +57,7 @@
++ import org.bouncycastle.cms.CMSEnvelopedData;
++ import org.bouncycastle.cms.CMSException;
++ import org.bouncycastle.cms.RecipientInformation;
+++import org.bouncycastle.cms.jcajce.JceKeyTransEnvelopedRecipient;
++ import org.apache.pdfbox.cos.COSArray;
++ import org.apache.pdfbox.cos.COSString;
++ import org.apache.pdfbox.exceptions.CryptographyException;
++@@ -185,7 +187,7 @@
++                     if (ri.getRID().match(material.getCertificate()) && !foundRecipient)
++                     {
++                         foundRecipient = true;
++-                        envelopedData = ri.getContent(material.getPrivateKey(), "BC");
+++                        envelopedData = ri.getContent(new JceKeyTransEnvelopedRecipient((PrivateKey) material.getPrivateKey()).setProvider("BC"));
++                         break;
++                     }
++                 }
++@@ -239,10 +241,6 @@
++         {
++             throw new CryptographyException(e);
++         }
++-        catch (NoSuchProviderException e)
++-        {
++-            throw new CryptographyException(e);
++-        }
++         catch (NoSuchAlgorithmException e)
++         {
++             throw new CryptographyException(e);
diff --cc debian/patches/build-subproject-docs.patch
index 0000000,0000000..50ddbb3
new file mode 100644
--- /dev/null
+++ b/debian/patches/build-subproject-docs.patch
@@@ -1,0 -1,0 +1,79 @@@
++Description: build javadocs for JempBox and FontBox
++Origin: vendor
++Forwarded: no
++Author: tony mancill <tmancill at debian.org>
++Last-Update: 2014-06-23
++
++--- a/pdfbox/build.xml
+++++ b/pdfbox/build.xml
++@@ -441,7 +441,7 @@
++ 
++     <!-- We use Maven to create the release packages. Keep this target for -->
++     <!-- now for backwards compatibility with old build scripts and habits -->
++-    <target name="dist" depends="pdfbox.clean,pdfbox.package,javadoc,build.NET,checkstyle"/>
+++    <target name="dist" depends="pdfbox.clean,pdfbox.package,pdfbox.javadoc,build.NET,checkstyle"/>
++ 
++     <target name="clean" depends="fontbox.clean,jempbox.clean,pdfbox.clean"/>
++ 
++@@ -840,7 +840,7 @@
++         </exec>
++     </target>
++ 
++-    <target name="javadoc" depends="pdfbox.compile" description="Create Javadocs">
+++    <target name="pdfbox.javadoc" depends="pdfbox.compile" description="Create Javadocs">
++         <javadoc packagenames="org.*"
++                sourcepath="${pdfbox.src.dir}"
++                destdir="${pdfbox.target.dir}/javadoc"
++@@ -863,4 +863,52 @@
++         </replaceregexp>
++     </target>
++ 
+++    <target name="fontbox.javadoc" depends="fontbox.compile" description="Create Javadocs">
+++        <property name="fontbox.release.name" value="${project.name}-${project.version}" />
+++        <javadoc packagenames="org.*"
+++               sourcepath="${fontbox.src.dir}"
+++               destdir="${fontbox.target.dir}/javadoc"
+++               author="true"
+++               version="true"
+++               use="true"
+++               windowtitle="${fontbox.release.name} API"
+++               doctitle="${project.name}"
+++               verbose="no"
+++               classpathref="fontbox.build.classpath"
+++               encoding="ISO-8859-1"
+++               breakiterator="yes">
+++            <link href="http://java.sun.com/j2se/1.5.0/docs/api/"/>
+++        </javadoc>
+++        <!-- PDFBOX-461: Disable javadoc creation timestamp -->
+++        <replaceregexp match="<!-- Generated by javadoc .* -->"
+++                       replace="<!-- Generated by javadoc -->"
+++                       flags="g" byline="true">
+++            <fileset dir="${fontbox.target.dir}/javadoc" includes="**/*.html" />
+++        </replaceregexp>
+++    </target>
+++
+++    <target name="jempbox.javadoc" depends="jempbox.compile" description="Create Javadocs">
+++        <property name="jempbox.release.name" value="${project.name}-${project.version}" />
+++        <javadoc packagenames="org.*"
+++               sourcepath="${jempbox.src.dir}"
+++               destdir="${jempbox.target.dir}/javadoc"
+++               author="true"
+++               version="true"
+++               use="true"
+++               windowtitle="${jempbox.release.name} API"
+++               doctitle="${project.name}"
+++               verbose="no"
+++               classpathref="jempbox.build.classpath"
+++               encoding="ISO-8859-1"
+++               breakiterator="yes">
+++            <link href="http://java.sun.com/j2se/1.5.0/docs/api/"/>
+++        </javadoc>
+++        <!-- PDFBOX-461: Disable javadoc creation timestamp -->
+++        <replaceregexp match="<!-- Generated by javadoc .* -->"
+++                       replace="<!-- Generated by javadoc -->"
+++                       flags="g" byline="true">
+++            <fileset dir="${jempbox.target.dir}/javadoc" includes="**/*.html" />
+++        </replaceregexp>
+++    </target>
+++
++ </project>
diff --cc debian/patches/build.xml.patch
index 0000000,0000000..2e74bf2
new file mode 100644
--- /dev/null
+++ b/debian/patches/build.xml.patch
@@@ -1,0 -1,0 +1,94 @@@
++Description: adjust for Debian:
++ - use Debian packages for building
++ - remove the test classes from the jars
++ - fix a variable
++Origin: vendor
++Forwarded: not-needed
++Author: gregor herrmann <gregoa at debian.org>
++Last-Update: 2016-01-23
++
++--- a/pdfbox/build.xml
+++++ b/pdfbox/build.xml
++@@ -24,8 +24,8 @@
++     <property name="build.compiler" value="modern" />
++ 
++     <property name="download.dir" value="download" />
++-    <property name="jar.dir" value="external" />
++-    <property name="tool.dir" value="tools" />
+++    <property name="jar.dir" value="/usr/share/java" />
+++    <property name="tool.dir" value="/usr/share/java" />
++     <property name="bin.dir" value="bin" />
++ 
++     <property name="project.version" value="1.8.11" />
++@@ -64,23 +64,23 @@
++     <property name="maven.repo1" value="http://repo1.maven.org/maven2" />
++     <property name="maven.repo2" value="http://repo2.maven.org/maven2" />
++ 
++-    <property name="bcprov.name" value="bcprov-jdk15-1.44" />
+++    <property name="bcprov.name" value="bcprov" />
++     <property name="bcprov.url" value="${maven.repo2}/org/bouncycastle/bcprov-jdk15/1.44/${bcprov.name}.jar" />
++     <property name="bcprov.jar" value="${jar.dir}/${bcprov.name}.jar" />
++ 
++-    <property name="bcmail.name" value="bcmail-jdk15-1.44" />
+++    <property name="bcmail.name" value="bcmail" />
++     <property name="bcmail.url" value="${maven.repo2}/org/bouncycastle/bcmail-jdk15/1.44/${bcmail.name}.jar" />
++     <property name="bcmail.jar" value="${jar.dir}/${bcmail.name}.jar" />
++ 
++-    <property name="junit.name" value="junit-4.8.1" />
+++    <property name="junit.name" value="junit4" />
++     <property name="junit.url" value="${maven.repo2}/junit/junit/4.8.1/${junit.name}.jar" />
++     <property name="junit.jar" value="${jar.dir}/${junit.name}.jar" />
++ 
++-    <property name="logging.name" value="commons-logging-1.1.1" />
+++    <property name="logging.name" value="commons-logging" />
++     <property name="logging.url" value="${maven.repo1}/commons-logging/commons-logging/1.1.1/${logging.name}.jar" />
++     <property name="logging.jar" value="${jar.dir}/${logging.name}.jar" />
++ 
++-    <property name="icu4j.name" value="icu4j-3.8" />
+++    <property name="icu4j.name" value="icu4j" />
++     <property name="icu4j.url" value="${maven.repo1}/com/ibm/icu/icu4j/3.8/${icu4j.name}.jar" />
++     <property name="icu4j.jar" value="${jar.dir}/${icu4j.name}.jar" />
++ 
++@@ -177,9 +177,11 @@
++         <javac srcdir="${pdfbox.src.dir}" destdir="${pdfbox.dest.dir}"
++                target="1.5" source="1.5" debug="on" deprecation="on"
++                classpathref="pdfbox.build.classpath" encoding="ISO-8859-1"/>
+++<!--
++         <javac srcdir="${pdfbox.test.dir}" destdir="${pdfbox.dest.dir}"
++                target="1.5" source="1.5" debug="on" deprecation="on"
++                classpathref="pdfbox.build.classpath" encoding="ISO-8859-1"/>
+++-->
++     </target>
++ 
++     <target name="fontbox.compile" depends="fontbox.init"
++@@ -188,9 +190,11 @@
++         <javac srcdir="${fontbox.src.dir}" destdir="${fontbox.dest.dir}"
++                target="1.5" source="1.5" debug="on" deprecation="on"
++                classpathref="fontbox.build.classpath" encoding="ISO-8859-1"/>
+++<!--
++         <javac srcdir="${fontbox.test.dir}" destdir="${fontbox.dest.dir}"
++                target="1.5" source="1.5" debug="on" deprecation="on"
++                classpathref="fontbox.build.classpath" encoding="ISO-8859-1"/>
+++-->
++     </target>
++ 
++     <target name="jempbox.compile" depends="jempbox.init"
++@@ -199,15 +203,17 @@
++         <javac srcdir="${jempbox.src.dir}" destdir="${jempbox.dest.dir}"
++                target="1.5" source="1.5" debug="on" deprecation="on"
++                classpathref="jempbox.build.classpath" encoding="ISO-8859-1"/>
+++<!--
++         <javac srcdir="${jempbox.test.dir}" destdir="${jempbox.dest.dir}"
++                target="1.5" source="1.5" debug="on" deprecation="on"
++                classpathref="jempbox.build.classpath" encoding="ISO-8859-1"/>
+++-->
++     </target>
++ 
++     <target name="test" depends="testextract,test-junit,testimage" description="Run all the junit tests"/>
++ 
++     <target name="find.adobefiles">
++-        <available property="adobefiles.found" file="${dest.dir}/org/apache/pdfbox/resources/cmap"/>
+++        <available property="adobefiles.found" file="${pdfbox.dest.dir}/org/apache/pdfbox/resources/cmap"/>
++     </target>
++ 
++     <target name="get.adobefiles"
diff --cc debian/patches/reproducible-build.patch
index 0000000,0000000..38edb88
new file mode 100644
--- /dev/null
+++ b/debian/patches/reproducible-build.patch
@@@ -1,0 -1,0 +1,40 @@@
++Description: Make the build reproducible
++Author: Emmanuel Bourg <ebourg at apache.org>
++Forwarded: not-needed
++--- a/pdfbox/build.xml
+++++ b/pdfbox/build.xml
++@@ -393,9 +393,7 @@
++     </target>
++ 
++     <target name="pdfbox.package" depends="get.externallibs.pdfbox,pdfbox.compile" description="Package pdfbox into a jar file">
++-        <propertyfile file="${pdfbox.resources.dir}/org/apache/pdfbox/resources/pdfbox.version">
++-            <entry  key="pdfbox.version" value="${pdfbox.release.name}"/>
++-        </propertyfile>
+++        <echo file="${pdfbox.resources.dir}/org/apache/pdfbox/resources/pdfbox.version">pdfbox.version=${pdfbox.release.name}</echo>
++ 
++         <jar jarfile="./${pdfbox.target.dir}/${pdfbox.release.name}.jar">
++             <fileset dir="${pdfbox.dest.dir}"/>
++@@ -852,6 +850,7 @@
++                verbose="no"
++                classpathref="pdfbox.build.classpath"
++                encoding="ISO-8859-1"
+++               locale="en"
++                breakiterator="yes">
++             <link href="http://java.sun.com/j2se/1.5.0/docs/api/"/>
++         </javadoc>
++@@ -876,6 +875,7 @@
++                verbose="no"
++                classpathref="fontbox.build.classpath"
++                encoding="ISO-8859-1"
+++               locale="en"
++                breakiterator="yes">
++             <link href="http://java.sun.com/j2se/1.5.0/docs/api/"/>
++         </javadoc>
++@@ -900,6 +900,7 @@
++                verbose="no"
++                classpathref="jempbox.build.classpath"
++                encoding="ISO-8859-1"
+++               locale="en"
++                breakiterator="yes">
++             <link href="http://java.sun.com/j2se/1.5.0/docs/api/"/>
++         </javadoc>
diff --cc debian/patches/series
index c040ff5,0000000..bddecbe
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,2 @@@
- use-local-jars.patch
- jar-packaging.patch
++01-bouncycastle-compatibility.patch
++02-jar-packaging.patch
diff --cc debian/rules
index 90273cb,0000000..bf20a8a
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,41 -1,0 +1,41 @@@
 +#!/usr/bin/make -f
 +
 +htmldoc-common_source := $(shell dpkg-query -f '$${source:Package} (= $${source:Version}), ' -W htmldoc-common)
 +lcdf-typetools_source := $(shell dpkg-query -f '$${source:Package} (= $${source:Version}), ' -W lcdf-typetools)
 +poppler-data_source   := $(shell dpkg-query -f '$${source:Package} (= $${source:Version}), ' -W poppler-data)
 +
 +%:
 +	dh $@ --buildsystem=maven --with javahelper
 +
 +override_dh_auto_configure:
 +	# replace what we delete in repacking. never used ...
 +	mkdir -p pdfbox/src/main/resources/org/apache/pdfbox/resources/cmap/
 +	find /usr/share/poppler/cMap -type f -print0 | xargs -r0 cp -n -t pdfbox/src/main/resources/org/apache/pdfbox/resources/cmap/
 +	dh_auto_configure
 +
 +override_dh_auto_build:
 +	# work around downloading adobe file
 +	mkdir -p pdfbox/target/classes/org/apache/pdfbox/resources/cmap
 +	cp pdfbox/src/main/resources/org/apache/pdfbox/resources/cmap/* pdfbox/target/classes/org/apache/pdfbox/resources/cmap/
 +
 +	mkdir -p pdfbox/target/classes/org/apache/pdfbox/resources/afm
 +	cp /usr/share/htmldoc/fonts/*.afm          pdfbox/target/classes/org/apache/pdfbox/resources/afm/
 +	cp /usr/share/lcdf-typetools/glyphlist.txt pdfbox/target/classes/org/apache/pdfbox/resources
 +
 +	dh_auto_build
 +
 +override_dh_installchangelogs:
 +	dh_installchangelogs $(CURDIR)/RELEASE-NOTES.txt
 +
 +override_dh_installexamples:
 +	dh_installexamples
 +	# empty directory since we remove the contents during repackaging.
 +	rmdir --verbose --parents --ignore-fail-on-non-empty $(CURDIR)/debian/libpdfbox-java-doc/usr/share/doc/libpdfbox-java-doc/examples/src/main/resources/org/apache/pdfbox/resources/pdfa
 +
 +	rm $(CURDIR)/debian/libpdfbox-java-doc/usr/share/doc/libpdfbox-java-doc/examples/pom.xml.save
 +
 +override_dh_gencontrol:
 +	dh_gencontrol -- "-Vmisc:Built-Using=$(htmldoc-common_source)$(lcdf-typetools_source)$(poppler-data_source)"
 +
 +get-orig-source:
- 	uscan --force-download --repack --rename --compression xz
++	uscan --download-current-version --force-download --repack --rename --compression xz

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libpdfbox-java.git



More information about the pkg-java-commits mailing list