nicholas clarke <> in NetarchiveSuite-Github

Fixed a merge compilation error.

Merge branch 'master' into h3-monitor

Fixed some bad settings paths. Show more configuration on index page.

H3 monitor work in progress. Added some threshold settings. Isolated I18N. Show total and search sizes in crawllog resource. Do not call h3Job.update() in job resource.

H3 monitor: Improved generic refactoring of text file indexer and searcher.

Merge branch 'master' into h3-monitor

Making text file indexer more generic.

Trivial class renames and preparation for cache frontier queue resource.

Improve separation between NAS and H3 monitor. Make SearchResult a bit more generic. Added some more javadoc. NAS-2638: CR-NAS-355 review follow-up.

NAS-2647: Overlooked 2 failing unit tests. Trivial fix.

Merge branch 'master' into NAS-2647

NAS-2647: Added missing header to source files.

  1. … 13 more files in changeset.
NAS-2647: CR-NAS-353 review follow-up.

  1. … 5 more files in changeset.
NAS-2647: Change menu generator to support non jsp. Improve Locale support in Servlet by parsing accept-languages http header. Better cookie logic.

  1. … 9 more files in changeset.
Forgot to change a dependency in the H3 monitor assembly so it was not built correctly after a rename.

Merge pull request #70 from netarchivesuite/NAS-2638-CSR

Nas 2638 csr

Fixed bootstrap dependency in h3 monitor module.

Merge branch 'master' into NAS-2638

Added the H3 monitor jar to the classpth of the harvester-core artifact manifest.

    • -17
    • +18
Encourage the H3 monitor artifact to make an appearance in the distribution zip artifact.

Minor changes to re-integrate separate H3 monitor modules into the existing GUIApplication.

Merge branch 'master' into NAS-2638

Merge, resolve, reset, fix, commit of changed from master to NAS-2638.

  1. … 275 more files in changeset.
Use NumberFormat on some of the Long values in the H3 job resource page. Fixed bug in nas.groovy related to a new function.

Work on separate delete from frontier resource. Changed H3 the on deployed on sbforge nexus.

Changed H3 version to 3.3.0-BDB-5.0.x.

Work on adding a separate delete resource page to the H3 monitor GUI.

Byterange was 1 byte to long. Job list does not call h3mon.init() any more, potential for long delay.

Removed page size limit in H3 monitor. Do not show H3 monitor information for done or failed jobs.