Merge branch 'master' into dependabot/npm_and_yarn/angular/socket.io-…

…parser-4.2.3

.vscode/launch.json

@@ -12,11 +12,11 @@
         },
         {
             "type": "java",
-            "name": "Debug MobileAccessGateway pmp",
+            "name": "Debug Mobile Access Gateway pmp",
             "request": "launch",
             "mainClass": "ch.bfh.ti.i4mi.mag.MobileAccessGateway",
             "projectName": "mobile-access-gateway",
             "vmArgs": "-Dspring.config.additional-location=file:/Users/oliveregger/Documents/github/k8s-fhir.ch/configurations/mag-pmp2/application.yml",
         }
     ]
-}
+}

README.md

@@ -1,6 +1,6 @@
-# MobileAccessGateway
+# Mobile Access Gateway
 
-The MobileAccessGateway is an implementation based on the [CH EPR mHealth](https://fhir.ch/ig/ch-epr-mhealth/index.html) [(CI-Build)](http://build.fhir.org/ig/ehealthsuisse/ch-epr-mhealth/index.html) implementation guide.  
+The Mobile Access Gateway is an implementation based on the [CH EPR mHealth](https://fhir.ch/ig/ch-epr-mhealth/index.html) [(CI-Build)](http://build.fhir.org/ig/ehealthsuisse/ch-epr-mhealth/index.html) implementation guide.  
 It provides a FHIR Gateway supporting the PMIR and MHD server actors and uses XDS/PIXV3 to communicate with an XDS Affinity Domain.
 
 It uses [IPF](https://oehf.github.io/ipf/) and [HAPI-FHIR](https://hapifhir.io/).
@@ -17,7 +17,7 @@ It uses [IPF](https://oehf.github.io/ipf/) and [HAPI-FHIR](https://hapifhir.io/)
 
 ## Test setup
 
-Current configuration works with [XDSTools7](https://ehealthsuisse.ihe-europe.net/xdstools7/), a [simulator](http://ehealthsuisse.ihe-europe.net:8280/xdstools7/sim/default__ahdis/reg/rb) is setup where the MobileAccessGateway connects.
+Current configuration works with [XDSTools7](https://ehealthsuisse.ihe-europe.net/xdstools7/), a [simulator](http://ehealthsuisse.ihe-europe.net:8280/xdstools7/sim/default__ahdis/reg/rb) is setup where the Mobile Access Gateway connects.
 
 [Patient Manager](https://ehealthsuisse.ihe-europe.net/PatientManager/home.seam) is used for simulating PIX V3.
 
@@ -68,15 +68,15 @@ npm run build-mag
 
 ## Deployment
 
-The MobileAccessGateway can run in a docker container and can be deployed to a Kubernetes cluster.
+The Mobile Access Gateway can run in a docker container and can be deployed to a Kubernetes cluster.
 
 ### Building an image
 
 To create a new docker image run:
 
 ```
 mvn clean package
-docker build -t mag:v030 .
+docker build -t mag:v059 .
 ```
 
 Where "mag" is the image name and v030 is the version. Then push to a registry.

angular/README.md

@@ -33,8 +33,8 @@ this angular app is directly provided with matchbox
 
 ```
 ng build --configuration production
-rm -rf ../MobileAccessGateway/src/main/resources/static/*
-cp -r dist/* ../MobileAccessGateway/src/main/resources/static
+rm -rf ../src/main/resources/static/*
+cp -r dist/* ../src/main/resources/static
 ```
 
 ## Contributing

angular/angular.json

@@ -102,7 +102,6 @@
       }
     }
   },
-  "defaultProject": "matchbox-formfiller",
   "schematics": {
     "@schematics/angular:component": {
       "prefix": "app",