Commit graph

38 commits

Author SHA1 Message Date
Brian Lowe
a7e1e60c7e
Update version numbers in pom.xmls (#239)
* Update version numbers in pom.xmls

* Restore -SNAPSHOT
2021-06-21 04:10:08 -05:00
Ralph O'Flinn
193b38159a
revert deployment changes (#219)
Co-authored-by: William Welling <wwelling@library.tamu.edu>
2021-03-24 01:47:08 -05:00
Andrew Woods
eb949919b5
Sprint i18n with main (#209)
* Layer uqam updates onto master (minus trailing whitespace)

* Update RDFServiceFactorySingle.java

* Sprint i18n whitespace (#143)

* Removed extraneous whitespace
   - modified:   api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/BaseEditElementVTwo.java

* move RootUserPolicy.java from VIVO to Vitro repo.

* Remove blank line

* Fixed indentations

* Update whitespace for: TemplateProcessingHelper.java

* Update whitespace for: RDFServiceModel.java

* Removed extraneous whitespaces.

* Tagging UQAM Comments with following tags

-Add-Feature
-Optimization
-Linguistic-Management
-Bug-Correction

* Resolve compilation failures in Vitro tests

* Remove whitespace changes from SelectListGeneratorVTwo.java

* Add null check on field values of RDF Form (#158)

Resolves: https://jira.lyrasis.org/browse/VIVO-1800

Co-authored-by: Andrew Woods <awoods@duraspace.org>

* Fix incorrect tool-tip in language selection dropdown (#156)

Resolves: https://jira.lyrasis.org/browse/VIVO-1783

Co-authored-by: Andrew Woods <awoods@duraspace.org>

* Sprint i18n/lang filtering model (#159)

* Add language-aware graph filtering instead of layering on additional RDFService

Resolves: https://jira.lyrasis.org/browse/VIVO-1771

* Remove hardcoded link label (#161)

Resolves: https://jira.lyrasis.org/browse/VIVO-1779

* Enable filtering of non-enabled i18n language files from being loaded into triple store (#160)

Define name of available language listing file (found in Vitro-languages)
Update RDFFilesLoader method interfaces to include ServletContext

Part of resolution to: https://jira.lyrasis.org/browse/VIVO-1836

Co-authored-by: Andrew Woods <awoods@duraspace.org>

* Add i18n version of Edit page title (#157)

Related to: https://jira.lyrasis.org/browse/VIVO-1779

Co-authored-by: Andrew Woods <awoods@duraspace.org>

* Changing ontology extensions for n3 & assigning a base IRI to each (#163)

ontology

Co-authored-by: michelheon <heon@videotorn.ca>
Co-authored-by: Andrew Woods <awoods@duraspace.org>

https://jira.lyrasis.org/browse/VIVO-1862

* Update sprint-i18n with master branch (#166)

* Make data property richtext editor option selectable from UI

* [VIVO-1755] - Better error handling when reasoner disabled (#137)

* Better error handling when reasoner disabled

* Change reasoner error log message to debug

* Extend reasoner status error handling

* Improve reasoner error log message and extend to JenaAdminActions

* Bump up log level for admin action to 'warn' and edit admin panel error message

* Change Model writer lang from "N3-PP" to "N3" (#149)

Resolves: https://jira.lyrasis.org/browse/VIVO-1761

Co-authored-by: Andrew Woods <awoods@duraspace.org>

* [VIVO-1851] - Add 'remove' option to named graph management page (#162)

* Add 'remove' option to named graph management page

Resolves: https://jira.lyrasis.org/browse/VIVO-1851

* [VIVO-1872] - Add download option to SPARQL Query page (#164)

* Add download option to SPARQL Query page

* Set SPARQL query results content type even if downloading

* Address pull request comments

Co-authored-by: gneissone <mbgross@wustl.edu>
Co-authored-by: Ralph O'Flinn <roflinn@users.noreply.github.com>
Co-authored-by: Andrew Woods <awoods@duraspace.org>

* [VIVO-1839] - Use language name for selector instead of flags (#165)

* Use language name for selector instead of flags
* Add country name to language selector
* Increase min-width of language dropdown
* Update data tree comment in languageSelector.ftl
* Min-width for language dropdown
* Language dropdown css adjustment
* Capitalize locale label
* Indent on languageSelector.ftl

Resolves: https://jira.lyrasis.org/browse/VIVO-1839

* Adds internationalization to the admin/sparql-query page (#167)

* Adds internationalization to the admin/sparql-query page

Partial resolution of: https://jira.lyrasis.org/browse/VIVO-1873

* Add i18n for 'save query result'

Related to: https://jira.lyrasis.org/browse/VIVO-1873

* code review

Co-authored-by: Andrew Woods <awoods@duraspace.org>

* removed redundat files which are now available via Vitro- and VIVO-languages

* Making UQAM-optimization aware of https://

* Add parent reference to installer/pom.xml (#174)

Resolves: https://jira.lyrasis.org/browse/VIVO-1903

Co-authored-by: Andrew Woods <awoods@duraspace.org>

* Revert non-function RDF changes (#177)

Related to: https://jira.lyrasis.org/browse/VIVO-1905

Co-authored-by: Andrew Woods <awoods@duraspace.org>

* Ensure 'other' in Individual->Teaching->advisees->type is translated

Partial resolution to: https://jira.lyrasis.org/browse/VIVO-1881

* Re-add logic from commit 7420957

* [VIVO-1812] use i18n translation for validation messages (#179)

* replace constants with i18n text in BasicValidationVTwo
* use constants for i18n template key

Partial resolution of: https://jira.lyrasis.org/browse/VIVO-1812

* added js_string at i18n strings to handle quotes properly, ticket vivo-1842 (#180)

Partial resolution for: https://jira.lyrasis.org/browse/VIVO-1842

* [VIVO-1870] simplify and concat translation for browse by vclass (#182)

* simplify and concat translation for browse by vclass

Partial resolution of: https://jira.lyrasis.org/browse/VIVO-1870

* [VIVO-1900] i18n: added empty check for getCountry, fixing bug with spanish label (es) (#181)

* added empty check for getCountry, fixing bug with spanish label (es), ticket vivo-1900

Partial resolution to: https://jira.lyrasis.org/browse/VIVO-1900

* [VIVO 1870] update i18n key to JavaScript mapping (#183)

* update menupage-script i18n key to JavaScript mapping

Follow-on to resolution of: https://jira.lyrasis.org/browse/VIVO-1870

* [VIVO-1837] get i18n bundle from WebappDaoFactoryConfig preferred locales (#178)

* apply i18n text to VClassDaoJena.getLabelForClass
* expose i18n bundle through webapp dao factory interface
* use whole messages for i18n
* if request available use request bundle else use context bundle
* clear cache when context theme directory changes
* make getOverridingLocale from context private
* select locale based on preferred locale from webapp dao factory
* use first preferred local even when no selectable locales available on context
* build default preferred locales from default preferred languages

Resolves: https://jira.lyrasis.org/browse/VIVO-1837

* Ensure that "available langs" include base langs (#185)

Resolves: https://jira.lyrasis.org/browse/VIVO-1922

Co-authored-by: Andrew Woods <awoods@duraspace.org>

* Ensure I18nStub is initialized before pertinent tests (#186)

Resolves: https://jira.lyrasis.org/browse/VIVO-1923

Co-authored-by: Andrew Woods <awoods@duraspace.org>

* add additional null checks to ensure context is ready for theme change (#187)

* [VIVO-1915] i18n - Adding a label with language tag through the "new" manageLabelsForindividualAddForm.ftl does not take the setting for language tag (#184)

* Fixed bug when addng a label with language tag through managLabelsForindividualAddForm, re ticket VIVO-1915

* removed the language select for managing multi language labels, ticket vivo-1915

* readded the fix for language selection because of the fr-CA version of the manageLabelsForIndividualftl, ticket vivo-1915

* removed earlier fix, removed comments, modified ManageLabelGenrator, ticket vivo-1915

Partial resolution to: https://jira.lyrasis.org/browse/VIVO-1915

* - replaced hard coded "or"s with i18n().or

* [VIVO-1925] i18n: Editing labels results in new label (#188)

* fixed bug: Editing language labels results in new label, ticket vivo-1925

Resolves: https://jira.lyrasis.org/browse/VIVO-1925

* Enable lang selection without need for 'available-langs.properties' (#169)

* Enable lang selection without need for 'available-langs.properties'
Co-authored-by: Andrew Woods <awoods@duraspace.org>

* Reduce number of times QuerySolutions are looped in LanguageFilteringRDFService (#194)

- No functional change in this update

Resolves: https://jira.lyrasis.org/browse/VIVO-1931

Co-authored-by: Andrew Woods <awoods@duraspace.org>

* Prevent 'ProcessRdfForm.parseN3ToRDF' from using null linguisticContext (#197)

Resolves: https://jira.lyrasis.org/browse/VIVO-1944

Co-authored-by: Andrew Woods <awoods@duraspace.org>

* [Vivo 1918] i18n: Reload firsttime files on start-up if changed (#195)

Co-authored-by: Andrew Woods <awoods@lyrasis.org>

* [VIVO-1936] i18n: updated the language comment in runtime.properties

* ftl function to capitalize group name affording override

* Further i18n for BasicValidationVTwo.java

* Fixed DeletePropertyController.java - getting localname of property properly (#200)

* Fixed DeletePropertyController.java - getting localname of property properly

Resolves: https://jira.lyrasis.org/browse/VIVO-1816

* Removed hardcoded time units by properties calls in dateTimeWithPrecision.ftl

* Use i18n values for date time form (#204)

Resolves: https://jira.lyrasis.org/browse/VIVO-1953

* VIVO-1929: patch authorizing create individual form (#206)

* patch authorizing create individual form

Resolves: https://jira.lyrasis.org/browse/VIVO-1929

* Issue/vivo 1947 (#205)

* Make data property richtext editor option selectable from UI
* Better error handling when reasoner disabled
* Change reasoner error log message to debug
* Extend reasoner status error handling
* Improve reasoner error log message and extend to JenaAdminActions
* Bump up log level for admin action to 'warn' and edit admin panel error message
* Change Model writer lang from "N3-PP" to "N3" (#149)
* Prevent ontology editor and N3 editing from deleting property values in languages other than the one associated with the editing request. [https://jira.lyrasis.org/browse/VIVO-1947]

Resolves: https://jira.lyrasis.org/browse/VIVO-1947

Co-authored-by: gneissone <mbgross@wustl.edu>
Co-authored-by: Ralph O'Flinn <roflinn@users.noreply.github.com>
Co-authored-by: Andrew Woods <awoods@lyrasis.org>
Co-authored-by: Andrew Woods <awoods@duraspace.org>

* Remove comments

Co-authored-by: Andrew Woods <awoods@duraspace.org>
Co-authored-by: Nicolas D <46490666+nicalico@users.noreply.github.com>
Co-authored-by: VIVO UQAM <62542918+UQAM-VIVO@users.noreply.github.com>
Co-authored-by: Matthias Luehr <luehr@hs-mittweida.de>
Co-authored-by: michelheonuqam <heon.michel@uqam.ca>
Co-authored-by: Brian Lowe <brianjlowe@gmail.com>
Co-authored-by: j-dornbusch <joachim.dornbusch@ehess.fr>
Co-authored-by: Michel Heon <heon@videotron.ca>
Co-authored-by: gneissone <mbgross@wustl.edu>
Co-authored-by: Ralph O'Flinn <roflinn@users.noreply.github.com>
Co-authored-by: dofeldsc <dofeldsc@uos.de>
Co-authored-by: root <root@vivo-development.hs-mittweida.de>
Co-authored-by: gneissone <mbgross@unavco.org>
Co-authored-by: William Welling <wwelling@library.tamu.edu>
Co-authored-by: Kampe <Benjamin.Kampe@tib.eu>
Co-authored-by: Gross, Benjamin <benjamin.gross@clarivate.com>
Co-authored-by: matthiasluehr <60263380+matthiasluehr@users.noreply.github.com>
Co-authored-by: nicolasdickner <dickner.nicolas@uqam.ca>
2021-02-10 11:04:01 -06:00
Andrew Woods
8b9a7484b3
Create vivo/home on application start-up (#192)
* Create vivo/home on application start-up

- Add logic for untarring vivo-home

Related to: https://jira.lyrasis.org/browse/VIVO-1443

* Require runtime.properties and applicationSetup.n3 be in 'config/' dir

Related to: https://jira.lyrasis.org/browse/VIVO-1443

* Support loading config files with or without 'default' prefix
* Prioritize without the prefix

Related to: https://jira.lyrasis.org/browse/VIVO-1443

* Add leading slash to location of vivo-home.tar resource path
* This allows for deployment in both Tomcat and Jetty

Related to: https://jira.lyrasis.org/browse/VIVO-1443

* Ensure VIVO_HOME is populated whether it is empty or not

Related to: https://jira.lyrasis.org/browse/VIVO-1443

* Require common properties to be in JNDI

Properties include:
- vitro/home
- vitro/appName
- vitro/rootUserAddress
- vitro/defaultNamespace

Related to: https://jira.lyrasis.org/browse/VIVO-1443

* VIVO-1443: non destructive vivo home untarring (#2)

* Upgrade Jena version to 3.16.0 (#196)

Related to: https://jira.lyrasis.org/browse/VIVO-1943

* remove example-settings.xml
* update home directory untar non-destructive
* checksum digest to retain modified files
* compare checksum from digest with existing file
* overwrite files that have not changed
* add command to manually generate checksum digest
* simplify parsing checksum digest using pattern

Co-authored-by: Andrew Woods <awoods@lyrasis.org>
Co-authored-by: Andrew Woods <awoods@duraspace.org>

* not overwrite existing file if same as tar entry (#3)

* Upgrade Jena version to 3.16.0 (#196)

Related to: https://jira.lyrasis.org/browse/VIVO-1943

* remove example-settings.xml
* update home directory untar non-destructive
* checksum digest to retain modified files
* compare checksum from digest with existing file
* overwrite files that have not changed
* add command to manually generate checksum digest
* simplify parsing checksum digest using pattern
* do not overwrite file if same as already exists

Co-authored-by: Andrew Woods <awoods@lyrasis.org>
Co-authored-by: Andrew Woods <awoods@duraspace.org>

* Update log messages for clarity

Co-authored-by: Andrew Woods <awoods@duraspace.org>
Co-authored-by: William Welling <wwelling@library.tamu.edu>
Co-authored-by: Gross, Benjamin <benjamin.gross@clarivate.com>
2021-02-05 10:58:37 -06:00
Ralph O'Flinn
777fa43864 [maven-scm-plugin] prepare development vitro-1.11.2-SNAPSHOT 2020-03-07 10:31:59 -06:00
Ralph O'Flinn
850cc6adbf [maven-scm-plugin] prepare release vivo-1.11.1 2020-03-07 10:29:22 -06:00
Ralph O'Flinn
b1b620d927 [maven-scm-plugin] prepare development vitro-1.11.1-SNAPSHOT 2019-10-21 00:49:31 -05:00
Ralph O'Flinn
0f25660b42 [maven-scm-plugin] prepare release vitro-1.11.0 2019-10-21 00:45:50 -05:00
Ralph O'Flinn
d8649a60ad Merge branch 'sprint-search' into dev-search
# Conflicts:
#	home/src/main/resources/solr/README.txt
#	home/src/main/resources/solr/conf/admin-extra.html
#	home/src/main/resources/solr/conf/clustering/carrot2/kmeans-attributes.xml
#	home/src/main/resources/solr/conf/clustering/carrot2/lingo-attributes.xml
#	home/src/main/resources/solr/conf/clustering/carrot2/stc-attributes.xml
#	home/src/main/resources/solr/conf/currency.xml
#	home/src/main/resources/solr/conf/elevate.xml
#	home/src/main/resources/solr/conf/lang/contractions_it.txt
#	home/src/main/resources/solr/conf/lang/stoptags_ja.txt
#	home/src/main/resources/solr/conf/lang/stopwords_ar.txt
#	home/src/main/resources/solr/conf/lang/stopwords_ca.txt
#	home/src/main/resources/solr/conf/lang/stopwords_el.txt
#	home/src/main/resources/solr/conf/lang/stopwords_fi.txt
#	home/src/main/resources/solr/conf/lang/stopwords_hi.txt
#	home/src/main/resources/solr/conf/lang/stopwords_hu.txt
#	home/src/main/resources/solr/conf/lang/stopwords_lv.txt
#	home/src/main/resources/solr/conf/lang/stopwords_ro.txt
#	home/src/main/resources/solr/conf/mapping-FoldToASCII.txt
#	home/src/main/resources/solr/conf/schema-old.xml
#	home/src/main/resources/solr/conf/schema.xml
#	home/src/main/resources/solr/conf/solrconfig-old.xml
#	home/src/main/resources/solr/conf/solrconfig.xml
#	home/src/main/resources/solr/conf/stopwords-name.txt
#	home/src/main/resources/solr/conf/velocity/VM_global_library.vm
#	home/src/main/resources/solr/conf/velocity/jquery.autocomplete.css
#	home/src/main/resources/solr/conf/velocity/jquery.autocomplete.js
#	home/src/main/resources/solr/conf/velocity/main.css
#	home/src/main/resources/solr/conf/velocity/query_group.vm
#	home/src/main/resources/solr/conf/velocity/query_spatial.vm
#	home/src/main/resources/solr/conf/velocity/richtext_doc.vm
#	home/src/main/resources/solr/conf/xslt/example.xsl
#	home/src/main/resources/solr/conf/xslt/example_atom.xsl
#	home/src/main/resources/solr/conf/xslt/example_rss.xsl
#	home/src/main/resources/solr/conf/xslt/luke.xsl
#	home/src/main/resources/solr/conf/xslt/updateXml.xsl
#	home/src/main/resources/solr/solr.xml
#	home/src/main/resources/solr/solr_newversion.xml
2019-06-21 12:04:45 -05:00
gneissone
bd6140a8cc Remove trailing whitespace throughout project 2019-05-03 12:50:05 -04:00
Andrew Woods
6c5fb9beb8 [VIVO-1592] Remove embedded Solr (#83)
* Remove embedded Solr

Related to: https://jira.duraspace.org/browse/VIVO-1592

* Fix merge conflict in pom.xml files

Related to https://jira.duraspace.org/browse/VIVO-1592
2019-04-03 12:18:55 -04:00
Andrew Woods
a5b2f0b373 [VIVO-1592] Upgrade Solr library to 7.4.0 (#82)
* Upgrade Solr library to 7.4.0

Related to: https://jira.duraspace.org/browse/VIVO-1589

* Fix SolrSmokeTest : home page connection

Related to: https://jira.duraspace.org/browse/VIVO-1589
2019-04-03 12:18:55 -04:00
gneissone
6e717446b4 Replace antrun-plugin <tasks> with <target> in pom.xml files 2019-01-14 17:27:37 -05:00
Graham Triggs
73d6a85e5e [VIVO-1605] Update to latest Error Prone plugin and configuration to support JDK 11 (#88)
* Update to latest Error Prone plugin and configuration to support JDK 11

* Update Error Prone from SNAPSHOT

* Add Javac version missing from Error Prone docs

Partial resolution of: https://jira.duraspace.org/browse/VIVO-1605
2018-10-25 12:51:52 -04:00
vivo-uab
f2656ba3d8 [maven-scm-plugin] prepare development vitro-1.11.0-SNAPSHOT 2018-07-09 17:17:08 -04:00
vivo-uab
2c3c97be5e [maven-scm-plugin] prepare release vitro-1.10.0 2018-07-09 17:17:08 -04:00
Graham Triggs
afaed98291 [VIVO-1470] Cross-platform improvements for Maven (#68) 2018-05-02 12:49:53 +03:00
Andrew Woods
80625e3b4c Change project version from 2.0.0-SNAPSHOT to 1.10.0-SNAPSHOT
Resolves: https://jira.duraspace.org/browse/VIVO-1479
2018-04-24 17:09:02 -04:00
Graham Triggs
41be1c22f4 Fix building on JDK 9 2017-10-23 19:24:32 +01:00
Graham Triggs
f7a7aa5060 Update language pack example 2017-10-21 22:30:47 +01:00
Graham Triggs
e0b723354d Update project version numbers 2017-10-20 15:02:14 +01:00
Graham Triggs
08d8b3f09f Sections needed for internationalization 2017-10-07 20:30:38 +01:00
Graham Triggs
3ad80a9cf6 Consolidate local overrides of messages and styles in "local" subdirectory. Allows customisation without creating a new thmee. 2017-10-02 18:23:49 +01:00
Graham Triggs
d97544b991 Minor code improvements 2017-09-18 11:49:47 +01:00
Graham Triggs
0ae8d005e4 Initial work for Maven site generation 2017-09-16 23:20:33 +01:00
Graham Triggs
0bfd909348 Update versions for beta 2 release 2017-07-27 17:40:04 +01:00
Graham Triggs
7a76405ef3 Reset develop to SNAPSHOT release 2017-06-12 21:54:33 +01:00
Graham Triggs
2fe4d3b3a0 Beta version 2017-06-09 15:57:28 +01:00
Jim Blake
7991bc3da1 VIVO-1258 derive location of log files from CATALINA_BASE instead of CATALINA_HOME (#56)
* VIVO-1246 improve the ConfigurationBeanLoader:

Add cardinality parameters minOccurs and maxOccurs
Create README.md document in the edu.cornell.mannlib.vitro.webapp.utils.configuration package
Split large class of unit tests into separate classes by functionality

* VIVO-1247, remove duplicate code used with ConfigurationBeanLoader.

Now that the @Property annotation includes cardinality parameters, we can remove a lot of duplicate code.

* VIVO-1246 Move unit tests to the new location.

* VIVO-1246 The documentation was in the wrong place.

* VIVO-1258 derive location of log files from CATALINA_BASE instead of CATALINA_HOME
2017-04-05 09:15:28 -04:00
Graham Triggs
5ccba0e0c4 Update POM to require Java 8 (Jena 3.x does not support earlier versions) 2016-12-21 14:12:27 +00:00
Graham Triggs
ed4e42c98f Update version numbers 2016-10-31 19:46:39 +00:00
Graham Triggs
a3c378bb25 [VIVO-1270] Initial commit of Jena 3 2016-09-02 19:59:10 +01:00
Graham Triggs
0d22fa2716 [VIVO-1268] Add UTF-8 settings to Java compiler 2016-08-26 16:16:00 +01:00
Graham Triggs
78547606c6 [VIVO-1269] Add compiler settings to the installer 2016-08-26 16:10:36 +01:00
Graham Triggs
8c9235f8a1 Add clean plugin version 2016-07-18 19:27:53 +01:00
Graham Triggs
dab5bcb357 Add dependencies to webapp pom.xml 2016-07-14 22:47:27 +01:00
Graham Triggs
648ccf4d14 [VIVO-1082] Clean up pluginManagement 2016-07-06 06:39:39 +01:00
Graham Triggs
7afe9de82b [VIVO-1082] Add Maven installer for Vitro 2016-07-06 06:19:17 +01:00