From cb106bc88168d633d3e6a85b4d059f7a2a8a3bc6 Mon Sep 17 00:00:00 2001 From: Lee Surprenant Date: Tue, 7 Dec 2021 14:04:19 -0500 Subject: [PATCH] enable liberty dev mode for fhir-server-webapp (#2328) * enable liberty dev mode for fhir-server-webapp Signed-off-by: Lee Surprenant * move remaining liberty-config artifacts to fhir-server-webapp Signed-off-by: Lee Surprenant * declare maven-dependency-plugin in fhir-parent and bump version Signed-off-by: Lee Surprenant * Use liberty maven plugin copyDependencies feature instead of maven-dependency-plugin Signed-off-by: Lee Surprenant * update migration test scripts to handle old config location Signed-off-by: Lee Surprenant * minor edits to fhir-persistence-scout to make it compile Signed-off-by: Lee Surprenant * Move last couple files and added README Per review comment Signed-off-by: Lee Surprenant * update to latest plugin version Signed-off-by: Lee Surprenant * change default derby location to the root of the project and add that location (and schematool log files) to .gitignore Signed-off-by: Lee Surprenant --- .gitignore | 8 +++++ build/audit/kafka/pre-integration-test.sh | 2 +- build/certificates/README.md | 8 ++--- build/certificates/copy-kafka-client.sh | 4 +-- build/certificates/copy-server.sh | 4 +-- build/docker/copy-server-config.sh | 12 +++---- build/migration/db2/2_compose.sh | 23 +++++++++---- .../db2/5_current-pre-integration-test.sh | 6 ++-- build/migration/postgres/2_compose.sh | 32 ++++++++++++------ .../5_current-pre-integration-test.sh | 6 ++-- .../kafka/pre-integration-test.sh | 2 +- .../postgres/pre-integration-test.sh | 8 ++--- build/pre-integration-test.ps1 | 8 ++--- build/pre-integration-test.sh | 4 +-- build/reindex/db2/pre-integration-test.sh | 4 +-- build/reindex/derby/pre-integration-test.sh | 2 +- .../reindex/postgres/pre-integration-test.sh | 4 +-- docs/src/pages/guides/DB2OnCloudSetup.md | 4 +-- .../src/main/assembly/distribution.xml | 2 +- fhir-parent/pom.xml | 10 ++++++ fhir-persistence-scout/pom.xml | 20 +++++++++++ .../scout/FHIRPersistenceScoutImpl.java | 23 +++++++++++++ fhir-server-webapp/pom.xml | 29 +++++++++++----- .../main/liberty/config/bootstrap.properties | 3 ++ .../default/extension-search-parameters.json | 0 .../default/extension-search-parameters.md | 0 .../fhir-server-config-audit-cicd.json | 0 .../fhir-server-config-audit-config.json | 0 .../fhir-server-config-audit-environment.json | 0 .../default/fhir-server-config-db2.json | 0 ...fhir-server-config-notifications-cicd.json | 0 .../fhir-server-config-postgresql.json | 0 .../config/default/fhir-server-config.json | 0 .../configDropins/defaults/bulkdata.xml | 2 +- .../configDropins/defaults/datasource.xml | 3 +- .../configDropins/defaults/jvm.options | 0 .../configDropins/defaults/keystore.xml | 0 .../configDropins/defaults/openapi.xml | 0 .../defaults/transaction-manager.xml | 0 .../configDropins/defaults/trustDefault.xml | 0 .../config}/configDropins/disabled/README.md | 0 .../config}/configDropins/disabled/cors.xml | 0 .../configDropins/disabled/datasource-db2.xml | 0 .../disabled/datasource-derby.xml | 0 .../disabled/datasource-postgresql.xml | 0 .../disabled/db2-cloud/bulkdata.xml | 2 +- .../configDropins/disabled/db2/bulkdata.xml | 6 ++-- .../configDropins/disabled/derby/bulkdata.xml | 4 +-- .../configDropins/disabled/jvm.options | 2 +- .../config}/configDropins/disabled/jwtRS.xml | 0 .../disabled/postgres/bulkdata.xml | 0 .../config}/configDropins/overrides/.empty | 0 .../src/main/liberty/config}/jvm.options | 0 .../resources/security/fhirKeyStore.p12 | Bin .../resources/security/fhirTrustStore.p12 | Bin .../security/kafka.client.keystore.p12 | Bin .../security/kafka.client.truststore.p12 | Bin .../src/main/liberty/config}/server.env | 0 .../src/main/liberty/config}/server.xml | 2 +- .../src/main/liberty/config}/userlib/.empty | 0 fhir-server/liberty-config/README.txt | 1 + 61 files changed, 175 insertions(+), 75 deletions(-) create mode 100644 fhir-server-webapp/src/main/liberty/config/bootstrap.properties rename {fhir-server/liberty-config => fhir-server-webapp/src/main/liberty/config}/config/default/extension-search-parameters.json (100%) rename {fhir-server/liberty-config => fhir-server-webapp/src/main/liberty/config}/config/default/extension-search-parameters.md (100%) rename {fhir-server/liberty-config => fhir-server-webapp/src/main/liberty/config}/config/default/fhir-server-config-audit-cicd.json (100%) rename {fhir-server/liberty-config => fhir-server-webapp/src/main/liberty/config}/config/default/fhir-server-config-audit-config.json (100%) rename {fhir-server/liberty-config => fhir-server-webapp/src/main/liberty/config}/config/default/fhir-server-config-audit-environment.json (100%) rename {fhir-server/liberty-config => fhir-server-webapp/src/main/liberty/config}/config/default/fhir-server-config-db2.json (100%) rename {fhir-server/liberty-config => fhir-server-webapp/src/main/liberty/config}/config/default/fhir-server-config-notifications-cicd.json (100%) rename {fhir-server/liberty-config => fhir-server-webapp/src/main/liberty/config}/config/default/fhir-server-config-postgresql.json (100%) rename {fhir-server/liberty-config => fhir-server-webapp/src/main/liberty/config}/config/default/fhir-server-config.json (100%) rename {fhir-server/liberty-config => fhir-server-webapp/src/main/liberty/config}/configDropins/defaults/bulkdata.xml (99%) rename {fhir-server/liberty-config => fhir-server-webapp/src/main/liberty/config}/configDropins/defaults/datasource.xml (89%) rename {fhir-server/liberty-config => fhir-server-webapp/src/main/liberty/config}/configDropins/defaults/jvm.options (100%) rename {fhir-server/liberty-config => fhir-server-webapp/src/main/liberty/config}/configDropins/defaults/keystore.xml (100%) rename {fhir-server/liberty-config => fhir-server-webapp/src/main/liberty/config}/configDropins/defaults/openapi.xml (100%) rename {fhir-server/liberty-config => fhir-server-webapp/src/main/liberty/config}/configDropins/defaults/transaction-manager.xml (100%) rename {fhir-server/liberty-config => fhir-server-webapp/src/main/liberty/config}/configDropins/defaults/trustDefault.xml (100%) rename {fhir-server/liberty-config => fhir-server-webapp/src/main/liberty/config}/configDropins/disabled/README.md (100%) rename {fhir-server/liberty-config => fhir-server-webapp/src/main/liberty/config}/configDropins/disabled/cors.xml (100%) rename {fhir-server/liberty-config => fhir-server-webapp/src/main/liberty/config}/configDropins/disabled/datasource-db2.xml (100%) rename {fhir-server/liberty-config => fhir-server-webapp/src/main/liberty/config}/configDropins/disabled/datasource-derby.xml (100%) rename {fhir-server/liberty-config => fhir-server-webapp/src/main/liberty/config}/configDropins/disabled/datasource-postgresql.xml (100%) rename {fhir-server/liberty-config => fhir-server-webapp/src/main/liberty/config}/configDropins/disabled/db2-cloud/bulkdata.xml (99%) rename {fhir-server/liberty-config => fhir-server-webapp/src/main/liberty/config}/configDropins/disabled/db2/bulkdata.xml (92%) rename {fhir-server/liberty-config => fhir-server-webapp/src/main/liberty/config}/configDropins/disabled/derby/bulkdata.xml (90%) mode change 100755 => 100644 rename {fhir-server/liberty-config => fhir-server-webapp/src/main/liberty/config}/configDropins/disabled/jvm.options (90%) rename {fhir-server/liberty-config => fhir-server-webapp/src/main/liberty/config}/configDropins/disabled/jwtRS.xml (100%) rename {fhir-server/liberty-config => fhir-server-webapp/src/main/liberty/config}/configDropins/disabled/postgres/bulkdata.xml (100%) rename {fhir-server/liberty-config => fhir-server-webapp/src/main/liberty/config}/configDropins/overrides/.empty (100%) rename {fhir-server/liberty-config => fhir-server-webapp/src/main/liberty/config}/jvm.options (100%) rename {fhir-server/liberty-config => fhir-server-webapp/src/main/liberty/config}/resources/security/fhirKeyStore.p12 (100%) rename {fhir-server/liberty-config => fhir-server-webapp/src/main/liberty/config}/resources/security/fhirTrustStore.p12 (100%) rename {fhir-server/liberty-config => fhir-server-webapp/src/main/liberty/config}/resources/security/kafka.client.keystore.p12 (100%) rename {fhir-server/liberty-config => fhir-server-webapp/src/main/liberty/config}/resources/security/kafka.client.truststore.p12 (100%) rename {fhir-server/liberty-config => fhir-server-webapp/src/main/liberty/config}/server.env (100%) rename {fhir-server/liberty-config => fhir-server-webapp/src/main/liberty/config}/server.xml (97%) rename {fhir-server/liberty-config => fhir-server-webapp/src/main/liberty/config}/userlib/.empty (100%) create mode 100644 fhir-server/liberty-config/README.txt diff --git a/.gitignore b/.gitignore index 12263e51c2b..8a12f135e9a 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,9 @@ ibm-web-ext.xml *.iml .idea/ +# VS Code +.vscode/ + # Mac OS X .DS_Store @@ -20,6 +23,11 @@ ibm-web-ext.xml target/ test-output/ +# Test DB and schematool logs +/derby/ +derby.log +fhirschema.log + # Integration tests /SIT/ /pre-it-logs/ diff --git a/build/audit/kafka/pre-integration-test.sh b/build/audit/kafka/pre-integration-test.sh index e15ae1ad1df..7c7e6fc212a 100644 --- a/build/audit/kafka/pre-integration-test.sh +++ b/build/audit/kafka/pre-integration-test.sh @@ -31,7 +31,7 @@ config(){ echo "Copying fhir configuration files..." - cp -pr ${WORKSPACE}/fhir-server/liberty-config/config $DIST + cp -pr ${WORKSPACE}/fhir-server-webapp/src/main/liberty/config/config $DIST cp -pr ${WORKSPACE}/fhir-server/liberty-config-tenants/config/* $DIST/config echo "Copying test artifacts to install location..." diff --git a/build/certificates/README.md b/build/certificates/README.md index 4e3e80a26bf..3771da86777 100644 --- a/build/certificates/README.md +++ b/build/certificates/README.md @@ -37,8 +37,8 @@ build/docker/minio/public.crt The following certificates are used with the IBM FHIR Server. ``` -fhir-server/liberty-config/resources/security/fhirKeyStore.p12 -fhir-server/liberty-config/resources/security/fhirTrustStore.p12 +fhir-server-webapp/src/main/liberty/config/resources/security/fhirKeyStore.p12 +fhir-server-webapp/src/main/liberty/config/resources/security/fhirTrustStore.p12 ``` 1. Set `export WORKSPACE=$(pwd)` @@ -85,8 +85,8 @@ Note, the `tmp` folder should exist and be empty. The following certificates are used with the kafka-client. ``` -fhir-server/liberty-config/resources/security/kafka.client.keystore.p12 -fhir-server/liberty-config/resources/security/kafka.client.truststore.p12 +fhir-server-webapp/src/main/liberty/config/resources/security/kafka.client.keystore.p12 +fhir-server-webapp/src/main/liberty/config/resources/security/kafka.client.truststore.p12 ``` 1. Set `export WORKSPACE=$(pwd)` diff --git a/build/certificates/copy-kafka-client.sh b/build/certificates/copy-kafka-client.sh index 795fc3fbcb4..38414b88139 100644 --- a/build/certificates/copy-kafka-client.sh +++ b/build/certificates/copy-kafka-client.sh @@ -7,8 +7,8 @@ # ---------------------------------------------------------------------------- cp -f ${WORKSPACE}/build/certificates/tmp/kafka.client.truststore.p12 \ - ${WORKSPACE}/fhir-server/liberty-config/resources/security/kafka.client.truststore.p12 + ${WORKSPACE}/fhir-server-webapp/src/main/liberty/config/resources/security/kafka.client.truststore.p12 cp -f ${WORKSPACE}/build/certificates/tmp/kafka.client.keystore.p12 \ - ${WORKSPACE}/fhir-server/liberty-config/resources/security/kafka.client.keystore.p12 + ${WORKSPACE}/fhir-server-webapp/src/main/liberty/config/resources/security/kafka.client.keystore.p12 # EOF \ No newline at end of file diff --git a/build/certificates/copy-server.sh b/build/certificates/copy-server.sh index 302bdcc6205..38a4e368698 100644 --- a/build/certificates/copy-server.sh +++ b/build/certificates/copy-server.sh @@ -7,8 +7,8 @@ # ---------------------------------------------------------------------------- cp -f ${WORKSPACE}/build/certificates/tmp/fhirKeyStore.p12 \ - ${WORKSPACE}/fhir-server/liberty-config/resources/security/fhirKeyStore.p12 + ${WORKSPACE}/fhir-server-webapp/src/main/liberty/config/resources/security/fhirKeyStore.p12 cp -f ${WORKSPACE}/build/certificates/tmp/fhirTrustStore.p12 \ - ${WORKSPACE}/fhir-server/liberty-config/resources/security/fhirTrustStore.p12 + ${WORKSPACE}/fhir-server-webapp/src/main/liberty/config/resources/security/fhirTrustStore.p12 # EOF \ No newline at end of file diff --git a/build/docker/copy-server-config.sh b/build/docker/copy-server-config.sh index 194e1a63fa2..69909b0af16 100755 --- a/build/docker/copy-server-config.sh +++ b/build/docker/copy-server-config.sh @@ -32,9 +32,9 @@ cp ${WORKSPACE}/fhir-server-test/src/test/resources/testdata/import-operation/te echo "test.bulkdata.path = ${BULKDATA}" >> ${WORKSPACE}/fhir-server-test/src/test/resources/test.properties echo "Copying the server config files..." -cp -pr ${WORKSPACE}/fhir-server/liberty-config/config/* ${CONFIG} +cp -pr ${WORKSPACE}/fhir-server-webapp/src/main/liberty/config/config/* ${CONFIG} cp -pr ${WORKSPACE}/fhir-server/liberty-config-tenants/config/* ${CONFIG} -cp -pr ${WORKSPACE}/fhir-server/liberty-config/config/default/fhir-server-config-db2.json ${CONFIG}/default/fhir-server-config.json +cp -pr ${WORKSPACE}/fhir-server-webapp/src/main/liberty/config/config/default/fhir-server-config-db2.json ${CONFIG}/default/fhir-server-config.json echo "Replacing datasource content in server configDropins..." OVERRIDES="${WORKSPACE}/build/docker/fhir-server/volumes/overrides" @@ -43,9 +43,9 @@ mkdir -p ${OVERRIDES} # Just in case it already exists, let's wipe the datsource*.xml files rm -f ${OVERRIDES}/datasource*.xml -# Copy over the db2 (default_default and fhirbatchDS) and derby (tenant1_*) datasource definitions -cp -p ${WORKSPACE}/fhir-server/liberty-config/configDropins/disabled/datasource-db2.xml ${OVERRIDES}/ -cp -p ${WORKSPACE}/fhir-server/liberty-config/configDropins/disabled/db2/bulkdata.xml ${OVERRIDES}/ -cp -p ${WORKSPACE}/fhir-server/liberty-config/configDropins/disabled/datasource-derby.xml ${OVERRIDES}/ +# Copy over both the db2 (default_default) and derby (tenant1_*) datasource definitions +cp -p ${WORKSPACE}/fhir-server-webapp/src/main/liberty/config/configDropins/disabled/datasource-db2.xml ${OVERRIDES}/ +cp -p ${WORKSPACE}/fhir-server-webapp/src/main/liberty/config/configDropins/disabled/db2/bulkdata.xml ${OVERRIDES}/ +cp -p ${WORKSPACE}/fhir-server-webapp/src/main/liberty/config/configDropins/disabled/datasource-derby.xml ${OVERRIDES}/ echo "Finished copying the server config." diff --git a/build/migration/db2/2_compose.sh b/build/migration/db2/2_compose.sh index debcde09c61..9804cb0a95c 100644 --- a/build/migration/db2/2_compose.sh +++ b/build/migration/db2/2_compose.sh @@ -20,7 +20,7 @@ pre_integration(){ # setup_docker - setup docker setup_docker(){ - pushd $(pwd) > /dev/null + pushd $(pwd) > /dev/null cd ${WORKSPACE}/fhir/build/migration/db2 mkdir -p ${WORKSPACE}/fhir/build/migration/db2/workarea/volumes/dist/db docker build -t test/fhir-db2 resources/ @@ -37,8 +37,13 @@ config(){ # Setup the Configurations for Migration echo "Copying fhir configuration files..." mkdir -p ${DIST}/config - cp -pr ${WORKSPACE}/prev/fhir-server/liberty-config/config $DIST - cp -pr ${WORKSPACE}/prev/fhir-server/liberty-config-tenants/config/* $DIST/config + if [ -d ${WORKSPACE}/prev/fhir-server-webapp/src/main/liberty ] + then + cp -r ${WORKSPACE}/prev/fhir-server-webapp/src/main/liberty/config/config $DIST/ + else + cp -r ${WORKSPACE}/prev/fhir-server/liberty-config/config $DIST/ + cp -r ${WORKSPACE}/prev/fhir-server/liberty-config-tenants/config/* $DIST/config/ + fi echo "Copying test artifacts to install location..." USERLIB="${DIST}/userlib" @@ -56,8 +61,14 @@ config(){ echo "Copying over the overrides for the datasource" mkdir -p ${DIST}/overrides - cp ${WORKSPACE}/prev/fhir-server/liberty-config/configDropins/disabled/datasource-db2.xml ${DIST}/overrides - cp -p ${WORKSPACE}/prev/fhir-server/liberty-config/configDropins/disabled/datasource-derby.xml ${DIST}/overrides + if [ -d ${WORKSPACE}/prev/fhir-server-webapp/src/main/liberty ] + then + cp ${WORKSPACE}/prev/fhir-server-webapp/src/main/liberty/config/configDropins/disabled/datasource-db2.xml ${DIST}/overrides + cp ${WORKSPACE}/prev/fhir-server-webapp/src/main/liberty/config/configDropins/disabled/datasource-derby.xml ${DIST}/overrides + else + cp ${WORKSPACE}/prev/fhir-server/liberty-config/configDropins/disabled/datasource-db2.xml ${DIST}/overrides + cp ${WORKSPACE}/prev/fhir-server/liberty-config/configDropins/disabled/datasource-derby.xml ${DIST}/overrides + fi # Move over the test configurations echo "Copying over the fhir-server-config.json and updating publishing" @@ -215,4 +226,4 @@ cd build/migration/db2 pre_integration "${1}" # EOF -############################################################################### \ No newline at end of file +############################################################################### diff --git a/build/migration/db2/5_current-pre-integration-test.sh b/build/migration/db2/5_current-pre-integration-test.sh index 1244df390ea..d3ae70ce7a2 100644 --- a/build/migration/db2/5_current-pre-integration-test.sh +++ b/build/migration/db2/5_current-pre-integration-test.sh @@ -25,7 +25,7 @@ config(){ echo "Copying fhir configuration files..." rm -rf ${DIST}/config mkdir -p ${DIST}/config - cp -pr ${WORKSPACE}/fhir/fhir-server/liberty-config/config $DIST + cp -pr ${WORKSPACE}/fhir/fhir-server-webapp/src/main/liberty/config/config $DIST cp -pr ${WORKSPACE}/fhir/fhir-server/liberty-config-tenants/config/* $DIST/config echo "Copying test artifacts to install location..." @@ -46,8 +46,8 @@ config(){ echo "Remove the old overrides, and copy the current overrides for the datasource" rm -rf ${DIST}/overrides mkdir -p ${DIST}/overrides - cp -p ${WORKSPACE}/fhir/fhir-server/liberty-config/configDropins/disabled/datasource-db2.xml ${DIST}/overrides - cp -p ${WORKSPACE}/fhir/fhir-server/liberty-config/configDropins/disabled/datasource-derby.xml ${DIST}/overrides + cp -p ${WORKSPACE}/fhir/fhir-server-webapp/src/main/liberty/config/configDropins/disabled/datasource-db2.xml ${DIST}/overrides + cp -p ${WORKSPACE}/fhir/fhir-server-webapp/src/main/liberty/config/configDropins/disabled/datasource-derby.xml ${DIST}/overrides # Move over the test configurations echo "Copying over the fhir-server-config.json and updating publishing" diff --git a/build/migration/postgres/2_compose.sh b/build/migration/postgres/2_compose.sh index 530fc472567..885f77a0a11 100644 --- a/build/migration/postgres/2_compose.sh +++ b/build/migration/postgres/2_compose.sh @@ -20,7 +20,7 @@ pre_integration(){ # setup_docker - setup docker setup_docker(){ - pushd $(pwd) > /dev/null + pushd $(pwd) > /dev/null cd ${WORKSPACE}/fhir/build/migration/postgres mkdir -p ${WORKSPACE}/fhir/build/migration/postgres/workarea/volumes/dist/db docker build -t test/fhir-postgres:snapshot . @@ -38,19 +38,19 @@ config(){ # Setup the Configurations for Migration echo "Copying fhir configuration files..." mkdir -p ${DIST}/config - cp -pr ${WORKSPACE}/prev/fhir-server/liberty-config/config $DIST - cp -pr ${WORKSPACE}/prev/fhir-server/liberty-config-tenants/config/* $DIST/config + if [ -d ${WORKSPACE}/prev/fhir-server-webapp/src/main/liberty ] + then + cp -r ${WORKSPACE}/prev/fhir-server-webapp/src/main/liberty/config/config $DIST/ + else + cp -r ${WORKSPACE}/prev/fhir-server/liberty-config/config $DIST/ + cp -r ${WORKSPACE}/prev/fhir-server/liberty-config-tenants/config/* $DIST/config/ + fi echo "Copying test artifacts to install location..." USERLIB="${DIST}/userlib" mkdir -p "${USERLIB}" find ${WORKSPACE}/prev/conformance -iname 'fhir-ig*.jar' -not -iname 'fhir*-tests.jar' -not -iname 'fhir*-test-*.jar' -exec cp -f {} ${USERLIB} \; find ${WORKSPACE}/prev/operation/fhir-operation-test/target -iname '*.jar' -exec cp -f {} ${USERLIB} \; - - echo "Copying over the overrides for the datasource" - mkdir -p ${DIST}/overrides - cp ${WORKSPACE}/prev/fhir-server/liberty-config/configDropins/disabled/datasource-postgresql.xml ${DIST}/overrides - cp -p ${WORKSPACE}/prev/fhir-server/liberty-config/configDropins/disabled/datasource-derby.xml ${DIST}/overrides if [ -d ${WORKSPACE}/prev/operation/fhir-operation-term-cache/target ] then find ${WORKSPACE}/prev/operation/fhir-operation-term-cache/target -iname '*.jar' -exec cp -f {} ${USERLIB} \; @@ -59,6 +59,18 @@ config(){ then find ${WORKSPACE}/prev/term/operation/fhir-operation-term-cache/target -iname '*.jar' -exec cp -f {} ${USERLIB} \; fi + + echo "Copying over the overrides for the datasource" + mkdir -p ${DIST}/overrides + if [ -d ${WORKSPACE}/prev/fhir-server-webapp/src/main/liberty ] + then + cp ${WORKSPACE}/prev/fhir-server-webapp/src/main/liberty/config/configDropins/disabled/datasource-postgresql.xml ${DIST}/overrides + cp ${WORKSPACE}/prev/fhir-server-webapp/src/main/liberty/config/configDropins/disabled/datasource-derby.xml ${DIST}/overrides + else + cp ${WORKSPACE}/prev/fhir-server/liberty-config/configDropins/disabled/datasource-postgresql.xml ${DIST}/overrides + cp ${WORKSPACE}/prev/fhir-server/liberty-config/configDropins/disabled/datasource-derby.xml ${DIST}/overrides + fi + # Move over the test configurations echo "Copying over the fhir-server-config.json and updating publishing" cp -f ${DIST}/config/default/fhir-server-config-postgresql.json ${DIST}/config/default/fhir-server-config.json @@ -82,7 +94,7 @@ bringup(){ echo "Previous Version: ${PREVIOUS_VERSION}" echo "Bringing up containers >>> Current time: " $(date) - # In order not to hit this after packaging everything up,w e want to run this before we start up the db. + # In order not to hit this after packaging everything up, we want to run this before we start up the db. # waiting for server to start....2021-07-16 20:42:03.136 UTC [9] FATAL: data directory "/db/data" has invalid permissions # 2021-07-16 20:42:03.136 UTC [9] DETAIL: Permissions should be u=rwx (0700) or u=rwx,g=rx (0750). sudo chown -R 70:70 ${WORKSPACE}/fhir/build/migration/postgres/workarea/volumes/dist/db @@ -225,4 +237,4 @@ cd build/migration/postgres pre_integration "${1}" # EOF -############################################################################### \ No newline at end of file +############################################################################### diff --git a/build/migration/postgres/5_current-pre-integration-test.sh b/build/migration/postgres/5_current-pre-integration-test.sh index 48d5dbd28fb..dc9eddc4cd8 100644 --- a/build/migration/postgres/5_current-pre-integration-test.sh +++ b/build/migration/postgres/5_current-pre-integration-test.sh @@ -25,7 +25,7 @@ config(){ # Setup the Configurations for Migration echo "Copying fhir configuration files..." mkdir -p ${DIST}/config - cp -pr ${WORKSPACE}/fhir/fhir-server/liberty-config/config $DIST + cp -pr ${WORKSPACE}/fhir/fhir-server-webapp/src/main/liberty/config/config $DIST cp -pr ${WORKSPACE}/fhir/fhir-server/liberty-config-tenants/config/* $DIST/config echo "Copying test artifacts to install location..." @@ -38,8 +38,8 @@ config(){ echo "Copying over the overrides for the datasource" mkdir -p ${DIST}/overrides - cp ${WORKSPACE}/fhir/fhir-server/liberty-config/configDropins/disabled/datasource-postgresql.xml ${DIST}/overrides - cp -p ${WORKSPACE}/fhir/fhir-server/liberty-config/configDropins/disabled/datasource-derby.xml ${DIST}/overrides + cp ${WORKSPACE}/fhir/fhir-server-webapp/src/main/liberty/config/configDropins/disabled/datasource-postgresql.xml ${DIST}/overrides + cp -p ${WORKSPACE}/fhir/fhir-server-webapp/src/main/liberty/config/configDropins/disabled/datasource-derby.xml ${DIST}/overrides if [ -d ${WORKSPACE}/fhir/operation/fhir-operation-term-cache/target ] then find ${WORKSPACE}/fhir/operation/fhir-operation-term-cache/target -iname '*.jar' -exec cp -f {} ${USERLIB} \; diff --git a/build/notifications/kafka/pre-integration-test.sh b/build/notifications/kafka/pre-integration-test.sh index cd05fd88658..167acd76d0c 100644 --- a/build/notifications/kafka/pre-integration-test.sh +++ b/build/notifications/kafka/pre-integration-test.sh @@ -30,7 +30,7 @@ config(){ chmod -R 777 ${WORKSPACE}/build/notifications/kafka/workarea/output/ echo "Copying fhir configuration files..." - cp -pr ${WORKSPACE}/fhir-server/liberty-config/config $DIST + cp -pr ${WORKSPACE}/fhir-server-webapp/src/main/liberty/config/config $DIST cp -pr ${WORKSPACE}/fhir-server/liberty-config-tenants/config/* $DIST/config echo "Copying test artifacts to install location..." diff --git a/build/persistence/postgres/pre-integration-test.sh b/build/persistence/postgres/pre-integration-test.sh index 34e165f6396..9ef630f558a 100644 --- a/build/persistence/postgres/pre-integration-test.sh +++ b/build/persistence/postgres/pre-integration-test.sh @@ -46,17 +46,17 @@ copy_server_config(){ cp -p ${WORKSPACE}/fhir-install/target/fhir-server-distribution.zip $DIST echo "Copying fhir configuration files..." - cp -pr ${WORKSPACE}/fhir-server/liberty-config/config $DIST + cp -pr ${WORKSPACE}/fhir-server-webapp/src/main/liberty/config/config $DIST cp -pr ${WORKSPACE}/fhir-server/liberty-config-tenants/config/* $DIST/config - cp -pr ${WORKSPACE}/fhir-server/liberty-config/config/default/fhir-server-config-postgresql.json $DIST/config/default/fhir-server-config.json + cp -pr ${WORKSPACE}/fhir-server-webapp/src/main/liberty/config/config/default/fhir-server-config-postgresql.json $DIST/config/default/fhir-server-config.json # Note the overrides folder is specifically mounted to the docker image under configDropins/overrides echo "Creating an overrides folder in $DIST" mkdir -p $DIST/overrides # Copy over both the postgres (default_default) and derby (tenant1_*) datasource definitions - cp -p ${WORKSPACE}/fhir-server/liberty-config/configDropins/disabled/datasource-postgresql.xml $DIST/overrides/ - cp -p ${WORKSPACE}/fhir-server/liberty-config/configDropins/disabled/datasource-derby.xml $DIST/overrides/ + cp -p ${WORKSPACE}/fhir-server-webapp/src/main/liberty/config/configDropins/disabled/datasource-postgresql.xml $DIST/overrides/ + cp -p ${WORKSPACE}/fhir-server-webapp/src/main/liberty/config/configDropins/disabled/datasource-derby.xml $DIST/overrides/ USERLIB="${DIST}/userlib" mkdir -p $USERLIB diff --git a/build/pre-integration-test.ps1 b/build/pre-integration-test.ps1 index 907d0bf5b49..10c92ab3b8a 100644 --- a/build/pre-integration-test.ps1 +++ b/build/pre-integration-test.ps1 @@ -90,7 +90,7 @@ New-Item -Path $CONFIGS_DROPINS -Name 'defaults' -ItemType 'directory' New-Item -Path $CONFIGS_DROPINS -Name 'overrides' -ItemType 'directory' # Copy over the Files for default, tenant1, tenant2 -$DR_ITEM=[string]$DIR_WORKSPACE + '\fhir-server\liberty-config\config\*' +$DR_ITEM=[string]$DIR_WORKSPACE + '\fhir-server-webapp\src\main\liberty\config\config\*' $DR_ITEM_DST=[string]$DIR_WORKSPACE + '\SIT\wlp\usr\servers\fhir-server\config\' Copy-Item $DR_ITEM -Destination $DR_ITEM_DST -Recurse @@ -98,13 +98,13 @@ $DR_ITEM1=[string]$DIR_WORKSPACE + '\fhir-server\liberty-config-tenants\config\* Copy-Item $DR_ITEM1 -Destination $DR_ITEM_DST -Recurse # Only copy over the Derby datasource definition for this instance -$OVR_ITEM=[string]$DIR_WORKSPACE + '\fhir-server\liberty-config\configDropins\defaults\datasource.xml' +$OVR_ITEM=[string]$DIR_WORKSPACE + '\fhir-server-webapp\src\main\liberty\config\configDropins\defaults\datasource.xml' $OVR_ITEM_DST=[string]$DIR_WORKSPACE + '\SIT\wlp\usr\servers\fhir-server\configDropins\defaults\datasource.xml' Copy-Item $OVR_ITEM -Destination $OVR_ITEM_DST -$OVR_ITEM2=[string]$DIR_WORKSPACE + '\fhir-server\liberty-config\configDropins\disabled\datasource-derby.xml' +$OVR_ITEM2=[string]$DIR_WORKSPACE + '\fhir-server-webapp\src\main\liberty\config\configDropins\disabled\datasource-derby.xml' $OVR_ITEM_DST2=[string]$DIR_WORKSPACE + '\SIT\wlp\usr\servers\fhir-server\configDropins\overrides\datasource-derby.xml' Copy-Item $OVR_ITEM2 -Destination $OVR_ITEM_DST2 -$OVR_ITEM3=[string]$DIR_WORKSPACE + '\fhir-server\liberty-config\configDropins\disabled\jvm.options' +$OVR_ITEM3=[string]$DIR_WORKSPACE + '\fhir-server-webapp\src\main\liberty\config\configDropins\disabled\jvm.options' $OVR_ITEM_DST3=[string]$DIR_WORKSPACE + '\SIT\wlp\usr\servers\fhir-server\configDropins\overrides\jvm.options' Copy-Item $OVR_ITEM3 -Destination $OVR_ITEM_DST3 diff --git a/build/pre-integration-test.sh b/build/pre-integration-test.sh index a5743aa969a..353920f5443 100755 --- a/build/pre-integration-test.sh +++ b/build/pre-integration-test.sh @@ -63,13 +63,13 @@ java -jar ${SIT}/fhir-server-dist/tools/fhir-persistence-schema-*-cli.jar \ echo "Copying configuration to install location..." rm -rf ${SIT}/wlp/usr/servers/fhir-server/config/* -cp -pr ${WORKSPACE}/fhir-server/liberty-config/config/* ${SIT}/wlp/usr/servers/fhir-server/config/ +cp -pr ${WORKSPACE}/fhir-server-webapp/src/main/liberty/config/config/* ${SIT}/wlp/usr/servers/fhir-server/config/ cp -pr ${WORKSPACE}/fhir-server/liberty-config-tenants/config/* ${SIT}/wlp/usr/servers/fhir-server/config/ # Only copy over the Derby datasource definition for this instance rm -f ${SIT}/wlp/usr/servers/fhir-server/configDropins/overrides/datasource-*.xml mkdir -p ${SIT}/wlp/usr/servers/fhir-server/configDropins/overrides -cp -p ${WORKSPACE}/fhir-server/liberty-config/configDropins/disabled/datasource-derby.xml ${SIT}/wlp/usr/servers/fhir-server/configDropins/overrides/datasource.xml +cp -p ${WORKSPACE}/fhir-server-webapp/src/main/liberty/config/configDropins/disabled/datasource-derby.xml ${SIT}/wlp/usr/servers/fhir-server/configDropins/overrides/datasource.xml echo "Copying test artifacts to install location..." USERLIB=${SIT}/wlp/usr/servers/fhir-server/userlib diff --git a/build/reindex/db2/pre-integration-test.sh b/build/reindex/db2/pre-integration-test.sh index efc685e62ce..c13d662cbc4 100644 --- a/build/reindex/db2/pre-integration-test.sh +++ b/build/reindex/db2/pre-integration-test.sh @@ -31,7 +31,7 @@ config(){ # Setup the Configurations for Reindex echo "Copying fhir configuration files..." mkdir -p ${DIST}/config - cp -pr ${WORKSPACE}/fhir-server/liberty-config/config $DIST + cp -pr ${WORKSPACE}/fhir-server-webapp/src/main/liberty/config/config $DIST cp -pr ${WORKSPACE}/fhir-server/liberty-config-tenants/config/* $DIST/config echo "Copying test artifacts to install location..." @@ -41,7 +41,7 @@ config(){ echo "Copying over the overrides for the datasource" mkdir -p ${DIST}/overrides - cp ${WORKSPACE}/fhir-server/liberty-config/configDropins/disabled/datasource-db2.xml ${DIST}/overrides + cp ${WORKSPACE}/fhir-server-webapp/src/main/liberty/config/configDropins/disabled/datasource-db2.xml ${DIST}/overrides # Move over the test configurations echo "Copying over the fhir-server-config.json and updating publishing" diff --git a/build/reindex/derby/pre-integration-test.sh b/build/reindex/derby/pre-integration-test.sh index 231d37e8e30..c7ccc40f378 100644 --- a/build/reindex/derby/pre-integration-test.sh +++ b/build/reindex/derby/pre-integration-test.sh @@ -24,7 +24,7 @@ config() { # Setup the Configurations for Reindex echo "Copying fhir configuration files..." mkdir -p "${DIST}/config" - cp -pr "${WORKSPACE}/fhir-server/liberty-config/config" "$DIST" + cp -pr "${WORKSPACE}/fhir-server-webapp/src/main/liberty/config/config" "$DIST" cp -pr ${WORKSPACE}/fhir-server/liberty-config-tenants/config/* "$DIST/config" echo "Copying test artifacts to install location..." diff --git a/build/reindex/postgres/pre-integration-test.sh b/build/reindex/postgres/pre-integration-test.sh index 2822a700fb9..edd88004c1a 100644 --- a/build/reindex/postgres/pre-integration-test.sh +++ b/build/reindex/postgres/pre-integration-test.sh @@ -33,7 +33,7 @@ config(){ # Setup the Configurations for Reindex echo "Copying fhir configuration files..." mkdir -p ${DIST}/config - cp -pr ${WORKSPACE}/fhir-server/liberty-config/config $DIST + cp -pr ${WORKSPACE}/fhir-server-webapp/src/main/liberty/config/config $DIST cp -pr ${WORKSPACE}/fhir-server/liberty-config-tenants/config/* $DIST/config echo "Copying test artifacts to install location..." @@ -43,7 +43,7 @@ config(){ echo "Copying over the overrides for the datasource" mkdir -p ${DIST}/overrides - cp ${WORKSPACE}/fhir-server/liberty-config/configDropins/disabled/datasource-postgresql.xml ${DIST}/overrides + cp ${WORKSPACE}/fhir-server-webapp/src/main/liberty/config/configDropins/disabled/datasource-postgresql.xml ${DIST}/overrides # Move over the test configurations echo "Copying over the fhir-server-config.json and updating" diff --git a/docs/src/pages/guides/DB2OnCloudSetup.md b/docs/src/pages/guides/DB2OnCloudSetup.md index 00c0cbfcbe5..1d86be112d4 100644 --- a/docs/src/pages/guides/DB2OnCloudSetup.md +++ b/docs/src/pages/guides/DB2OnCloudSetup.md @@ -388,8 +388,8 @@ The IBM FHIR Server Bulk Data modules utilize Java Batch (JSR-352) from the Libe 1. Associate it with a ServiceId (no need to create an Administration user, a simple user has sufficient privileges) using the same procedure you followed for the fhir-server ServiceId user. 1. Create the datasource - 1. Db2 with IAM https://github.com/IBM/FHIR/blob/main/fhir-server/liberty-config/configDropins/disabled/db2-cloud/bulkdata.xml - 1. Db2 with Db2Auth https://github.com/IBM/FHIR/blob/main/fhir-server/liberty-config/configDropins/disabled/db2/bulkdata.xml + 1. Db2 with IAM https://github.com/IBM/FHIR/blob/main/fhir-server-webapp/src/main/liberty/config/configDropins/disabled/db2-cloud/bulkdata.xml + 1. Db2 with Db2Auth https://github.com/IBM/FHIR/blob/main/fhir-server-webapp/src/main/liberty/config/configDropins/disabled/db2/bulkdata.xml - Note: The Java Batch is configured in `bulkdata.xml` and included from the IBM FHIR Server's `server.xml` which is installed to `{wlp}/usr/server/defaultServer`. (fhir-server is installed locally) - Note: While this feature is not required, it's best to configure this datasource while configuring the main datasource. diff --git a/fhir-install/src/main/assembly/distribution.xml b/fhir-install/src/main/assembly/distribution.xml index 5a06467b36b..6076554c181 100644 --- a/fhir-install/src/main/assembly/distribution.xml +++ b/fhir-install/src/main/assembly/distribution.xml @@ -11,7 +11,7 @@ - ../fhir-server/liberty-config + ../fhir-server-webapp/src/main/liberty/config artifacts/servers/fhir-server 0755 diff --git a/fhir-parent/pom.xml b/fhir-parent/pom.xml index 0581240517a..144db531306 100644 --- a/fhir-parent/pom.xml +++ b/fhir-parent/pom.xml @@ -743,6 +743,11 @@ maven-deploy-plugin 2.8.2 + + org.apache.maven.plugins + maven-dependency-plugin + 3.2.0 + maven-scm-plugin 1.9.5 @@ -779,6 +784,11 @@ + + io.openliberty.tools + liberty-maven-plugin + 3.5.1 + com.spotify dockerfile-maven-plugin diff --git a/fhir-persistence-scout/pom.xml b/fhir-persistence-scout/pom.xml index de63eb0bb77..8536af69cea 100644 --- a/fhir-persistence-scout/pom.xml +++ b/fhir-persistence-scout/pom.xml @@ -18,6 +18,26 @@ + + + org.codehaus.mojo + build-helper-maven-plugin + 3.0.0 + + + 01-add-test-sources + generate-sources + + add-source + + + + ${project.build.directory}/generated-sources + + + + + com.github.os72 protoc-jar-maven-plugin diff --git a/fhir-persistence-scout/src/main/java/com/ibm/fhir/persistence/scout/FHIRPersistenceScoutImpl.java b/fhir-persistence-scout/src/main/java/com/ibm/fhir/persistence/scout/FHIRPersistenceScoutImpl.java index 3b441e36681..2e4b1887c97 100644 --- a/fhir-persistence-scout/src/main/java/com/ibm/fhir/persistence/scout/FHIRPersistenceScoutImpl.java +++ b/fhir-persistence-scout/src/main/java/com/ibm/fhir/persistence/scout/FHIRPersistenceScoutImpl.java @@ -20,6 +20,7 @@ import java.util.Map.Entry; import java.util.Properties; import java.util.UUID; +import java.util.concurrent.Future; import java.util.function.Function; import java.util.logging.Level; import java.util.logging.Logger; @@ -62,6 +63,7 @@ import com.ibm.fhir.persistence.context.FHIRPersistenceContext; import com.ibm.fhir.persistence.exception.FHIRPersistenceException; import com.ibm.fhir.persistence.exception.FHIRPersistenceNotSupportedException; +import com.ibm.fhir.persistence.payload.PayloadKey; import com.ibm.fhir.persistence.scout.SearchParameters.ParameterBlock; import com.ibm.fhir.persistence.scout.SearchParameters.StrValue; import com.ibm.fhir.persistence.scout.SearchParameters.StrValueList; @@ -478,4 +480,25 @@ public List changes(int resourceCount, java.time.Instan public List retrieveIndex(int count, java.time.Instant notModifiedAfter, Long afterIndexId, String resourceTypeName) throws FHIRPersistenceException { throw new FHIRPersistenceNotSupportedException("API not supported at this time"); } + + @Override + public SingleResourceResult createWithMeta(FHIRPersistenceContext context, T resource) + throws FHIRPersistenceException { + // TODO Auto-generated method stub + return null; + } + + @Override + public SingleResourceResult updateWithMeta(FHIRPersistenceContext context, T resource) + throws FHIRPersistenceException { + // TODO Auto-generated method stub + return null; + } + + @Override + public Future storePayload(Resource resource, String logicalId, int newVersionNumber) + throws FHIRPersistenceException { + // TODO Auto-generated method stub + return null; + } } \ No newline at end of file diff --git a/fhir-server-webapp/pom.xml b/fhir-server-webapp/pom.xml index 7fc936d28c4..95df9424656 100644 --- a/fhir-server-webapp/pom.xml +++ b/fhir-server-webapp/pom.xml @@ -1,14 +1,5 @@ - - - IBM International License Agreement for Non-Warranted Programs - http://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/maven/licenses/L-JTHS-8SZMHX/HTML/ - repo - Additional notices http://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/maven/licenses/L-JTHS-8SZMHX/HTML/notices.html - - - 4.0.0 @@ -24,6 +15,7 @@ fhir-server + ${project.basedir}/../derby/fhirDB @@ -87,9 +79,15 @@ jakarta.servlet-api provided + + org.apache.derby + derby + test + + ${fhir.server.war.name} maven-war-plugin @@ -97,6 +95,19 @@ ${fhir.server.war.name} + + io.openliberty.tools + liberty-maven-plugin + + + + org.apache.derby + derby + + ${project.build.directory}/liberty/wlp/usr/shared/resources/lib/derby/ + + + diff --git a/fhir-server-webapp/src/main/liberty/config/bootstrap.properties b/fhir-server-webapp/src/main/liberty/config/bootstrap.properties new file mode 100644 index 00000000000..f608a3789ed --- /dev/null +++ b/fhir-server-webapp/src/main/liberty/config/bootstrap.properties @@ -0,0 +1,3 @@ +javax.xml.stream.XMLInputFactory=com.sun.xml.internal.stream.XMLInputFactoryImpl +javax.xml.stream.XMLOutputFactory=com.sun.xml.internal.stream.XMLOutputFactoryImpl +javax.xml.stream.XMLTransformerFactory=com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl diff --git a/fhir-server/liberty-config/config/default/extension-search-parameters.json b/fhir-server-webapp/src/main/liberty/config/config/default/extension-search-parameters.json similarity index 100% rename from fhir-server/liberty-config/config/default/extension-search-parameters.json rename to fhir-server-webapp/src/main/liberty/config/config/default/extension-search-parameters.json diff --git a/fhir-server/liberty-config/config/default/extension-search-parameters.md b/fhir-server-webapp/src/main/liberty/config/config/default/extension-search-parameters.md similarity index 100% rename from fhir-server/liberty-config/config/default/extension-search-parameters.md rename to fhir-server-webapp/src/main/liberty/config/config/default/extension-search-parameters.md diff --git a/fhir-server/liberty-config/config/default/fhir-server-config-audit-cicd.json b/fhir-server-webapp/src/main/liberty/config/config/default/fhir-server-config-audit-cicd.json similarity index 100% rename from fhir-server/liberty-config/config/default/fhir-server-config-audit-cicd.json rename to fhir-server-webapp/src/main/liberty/config/config/default/fhir-server-config-audit-cicd.json diff --git a/fhir-server/liberty-config/config/default/fhir-server-config-audit-config.json b/fhir-server-webapp/src/main/liberty/config/config/default/fhir-server-config-audit-config.json similarity index 100% rename from fhir-server/liberty-config/config/default/fhir-server-config-audit-config.json rename to fhir-server-webapp/src/main/liberty/config/config/default/fhir-server-config-audit-config.json diff --git a/fhir-server/liberty-config/config/default/fhir-server-config-audit-environment.json b/fhir-server-webapp/src/main/liberty/config/config/default/fhir-server-config-audit-environment.json similarity index 100% rename from fhir-server/liberty-config/config/default/fhir-server-config-audit-environment.json rename to fhir-server-webapp/src/main/liberty/config/config/default/fhir-server-config-audit-environment.json diff --git a/fhir-server/liberty-config/config/default/fhir-server-config-db2.json b/fhir-server-webapp/src/main/liberty/config/config/default/fhir-server-config-db2.json similarity index 100% rename from fhir-server/liberty-config/config/default/fhir-server-config-db2.json rename to fhir-server-webapp/src/main/liberty/config/config/default/fhir-server-config-db2.json diff --git a/fhir-server/liberty-config/config/default/fhir-server-config-notifications-cicd.json b/fhir-server-webapp/src/main/liberty/config/config/default/fhir-server-config-notifications-cicd.json similarity index 100% rename from fhir-server/liberty-config/config/default/fhir-server-config-notifications-cicd.json rename to fhir-server-webapp/src/main/liberty/config/config/default/fhir-server-config-notifications-cicd.json diff --git a/fhir-server/liberty-config/config/default/fhir-server-config-postgresql.json b/fhir-server-webapp/src/main/liberty/config/config/default/fhir-server-config-postgresql.json similarity index 100% rename from fhir-server/liberty-config/config/default/fhir-server-config-postgresql.json rename to fhir-server-webapp/src/main/liberty/config/config/default/fhir-server-config-postgresql.json diff --git a/fhir-server/liberty-config/config/default/fhir-server-config.json b/fhir-server-webapp/src/main/liberty/config/config/default/fhir-server-config.json similarity index 100% rename from fhir-server/liberty-config/config/default/fhir-server-config.json rename to fhir-server-webapp/src/main/liberty/config/config/default/fhir-server-config.json diff --git a/fhir-server/liberty-config/configDropins/defaults/bulkdata.xml b/fhir-server-webapp/src/main/liberty/config/configDropins/defaults/bulkdata.xml similarity index 99% rename from fhir-server/liberty-config/configDropins/defaults/bulkdata.xml rename to fhir-server-webapp/src/main/liberty/config/configDropins/defaults/bulkdata.xml index b5762192050..db5f8c23aa0 100644 --- a/fhir-server/liberty-config/configDropins/defaults/bulkdata.xml +++ b/fhir-server-webapp/src/main/liberty/config/configDropins/defaults/bulkdata.xml @@ -34,7 +34,7 @@ - + diff --git a/fhir-server/liberty-config/configDropins/defaults/datasource.xml b/fhir-server-webapp/src/main/liberty/config/configDropins/defaults/datasource.xml similarity index 89% rename from fhir-server/liberty-config/configDropins/defaults/datasource.xml rename to fhir-server-webapp/src/main/liberty/config/configDropins/defaults/datasource.xml index 3571c4c7aff..3ab8d7690d6 100644 --- a/fhir-server/liberty-config/configDropins/defaults/datasource.xml +++ b/fhir-server-webapp/src/main/liberty/config/configDropins/defaults/datasource.xml @@ -7,9 +7,10 @@ + - + diff --git a/fhir-server/liberty-config/configDropins/defaults/jvm.options b/fhir-server-webapp/src/main/liberty/config/configDropins/defaults/jvm.options similarity index 100% rename from fhir-server/liberty-config/configDropins/defaults/jvm.options rename to fhir-server-webapp/src/main/liberty/config/configDropins/defaults/jvm.options diff --git a/fhir-server/liberty-config/configDropins/defaults/keystore.xml b/fhir-server-webapp/src/main/liberty/config/configDropins/defaults/keystore.xml similarity index 100% rename from fhir-server/liberty-config/configDropins/defaults/keystore.xml rename to fhir-server-webapp/src/main/liberty/config/configDropins/defaults/keystore.xml diff --git a/fhir-server/liberty-config/configDropins/defaults/openapi.xml b/fhir-server-webapp/src/main/liberty/config/configDropins/defaults/openapi.xml similarity index 100% rename from fhir-server/liberty-config/configDropins/defaults/openapi.xml rename to fhir-server-webapp/src/main/liberty/config/configDropins/defaults/openapi.xml diff --git a/fhir-server/liberty-config/configDropins/defaults/transaction-manager.xml b/fhir-server-webapp/src/main/liberty/config/configDropins/defaults/transaction-manager.xml similarity index 100% rename from fhir-server/liberty-config/configDropins/defaults/transaction-manager.xml rename to fhir-server-webapp/src/main/liberty/config/configDropins/defaults/transaction-manager.xml diff --git a/fhir-server/liberty-config/configDropins/defaults/trustDefault.xml b/fhir-server-webapp/src/main/liberty/config/configDropins/defaults/trustDefault.xml similarity index 100% rename from fhir-server/liberty-config/configDropins/defaults/trustDefault.xml rename to fhir-server-webapp/src/main/liberty/config/configDropins/defaults/trustDefault.xml diff --git a/fhir-server/liberty-config/configDropins/disabled/README.md b/fhir-server-webapp/src/main/liberty/config/configDropins/disabled/README.md similarity index 100% rename from fhir-server/liberty-config/configDropins/disabled/README.md rename to fhir-server-webapp/src/main/liberty/config/configDropins/disabled/README.md diff --git a/fhir-server/liberty-config/configDropins/disabled/cors.xml b/fhir-server-webapp/src/main/liberty/config/configDropins/disabled/cors.xml similarity index 100% rename from fhir-server/liberty-config/configDropins/disabled/cors.xml rename to fhir-server-webapp/src/main/liberty/config/configDropins/disabled/cors.xml diff --git a/fhir-server/liberty-config/configDropins/disabled/datasource-db2.xml b/fhir-server-webapp/src/main/liberty/config/configDropins/disabled/datasource-db2.xml similarity index 100% rename from fhir-server/liberty-config/configDropins/disabled/datasource-db2.xml rename to fhir-server-webapp/src/main/liberty/config/configDropins/disabled/datasource-db2.xml diff --git a/fhir-server/liberty-config/configDropins/disabled/datasource-derby.xml b/fhir-server-webapp/src/main/liberty/config/configDropins/disabled/datasource-derby.xml similarity index 100% rename from fhir-server/liberty-config/configDropins/disabled/datasource-derby.xml rename to fhir-server-webapp/src/main/liberty/config/configDropins/disabled/datasource-derby.xml diff --git a/fhir-server/liberty-config/configDropins/disabled/datasource-postgresql.xml b/fhir-server-webapp/src/main/liberty/config/configDropins/disabled/datasource-postgresql.xml similarity index 100% rename from fhir-server/liberty-config/configDropins/disabled/datasource-postgresql.xml rename to fhir-server-webapp/src/main/liberty/config/configDropins/disabled/datasource-postgresql.xml diff --git a/fhir-server/liberty-config/configDropins/disabled/db2-cloud/bulkdata.xml b/fhir-server-webapp/src/main/liberty/config/configDropins/disabled/db2-cloud/bulkdata.xml similarity index 99% rename from fhir-server/liberty-config/configDropins/disabled/db2-cloud/bulkdata.xml rename to fhir-server-webapp/src/main/liberty/config/configDropins/disabled/db2-cloud/bulkdata.xml index e5cbba431d5..6ce2ba2d226 100644 --- a/fhir-server/liberty-config/configDropins/disabled/db2-cloud/bulkdata.xml +++ b/fhir-server-webapp/src/main/liberty/config/configDropins/disabled/db2-cloud/bulkdata.xml @@ -1,5 +1,5 @@ - diff --git a/fhir-server/liberty-config/configDropins/disabled/db2/bulkdata.xml b/fhir-server-webapp/src/main/liberty/config/configDropins/disabled/db2/bulkdata.xml similarity index 92% rename from fhir-server/liberty-config/configDropins/disabled/db2/bulkdata.xml rename to fhir-server-webapp/src/main/liberty/config/configDropins/disabled/db2/bulkdata.xml index 7163c20b323..5cf2f9ee4e3 100644 --- a/fhir-server/liberty-config/configDropins/disabled/db2/bulkdata.xml +++ b/fhir-server-webapp/src/main/liberty/config/configDropins/disabled/db2/bulkdata.xml @@ -1,5 +1,5 @@ - @@ -53,6 +53,6 @@ password="${BATCH_DB_PASS}"/> - - + + diff --git a/fhir-server/liberty-config/configDropins/disabled/derby/bulkdata.xml b/fhir-server-webapp/src/main/liberty/config/configDropins/disabled/derby/bulkdata.xml old mode 100755 new mode 100644 similarity index 90% rename from fhir-server/liberty-config/configDropins/disabled/derby/bulkdata.xml rename to fhir-server-webapp/src/main/liberty/config/configDropins/disabled/derby/bulkdata.xml index 15476aafddc..587ed0e8a41 --- a/fhir-server/liberty-config/configDropins/disabled/derby/bulkdata.xml +++ b/fhir-server-webapp/src/main/liberty/config/configDropins/disabled/derby/bulkdata.xml @@ -38,6 +38,6 @@ - - + + diff --git a/fhir-server/liberty-config/configDropins/disabled/jvm.options b/fhir-server-webapp/src/main/liberty/config/configDropins/disabled/jvm.options similarity index 90% rename from fhir-server/liberty-config/configDropins/disabled/jvm.options rename to fhir-server-webapp/src/main/liberty/config/configDropins/disabled/jvm.options index 305aee9cfaa..e5cbd74f730 100644 --- a/fhir-server/liberty-config/configDropins/disabled/jvm.options +++ b/fhir-server-webapp/src/main/liberty/config/configDropins/disabled/jvm.options @@ -5,4 +5,4 @@ #-verbose:class # Turn on verbose garbage collection -#-verbose:gc \ No newline at end of file +#-verbose:gc diff --git a/fhir-server/liberty-config/configDropins/disabled/jwtRS.xml b/fhir-server-webapp/src/main/liberty/config/configDropins/disabled/jwtRS.xml similarity index 100% rename from fhir-server/liberty-config/configDropins/disabled/jwtRS.xml rename to fhir-server-webapp/src/main/liberty/config/configDropins/disabled/jwtRS.xml diff --git a/fhir-server/liberty-config/configDropins/disabled/postgres/bulkdata.xml b/fhir-server-webapp/src/main/liberty/config/configDropins/disabled/postgres/bulkdata.xml similarity index 100% rename from fhir-server/liberty-config/configDropins/disabled/postgres/bulkdata.xml rename to fhir-server-webapp/src/main/liberty/config/configDropins/disabled/postgres/bulkdata.xml diff --git a/fhir-server/liberty-config/configDropins/overrides/.empty b/fhir-server-webapp/src/main/liberty/config/configDropins/overrides/.empty similarity index 100% rename from fhir-server/liberty-config/configDropins/overrides/.empty rename to fhir-server-webapp/src/main/liberty/config/configDropins/overrides/.empty diff --git a/fhir-server/liberty-config/jvm.options b/fhir-server-webapp/src/main/liberty/config/jvm.options similarity index 100% rename from fhir-server/liberty-config/jvm.options rename to fhir-server-webapp/src/main/liberty/config/jvm.options diff --git a/fhir-server/liberty-config/resources/security/fhirKeyStore.p12 b/fhir-server-webapp/src/main/liberty/config/resources/security/fhirKeyStore.p12 similarity index 100% rename from fhir-server/liberty-config/resources/security/fhirKeyStore.p12 rename to fhir-server-webapp/src/main/liberty/config/resources/security/fhirKeyStore.p12 diff --git a/fhir-server/liberty-config/resources/security/fhirTrustStore.p12 b/fhir-server-webapp/src/main/liberty/config/resources/security/fhirTrustStore.p12 similarity index 100% rename from fhir-server/liberty-config/resources/security/fhirTrustStore.p12 rename to fhir-server-webapp/src/main/liberty/config/resources/security/fhirTrustStore.p12 diff --git a/fhir-server/liberty-config/resources/security/kafka.client.keystore.p12 b/fhir-server-webapp/src/main/liberty/config/resources/security/kafka.client.keystore.p12 similarity index 100% rename from fhir-server/liberty-config/resources/security/kafka.client.keystore.p12 rename to fhir-server-webapp/src/main/liberty/config/resources/security/kafka.client.keystore.p12 diff --git a/fhir-server/liberty-config/resources/security/kafka.client.truststore.p12 b/fhir-server-webapp/src/main/liberty/config/resources/security/kafka.client.truststore.p12 similarity index 100% rename from fhir-server/liberty-config/resources/security/kafka.client.truststore.p12 rename to fhir-server-webapp/src/main/liberty/config/resources/security/kafka.client.truststore.p12 diff --git a/fhir-server/liberty-config/server.env b/fhir-server-webapp/src/main/liberty/config/server.env similarity index 100% rename from fhir-server/liberty-config/server.env rename to fhir-server-webapp/src/main/liberty/config/server.env diff --git a/fhir-server/liberty-config/server.xml b/fhir-server-webapp/src/main/liberty/config/server.xml similarity index 97% rename from fhir-server/liberty-config/server.xml rename to fhir-server-webapp/src/main/liberty/config/server.xml index 989b6c7c40f..bf6b2454230 100644 --- a/fhir-server/liberty-config/server.xml +++ b/fhir-server-webapp/src/main/liberty/config/server.xml @@ -63,7 +63,7 @@ - + diff --git a/fhir-server/liberty-config/userlib/.empty b/fhir-server-webapp/src/main/liberty/config/userlib/.empty similarity index 100% rename from fhir-server/liberty-config/userlib/.empty rename to fhir-server-webapp/src/main/liberty/config/userlib/.empty diff --git a/fhir-server/liberty-config/README.txt b/fhir-server/liberty-config/README.txt new file mode 100644 index 00000000000..0a0c849540b --- /dev/null +++ b/fhir-server/liberty-config/README.txt @@ -0,0 +1 @@ +Contents have been moved to fhir-server-webapp/src/main/liberty/config for compatibility with the Liberty maven plugin. \ No newline at end of file