From d7a3a6b0786701df3a7b1f6e32710de7d8f98f12 Mon Sep 17 00:00:00 2001
From: Sergey Mikhaylenko <sergey.mikhaylenko@gmail.com>
Date: Tue, 27 Feb 2024 13:16:43 +0300
Subject: [PATCH 01/19] Update Setup.cls

---
 src/fhirtemplate/Setup.cls | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/fhirtemplate/Setup.cls b/src/fhirtemplate/Setup.cls
index d0fa137..44716ec 100644
--- a/src/fhirtemplate/Setup.cls
+++ b/src/fhirtemplate/Setup.cls
@@ -1,13 +1,13 @@
 Class fhirtemplate.Setup
 {
 
-ClassMethod SetupFHIRServer(ns) As %Status
+ClassMethod SetupFHIRServer(ns="FHIRSERVER222",appKey="/fhir/r444",testLoad=1) As %Status
 {
-    set ns=$g(ns,$namespace)
-    set ns="FHIRSERVER"
+    ;set ns=$g(ns,$namespace)
+    ;set ns="FHIRSERVER"
     zn "HSLIB"
     set namespace=ns
-    Set appKey = "/fhir/r4"
+    ;Set appKey = "/fhir/r4"
     Set strategyClass = "HS.FHIRServer.Storage.Json.InteractionsStrategy"
     set metadataPackages = $lb("hl7.fhir.r4.core@4.0.1")
     Set metadataConfigKey = "HL7v40"
@@ -32,10 +32,12 @@ ClassMethod SetupFHIRServer(ns) As %Status
     set config.DebugMode = 4
     do strategy.SaveServiceConfigData(config)
 
-    set dir=$System.Util.ManagerDirectory()_"test-data-fhir"
-    write !," ====== Load test data in "_ns_" from "_dir
-    set st=##class(HS.FHIRServer.Tools.DataLoader).SubmitResourceFiles(dir, "FHIRServer", appKey)
-    if 'st write $System.Status.GetErrorText(st)
+    if testLoad {
+     set dir=$System.Util.ManagerDirectory()_"test-data-fhir"
+     write !," ====== Load test data in "_ns_" from "_dir
+     set st=##class(HS.FHIRServer.Tools.DataLoader).SubmitResourceFiles(dir, "FHIRServer", appKey)
+     if 'st write $System.Status.GetErrorText(st)
+    }
     quit st
 }
 

From 5ba5c0e58af8c67fbe47fe0cd46a4bb4a11a1c7c Mon Sep 17 00:00:00 2001
From: Sergey Mikhaylenko <sergey.mikhaylenko@gmail.com>
Date: Tue, 27 Feb 2024 13:40:22 +0300
Subject: [PATCH 02/19] Update module.xml

Add parameters:
Namespace - to alter created/modified namespace (now/default FHIRSERVER)
AddTestData - import some test data to the FHIR server, otherwise don't
Webapp - provide the name for the web application to expose R4 API. /fhir/r4 is by default
---
 module.xml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/module.xml b/module.xml
index 4193a2f..4b6ed44 100755
--- a/module.xml
+++ b/module.xml
@@ -7,9 +7,15 @@
       <Description>InterSystems FHIR Server with a demo frontend</Description>
       <Keywords>FHIR,Server</Keywords>
       <Packaging>module</Packaging>
+    <Default Name="Namespace" Value="FHIRSERVER" />
+	  <Default Name="Webapp" Value="/fhir/r4" />
+    <Default Name="AddTestData" Value="1" />
     <SourcesRoot>src</SourcesRoot>
     <Invokes>
     <Invoke Class="fhirtemplate.Setup" Method="SetupFHIRServer" Phase="Activate" When="After" ></Invoke>
+      <Arg>${Namespace}</Arg>
+		  <Arg>${Webapp}</Arg>
+      <Arg>${AddTestData}</Arg>
     </Invokes>
     <Resource Name="fhirtemplate.PKG"/>
     <Resource Name="User.PKG"/>
@@ -23,5 +29,12 @@
         CookiePath="/fhirUI"
        />
     </Module>
+    <AfterInstallMessage>
+&#13;You can change the default settings
+&#13;Namespace - to alter created/modified namespace (now/default FHIRSERVER)
+&#13;AddTestData - import some test data to the FHIR server, otherwise don't
+&#13;Webapp - provide the name for the web application to expose R4 API. /fhir/r4 is by default
+&#13;USER>zpm "install fhir-server -Dzpm.Namespace=ALTERFHIRSERVER -Dzpm.Webapp=/fhir/r444 Dzpm.AddTestData=0" 
+</AfterInstallMessage>
   </Document>
 </Export>

From 81e454157fe4ddf04c6945379a531ef6c8dbb212 Mon Sep 17 00:00:00 2001
From: Sergey Mikhaylenko <sergey.mikhaylenko@gmail.com>
Date: Tue, 27 Feb 2024 13:41:55 +0300
Subject: [PATCH 03/19] Update module.xml

---
 module.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/module.xml b/module.xml
index 4b6ed44..67085a8 100755
--- a/module.xml
+++ b/module.xml
@@ -7,9 +7,9 @@
       <Description>InterSystems FHIR Server with a demo frontend</Description>
       <Keywords>FHIR,Server</Keywords>
       <Packaging>module</Packaging>
-    <Default Name="Namespace" Value="FHIRSERVER" />
-	  <Default Name="Webapp" Value="/fhir/r4" />
-    <Default Name="AddTestData" Value="1" />
+    <Default Name="Namespace" Value="FHIRSERVER7777" />
+	  <Default Name="Webapp" Value="/fhir/r47777" />
+    <Default Name="AddTestData" Value="0" />
     <SourcesRoot>src</SourcesRoot>
     <Invokes>
     <Invoke Class="fhirtemplate.Setup" Method="SetupFHIRServer" Phase="Activate" When="After" ></Invoke>

From 3bae534e4c77ded0e284759b2ef5fe893a3919a1 Mon Sep 17 00:00:00 2001
From: Sergey Mikhaylenko <sergey.mikhaylenko@gmail.com>
Date: Tue, 27 Feb 2024 13:43:15 +0300
Subject: [PATCH 04/19] Update module.xml

---
 module.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module.xml b/module.xml
index 67085a8..9caded5 100755
--- a/module.xml
+++ b/module.xml
@@ -28,7 +28,6 @@
         Recurse="1"
         CookiePath="/fhirUI"
        />
-    </Module>
     <AfterInstallMessage>
 &#13;You can change the default settings
 &#13;Namespace - to alter created/modified namespace (now/default FHIRSERVER)
@@ -36,5 +35,6 @@
 &#13;Webapp - provide the name for the web application to expose R4 API. /fhir/r4 is by default
 &#13;USER>zpm "install fhir-server -Dzpm.Namespace=ALTERFHIRSERVER -Dzpm.Webapp=/fhir/r444 Dzpm.AddTestData=0" 
 </AfterInstallMessage>
-  </Document>
+  </Module>
+ </Document>
 </Export>

From 1f39b0d6564563687a070d54a2da350dec4dd7cf Mon Sep 17 00:00:00 2001
From: Sergey Mikhaylenko <sergey.mikhaylenko@gmail.com>
Date: Tue, 27 Feb 2024 13:44:34 +0300
Subject: [PATCH 05/19] Update module.xml

---
 module.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/module.xml b/module.xml
index 9caded5..07e23d8 100755
--- a/module.xml
+++ b/module.xml
@@ -12,10 +12,11 @@
     <Default Name="AddTestData" Value="0" />
     <SourcesRoot>src</SourcesRoot>
     <Invokes>
-    <Invoke Class="fhirtemplate.Setup" Method="SetupFHIRServer" Phase="Activate" When="After" ></Invoke>
+    <Invoke Class="fhirtemplate.Setup" Method="SetupFHIRServer" Phase="Activate" When="After" >
       <Arg>${Namespace}</Arg>
-		  <Arg>${Webapp}</Arg>
+      <Arg>${Webapp}</Arg>
       <Arg>${AddTestData}</Arg>
+     </Invoke>
     </Invokes>
     <Resource Name="fhirtemplate.PKG"/>
     <Resource Name="User.PKG"/>

From f4dbcad3227090f608a0d5687aa317b6889afd0d Mon Sep 17 00:00:00 2001
From: Sergey Mikhaylenko <sergey.mikhaylenko@gmail.com>
Date: Tue, 27 Feb 2024 13:55:26 +0300
Subject: [PATCH 06/19] Update Setup.cls

---
 src/fhirtemplate/Setup.cls | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/fhirtemplate/Setup.cls b/src/fhirtemplate/Setup.cls
index 44716ec..4e2dd1d 100644
--- a/src/fhirtemplate/Setup.cls
+++ b/src/fhirtemplate/Setup.cls
@@ -1,9 +1,9 @@
 Class fhirtemplate.Setup
 {
 
-ClassMethod SetupFHIRServer(ns="FHIRSERVER222",appKey="/fhir/r444",testLoad=1) As %Status
+ClassMethod SetupFHIRServer(ns="FHIRSERVER",appKey="/fhir/r4",testLoad=1) As %Status
 {
-    ;set ns=$g(ns,$namespace)
+    set st=$$$OK
     ;set ns="FHIRSERVER"
     zn "HSLIB"
     set namespace=ns

From 2341398b8b5d6a0cf95116c6e758bddbf8431c1c Mon Sep 17 00:00:00 2001
From: Sergey Mikhaylenko <sergey.mikhaylenko@gmail.com>
Date: Tue, 27 Feb 2024 14:07:10 +0300
Subject: [PATCH 07/19] Update module.xml

bump version
---
 module.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/module.xml b/module.xml
index 07e23d8..ccc8d4c 100755
--- a/module.xml
+++ b/module.xml
@@ -3,13 +3,13 @@
   <Document name="fhir-server.ZPM">
     <Module>
       <Name>fhir-server</Name>
-      <Version>1.3.2</Version>
+      <Version>1.3.3</Version>
       <Description>InterSystems FHIR Server with a demo frontend</Description>
       <Keywords>FHIR,Server</Keywords>
       <Packaging>module</Packaging>
-    <Default Name="Namespace" Value="FHIRSERVER7777" />
-	  <Default Name="Webapp" Value="/fhir/r47777" />
-    <Default Name="AddTestData" Value="0" />
+    <Default Name="Namespace" Value="FHIRSERVER" />
+	  <Default Name="Webapp" Value="/fhir/r4" />
+    <Default Name="AddTestData" Value="1" />
     <SourcesRoot>src</SourcesRoot>
     <Invokes>
     <Invoke Class="fhirtemplate.Setup" Method="SetupFHIRServer" Phase="Activate" When="After" >
@@ -34,7 +34,7 @@
 &#13;Namespace - to alter created/modified namespace (now/default FHIRSERVER)
 &#13;AddTestData - import some test data to the FHIR server, otherwise don't
 &#13;Webapp - provide the name for the web application to expose R4 API. /fhir/r4 is by default
-&#13;USER>zpm "install fhir-server -Dzpm.Namespace=ALTERFHIRSERVER -Dzpm.Webapp=/fhir/r444 Dzpm.AddTestData=0" 
+&#13;USER>zpm "install fhir-server -Dzpm.Namespace=ALTERFHIRSERVER -Dzpm.Webapp=/fhir/r444 -Dzpm.AddTestData=0" 
 </AfterInstallMessage>
   </Module>
  </Document>

From 8e06624a104e412db35e584df0cbd8ae54315577 Mon Sep 17 00:00:00 2001
From: Sergey Mikhaylenko <sergey.mikhaylenko@gmail.com>
Date: Tue, 27 Feb 2024 14:30:55 +0300
Subject: [PATCH 08/19] Update Setup.cls

---
 src/fhirtemplate/Setup.cls | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fhirtemplate/Setup.cls b/src/fhirtemplate/Setup.cls
index 4e2dd1d..2c7de09 100644
--- a/src/fhirtemplate/Setup.cls
+++ b/src/fhirtemplate/Setup.cls
@@ -4,7 +4,7 @@ Class fhirtemplate.Setup
 ClassMethod SetupFHIRServer(ns="FHIRSERVER",appKey="/fhir/r4",testLoad=1) As %Status
 {
     set st=$$$OK
-    ;set ns="FHIRSERVER"
+    Write !,"Initialization with parameters: Namespace: "_ns_", appKey: "_appKey_", testLoad: "_testLoad
     zn "HSLIB"
     set namespace=ns
     ;Set appKey = "/fhir/r4"

From a05201638ff437c79fb340b56674b301ca801922 Mon Sep 17 00:00:00 2001
From: Sergey Mikhaylenko <sergey.mikhaylenko@gmail.com>
Date: Tue, 27 Feb 2024 14:35:10 +0300
Subject: [PATCH 09/19] Update Setup.cls

---
 src/fhirtemplate/Setup.cls | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fhirtemplate/Setup.cls b/src/fhirtemplate/Setup.cls
index 2c7de09..e209775 100644
--- a/src/fhirtemplate/Setup.cls
+++ b/src/fhirtemplate/Setup.cls
@@ -4,7 +4,7 @@ Class fhirtemplate.Setup
 ClassMethod SetupFHIRServer(ns="FHIRSERVER",appKey="/fhir/r4",testLoad=1) As %Status
 {
     set st=$$$OK
-    Write !,"Initialization with parameters: Namespace: "_ns_", appKey: "_appKey_", testLoad: "_testLoad
+    Write !,"Initialization with parameters: Namespace: "_ns_", Webapp: "_appKey_", AddTestData: "_testLoad
     zn "HSLIB"
     set namespace=ns
     ;Set appKey = "/fhir/r4"

From 17bce24fe5bb609e1c6768cb1dbacd2dc3c28d9f Mon Sep 17 00:00:00 2001
From: Sergey Mikhaylenko <sergey.mikhaylenko@gmail.com>
Date: Tue, 27 Feb 2024 14:37:04 +0300
Subject: [PATCH 10/19] Update module.xml

---
 module.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/module.xml b/module.xml
index ccc8d4c..83e2774 100755
--- a/module.xml
+++ b/module.xml
@@ -7,13 +7,13 @@
       <Description>InterSystems FHIR Server with a demo frontend</Description>
       <Keywords>FHIR,Server</Keywords>
       <Packaging>module</Packaging>
-    <Default Name="Namespace" Value="FHIRSERVER" />
-	  <Default Name="Webapp" Value="/fhir/r4" />
+    <Default Name="Nspace" Value="FHIRSERVER" />
+    <Default Name="Webapp" Value="/fhir/r4" />
     <Default Name="AddTestData" Value="1" />
     <SourcesRoot>src</SourcesRoot>
     <Invokes>
     <Invoke Class="fhirtemplate.Setup" Method="SetupFHIRServer" Phase="Activate" When="After" >
-      <Arg>${Namespace}</Arg>
+      <Arg>${Nspace}</Arg>
       <Arg>${Webapp}</Arg>
       <Arg>${AddTestData}</Arg>
      </Invoke>
@@ -31,10 +31,10 @@
        />
     <AfterInstallMessage>
 &#13;You can change the default settings
-&#13;Namespace - to alter created/modified namespace (now/default FHIRSERVER)
+&#13;Nspace - to alter created/modified namespace (now/default FHIRSERVER)
 &#13;AddTestData - import some test data to the FHIR server, otherwise don't
 &#13;Webapp - provide the name for the web application to expose R4 API. /fhir/r4 is by default
-&#13;USER>zpm "install fhir-server -Dzpm.Namespace=ALTERFHIRSERVER -Dzpm.Webapp=/fhir/r444 -Dzpm.AddTestData=0" 
+&#13;USER>zpm "install fhir-server -Dzpm.Nspace=ALTERFHIRSERVER -Dzpm.Webapp=/fhir/r7 -Dzpm.AddTestData=0" 
 </AfterInstallMessage>
   </Module>
  </Document>

From ef0978ac2bcfefa832b55ef885b35b6c0f404d06 Mon Sep 17 00:00:00 2001
From: Sergey Mikhaylenko <sergey.mikhaylenko@gmail.com>
Date: Tue, 27 Feb 2024 14:42:58 +0300
Subject: [PATCH 11/19] Update module.xml

---
 module.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module.xml b/module.xml
index 83e2774..f53f2c6 100755
--- a/module.xml
+++ b/module.xml
@@ -7,13 +7,13 @@
       <Description>InterSystems FHIR Server with a demo frontend</Description>
       <Keywords>FHIR,Server</Keywords>
       <Packaging>module</Packaging>
-    <Default Name="Nspace" Value="FHIRSERVER" />
+    <Default Name="aaa" Value="FHIRSERVER" />
     <Default Name="Webapp" Value="/fhir/r4" />
     <Default Name="AddTestData" Value="1" />
     <SourcesRoot>src</SourcesRoot>
     <Invokes>
     <Invoke Class="fhirtemplate.Setup" Method="SetupFHIRServer" Phase="Activate" When="After" >
-      <Arg>${Nspace}</Arg>
+      <Arg>${aaa}</Arg>
       <Arg>${Webapp}</Arg>
       <Arg>${AddTestData}</Arg>
      </Invoke>

From 155edda1896654343a67b081185607c9312f76b2 Mon Sep 17 00:00:00 2001
From: Sergey Mikhaylenko <sergey.mikhaylenko@gmail.com>
Date: Tue, 27 Feb 2024 14:53:21 +0300
Subject: [PATCH 12/19] Update module.xml

---
 module.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/module.xml b/module.xml
index f53f2c6..39443ff 100755
--- a/module.xml
+++ b/module.xml
@@ -7,13 +7,13 @@
       <Description>InterSystems FHIR Server with a demo frontend</Description>
       <Keywords>FHIR,Server</Keywords>
       <Packaging>module</Packaging>
-    <Default Name="aaa" Value="FHIRSERVER" />
+    <Default Name="ns" Value="FHIRSERVER" />
     <Default Name="Webapp" Value="/fhir/r4" />
     <Default Name="AddTestData" Value="1" />
     <SourcesRoot>src</SourcesRoot>
     <Invokes>
     <Invoke Class="fhirtemplate.Setup" Method="SetupFHIRServer" Phase="Activate" When="After" >
-      <Arg>${aaa}</Arg>
+      <Arg>${ns}</Arg>
       <Arg>${Webapp}</Arg>
       <Arg>${AddTestData}</Arg>
      </Invoke>
@@ -34,7 +34,7 @@
 &#13;Nspace - to alter created/modified namespace (now/default FHIRSERVER)
 &#13;AddTestData - import some test data to the FHIR server, otherwise don't
 &#13;Webapp - provide the name for the web application to expose R4 API. /fhir/r4 is by default
-&#13;USER>zpm "install fhir-server -Dzpm.Nspace=ALTERFHIRSERVER -Dzpm.Webapp=/fhir/r7 -Dzpm.AddTestData=0" 
+&#13;USER>zpm "install fhir-server -Dzpm.ns=ALTERFHIRSERVER -Dzpm.Webapp=/fhir/r7 -Dzpm.AddTestData=0" 
 </AfterInstallMessage>
   </Module>
  </Document>

From bbfd2d3d8199efb285463761ce40ad5b4f386b82 Mon Sep 17 00:00:00 2001
From: Sergey Mikhaylenko <sergey.mikhaylenko@gmail.com>
Date: Tue, 27 Feb 2024 14:55:50 +0300
Subject: [PATCH 13/19] Update Setup.cls

---
 src/fhirtemplate/Setup.cls | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fhirtemplate/Setup.cls b/src/fhirtemplate/Setup.cls
index e209775..f940ce6 100644
--- a/src/fhirtemplate/Setup.cls
+++ b/src/fhirtemplate/Setup.cls
@@ -4,7 +4,7 @@ Class fhirtemplate.Setup
 ClassMethod SetupFHIRServer(ns="FHIRSERVER",appKey="/fhir/r4",testLoad=1) As %Status
 {
     set st=$$$OK
-    Write !,"Initialization with parameters: Namespace: "_ns_", Webapp: "_appKey_", AddTestData: "_testLoad
+    Write !,"=== Initialization with parameters: Namespace: "_ns_", Webapp: "_appKey_", AddTestData: "_testLoad,!
     zn "HSLIB"
     set namespace=ns
     ;Set appKey = "/fhir/r4"

From 58338aaac04b720b1a6ec89cf30b84af1868ca26 Mon Sep 17 00:00:00 2001
From: Sergey Mikhaylenko <sergey.mikhaylenko@gmail.com>
Date: Tue, 27 Feb 2024 15:32:24 +0300
Subject: [PATCH 14/19] Update module.xml

---
 module.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module.xml b/module.xml
index 39443ff..bcd641a 100755
--- a/module.xml
+++ b/module.xml
@@ -13,7 +13,7 @@
     <SourcesRoot>src</SourcesRoot>
     <Invokes>
     <Invoke Class="fhirtemplate.Setup" Method="SetupFHIRServer" Phase="Activate" When="After" >
-      <Arg>${ns}</Arg>
+      <Arg>SSSSSS</Arg>
       <Arg>${Webapp}</Arg>
       <Arg>${AddTestData}</Arg>
      </Invoke>

From 9c5e5e97b985247ac4d9c6d0fcb6a33037d63271 Mon Sep 17 00:00:00 2001
From: Sergey Mikhaylenko <sergey.mikhaylenko@gmail.com>
Date: Tue, 27 Feb 2024 20:17:54 +0300
Subject: [PATCH 15/19] Update module.xml

---
 module.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module.xml b/module.xml
index bcd641a..39443ff 100755
--- a/module.xml
+++ b/module.xml
@@ -13,7 +13,7 @@
     <SourcesRoot>src</SourcesRoot>
     <Invokes>
     <Invoke Class="fhirtemplate.Setup" Method="SetupFHIRServer" Phase="Activate" When="After" >
-      <Arg>SSSSSS</Arg>
+      <Arg>${ns}</Arg>
       <Arg>${Webapp}</Arg>
       <Arg>${AddTestData}</Arg>
      </Invoke>

From dea87bba99b0a142cdfb76091d8cee79fe20dfec Mon Sep 17 00:00:00 2001
From: Sergey Mikhaylenko <sergey.mikhaylenko@gmail.com>
Date: Tue, 27 Feb 2024 20:41:55 +0300
Subject: [PATCH 16/19] Update module.xml

---
 module.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module.xml b/module.xml
index 39443ff..8a23906 100755
--- a/module.xml
+++ b/module.xml
@@ -13,7 +13,7 @@
     <SourcesRoot>src</SourcesRoot>
     <Invokes>
     <Invoke Class="fhirtemplate.Setup" Method="SetupFHIRServer" Phase="Activate" When="After" >
-      <Arg>${ns}</Arg>
+      <Arg>TTTTTT</Arg>
       <Arg>${Webapp}</Arg>
       <Arg>${AddTestData}</Arg>
      </Invoke>

From 3b559354638f8ad1c2405de2867f620a2cdd46a8 Mon Sep 17 00:00:00 2001
From: Sergey Mikhaylenko <sergey.mikhaylenko@gmail.com>
Date: Tue, 27 Feb 2024 20:43:32 +0300
Subject: [PATCH 17/19] Update module.xml

---
 module.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module.xml b/module.xml
index 8a23906..839d179 100755
--- a/module.xml
+++ b/module.xml
@@ -7,13 +7,13 @@
       <Description>InterSystems FHIR Server with a demo frontend</Description>
       <Keywords>FHIR,Server</Keywords>
       <Packaging>module</Packaging>
-    <Default Name="ns" Value="FHIRSERVER" />
+    <Default Name="nnn" Value="FHIRSERVER" />
     <Default Name="Webapp" Value="/fhir/r4" />
     <Default Name="AddTestData" Value="1" />
     <SourcesRoot>src</SourcesRoot>
     <Invokes>
     <Invoke Class="fhirtemplate.Setup" Method="SetupFHIRServer" Phase="Activate" When="After" >
-      <Arg>TTTTTT</Arg>
+      <Arg>${nnn}</Arg>
       <Arg>${Webapp}</Arg>
       <Arg>${AddTestData}</Arg>
      </Invoke>

From 9130e6114ec1329ec89bd935ebf771a0cecccb87 Mon Sep 17 00:00:00 2001
From: Sergey Mikhaylenko <sergey.mikhaylenko@gmail.com>
Date: Tue, 27 Feb 2024 20:46:20 +0300
Subject: [PATCH 18/19] Update module.xml

---
 module.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/module.xml b/module.xml
index 839d179..d5178c0 100755
--- a/module.xml
+++ b/module.xml
@@ -7,13 +7,13 @@
       <Description>InterSystems FHIR Server with a demo frontend</Description>
       <Keywords>FHIR,Server</Keywords>
       <Packaging>module</Packaging>
-    <Default Name="nnn" Value="FHIRSERVER" />
+    <Default Name="name" Value="FHIRSERVER" />
     <Default Name="Webapp" Value="/fhir/r4" />
     <Default Name="AddTestData" Value="1" />
     <SourcesRoot>src</SourcesRoot>
     <Invokes>
     <Invoke Class="fhirtemplate.Setup" Method="SetupFHIRServer" Phase="Activate" When="After" >
-      <Arg>${nnn}</Arg>
+      <Arg>${name}</Arg>
       <Arg>${Webapp}</Arg>
       <Arg>${AddTestData}</Arg>
      </Invoke>
@@ -34,7 +34,7 @@
 &#13;Nspace - to alter created/modified namespace (now/default FHIRSERVER)
 &#13;AddTestData - import some test data to the FHIR server, otherwise don't
 &#13;Webapp - provide the name for the web application to expose R4 API. /fhir/r4 is by default
-&#13;USER>zpm "install fhir-server -Dzpm.ns=ALTERFHIRSERVER -Dzpm.Webapp=/fhir/r7 -Dzpm.AddTestData=0" 
+&#13;USER>zpm "install fhir-server -Dzpm.name=ALTERFHIRSERVER -Dzpm.Webapp=/fhir/r7 -Dzpm.AddTestData=0" 
 </AfterInstallMessage>
   </Module>
  </Document>

From c1a234a5d92b8c818d6c699f0843eba18fe2db3f Mon Sep 17 00:00:00 2001
From: Sergey Mikhaylenko <sergey.mikhaylenko@gmail.com>
Date: Tue, 27 Feb 2024 20:48:11 +0300
Subject: [PATCH 19/19] Update module.xml

---
 module.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module.xml b/module.xml
index d5178c0..8c3c934 100755
--- a/module.xml
+++ b/module.xml
@@ -31,7 +31,7 @@
        />
     <AfterInstallMessage>
 &#13;You can change the default settings
-&#13;Nspace - to alter created/modified namespace (now/default FHIRSERVER)
+&#13;Name - to alter created/modified namespace (now/default FHIRSERVER)
 &#13;AddTestData - import some test data to the FHIR server, otherwise don't
 &#13;Webapp - provide the name for the web application to expose R4 API. /fhir/r4 is by default
 &#13;USER>zpm "install fhir-server -Dzpm.name=ALTERFHIRSERVER -Dzpm.Webapp=/fhir/r7 -Dzpm.AddTestData=0"