[open-ils-commits] [GIT] Evergreen ILS branch tags/rel_2_11_1 created. 0bce42dc54192ff1ed71b655da34a6b4c643349a
Evergreen Git
git at git.evergreen-ils.org
Wed Nov 16 17:25:05 EST 2016
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".
The branch, tags/rel_2_11_1 has been created
at 0bce42dc54192ff1ed71b655da34a6b4c643349a (commit)
- Log -----------------------------------------------------------------
commit 0bce42dc54192ff1ed71b655da34a6b4c643349a
Author: Dan Wells <dbw2 at calvin.edu>
Date: Wed Nov 16 16:53:48 2016 -0500
Bumping version numbers, adding Upgrade Script and Changelog
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/ChangeLog b/ChangeLog
index 1f72b2c..207c4fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,663 @@
-Evergreen doesn't keep a GNU-style ChangeLog except in release tarballs.
-Those seeking a change log are encouraged to run 'git log -v', or read
-it online at: http://git.evergreen-ils.org/?p=Evergreen.git;a=log
+commit 0ed97812e534d03dce007cad0144d81ac73a4e82
+Author: Dan Wells <dbw2 at calvin.edu>
+Date: Wed Nov 16 16:47:49 2016 -0500
+
+ bump up upgrade instructions for 2.11.1
+
+ Signed-off-by: Dan Wells <dbw2 at calvin.edu>
+
+21 41 docs/installation/server_upgrade.txt
+
+commit 4a562ae438ad2f20e500e731dc0acb96afe917fe
+Author: Dan Wells <dbw2 at calvin.edu>
+Date: Wed Nov 16 16:40:22 2016 -0500
+
+ bumping Perl version string for 2.11.1
+
+ Signed-off-by: Dan Wells <dbw2 at calvin.edu>
+
+1 1 Open-ILS/src/perlmods/lib/OpenILS.pm
+
+commit 8f9e0ee51b489238668079f9e7ab75ef92a41ce1
+Author: Galen Charlton <gmc at esilibrary.com>
+Date: Wed Nov 16 15:18:28 2016 -0500
+
+ 2.10.7-2.10.8 schema upgrade script
+
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+109 0 Open-ILS/src/sql/Pg/version-upgrade/2.10.7-2.10.8-upgrade-db.sql
+ create mode 100644 Open-ILS/src/sql/Pg/version-upgrade/2.10.7-2.10.8-upgrade-db.sql
+
+commit f6f11d9b8475bcd454aad600d8bdac395a4bbcd4
+Author: Galen Charlton <gmc at esilibrary.com>
+Date: Wed Nov 16 15:07:04 2016 -0500
+
+ update 2.10.8 release notes
+
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+3 1 docs/RELEASE_NOTES_2_10.adoc
+
+commit 27dcd0b34af18783757b966d0ca07faf5b3b409b
+Author: Galen Charlton <gmc at esilibrary.com>
+Date: Wed Nov 16 15:05:54 2016 -0500
+
+ updates to 2.11.1 release notes
+
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+4 4 docs/RELEASE_NOTES_2_11.adoc
+
+commit c41d389b2350bf0a1001de50a8f19c1ecc269822
+Author: Galen Charlton <gmc at esilibrary.com>
+Date: Wed Nov 16 14:55:02 2016 -0500
+
+ LP#1488655: stamp schema upgrade script
+
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+1 1 Open-ILS/src/sql/Pg/002.schema.config.sql
+94 0 Open-ILS/src/sql/Pg/upgrade/1003.schema.fix_metarecord_remapping.sql
+0 94 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.fix_metarecord_remapping.sql
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/1003.schema.fix_metarecord_remapping.sql
+ delete mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.fix_metarecord_remapping.sql
+
+commit 88a106fbadb5d84e9958e2da502d29986e2aa6f4
+Author: Galen Charlton <gmc at esilibrary.com>
+Date: Fri Oct 28 11:42:52 2016 -0400
+
+ LP#1488655: fix MR remapping upon fingerprint change
+
+ This patch ensures that if the fingerprint of a bib changes, the
+ bib will be moved to a new metarecord as opposed to ending up
+ as a member of more than one metarecord.
+
+ To test
+ -------
+ [1] Note the metarecord that a bib belongs to.
+ [2] Change the bib so that its fingerprint changes -- with stock
+ cbf settings, editing the 245$a should suffice.
+ [3] Note that it is now a component of two metarecords.
+ [4] Apply the patch.
+ [5] Repeat step 2 or force a reingest. The bib should now be part
+ of exactly one metarecord.
+
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+ Signed-off-by: Rogan Hamby <rogan.hamby at gmail.com>
+ Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
+
+1 1 Open-ILS/src/sql/Pg/030.schema.metabib.sql
+94 0 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.fix_metarecord_remapping.sql
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.fix_metarecord_remapping.sql
+
+commit a83cb2e90ae132110fb6b514e563c8096654f960
+Author: Galen Charlton <gmc at esilibrary.com>
+Date: Fri Oct 28 11:40:52 2016 -0400
+
+ LP#1488655: regression test for metarecord remapping
+
+ This patch contains pgTAP tests for verifying that when
+ the fingerprint of a bib is changed, it remains part of
+ exactly one metarecord (as opposed to being part of both
+ its old and new MRs).
+
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+ Signed-off-by: Rogan Hamby <rogan.hamby at gmail.com>
+ Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
+
+57 0 Open-ILS/src/sql/Pg/t/lp1488655_metarecord_remapping.pg
+ create mode 100644 Open-ILS/src/sql/Pg/t/lp1488655_metarecord_remapping.pg
+
+commit 22fae8ec300fc7fea64176e406f7f3f104bbd8db
+Author: Kathy Lussier <klussier at masslnc.org>
+Date: Wed Nov 16 14:40:51 2016 -0500
+
+ Docs: Adding 2.11.1 point release notes
+
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+65 8 docs/RELEASE_NOTES_2_11.adoc
+
+commit a9b31904858a1537d1399058038ba8fad3fe7f6b
+Author: Kathy Lussier <klussier at masslnc.org>
+Date: Wed Nov 16 14:16:51 2016 -0500
+
+ Docs: Adding 2.10.8 point release notes
+
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+52 0 docs/RELEASE_NOTES_2_10.adoc
+
+commit 8f9189fca7722165af7c8c9c778fa59179f13d49
+Author: Galen Charlton <gmc at esilibrary.com>
+Date: Wed Nov 16 12:18:29 2016 -0500
+
+ LP#1618183: more work backporting update to rel_2_10
+
+ This patch tries to ensure that if somebody running 2.10.8 (or a
+ later 2.10.x) attempts to upgrade to 2.11.1 or later using the
+ monolithic version upgrade scripts, the presence of the es-ES locale won't
+ abort the 2.10.7-2.11.0 update.
+
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+3 2 Open-ILS/src/sql/Pg/version-upgrade/2.10.7-2.11.0-upgrade-db.sql
+
+commit 6237dd57007a3743e78888ada43889cae689c098
+Author: Galen Charlton <gmc at esilibrary.com>
+Date: Wed Nov 16 12:14:35 2016 -0500
+
+ LP#1618183: placeholder schema update
+
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+1 1 Open-ILS/src/sql/Pg/002.schema.config.sql
+9 0 Open-ILS/src/sql/Pg/upgrade/1002.data.add-spanish-to-i18n-locale-2_10.sql
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/1002.data.add-spanish-to-i18n-locale-2_10.sql
+
+commit af7f5cc752a9ef730ea3231ac591f33cf3df1d8d
+Author: Galen Charlton <gmc at esilibrary.com>
+Date: Wed Nov 16 12:03:41 2016 -0500
+
+ forward-port 2.10.7-2.11.0 schema update
+
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+3351 0 Open-ILS/src/sql/Pg/version-upgrade/2.10.7-2.11.0-upgrade-db.sql
+ create mode 100644 Open-ILS/src/sql/Pg/version-upgrade/2.10.7-2.11.0-upgrade-db.sql
+
+commit 343f21c7aa2df3bb7f5d40ddff27e3a7a9921aaa
+Author: Galen Charlton <gmc at esilibrary.com>
+Date: Wed Nov 16 11:56:16 2016 -0500
+
+ LP#1618183: make upgrade not die if es-ES locale already exists
+
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+3 2 Open-ILS/src/sql/Pg/upgrade/1000.data.add-spanish-to-i18n-locale.sql
+
+commit 12a98bcc1b3f5981bbab8f8367e12f04363a5a37
+Author: Galen Charlton <gmc at esilibrary.com>
+Date: Wed Nov 16 11:46:40 2016 -0500
+
+ LP#1615736: stamping schema update
+
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+1 1 Open-ILS/src/sql/Pg/002.schema.config.sql
+7 0 Open-ILS/src/sql/Pg/upgrade/1001.schema.action_usr_circ_history_index.sql
+0 7 Open-ILS/src/sql/Pg/upgrade/XXXX.action_usr_circ_history_index.sql
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/1001.schema.action_usr_circ_history_index.sql
+ delete mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.action_usr_circ_history_index.sql
+
+commit 09f45b56fb72335817c087052bb1b50be0bf3bb6
+Author: Josh Stompro <stomproj at larl.org>
+Date: Mon Aug 29 14:07:48 2016 -0500
+
+ LP#1615736 - Add an index on the usr field of action.usr_circ_history.
+
+ Improve the performance of looking up a users circ history by adding
+ an index on action.usr_circ_history( usr ).
+
+ To test for performance improvements time doing a search for a particular
+ users history before and after the index is created.
+
+ Signed-off-by: Josh Stompro <stomproj at larl.org>
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+2 0 Open-ILS/src/sql/Pg/090.schema.action.sql
+7 0 Open-ILS/src/sql/Pg/upgrade/XXXX.action_usr_circ_history_index.sql
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.action_usr_circ_history_index.sql
+
+commit 35b822231a40bcf7e6e68e17bb28a15337e49879
+Author: Josh Stompro <stomproj at larl.org>
+Date: Tue Aug 16 09:55:21 2016 -0500
+
+ LP#1612873 - Fix text of notice message for history migration.
+
+ The notice text that was outputed for every 10000 circs processed
+ was labeled as users, which made the output confusing.
+
+ Signed-off-by: Josh Stompro <stomproj at larl.org>
+ Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+1 1 Open-ILS/src/sql/Pg/upgrade/0960.schema.decouple_co_history.sql
+1 1 Open-ILS/src/sql/Pg/version-upgrade/2.9.3-2.10.0-upgrade-db.sql
+
+commit 062bbe626d2f5faf7d6b3f1d7a1ab87f082d36a2
+Author: blake <blake at mobiusconsortium.org>
+Date: Thu Nov 3 10:42:24 2016 -0500
+
+ LP1638921 List display broken in 2.11
+
+ The badges feature added more data to an array which broke bib_record_list_via_search
+ Taking the first item in the array instead of the last item fixes the issue.
+ Thanks to miker and Dyrcona!
+
+ Signed-off-by: blake <blake at mobiusconsortium.org>
+ Signed-off-by: Mike Rylander <miker at esilibrary.com>
+
+1 1 Open-ILS/src/perlmods/lib/OpenILS/Application/AppUtils.pm
+
+commit b99837b6a52c1b8c1379e3b6b084855b1160d92b
+Author: Christine Morgan <cmorgan at noblenet.org>
+Date: Thu Sep 29 16:50:24 2016 -0400
+
+ lp1629075: Hide Permalink in Staff Client
+
+ This will hide the permalink in the staff client catalog.
+
+ Signed-off-by: Christine Morgan <cmorgan at noblenet.org>
+ Signed-off-by: Terran McCanna <tmccanna at georgialibraries.org>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+8 6 Open-ILS/src/templates/opac/parts/record/summary.tt2
+
+commit 0398f8d4778bdd0515e00bcad50b438d4717e9c5
+Author: Kathy Lussier <klussier at masslnc.org>
+Date: Mon May 23 20:09:34 2016 -0400
+
+ LP#1584807: Clicking column header should not unsort list
+
+ Clicking column headers in My Account cycled through ascending order,
+ descending order, and then unsorted. But unsorting a list after clicking a
+ header is unintutive to the user. Instead, it should toggle between ascending /
+ descending order.
+
+ Test plan
+ * Using the concerto dataset, log in as user 99999395984 / maes1234
+ * Go to the Items Out area of my account and click the title column header to
+ sort the list.
+ * The list will first sort alphabetically in ascending order, on a second click
+ will sort alphabetically in descending order, and, on a third click, will
+ return to the default sort order.
+ * After loading the patch, clicking the column header should only result in
+ sorting in ascending and descending order.
+
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+ Signed-off-by: Jason Stephenson <jason at sigio.com>
+
+0 2 Open-ILS/src/templates/opac/parts/myopac/column_sort_support.tt2
+
+commit 438ed0ebb669feb6d88cc88962ecbfe10c78f0ce
+Author: Dan Scott <dscott at laurentian.ca>
+Date: Tue Sep 6 13:53:02 2016 -0400
+
+ LP#1620750 Prevent log warning for uninit var in checkin_retarget()
+
+ If the retarget_mode variable is not initialized, then a warning is generated
+ in the logs every time an item is checked in. Avoid the warning by
+ short-circuiting before testing the value in the regex.
+
+ Signed-off-by: Dan Scott <dscott at laurentian.ca>
+ Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+1 1 Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm
+
+commit 5924d3a93aaf2ea85d996fb37c9638ec42bc93f8
+Author: Dan Scott <dscott at laurentian.ca>
+Date: Fri Sep 16 13:49:01 2016 -0400
+
+ LP#1624491 Avoid uninit var prox_cache during holds processing
+
+ open-ils.circ was logging a prox_cache hash value before it is
+ guaranteed to have been initialized. Instead, log messages _after_ they
+ have been initialized.
+
+ Signed-off-by: Dan Scott <dscott at laurentian.ca>
+ Signed-off-by: Mike Rylander <mrylander at gmail.com>
+
+3 6 Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
+
+commit 975057a5ec197a32e3c998d3badb2528fed789b1
+Author: Bill Erickson <berickxx at gmail.com>
+Date: Thu Sep 15 15:13:47 2016 -0400
+
+ LP#1282751 Credit card payment balance owed rounding fix
+
+ Avoid using Perl's int() when summing owed/paid totals for display in
+ the TPAC credit card payment form, since this can lead to rounding
+ errors.
+
+ A simple example of why we should not use int() when summing floating
+ point numbers:
+
+ perl -e 'print "no match\n" unless ((8.29 * 100) == int(8.29 * 100))';
+
+ Furthermore, use the relatively new fpsum() utility function for summing
+ floating point numbers so we can avoid having multiple versions of the
+ summing logic floating (*cough*) around (*cough cough*).
+
+ Signed-off-by: Bill Erickson <berickxx at gmail.com>
+ Signed-off-by: Mike Rylander <mrylander at gmail.com>
+
+9 7 Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm
+
+commit cc55a441abeba2a38e0dd61b45c72be48583e286
+Author: Ben Shum <ben at evergreener.net>
+Date: Mon Oct 24 12:05:31 2016 -0400
+
+ Docs: Update base system requirements for Evergreen
+
+ These memory values are woefully out of date for modern Evergreen installations.
+
+ Recommending also at least 2 GB of RAM for client workstation, though honestly,
+ more is probably better there too.
+
+ Also adding specific Linux distributions supported by this community instead of
+ just Linux.
+
+ And dropping specific Windows versions (especially since two out of the three
+ are no longer supported by Microsoft).
+
+ Signed-off-by: Ben Shum <ben at evergreener.net>
+
+4 4 docs/installation/system_requirements.txt
+
+commit 8fb0c2da35278859371c7e4bd1e3f7e18a940694
+Author: Dan Scott <dscott at laurentian.ca>
+Date: Sun Oct 2 17:28:05 2016 -0400
+
+ Docs: add mpm_prefork config for Apache 2.4 systems
+
+ We had only documented the Apache 2.2 stanzas for mpm_prefork, so include a
+ section for 2.4 that uses MaxRequestWorkers and MaxConnectionsPerChild. Given
+ the memory leaks that we have seen, suggest lower settings for these two values
+ (assuming that most sites will be serving a public catalogue instead of using a
+ separate discovery layer).
+
+ Also fix the weird formatting where Debian instructions were indented under a
+ Fedora section.
+
+ Also use dots for ordered bullets instead of renumbering all of the bullets
+ again.
+
+ Signed-off-by: Dan Scott <dscott at laurentian.ca>
+
+46 28 docs/installation/server_installation.txt
+
+commit a0e7908913b45a7902b9659c0228e2e9e8c6dfb0
+Author: Dan Scott <dscott at laurentian.ca>
+Date: Sun Oct 2 10:04:04 2016 -0400
+
+ Docs: set up default action_trigger_filters.json file
+
+ Given that action_trigger_runner.pl looks by default for a file called
+ action_trigger_filters.json, instruct people to create that file when they are
+ first setting up their system.
+
+ Signed-off-by: Dan Scott <dscott at laurentian.ca>
+
+20 2 docs/installation/server_installation.txt
+
+commit b5c1603f9b0d5dd79beb376fc77a5e69cd515c24
+Author: Kathy Lussier <klussier at masslnc.org>
+Date: Thu Sep 29 13:50:40 2016 -0400
+
+ LP#1623955: Keep periods in subject links
+
+ The subject links in the record summary were stripping periods, changing
+ headings that contained N.Y., for example, to NY in the subsequent search
+ string. Since normalization at index time replaces the period with a space,
+ clicking the subject links did not successfully retrieve all relevant
+ results.
+
+ Test plan:
+ Click the Subject link for a record that has New York (N.Y.) in its heading and
+ has no other instances of ny in the keyword index. This record will not be
+ retrieved when you click the link. After loading the patch, the record will be
+ successfully retrieved, along with other records that contain New York (N.Y.) in
+ their subject headings.
+
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+ Signed-off-by: Dan Wells <dbw2 at calvin.edu>
+
+1 1 Open-ILS/src/templates/opac/parts/record/subjects.tt2
+
+commit e274d4b8092c7500bb01ef9a2a2ffc9e797fc066
+Author: Josh Stompro <stomproj at larl.org>
+Date: Fri Aug 19 15:31:11 2016 -0500
+
+ LP#1494750 - Extra closing curly bracket in style.css disables following css
+
+ Which is the .sort_deemphasize class, so the modification of the non-filing
+ characters never happens in the sort results.
+
+ Test Plan:
+
+ Needed: Patron account with checkout history that contains titles with
+ non filing characters.
+
+ Before change, view the checkout history and sort by title. Note that the
+ leading non filing characters look the same as the rest of the title.
+
+ After change, view the checkout history and sort by title. Note that the
+ leading non filing characters now have a different style than the rest
+ of the title.
+
+ Signed-off-by: Josh Stompro <stomproj at larl.org>
+ Signed-off-by: Jeanette Lundgren <jlundgren at cwmars.org>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+0 1 Open-ILS/src/templates/opac/css/style.css.tt2
+
+commit 0336afa49eca65fe66db1468e5d4539b47ac3e49
+Author: Bill Erickson <berickxx at gmail.com>
+Date: Fri Sep 23 13:56:42 2016 -0400
+
+ LP#1526159 Webstaff Items Out includes overdue, etc.
+
+ Items Out tally in patron summary (side-bar) is now consistent with the
+ Items Out value displayed along the top of the patron UI. It now includes
+ overdues and optionally lost/claims-returned total.
+
+ Signed-off-by: Bill Erickson <berickxx at gmail.com>
+ Signed-off-by: Jeanette Lundgren <jlundgren at cwmars.org>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+1 1 Open-ILS/src/templates/staff/circ/patron/t_summary.tt2
+
+commit 0ae4e47bfe608b1c0901110e464bcb1faf68e0c2
+Author: Bill Erickson <berickxx at gmail.com>
+Date: Fri Sep 2 17:01:35 2016 -0400
+
+ LP#1565009 Webstaff patron search progress bar
+
+ Displays a progress bar while waiting for results from a patron search
+ in the browser client. Bar only displays when a server-side search is
+ required. (It's not displayed for cached searches, etc.). Results grid
+ is hidden while the progress bar is visible and vice versa.
+
+ Signed-off-by: Bill Erickson <berickxx at gmail.com>
+ Signed-off-by: Jeanette Lundgren <jlundgren at cwmars.org>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+15 0 Open-ILS/src/templates/staff/circ/patron/t_search_results.tt2
+10 1 Open-ILS/web/js/ui/default/staff/circ/patron/app.js
+
+commit 542e73af4db370b6d13fe98f4d4b5c4d5e6456e7
+Author: Jim Keenan <jkeenan at cwmars.org>
+Date: Thu Sep 29 13:22:15 2016 -0400
+
+ LP#1629029: Fixed missing space in line 11
+
+ Signed-off-by: Jim Keenan <jkeenan at cwmars.org>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+1 1 Open-ILS/src/templates/kpac/getit.tt2
+
+commit 5e7b30664ceda70ce9dd8d1cca02a31c437cf09f
+Author: Bill Erickson <berickxx at gmail.com>
+Date: Fri Sep 16 17:16:53 2016 -0400
+
+ LP#1618992 Webstaff checkin UI bib title link repair
+
+ Fix bib record title link in browser staff checkin grid so that clicking
+ on the link directs the user to the bib record page.
+
+ Signed-off-by: Bill Erickson <berickxx at gmail.com>
+ Signed-off-by: Jennifer Pringle <jennifer.pringle at bc.libraries.coop>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+1 1 Open-ILS/src/templates/staff/circ/checkin/t_checkin_table.tt2
+
+commit ae89feb5c00ed3177bcf2b63e89638ee1c74ffd2
+Author: Bill Erickson <berickxx at gmail.com>
+Date: Fri Sep 16 17:15:37 2016 -0400
+
+ LP#1618992 Webstaff checkin error handler repairs
+
+ Fix typo in browser staff checkin error handler which resulted in null
+ errors any time a checkin failed instead of gracefully handling the
+ error.
+
+ Signed-off-by: Bill Erickson <berickxx at gmail.com>
+ Signed-off-by: Jennifer Pringle <jennifer.pringle at bc.libraries.coop>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+1 1 Open-ILS/web/js/ui/default/staff/circ/checkin/app.js
+
+commit 0de0af73a7979af5e33cf3816e2d47f7b0a9f29f
+Author: Bill Erickson <berickxx at gmail.com>
+Date: Fri Sep 16 17:14:42 2016 -0400
+
+ LP#1618992 Work log checkin/user sanity checks
+
+ Avoid attempts to log user information during checkin when no user
+ information is available.
+
+ Signed-off-by: Bill Erickson <berickxx at gmail.com>
+ Signed-off-by: Jennifer Pringle <jennifer.pringle at bc.libraries.coop>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+4 2 Open-ILS/web/js/ui/default/staff/services/ui.js
+
+commit 7cca1fdb5ca18be5f1bd1320af4cc66cac9a82ae
+Author: Remington Steed <rjs7 at calvin.edu>
+Date: Thu Sep 29 11:05:18 2016 -0400
+
+ LP#802700 Sort funds by code and year
+
+ This commit applies Bill Erickson's change from bug #1227344 to the fund
+ selector that appears on the Selection List (picklist) screen when you click
+ "Copies" to reveal the line items table. (Bill also mentioned this in
+ bug #1266471.)
+
+ Signed-off-by: Remington Steed <rjs7 at calvin.edu>
+ Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
+ Signed-off-by: Dan Wells <dbw2 at calvin.edu>
+
+2 0 Open-ILS/web/js/ui/default/acq/common/li_table.js
+
+commit 1aca777034aab61fea51f6af5ca308c84391016a
+Author: Robert Soulliere <rsoulliere at yahoo.com>
+Date: Wed Sep 28 10:35:53 2016 -0400
+
+ Docs: Use the 2.11 release notes
+
+ Update root.txt to point to the 2.11 release notes.
+
+ Signed-off-by: Robert Soulliere <robert.soulliere at mohawkcollege.ca>
+
+1 1 docs/root.txt
+
+commit b76167d90f141eb2cc03c1098ea9259b98481add
+Author: Dan Scott <dscott at laurentian.ca>
+Date: Fri Sep 23 15:18:32 2016 -0400
+
+ Add a simple Item Information test for SIP server
+
+ Useful if you want to check the ability of the server to return Unicode
+ response.
+
+ Signed-off-by: Dan Scott <dscott at laurentian.ca>
+
+15 2 docs/admin/sip_server.txt
+
+commit 2c06d1bf398524a8eef716695dfe5fab9b30fff4
+Author: Kathy Lussier <klussier at masslnc.org>
+Date: Fri Sep 23 13:37:42 2016 -0400
+
+ Docs: Minor fixes for 2.11 Release Notes
+
+ Fixed a header level as well as some minor typos in the 2.11 release notes.
+
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+5 5 docs/RELEASE_NOTES_2_11.adoc
+
+commit f7bf369ef275267e0eb0b0d3cd3ab1c13fd95f30
+Author: Dan Wells <dbw2 at calvin.edu>
+Date: Thu Aug 25 18:08:07 2016 -0400
+
+ Create/consolidate release notes for 2.11
+
+ Signed-off-by: Dan Wells <dbw2 at calvin.edu>
+
+537 0 docs/RELEASE_NOTES_2_11.adoc
+0 16 docs/RELEASE_NOTES_NEXT/Administration/Action_Trigger_Email_Headers.adoc
+0 15 docs/RELEASE_NOTES_NEXT/Administration/lp1568046-tablefunc-extension-removed.adoc
+0 29 docs/RELEASE_NOTES_NEXT/Administration/user-activity-purge.adoc
+0 6 docs/RELEASE_NOTES_NEXT/Cataloging/auth_bib_update.adoc
+0 16 docs/RELEASE_NOTES_NEXT/Cataloging/auth_prop_bib_update.adoc
+0 6 docs/RELEASE_NOTES_NEXT/Cataloging/bib_source_in_901s.txt
+0 12 docs/RELEASE_NOTES_NEXT/Cataloging/marc_bib_update.adoc
+0 21 docs/RELEASE_NOTES_NEXT/Circulation/aged-circs-see-light-of-day.adoc
+0 26 docs/RELEASE_NOTES_NEXT/Circulation/canceled-transit-copy-status.adoc
+0 18 docs/RELEASE_NOTES_NEXT/Circulation/copy-status-is-avail.adoc
+0 20 docs/RELEASE_NOTES_NEXT/Circulation/email_cko_receipts.adoc
+0 18 docs/RELEASE_NOTES_NEXT/Circulation/limit_payment_amounts_accepted.txt
+0 17 docs/RELEASE_NOTES_NEXT/Client/added-fields-for-client-interfaces.adoc
+0 7 docs/RELEASE_NOTES_NEXT/OPAC/combine_notice_prefs_tables.adoc
+0 14 docs/RELEASE_NOTES_NEXT/OPAC/improved-myopac-holds-screens.adoc
+0 74 docs/RELEASE_NOTES_NEXT/OPAC/popularity-rating.txt
+0 9 docs/RELEASE_NOTES_NEXT/OPAC/remove_advanced_hold_options_for_parts.adoc
+0 8 docs/RELEASE_NOTES_NEXT/SIP/SIP_Workstation_Name.adoc
+0 7 docs/RELEASE_NOTES_NEXT/SIP/SIP_renewal_blocks.adoc
+0 7 docs/RELEASE_NOTES_NEXT/Translations/Updates.adoc
+ create mode 100644 docs/RELEASE_NOTES_2_11.adoc
+ delete mode 100644 docs/RELEASE_NOTES_NEXT/Administration/Action_Trigger_Email_Headers.adoc
+ delete mode 100644 docs/RELEASE_NOTES_NEXT/Administration/lp1568046-tablefunc-extension-removed.adoc
+ delete mode 100644 docs/RELEASE_NOTES_NEXT/Administration/user-activity-purge.adoc
+ delete mode 100644 docs/RELEASE_NOTES_NEXT/Cataloging/auth_bib_update.adoc
+ delete mode 100644 docs/RELEASE_NOTES_NEXT/Cataloging/auth_prop_bib_update.adoc
+ delete mode 100644 docs/RELEASE_NOTES_NEXT/Cataloging/bib_source_in_901s.txt
+ delete mode 100644 docs/RELEASE_NOTES_NEXT/Cataloging/marc_bib_update.adoc
+ delete mode 100644 docs/RELEASE_NOTES_NEXT/Circulation/aged-circs-see-light-of-day.adoc
+ delete mode 100644 docs/RELEASE_NOTES_NEXT/Circulation/canceled-transit-copy-status.adoc
+ delete mode 100644 docs/RELEASE_NOTES_NEXT/Circulation/copy-status-is-avail.adoc
+ delete mode 100644 docs/RELEASE_NOTES_NEXT/Circulation/email_cko_receipts.adoc
+ delete mode 100644 docs/RELEASE_NOTES_NEXT/Circulation/limit_payment_amounts_accepted.txt
+ delete mode 100644 docs/RELEASE_NOTES_NEXT/Client/added-fields-for-client-interfaces.adoc
+ delete mode 100644 docs/RELEASE_NOTES_NEXT/OPAC/combine_notice_prefs_tables.adoc
+ delete mode 100644 docs/RELEASE_NOTES_NEXT/OPAC/improved-myopac-holds-screens.adoc
+ delete mode 100644 docs/RELEASE_NOTES_NEXT/OPAC/popularity-rating.txt
+ delete mode 100644 docs/RELEASE_NOTES_NEXT/OPAC/remove_advanced_hold_options_for_parts.adoc
+ delete mode 100644 docs/RELEASE_NOTES_NEXT/SIP/SIP_Workstation_Name.adoc
+ delete mode 100644 docs/RELEASE_NOTES_NEXT/SIP/SIP_renewal_blocks.adoc
+ delete mode 100644 docs/RELEASE_NOTES_NEXT/Translations/Updates.adoc
+
+commit c17f5947f791f485aacd8628a6b47584771d8c92
+Author: Galen Charlton <gmc at esilibrary.com>
+Date: Wed Sep 21 20:27:42 2016 -0400
+
+ small typo fix in 2.10 release notes
+
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+1 1 docs/RELEASE_NOTES_2_10.adoc
+
+commit 1501e1f2d333cf9819b329b11dac359d663e1f9b
+Author: Jason Stephenson <jason at sigio.com>
+Date: Wed Sep 21 15:58:33 2016 -0400
+
+ Forward port 2.9.7 to 2.9.8 db upgrade script.
+
+ Signed-off-by: Jason Stephenson <jason at sigio.com>
+
+5 0 Open-ILS/src/sql/Pg/version-upgrade/2.9.7-2.9.8-upgrade-db.sql
+ create mode 100644 Open-ILS/src/sql/Pg/version-upgrade/2.9.7-2.9.8-upgrade-db.sql
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application.pm
index d750216..365e686 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application.pm
@@ -7,7 +7,7 @@ use OpenILS::Utils::Fieldmapper;
sub ils_version {
# version format is "x-y-z", for example "2-0-0" for Evergreen 2.0.0
# For branches, format is "x-y"
- return "HEAD";
+ return "2-11-1";
}
__PACKAGE__->register_method(
diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index a9a4de1..bb3aae0 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -92,6 +92,7 @@ CREATE TRIGGER no_overlapping_deps
FOR EACH ROW EXECUTE PROCEDURE evergreen.array_overlap_check ('deprecates');
INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1003', :eg_version); -- gmcharlt/rhamby/csharp
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('2.11.1', :eg_version);
CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/version-upgrade/2.11.0-2.11.1-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/2.11.0-2.11.1-upgrade-db.sql
new file mode 100644
index 0000000..8042012
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/version-upgrade/2.11.0-2.11.1-upgrade-db.sql
@@ -0,0 +1,109 @@
+--Upgrade Script for 2.11.0 to 2.11.1
+\set eg_version '''2.11.1'''
+BEGIN;
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('2.11.1', :eg_version);
+
+SELECT evergreen.upgrade_deps_block_check('1001', :eg_version); -- stompro/gmcharlt
+
+CREATE INDEX action_usr_circ_history_usr_idx ON action.usr_circ_history ( usr );
+
+
+SELECT evergreen.upgrade_deps_block_check('1002', :eg_version);
+
+-- This is a placeholder for the backport of schema update 1002
+-- (adding es-ES to the list of locales. This script does nothing for
+-- rel_2_11 and later.
+
+
+SELECT evergreen.upgrade_deps_block_check('1003', :eg_version); -- gmcharlt/rhamby/csharp
+
+CREATE OR REPLACE FUNCTION metabib.remap_metarecord_for_bib( bib_id BIGINT, fp TEXT, bib_is_deleted BOOL DEFAULT FALSE, retain_deleted BOOL DEFAULT FALSE ) RETURNS BIGINT AS $func$
+DECLARE
+ new_mapping BOOL := TRUE;
+ source_count INT;
+ old_mr BIGINT;
+ tmp_mr metabib.metarecord%ROWTYPE;
+ deleted_mrs BIGINT[];
+BEGIN
+
+ -- We need to make sure we're not a deleted master record of an MR
+ IF bib_is_deleted THEN
+ FOR old_mr IN SELECT id FROM metabib.metarecord WHERE master_record = bib_id LOOP
+
+ IF NOT retain_deleted THEN -- Go away for any MR that we're master of, unless retained
+ DELETE FROM metabib.metarecord_source_map WHERE source = bib_id;
+ END IF;
+
+ -- Now, are there any more sources on this MR?
+ SELECT COUNT(*) INTO source_count FROM metabib.metarecord_source_map WHERE metarecord = old_mr;
+
+ IF source_count = 0 AND NOT retain_deleted THEN -- No other records
+ deleted_mrs := ARRAY_APPEND(deleted_mrs, old_mr); -- Just in case...
+ DELETE FROM metabib.metarecord WHERE id = old_mr;
+
+ ELSE -- indeed there are. Update it with a null cache and recalcualated master record
+ UPDATE metabib.metarecord
+ SET mods = NULL,
+ master_record = ( SELECT id FROM biblio.record_entry WHERE fingerprint = fp AND NOT deleted ORDER BY quality DESC LIMIT 1)
+ WHERE id = old_mr;
+ END IF;
+ END LOOP;
+
+ ELSE -- insert or update
+
+ FOR tmp_mr IN SELECT m.* FROM metabib.metarecord m JOIN metabib.metarecord_source_map s ON (s.metarecord = m.id) WHERE s.source = bib_id LOOP
+
+ -- Find the first fingerprint-matching
+ IF old_mr IS NULL AND fp = tmp_mr.fingerprint THEN
+ old_mr := tmp_mr.id;
+ new_mapping := FALSE;
+
+ ELSE -- Our fingerprint changed ... maybe remove the old MR
+ DELETE FROM metabib.metarecord_source_map WHERE metarecord = tmp_mr.id AND source = bib_id; -- remove the old source mapping
+ SELECT COUNT(*) INTO source_count FROM metabib.metarecord_source_map WHERE metarecord = tmp_mr.id;
+ IF source_count = 0 THEN -- No other records
+ deleted_mrs := ARRAY_APPEND(deleted_mrs, tmp_mr.id);
+ DELETE FROM metabib.metarecord WHERE id = tmp_mr.id;
+ END IF;
+ END IF;
+
+ END LOOP;
+
+ -- we found no suitable, preexisting MR based on old source maps
+ IF old_mr IS NULL THEN
+ SELECT id INTO old_mr FROM metabib.metarecord WHERE fingerprint = fp; -- is there one for our current fingerprint?
+
+ IF old_mr IS NULL THEN -- nope, create one and grab its id
+ INSERT INTO metabib.metarecord ( fingerprint, master_record ) VALUES ( fp, bib_id );
+ SELECT id INTO old_mr FROM metabib.metarecord WHERE fingerprint = fp;
+
+ ELSE -- indeed there is. update it with a null cache and recalcualated master record
+ UPDATE metabib.metarecord
+ SET mods = NULL,
+ master_record = ( SELECT id FROM biblio.record_entry WHERE fingerprint = fp AND NOT deleted ORDER BY quality DESC LIMIT 1)
+ WHERE id = old_mr;
+ END IF;
+
+ ELSE -- there was one we already attached to, update its mods cache and master_record
+ UPDATE metabib.metarecord
+ SET mods = NULL,
+ master_record = ( SELECT id FROM biblio.record_entry WHERE fingerprint = fp AND NOT deleted ORDER BY quality DESC LIMIT 1)
+ WHERE id = old_mr;
+ END IF;
+
+ IF new_mapping THEN
+ INSERT INTO metabib.metarecord_source_map (metarecord, source) VALUES (old_mr, bib_id); -- new source mapping
+ END IF;
+
+ END IF;
+
+ IF ARRAY_UPPER(deleted_mrs,1) > 0 THEN
+ UPDATE action.hold_request SET target = old_mr WHERE target IN ( SELECT unnest(deleted_mrs) ) AND hold_type = 'M'; -- if we had to delete any MRs above, make sure their holds are moved
+ END IF;
+
+ RETURN old_mr;
+
+END;
+$func$ LANGUAGE PLPGSQL;
+
+COMMIT;
diff --git a/Open-ILS/xul/staff_client/chrome/content/main/about.html b/Open-ILS/xul/staff_client/chrome/content/main/about.html
index 7b2b3f5..73ce93c 100644
--- a/Open-ILS/xul/staff_client/chrome/content/main/about.html
+++ b/Open-ILS/xul/staff_client/chrome/content/main/about.html
@@ -1,7 +1,7 @@
<html><head><script></script></head><body onload="var x = document.getElementById('version'); var version ='/xul/server/'.split(/\//)[2]; if (version == 'server') { version = 'versionless debug build'; } x.appendChild(document.createTextNode(version));">
<h1 style="text-decoration: underline">Evergreen</h1>
<p>Target Server ID: <span id="version"></span></p>
-<p>$HeadURL$</p>
+<p>http://git.evergreen-ils.org/?p=Evergreen.git;a=shortlog;h=refs/heads/tags/rel_2_11_1</p>
<h2>What is Evergreen?</h2>
<blockquote>
<p>
diff --git a/Open-ILS/xul/staff_client/defaults/preferences/prefs.js b/Open-ILS/xul/staff_client/defaults/preferences/prefs.js
index 0613a13..02b0798 100644
--- a/Open-ILS/xul/staff_client/defaults/preferences/prefs.js
+++ b/Open-ILS/xul/staff_client/defaults/preferences/prefs.js
@@ -11,7 +11,7 @@ pref("toolkit.singletonWindowType", "eg_main");
pref("open-ils.enable_join_tabs", true);
// We'll use this one to help brand some build information into the client, and rely on subversion keywords
-pref("open-ils.repository.headURL","$HeadURL$");
+pref("open-ils.repository.headURL","http://git.evergreen-ils.org/?p=Evergreen.git;a=shortlog;h=refs/heads/tags/rel_2_11_1");
pref("open-ils.repository.author","$Author$");
pref("open-ils.repository.revision","$Revision$");
pref("open-ils.repository.date","$Date$");
diff --git a/Open-ILS/xul/staff_client/windowssetup.nsi b/Open-ILS/xul/staff_client/windowssetup.nsi
index a954357..5ebcd7a 100644
--- a/Open-ILS/xul/staff_client/windowssetup.nsi
+++ b/Open-ILS/xul/staff_client/windowssetup.nsi
@@ -3,7 +3,7 @@
; HM NIS Edit Wizard helper defines
; Old versions of makensis don't like this, moved to Makefile
;!define /file PRODUCT_VERSION "client/VERSION"
-!define PRODUCT_TAG "Master"
+!define PRODUCT_TAG "2.11"
!define PRODUCT_INSTALL_TAG "${PRODUCT_TAG}"
!define UI_IMAGESET "beta"
;!define UI_IMAGESET "release"
diff --git a/README b/README
deleted file mode 120000
index b57451a..0000000
--- a/README
+++ /dev/null
@@ -1 +0,0 @@
-docs/installation/server_installation.txt
\ No newline at end of file
diff --git a/README b/README
new file mode 100644
index 0000000..890e66c
--- /dev/null
+++ b/README
@@ -0,0 +1,742 @@
+Installing the Evergreen server
+===============================
+:toc:
+:numbered:
+
+Preamble: referenced user accounts
+----------------------------------
+
+In subsequent sections, we will refer to a number of different accounts, as
+follows:
+
+ * Linux user accounts:
+ ** The *user* Linux account is the account that you use to log onto the
+ Linux system as a regular user.
+ ** The *root* Linux account is an account that has system administrator
+ privileges. On Debian and Fedora you can switch to this account from
+ your *user* account by issuing the `su -` command and entering the
+ password for the *root* account when prompted. On Ubuntu you can switch
+ to this account from your *user* account using the `sudo su -` command
+ and entering the password for your *user* account when prompted.
+ ** The *opensrf* Linux account is an account that you create when installing
+ OpenSRF. You can switch to this account from the *root* account by
+ issuing the `su - opensrf` command.
+ ** The *postgres* Linux account is created automatically when you install
+ the PostgreSQL database server. You can switch to this account from the
+ *root* account by issuing the `su - postgres` command.
+ * PostgreSQL user accounts:
+ ** The *evergreen* PostgreSQL account is a superuser account that you will
+ create to connect to the PostgreSQL database server.
+ * Evergreen administrator account:
+ ** The *egadmin* Evergreen account is an administrator account for
+ Evergreen that you will use to test connectivity and configure your
+ Evergreen instance.
+
+Preamble: developer instructions
+--------------------------------
+
+[NOTE]
+Skip this section if you are using an official release tarball downloaded
+from http://evergreen-ils.org/egdownloads
+
+Developers working directly with the source code from the Git repository,
+rather than an official release tarball, must perform one step before they
+can proceed with the `./configure` step.
+
+As the *user* Linux account, issue the following command in the Evergreen
+source directory to generate the configure script and Makefiles:
+
+[source, bash]
+------------------------------------------------------------------------------
+autoreconf -i
+------------------------------------------------------------------------------
+
+Installing prerequisites
+------------------------
+
+ * **PostgreSQL**: Version 9.3 is recommended. The minimum supported version
+ is 9.1.
+ * **Linux**: Evergreen 2.8 has been tested on Debian Jessie (8.0),
+ Debian Wheezy (7.0), Ubuntu Xenial Xerus (16.04),
+ Ubuntu Trusty Tahr (14.04), and Fedora.
+ If you are running an older version of these distributions, you may want
+ to upgrade before upgrading Evergreen. For instructions on upgrading these
+ distributions, visit the Debian, Ubuntu or Fedora websites.
+ * **OpenSRF**: The minimum supported version of OpenSRF is 2.4.0.
+
+
+Evergreen has a number of prerequisite packages that must be installed
+before you can successfully configure, compile, and install Evergreen.
+
+1. Begin by installing the most recent version of OpenSRF (2.4.0 or later).
+ You can download OpenSRF releases from http://evergreen-ils.org/opensrf-downloads/
+2. On some distributions, it is necessary to install PostgreSQL 9.1+ from external
+ repositories.
++
+ * Debian (Wheezy and Jessie) and Ubuntu (Trusty and Xenial) comes with
+ PostgreSQL 9.1+, so no additional steps are required.
+ * Fedora 19 and 20 come with PostgreSQL 9.2+, so no additional steps are required.
++
+3. On Debian and Ubuntu, run `aptitude update` as the *root* Linux account to
+ retrieve the new packages from the backports repository.
+4. Issue the following commands as the *root* Linux account to install
+ prerequisites using the `Makefile.install` prerequisite installer,
+ substituting `debian-jessie`, `debian-wheezy`, `fedora`,
+ `ubuntu-xenial`, or `ubuntu-trusty` for <osname> below:
++
+[source, bash]
+------------------------------------------------------------------------------
+make -f Open-ILS/src/extras/Makefile.install <osname>
+------------------------------------------------------------------------------
++
+5. Add the libdbi-libdbd libraries to the system dynamic library path by
+ issuing the following commands as the *root* Linux account:
++
+[NOTE]
+You should skip this step if installing on Ubuntu Trusty, Ubuntu Xenial or Debian Jessie. The Ubuntu
+and Debian Jessie targets use libdbd-pgsql from packages.
++
+.Debian Wheezy
+[source, bash]
+------------------------------------------------------------------------------
+echo "/usr/local/lib/dbd" > /etc/ld.so.conf.d/eg.conf
+ldconfig
+------------------------------------------------------------------------------
++
+.Fedora
+[source, bash]
+------------------------------------------------------------------------------
+echo "/usr/lib64/dbd" > /etc/ld.so.conf.d/eg.conf
+ldconfig
+------------------------------------------------------------------------------
+
+6. OPTIONAL: Developer additions
++
+To perform certain developer tasks from a Git source code checkout,
+additional packages may be required. As the *root* Linux account:
++
+ * To install packages needed for retriving and managing web dependencies,
+ use the <osname>-developer Makefile.install target. Currently,
+ this is only needed for building and installing the (preview) browser
+ staff client.
++
+[source, bash]
+------------------------------------------------------------------------------
+make -f Open-ILS/src/extras/Makefile.install <osname>-developer
+------------------------------------------------------------------------------
++
+ * To install packages required for building Evergreen release bundles, use
+ the <osname>-packager Makefile.install target.
++
+[source, bash]
+------------------------------------------------------------------------------
+make -f Open-ILS/src/extras/Makefile.install <osname>-packager
+------------------------------------------------------------------------------
+
+Optional: Extra steps for browser-based staff client
+----------------------------------------------------
+
+[NOTE]
+Skip this entire section if you are using an official release tarball downloaded
+from http://evergreen-ils.org/downloads
+
+[NOTE]
+You make skip the subsection `Install dependencies for browser-based staff client'
+if you are installing on either Debian Jessie, Ubuntu Trusty, or Ubuntu Xenial and you have
+installed the `Optional: Developer Additions' described above. You will still
+need to do the steps in `Install files for browser-based staff client' below.
+
+Install dependencies for browser-based staff client
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+1. Install Node.js. For more information see also:
+ https://github.com/joyent/node/wiki/installation[Node.js Installation]
++
+[source,sh]
+------------------------------------------------------------------------------
+# Go to a temporary directory
+cd /tmp
+
+# Clone the code and checkout the necessary version
+git clone https://github.com/joyent/node.git
+cd node
+git checkout -b v0.10.28 v0.10.28
+
+# set -j to the number of CPU cores on the server + 1
+./configure && make -j2 && sudo make install
+
+# update packages
+% sudo npm update
+------------------------------------------------------------------------------
++
+2. Install Grunt CLI
++
+[source,sh]
+------------------------------------------------------------------------------
+% sudo npm install -g grunt-cli
+------------------------------------------------------------------------------
++
+3. Install Bower
++
+[source,sh]
+------------------------------------------------------------------------------
+% sudo npm install -g bower
+------------------------------------------------------------------------------
+
+Install files for browser-based staff client
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+1. Building, Testing, Minification: The remaining steps all take place within
+ the staff JS web root:
++
+[source,sh]
+------------------------------------------------------------------------------
+cd $EVERGREEN_ROOT/Open-ILS/web/js/ui/default/staff/
+------------------------------------------------------------------------------
++
+2. Install Project-local Dependencies. npm inspects the 'package.json' file
+ for dependencies and fetches them from the Node package network.
++
+[source,sh]
+------------------------------------------------------------------------------
+npm install # fetch Grunt dependencies
+bower install # fetch JS dependencies
+------------------------------------------------------------------------------
++
+3. Run the build script.
++
+[source,sh]
+------------------------------------------------------------------------------
+# build, run tests, concat+minify
+grunt all
+------------------------------------------------------------------------------
+
+
+Configuration and compilation instructions
+------------------------------------------
+
+For the time being, we are still installing everything in the `/openils/`
+directory. From the Evergreen source directory, issue the following commands as
+the *user* Linux account to configure and build Evergreen:
+
+[source, bash]
+------------------------------------------------------------------------------
+PATH=/openils/bin:$PATH ./configure --prefix=/openils --sysconfdir=/openils/conf
+make
+------------------------------------------------------------------------------
+
+These instructions assume that you have also installed OpenSRF under `/openils/`.
+If not, please adjust PATH as needed so that the Evergreen `configure` script
+can find `osrf_config`.
+
+Installation instructions
+-------------------------
+
+1. Once you have configured and compiled Evergreen, issue the following
+ command as the *root* Linux account to install Evergreen, build the server
+ portion of the staff client, and copy example configuration files to
+ `/openils/conf`.
+ Change the value of the `STAFF_CLIENT_STAMP_ID` variable to match the version
+ of the staff client that you will use to connect to the Evergreen server.
++
+[source, bash]
+------------------------------------------------------------------------------
+make STAFF_CLIENT_STAMP_ID=rel_2_11_1 install
+------------------------------------------------------------------------------
++
+2. The server portion of the staff client expects `http://hostname/xul/server`
+ to resolve. Issue the following commands as the *root* Linux account to
+ create a symbolic link pointing to the `server` subdirectory of the server
+ portion of the staff client that we just built using the staff client ID
+ 'rel_name':
++
+[source, bash]
+------------------------------------------------------------------------------
+cd /openils/var/web/xul
+ln -sf rel_name/server server
+------------------------------------------------------------------------------
+
+Change ownership of the Evergreen files
+---------------------------------------
+
+All files in the `/openils/` directory and subdirectories must be owned by the
+`opensrf` user. Issue the following command as the *root* Linux account to
+change the ownership on the files:
+
+[source, bash]
+------------------------------------------------------------------------------
+chown -R opensrf:opensrf /openils
+------------------------------------------------------------------------------
+
+Additional Instructions for Developers
+--------------------------------------
+
+[NOTE]
+Skip this section if you are using an official release tarball downloaded
+from http://evergreen-ils.org/egdownloads
+
+Developers working directly with the source code from the Git repository,
+rather than an official release tarball, need to install the Dojo Toolkit
+set of JavaScript libraries. The appropriate version of Dojo is included in
+Evergreen release tarballs. Developers should install the Dojo 1.3.3 version
+of Dojo by issuing the following commands as the *opensrf* Linux account:
+
+[source, bash]
+------------------------------------------------------------------------------
+wget http://download.dojotoolkit.org/release-1.3.3/dojo-release-1.3.3.tar.gz
+tar -C /openils/var/web/js -xzf dojo-release-1.3.3.tar.gz
+cp -r /openils/var/web/js/dojo-release-1.3.3/* /openils/var/web/js/dojo/.
+------------------------------------------------------------------------------
+
+
+Configure the Apache Web server
+-------------------------------
+
+. Use the example configuration files in `Open-ILS/examples/apache/` (for
+Apache versions below 2.4) or `Open-ILS/examples/apache_24/` (for Apache
+versions 2.4 or greater) to configure your Web server for the Evergreen
+catalog, staff client, Web services, and administration interfaces. Issue the
+following commands as the *root* Linux account:
++
+.Debian Wheezy
+[source,bash]
+------------------------------------------------------------------------------
+cp Open-ILS/examples/apache/eg.conf /etc/apache2/sites-available/
+cp Open-ILS/examples/apache/eg_vhost.conf /etc/apache2/
+cp Open-ILS/examples/apache/eg_startup /etc/apache2/
+# Now set up SSL
+mkdir /etc/apache2/ssl
+cd /etc/apache2/ssl
+------------------------------------------------------------------------------
++
+.Ubuntu Trusty, Ubuntu Xenial, and Debian Jessie
+[source,bash]
+------------------------------------------------------------------------------------
+cp Open-ILS/examples/apache_24/eg_24.conf /etc/apache2/sites-available/eg.conf
+cp Open-ILS/examples/apache_24/eg_vhost_24.conf /etc/apache2/eg_vhost.conf
+cp Open-ILS/examples/apache/eg_startup /etc/apache2/
+# Now set up SSL
+mkdir /etc/apache2/ssl
+cd /etc/apache2/ssl
+------------------------------------------------------------------------------------
++
+.Fedora
+[source,bash]
+------------------------------------------------------------------------------
+cp Open-ILS/examples/apache_24/eg_24.conf /etc/httpd/conf.d/
+cp Open-ILS/examples/apache_24/eg_vhost_24.conf /etc/httpd/eg_vhost.conf
+cp Open-ILS/examples/apache/eg_startup /etc/httpd/
+# Now set up SSL
+mkdir /etc/httpd/ssl
+cd /etc/httpd/ssl
+------------------------------------------------------------------------------
++
+. The `openssl` command cuts a new SSL key for your Apache server. For a
+production server, you should purchase a signed SSL certificate, but you can
+just use a self-signed certificate and accept the warnings in the staff client
+and browser during testing and development. Create an SSL key for the Apache
+server by issuing the following command as the *root* Linux account:
++
+[source,bash]
+------------------------------------------------------------------------------
+openssl req -new -x509 -days 365 -nodes -out server.crt -keyout server.key
+------------------------------------------------------------------------------
++
+. As the *root* Linux account, edit the `eg.conf` file that you copied into
+place.
+ a. To enable access to the offline upload / execute interface from any
+ workstation on any network, make the following change (and note that
+ you *must* secure this for a production instance):
+ * (Apache 2.2): Replace `Allow from 10.0.0.0/8` with `Allow from all`
+ * (Apache 2.4): Replace `Require host 10.0.0.0/8` with `Require all granted`
+ b. (Fedora): Change references from the non-existent `/etc/apache2/` directory
+ to `/etc/httpd/`.
+. Change the user for the Apache server.
+ * (Debian and Ubuntu): As the *root* Linux account, edit
+ `/etc/apache2/envvars`. Change `export APACHE_RUN_USER=www-data` to
+ `export APACHE_RUN_USER=opensrf`.
+ * (Fedora): As the *root* Linux account , edit `/etc/httpd/conf/httpd.conf`.
+ Change `User apache` to `User opensrf`.
+. As the *root* Linux account, configure Apache with KeepAlive settings
+ appropriate for Evergreen. Higher values can improve the performance of a
+ single client by allowing multiple requests to be sent over the same TCP
+ connection, but increase the risk of using up all available Apache child
+ processes and memory.
+ * (Debian and Ubuntu): Edit `/etc/apache2/apache2.conf`.
+ a. Change `KeepAliveTimeout` to `1`.
+ b. Change `MaxKeepAliveRequests` to `100`.
+ * (Fedora): Edit `/etc/httpd/conf/httpd.conf`.
+ a. Change `KeepAliveTimeout` to `1`.
+ b. Change `MaxKeepAliveRequests` to `100`.
+. As the *root* Linux account, configure the prefork module to start and keep
+ enough Apache servers available to provide quick responses to clients without
+ running out of memory. The following settings are a good starting point for a
+ site that exposes the default Evergreen catalogue to the web:
++
+.Debian Wheezy (`/etc/apache2/apache2.conf`) and Fedora (`/etc/httpd/conf/httpd.conf`)
+[source,bash]
+------------------------------------------------------------------------------
+<IfModule mpm_prefork_module>
+ StartServers 15
+ MinSpareServers 5
+ MaxSpareServers 15
+ MaxClients 75
+ MaxRequestsPerChild 500
+</IfModule>
+------------------------------------------------------------------------------
++
+.Ubuntu Trusty, Ubuntu Xenial, Debian Jessie (`/etc/apache2/mods-available/mpm_prefork.conf`)
+[source,bash]
+------------------------------------------------------------------------------
+<IfModule mpm_prefork_module>
+ StartServers 15
+ MinSpareServers 5
+ MaxSpareServers 15
+ MaxRequestWorkers 75
+ MaxConnectionsPerChild 500
+</IfModule>
+------------------------------------------------------------------------------
++
+. (Ubuntu Trusty, Ubuntu Xenial, Debian Jessie) As the *root* user,
+ enable the mpm_prefork module:
++
+[source,bash]
+------------------------------------------------------------------------------
+a2dismod mpm_event
+a2enmod mpm_prefork
+------------------------------------------------------------------------------
++
+. (Fedora): As the *root* Linux account, edit the `/etc/httpd/eg_vhost.conf`
+ file to change references from the non-existent `/etc/apache2/` directory
+ to `/etc/httpd/`.
+. (Debian Wheezy): As the *root* Linux account, enable the Evergreen site:
++
+[source,bash]
+------------------------------------------------------------------------------
+a2dissite default # OPTIONAL: disable the default site (the "It Works" page)
+a2ensite eg.conf
+------------------------------------------------------------------------------
++
+(Ubuntu Trusty, Ubuntu Xenial, Debian Jessie):
++
+[source,bash]
+------------------------------------------------------------------------------
+a2dissite 000-default # OPTIONAL: disable the default site (the "It Works" page)
+a2ensite eg.conf
+------------------------------------------------------------------------------
++
+. (Ubuntu): As the *root* Linux account, enable Apache to write
+ to the lock directory; this is currently necessary because Apache
+ is running as the `opensrf` user:
++
+[source,bash]
+------------------------------------------------------------------------------
+chown opensrf /var/lock/apache2
+------------------------------------------------------------------------------
+
+Learn more about additional Apache options in the following sections:
+
+ * <<_apache_rewrite_tricks,Apache Rewrite Tricks>>
+ * <<_apache_access_handler_perl_module,Apache Access Handler Perl Module>>
+
+Configure OpenSRF for the Evergreen application
+-----------------------------------------------
+There are a number of example OpenSRF configuration files in `/openils/conf/`
+that you can use as a template for your Evergreen installation. Issue the
+following commands as the *opensrf* Linux account:
+
+[source, bash]
+------------------------------------------------------------------------------
+cp -b /openils/conf/opensrf_core.xml.example /openils/conf/opensrf_core.xml
+cp -b /openils/conf/opensrf.xml.example /openils/conf/opensrf.xml
+------------------------------------------------------------------------------
+
+When you installed OpenSRF, you created four Jabber users on two
+separate domains and edited the `opensrf_core.xml` file accordingly. Please
+refer back to the OpenSRF README and, as the *opensrf* Linux account, edit the
+Evergreen version of the `opensrf_core.xml` file using the same Jabber users
+and domains as you used while installing and testing OpenSRF.
+
+[NOTE]
+The `-b` flag tells the `cp` command to create a backup version of the
+destination file. The backup version of the destination file has a tilde (`~`)
+appended to the file name, so if you have forgotten the Jabber users and
+domains, you can retrieve the settings from the backup version of the files.
+
+`eg_db_config`, described in <<_creating_the_evergreen_database,Creating the Evergreen
+database>>, sets the database connection information in `opensrf.xml` for you.
+
+Configure action triggers for the Evergreen application
+-------------------------------------------------------
+_Action Triggers_ provide hooks for the system to perform actions when a given
+event occurs; for example, to generate reminder or overdue notices, the
+`checkout.due` hook is processed and events are triggered for potential actions
+if there is no checkin time.
+
+To enable the default set of hooks, issue the following command as the
+*opensrf* Linux account:
+
+[source, bash]
+------------------------------------------------------------------------------
+cp -b /openils/conf/action_trigger_filters.json.example /openils/conf/action_trigger_filters.json
+------------------------------------------------------------------------------
+
+For more information about configuring and using action triggers, see
+<<_notifications_action_triggers,Notifications / Action Triggers>>.
+
+Creating the Evergreen database
+-------------------------------
+
+Setting up the PostgreSQL server
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+For production use, most libraries install the PostgreSQL database server on a
+dedicated machine. Therefore, by default, the `Makefile.install` prerequisite
+installer does *not* install the PostgreSQL 9 database server that is required
+by every Evergreen system. You can install the packages required by Debian or
+Ubuntu on the machine of your choice using the following commands as the
+*root* Linux account:
+
+.(Debian / Ubuntu / Fedora) Installing PostgreSQL server packages
+
+Each OS build target provides the postgres server installation packages
+required for each operating system. To install Postgres server packages,
+use the make target 'postgres-server-<OSTYPE>'. Choose the most appropriate
+command below based on your operating system.
+
+[source, bash]
+------------------------------------------------------------------------------
+make -f Open-ILS/src/extras/Makefile.install postgres-server-debian-jessie
+make -f Open-ILS/src/extras/Makefile.install postgres-server-debian-wheezy
+make -f Open-ILS/src/extras/Makefile.install postgres-server-ubuntu-trusty
+make -f Open-ILS/src/extras/Makefile.install postgres-server-ubuntu-xenial
+make -f Open-ILS/src/extras/Makefile.install postgres-server-fedora
+------------------------------------------------------------------------------
+
+.(Fedora) Postgres initialization
+
+Installing Postgres on Fedora also requires you to initialize the PostgreSQL
+cluster and start the service. Issue the following commands as the *root* user:
+
+[source, bash]
+------------------------------------------------------------------------------
+postgresql-setup initdb
+systemctl start postgresql
+------------------------------------------------------------------------------
+
+For a standalone PostgreSQL server, install the following Perl modules for your
+distribution as the *root* Linux account:
+
+.(Debian Wheezy, Ubuntu Trusty, and Ubuntu Xenial)
+No extra modules required for these distributions.
+
+.(Fedora)
+[source, bash]
+------------------------------------------------------------------------------
+cpan Rose::URI
+------------------------------------------------------------------------------
+
+You need to create a PostgreSQL superuser to create and access the database.
+Issue the following command as the *postgres* Linux account to create a new
+PostgreSQL superuser named `evergreen`. When prompted, enter the new user's
+password:
+
+[source, bash]
+------------------------------------------------------------------------------
+createuser -s -P evergreen
+------------------------------------------------------------------------------
+
+.Enabling connections to the PostgreSQL database
+
+Your PostgreSQL database may be configured by default to prevent connections,
+for example, it might reject attempts to connect via TCP/IP or from other
+servers. To enable TCP/IP connections from localhost, check your `pg_hba.conf`
+file, found in the `/etc/postgresql/` directory on Debian and Ubuntu, and in
+the `/var/lib/pgsql/data/` directory on Fedora. A simple way to enable TCP/IP
+connections from localhost to all databases with password authentication, which
+would be suitable for a test install of Evergreen on a single server, is to
+ensure the file contains the following entries _before_ any "host ... ident"
+entries:
+
+------------------------------------------------------------------------------
+host all all ::1/128 md5
+host all all 127.0.0.1/32 md5
+------------------------------------------------------------------------------
+
+When you change the `pg_hba.conf` file, you will need to reload PostgreSQL to
+make the changes take effect. For more information on configuring connectivity
+to PostgreSQL, see
+http://www.postgresql.org/docs/devel/static/auth-pg-hba-conf.html
+
+Creating the Evergreen database and schema
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Once you have created the *evergreen* PostgreSQL account, you also need to
+create the database and schema, and configure your configuration files to point
+at the database server. Issue the following command as the *root* Linux account
+from inside the Evergreen source directory, replacing <user>, <password>,
+<hostname>, <port>, and <dbname> with the appropriate values for your
+PostgreSQL database (where <user> and <password> are for the *evergreen*
+PostgreSQL account you just created), and replace <admin-user> and <admin-pass>
+with the values you want for the *egadmin* Evergreen administrator account:
+
+[source, bash]
+------------------------------------------------------------------------------
+perl Open-ILS/src/support-scripts/eg_db_config --update-config \
+ --service all --create-database --create-schema --create-offline \
+ --user <user> --password <password> --hostname <hostname> --port <port> \
+ --database <dbname> --admin-user <admin-user> --admin-pass <admin-pass>
+------------------------------------------------------------------------------
+
+This creates the database and schema and configures all of the services in
+your `/openils/conf/opensrf.xml` configuration file to point to that database.
+It also creates the configuration files required by the Evergreen `cgi-bin`
+administration scripts, and sets the user name and password for the *egadmin*
+Evergreen administrator account to your requested values.
+
+You can get a complete set of options for `eg_db_config` by passing the
+`--help` parameter.
+
+Loading sample data
+~~~~~~~~~~~~~~~~~~~
+If you add the `--load-all-sample` parameter to the `eg_db_config` command,
+a set of authority and bibliographic records, call numbers, copies, staff
+and regular users, and transactions will be loaded into your target
+database. This sample dataset is commonly referred to as the _concerto_
+sample data, and can be useful for testing out Evergreen functionality and
+for creating problem reports that developers can easily recreate with their
+own copy of the _concerto_ sample data.
+
+Creating the database on a remote server
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+In a production instance of Evergreen, your PostgreSQL server should be
+installed on a dedicated server.
+
+PostgreSQL 9.1 and later
+^^^^^^^^^^^^^^^^^^^^^^^^
+To create the database instance on a remote database server running PostgreSQL
+9.1 or later, simply use the `--create-database` flag on `eg_db_config`.
+
+Starting Evergreen
+------------------
+1. As the *root* Linux account, start the `memcached` and `ejabberd` services
+(if they aren't already running):
++
+[source, bash]
+------------------------------------------------------------------------------
+/etc/init.d/ejabberd start
+/etc/init.d/memcached start
+------------------------------------------------------------------------------
++
+2. As the *opensrf* Linux account, start Evergreen. The `-l` flag in the
+following command is only necessary if you want to force Evergreen to treat the
+hostname as `localhost`; if you configured `opensrf.xml` using the real
+hostname of your machine as returned by `perl -ENet::Domain 'print
+Net::Domain::hostfqdn() . "\n";'`, you should not use the `-l` flag.
++
+[source, bash]
+------------------------------------------------------------------------------
+osrf_control -l --start-all
+------------------------------------------------------------------------------
++
+ ** If you receive the error message `bash: osrf_control: command not found`,
+ then your environment variable `PATH` does not include the `/openils/bin`
+ directory; this should have been set in the *opensrf* Linux account's
+ `.bashrc` configuration file. To manually set the `PATH` variable, edit the
+ configuration file `~/.bashrc` as the *opensrf* Linux account and add the
+ following line:
++
+[source, bash]
+------------------------------------------------------------------------------
+export PATH=$PATH:/openils/bin
+------------------------------------------------------------------------------
++
+3. As the *opensrf* Linux account, generate the Web files needed by the staff
+ client and catalogue and update the organization unit proximity (you need to do
+ this the first time you start Evergreen, and after that each time you change the library org unit configuration.
+):
++
+[source, bash]
+------------------------------------------------------------------------------
+autogen.sh
+------------------------------------------------------------------------------
++
+4. As the *root* Linux account, restart the Apache Web server:
++
+[source, bash]
+------------------------------------------------------------------------------
+/etc/init.d/apache2 restart
+------------------------------------------------------------------------------
++
+If the Apache Web server was running when you started the OpenSRF services, you
+might not be able to successfully log in to the OPAC or staff client until the
+Apache Web server is restarted.
+
+Testing connections to Evergreen
+--------------------------------
+
+Once you have installed and started Evergreen, test your connection to
+Evergreen via `srfsh`. As the *opensrf* Linux account, issue the following
+commands to start `srfsh` and try to log onto the Evergreen server using the
+*egadmin* Evergreen administrator user name and password that you set using the
+`eg_db_config` command:
+
+[source, bash]
+------------------------------------------------------------------------------
+/openils/bin/srfsh
+srfsh% login <admin-user> <admin-pass>
+------------------------------------------------------------------------------
+
+You should see a result like:
+
+ Received Data: "250bf1518c7527a03249858687714376"
+ ------------------------------------
+ Request Completed Successfully
+ Request Time in seconds: 0.045286
+ ------------------------------------
+
+ Received Data: {
+ "ilsevent":0,
+ "textcode":"SUCCESS",
+ "desc":" ",
+ "pid":21616,
+ "stacktrace":"oils_auth.c:304",
+ "payload":{
+ "authtoken":"e5f9827cc0f93b503a1cc66bee6bdd1a",
+ "authtime":420
+ }
+
+ }
+
+ ------------------------------------
+ Request Completed Successfully
+ Request Time in seconds: 1.336568
+ ------------------------------------
+[[install-troubleshooting-1]]
+If this does not work, it's time to do some troubleshooting.
+
+ * As the *opensrf* Linux account, run the `settings-tester.pl` script to see
+ if it finds any system configuration problems. The script is found at
+ `Open-ILS/src/support-scripts/settings-tester.pl` in the Evergreen source
+ tree.
+ * Follow the steps in the http://evergreen-ils.org/dokuwiki/doku.php?id=troubleshooting:checking_for_errors[troubleshooting guide].
+ * If you have faithfully followed the entire set of installation steps
+ listed here, you are probably extremely close to a working system.
+ Gather your configuration files and log files and contact the
+ http://evergreen-ils.org/communicate/mailing-lists/[Evergreen development
+mailing list] for assistance before making any drastic changes to your system
+ configuration.
+
+Getting help
+------------
+
+Need help installing or using Evergreen? Join the mailing lists at
+http://evergreen-ils.org/communicate/mailing-lists/ or contact us on the Freenode
+IRC network on the #evergreen channel.
+
+License
+-------
+This work is licensed under the Creative Commons Attribution-ShareAlike 3.0
+Unported License. To view a copy of this license, visit
+http://creativecommons.org/licenses/by-sa/3.0/ or send a letter to Creative
+Commons, 444 Castro Street, Suite 900, Mountain View, California, 94041, USA.
diff --git a/configure.ac b/configure.ac
index 74e6b3b..ec27986 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,8 +20,8 @@
export PATH=${PATH}:/usr/sbin
AC_PREREQ(2.61)
-AC_INIT(Open-ILS, trunk, open-ils-dev at list.georgialibraries.org)
-AM_INIT_AUTOMAKE([OpenILS], [trunk])
+AC_INIT(Open-ILS, 2.11.1, open-ils-dev at list.georgialibraries.org)
+AM_INIT_AUTOMAKE([OpenILS], [2.11.1])
AC_REVISION($Revision: 0.1 $)
AC_CONFIG_SRCDIR([configure.ac])
AC_CONFIG_SUBDIRS([Open-ILS/xul/staff_client/external/libmar])
commit 0ed97812e534d03dce007cad0144d81ac73a4e82
Author: Dan Wells <dbw2 at calvin.edu>
Date: Wed Nov 16 16:47:49 2016 -0500
bump up upgrade instructions for 2.11.1
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/docs/installation/server_upgrade.txt b/docs/installation/server_upgrade.txt
index 773c250..18ebfe5 100644
--- a/docs/installation/server_upgrade.txt
+++ b/docs/installation/server_upgrade.txt
@@ -8,7 +8,7 @@ Software Prerequisites
* **PostgreSQL**: Version 9.3 is recommended. The minimum supported version
is 9.1.
- * **Linux**: Evergreen 2.10.1 has been tested on Debian Jessie (8.0),
+ * **Linux**: Evergreen 2.11.1 has been tested on Debian Jessie (8.0),
Debian Wheezy (7.0), Ubuntu Xenial Xerus (16.04), Ubuntu Trusty Tahr (14.04),
and Fedora.
If you are running an older version of these distributions, you may want
@@ -44,12 +44,12 @@ osrf_control --localhost --stop-all
.. Back up the /openils directory.
. Upgrade OpenSRF. Download and install the latest version of OpenSRF from
the https://evergreen-ils.org/opensrf-downloads/[OpenSRF download page].
-. As the *opensrf* user, download and extract Evergreen 2.10.1:
+. As the *opensrf* user, download and extract Evergreen 2.11.1:
+
[source, bash]
-----------------------------------------------
-wget https://evergreen-ils.org/downloads/Evergreen-ILS-2.10.1.tar.gz
-tar xzf Evergreen-ILS-2.10.1.tar.gz
+wget https://evergreen-ils.org/downloads/Evergreen-ILS-2.11.1.tar.gz
+tar xzf Evergreen-ILS-2.11.1.tar.gz
-----------------------------------------------
+
[NOTE]
@@ -59,7 +59,7 @@ For the latest edition of Evergreen, check the https://evergreen-ils.org/egdownl
+
[source, bash]
---------------------------------------------
-cd /home/opensrf/Evergreen-ILS-2.10.1
+cd /home/opensrf/Evergreen-ILS-2.11.1
---------------------------------------------
+
On the next command, replace `[distribution]` with one of these values for your
@@ -84,7 +84,7 @@ make -f Open-ILS/src/extras/Makefile.install [distribution]
+
[source, bash]
------------------------------------------------------------
-cd /home/opensrf/Evergreen-ILS-2.10.1
+cd /home/opensrf/Evergreen-ILS-2.11.1
PATH=/openils/bin:$PATH ./configure --prefix=/openils --sysconfdir=/openils/conf
make
------------------------------------------------------------
@@ -95,8 +95,8 @@ These instructions assume that you have also installed OpenSRF under /openils/.
+
[source, bash]
------------------------------------------------------------
-cd /home/opensrf/Evergreen-ILS-2.10.1
-make STAFF_CLIENT_STAMP_ID=rel_2_10_1 install
+cd /home/opensrf/Evergreen-ILS-2.11.1
+make STAFF_CLIENT_STAMP_ID=rel_2_11_1 install
------------------------------------------------------------
+
. As the *root* user, change all files to be owned by the opensrf user and group:
@@ -112,7 +112,7 @@ chown -R opensrf:opensrf /openils
-----------------------------------------------------------
cd /openils/var/web/xul/
rm server
-ln -sf rel_2_10_1/server server
+ln -sf rel_2_11_1/server server
----------------------------------------------------------
+
. As the *opensrf* user, update opensrf_core.xml and opensrf.xml by copying the
@@ -132,7 +132,7 @@ Copying these configuration files will remove any customizations you have made t
+
[source, bash]
-------------------------------------------------------------------------
-cd /home/opensrf/Evergreen-ILS-2.10.1
+cd /home/opensrf/Evergreen-ILS-2.11.1
perl Open-ILS/src/support-scripts/eg_db_config --update-config --service all \
--create-offline --database evergreen --host localhost --user evergreen --password evergreen
-------------------------------------------------------------------------
@@ -156,21 +156,21 @@ The diff command can be used to show the differences between the distribution ve
+
[source, bash]
----------------------------------------------------------
-cp /home/opensrf/Evergreen-ILS-2.10.1/Open-ILS/examples/apache/eg_startup /etc/apache2/eg_startup
+cp /home/opensrf/Evergreen-ILS-2.11.1/Open-ILS/examples/apache/eg_startup /etc/apache2/eg_startup
----------------------------------------------------------
+
.. Update /etc/apache2/eg_vhost.conf by copying the example from Open-ILS/examples/apache/eg_vhost.conf.
+
[source, bash]
----------------------------------------------------------
-cp /home/opensrf/Evergreen-ILS-2.10.1/Open-ILS/examples/apache/eg_vhost.conf /etc/apache2/eg_vhost.conf
+cp /home/opensrf/Evergreen-ILS-2.11.1/Open-ILS/examples/apache/eg_vhost.conf /etc/apache2/eg_vhost.conf
----------------------------------------------------------
+
.. Update /etc/apache2/sites-available/eg.conf by copying the example from Open-ILS/examples/apache/eg.conf.
+
[source, bash]
----------------------------------------------------------
-cp /home/opensrf/Evergreen-ILS-2.10.1/Open-ILS/examples/apache/eg.conf /etc/apache2/sites-available/eg.conf
+cp /home/opensrf/Evergreen-ILS-2.11.1/Open-ILS/examples/apache/eg.conf /etc/apache2/sites-available/eg.conf
----------------------------------------------------------
Upgrade the Evergreen database schema
@@ -193,36 +193,22 @@ anything goes wrong during the upgrade.
=============
Evergreen provides incremental upgrade scripts that allow you to upgrade
from one minor version to the next until you have the current version of
-the schema. For example, if you want to upgrade from 2.5.1 to 2.10.1, you
+the schema. For example, if you want to upgrade from 2.5.1 to 2.6.3, you
would run the following upgrade scripts:
- 2.5.1-2.5.2-upgrade-db.sql
- 2.5.2-2.5.3-upgrade-db.sql
- 2.5.3-2.6.0-upgrade-db.sql (this is a major version upgrade)
+- 2.6.0-2.6.1-upgrade-db.sql
+- 2.6.1-2.6.2-upgrade-db.sql
- 2.6.2-2.6.3-upgrade-db.sql
-- 2.6.3-2.7.0-upgrade-db.sql (this is a major version upgrade)
-- 2.7.0-2.7.1-upgrade-db.sql
-- 2.7.1-2.7.2-upgrade-db.sql
-- 2.7.2-2.7.3-upgrade-db.sql
-- 2.7.3-2.7.4-upgrade-db.sql
-- 2.7.4-2.8.0-upgrade-db.sql (this is a major version upgrade)
-- 2.8.0-2.8.1-upgrade-db.sql
-- 2.8.1-2.8.2-upgrade-db.sql
-- 2.8.2-2.8.3-upgrade-db.sql
-- 2.8.3-2.8.4-upgrade-db.sql
-- 2.8.4-2.9.0-upgrade-db.sql (this is a major version upgrade)
-- 2.9.0-2.9.1-upgrade-db.sql
-- 2.9.1-2.9.2-upgrade-db.sql
-- 2.9.2-2.9.3-upgrade-db.sql
-- 2.9.3-2.10.0-upgrade-db.sql
-- 2.10.0-2.10.1-upgrade-db.sql
Note that you do *not* want to run additional 2.5 scripts to upgrade to the
newest version of 2.5, since currently there is no automated way to upgrade
from 2.5.4+ to 2.6. Only upgrade as far as necessary to reach the major
version upgrade script (in this example, as far as 2.5.3).
-To upgrade across multiple major versions (e.g. from 2.3.0 to 2.10.1), use
+To upgrade across multiple major versions (e.g. from 2.3.0 to 2.7.4), use
the same logic to utilize the provided major version upgrade scripts. For
example:
@@ -235,12 +221,6 @@ example:
- (run all incremental scripts from 2.6.0 to 2.6.3)
- 2.6.3-2.7.0-upgrade-db.sql
- (run all incremental scripts from 2.7.0 to 2.7.4)
-- 2.7.4-2.8.0-upgrade-db.sql
-- (run all incremental scripts from 2.8.0 to 2.8.4)
-- 2.8.4-2.9.0-upgrade-db.sql
-- (run all incremental scripts from 2.9.0 to 2.9.3)
-- 2.9.3-2.10.0-upgrade-db.sql
-- (run all incremental scripts from 2.10.0 to 2.10.1)
=============
[CAUTION]
@@ -249,13 +229,13 @@ that you cannot resolve yourself through additional troubleshooting, please
report the errors to the https://evergreen-ils.org/communicate/mailing-lists/[Evergreen
Technical Discussion List].
-Run the following steps (including other upgrade scripts, as noted above)
+Run the following steps (using appropriate upgrade scripts, as noted above)
as a user with the ability to connect to the database server.
[source, bash]
----------------------------------------------------------
-cd /home/opensrf/Evergreen-ILS-2.10.0/Open-ILS/src/sql/Pg
-psql -U evergreen -h localhost -f version-upgrade/2.10.0-2.10.1-upgrade-db.sql evergreen
+cd /home/opensrf/Evergreen-ILS-2.11.1/Open-ILS/src/sql/Pg
+psql -U evergreen -h localhost -f version-upgrade/[appropriate versions here]-upgrade-db.sql evergreen
----------------------------------------------------------
[TIP]
@@ -336,6 +316,6 @@ from the Evergreen community.
Review Release Notes
~~~~~~~~~~~~~~~~~~~~
-Review the <<_evergreen_2_10_release_notes,2.10 release notes>> for other tasks
+Review the <<_evergreen_2_11_release_notes,2.11 release notes>> for other tasks
that need to be done after upgrading. If you have upgraded over several
major versions, you will need to review the release notes for each version also.
commit 4a562ae438ad2f20e500e731dc0acb96afe917fe
Author: Dan Wells <dbw2 at calvin.edu>
Date: Wed Nov 16 16:40:22 2016 -0500
bumping Perl version string for 2.11.1
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/perlmods/lib/OpenILS.pm b/Open-ILS/src/perlmods/lib/OpenILS.pm
index d7235ce..9665864 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS.pm
@@ -6,6 +6,6 @@ OpenILS - Client and server support for the Evergreen open source library system
=cut
-our $VERSION = '2.4';
+our $VERSION = '2.1101';
1;
-----------------------------------------------------------------------
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list