Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

O3-3640: SDK to use any content packages specified in distribution properties #288

Merged
merged 37 commits into from
Sep 24, 2024
Merged
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
384e7b3
Pull and extract the content package set in distro.prop
Aug 22, 2024
5476188
Revert "Pull and extract the content package set in distro.prop"
Aug 26, 2024
ed94bcf
Merge branch 'openmrs:master' into master
nravilla Aug 26, 2024
024cffc
To handle content packages
nravilla Aug 27, 2024
6052404
Formatting fix
nravilla Aug 27, 2024
05e7edf
Revert "Formatting fix"
nravilla Aug 27, 2024
e46fcac
Formatting fix
nravilla Aug 27, 2024
c2edc36
Formatting fix
nravilla Aug 27, 2024
6d89453
Formatting fix
nravilla Aug 27, 2024
44d620c
Formatting fix
nravilla Aug 27, 2024
3e699ce
Formatting fix
nravilla Aug 27, 2024
fbc954e
Removed unused variables
nravilla Aug 29, 2024
12fb282
Formatting fix
nravilla Aug 29, 2024
46ac43c
Formatting fix
nravilla Aug 29, 2024
cd35a01
Formatting fix
nravilla Aug 29, 2024
41c4654
Merge remote-tracking branch 'upstream/master'
nravilla Aug 29, 2024
405b4dd
Merge branch 'master' of https://github.com/nravilla/openmrs-sdk into…
nravilla Aug 29, 2024
b32c4d6
Formatting fix
nravilla Aug 30, 2024
6a68fe2
Formatting fix
nravilla Aug 30, 2024
1e50aed
Formatting fix
nravilla Aug 30, 2024
a86913c
Formatting fix
nravilla Aug 30, 2024
392fc71
Formatting fix
nravilla Aug 30, 2024
5c34131
Merge remote-tracking branch 'upstream/master' into O3-3640-new
nravilla Sep 9, 2024
776b404
Added getContentArtifacts
nravilla Sep 9, 2024
89120ef
Changed Content to ContentConfiguration
nravilla Sep 9, 2024
befffc3
Merge branch 'master' into O3-3640-new
nravilla Sep 18, 2024
37c0442
Removed serverDirectory as an instance variable from ContentHelper
nravilla Sep 19, 2024
6b5041a
removed empty method - cleanupContentTempFolder()
nravilla Sep 19, 2024
78a39b7
Changes based on PR code review
nravilla Sep 23, 2024
7db72c4
Changes based on PR code review-formatting fix
nravilla Sep 23, 2024
57484db
formatting fix
nravilla Sep 23, 2024
aa55b35
Merge branch 'O3-3640-new' of https://github.com/nravilla/openmrs-sdk…
nravilla Sep 23, 2024
8ddadf5
Removed accidently added eclipse files
nravilla Sep 23, 2024
c5e8d41
Changes based on PR code review
nravilla Sep 23, 2024
2e8af3f
Reverted changes regarding OS temp directory
nravilla Sep 23, 2024
9e9e4d2
Formatting fix
nravilla Sep 23, 2024
1fefe44
Code review and some improvements
ibacher Sep 24, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Changes based on PR code review
  • Loading branch information
nravilla committed Sep 23, 2024
commit c5e8d41c9b247a3fd209a6ddb045f89fcb580ffc
Original file line number Diff line number Diff line change
@@ -294,17 +294,15 @@ private String buildDistro(File targetDirectory, Artifact distroArtifact, Distro

File owasDir = new File(tempDir, "bundledOwas");
owasDir.mkdir();
downloadOWAs(targetDirectory, distroProperties, owasDir);
//downloadAndMoveContentBackendConfig(targetDirectory, distroProperties);
spaInstaller.installFromDistroProperties(tempDir, distroProperties, ignorePeerDependencies, overrideReuseNodeCache);
downloadOWAs(targetDirectory, distroProperties, owasDir);
spaInstaller.installFromDistroProperties(tempDir, distroProperties, ignorePeerDependencies, overrideReuseNodeCache);
File frontendDir = new File(tempDir, "frontend");
if(frontendDir.exists()) {
frontendDir.renameTo(new File(tempDir, "bundledFrontend"));
}

warfile.addFolder(tempDir, new ZipParameters());
try {
//ContentHelper.deleteTempContentFolder(targetDirectory);
FileUtils.deleteDirectory(tempDir);
}
catch (IOException e) {
@@ -325,7 +323,7 @@ private String buildDistro(File targetDirectory, Artifact distroArtifact, Distro

File configDir = new File(web, SDKConstants.OPENMRS_SERVER_CONFIGURATION);
configDir.mkdir();
setConfigFolder(configDir, distroProperties, distroArtifact);
setConfigFolder(configDir, distroProperties, distroArtifact);
ContentHelper.downloadAndMoveContentBackendConfig(web, distroProperties, moduleInstaller, wizard);
spaInstaller.installFromDistroProperties(web, distroProperties, ignorePeerDependencies, overrideReuseNodeCache);

@@ -621,5 +619,6 @@ public boolean accept(File dir, String name) {
throw new MojoExecutionException("Distro should contain only single war file");
}
}
}
}

}