From ec56354f69b8bbcc2295432c4278375791f3fe6f Mon Sep 17 00:00:00 2001 From: Qifeng Date: Tue, 14 Sep 2021 15:42:54 +1000 Subject: [PATCH] #500 fix(g:message) --- .travis.yml | 28 -- LICENSE.txt | 469 ------------------ README.md | 47 -- build.gradle | 65 +-- crowdin.yml | 247 --------- gradle.properties | 4 +- gradlew | 8 +- grails-app/conf/application.yml | 35 +- grails-app/conf/spring/resources.groovy | 2 +- grails-wrapper.jar | Bin 5473 -> 4821 bytes grailsw | 1 + .../hubs/BiocacheHubsGrailsPlugin.groovy | 3 +- ...ginAwareResourceBundleMessageSource.groovy | 11 + .../ala/biocache/hubs/defaultConfig.groovy | 24 +- 14 files changed, 81 insertions(+), 863 deletions(-) delete mode 100644 .travis.yml delete mode 100644 LICENSE.txt delete mode 100644 README.md delete mode 100644 crowdin.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index d9b8d8119..000000000 --- a/.travis.yml +++ /dev/null @@ -1,28 +0,0 @@ -language: groovy -jdk: -- openjdk8 -sudo: false -branches: - only: - - master - - data-quality - - hotfix - - EYA-enhancements - - develop - - feature/data-quality -before_cache: - - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock - - rm -fr $HOME/.gradle/caches/*/plugin-resolution/ -cache: - directories: - - $HOME/.m2 - - $HOME/.gradle/caches/ - - $HOME/.gradle/wrapper/ -after_success: - - echo "TRAVIS_BRANCH=$TRAVIS_BRANCH TRAVIS_PULL_REQUEST=$TRAVIS_PULL_REQUEST" - - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && travis_retry ./gradlew publish' - - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && sh .travis/trigger-travis.sh --pro --branch $TRAVIS_BRANCH AtlasOfLivingAustralia ala-hub $TRAVIS_ACCESS_TOKEN' -env: - global: - - secure: fwa7jtwNL/MNa3+iI+r0jrGwnQcC8fYtgH9vbOT3x9MHo0b2K2CCTq+io+U2iDhFpDt1Tee49ZqL38aQV+/Q7oW9OddRCBhpPafLwvIeAeEAzYVfZzYj0M5QfomqhQfFqaeBlsDGWLmfqs+Qa56acG/5AXvy2bdIBkx8eobxKHw= - - secure: JICocWnUXHHv+yt1XM/8GcurEmaNwzAbnmAGylaVriCq98m31clDGms1OKoHU11g9Ux8uNSmydafvf+oEFzpm8LAyqrtDcPBqi8UXG+4AY3SctutdDGHE2Ue3ly8HlVkMY2e9wnA2bU/Wmq4VesyvPCIRp/IeGi+sE02F+3IYAQ= diff --git a/LICENSE.txt b/LICENSE.txt deleted file mode 100644 index 8b7c1537b..000000000 --- a/LICENSE.txt +++ /dev/null @@ -1,469 +0,0 @@ - MOZILLA PUBLIC LICENSE - Version 1.1 - - --------------- - -1. Definitions. - - 1.0.1. "Commercial Use" means distribution or otherwise making the - Covered Code available to a third party. - - 1.1. "Contributor" means each entity that creates or contributes to - the creation of Modifications. - - 1.2. "Contributor Version" means the combination of the Original - Code, prior Modifications used by a Contributor, and the Modifications - made by that particular Contributor. - - 1.3. "Covered Code" means the Original Code or Modifications or the - combination of the Original Code and Modifications, in each case - including portions thereof. - - 1.4. "Electronic Distribution Mechanism" means a mechanism generally - accepted in the software development community for the electronic - transfer of data. - - 1.5. "Executable" means Covered Code in any form other than Source - Code. - - 1.6. "Initial Developer" means the individual or entity identified - as the Initial Developer in the Source Code notice required by Exhibit - A. - - 1.7. "Larger Work" means a work which combines Covered Code or - portions thereof with code not governed by the terms of this License. - - 1.8. "License" means this document. - - 1.8.1. "Licensable" means having the right to grant, to the maximum - extent possible, whether at the time of the initial grant or - subsequently acquired, any and all of the rights conveyed herein. - - 1.9. "Modifications" means any addition to or deletion from the - substance or structure of either the Original Code or any previous - Modifications. When Covered Code is released as a series of files, a - Modification is: - A. Any addition to or deletion from the contents of a file - containing Original Code or previous Modifications. - - B. Any new file that contains any part of the Original Code or - previous Modifications. - - 1.10. "Original Code" means Source Code of computer software code - which is described in the Source Code notice required by Exhibit A as - Original Code, and which, at the time of its release under this - License is not already Covered Code governed by this License. - - 1.10.1. "Patent Claims" means any patent claim(s), now owned or - hereafter acquired, including without limitation, method, process, - and apparatus claims, in any patent Licensable by grantor. - - 1.11. "Source Code" means the preferred form of the Covered Code for - making modifications to it, including all modules it contains, plus - any associated interface definition files, scripts used to control - compilation and installation of an Executable, or source code - differential comparisons against either the Original Code or another - well known, available Covered Code of the Contributor's choice. The - Source Code can be in a compressed or archival form, provided the - appropriate decompression or de-archiving software is widely available - for no charge. - - 1.12. "You" (or "Your") means an individual or a legal entity - exercising rights under, and complying with all of the terms of, this - License or a future version of this License issued under Section 6.1. - For legal entities, "You" includes any entity which controls, is - controlled by, or is under common control with You. For purposes of - this definition, "control" means (a) the power, direct or indirect, - to cause the direction or management of such entity, whether by - contract or otherwise, or (b) ownership of more than fifty percent - (50%) of the outstanding shares or beneficial ownership of such - entity. - -2. Source Code License. - - 2.1. The Initial Developer Grant. - The Initial Developer hereby grants You a world-wide, royalty-free, - non-exclusive license, subject to third party intellectual property - claims: - (a) under intellectual property rights (other than patent or - trademark) Licensable by Initial Developer to use, reproduce, - modify, display, perform, sublicense and distribute the Original - Code (or portions thereof) with or without Modifications, and/or - as part of a Larger Work; and - - (b) under Patents Claims infringed by the making, using or - selling of Original Code, to make, have made, use, practice, - sell, and offer for sale, and/or otherwise dispose of the - Original Code (or portions thereof). - - (c) the licenses granted in this Section 2.1(a) and (b) are - effective on the date Initial Developer first distributes - Original Code under the terms of this License. - - (d) Notwithstanding Section 2.1(b) above, no patent license is - granted: 1) for code that You delete from the Original Code; 2) - separate from the Original Code; or 3) for infringements caused - by: i) the modification of the Original Code or ii) the - combination of the Original Code with other software or devices. - - 2.2. Contributor Grant. - Subject to third party intellectual property claims, each Contributor - hereby grants You a world-wide, royalty-free, non-exclusive license - - (a) under intellectual property rights (other than patent or - trademark) Licensable by Contributor, to use, reproduce, modify, - display, perform, sublicense and distribute the Modifications - created by such Contributor (or portions thereof) either on an - unmodified basis, with other Modifications, as Covered Code - and/or as part of a Larger Work; and - - (b) under Patent Claims infringed by the making, using, or - selling of Modifications made by that Contributor either alone - and/or in combination with its Contributor Version (or portions - of such combination), to make, use, sell, offer for sale, have - made, and/or otherwise dispose of: 1) Modifications made by that - Contributor (or portions thereof); and 2) the combination of - Modifications made by that Contributor with its Contributor - Version (or portions of such combination). - - (c) the licenses granted in Sections 2.2(a) and 2.2(b) are - effective on the date Contributor first makes Commercial Use of - the Covered Code. - - (d) Notwithstanding Section 2.2(b) above, no patent license is - granted: 1) for any code that Contributor has deleted from the - Contributor Version; 2) separate from the Contributor Version; - 3) for infringements caused by: i) third party modifications of - Contributor Version or ii) the combination of Modifications made - by that Contributor with other software (except as part of the - Contributor Version) or other devices; or 4) under Patent Claims - infringed by Covered Code in the absence of Modifications made by - that Contributor. - -3. Distribution Obligations. - - 3.1. Application of License. - The Modifications which You create or to which You contribute are - governed by the terms of this License, including without limitation - Section 2.2. The Source Code version of Covered Code may be - distributed only under the terms of this License or a future version - of this License released under Section 6.1, and You must include a - copy of this License with every copy of the Source Code You - distribute. You may not offer or impose any terms on any Source Code - version that alters or restricts the applicable version of this - License or the recipients' rights hereunder. However, You may include - an additional document offering the additional rights described in - Section 3.5. - - 3.2. Availability of Source Code. - Any Modification which You create or to which You contribute must be - made available in Source Code form under the terms of this License - either on the same media as an Executable version or via an accepted - Electronic Distribution Mechanism to anyone to whom you made an - Executable version available; and if made available via Electronic - Distribution Mechanism, must remain available for at least twelve (12) - months after the date it initially became available, or at least six - (6) months after a subsequent version of that particular Modification - has been made available to such recipients. You are responsible for - ensuring that the Source Code version remains available even if the - Electronic Distribution Mechanism is maintained by a third party. - - 3.3. Description of Modifications. - You must cause all Covered Code to which You contribute to contain a - file documenting the changes You made to create that Covered Code and - the date of any change. You must include a prominent statement that - the Modification is derived, directly or indirectly, from Original - Code provided by the Initial Developer and including the name of the - Initial Developer in (a) the Source Code, and (b) in any notice in an - Executable version or related documentation in which You describe the - origin or ownership of the Covered Code. - - 3.4. Intellectual Property Matters - (a) Third Party Claims. - If Contributor has knowledge that a license under a third party's - intellectual property rights is required to exercise the rights - granted by such Contributor under Sections 2.1 or 2.2, - Contributor must include a text file with the Source Code - distribution titled "LEGAL" which describes the claim and the - party making the claim in sufficient detail that a recipient will - know whom to contact. If Contributor obtains such knowledge after - the Modification is made available as described in Section 3.2, - Contributor shall promptly modify the LEGAL file in all copies - Contributor makes available thereafter and shall take other steps - (such as notifying appropriate mailing lists or newsgroups) - reasonably calculated to inform those who received the Covered - Code that new knowledge has been obtained. - - (b) Contributor APIs. - If Contributor's Modifications include an application programming - interface and Contributor has knowledge of patent licenses which - are reasonably necessary to implement that API, Contributor must - also include this information in the LEGAL file. - - (c) Representations. - Contributor represents that, except as disclosed pursuant to - Section 3.4(a) above, Contributor believes that Contributor's - Modifications are Contributor's original creation(s) and/or - Contributor has sufficient rights to grant the rights conveyed by - this License. - - 3.5. Required Notices. - You must duplicate the notice in Exhibit A in each file of the Source - Code. If it is not possible to put such notice in a particular Source - Code file due to its structure, then You must include such notice in a - location (such as a relevant directory) where a user would be likely - to look for such a notice. If You created one or more Modification(s) - You may add your name as a Contributor to the notice described in - Exhibit A. You must also duplicate this License in any documentation - for the Source Code where You describe recipients' rights or ownership - rights relating to Covered Code. You may choose to offer, and to - charge a fee for, warranty, support, indemnity or liability - obligations to one or more recipients of Covered Code. However, You - may do so only on Your own behalf, and not on behalf of the Initial - Developer or any Contributor. You must make it absolutely clear than - any such warranty, support, indemnity or liability obligation is - offered by You alone, and You hereby agree to indemnify the Initial - Developer and every Contributor for any liability incurred by the - Initial Developer or such Contributor as a result of warranty, - support, indemnity or liability terms You offer. - - 3.6. Distribution of Executable Versions. - You may distribute Covered Code in Executable form only if the - requirements of Section 3.1-3.5 have been met for that Covered Code, - and if You include a notice stating that the Source Code version of - the Covered Code is available under the terms of this License, - including a description of how and where You have fulfilled the - obligations of Section 3.2. The notice must be conspicuously included - in any notice in an Executable version, related documentation or - collateral in which You describe recipients' rights relating to the - Covered Code. You may distribute the Executable version of Covered - Code or ownership rights under a license of Your choice, which may - contain terms different from this License, provided that You are in - compliance with the terms of this License and that the license for the - Executable version does not attempt to limit or alter the recipient's - rights in the Source Code version from the rights set forth in this - License. If You distribute the Executable version under a different - license You must make it absolutely clear that any terms which differ - from this License are offered by You alone, not by the Initial - Developer or any Contributor. You hereby agree to indemnify the - Initial Developer and every Contributor for any liability incurred by - the Initial Developer or such Contributor as a result of any such - terms You offer. - - 3.7. Larger Works. - You may create a Larger Work by combining Covered Code with other code - not governed by the terms of this License and distribute the Larger - Work as a single product. In such a case, You must make sure the - requirements of this License are fulfilled for the Covered Code. - -4. Inability to Comply Due to Statute or Regulation. - - If it is impossible for You to comply with any of the terms of this - License with respect to some or all of the Covered Code due to - statute, judicial order, or regulation then You must: (a) comply with - the terms of this License to the maximum extent possible; and (b) - describe the limitations and the code they affect. Such description - must be included in the LEGAL file described in Section 3.4 and must - be included with all distributions of the Source Code. Except to the - extent prohibited by statute or regulation, such description must be - sufficiently detailed for a recipient of ordinary skill to be able to - understand it. - -5. Application of this License. - - This License applies to code to which the Initial Developer has - attached the notice in Exhibit A and to related Covered Code. - -6. Versions of the License. - - 6.1. New Versions. - Netscape Communications Corporation ("Netscape") may publish revised - and/or new versions of the License from time to time. Each version - will be given a distinguishing version number. - - 6.2. Effect of New Versions. - Once Covered Code has been published under a particular version of the - License, You may always continue to use it under the terms of that - version. You may also choose to use such Covered Code under the terms - of any subsequent version of the License published by Netscape. No one - other than Netscape has the right to modify the terms applicable to - Covered Code created under this License. - - 6.3. Derivative Works. - If You create or use a modified version of this License (which you may - only do in order to apply it to code which is not already Covered Code - governed by this License), You must (a) rename Your license so that - the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape", - "MPL", "NPL" or any confusingly similar phrase do not appear in your - license (except to note that your license differs from this License) - and (b) otherwise make it clear that Your version of the license - contains terms which differ from the Mozilla Public License and - Netscape Public License. (Filling in the name of the Initial - Developer, Original Code or Contributor in the notice described in - Exhibit A shall not of themselves be deemed to be modifications of - this License.) - -7. DISCLAIMER OF WARRANTY. - - COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, - WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, - WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF - DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. - THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE - IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, - YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE - COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER - OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF - ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. - -8. TERMINATION. - - 8.1. This License and the rights granted hereunder will terminate - automatically if You fail to comply with terms herein and fail to cure - such breach within 30 days of becoming aware of the breach. All - sublicenses to the Covered Code which are properly granted shall - survive any termination of this License. Provisions which, by their - nature, must remain in effect beyond the termination of this License - shall survive. - - 8.2. If You initiate litigation by asserting a patent infringement - claim (excluding declatory judgment actions) against Initial Developer - or a Contributor (the Initial Developer or Contributor against whom - You file such action is referred to as "Participant") alleging that: - - (a) such Participant's Contributor Version directly or indirectly - infringes any patent, then any and all rights granted by such - Participant to You under Sections 2.1 and/or 2.2 of this License - shall, upon 60 days notice from Participant terminate prospectively, - unless if within 60 days after receipt of notice You either: (i) - agree in writing to pay Participant a mutually agreeable reasonable - royalty for Your past and future use of Modifications made by such - Participant, or (ii) withdraw Your litigation claim with respect to - the Contributor Version against such Participant. If within 60 days - of notice, a reasonable royalty and payment arrangement are not - mutually agreed upon in writing by the parties or the litigation claim - is not withdrawn, the rights granted by Participant to You under - Sections 2.1 and/or 2.2 automatically terminate at the expiration of - the 60 day notice period specified above. - - (b) any software, hardware, or device, other than such Participant's - Contributor Version, directly or indirectly infringes any patent, then - any rights granted to You by such Participant under Sections 2.1(b) - and 2.2(b) are revoked effective as of the date You first made, used, - sold, distributed, or had made, Modifications made by that - Participant. - - 8.3. If You assert a patent infringement claim against Participant - alleging that such Participant's Contributor Version directly or - indirectly infringes any patent where such claim is resolved (such as - by license or settlement) prior to the initiation of patent - infringement litigation, then the reasonable value of the licenses - granted by such Participant under Sections 2.1 or 2.2 shall be taken - into account in determining the amount or value of any payment or - license. - - 8.4. In the event of termination under Sections 8.1 or 8.2 above, - all end user license agreements (excluding distributors and resellers) - which have been validly granted by You or any distributor hereunder - prior to termination shall survive termination. - -9. LIMITATION OF LIABILITY. - - UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT - (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL - DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, - OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR - ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY - CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, - WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER - COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN - INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF - LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY - RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW - PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE - EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO - THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. - -10. U.S. GOVERNMENT END USERS. - - The Covered Code is a "commercial item," as that term is defined in - 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer - software" and "commercial computer software documentation," as such - terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 - C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), - all U.S. Government End Users acquire Covered Code with only those - rights set forth herein. - -11. MISCELLANEOUS. - - This License represents the complete agreement concerning subject - matter hereof. If any provision of this License is held to be - unenforceable, such provision shall be reformed only to the extent - necessary to make it enforceable. This License shall be governed by - California law provisions (except to the extent applicable law, if - any, provides otherwise), excluding its conflict-of-law provisions. - With respect to disputes in which at least one party is a citizen of, - or an entity chartered or registered to do business in the United - States of America, any litigation relating to this License shall be - subject to the jurisdiction of the Federal Courts of the Northern - District of California, with venue lying in Santa Clara County, - California, with the losing party responsible for costs, including - without limitation, court costs and reasonable attorneys' fees and - expenses. The application of the United Nations Convention on - Contracts for the International Sale of Goods is expressly excluded. - Any law or regulation which provides that the language of a contract - shall be construed against the drafter shall not apply to this - License. - -12. RESPONSIBILITY FOR CLAIMS. - - As between Initial Developer and the Contributors, each party is - responsible for claims and damages arising, directly or indirectly, - out of its utilization of rights under this License and You agree to - work with Initial Developer and Contributors to distribute such - responsibility on an equitable basis. Nothing herein is intended or - shall be deemed to constitute any admission of liability. - -13. MULTIPLE-LICENSED CODE. - - Initial Developer may designate portions of the Covered Code as - "Multiple-Licensed". "Multiple-Licensed" means that the Initial - Developer permits you to utilize portions of the Covered Code under - Your choice of the MPL or the alternative licenses, if any, specified - by the Initial Developer in the file described in Exhibit A. - -EXHIBIT A -Mozilla Public License. - - ``The contents of this file are subject to the Mozilla Public License - Version 1.1 (the "License"); you may not use this file except in - compliance with the License. You may obtain a copy of the License at - https://www.mozilla.org/MPL/ - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the - License for the specific language governing rights and limitations - under the License. - - The Original Code is ______________________________________. - - The Initial Developer of the Original Code is ________________________. - Portions created by ______________________ are Copyright (C) ______ - _______________________. All Rights Reserved. - - Contributor(s): ______________________________________. - - Alternatively, the contents of this file may be used under the terms - of the _____ license (the "[___] License"), in which case the - provisions of [______] License are applicable instead of those - above. If you wish to allow use of your version of this file only - under the terms of the [____] License and not to allow others to use - your version of this file under the MPL, indicate your decision by - deleting the provisions above and replace them with the notice and - other provisions required by the [___] License. If you do not delete - the provisions above, a recipient may use your version of this file - under either the MPL or the [___] License." - - [NOTE: The text of this Exhibit A may differ slightly from the text of - the notices in the Source Code files of the Original Code. You should - use the text of this Exhibit A rather than the text found in the - Original Code Source Code for Your Modifications.] \ No newline at end of file diff --git a/README.md b/README.md deleted file mode 100644 index ef1ece257..000000000 --- a/README.md +++ /dev/null @@ -1,47 +0,0 @@ -# biocache-hubs [![Build Status](https://travis-ci.com/AtlasOfLivingAustralia/biocache-hubs.svg?branch=master)](https://travis-ci.com/AtlasOfLivingAustralia/biocache-hubs) - -**biocache-hubs** is a Grails plugin that provides the core functionality for the _Atlas of Living Australia_ (ALA) [Occurrence search portal](https://biocache.ala.org.au/search) (Biocache) front-end. - -This application/plugin provides a web UI for a back-end service called [**biocache-service**](https://github.com/AtlasOfLivingAustralia/biocache-service) (see [biocache-service API](https://biocache-ws.ala.org.au/ws)) - a full-text search and record retreival for occurrence data records, using JSON data format. - -An example Grails application that uses this plugin, is the [**generic-hub**](https://github.com/AtlasOfLivingAustralia/generic-hub) app. There are other implementations listed in the [ALA Github repository](https://github.com/AtlasOfLivingAustralia?query=-hub) (all implementations have a suffix '-hub'). - -## Versions -The grails2 branch contains the 1.5.x series of the plugin compatible with Grails 2.x. - -The master branch hosts version 2.x and forward of the plugin compatible with grails 3.x. - -Data Quality project version is 4.x (see https://www.ala.org.au/data-quality-project/). - -## Getting started -The easiest way to get started is to clone the **generic-hub** project and then modify it to suit your needs. Any functionality that you wish to alter, is achieved by creating a copy of the groovy/GSP/JS/CSS/i18n file of interest, from **biocache-hubs** and placing it in your client app, so that it overrides the plugin version. - -E.g. to change the header and footer, create a copy of the file `grails-app/views/layout/generic.gsp` (calling it acme.gsp) and then edit the configuration file to point to this new GSP file: `grails-app/conf/Config.groovy` - change `skin.layout = 'generic'` to the new layout file, e.g. `skin.layout = 'acme'`. - -To load and view you own occurrence record data, you'll need to install and run [**biocache-store**](https://github.com/AtlasOfLivingAustralia/biocache-store) and [**biocache-service**](https://github.com/AtlasOfLivingAustralia/biocache-service) and then configure your app to use your local **biocache-service** by adding/editing the line: `biocache.baseUrl = "http://hostname.acme.org/biocache-service/"`. - -A full list of the configuration settings (and their default values) are found in `src/main/groovy/au/org/ala/biocache/hubs/defaultConfig.groovy`. - -## Grails 3 - -Starting with version 1.7 biocache-hubs has been migrated to run on Grails 3 and Java 8 - -If you have deployed biocache-hubs plugin version 1.4.x or earlier in your own hub then you need to follow the following points to bring that hub up to date to use the latest version of biocache-hubs - -* The minimum version of Java is 8 -* You have to use the latest Grails 3.1.x -Use these as reference: - * https://docs.grails.org/3.2.11/guide/upgrading.html#upgrading2x - * https://docs.grails.org/3.0.x/guide/upgrading.html -* biocache-hubs now uses ala-auth 3.x, see this [guide](https://github.com/AtlasOfLivingAustralia/ala-auth-plugin/wiki/1.x-Migration-Guide) for configuration changes -* Grails 3 no longer supports resources pipeline, You will have to migrate resources settings to [Asset pipeline plugin configuration](http://www.asset-pipeline.com/manual/#grails3) -* Following from the above, your hub should use at the very least these two assets: `hubCore.css` and `hubCore.js`. The easiest way is to add them to the head section of your hub layouts - - An example of this can be found [here](https://github.com/AtlasOfLivingAustralia/ala-hub/blob/c6c999d7e87de985bfc65e1fe6fe5cd13396212f/grails-app/views/layouts/generic.gsp#L9-L10) - In this case, alaBs.css and alaBs.js source the required dependencies: - * https://github.com/AtlasOfLivingAustralia/ala-hub/blob/77ad912b6007afb21e5ee9d46cd068ba2040eb9f/grails-app/assets/stylesheets/alaBs.css#L11 - * https://github.com/AtlasOfLivingAustralia/ala-hub/blob/c6c999d7e87de985bfc65e1fe6fe5cd13396212f/grails-app/assets/javascripts/alaBs.js#L11 - -## Grails 4 - -Starting with version 3.4.0, biocache-hubs has been migrated to run on Grails 4 diff --git a/build.gradle b/build.gradle index f03b32617..1c75c9423 100644 --- a/build.gradle +++ b/build.gradle @@ -1,3 +1,5 @@ +import org.gradle.api.tasks.compile.GroovyCompile + buildscript { repositories { mavenLocal() @@ -6,9 +8,7 @@ buildscript { } dependencies { classpath "org.grails:grails-gradle-plugin:$grailsVersion" - //classpath "org.grails.plugins:hibernate5:7.0.5" - classpath "gradle.plugin.com.github.erdi.webdriver-binaries:webdriver-binaries-gradle-plugin:2.0" - classpath "com.bertramlabs.plugins:asset-pipeline-gradle:3.2.4" + classpath "com.bertramlabs.plugins:asset-pipeline-gradle:3.0.10" } } @@ -17,9 +17,8 @@ group "au.org.ala.plugins.grails" apply plugin:"eclipse" apply plugin:"idea" -apply plugin:"org.grails.grails-web" -apply plugin:"com.github.erdi.webdriver-binaries" -apply plugin:"com.bertramlabs.asset-pipeline" +apply plugin:"org.grails.grails-plugin" +apply plugin:"asset-pipeline" apply plugin:"org.grails.grails-gsp" apply plugin:"maven-publish" @@ -36,6 +35,11 @@ configurations { } } +springBoot { + mainClassName = 'biocache.hubs.Application' +} + + dependencies { developmentOnly("org.springframework.boot:spring-boot-devtools") compile "org.springframework.boot:spring-boot-starter-logging" @@ -43,6 +47,7 @@ dependencies { compile "org.grails:grails-core" compile "org.springframework.boot:spring-boot-starter-actuator" compile "org.springframework.boot:spring-boot-starter-tomcat" + compile "org.grails:grails-dependencies" compile "org.grails:grails-web-boot" compile "org.grails:grails-logging" compile "org.grails:grails-plugin-rest" @@ -54,35 +59,22 @@ dependencies { compile "org.grails.plugins:cache" compile "org.grails.plugins:async" compile "org.grails.plugins:scaffolding" - compile "org.grails.plugins:events" - compile "org.grails.plugins:hibernate5" - compile "org.hibernate:hibernate-core:5.4.18.Final" compile "org.grails.plugins:gsp" compileOnly "io.micronaut:micronaut-inject-groovy" console "org.grails:grails-console" - profile "org.grails.profiles:web" - runtime "org.glassfish.web:el-impl:2.1.2-b03" - runtime "com.h2database:h2" - runtime "org.apache.tomcat:tomcat-jdbc" - runtime "javax.xml.bind:jaxb-api:2.3.1" - runtime "com.bertramlabs.plugins:asset-pipeline-grails:3.2.4" - testCompile "io.micronaut:micronaut-inject-groovy" - testCompile "org.grails:grails-gorm-testing-support" + profile "org.grails.profiles:web-plugin" + runtime "com.bertramlabs.plugins:asset-pipeline-grails:3.0.10" + //testCompile "org.grails:grails-gorm-testing-support" testCompile "org.mockito:mockito-core" testCompile "org.grails:grails-web-testing-support" - testCompile "org.grails.plugins:geb" - testCompile "org.seleniumhq.selenium:selenium-remote-driver:3.14.0" - testCompile "org.seleniumhq.selenium:selenium-api:3.14.0" - testCompile "org.seleniumhq.selenium:selenium-support:3.14.0" - testRuntime "org.seleniumhq.selenium:selenium-chrome-driver:3.14.0" - testRuntime "org.seleniumhq.selenium:selenium-firefox-driver:3.14.0" + //testCompile "org.grails:grails-plugin-testing" testImplementation group: 'org.spockframework', name: 'spock-spring', version: '1.3-groovy-2.5' implementation group: 'org.ehcache', name: 'ehcache', version: '3.1.0' testImplementation group: 'xml-apis', name: 'xml-apis', version: '1.4.01' //compile 'org.grails:grails-validation:3.1.14' - // testCompile "org.grails:grails-test-mixins:3.3.0" + // testCompile "org.grails:grails-test-mixins:3.3.0" def noCache = { exclude group: 'org.grails.plugins', module: 'cache' @@ -101,9 +93,10 @@ dependencies { compile "com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20180219.1" compile "au.org.ala:data-quality-filter-service-client:1.0.0", noCache + compile 'xml-apis:xml-apis:1.4.01' //plugins - //compile 'org.grails.plugins:cache-ehcache:3.0.0.M1' + compile 'org.grails.plugins:cache-ehcache:3.0.0.M1' compile 'org.grails.plugins:http-builder-helper:1.0.2.ALA' compile "org.grails.plugins:ala-admin-plugin:2.2" compile "org.grails.plugins:ala-auth:3.2.3" @@ -115,10 +108,9 @@ dependencies { } bootRun { - ignoreExitValue true jvmArgs( - '-Dspring.output.ansi.enabled=always', - '-noverify', + '-Dspring.output.ansi.enabled=always', + '-noverify', '-XX:TieredStopAtLevel=1', '-Xmx1024m') sourceResources sourceSets.main @@ -132,22 +124,11 @@ tasks.withType(GroovyCompile) { } } -webdriverBinaries { - chromedriver '2.45.0' - geckodriver '0.24.0' -} - -tasks.withType(Test) { - systemProperty "geb.env", System.getProperty('geb.env') - systemProperty "geb.build.reportsDir", reporting.file("geb/integrationTest") - systemProperty "webdriver.chrome.driver", System.getProperty('webdriver.chrome.driver') - systemProperty "webdriver.gecko.driver", System.getProperty('webdriver.gecko.driver') -} - +// enable if you wish to package this plugin as a standalone application +bootJar.enabled = false assets { - minifyJs = true - minifyCss = true + packagePlugin = true } publishing { diff --git a/crowdin.yml b/crowdin.yml deleted file mode 100644 index b07ebfacf..000000000 --- a/crowdin.yml +++ /dev/null @@ -1,247 +0,0 @@ -# -# This is the crowdin-cli configuration for this repository that allow to keep in sync ALA and crowdin translations in both directions. -# -# Currently github integration only allows to configure one repo, so we need to use crowdin-cli to keep in sync serveral githubs repos with one crowdin project. -# -# To use it this, you need to configure two vars: -# -# export CROWDIN_BASE_PATH=$(dirname $PWD) -# export CROWDIN_API_KEY=XXXXXX -# -# You can get the API from https://crowdin.com/project/ala-i18n/settings#api -# CROWDIN_BASE_PATH is the parent directory of this repository. -# -# After installing crowdin in your computer, to download translations from crowdin run: -# crowdin download -# or a specific language with: -# crowdin download --language es-ES -# so you can later commit the changes to github. -# -# You can update messages.properties in crowdin with: -# crowdin upload sources -# and the translations (if there are some change in the repository that needs to be updated in crowdin), for instance to update Japanese language: -# crowdin upload translations -l ja -# -# Note: Right now `crowdin-cli download` downloads files of non translated languages with empty lines and comments, so as a workround, you can run this bash snippet to delete these empty files prior to git commit the changes: -# for i in $(ls grails-app/i18n/messages_*) ; do SIZE=$(cat $i | egrep -v "^#|^$" | wc -c); if [[ $SIZE -eq 0 ]] ; then rm $i; fi ; done -# -# Also you will get some warning like "Warning: Downloaded translations do not match current project configuration. The following files will be omitted" for the rest of repository translations files. -# -# More info: -# -# - https://support.crowdin.com/cli-tool/ -# - https://support.crowdin.com/configuration-file/ - -# -# Configuration -# -# Your crowdin's credentials - -# -"project_identifier" : "ala-i18n" -"api_key_env" : CROWDIN_API_KEY -"base_path_env": CROWDIN_BASE_PATH - -# "api_key" : "foo" -# "base_path" : "" -# "base_url" : "" - -# -# Choose file structure in crowdin -# e.g. true or false -# -"preserve_hierarchy": true - -# -# Files configuration -# -files: [ - { - # - # Source files filter - # e.g. "/resources/en/*.json" - # - "source" : "/biocache-hubs/grails-app/i18n/messages_en.properties", - - # - # where translations live - # e.g. "/resources/%two_letters_code%/%original_file_name%" - # - "translation" : "/biocache-hubs/grails-app/i18n/messages_%locale_with_underscore%.properties", - - "translation_replace" : { - "af_ZA": "af", - "ar_SA": "ar", - "ca_ES": "ca", - "cs_CZ": "cs", - "da_DK": "da", - "de_DE": "de", - # "de_LU": "de", - "el_GR": "el", - "en_CA": "en", - "en_US": "en", - "es_ES": "es", - "es_MX": "es", - "eu_ES": "eu", - "fi_FI": "fi", - "fr_CA": "fr", - "fr_FR": "fr", - "fr_LU": "fr", - "gl_ES": "gl", - "he_IL": "he", - "hu_HU": "hu", - "it_IT": "it", - "ja_JP": "ja", - "ko_KR": "ko", - "lb_LU": "lb", - "nl_NL": "nl", - "no_NO": "no", - "pl_PL": "pl", - # "pt_BR": "pt", - # "pt_PT": "pt", - "ro_RO": "ro", - "ru_RU": "ru", - "sr_SP": "sr", - "sv_SE": "sv", - "tr_TR": "tr", - "uk_UA": "uk", - "vi_VN": "vi", - "zh_CN": "zh" - # "zh_TW": "zh" - }, - - # - # files or directories for ignore - # e.g. ["/**/?.txt", "/**/[0-9].txt", "/**/*\?*.txt"] - # - #"ignore" : [], - - # - # The dest allows you to specify a file name on Crowdin - # e.g. "/messages.json" - # - "dest" : "/biocache-hub/messages_en.properties", - - # - # File type - # e.g. "json" - # - #"type" : "", - "type" : "properties", - - # - # The parameter "update_option" is optional. If it is not set, translations for changed strings will be lost. Useful for typo fixes and minor changes in source strings. - # e.g. "update_as_unapproved" or "update_without_changes" - # - "update_option" : "update_as_unapproved", - - # - # Start block only for XML - # - - # - # Defines whether to translate tags attributes. - # e.g. 0 or 1 (Default is 1) - # - # "translate_attributes" : 1, - - # - # Defines whether to translate texts placed inside the tags. - # e.g. 0 or 1 (Default is 1) - # - # "translate_content" : 1, - - # - # This is an array of strings, where each item is the XPaths to DOM element that should be imported - # e.g. ["/content/text", "/content/text[@value]"] - # - # "translatable_elements" : [], - - # - # Defines whether to split long texts into smaller text segments. - # e.g. 0 or 1 (Default is 1) - # - # "content_segmentation" : 1, - - # - # End block only for XML - # - - # - # Start .properties block - # - - # - # Defines whether single quote should be escaped by another single quote or backslash in exported translations. - # e.g. 0 or 1 or 2 or 3 (Default is 3) - # 0 - do not escape single quote; - # 1 - escape single quote by another single quote; - # 2 - escape single quote by backslash; - # 3 - escape single quote by another single quote only in strings containing variables ( {0} ). - # - - "escape_quotes" : 3, - - # - # End .properties block - # - - # - # Often software projects have custom names for locale directories. crowdin-cli allows you to map your own languages to be understandable by Crowdin. - # - "languages_mapping" : { - "locale_with_underscore" : { - "af_ZA": "af", - "ar_SA": "ar", - "ca_ES": "ca", - "cs_CZ": "cs", - "da_DK": "da", - "de_DE": "de", - # "de_LU": "de", - "el_GR": "el", - # "en_CA": "en", - "en_US": "en", - "es_ES": "es", - "es_MX": "es", - "eu_ES": "eu", - "fi_FI": "fi", - "fr_CA": "fr", - "fr_FR": "fr", - "fr_LU": "fr", - "gl_ES": "gl", - "he_IL": "he", - "hu_HU": "hu", - "it_IT": "it", - "ja_JP": "ja", - "ko_KR": "ko", - "lb_LU": "lb", - "nl_NL": "nl", - "no_NO": "no", - "pl_PL": "pl", - # "pt_BR": "pt", - # "pt_PT": "pt", - "ro_RO": "ro", - "ru_RU": "ru", - "sr_SP": "sr", - "sv_SE": "sv", - "tr_TR": "tr", - "uk_UA": "uk", - "vi_VN": "vi", - "zh_CN": "zh" - #"zh_TW": "zh" - } - } - - # - # Does the first line contain a header? - # e.g. true or false - # - #"first_line_contains_header" : true, - - # - # for spreadsheets - # e.g. "identifier,source_phrase,context,uk,ru,fr" - # - # "scheme" : "", - } -] diff --git a/gradle.properties b/gradle.properties index 83e8a142f..67e5b1d87 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,3 @@ grailsVersion=4.0.12 gorm.version=7.0.8.RELEASE -org.gradle.daemon=true -org.gradle.parallel=true -org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Xmx1024M +#exploded=true diff --git a/gradlew b/gradlew index 4453ccea3..af6708ff2 100755 --- a/gradlew +++ b/gradlew @@ -28,16 +28,16 @@ APP_NAME="Gradle" APP_BASE_NAME=`basename "$0"` # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +DEFAULT_JVM_OPTS='"-Xmx64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" -warn ( ) { +warn () { echo "$*" } -die ( ) { +die () { echo echo "$*" echo @@ -155,7 +155,7 @@ if $cygwin ; then fi # Escape application args -save ( ) { +save () { for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done echo " " } diff --git a/grails-app/conf/application.yml b/grails-app/conf/application.yml index b51abea0e..c0e03071b 100644 --- a/grails-app/conf/application.yml +++ b/grails-app/conf/application.yml @@ -15,20 +15,37 @@ info: version: '@info.app.version@' grailsVersion: '@info.app.grailsVersion@' +spring: + devtools: + restart: + exclude: + - grails-app/views/** + - grails-app/i18n/** + - grails-app/conf/** + security: cas: casServerName: 'https://auth.ala.org.au' + uriFilterPattern: '/alaAdmin,/alaAdmin.*' + uriExclusionFilterPattern: '/portal/q.*,/portal/messages.*,/portal/sessionCache.*,/static.*,/assets.*' + authenticateOnlyIfLoggedInPattern: '/portal.*,/,/portal/config.*,/portal/i18n.*,/hub/[a-zA-Z0-9]+' loginUrl: 'https://auth.ala.org.au/cas/login' logoutUrl: 'https://auth.ala.org.au/cas/logout' + gateway: false casServerUrlPrefix: 'https://auth.ala.org.au/cas' - bypass: false # set to true for non-ALA deployment - gateway: false - uriExclusionFilterPattern: '/assets.*,/images.*,/css.*,/js.*,/less.*,' - uriFilterPattern: '/alaAdmin.*' - #if false, ticket params always proceed - #true, only processes urls listed in authenticateOnlyIfLoggedInFilterPattern - applyUriFiltersToTicketValidation: false - authenticateOnlyIfLoggedInFilterPattern: '/master,/master/.*,/manageLayers,/manageLayers/.*,/admin,/admin/.*,/layers/view/more/.*,/layer/download/.*,/workflow.*' disableCAS: false - appServerName: "" + roleAttribute: authority + ignoreCase: true + authCookieName: ALA-Auth + +environments: + development: + security: + cas: + appServerName: "http://devt.ala.org.au:8081" + server: + port: 8081 + use-forward-headers: true + grails: + serverURL: "http://devt.ala.org.au:8081" \ No newline at end of file diff --git a/grails-app/conf/spring/resources.groovy b/grails-app/conf/spring/resources.groovy index 1aff76b7f..e6f3ccd27 100644 --- a/grails-app/conf/spring/resources.groovy +++ b/grails-app/conf/spring/resources.groovy @@ -11,7 +11,7 @@ * rights and limitations under the License. */ -import au.org.ala.biocache.hubs.ExtendedPluginAwareResourceBundleMessageSource +import org.springframework.web.servlet.i18n.CookieLocaleResolver beans = { // Custom message source - This is a duplicate bean def - see original in: src/main/groovy/au/org/ala/biocache/hubs/BiocacheHubsGrailsPlugin.groovy diff --git a/grails-wrapper.jar b/grails-wrapper.jar index 6b6da64fe2dbac9d01e295cd9bdaa523cb70766c..b9bd249f589660cf867961102cb1760974e60dcb 100644 GIT binary patch delta 2772 zcmZ9Oc{tRK7RSAl3fUPl3^8_6*2ap;Om8og$`!;r2#x*p& zg~lLc>>;}%#JIB4eXD=&z2|w(`F_sxoacQ1{Z6S4DDY!09^&NT;NaronDMehllT=l zf9n~~Kbi;oqaDh>wQ57@5dW_Ot2aZ^3~mk%vGY_hY+rEJ>I_*c+-95Y<@GRHCX4j(qiT<# z!RYl=2t9Zd;*ciFDHr`*7M6axGyHxMj@cD%aF{B2QhWJ$0hNio87Y%>d2(W~XP}=B z(6y(TU%{Otqn~0=OIwFX$GU`)b5;v2S;WQuNOod&M7fnDB1@u^j9qj9UiL7if(CXKM!{w_JTywAsYd86^3{R z9p#IXE&3@D?nzoXce4?9TMf)jk9+x2U0a2FmEj75P;DL0!qe0zdAtoo z;-2d8i5}5ieCc}ehaRjQ`6Y;2;A)Y4$%!FuKb0?3IF;KI4vHn6QeZU^5QR)?E`H>WWq8Ck84$z&_@>w#=w3T-6H_E|7u=lyu}yMlw5}Hzfp~7-U03u9^hDNZ?k~_EH*Fim-jg8*3mZ=3kbrtsLRo zC#07bsI>2!=8ZN|iGb;JX2t{db${}i<(Z_FaZBO@t=J{=IR0mor-2G%eH9y4usWdM}oB-x*F&DG~tdyg*LotJr*8%|_n|tP*Y9uxDr4{?4w-NTnTq_}O zsTK6hxxed)+U2>9Fb|$+rHI`_OG-@%dw`aJ2w5FoIlwN;FNzxFnPvzD^&$qqoT{Fe; zX%1&%atJ)_{MI7qHD6M?7;35a@&(^eBvRKjB-$oM*5vA|NA7*9mz?+l+OGt5mOJSTJ5o(DrSEqjydaEr>k=~wxxjaV5ElH8PyUsggc*|n;0-#{X+l56f0_~=BIAB=4 zyZv}5+G^>2SGukrHd3rR5S3~H{|b#+Nmx5*_27QX*664rQ%}#bPz$NHq8SfRZ{Ue< zn(_XA{eC>dac4uk*P`Yn5Z0TF5ItfJVJKBSgyb8){yeuPU>V+@83u^DU-Mk7PG%tX z`(JA(lNn<;WyIs4@NM84r{|ULk}aUQ_{CX+vM(#kZf7DPozn!cle(G2>(&r;rq!3m zR2)}nrSy=C$ZN(e2VIPunUmQanYTY&5FWkXIQa2%+xC$j)7PvuA}RBX@;&dmVlex{ z;3ixZuBAI3gfCVJ6apc1(cqyMI9WdjQTud;a4TK@+0(&u?!c&ode?MG<02>lXOCSZ zbAQ#X*w8ujLBEWADnZ|H+V=V-TT|;+!LpN3=F?1`31#eH3D{e#RMqN(*yM;hc7@!B zd2;GmiTYq&QM>qre%Z2$@#6p|T+#SqDI)w_xsB;HGiAzy?cQApK#=MCk&|ec+*sx( zBy>HJujt(cZ(s~5ucz7PFnu}tuYOz%a-5iU|GB5Mg~-+6s9;viZY5NyT{CvY#0?U0 z$V745^K-Dk$ApwYEopzaB^gG)$(%kHdQ~iKv;>T%t&3JnEfq8>Wm^nB>^DLc zLR0`35Q}e?Z`d7TSd!j&r9E43_2NlQZ`ZUX*e-u1ihpexi`Q&TIe!mE8aY>M(00Ge zq1q4NvKY(EXqk7$RtE>b`elAaI-k(vxMbn+#$j)z5t9!|upNzsrWLxul09di6rpkL#k;`^sP z@UC7yey8r^$?pUOf9FGLzu;}qZz7wCX#atSBF2B9K}7QputoI#fSM@!|I=i&=$RA0 q0_HD||MvQ|b8rZ9ESvE0lgC9R|2)_ig@6qB$r51GBZY#$4*ml?=Qwo$ delta 3434 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 diff --git a/grailsw b/grailsw index c2c921c29..8d0cc123e 100755 --- a/grailsw +++ b/grailsw @@ -102,6 +102,7 @@ fi if $cygwin ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` JAVACMD=`cygpath --unix "$JAVACMD"` + JAR_PATH=`cygpath --path --mixed "$JAR_PATH"` # We build the pattern for arguments to be converted via cygpath ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` diff --git a/src/main/groovy/au/org/ala/biocache/hubs/BiocacheHubsGrailsPlugin.groovy b/src/main/groovy/au/org/ala/biocache/hubs/BiocacheHubsGrailsPlugin.groovy index eaab98f42..10605d7f8 100644 --- a/src/main/groovy/au/org/ala/biocache/hubs/BiocacheHubsGrailsPlugin.groovy +++ b/src/main/groovy/au/org/ala/biocache/hubs/BiocacheHubsGrailsPlugin.groovy @@ -27,7 +27,8 @@ import org.grails.config.PropertySourcesConfig */ class BiocacheHubsGrailsPlugin extends Plugin { // the version or versions of Grails the plugin is designed for - def grailsVersion = "3.2.11 > *" + def version = "3.4.0-SNAPSHOT" + def grailsVersion = "4.0.12 > *" // resources that are excluded from plugin packaging def pluginExcludes = [ "grails-app/views/error.gsp" diff --git a/src/main/groovy/au/org/ala/biocache/hubs/ExtendedPluginAwareResourceBundleMessageSource.groovy b/src/main/groovy/au/org/ala/biocache/hubs/ExtendedPluginAwareResourceBundleMessageSource.groovy index dac894a93..d4352df2b 100644 --- a/src/main/groovy/au/org/ala/biocache/hubs/ExtendedPluginAwareResourceBundleMessageSource.groovy +++ b/src/main/groovy/au/org/ala/biocache/hubs/ExtendedPluginAwareResourceBundleMessageSource.groovy @@ -14,9 +14,12 @@ */ package au.org.ala.biocache.hubs +import grails.core.GrailsApplication +import grails.plugins.GrailsPluginManager import grails.util.CacheEntry import org.grails.spring.context.support.PluginAwareResourceBundleMessageSource import org.springframework.beans.factory.annotation.Autowired +import org.springframework.core.io.ResourceLoader import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.ConcurrentMap @@ -28,6 +31,14 @@ import java.util.concurrent.ConcurrentMap * @author "Nick dos Remedios " */ class ExtendedPluginAwareResourceBundleMessageSource extends PluginAwareResourceBundleMessageSource { + + ExtendedPluginAwareResourceBundleMessageSource (GrailsApplication application, GrailsPluginManager pluginManager) { + super(application, pluginManager) + } + + void setResourceLoader(ResourceLoader resourceLoader) { + super.setResourceLoader(resourceLoader) + } private long pluginCacheMillis = Long.MIN_VALUE /** diff --git a/src/main/groovy/au/org/ala/biocache/hubs/defaultConfig.groovy b/src/main/groovy/au/org/ala/biocache/hubs/defaultConfig.groovy index 044aa955c..dccb2bcee 100644 --- a/src/main/groovy/au/org/ala/biocache/hubs/defaultConfig.groovy +++ b/src/main/groovy/au/org/ala/biocache/hubs/defaultConfig.groovy @@ -17,19 +17,19 @@ package au.org.ala.biocache.hubs // // CAS properties - may be omitted for non-ALA deployments // -//security.cas.appServerName = "http://dev.ala.org.au:8080" -//security.cas.casServerName = 'https://auth.ala.org.au' -//security.cas.uriFilterPattern = '/admin, /admin/.*' -//security.cas.authenticateOnlyIfLoggedInPattern = "/occurrences/(?!.+userAssertions|facet.+).+,/explore/your-area" -//security.cas.uriExclusionFilterPattern = '/images.*,/css.*,/js.*' -//security.cas.loginUrl = 'https://auth.ala.org.au/cas/login' -//security.cas.logoutUrl = 'https://auth.ala.org.au/cas/logout' -//security.cas.casServerUrlPrefix = 'https://auth.ala.org.au/cas' -//security.cas.bypass = false // set to true for non-ALA deployment -//security.cas.contextPath = "/generic-biocache-hub" //"/${appName}" -//security.cas.debugWebXml = true +security.cas.appServerName = "http://dev.ala.org.au:8080" +security.cas.casServerName = 'https://auth.ala.org.au' +security.cas.uriFilterPattern = '/admin, /admin/.*' +security.cas.authenticateOnlyIfLoggedInPattern = "/occurrences/(?!.+userAssertions|facet.+).+,/explore/your-area" +security.cas.uriExclusionFilterPattern = '/images.*,/css.*,/js.*' +security.cas.loginUrl = 'https://auth.ala.org.au/cas/login' +security.cas.logoutUrl = 'https://auth.ala.org.au/cas/logout' +security.cas.casServerUrlPrefix = 'https://auth.ala.org.au/cas' +security.cas.bypass = false // set to true for non-ALA deployment +security.cas.contextPath = "/generic-biocache-hub" //"/${appName}" +security.cas.debugWebXml = true auth.admin_role = "ROLE_ADMIN" -serverName = 'http://dev.ala.org.au:8080' +//serverName = 'http://dev.ala.org.au:8080' // skin settings organisation.baseUrl = "https://www.ala.org.au"