From 07002e7ea8289c2b62f3a2865597d62b949ad618 Mon Sep 17 00:00:00 2001 From: Romain Buisson Date: Fri, 5 Jan 2024 15:06:50 +0100 Subject: [PATCH] KH-452: Re-organize to match the latest Ozone structure (#273) --- .gitpod.yml | 8 +- README.md | 7 +- base/pom.xml | 228 ++++++++------- .../ozone-frontend-config.json | 0 .../addresshierarchy/addressConfiguration.xml | 0 .../addresshierarchy/addresshierarchy.csv | 0 .../ampathforms/NCD_Consultation.json | 0 .../ampathforms/NCD_Medical_History.json | 0 .../ampathforms/NCD_Screening.json | 0 .../cervical_cancer_screening.json | 0 ...enter - NCD Screening_translations_en.json | 0 ...enter - NCD Screening_translations_km.json | 0 .../NCD Consultation_translations_en.json | 0 .../NCD Consultation_translations_km.json | 0 .../NCD Medical History_translations_en.json | 0 .../NCD Medical History_translations_km.json | 0 .../cervical_cancer_screening_en.json | 0 .../cervical_cancer_screening_km.json | 0 .../attributetypes/attribute_types.csv | 0 .../concepts/assessment.csv | 0 .../concepts/diagnosis.csv | 0 .../concepts/drugs_concepts.csv | 0 .../concepts/education.csv | 0 .../concepts/ethnicities.csv | 0 .../initializer_config}/concepts/findings.csv | 0 .../initializer_config}/concepts/general.csv | 0 .../initializer_config}/concepts/labs.csv | 0 .../concepts/lifestyle.csv | 0 .../concepts/locations.csv | 0 .../concepts/management.csv | 0 .../concepts/marital_status.csv | 0 .../concepts/occupation.csv | 0 .../opdConsultationReportConcepts.csv | 0 .../concepts/past_medical_history.csv | 0 .../concepts/physical_examination.csv | 0 .../concepts/reproductive_history.csv | 0 .../concepts/sexual_orientation.csv | 0 .../initializer_config}/drugs/drugs.csv | 0 .../encountertypes/encountertypes.csv | 0 .../encountertypes/encountertypes_core.csv | 0 .../globalproperties/address-template.xml | 0 .../globalproperties/i18n.xml | 0 .../opdConsultationReportConfig.json | 0 .../locations/locations.csv | 0 .../ocl/CCD_1.20220817052001.zip | Bin .../ocl/CDU_3.0.20220817051630.zip | Bin .../ocl/CIEL-frequencies_1.20220816234743.zip | Bin .../ocl/CIELAllergySet_1.20220817053026.zip | Bin ...ELImmunizationContent_1.20220817012726.zip | Bin .../ocl/DemoQueueConcepts_1.zip | Bin .../ocl/ExampleLabFilter_2.20220331075053.zip | Bin .../ocl/GenericDemoForm_3.20220225043204.zip | Bin .../ocl/demopackagehiv_12.20220525204054.zip | Bin .../ocl/lab_tests-core-demo.zip | Bin .../cambodia-identifiers.csv | 0 .../patientidentifiertypes.csv | 0 .../retire-core-identifiers.csv | 0 .../personattributetypes.csv | 0 .../privileges/privileges.csv | 0 .../privileges/privileges_core.csv | 0 .../initializer_config}/roles/roles.csv | 0 .../initializer_config}/roles/roles_core.csv | 0 .../visittypes/visittypes.csv | 0 configs/openmrs_config/demo-users/app.js | 40 --- .../demo-users/create-demo-users.sh | 12 - .../demo-users/package-lock.json | 100 ------- .../openmrs_config/demo-users/package.json | 23 -- configs/openmrs_config/demo-users/users.json | 50 ---- .../frontend/ozone_logo_color.svg | 55 ---- .../frontend/ozone_logo_white.svg | 13 - exclude-files.sh | 21 -- pom.xml | 75 ++++- prod/pom.xml | 264 ++++++++---------- prod/start-distro.sh | 23 ++ readme/impl-guide.md | 83 +++--- run/pom.xml | 195 ------------- run/resources/concatenate.sh | 4 - run/resources/ozone-analytics.env | 18 -- run/resources/ozone-docker-compose.env | 15 - scripts/.mvn/wrapper/maven-wrapper.jar | Bin 0 -> 59925 bytes .../.mvn}/wrapper/maven-wrapper.properties | 0 scripts/docker-compose-files.txt | 2 + scripts/go-to-scripts-dir.sh | 6 + mvnw => scripts/mvnw | 0 mvnw.cmd => scripts/mvnw.cmd | 0 scripts/set-ozone-dir.sh | 13 + start-analytics.sh | 24 -- start-distro.sh | 34 --- 88 files changed, 401 insertions(+), 912 deletions(-) rename configs/{ozone_config/frontend => openmrs/frontend_config}/ozone-frontend-config.json (100%) rename configs/{openmrs_config => openmrs/initializer_config}/addresshierarchy/addressConfiguration.xml (100%) rename configs/{openmrs_config => openmrs/initializer_config}/addresshierarchy/addresshierarchy.csv (100%) rename configs/{openmrs_config => openmrs/initializer_config}/ampathforms/NCD_Consultation.json (100%) rename configs/{openmrs_config => openmrs/initializer_config}/ampathforms/NCD_Medical_History.json (100%) rename configs/{openmrs_config => openmrs/initializer_config}/ampathforms/NCD_Screening.json (100%) rename configs/{openmrs_config => openmrs/initializer_config}/ampathforms/cervical_cancer_screening.json (100%) rename configs/{openmrs_config => openmrs/initializer_config}/ampathformstranslations/Health Center - NCD Screening_translations_en.json (100%) rename configs/{openmrs_config => openmrs/initializer_config}/ampathformstranslations/Health Center - NCD Screening_translations_km.json (100%) rename configs/{openmrs_config => openmrs/initializer_config}/ampathformstranslations/NCD Consultation_translations_en.json (100%) rename configs/{openmrs_config => openmrs/initializer_config}/ampathformstranslations/NCD Consultation_translations_km.json (100%) rename configs/{openmrs_config => openmrs/initializer_config}/ampathformstranslations/NCD Medical History_translations_en.json (100%) rename configs/{openmrs_config => openmrs/initializer_config}/ampathformstranslations/NCD Medical History_translations_km.json (100%) rename configs/{openmrs_config => openmrs/initializer_config}/ampathformstranslations/cervical_cancer_screening_en.json (100%) rename configs/{openmrs_config => openmrs/initializer_config}/ampathformstranslations/cervical_cancer_screening_km.json (100%) rename configs/{openmrs_config => openmrs/initializer_config}/attributetypes/attribute_types.csv (100%) rename configs/{openmrs_config => openmrs/initializer_config}/concepts/assessment.csv (100%) rename configs/{openmrs_config => openmrs/initializer_config}/concepts/diagnosis.csv (100%) rename configs/{openmrs_config => openmrs/initializer_config}/concepts/drugs_concepts.csv (100%) rename configs/{openmrs_config => openmrs/initializer_config}/concepts/education.csv (100%) rename configs/{openmrs_config => openmrs/initializer_config}/concepts/ethnicities.csv (100%) rename configs/{openmrs_config => openmrs/initializer_config}/concepts/findings.csv (100%) rename configs/{openmrs_config => openmrs/initializer_config}/concepts/general.csv (100%) rename configs/{openmrs_config => openmrs/initializer_config}/concepts/labs.csv (100%) rename configs/{openmrs_config => openmrs/initializer_config}/concepts/lifestyle.csv (100%) rename configs/{openmrs_config => openmrs/initializer_config}/concepts/locations.csv (100%) rename configs/{openmrs_config => openmrs/initializer_config}/concepts/management.csv (100%) rename configs/{openmrs_config => openmrs/initializer_config}/concepts/marital_status.csv (100%) rename configs/{openmrs_config => openmrs/initializer_config}/concepts/occupation.csv (100%) rename configs/{openmrs_config => openmrs/initializer_config}/concepts/opdConsultationReportConcepts.csv (100%) rename configs/{openmrs_config => openmrs/initializer_config}/concepts/past_medical_history.csv (100%) rename configs/{openmrs_config => openmrs/initializer_config}/concepts/physical_examination.csv (100%) rename configs/{openmrs_config => openmrs/initializer_config}/concepts/reproductive_history.csv (100%) rename configs/{openmrs_config => openmrs/initializer_config}/concepts/sexual_orientation.csv (100%) rename configs/{openmrs_config => openmrs/initializer_config}/drugs/drugs.csv (100%) rename configs/{openmrs_config => openmrs/initializer_config}/encountertypes/encountertypes.csv (100%) rename configs/{openmrs_config => openmrs/initializer_config}/encountertypes/encountertypes_core.csv (100%) rename configs/{openmrs_config => openmrs/initializer_config}/globalproperties/address-template.xml (100%) rename configs/{openmrs_config => openmrs/initializer_config}/globalproperties/i18n.xml (100%) rename configs/{openmrs_config => openmrs/initializer_config}/jsonkeyvalues/opdConsultationReportConfig.json (100%) rename configs/{openmrs_config => openmrs/initializer_config}/locations/locations.csv (100%) rename configs/{openmrs_config => openmrs/initializer_config}/ocl/CCD_1.20220817052001.zip (100%) rename configs/{openmrs_config => openmrs/initializer_config}/ocl/CDU_3.0.20220817051630.zip (100%) rename configs/{openmrs_config => openmrs/initializer_config}/ocl/CIEL-frequencies_1.20220816234743.zip (100%) rename configs/{openmrs_config => openmrs/initializer_config}/ocl/CIELAllergySet_1.20220817053026.zip (100%) rename configs/{openmrs_config => openmrs/initializer_config}/ocl/CIELImmunizationContent_1.20220817012726.zip (100%) rename configs/{openmrs_config => openmrs/initializer_config}/ocl/DemoQueueConcepts_1.zip (100%) rename configs/{openmrs_config => openmrs/initializer_config}/ocl/ExampleLabFilter_2.20220331075053.zip (100%) rename configs/{openmrs_config => openmrs/initializer_config}/ocl/GenericDemoForm_3.20220225043204.zip (100%) rename configs/{openmrs_config => openmrs/initializer_config}/ocl/demopackagehiv_12.20220525204054.zip (100%) rename configs/{openmrs_config => openmrs/initializer_config}/ocl/lab_tests-core-demo.zip (100%) rename configs/{openmrs_config => openmrs/initializer_config}/patientidentifiertypes/cambodia-identifiers.csv (100%) rename configs/{openmrs_config => openmrs/initializer_config}/patientidentifiertypes/patientidentifiertypes.csv (100%) rename configs/{openmrs_config => openmrs/initializer_config}/patientidentifiertypes/retire-core-identifiers.csv (100%) rename configs/{openmrs_config => openmrs/initializer_config}/personattributetypes/personattributetypes.csv (100%) rename configs/{openmrs_config => openmrs/initializer_config}/privileges/privileges.csv (100%) rename configs/{openmrs_config => openmrs/initializer_config}/privileges/privileges_core.csv (100%) rename configs/{openmrs_config => openmrs/initializer_config}/roles/roles.csv (100%) rename configs/{openmrs_config => openmrs/initializer_config}/roles/roles_core.csv (100%) rename configs/{openmrs_config => openmrs/initializer_config}/visittypes/visittypes.csv (100%) delete mode 100644 configs/openmrs_config/demo-users/app.js delete mode 100644 configs/openmrs_config/demo-users/create-demo-users.sh delete mode 100644 configs/openmrs_config/demo-users/package-lock.json delete mode 100644 configs/openmrs_config/demo-users/package.json delete mode 100644 configs/openmrs_config/demo-users/users.json delete mode 100644 configs/ozone_config/frontend/ozone_logo_color.svg delete mode 100644 configs/ozone_config/frontend/ozone_logo_white.svg delete mode 100755 exclude-files.sh create mode 100644 prod/start-distro.sh delete mode 100644 run/pom.xml delete mode 100755 run/resources/concatenate.sh delete mode 100644 run/resources/ozone-analytics.env delete mode 100644 run/resources/ozone-docker-compose.env create mode 100644 scripts/.mvn/wrapper/maven-wrapper.jar rename {.mvn => scripts/.mvn}/wrapper/maven-wrapper.properties (100%) create mode 100755 scripts/docker-compose-files.txt create mode 100755 scripts/go-to-scripts-dir.sh rename mvnw => scripts/mvnw (100%) rename mvnw.cmd => scripts/mvnw.cmd (100%) create mode 100755 scripts/set-ozone-dir.sh delete mode 100755 start-analytics.sh delete mode 100755 start-distro.sh diff --git a/.gitpod.yml b/.gitpod.yml index 6c1123f3..bf4cbc25 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -1,8 +1,8 @@ ---- - tasks: - - init: ./start-distro.sh default - + - name: Run Ozone Cambodia + before: sudo apt-get update && sudo apt-get install -y gettext-base && sudo rm -rf /var/lib/apt/lists/* + init: scripts/mvnw clean package + command: source base/target/go-to-scripts-dir.sh && ./start-demo.sh ports: - name: OpenMRS description: OpenMRS 3 diff --git a/README.md b/README.md index 9741a73e..efbba72a 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ -# Ozone Distribution For Cambodia 🇰🇭 +# Ozone for Cambodia 🇰🇭 -A Maven project to download and package in one place all the software artefacts that make the Ozone Distribution for Cambodia. +A Maven project to download and package in one place all the software artefacts that make the Ozone for Cambodia. ## Summary -The Ozone Distribution For Cambodia or **Ozone Kh** is a distribution of [Ozone HIS](https://www.ozone-his.com) specially configured for the MoH of Cambodia. In its original form it is an integrated system between an NCD-capable EMR system and a reporting & analytics platform for NCD population reporting. +Ozone for Cambodia or **Ozone Kh** is a distribution of [Ozone HIS](https://www.ozone-his.com) specially configured for the MoH of Cambodia. In its original form it is an integrated system between an NCD-capable EMR system and a reporting & analytics platform for NCD population reporting. ## Demo Environments @@ -29,6 +29,7 @@ A large part Ozone Kh's roadmap is managed publicly to promote transparency and ## Release Notes ### Version 1.5.0 +* Refactor the repository structure ### Version 1.4.1 * Reverted clinical forms version from '2' to '1'. diff --git a/base/pom.xml b/base/pom.xml index 80c5608c..daac136b 100644 --- a/base/pom.xml +++ b/base/pom.xml @@ -1,109 +1,129 @@ - 4.0.0 + 4.0.0 + com.ozonehis + ozone-cambodia + Ozone for Cambodia + 1.5.0-SNAPSHOT + pom + + com.ozonehis - ozone-distro-cambodia - Ozone Distribution for Cambodia + ozone-cambodia-parent 1.5.0-SNAPSHOT - pom + + + + UTF-8 + - - com.ozonehis - ozone-distro-cambodia-parent - 1.5.0-SNAPSHOT - + + + com.ozonehis + ozone + zip + 1.0.0-SNAPSHOT + + - - UTF-8 - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - 2.8 - - - Unpack Ozone Distro - generate-resources - - unpack-dependencies - - - true - true - ${project.build.directory}/${project.artifactId}-${project.version} - ozone-distro - - - - - - - exec-maven-plugin - 3.1.0 - org.codehaus.mojo - - - Run exclude-files.sh - generate-resources - - exec - - - ${project.parent.basedir}/exclude-files.sh - ${project.basedir}/dependency-excludes.txt - ${project.build.directory}/${project.artifactId}-${project.version} - - - - - - org.apache.maven.plugins - maven-resources-plugin - 3.3.0 - - - - Copy local resources - process-resources - - copy-resources - - - ${project.build.directory}/${project.artifactId}-${project.version} - true - - - ${project.parent.basedir}/configs - - - - - - - - - org.apache.maven.plugins - maven-assembly-plugin - - - Package distro - package - - single - - - false - - ${project.basedir}/assembly.xml - - - - - - - - - + + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.8 + + + Unpack Ozone + generate-resources + + unpack-dependencies + + + true + true + ${project.build.directory}/ozone + ozone + + + + + + org.apache.maven.plugins + maven-resources-plugin + 3.3.0 + + + + Copy local configs + prepare-package + + copy-resources + + + + ${project.build.directory}/${project.artifactId}-${project.version}/distro/configs + true + + + ${project.parent.basedir}/configs + + + + + + + Exclude some Ozone files + process-resources + + copy-resources + + + + ${project.build.directory}/${project.artifactId}-${project.version} + true + + + ${project.build.directory}/ozone + + distro/**/appointment* + distro/**/concepts*demo.csv + distro/**/encountertypes*demo.csv + distro/**/personattributetypes*demo.csv + distro/**/privileges*demo.csv + distro/**/program* + distro/**/roles*demo.csv + distro/**/ampathforms/*.json + distro/**/ampathformstranslations/*.json + distro/**/*demo.csv + + + + + + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + Package distro + package + + single + + + false + + ${project.basedir}/assembly.xml + + + + + + + + + \ No newline at end of file diff --git a/configs/ozone_config/frontend/ozone-frontend-config.json b/configs/openmrs/frontend_config/ozone-frontend-config.json similarity index 100% rename from configs/ozone_config/frontend/ozone-frontend-config.json rename to configs/openmrs/frontend_config/ozone-frontend-config.json diff --git a/configs/openmrs_config/addresshierarchy/addressConfiguration.xml b/configs/openmrs/initializer_config/addresshierarchy/addressConfiguration.xml similarity index 100% rename from configs/openmrs_config/addresshierarchy/addressConfiguration.xml rename to configs/openmrs/initializer_config/addresshierarchy/addressConfiguration.xml diff --git a/configs/openmrs_config/addresshierarchy/addresshierarchy.csv b/configs/openmrs/initializer_config/addresshierarchy/addresshierarchy.csv similarity index 100% rename from configs/openmrs_config/addresshierarchy/addresshierarchy.csv rename to configs/openmrs/initializer_config/addresshierarchy/addresshierarchy.csv diff --git a/configs/openmrs_config/ampathforms/NCD_Consultation.json b/configs/openmrs/initializer_config/ampathforms/NCD_Consultation.json similarity index 100% rename from configs/openmrs_config/ampathforms/NCD_Consultation.json rename to configs/openmrs/initializer_config/ampathforms/NCD_Consultation.json diff --git a/configs/openmrs_config/ampathforms/NCD_Medical_History.json b/configs/openmrs/initializer_config/ampathforms/NCD_Medical_History.json similarity index 100% rename from configs/openmrs_config/ampathforms/NCD_Medical_History.json rename to configs/openmrs/initializer_config/ampathforms/NCD_Medical_History.json diff --git a/configs/openmrs_config/ampathforms/NCD_Screening.json b/configs/openmrs/initializer_config/ampathforms/NCD_Screening.json similarity index 100% rename from configs/openmrs_config/ampathforms/NCD_Screening.json rename to configs/openmrs/initializer_config/ampathforms/NCD_Screening.json diff --git a/configs/openmrs_config/ampathforms/cervical_cancer_screening.json b/configs/openmrs/initializer_config/ampathforms/cervical_cancer_screening.json similarity index 100% rename from configs/openmrs_config/ampathforms/cervical_cancer_screening.json rename to configs/openmrs/initializer_config/ampathforms/cervical_cancer_screening.json diff --git a/configs/openmrs_config/ampathformstranslations/Health Center - NCD Screening_translations_en.json b/configs/openmrs/initializer_config/ampathformstranslations/Health Center - NCD Screening_translations_en.json similarity index 100% rename from configs/openmrs_config/ampathformstranslations/Health Center - NCD Screening_translations_en.json rename to configs/openmrs/initializer_config/ampathformstranslations/Health Center - NCD Screening_translations_en.json diff --git a/configs/openmrs_config/ampathformstranslations/Health Center - NCD Screening_translations_km.json b/configs/openmrs/initializer_config/ampathformstranslations/Health Center - NCD Screening_translations_km.json similarity index 100% rename from configs/openmrs_config/ampathformstranslations/Health Center - NCD Screening_translations_km.json rename to configs/openmrs/initializer_config/ampathformstranslations/Health Center - NCD Screening_translations_km.json diff --git a/configs/openmrs_config/ampathformstranslations/NCD Consultation_translations_en.json b/configs/openmrs/initializer_config/ampathformstranslations/NCD Consultation_translations_en.json similarity index 100% rename from configs/openmrs_config/ampathformstranslations/NCD Consultation_translations_en.json rename to configs/openmrs/initializer_config/ampathformstranslations/NCD Consultation_translations_en.json diff --git a/configs/openmrs_config/ampathformstranslations/NCD Consultation_translations_km.json b/configs/openmrs/initializer_config/ampathformstranslations/NCD Consultation_translations_km.json similarity index 100% rename from configs/openmrs_config/ampathformstranslations/NCD Consultation_translations_km.json rename to configs/openmrs/initializer_config/ampathformstranslations/NCD Consultation_translations_km.json diff --git a/configs/openmrs_config/ampathformstranslations/NCD Medical History_translations_en.json b/configs/openmrs/initializer_config/ampathformstranslations/NCD Medical History_translations_en.json similarity index 100% rename from configs/openmrs_config/ampathformstranslations/NCD Medical History_translations_en.json rename to configs/openmrs/initializer_config/ampathformstranslations/NCD Medical History_translations_en.json diff --git a/configs/openmrs_config/ampathformstranslations/NCD Medical History_translations_km.json b/configs/openmrs/initializer_config/ampathformstranslations/NCD Medical History_translations_km.json similarity index 100% rename from configs/openmrs_config/ampathformstranslations/NCD Medical History_translations_km.json rename to configs/openmrs/initializer_config/ampathformstranslations/NCD Medical History_translations_km.json diff --git a/configs/openmrs_config/ampathformstranslations/cervical_cancer_screening_en.json b/configs/openmrs/initializer_config/ampathformstranslations/cervical_cancer_screening_en.json similarity index 100% rename from configs/openmrs_config/ampathformstranslations/cervical_cancer_screening_en.json rename to configs/openmrs/initializer_config/ampathformstranslations/cervical_cancer_screening_en.json diff --git a/configs/openmrs_config/ampathformstranslations/cervical_cancer_screening_km.json b/configs/openmrs/initializer_config/ampathformstranslations/cervical_cancer_screening_km.json similarity index 100% rename from configs/openmrs_config/ampathformstranslations/cervical_cancer_screening_km.json rename to configs/openmrs/initializer_config/ampathformstranslations/cervical_cancer_screening_km.json diff --git a/configs/openmrs_config/attributetypes/attribute_types.csv b/configs/openmrs/initializer_config/attributetypes/attribute_types.csv similarity index 100% rename from configs/openmrs_config/attributetypes/attribute_types.csv rename to configs/openmrs/initializer_config/attributetypes/attribute_types.csv diff --git a/configs/openmrs_config/concepts/assessment.csv b/configs/openmrs/initializer_config/concepts/assessment.csv similarity index 100% rename from configs/openmrs_config/concepts/assessment.csv rename to configs/openmrs/initializer_config/concepts/assessment.csv diff --git a/configs/openmrs_config/concepts/diagnosis.csv b/configs/openmrs/initializer_config/concepts/diagnosis.csv similarity index 100% rename from configs/openmrs_config/concepts/diagnosis.csv rename to configs/openmrs/initializer_config/concepts/diagnosis.csv diff --git a/configs/openmrs_config/concepts/drugs_concepts.csv b/configs/openmrs/initializer_config/concepts/drugs_concepts.csv similarity index 100% rename from configs/openmrs_config/concepts/drugs_concepts.csv rename to configs/openmrs/initializer_config/concepts/drugs_concepts.csv diff --git a/configs/openmrs_config/concepts/education.csv b/configs/openmrs/initializer_config/concepts/education.csv similarity index 100% rename from configs/openmrs_config/concepts/education.csv rename to configs/openmrs/initializer_config/concepts/education.csv diff --git a/configs/openmrs_config/concepts/ethnicities.csv b/configs/openmrs/initializer_config/concepts/ethnicities.csv similarity index 100% rename from configs/openmrs_config/concepts/ethnicities.csv rename to configs/openmrs/initializer_config/concepts/ethnicities.csv diff --git a/configs/openmrs_config/concepts/findings.csv b/configs/openmrs/initializer_config/concepts/findings.csv similarity index 100% rename from configs/openmrs_config/concepts/findings.csv rename to configs/openmrs/initializer_config/concepts/findings.csv diff --git a/configs/openmrs_config/concepts/general.csv b/configs/openmrs/initializer_config/concepts/general.csv similarity index 100% rename from configs/openmrs_config/concepts/general.csv rename to configs/openmrs/initializer_config/concepts/general.csv diff --git a/configs/openmrs_config/concepts/labs.csv b/configs/openmrs/initializer_config/concepts/labs.csv similarity index 100% rename from configs/openmrs_config/concepts/labs.csv rename to configs/openmrs/initializer_config/concepts/labs.csv diff --git a/configs/openmrs_config/concepts/lifestyle.csv b/configs/openmrs/initializer_config/concepts/lifestyle.csv similarity index 100% rename from configs/openmrs_config/concepts/lifestyle.csv rename to configs/openmrs/initializer_config/concepts/lifestyle.csv diff --git a/configs/openmrs_config/concepts/locations.csv b/configs/openmrs/initializer_config/concepts/locations.csv similarity index 100% rename from configs/openmrs_config/concepts/locations.csv rename to configs/openmrs/initializer_config/concepts/locations.csv diff --git a/configs/openmrs_config/concepts/management.csv b/configs/openmrs/initializer_config/concepts/management.csv similarity index 100% rename from configs/openmrs_config/concepts/management.csv rename to configs/openmrs/initializer_config/concepts/management.csv diff --git a/configs/openmrs_config/concepts/marital_status.csv b/configs/openmrs/initializer_config/concepts/marital_status.csv similarity index 100% rename from configs/openmrs_config/concepts/marital_status.csv rename to configs/openmrs/initializer_config/concepts/marital_status.csv diff --git a/configs/openmrs_config/concepts/occupation.csv b/configs/openmrs/initializer_config/concepts/occupation.csv similarity index 100% rename from configs/openmrs_config/concepts/occupation.csv rename to configs/openmrs/initializer_config/concepts/occupation.csv diff --git a/configs/openmrs_config/concepts/opdConsultationReportConcepts.csv b/configs/openmrs/initializer_config/concepts/opdConsultationReportConcepts.csv similarity index 100% rename from configs/openmrs_config/concepts/opdConsultationReportConcepts.csv rename to configs/openmrs/initializer_config/concepts/opdConsultationReportConcepts.csv diff --git a/configs/openmrs_config/concepts/past_medical_history.csv b/configs/openmrs/initializer_config/concepts/past_medical_history.csv similarity index 100% rename from configs/openmrs_config/concepts/past_medical_history.csv rename to configs/openmrs/initializer_config/concepts/past_medical_history.csv diff --git a/configs/openmrs_config/concepts/physical_examination.csv b/configs/openmrs/initializer_config/concepts/physical_examination.csv similarity index 100% rename from configs/openmrs_config/concepts/physical_examination.csv rename to configs/openmrs/initializer_config/concepts/physical_examination.csv diff --git a/configs/openmrs_config/concepts/reproductive_history.csv b/configs/openmrs/initializer_config/concepts/reproductive_history.csv similarity index 100% rename from configs/openmrs_config/concepts/reproductive_history.csv rename to configs/openmrs/initializer_config/concepts/reproductive_history.csv diff --git a/configs/openmrs_config/concepts/sexual_orientation.csv b/configs/openmrs/initializer_config/concepts/sexual_orientation.csv similarity index 100% rename from configs/openmrs_config/concepts/sexual_orientation.csv rename to configs/openmrs/initializer_config/concepts/sexual_orientation.csv diff --git a/configs/openmrs_config/drugs/drugs.csv b/configs/openmrs/initializer_config/drugs/drugs.csv similarity index 100% rename from configs/openmrs_config/drugs/drugs.csv rename to configs/openmrs/initializer_config/drugs/drugs.csv diff --git a/configs/openmrs_config/encountertypes/encountertypes.csv b/configs/openmrs/initializer_config/encountertypes/encountertypes.csv similarity index 100% rename from configs/openmrs_config/encountertypes/encountertypes.csv rename to configs/openmrs/initializer_config/encountertypes/encountertypes.csv diff --git a/configs/openmrs_config/encountertypes/encountertypes_core.csv b/configs/openmrs/initializer_config/encountertypes/encountertypes_core.csv similarity index 100% rename from configs/openmrs_config/encountertypes/encountertypes_core.csv rename to configs/openmrs/initializer_config/encountertypes/encountertypes_core.csv diff --git a/configs/openmrs_config/globalproperties/address-template.xml b/configs/openmrs/initializer_config/globalproperties/address-template.xml similarity index 100% rename from configs/openmrs_config/globalproperties/address-template.xml rename to configs/openmrs/initializer_config/globalproperties/address-template.xml diff --git a/configs/openmrs_config/globalproperties/i18n.xml b/configs/openmrs/initializer_config/globalproperties/i18n.xml similarity index 100% rename from configs/openmrs_config/globalproperties/i18n.xml rename to configs/openmrs/initializer_config/globalproperties/i18n.xml diff --git a/configs/openmrs_config/jsonkeyvalues/opdConsultationReportConfig.json b/configs/openmrs/initializer_config/jsonkeyvalues/opdConsultationReportConfig.json similarity index 100% rename from configs/openmrs_config/jsonkeyvalues/opdConsultationReportConfig.json rename to configs/openmrs/initializer_config/jsonkeyvalues/opdConsultationReportConfig.json diff --git a/configs/openmrs_config/locations/locations.csv b/configs/openmrs/initializer_config/locations/locations.csv similarity index 100% rename from configs/openmrs_config/locations/locations.csv rename to configs/openmrs/initializer_config/locations/locations.csv diff --git a/configs/openmrs_config/ocl/CCD_1.20220817052001.zip b/configs/openmrs/initializer_config/ocl/CCD_1.20220817052001.zip similarity index 100% rename from configs/openmrs_config/ocl/CCD_1.20220817052001.zip rename to configs/openmrs/initializer_config/ocl/CCD_1.20220817052001.zip diff --git a/configs/openmrs_config/ocl/CDU_3.0.20220817051630.zip b/configs/openmrs/initializer_config/ocl/CDU_3.0.20220817051630.zip similarity index 100% rename from configs/openmrs_config/ocl/CDU_3.0.20220817051630.zip rename to configs/openmrs/initializer_config/ocl/CDU_3.0.20220817051630.zip diff --git a/configs/openmrs_config/ocl/CIEL-frequencies_1.20220816234743.zip b/configs/openmrs/initializer_config/ocl/CIEL-frequencies_1.20220816234743.zip similarity index 100% rename from configs/openmrs_config/ocl/CIEL-frequencies_1.20220816234743.zip rename to configs/openmrs/initializer_config/ocl/CIEL-frequencies_1.20220816234743.zip diff --git a/configs/openmrs_config/ocl/CIELAllergySet_1.20220817053026.zip b/configs/openmrs/initializer_config/ocl/CIELAllergySet_1.20220817053026.zip similarity index 100% rename from configs/openmrs_config/ocl/CIELAllergySet_1.20220817053026.zip rename to configs/openmrs/initializer_config/ocl/CIELAllergySet_1.20220817053026.zip diff --git a/configs/openmrs_config/ocl/CIELImmunizationContent_1.20220817012726.zip b/configs/openmrs/initializer_config/ocl/CIELImmunizationContent_1.20220817012726.zip similarity index 100% rename from configs/openmrs_config/ocl/CIELImmunizationContent_1.20220817012726.zip rename to configs/openmrs/initializer_config/ocl/CIELImmunizationContent_1.20220817012726.zip diff --git a/configs/openmrs_config/ocl/DemoQueueConcepts_1.zip b/configs/openmrs/initializer_config/ocl/DemoQueueConcepts_1.zip similarity index 100% rename from configs/openmrs_config/ocl/DemoQueueConcepts_1.zip rename to configs/openmrs/initializer_config/ocl/DemoQueueConcepts_1.zip diff --git a/configs/openmrs_config/ocl/ExampleLabFilter_2.20220331075053.zip b/configs/openmrs/initializer_config/ocl/ExampleLabFilter_2.20220331075053.zip similarity index 100% rename from configs/openmrs_config/ocl/ExampleLabFilter_2.20220331075053.zip rename to configs/openmrs/initializer_config/ocl/ExampleLabFilter_2.20220331075053.zip diff --git a/configs/openmrs_config/ocl/GenericDemoForm_3.20220225043204.zip b/configs/openmrs/initializer_config/ocl/GenericDemoForm_3.20220225043204.zip similarity index 100% rename from configs/openmrs_config/ocl/GenericDemoForm_3.20220225043204.zip rename to configs/openmrs/initializer_config/ocl/GenericDemoForm_3.20220225043204.zip diff --git a/configs/openmrs_config/ocl/demopackagehiv_12.20220525204054.zip b/configs/openmrs/initializer_config/ocl/demopackagehiv_12.20220525204054.zip similarity index 100% rename from configs/openmrs_config/ocl/demopackagehiv_12.20220525204054.zip rename to configs/openmrs/initializer_config/ocl/demopackagehiv_12.20220525204054.zip diff --git a/configs/openmrs_config/ocl/lab_tests-core-demo.zip b/configs/openmrs/initializer_config/ocl/lab_tests-core-demo.zip similarity index 100% rename from configs/openmrs_config/ocl/lab_tests-core-demo.zip rename to configs/openmrs/initializer_config/ocl/lab_tests-core-demo.zip diff --git a/configs/openmrs_config/patientidentifiertypes/cambodia-identifiers.csv b/configs/openmrs/initializer_config/patientidentifiertypes/cambodia-identifiers.csv similarity index 100% rename from configs/openmrs_config/patientidentifiertypes/cambodia-identifiers.csv rename to configs/openmrs/initializer_config/patientidentifiertypes/cambodia-identifiers.csv diff --git a/configs/openmrs_config/patientidentifiertypes/patientidentifiertypes.csv b/configs/openmrs/initializer_config/patientidentifiertypes/patientidentifiertypes.csv similarity index 100% rename from configs/openmrs_config/patientidentifiertypes/patientidentifiertypes.csv rename to configs/openmrs/initializer_config/patientidentifiertypes/patientidentifiertypes.csv diff --git a/configs/openmrs_config/patientidentifiertypes/retire-core-identifiers.csv b/configs/openmrs/initializer_config/patientidentifiertypes/retire-core-identifiers.csv similarity index 100% rename from configs/openmrs_config/patientidentifiertypes/retire-core-identifiers.csv rename to configs/openmrs/initializer_config/patientidentifiertypes/retire-core-identifiers.csv diff --git a/configs/openmrs_config/personattributetypes/personattributetypes.csv b/configs/openmrs/initializer_config/personattributetypes/personattributetypes.csv similarity index 100% rename from configs/openmrs_config/personattributetypes/personattributetypes.csv rename to configs/openmrs/initializer_config/personattributetypes/personattributetypes.csv diff --git a/configs/openmrs_config/privileges/privileges.csv b/configs/openmrs/initializer_config/privileges/privileges.csv similarity index 100% rename from configs/openmrs_config/privileges/privileges.csv rename to configs/openmrs/initializer_config/privileges/privileges.csv diff --git a/configs/openmrs_config/privileges/privileges_core.csv b/configs/openmrs/initializer_config/privileges/privileges_core.csv similarity index 100% rename from configs/openmrs_config/privileges/privileges_core.csv rename to configs/openmrs/initializer_config/privileges/privileges_core.csv diff --git a/configs/openmrs_config/roles/roles.csv b/configs/openmrs/initializer_config/roles/roles.csv similarity index 100% rename from configs/openmrs_config/roles/roles.csv rename to configs/openmrs/initializer_config/roles/roles.csv diff --git a/configs/openmrs_config/roles/roles_core.csv b/configs/openmrs/initializer_config/roles/roles_core.csv similarity index 100% rename from configs/openmrs_config/roles/roles_core.csv rename to configs/openmrs/initializer_config/roles/roles_core.csv diff --git a/configs/openmrs_config/visittypes/visittypes.csv b/configs/openmrs/initializer_config/visittypes/visittypes.csv similarity index 100% rename from configs/openmrs_config/visittypes/visittypes.csv rename to configs/openmrs/initializer_config/visittypes/visittypes.csv diff --git a/configs/openmrs_config/demo-users/app.js b/configs/openmrs_config/demo-users/app.js deleted file mode 100644 index d28824e4..00000000 --- a/configs/openmrs_config/demo-users/app.js +++ /dev/null @@ -1,40 +0,0 @@ -import fetch from 'node-fetch'; -import * as fs from 'fs'; - -var requestHeaders = new Headers(); -requestHeaders.append("Authorization", "Basic YWRtaW46QWRtaW4xMjM="); -requestHeaders.append("Content-Type", "application/json"); - -var requestOptions = { - method: 'GET', - headers: requestHeaders, - redirect: 'follow' -}; - -const baseUrl = 'http://localhost'; - -fetch(baseUrl + "/openmrs/ws/rest/v1/session", requestOptions) - .then( - function(response) { - - // Set new headers - requestHeaders.append("Cookie", response.headers.raw()['set-cookie']) - requestOptions.headers = requestHeaders - - let file = JSON.parse(fs.readFileSync('users.json')); - file.users.forEach((user) => { - var rawUser = JSON.stringify(user); - requestOptions.body = rawUser; - requestOptions.method = 'POST'; - - console.log("Creating user '" + user.username + "'...") - fetch(baseUrl + "/openmrs/ws/rest/v1/user", requestOptions) - .then(response => response.text()) - .then(result => console.log(result)) - .catch(error => console.log('error', error)); - }); - } - ) - .then(result => console.log(result)) - .catch(error => console.log('error', error)); - diff --git a/configs/openmrs_config/demo-users/create-demo-users.sh b/configs/openmrs_config/demo-users/create-demo-users.sh deleted file mode 100644 index b71978d8..00000000 --- a/configs/openmrs_config/demo-users/create-demo-users.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash -set -e - -# Install nvm -VERSION=v0.37.2 -curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${VERSION}/install.sh" | bash -source ~/.nvm/nvm.sh -nvm install --lts - -# Run app to create the demo users -npm install -node app.js diff --git a/configs/openmrs_config/demo-users/package-lock.json b/configs/openmrs_config/demo-users/package-lock.json deleted file mode 100644 index 0fef7eac..00000000 --- a/configs/openmrs_config/demo-users/package-lock.json +++ /dev/null @@ -1,100 +0,0 @@ -{ - "name": "create-demo-users", - "version": "1.0.0", - "lockfileVersion": 3, - "requires": true, - "packages": { - "": { - "name": "create-demo-users", - "version": "1.0.0", - "license": "ISC", - "dependencies": { - "node-fetch": "^3.3.1" - } - }, - "node_modules/data-uri-to-buffer": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz", - "integrity": "sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==", - "engines": { - "node": ">= 12" - } - }, - "node_modules/fetch-blob": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/fetch-blob/-/fetch-blob-3.2.0.tgz", - "integrity": "sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/jimmywarting" - }, - { - "type": "paypal", - "url": "https://paypal.me/jimmywarting" - } - ], - "dependencies": { - "node-domexception": "^1.0.0", - "web-streams-polyfill": "^3.0.3" - }, - "engines": { - "node": "^12.20 || >= 14.13" - } - }, - "node_modules/formdata-polyfill": { - "version": "4.0.10", - "resolved": "https://registry.npmjs.org/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz", - "integrity": "sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==", - "dependencies": { - "fetch-blob": "^3.1.2" - }, - "engines": { - "node": ">=12.20.0" - } - }, - "node_modules/node-domexception": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/node-domexception/-/node-domexception-1.0.0.tgz", - "integrity": "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/jimmywarting" - }, - { - "type": "github", - "url": "https://paypal.me/jimmywarting" - } - ], - "engines": { - "node": ">=10.5.0" - } - }, - "node_modules/node-fetch": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.1.tgz", - "integrity": "sha512-cRVc/kyto/7E5shrWca1Wsea4y6tL9iYJE5FBCius3JQfb/4P4I295PfhgbJQBLTx6lATE4z+wK0rPM4VS2uow==", - "dependencies": { - "data-uri-to-buffer": "^4.0.0", - "fetch-blob": "^3.1.4", - "formdata-polyfill": "^4.0.10" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/node-fetch" - } - }, - "node_modules/web-streams-polyfill": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.2.1.tgz", - "integrity": "sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q==", - "engines": { - "node": ">= 8" - } - } - } -} diff --git a/configs/openmrs_config/demo-users/package.json b/configs/openmrs_config/demo-users/package.json deleted file mode 100644 index 7787cb05..00000000 --- a/configs/openmrs_config/demo-users/package.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "name": "create-demo-users", - "version": "1.0.0", - "description": "Node script to create demo users in OpenMRS", - "main": "app.js", - "type": "module", - "scripts": { - "test": "npm test" - }, - "repository": { - "type": "git", - "url": "git+https://github.com/openmrs/ozone-distro-cambodia.git" - }, - "author": "", - "license": "ISC", - "bugs": { - "url": "https://github.com/openmrs/ozone-distro-cambodia/issues" - }, - "homepage": "https://github.com/openmrs/ozone-distro-cambodia#readme", - "dependencies": { - "node-fetch": "^3.3.1" - } -} diff --git a/configs/openmrs_config/demo-users/users.json b/configs/openmrs_config/demo-users/users.json deleted file mode 100644 index 94b5b6b3..00000000 --- a/configs/openmrs_config/demo-users/users.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "users": [ - { - "username": "bsuy", - "password": "Password123", - "person": { - "uuid": "fa22c347-bd3b-4ca3-bb79-f02e840bb922", - "names": [ - { - "givenName": "Suy", - "familyName": "Bunroeun" - } - ], - "gender": "F" - }, - "roles": [ - { - "uuid": "a28fc3ff-cf23-44e6-9b4b-a13aee22363b" - }, - { - "uuid": "8d94f280-c2cc-11de-8d13-0010c6dffd0f" - } - ], - "systemId": "bsuy" - }, - { - "username": "blou", - "password": "Password123", - "person": { - "uuid": "bf7ba9f1-de2c-44e0-932e-782a80b930cf", - "names": [ - { - "givenName": "Lou", - "familyName": "Bunleng" - } - ], - "gender": "M" - }, - "roles": [ - { - "uuid": "a28fc3ff-cf23-44e6-9b4b-a13aee22363b" - }, - { - "uuid": "8d94f280-c2cc-11de-8d13-0010c6dffd0f" - } - ], - "systemId": "blou" - } - ] -} \ No newline at end of file diff --git a/configs/ozone_config/frontend/ozone_logo_color.svg b/configs/ozone_config/frontend/ozone_logo_color.svg deleted file mode 100644 index e7ff153a..00000000 --- a/configs/ozone_config/frontend/ozone_logo_color.svg +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/configs/ozone_config/frontend/ozone_logo_white.svg b/configs/ozone_config/frontend/ozone_logo_white.svg deleted file mode 100644 index 11163f25..00000000 --- a/configs/ozone_config/frontend/ozone_logo_white.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - Ozone-Logo-White - - - - - - - - - - \ No newline at end of file diff --git a/exclude-files.sh b/exclude-files.sh deleted file mode 100755 index b198b715..00000000 --- a/exclude-files.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -exclusionFileName=$1 -targetDir=$2 - -echo "Parsing '$exclusionFileName' to identify exclusions..." -cat $exclusionFileName | while read line || [ -n "$line" ] -do - if [ "${line:0:1}" != "#" ]; then - echo "Evaluating RegEx \"$line\" for possible matching exclusions..." - count=$(find ${targetDir} -regex ${line} | wc -l) - if [ "$count" -ne "0" ]; then - echo "Found the following match(es): " - find ${targetDir} -regex ${line} - find ${targetDir} -regex ${line} | xargs rm -r - echo "$count file(s) excluded." - else - echo "No file matches the exclusion pattern." - fi - fi -done diff --git a/pom.xml b/pom.xml index 6fc758aa..b02d9147 100644 --- a/pom.xml +++ b/pom.xml @@ -1,8 +1,8 @@ 4.0.0 com.ozonehis - ozone-distro-cambodia-parent - Ozone Distribution for Cambodia - Parent project + ozone-cambodia-parent + Ozone for Cambodia - Parent project 1.5.0-SNAPSHOT pom @@ -37,15 +37,66 @@ - - - - com.ozonehis - ozone-distro - zip - 1.0.0-SNAPSHOT - - + + + + + org.apache.maven.plugins + maven-resources-plugin + 3.3.0 + + + + Copy and substitute some helper files + process-resources + + copy-resources + + + + ${project.build.directory}/ + true + + + ../scripts + false + + + ../scripts + + *.sh + + true + + + + + + + Copy docker-compose-files.txt + prepare-package + + copy-resources + + + + ${project.build.directory}/${project.artifactId}-${project.version}/run/docker/scripts + true + + + ../scripts + + docker-compose-files.txt + + true + + + + + + + + @@ -66,4 +117,4 @@ https://nexus.mekomsolutions.net/repository/maven-snapshots - + \ No newline at end of file diff --git a/prod/pom.xml b/prod/pom.xml index c6eac438..ddc76c91 100644 --- a/prod/pom.xml +++ b/prod/pom.xml @@ -1,150 +1,130 @@ - 4.0.0 + 4.0.0 + com.ozonehis + ozone-cambodia-prod + Ozone for Cambodia - Production + 1.5.0-SNAPSHOT + pom + + + Ozone HIS + http://www.ozone-his.com + + + + + Mekom Solutions + http://www.mekomsolutions.com + + + + com.ozonehis - ozone-distro-cambodia-prod - Ozone Distribution for Cambodia - Production + ozone-cambodia-parent 1.5.0-SNAPSHOT - pom - - - Ozone HIS - http://www.ozone-his.com - + - - - Mekom Solutions - http://www.mekomsolutions.com - - - - - com.ozonehis - ozone-distro-cambodia-parent - 1.5.0-SNAPSHOT - + + UTF-8 + - - UTF-8 - + + + com.ozonehis + ozone-cambodia + 1.5.0-SNAPSHOT + zip + + + com.ozonehis + ozone-config-cambodia0 + zip + 1.5.0-SNAPSHOT + + - - - com.ozonehis - ozone-distro-cambodia - 1.5.0-SNAPSHOT - zip - - - com.ozonehis - ozone-config-cambodia0 - zip - 1.5.0-SNAPSHOT - - - - - - org.apache.maven.plugins - maven-dependency-plugin - 2.8 - - - - Prod: Copy Oz Kh non-prod - generate-resources - - unpack-dependencies - - - true - true - - ${project.build.directory}/${project.artifactId}-${project.version} - ozone-distro-cambodia - - - - - Prod: Copy Ozone Config Cambodia 0 - process-resources - - unpack-dependencies - - - true - true - - ${project.build.directory}/${project.artifactId}-${project.version} - ozone-config-cambodia0 - - - - - - - exec-maven-plugin - 3.1.0 - org.codehaus.mojo - - - Prod: Run 'prod' exclude-files.sh - process-resources - - exec - - - ${project.parent.basedir}/exclude-files.sh - - ${project.basedir}/dependency-excludes.txt - ${project.build.directory}/${project.artifactId}-${project.version} - - - - - - org.apache.maven.plugins - maven-assembly-plugin - - - Prod: Package the production distro - package - - single - - - false - - assembly.xml - - - - - - - + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.8 + + + + Prod: Copy Oz Kh non-prod + generate-resources + + unpack-dependencies + + + true + true + + ${project.build.directory}/${project.artifactId}-${project.version} + ozone-cambodia + + + + + Prod: Copy Ozone Config Cambodia 0 + process-resources + + unpack-dependencies + + + true + true + + ${project.build.directory}/${project.artifactId}-${project.version}/distro + ozone-config-cambodia0 + + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + Prod: Package the production distro + package + + single + + + false + + assembly.xml + + + + + + + - - - mks-nexus-private - https://nexus.mekomsolutions.net/repository/maven-private/ - - - mks-nexus-public - https://nexus.mekomsolutions.net/repository/maven-public/ - - + + + mks-nexus-private + https://nexus.mekomsolutions.net/repository/maven-private/ + + + mks-nexus-public + https://nexus.mekomsolutions.net/repository/maven-public/ + + - - - Mekom SolutionsNexus private repo for releases - mks-nexus-private - https://nexus.mekomsolutions.net/repository/maven-private-releases/ - - - Mekom Solutions Nexus private repo for snapshots - mks-nexus-private-snapshots - https://nexus.mekomsolutions.net/repository/maven-private-snapshots - - - + + + Mekom SolutionsNexus private repo for releases + mks-nexus-private + https://nexus.mekomsolutions.net/repository/maven-private-releases/ + + + Mekom Solutions Nexus private repo for snapshots + mks-nexus-private-snapshots + https://nexus.mekomsolutions.net/repository/maven-private-snapshots + + + \ No newline at end of file diff --git a/prod/start-distro.sh b/prod/start-distro.sh new file mode 100644 index 00000000..3b0fc35a --- /dev/null +++ b/prod/start-distro.sh @@ -0,0 +1,23 @@ +#!/usr/bin/env bash +set -e + +# Set the profile value if provided +[ -z "$1" ] && profileArg="" || profileArg="-P$1" + +# Package the distro +printf "%s\n" "Build the project..." +./scripts/mvnw clean package $profileArg +printf "%s\n" "Done." + +# Run base +printf "%s\n" "Run 'base'..." +cd base/ +source target/go-to-scripts-dir.sh +./start-demo.sh + +printf "%s\n" "Run 'prod'..." +cd prod/ +source target/go-to-scripts-dir.sh +./start-demo.sh + +exit 0 \ No newline at end of file diff --git a/readme/impl-guide.md b/readme/impl-guide.md index 159ee3c5..4748a3f3 100644 --- a/readme/impl-guide.md +++ b/readme/impl-guide.md @@ -1,74 +1,71 @@ # 🇰🇭 Ozone Kh - Implementer Guide -The distro can be run using the Ozone Pro Docker project. Quick start command below, for trials purposes only - would not suit for stable environment. +The distro can be run using the Ozone Docker project. Quick start command below, for trials purposes only - would not suit for stable environment. -``` -$ git clone https://github.com/openmrs/ozone-distro-cambodia -$ cd ozone-distro-cambodia +```bash +$ git clone https://github.com/openmrs/ozone-cambodia +$ cd ozone-cambodia ``` ## Quick start -``` -./start-distro.sh -``` -## Manual instructions -Build the distro (optional, provide a `prod` profile to include confidential configs and exclude demo artifacts) -``` -./mvnw clean install [-Pprod] -``` - -Prepare for the run (optional, provide a `prod` profile to use the previously built `prod` distribution) -``` -./mvnw -f run/pom.xml clean package [-Pprod] -``` - -Pull images -``` -docker compose -f "./run/target/ozone-docker-compose/docker-compose.yml" -f "./run/target/ozone-docker-compose/docker-compose-proxy.yml" --env-file "./run/target/ozone-docker-compose/concatenated.env" pull proxy frontend openmrs mysql +Build +```bash +./scripts/mvnw clean package [-Pprod] ``` Run +```bash +source [base|prod]/target/go-to-scripts-dir.sh +./start-demo.sh ``` -docker compose -f "./run/target/ozone-docker-compose/docker-compose.yml" -f "./run/target/ozone-docker-compose/docker-compose-proxy.yml" --env-file "./run/target/ozone-docker-compose/concatenated.env" -p ozone-distro-cambodia up -d proxy frontend openmrs mysql -``` - -## Then start browsing: - -| HIS Component | URL | Username | Password | -|-------------------|--------------------------------|----------|----------| -| OpenMRS 3 | http://localhost/openmrs/spa | admin | Admin123 | - ---- +Tip: After running the `source [base|prod]/target/go-to-scripts-dir.sh` command you can use `popd` to easily move back to the root directory, if needed. ### Working on configurations: If needed to work on the distro configurations and see the results, you have several options: -- (1) Turn down the whole project with its volumes, compile again and run. +- (1) Turn down the whole project with its volumes, build again and run. - (2) Replace files in the mounted Docker volume (all files or only individual files) -#### 1. Turn down the whole project and start afresh -``` -docker compose -f "./run/target/ozone-docker-compose/docker-compose.yml" -f "./run/target/ozone-docker-compose/docker-compose-proxy.yml" --env-file "./run/target/ozone-docker-compose/concatenated.env" -p ozone-distro-cambodia down -v -``` -Then follow the [Quick start guide](#quick-start) or the [manual instructions](#manual-instructions) to install and then run. +#### Option 1. Turn down the whole project and start afresh -#### 2. Replace files in the mounted Docker volume +Turn down the project (including volumes) +```bash +source base/target/go-to-scripts-dir.sh +./destroy-demo.sh ``` -./mvnw clean install [–Pprod] + +Re-build: +```bash +popd # Return to the root directory +./scripts/mvnw clean package [-Pprod] ``` + +Then start afresh: +```bash +source [base|prod]/target/go-to-scripts-dir.sh +./start-demo.sh ``` -rsync -av target/ozone-distro-cambodia-/ run/target/ozone-distro-cambodia/ --delete + +#### Option 2. Replace only the files needed, directly in the mounted Docker volume + +```bash +rsync -av configs/ [base|prod]/target/ozone-cambodia[-prod]-/distro/configs ``` (replace `` with its value) ### Excluding inherited files from Ozone Distro: It is possible to exclude some of the files inherited from the parent Ozone Distro transitive dependencies (thus the OpenMRS Distro Reference Application). -This can be achieved by providing your exclusion RegEx in the [dependency-excludes.txt](dependency-excludes.txt) file. +This can be achieved by providing your exclusion path in the main pom.xml, using the Maven Resource plugin `excludes`: Eg.: -``` -\.\*openmrs_config.\demo*csv +```xml +${project.build.directory}/ozone + + distro/**/appointment* + distro/**/concepts*demo.csv + ... + ``` diff --git a/run/pom.xml b/run/pom.xml deleted file mode 100644 index e5352f26..00000000 --- a/run/pom.xml +++ /dev/null @@ -1,195 +0,0 @@ - - 4.0.0 - com.ozonehis - ozone-distro-cambodia-run - Utility project to fetch artifacts needed to run the Ozone Distribution for Cambodia - 1.5.0-SNAPSHOT - pom - - Ozone HIS - http://www.ozone-his.com - - - - Mekom Solutions - http://www.mekomsolutions.com - - - - UTF-8 - 1.5.0-SNAPSHOT - 1.0.0-SNAPSHOT - - - - - prod - - false - - - ozone-distro-cambodia-prod - - - - com.ozonehis - ${distroArtifactId} - ${distroVersion} - zip - - - - - - org.apache.maven.plugins - maven-dependency-plugin - 2.8 - - - - Unpack Ozone Distro Cambodia Prod - generate-resources - - unpack-dependencies - - - true - true - ${project.build.directory}/${distroArtifactId} - ${distroArtifactId} - - - - - - - - - default - - true - - - ozone-distro-cambodia - - - - com.ozonehis - ${distroArtifactId} - ${distroVersion} - zip - - - - - - org.apache.maven.plugins - maven-dependency-plugin - 2.8 - - - - Unpack Ozone Distro Cambodia - generate-resources - - unpack-dependencies - - - true - true - ${project.build.directory}/${distroArtifactId} - ${distroArtifactId} - - - - - - - - - - - com.ozonehis - ozone-docker-compose - zip - ${dockerComposeVersion} - - - - - - org.apache.maven.plugins - maven-dependency-plugin - 2.8 - - - - Unpack Ozone Docker Compose - generate-resources - - unpack-dependencies - - - true - true - ${project.build.directory}/ozone-docker-compose - ozone-docker-compose - - - - - - org.apache.maven.plugins - maven-resources-plugin - 3.3.0 - - - - Substitute Variables in Resources - process-resources - - copy-resources - - - ${project.build.directory}/resources - - - ${project.basedir}/resources - true - - - - - - - - exec-maven-plugin - org.codehaus.mojo - 3.1.0 - - - - Concatenate Environement Variables - process-resources - - exec - - - ${project.build.directory}/resources/concatenate.sh - - - - - - - - - mks-nexus-public - https://nexus.mekomsolutions.net/repository/maven-public/ - - - mks-nexus-private - https://nexus.mekomsolutions.net/repository/maven-private/ - - - diff --git a/run/resources/concatenate.sh b/run/resources/concatenate.sh deleted file mode 100755 index 20c2f07e..00000000 --- a/run/resources/concatenate.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -# Concatenates 2 env files into 1. -sort -u -t '=' -k 1,1 ${project.build.directory}/resources/ozone-docker-compose.env ${project.build.directory}/ozone-docker-compose/.env | sed '/^#/d' > ${project.build.directory}/ozone-docker-compose/concatenated.env \ No newline at end of file diff --git a/run/resources/ozone-analytics.env b/run/resources/ozone-analytics.env deleted file mode 100644 index b2dcbf05..00000000 --- a/run/resources/ozone-analytics.env +++ /dev/null @@ -1,18 +0,0 @@ -CONNECT_MYSQL_PORT=3306 -CONNECT_MYSQL_USERNAME=root -ANALYTICS_DB_PORT=5432 -ANALYTICS_DB_NAME=analytics -ANALYTICS_DB_USER=analytics -ANALYTICS_DB_PASSWORD=password - -# Secret used for demo purposes only -CONNECT_MYSQL_PASSWORD=3cY8Kve4lGey - -#CONNECT_MYSQL_HOSTNAME=172.17.0.1 -#ANALYTICS_DB_HOST=172.17.0.1 -# -# Uncoment the following lines if using Mac hosts. And remove the 3 lines above. -# -CONNECT_MYSQL_HOSTNAME=host.docker.internal -ANALYTICS_DB_HOST=host.docker.internal - diff --git a/run/resources/ozone-docker-compose.env b/run/resources/ozone-docker-compose.env deleted file mode 100644 index eb0e4ff5..00000000 --- a/run/resources/ozone-docker-compose.env +++ /dev/null @@ -1,15 +0,0 @@ -DISTRO_PATH=../${distroArtifactId} -OPENMRS_CONFIG_PATH=../${distroArtifactId}/openmrs_config -OZONE_CONFIG_PATH=../${distroArtifactId}/ozone_config -OPENMRS_CORE_PATH=../${distroArtifactId}/openmrs_core -OPENMRS_MODULES_PATH=../${distroArtifactId}/openmrs_modules -EIP_PATH=../${distroArtifactId}/eip_config -SPA_PATH=../${distroArtifactId}/spa -FLINK_CONFIG_PATH=../${distroArtifactId}/flink_config -KEYCLOAK_CONFIG_PATH=../${distroArtifactId}/keycloak_config -SENAITE_CONFIG_PATH=../${distroArtifactId}/senaite_config -SUPERSET_CONFIG_PATH=../${distroArtifactId}/superset_config -ODOO_EXTRA_ADDONS=../${distroArtifactId}/odoo_config/addons -ODOO_CONFIG_PATH=../${distroArtifactId}/odoo_config/odoo_csv -ODOO_INITIALIZER_CONFIG_FILE_PATH=../${distroArtifactId}/odoo_config/config/initializer_config.json -ODOO_CONFIG_FILE_PATH=../${distroArtifactId}/odoo_config/config/odoo.conf diff --git a/scripts/.mvn/wrapper/maven-wrapper.jar b/scripts/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..bf82ff01c6cdae4a1bb754a6e062954d77ac5c11 GIT binary patch literal 59925 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

dy!05UMhSKsK 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 VCNKd3JGtOvEm(5t0lFyE{{i--k}m)N literal 0 HcmV?d00001 diff --git a/.mvn/wrapper/maven-wrapper.properties b/scripts/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from .mvn/wrapper/maven-wrapper.properties rename to scripts/.mvn/wrapper/maven-wrapper.properties diff --git a/scripts/docker-compose-files.txt b/scripts/docker-compose-files.txt new file mode 100755 index 00000000..917598ee --- /dev/null +++ b/scripts/docker-compose-files.txt @@ -0,0 +1,2 @@ +docker-compose-common.yml +docker-compose-openmrs.yml diff --git a/scripts/go-to-scripts-dir.sh b/scripts/go-to-scripts-dir.sh new file mode 100755 index 00000000..e2f88f3a --- /dev/null +++ b/scripts/go-to-scripts-dir.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash +# +# Helper script to navigate to the Ozone Docker scripts/ directory, which contains commands to run the application +# +# Will be substituted at build time by the Maven Resource plugin filtering. +pushd ${project.build.directory}/${project.artifactId}-${project.version}/run/docker/scripts/ diff --git a/mvnw b/scripts/mvnw similarity index 100% rename from mvnw rename to scripts/mvnw diff --git a/mvnw.cmd b/scripts/mvnw.cmd similarity index 100% rename from mvnw.cmd rename to scripts/mvnw.cmd diff --git a/scripts/set-ozone-dir.sh b/scripts/set-ozone-dir.sh new file mode 100755 index 00000000..5974a0f0 --- /dev/null +++ b/scripts/set-ozone-dir.sh @@ -0,0 +1,13 @@ +#!/usr/bin/env bash +set -e + +cd ${project.build.directory}/ +source ./go-to-scripts-dir.sh + +# Override the ozone-dir.env file: +cat > ozone-dir.env << EOL +# +# $(date) | ⚠️ Existing file contents overriden by the '$(basename "$0")' script. +# +export OZONE_DIR=../../distro +EOL diff --git a/start-analytics.sh b/start-analytics.sh deleted file mode 100755 index 65f7adaf..00000000 --- a/start-analytics.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash -set -e - -repoUrl=https://nexus.mekomsolutions.net -serverId=mks-repo-private -repoName=maven-private -groupId=com.ozonehis -artifactId=ozone-analytics -version=1.0.0-SNAPSHOT -destinationFolder=./target/${artifactId}-${version} - -# Clean - -# Download Ozone Pro Docker Compose -./mvnw org.apache.maven.plugins:maven-dependency-plugin:get -DremoteRepositories=${serverId}::::${repoUrl}/repository/${repoName} -Dartifact=${groupId}:${artifactId}:${version}:zip -Dtransitive=false -./mvnw org.apache.maven.plugins:maven-dependency-plugin:unpack -Dproject.basedir=./target/ -Dartifact=${groupId}:${artifactId}:${version}:zip -DoutputDirectory=./target/${artifactId}-${version} - -# Concatenate and clean up the env files -sort -u -t '=' -k 1,1 target/resources/ozone-analytics.env ${destinationFolder}/.env | sed '/^#/d' > ${destinationFolder}/concatenated.env - -# Run -docker compose -f "${destinationFolder}/docker-compose-data-pipelines-external.yaml" --env-file "${destinationFolder}/concatenated.env" -p ozone-distro-cambodia up -d - -exit 0 \ No newline at end of file diff --git a/start-distro.sh b/start-distro.sh deleted file mode 100755 index 61584954..00000000 --- a/start-distro.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/usr/bin/env bash -set -e - -ozoneDockerArtifactId=ozone-docker-compose -destinationFolder=./run/target/${ozoneDockerArtifactId} -servicesToRun="proxy openmrs frontend mysql" - -# Set the profile value if provided -[ -z "$1" ] && profileArg="" || profileArg="-P$1" - -# Clean -rm -rf ${destinationFolder} -rm -f ${outputFile} - -# Package the distro -printf "%s\n" "Package and install the distro..." -./mvnw clean install $profileArg -printf "%s\n" "Done." - -# Prepare the run (build the run/ Maven project) -printf "%s\n" "Prepare the run..." -./mvnw -f run/pom.xml clean package $profileArg - -# Pull images -printf "%s\n" "Pull..." -docker compose -f "${destinationFolder}/docker-compose.yml" -f "${destinationFolder}/docker-compose-proxy.yml" --env-file "${destinationFolder}/concatenated.env" pull ${servicesToRun} -printf "%s\n" "Done." - -# Run -printf "%s\n" "Run..." -docker network inspect web >/dev/null 2>&1 || docker network create web -docker compose -f "${destinationFolder}/docker-compose.yml" -f "${destinationFolder}/docker-compose-proxy.yml" --env-file "${destinationFolder}/concatenated.env" -p ozone-distro-cambodia up -d ${servicesToRun} - -exit 0 \ No newline at end of file