Decouple installation and deployment#479
Merged
chenejac merged 7 commits intovivo-project:mainfrom Jan 10, 2025
Merged
Conversation
included vitro home into installer webapp
chenejac
requested changes
Dec 5, 2024
Contributor
chenejac
left a comment
chenejac
left a comment
There was a problem hiding this comment.
@litvinovg works well. I have only one comment for discussion about the code. Please check my comment.
api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/FileGraphSetup.java
Outdated
Show resolved
Hide resolved
Member
Author
|
@chenejac I checked contents of the war file in case tomcat-dir variable is not provided. |
chenejac
previously approved these changes
Dec 9, 2024
Contributor
chenejac
left a comment
chenejac
left a comment
There was a problem hiding this comment.
@litvinovg it works well. I have tested with and without tomcat-dir property.
api/src/main/java/edu/cornell/mannlib/vitro/webapp/application/VitroHomeDirectory.java
Outdated
Show resolved
Hide resolved
api/src/main/java/edu/cornell/mannlib/vitro/webapp/application/VitroHomeDirectory.java
Outdated
Show resolved
Hide resolved
api/src/main/java/edu/cornell/mannlib/vitro/webapp/application/VitroHomeDirectory.java
Outdated
Show resolved
Hide resolved
api/src/main/java/edu/cornell/mannlib/vitro/webapp/application/VitroHomeDirectory.java
Outdated
Show resolved
Hide resolved
tamu-sad-iii
requested changes
Dec 12, 2024
Contributor
tamu-sad-iii
left a comment
tamu-sad-iii
left a comment
There was a problem hiding this comment.
Please provide unit tests for added code.
litvinovg
force-pushed
the
decouple-install-deploy
branch
from
9f2a455 to
e441cb8
Compare
Member
Author
|
Found and fixed issues in UpdateKnowledgeBase and FauxPropertiesUpdater. |
tamu-sad-iii
previously approved these changes
Dec 15, 2024
api/src/main/java/edu/cornell/mannlib/vitro/webapp/application/VitroHomeDirectory.java
Outdated
Show resolved
Hide resolved
api/src/main/java/edu/cornell/mannlib/vitro/webapp/application/VitroHomeDirectory.java
Outdated
Show resolved
Hide resolved
api/src/main/java/edu/cornell/mannlib/vitro/webapp/application/VitroHomeDirectory.java
Show resolved
Hide resolved
…oHomeDirectory from checkstyle suppressions
chenejac
approved these changes
Jan 2, 2025
Contributor
chenejac
left a comment
chenejac
left a comment
There was a problem hiding this comment.
Looks good to me. Thanks for improvements.
tamu-sad-iii
approved these changes
Jan 8, 2025
ivanmrsulja
pushed a commit
to ivanmrsulja/Vitro
that referenced
this pull request
Apr 1, 2025
* removed home directory modifications by maven * fixed war file deployment included vitro home into installer webapp * Updated home directory on startup, fixed rdf file loading * create home directory path if not exists * Refactored code, fixed UpdateKnowledgeBase and FauxPropertiesUpdater. Added tests. * Reduced nesting, used more specific exception. * Fixed idents and other code style in VitroHomeDirectory. Removed VitroHomeDirectory from checkstyle suppressions
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
VIVO GitHub issue
VIVO PR
What does this pull request do?
Decoupled deployment and installation processes
Changed delivery of home directory: package it's contents as part of war artifact, update default files on home directory except rdf subdirectory on startup.
In case tomcat directory is not provided artifact will not be copied into tomcat webapps directory
What's new?
Changed deployment: war artifact is copied into webapp directory, not unpacked
Home directory contents are copied into war artifact
On startup path to home directory is being created if not already exists.
RDFFilesLoader and FileGraphSetup were adjusted to read home/rdf files from tomcat webapp application directory
How should this be tested?
Test update of already installed instance and installation of new instance.
Additional Notes:
This change require documentation to be updated
Interested parties
@VIVO-project/vivo-committers
Reviewers' expertise
Candidates for reviewing this PR should have some of the following expertises:
Reviewers' report template
Please update the following template which should be used by reviewers.
General comment
A reviewer should provide here comments and suggestions for requested changes if any.
Testing
A reviewer should briefly describe here how it was tested
Code reviewing
A reviewer should briefly describe here which part was code reviewed