Update from develop #68
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… watermark helptext #7844
- Add missing displayOrder values - Fix missing type for software requirements - Avoid splitting up compound fields too much, otherwise data is not exportable to schema.org or CodeMeta JSON-LD without special handling (#7856) - Tweak order - Tweak descriptions and examples - Fix whitespaces and line endings
With the merge of computational workflow metadata considered experimental, move CodeMeta there, too.
By refactoring SystemConfig.getSolrHostColonPort, the Solr endpoint
is not just configurable via a database setting, but also by all
mechanisms of MicroProfile Config.
- The database setting still has priority over the other mechanisms.
- It's completely backward compatible, no config change necessary.
- Tests have been added to ensure the behaviour
- Default ("localhost:8983") for no setting given is now also done via MPCONFIG
- Default for container usage ("solr:8983") possible via MPCONFIG profile "ct"
When using Dataverse with a non-default Solr, HTTPS, custom core name or similar, it's necessary to have a configurable URL for the Solr endpoint. This becomes now possible via MicroProfile Config, defaulting to the old variant.
Describe the new options to set the Solr endpoint, crosslinking the old way and adding hints about MPCONFIG profiles.
1. Instead of reading the configuration from system properties only, switch to using MPCONFIG and JvmSettings fluent API. 2. Instead of saving the configuration in a static variable, retrieve the config from the constructor. This has 2 advantages: 1) no worries about execution order and MPCONFIG not yet ready, 2) update the readers with new config settings when changed (no need to restart).
The docs said the default is "/tmp/Rserve", while the code had "/tmp". Changing the code default to the documented one.
IQSS/9126-allow_workflow_tokens_in_access_api
As the citation block already contains a compound field "software" with both "softwareName" and "softwareVersion", meant to describe software used to create the dataset, this name conflict must be resolved. By renaming to "codeVersion", the semantic is not changed, as this metadata block is about describing software deposits. As the termURI is explicitly set to "schema.org/softwareVersion" it remains compatible with OAI-ORE and other linked data usages. A future exporter for CodeMeta might require special attention for this field.
…scriptions #7844 A slight rephrasing should make it easier to understand what is expected as content for these metadata fields.
As we are now using JvmSettings everywhere as an abstraction above MPCONFIG, no need to import on our own.
When an invalid port was set, which cannot be transformed to an integer, the JSF page would kind of freeze: it leaves the user on the grayed out "action" screen and if you click on it, shows upload page with no files, so a silent error. By defaulting to 6311 also for this case and logging an error, this should improve the UX, but leave a hint for an admin in the logs.
7000 mpconfig rserve
7844 codemeta schema
…rove_guestbook_estimate Trigger auto-analyze more frequently for guestbook estimates
Co-authored-by: Philip Durbin <philipdurbin@gmail.com>
7000 mpconfig solr
document ongoing security and practices #3215
…bloader_integration IQSS/9095-dvwebloader integration
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What this PR does / why we need it:
Which issue(s) this PR closes:
Closes #
Special notes for your reviewer:
Suggestions on how to test this:
Does this PR introduce a user interface change? If mockups are available, please link/include them here:
Is there a release notes update needed for this change?:
Additional documentation: