From 2c7f0dde4eac50e5f556fce14270997baffb8c97 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Fri, 22 Feb 2013 14:26:42 -0500 Subject: [PATCH] Bumping version numbers, adding Upgrade Script and Changelog Signed-off-by: Bill Erickson --- ChangeLog | 597 ++++++++++++++++++++- Open-ILS/src/perlmods/lib/OpenILS/Application.pm | 2 +- Open-ILS/src/sql/Pg/002.schema.config.sql | 1 + .../staff_client/chrome/content/main/about.html | 2 +- .../xul/staff_client/defaults/preferences/prefs.js | 2 +- Open-ILS/xul/staff_client/windowssetup.nsi | 2 +- README | 550 ++++++++++++++++++- build/tools/make_release | 2 +- configure.ac | 4 +- 9 files changed, 1151 insertions(+), 11 deletions(-) mode change 120000 => 100644 README diff --git a/ChangeLog b/ChangeLog index 1f72b2c73e..a0e2b587fc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,594 @@ -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 d69146ed8a9a02a2aa632ed2211ebf58c9cc1279 +Author: Bill Erickson +Date: Thu Feb 21 13:04:54 2013 -0500 + + Setting OpenILS.pm VERSION + + Signed-off-by: Bill Erickson + +1 1 Open-ILS/src/perlmods/lib/OpenILS.pm + +commit a7a1ddc6418e8967a807c6e9360d77fb8c94b695 +Author: Bill Erickson +Date: Thu Feb 21 11:54:54 2013 -0500 + + Translations import / newpot : 2.3.4 + + Signed-off-by: Bill Erickson + +6 6 build/i18n/po/circ.properties/cs-CZ.po +6 6 build/i18n/po/circ.properties/en-CA.po +6 6 build/i18n/po/circ.properties/hy-AM.po +4 4 build/i18n/po/common.properties/en-CA.po +4 4 build/i18n/po/common.properties/hy-AM.po +8 8 build/i18n/po/conify.js/de-DE.po +122 122 build/i18n/po/db.seed/cs-CZ.po +127 127 build/i18n/po/db.seed/de-DE.po +122 122 build/i18n/po/db.seed/en-CA.po +122 122 build/i18n/po/db.seed/en-GB.po +122 122 build/i18n/po/db.seed/es-ES.po +123 123 build/i18n/po/db.seed/fi-FI.po +122 122 build/i18n/po/db.seed/fr-CA.po +122 122 build/i18n/po/db.seed/hy-AM.po +122 122 build/i18n/po/db.seed/oc-FR.po +122 122 build/i18n/po/db.seed/pt-BR.po +122 122 build/i18n/po/db.seed/ru-RU.po +122 122 build/i18n/po/db.seed/tr-TR.po +4 4 build/i18n/po/fm_IDL.dtd/cs-CZ.po +4 4 build/i18n/po/fm_IDL.dtd/en-CA.po +4 4 build/i18n/po/fm_IDL.dtd/hy-AM.po +6 6 build/i18n/po/lang.dtd/cs-CZ.po +25 15 build/i18n/po/lang.dtd/en-CA.po +5 5 build/i18n/po/lang.dtd/fr-CA.po +26 15 build/i18n/po/lang.dtd/hy-AM.po +7 7 build/i18n/po/offline.properties/en-CA.po +7 7 build/i18n/po/offline.properties/hy-AM.po +6 6 build/i18n/po/opac.dtd/de-DE.po +4 4 build/i18n/po/patron.properties/en-CA.po +4 4 build/i18n/po/patron.properties/hy-AM.po + +commit 8acbaecda1acdc15183dc379e7135f955118b737 +Author: Ben Shum +Date: Wed Jan 16 16:33:22 2013 -0500 + + LP 1092284 - Fix add to my list dropdown with ContentCafe links + + As noted in the bug ticket, the dropdown menu for Add to my list disappears + whenever hovering over the Reviews & More link for ContentCafe-enabled TPACs. + + Removing position:relative from .results_review seems to keep the two areas + from having any strange interactions. + + Signed-off-by: Ben Shum + Signed-off-by: Kathy Lussier + +0 1 Open-ILS/src/templates/opac/css/style.css.tt2 + +commit af46b5cc0316a1923c53bdd5dc1d7797cadef3d3 +Author: Lebbeous Fogle-Weekley +Date: Wed Jan 23 13:07:33 2013 -0500 + + Acq: EDI omnibus bugfix package + + EDIReader bugfix - Process misc charges better + MOA+304 seems to be an encoding peculiar to Ingram for processing fees. + + Bubble up errors better from invoice processing + Errors were getting logged, but weren't linked on the related + acq.edi_message row in the database like they could have been to make + debugging easier. + + This incidentally elevates one possible message from warning level to + error, but even as a warning it was stopping the processing of the + invoice in question there. So there's no meaningful difference. + + Try harder to associate incoming EDI messages with exact right account + Sites use many very nearly identical EDI accounts (same host and + credentials) with different values only for the label and the vendcode. + This allows mapping of an order to a profile on the vendor side. + + The problem with this is that the edi_fetcher and the processes it + kicks off did not know how to map incoming messages to the right + account based on vendcode. That code simply iterated through + accounts, using host information and login credentials, and grabbing + what it can find, as if + there will be no other Evergreen-side EDI "accounts" with the same + hostname and loging credentials. + + This should help with that. + + Style and whitespace cleanups in O::A::Acq::EDI.pm + All I could stand before I just couldn't take it anymore. + + New PO template created malformed JSON in the INC_COPIES=0 case + And now it no longer should. + + Allow order responses and invoices to omit PO repetition in lineitem refs + Usually vendor documents have bits of EDI that look like: + RFF+LI:100/123 + where 100 is a PO number and 123 is a lineitem number. + + Sometimes, for some documents, B&T at least will omit the '100/' part. + This is fine because we don't really need that number repeated for + every lineitem. We do need this change so that our EDI reader code + can deal with the omission, though. + + Be more liberal reading EDIFACT message reference number + Spec, if I read it correctly, says that this is alphanumeric, not just + numeric, and ULS is one vendor I've seen taking advantage of letters + and numbers in that space. + + This commit makes the relevant regex in our EDIReader appropriately + more tolerant. + + Fixes to new vencode parsing for incoming EDI messages + + Prevent problem in preventing EDI re-retrieves + The query we were using before would needlessly transfer large objects, + potentially hitting Jabber message size limits. + + We're just testing for the existence of such objects, so we need no + more than a single ID in the result. + + Fix EDI invoices for ULS, improve troubleshootability + 1) Taxes appear in different, but still valid way in ULS invoices than + in invoices from other vendors observed to date. + + 2) Invoices from ULS use MOA 203 to indicate unit price instead of the + usual meaning of whole-lineitem price. + + 3) Now abuse acq.invoice.note to leave better troubleshooting + breadcrumbs. + + Invoices from EDI had unsavable invoice_items attached + Deal with this by letting us create fund_debits a little later than in + the previous workflow. We have to, because the EDI-level stuff creating + the invoice doesn't know what fund we want to target for taxes and misc + charges. + + The problem we're fixing manifested by showing an alert() dialog about + ACQ_FUND_DEBIT_NOT_FOUND. + + Signed-off-by: Lebbeous Fogle-Weekley + Signed-off-by: Bill Erickson + +278 132 Open-ILS/src/perlmods/lib/OpenILS/Application/Acq/EDI.pm +34 8 Open-ILS/src/perlmods/lib/OpenILS/Application/Acq/Invoice.pm +44 6 Open-ILS/src/perlmods/lib/OpenILS/Utils/EDIReader.pm +2 2 Open-ILS/src/sql/Pg/950.data.seed-values.sql + +commit 5af2c67f0345d6222b6323fbd3f56fd80c16da57 +Author: Mike Rylander +Date: Thu Feb 14 11:00:42 2013 -0500 + + Don't sort filter group entries in the template + + They are now delivered sorted by 'pos', and the template sorting was + ascii-betical anyway, which is incorrect. + + Signed-off-by: Mike Rylander + Signed-off-by: Bill Erickson + +3 8 Open-ILS/src/templates/opac/parts/filter_group_selector.tt2 + +commit ddb61e9a34fd6bd4419fb401dddcba250d75cdee +Author: Mike Rylander +Date: Thu Feb 14 10:51:37 2013 -0500 + + Sort search filter group entries by 'pos' + + We use a fleshed cstore call to grab search filter groups and their entries, + but we don't currently sort them by their 'pos' field, which is it's purpose. + cstore will apply order_by expressions to the applicable tables in a fleshed + search/retrieve. This does that. + + Signed-off-by: Mike Rylander + Signed-off-by: Bill Erickson + +2 1 Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Util.pm + +commit e23d9a755a9ce1c51ef563f776526661b7623228 +Author: Thomas Berezansky +Date: Wed Feb 6 16:01:49 2013 -0500 + + ForceExternal: Compare hostnames case insensitive + + Lowercase both sides to avoid "right host, wrong case" issues. + + Resolves LP1081699 where the external browser would be used due to + hostname case sensitivity. + + Signed-off-by: Thomas Berezansky + Signed-off-by: Ben Shum + +1 1 Open-ILS/xul/staff_client/components/forceexternal.js + +commit a4526145b8047e864495178b3d63d52b81fc0345 +Author: Dan Scott +Date: Mon Jan 21 17:02:42 2013 -0500 + + TPAC: Make locale picker match default locale + + As noted by Pasi Kallinen, the language picker would not reflect the + chosen locale unless your cookie had been set or there was an explicit + CGI parameter with the locale name. + + Accordingly, get the default locale from the context vars and use that + to set the selected value for the language picker in the absence of + anything else, to prevent the picker from possibly confusingly showing + the first language alphabetically rather than the currently displayed + language in the rest of the UI. + + Signed-off-by: Dan Scott + Signed-off-by: Pasi Kallinen + Signed-off-by: Ben Shum + +6 1 Open-ILS/src/templates/opac/parts/locale_picker.tt2 + +commit 6a1db3f4f1bd2e355032cfc82b59af8861d8fc2a +Author: Lebbeous Fogle-Weekley +Date: Wed Jan 2 12:33:36 2013 -0500 + + LP #1092921: Display of/sorting by CN affixes in Simplified Hold Pull List + + In the Simplified Hold Pull List interface, the "Call Number Label" column + displays the call number of the copy targeted by the hold in each row, + and it does so by combining affixes with the actual label field. + Sorting of this column actually uses the call number sortkey generated + in-database for this purpose. + + Sometimes this means that sorting order doesn't match what you'd + expect to see with this column. Opinions differ on desired behavior, so + now you can explicity add columns to the table for call number prefix + and suffix, and sort on either of those (potentially in combination with + other columns). + + Amended from an earlier version of this commit that still didn't sort + CN prefix and suffix columns quite right. + + Signed-off-by: Lebbeous Fogle-Weekley + Signed-off-by: Kathy Lussier + + Conflicts: + Open-ILS/src/templates/circ/hold_pull_list.tt2 + + Signed-off-by: Ben Shum + +12 2 Open-ILS/src/templates/circ/hold_pull_list.tt2 + +commit ce71d68c024d4d5db1b77f197bfc23a40286a8f7 +Author: Mark Cooper +Date: Tue Oct 16 11:02:23 2012 -0700 + + LP#1067361: vandelay: batch queue deletion no longer works + + Because window.location.reload can trigger before the deletions + have occurred. Simple fix (band aid?) is to make the delete + calls in sync. + + Signed-off-by: Mark Cooper + Signed-off-by: Kathy Lussier + Signed-off-by: Ben Shum + +1 1 Open-ILS/web/js/ui/default/vandelay/vandelay.js + +commit 7188b110ca7c2dcde23f053a978c508974564082 +Author: Ben Shum +Date: Tue Jan 29 00:27:55 2013 -0500 + + LP1054053 - Remove white padding around login inputs + + Forget efforts to make the boxes bigger and smoother as it was in the past. + Instead, opting for a cleaner look by removing the extra white background + that was part of the padding surrounding the actual login input area. This + removes the feeling that the box area should have been bigger than it really + is. + + Signed-off-by: Ben Shum + Signed-off-by: Michael Peters + +1 2 Open-ILS/src/templates/opac/css/style.css.tt2 + +commit 351427dbde7eadfdbeb68369dbc002dbfea557da +Author: Michael Peters +Date: Tue Nov 27 09:05:35 2012 -0500 + + Replace "Mirror Mirror" default non-AC jacket cover + + Every item in KPAC that doesn't have a jacket cover uses + the cover for "Mirror Mirror". This is inappropriate, so + lets replace it with a small blank image. + + Signed-off-by: Michael Peters + Signed-off-by: Ben Shum + +- - Open-ILS/web/images/kpac/item_image.jpg + mode change 100755 => 100644 Open-ILS/web/images/kpac/item_image.jpg + +commit 77be46a2947c16cceae185877b6685904ae54f65 +Author: Jason Etheridge +Date: Thu Sep 20 13:10:15 2012 -0400 + + LP1053526 - Don't inadvertently modify the in-memory org tree when printing + + To see an example of this causing a problem, load Holdings Maintenance for + an arbitrary bib record with items. Make sure the Hide Empty Libs checkbox + is checked. Hit the Print button at the bottom of the UI (it's okay to then + Cancel the print). Then hit Refresh. It should result in an org.children() + is null error. + + Signed-off-by: Jason Etheridge + Signed-off-by: Ben Shum + +2 2 Open-ILS/xul/staff_client/chrome/content/util/list.js + +commit 5ad1fd55868f51fb2e72d8c901da617fd86f9494 +Author: Kathy Lussier +Date: Thu Jan 31 10:51:40 2013 -0500 + + Copy_offset and copy_limit shouldn't persist in URL + + Added copy_offset and copy_limit to stop_parms definition so that they + don't persist in URL when returning to search results or launching + subject/series searches. + + Signed-off-by: Kathy Lussier + Signed-off-by: Pasi Kallinen + Signed-off-by: Ben Shum + +1 1 Open-ILS/src/templates/opac/parts/record/body.tt2 + +commit ad4a7f49ef10bdbdbd7977b576c298ea691c927e +Author: Lebbeous Fogle-Weekley +Date: Mon Jan 21 14:54:55 2013 -0500 + + Serials: Caption/pattern wizard use enum fields for chronology when no enum + + MFHD spec says that when there are no ‡a - ‡f enumeration captions, any + chronology captions should move back from their usual ‡i - ‡m places + back into enumeration space. + + The predictions engine we already have deals with this better than with + the wrong patterns we were creating before, e.g.: + + 853 20 ‡81 ‡i(year) ‡j(month) ‡wm + + Signed-off-by: Lebbeous Fogle-Weekley + Signed-off-by: Dan Wells + +15 3 Open-ILS/xul/staff_client/server/serial/pattern_wizard.js + +commit 677167d56647dd7351b41aeee4851384d05c734e +Author: Dan Scott +Date: Fri Aug 17 16:07:19 2012 -0400 + + Deal with opt-in boundaries defensively + + If a site had not set an 'org.patron_opt_default' OU setting, then it + seemed that a DEFAULT value was getting dumped into the "create opt-in" + INSERT statement for the org_unit argument, and that (as there is a + non-NULL constraint on the column and no default value for the column) + resulted in the patron not getting opted in. + + One way for sites to deal with this is to set an opt-in boundary at the + consortial level, along the lines of: + + INSERT INTO actor.org_unit_setting (org_unit, name, value) + VALUES (1, 'org.patron_opt_default', 2); + + Alternatively, in the absense of any such setting, opt-in should + continue to work as it had before the new feature was added; this change + keeps the old behaviour active in that case. + + Signed-off-by: Dan Scott + Signed-off-by: James Fournie + Signed-off-by: Ben Shum + +5 2 Open-ILS/src/perlmods/lib/OpenILS/Application/Actor.pm + +commit 50483a39db90045150343cc6ee98365a947c9fc3 +Author: Bill Erickson +Date: Mon Nov 5 09:22:55 2012 -0500 + + LP1051112 - Display lineitem commands menu on empty picklists + + Ensure that the lineitem commands drop-down menu appears even when the + picklist is empty. Previously, the commands were not displayed until + the first lineitem was retrieved. For empty picklists, of course, there + will be no first lineitem. + + Signed-off-by: Bill Erickson + Signed-off-by: Ben Shum + +3 0 Open-ILS/web/js/ui/default/acq/picklist/view.js + +commit e634bfcd3b8c49857bd56f790c489aeed956447c +Author: Kathy Lussier +Date: Fri Jan 25 21:35:13 2013 -0500 + + Documentation: acquisitions updates + + Update Search for Line Items from an Invoice section to reflect minor + changes that came with lp1050008. Also, moved received Items from an + Invoice section to fall within the rest of the Invoices section. + + Signed-off-by: Kathy Lussier + +6 0 docs/acquisitions/invoices.txt +3 3 docs/acquisitions/receive_items_from_invoice.txt +- - docs/media/Search_for_line_items_from_an_invoice2.jpg + +commit 6f6468d4a4e14ceb2376419f88b3930007bd10a8 +Author: Robert Soulliere +Date: Tue Jan 22 09:36:08 2013 -0500 + + Documentation: Update staff client installation for 2.3.3 version. + + Signed-off-by: Robert Soulliere + +3 3 docs/installation/staff_client_installation.txt + +commit 2136de21293f78c9496b261854aec3af973222c0 +Author: Robert Soulliere +Date: Tue Jan 22 09:17:26 2013 -0500 + + Documentation: Update upgrading the server instructions to point to 2.3.3. + + Signed-off-by: Robert Soulliere + +13 12 docs/installation/server_upgrade.txt + +commit eed9a4fd907be78dca50ec6355ad6d3922a7dd50 +Author: Ben Shum +Date: Fri Dec 21 15:47:40 2012 -0500 + + LP1054053 - make default input font darker + + The original light grey made it difficult to see what was being input. + Change to use text font color variable (black by default). + + Signed-off-by: Ben Shum + Signed-off-by: Dan Scott + +1 1 Open-ILS/src/templates/opac/css/style.css.tt2 + +commit 1290cc1aa8a8c4f5a535548cd56d917576ed5fd1 +Author: Dan Scott +Date: Tue Jan 8 17:02:38 2013 -0500 + + TPAC: Prevent numeric subfields in series display + + Series fields can theoretically contain linking subfields ($6, $8) and + other numeric subfields that aren't meant to be displayed. So, do not + display them. + + Signed-off-by: Dan Scott + Signed-off-by: Ben Shum + +18 9 Open-ILS/src/templates/opac/parts/record/series.tt2 + +commit f8e65c7070dd02bb71750f64e77297fabb80f141 +Author: Ben Shum +Date: Sun Dec 2 00:02:25 2012 -0500 + + TPAC - hide subfield 6 and 8 from record title display + + Record display previously showed every subfield associated with tag 245 + to display the title in TPAC's record view. Hide subfields 6 and 8 + because they only show linkage information that does not contribute to + the actual title content. + + Signed-off-by: Ben Shum + Signed-off-by: Dan Scott + +1 1 Open-ILS/src/templates/opac/parts/misc_util.tt2 + +commit bb2b1fc3b781f34d3074619108004bc62cae38cd +Author: Ben Shum +Date: Mon Dec 3 10:37:43 2012 -0500 + + Update staff client's about page to include newest core committers + + The newest core committers were elected during the Evergreen Hack-A-Way on + October 10, 2012: + + Jeff Godin, Traverse Area District Library + Benjamin Shum, Bibliomation, Inc. + Jason Stephenson, Merrimack Valley Library Consortium + + Also update language of page to reflect that these contributors are now core + "committers" rather than "developers". And move past core committers into + their own section. + + Signed-off-by: Ben Shum + Signed-off-by: Dan Scott + +13 6 Open-ILS/xul/staff_client/chrome/content/main/about.html + +commit 1caa2b6cda4fd28eabd911ecda5bdc86599b09be +Author: Lebbeous Fogle-Weekley +Date: Wed Jan 16 15:18:56 2013 -0500 + + Add 2.2.4 -> 2.2.5 upgrade script + + Signed-off-by: Lebbeous Fogle-Weekley + Signed-off-by: Bill Erickson + +278 0 Open-ILS/src/sql/Pg/version-upgrade/2.2.4-2.2.5-upgrade-db.sql + create mode 100644 Open-ILS/src/sql/Pg/version-upgrade/2.2.4-2.2.5-upgrade-db.sql + +commit 16b73cbada70bd47752b93f9f3213a7ca654d962 +Author: Bill Erickson +Date: Wed Jan 16 15:18:57 2013 -0500 + + Forward-porting 2.3.2 -> 2.3.3 DB upgrade + + Signed-off-by: Bill Erickson + Signed-off-by: Lebbeous Fogle-Weekley + +314 0 Open-ILS/src/sql/Pg/version-upgrade/2.3.2-2.3.3-upgrade-db.sql + create mode 100644 Open-ILS/src/sql/Pg/version-upgrade/2.3.2-2.3.3-upgrade-db.sql + +commit 1419b2ae9fa6a6a9e24e98a55d791406c3a882a1 +Author: Galen Charlton +Date: Tue Jan 15 11:30:41 2013 -0500 + + LP#1098377: protect against even more cstore segfaults + + Following up on the preceding patch, passing null + as the savepoint name to savepoint.release and + savepoint.rollback would also segfault cstore. + + Signed-off-by: Galen Charlton + Signed-off-by: Bill Erickson + +12 0 Open-ILS/src/c-apps/oils_sql.c + +commit 850d1054e3c0753dc232f3783a92070114f4ff78 +Author: Bill Erickson +Date: Tue Jan 15 10:58:16 2013 -0500 + + Verify savepoint name is non-null + + Before we attempt to mangle the name, let's ensure that it's non-null. + Otherwise, segfaults ensue. + + Signed-off-by: Bill Erickson + Signed-off-by: Galen Charlton + +6 0 Open-ILS/src/c-apps/oils_sql.c + +commit a17f4a5e3961b049adcb8a556e3fcc9d770ed99f +Author: Dan Scott +Date: Fri Jan 11 01:32:13 2013 -0500 + + Protect against overly long savepoint names + + Per http://postgresql.org/docs/9.1/static/sql-syntax-lexical.html#SQL-SYNTAX-IDENTIFIERS, + the maximum identifier length works out to being 63 bytes (+1 for the + null terminator), so to avoid potential memory pressure by a 10GB string + somehow being passed in as the savepoint name, malloc no more than 64 + bytes and copy no more than 63 bytes from the incoming name to the + escaped name. + + Signed-off-by: Dan Scott + Signed-off-by: Galen Charlton + +16 2 Open-ILS/src/c-apps/oils_sql.c + +commit 955468b71d3cee9c97b27a8ddc90c1a2151aaac8 +Author: Galen Charlton +Date: Fri Jan 11 02:30:50 2013 -0500 + + LP#1098377: sanitize savepoint names + + When invoking open-ils.{cstore,pcrud,rstore}.savepoint.*, the + caller supplies a name for the savepoint. However, the savepoint + names could be constructed so that the caller could execute + arbitrary SQL. This patch sanitizes the name so that it contains + only alphanumeric and underscore characters. + + Signed-off-by: Galen Charlton + Signed-off-by: Dan Scott + +37 3 Open-ILS/src/c-apps/oils_sql.c diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application.pm index cd4dbbf9c0..13f8e8bc92 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Application.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Application.pm @@ -6,7 +6,7 @@ use base qw/OpenSRF::Application/; 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-3-4"; } __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 25fa29294f..1ffb020eb8 100644 --- a/Open-ILS/src/sql/Pg/002.schema.config.sql +++ b/Open-ILS/src/sql/Pg/002.schema.config.sql @@ -88,6 +88,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 ('0751', :eg_version); -- berick/senator +INSERT INTO config.upgrade_log (version, applied_to) VALUES ('2.3.4', :eg_version); CREATE TABLE config.bib_source ( id SERIAL PRIMARY KEY, 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 2737f47bf1..82514353fc 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 @@

Evergreen

Target Server ID:

-

$HeadURL$

+

http://git.evergreen-ils.org/Evergreen.git?h=refs/heads/rel_2_3_4

What is Evergreen?

diff --git a/Open-ILS/xul/staff_client/defaults/preferences/prefs.js b/Open-ILS/xul/staff_client/defaults/preferences/prefs.js index 6352b6e04e..a51b79cac5 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/Evergreen.git?h=refs/heads/rel_2_3_4"); 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 e0bc1ef5df..e7e96bb1ed 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.3" !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 b57451acb4..0000000000 --- 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 0000000000..fa878e74d7 --- /dev/null +++ b/README @@ -0,0 +1,549 @@ +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/downloads + +Developers working directly with the source code from the Git repository, +rather than an official release tarball, must install some extra packages +and perform one step before they can proceed with the `./configure` step. + +As the *root* Linux account, install the following packages: + + * autoconf + * automake + * libtool + +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 +------------------------------------------------------------------------------ + +After running `make install`, developers also 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/. +------------------------------------------------------------------------------ + +Installing prerequisites +------------------------ + +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.1 or later). + You can download OpenSRF releases from http://evergreen-ils.org/opensrf.php +2. On many distributions, it is necessary to install PostgreSQL 9 from external + repositories. ++ + * On Debian Squeeze, open `/etc/apt/sources.list` in a text editor as the + *root* Linux account and add the following line: ++ +[source, bash] +------------------------------------------------------------------------------ +deb http://backports.debian.org/debian-backports squeeze-backports main contrib +------------------------------------------------------------------------------ ++ + * On Ubuntu Lucid, you can use a PPA (personal package archive), which are + package sources hosted on Launchpad. The one most commonly used by Evergreen + Community members is maintained by Martin Pitt, who also maintains the + official PostgreSQL packages for Ubuntu. As the *root* Linux account, issue + the following commands to add the PPA source: ++ +[source, bash] +------------------------------------------------------------------------------ +apt-get install python-software-properties +add-apt-repository ppa:pitti/postgresql +------------------------------------------------------------------------------ ++ + * Ubuntu Precise comes with PostgreSQL 9, so no additional steps are required. ++ + * Fedora comes with PostgreSQL 9, 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-squeeze`, `fedora`, `ubuntu-lucid`, or + `ubuntu-precise` for below: ++ +[source, bash] +------------------------------------------------------------------------------ +make -f Open-ILS/src/extras/Makefile.install +------------------------------------------------------------------------------ ++ +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 Precise. The ubuntu-precise +target uses libdbd-pgsql from packages. ++ +.Debian / Ubuntu Lucid +[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 +------------------------------------------------------------------------------ + +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] +------------------------------------------------------------------------------ +./configure --prefix=/openils --sysconfdir=/openils/conf +make +------------------------------------------------------------------------------ + +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_3_4 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 +------------------------------------------------------------------------------ + +Configure the Apache Web server +------------------------------- + +1. Use the example configuration files in `Open-ILS/examples/apache/` 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 and Ubuntu +[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/startup.pl /etc/apache2/ +# Now set up SSL +mkdir /etc/apache2/ssl +cd /etc/apache2/ssl +------------------------------------------------------------------------------ ++ +.Fedora +[source,bash] +------------------------------------------------------------------------------ +cp Open-ILS/examples/apache/eg.conf /etc/httpd/conf.d/ +cp Open-ILS/examples/apache/eg_vhost.conf /etc/httpd/ +cp Open-ILS/examples/apache/startup.pl /etc/httpd/ +# Now set up SSL +mkdir /etc/httpd/ssl +cd /etc/httpd/ssl +------------------------------------------------------------------------------ ++ +2. 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 +------------------------------------------------------------------------------ ++ +3. As the *root* Linux account, edit the `eg.conf` file that you copied into +place. + a. Replace `Allow from 10.0.0.0/8` with `Allow from all` (to enable + access to the offline upload / execute interface from any workstation on + any network - note that you must secure this for a production instance) + b. (Fedora): Change references from the non-existent `/etc/apache2/` directory + to `/etc/httpd/`. +4. 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`. +5. Configure Apache with performance settings appropriate for Evergreen: + * (Debian and Ubuntu): As the *root* Linux account, edit + `/etc/apache2/apache2.conf`: + * (Fedora): As the *root* Linux account, edit `/etc/httpd/conf/httpd.conf`: + a. Change `KeepAliveTimeout` to `1`. Higher values reduce the chance of + a request timing out unexpectedly, but increase the risk of using up + all available Apache child processes. + b. 'Optional': Change `MaxKeepAliveRequests` to `100` + c. Update the prefork configuration section to suit your environment. The + following settings apply to a busy system: ++ +[source,bash] +------------------------------------------------------------------------------ + + StartServers 20 + MinSpareServers 5 + MaxSpareServers 15 + MaxClients 150 + MaxRequestsPerChild 10000 + +------------------------------------------------------------------------------ ++ +6. (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/`. +7. (Debian and Ubuntu): 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 +------------------------------------------------------------------------------ + +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.pl`, described in the following section, sets the database +connection information in `opensrf.xml` for you. + +Creating the Evergreen database +------------------------------- + +By default, the `Makefile.install` prerequisite installer does not install +the PostgreSQL 9 database server required by every Evergreen system; +for production use, most libraries install the PostgreSQL database server on a +dedicated machine. You can install the packages required by Debian or Ubuntu Lucid +on the machine of your choice using the following commands as the *root* +Linux account: + +.(Debian and Ubuntu Lucid) Installing PostgreSQL 9.1 server packages +[source, bash] +------------------------------------------------------------------------------ +make -f Open-ILS/src/extras/Makefile.install install_pgsql_server_backport_debs_91 +------------------------------------------------------------------------------ + +.(Ubuntu Precise) Installing PostgreSQL 9.1 server packages +[source, bash] +------------------------------------------------------------------------------ +make -f Open-ILS/src/extras/Makefile.install install_pgsql_server_debs_91 +------------------------------------------------------------------------------ + +You can install the packages required by Fedora on the machine of your choice +using the following commands as the *root* Linux account: + +.(Fedora) Installing PostgreSQL server packages +[source, bash] +------------------------------------------------------------------------------ +make -f Open-ILS/src/extras/Makefile.install install_fedora_pgsql_server +postgresql-setup initdb +------------------------------------------------------------------------------ + +For a standalone PostgreSQL server, install the following Perl modules as the +*root* Linux account: + +.(Debian / Ubuntu) Installing additional Perl modules on a standalone PostgreSQL 9 server +[source, bash] +------------------------------------------------------------------------------ +aptitude install gcc libxml-libxml-perl libxml-libxslt-perl +cpan Business::ISBN +cpan JSON::XS +cpan Library::CallNumber::LC +cpan MARC::Record +cpan MARC::File::XML +cpan UUID::Tiny +------------------------------------------------------------------------------ + +.(Fedora) Installing additional Perl modules on a standalone PostgreSQL 9 server +[source, bash] +------------------------------------------------------------------------------ +yum install gcc perl-XML-LibXML perl-XML-LibXSLT perl-Business-ISBN +cpan Library::CallNumber::LC +cpan MARC::Record +cpan MARC::File::XML +cpan UUID::Tiny +------------------------------------------------------------------------------ + +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 +------------------------------------------------------------------------------ + +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 , , +, , and with the appropriate values for your +PostgreSQL database (where and are for the *evergreen* +PostgreSQL account you just created), and replace and +with the values you want for the *egadmin* Evergreen administrator account: + +[source, bash] +------------------------------------------------------------------------------ +perl Open-ILS/src/support-scripts/eg_db_config.pl --update-config \ + --service all --create-database --create-schema --create-offline \ + --user --password --hostname --port \ + --database --admin-user --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. + +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.pl`. + +For PostgreSQL 9.0 +^^^^^^^^^^^^^^^^^^ +To create the database instance on a remote database server running PostgreSQL +9.0, you can either: + + * Install the PostgreSQL contrib modules on the machine on which you + are installing the Evergreen code, and use the `--create-database` + option from that machine, or + * Copy the `Open-ILS/src/sql/Pg/create_database.sql` script to your + PostgreSQL server and invoke it as the *postgres* Linux account: ++ +[source, bash] +------------------------------------------------------------------------------ +psql -vdb_name= -vcontrib_dir=`pg_config --sharedir`/contrib -f create_database.sql +------------------------------------------------------------------------------ + +Then you can issue the `eg_db_config.pl` command as above _without_ the +`--create-database` argument to create your schema and configure your +configuration files. + +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_ctl.sh -l -a start_all +------------------------------------------------------------------------------ ++ + ** If you receive the error message `bash: osrf_ctl.sh: 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 hierarchy in `config.cgi`): ++ +[source, bash] +------------------------------------------------------------------------------ +autogen.sh -u +------------------------------------------------------------------------------ ++ +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.pl` command: + +[source, bash] +------------------------------------------------------------------------------ +/openils/bin/srfsh +srfsh% login +------------------------------------------------------------------------------ + +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 + ------------------------------------ + +If this does not work, it's time to do some troubleshooting. + + * As the *opensrf* Linux acccount, 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://open-ils.org/listserv.php[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/listserv.php 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/build/tools/make_release b/build/tools/make_release index c5580c1b4a..50c36a03a9 100755 --- a/build/tools/make_release +++ b/build/tools/make_release @@ -2,7 +2,7 @@ GIT_ABS=`git rev-parse --show-toplevel` GIT_BRANCH=`git rev-parse --abbrev-ref HEAD | sed 's|.*/||'` -HEADURLBASE="http://git.evergreen-ils.org/Evergreen.git?h=refs/heads/" +HEADURLBASE="http://git.evergreen-ils.org/Evergreen.git?h=refs/heads/rel_2_3_4" HEADURL="$HEADURLBASE$GIT_BRANCH" # Drop to the root of the checkout diff --git a/configure.ac b/configure.ac index 89e64f6829..a6822b848f 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@list.georgialibraries.org) -AM_INIT_AUTOMAKE([OpenILS], [trunk]) +AC_INIT(Open-ILS, 2.3.4, open-ils-dev@list.georgialibraries.org) +AM_INIT_AUTOMAKE([OpenILS], [2.3.4]) AC_REVISION($Revision: 0.1 $) AC_CONFIG_SRCDIR([configure.ac]) AC_PREFIX_DEFAULT([/openils/]) -- 2.11.0