From 0fafef4c4a8b0f5744d420c2141989cabd67c196 Mon Sep 17 00:00:00 2001
From: Lee Surprenant <lmsurpre@us.ibm.com>
Date: Fri, 3 Dec 2021 08:23:19 -0500
Subject: [PATCH] Move last couple files and added README

Per review comment

Signed-off-by: Lee Surprenant <lmsurpre@us.ibm.com>
---
 .../main/liberty/config}/configDropins/defaults/jvm.options   | 0
 .../liberty/config}/configDropins/disabled/derby/bulkdata.xml | 4 ++--
 fhir-server/liberty-config/README.txt                         | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)
 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/disabled/derby/bulkdata.xml (90%)
 mode change 100755 => 100644
 create mode 100644 fhir-server/liberty-config/README.txt

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/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 @@
         <connectionManager maxPoolSize="50" minPoolSize="10"/>
     </dataSource>
 
-   <batchPersistence jobStoreRef="BatchDatabaseStore"/>
-   <databaseStore id="BatchDatabaseStore" dataSourceRef="fhirbatchDS" schema="${BATCH_DB_SCHEMA}" tablePrefix="" createTables="false"/>
+    <batchPersistence jobStoreRef="BatchDatabaseStore"/>
+    <databaseStore id="BatchDatabaseStore" dataSourceRef="fhirbatchDS" schema="${BATCH_DB_SCHEMA}" tablePrefix="" createTables="false"/>
 </server>
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