enable liberty dev mode for fhir-server-webapp (#2328)

* enable liberty dev mode for fhir-server-webapp Signed-off-by: Lee Surprenant <[email protected]> * move remaining liberty-config artifacts to fhir-server-webapp Signed-off-by: Lee Surprenant <[email protected]> * declare maven-dependency-plugin in fhir-parent and bump version Signed-off-by: Lee Surprenant <[email protected]> * Use liberty maven plugin copyDependencies feature instead of maven-dependency-plugin Signed-off-by: Lee Surprenant <[email protected]> * update migration test scripts to handle old config location Signed-off-by: Lee Surprenant <[email protected]> * minor edits to fhir-persistence-scout to make it compile Signed-off-by: Lee Surprenant <[email protected]> * Move last couple files and added README Per review comment Signed-off-by: Lee Surprenant <[email protected]> * update to latest plugin version Signed-off-by: Lee Surprenant <[email protected]> * 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 <[email protected]>
LinuxForHealth · Dec 7, 2021 · cb106bc · cb106bc
1 parent c42add5
commit cb106bc
Show file tree

Hide file tree

Showing 61 changed files with 175 additions and 75 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,13 +13,21 @@ ibm-web-ext.xml
 *.iml
 .idea/
 
+# VS Code
+.vscode/
+
 # Mac OS X
 .DS_Store
 
 # Output folders
 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
@@ -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
@@ -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
@@ -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
diff --git 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
diff --git 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
@@ -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
-###############################################################################
+###############################################################################
diff --git 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
@@ -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
-###############################################################################
+###############################################################################
diff --git 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
@@ -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
@@ -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
@@ -90,21 +90,21 @@ 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
 
 $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
@@ -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
@@ -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
@@ -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..."