Merge branch 'main' into dependabot/maven/org.apache.santuario-xmlsec…

…-2.2.6

.dockerignore

@@ -2,4 +2,5 @@
 !target/*-runner
 !target/*-runner.jar
 !target/lib/*
-!target/quarkus-app/*
+!target/quarkus-app/*
+!KBV_FHIR_eRP_V1_1_0

.github/workflows/ci-pull-request.yml

@@ -11,11 +11,11 @@ jobs:
       ERE_CONNECTOR_TLS_CERT_TRUST_STORE_PWD: "00"
       ERE_VALIDATOR_VALIDATE_SIGN_REQUEST_BUNDLES_ENABLED: false
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 11
-        uses: actions/setup-java@v2
+      - uses: actions/checkout@v4
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'adopt'
       - name: Build with Maven
         run: mvn -B verify

.github/workflows/ci-push.yml

@@ -11,14 +11,14 @@ jobs:
       ERE_CONNECTOR_TLS_CERT_TRUST_STORE_PWD: "00"
       ERE_VALIDATOR_VALIDATE_SIGN_REQUEST_BUNDLES_ENABLED: false
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 11
-        uses: actions/setup-java@v2
+      - uses: actions/checkout@v4
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'adopt'
       - name: Cache Maven packages
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}

.gitignore

@@ -46,3 +46,15 @@ yarn-error.log
 
 # Test generated file
 user.properties
+
+# Generate secrets folder, but don't commit files
+src/test/resources/secret/*
+!src/test/resources/secret/.gitkeep
+src/test/resources/secret/bundles-v1-1-0/*
+!src/test/resources/secret/bundles-v1-1-0/.gitkeep
+src/test/resources/secret/bundles-multiples-v1-1-0/*
+!src/test/resources/secret/bundles-multiples-v1-1-0/.gitkeep
+
+# Log folder
+logs/*
+!logs/.gitkeep

.mvn/wrapper/maven-wrapper.properties

@@ -1,2 +1,2 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.1/apache-maven-3.8.1-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
 wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar

CONFIGURATION.md

@@ -1,9 +1,93 @@
 # Configuration
 
-The ere-health application read configuration is the following order from most important to least important:
- * RuntimeConfiguration as part of a web socket message or a HTTP header
- * user.properties
- * Java process parameter e.g. -Dquarkus.http.port=8081
- * Environment variables e.g. export ERE_DIRECTORY_WATCHER_DIR="my-watch-dir"
- * application.properties outside of the jar
- * application.properties in the java class path (inside the jar)
+[Back to Readme](README.md)
+
+## List of parameters
+
+### Quarkus Dev UI
+
+If you started the application with `mvn quarkus:dev` you can access the quarkus Dev UI under `http://localhost:8080/q/dev/`
+
+- The Config Editor shows the current configuration of the application, including the environment variables, with a handy search function.
+   - e.g. `connector.client-system-id` shows the settings in different profiles (if preceded with %'name-of-profile') and the current setting without it.
+- ArC links allow to see the current state of the application and the beans in the application.
+
+---
+
+### Startup parameters
+
+If you want to use a special profile ("%RU." prefix in files for "RU" profile) use:
+> mvn -Dquarkus.profile=RU quarkus:dev
+
+- If you want to see the SOAP message between ere-ps-app and the konnektor use:
+> mvn -Djvm.args="-Dcom.sun.xml.ws.transport.http.client.HttpTransportPipe.dump=true -Dcom.sun.xml.internal.ws.transport.http.client.HttpTransportPipe.dump=true -Dcom.sun.xml.ws.transport.http.HttpAdapter.dump=true -Dcom.sun.xml.internal.ws.transport.http.HttpAdapter.dump=true -Dcom.sun.xml.ws.transport.http.HttpAdapter.dumpTreshold=999999" quarkus:dev
+
+- If you want so see the SSL Handshake use:
+> mvn -Djvm.args="-Djavax.net.debug=ssl:handshake" quarkus:dev
+
+- If you want to use a certain version of a JDK use:
+> JAVA_HOME=/usr/lib/jvm/java-1.11.0-openjdk-amd64/ mvn quarkus:dev
+
+---
+
+### Environment Variables
+
+For Quarkus specific variables, please refer to the [Quarkus documentation](https://quarkus.io/guides/config-reference),
+keep version in mind, as the documentation might change.
+
+#### List of Application Environment Variables
+
+* **ERE_DIRECTORY_WATCHER_DIR**
+
+  > directory-watcher.dir=${ERE_DIRECTORY_WATCHER_DIR:watch-pdf}
+
+  Specifies the path of the watch-folder for new muster 16 PDFs. Paths can be absolute or
+  relative to the path location of the ere-ps-app.jar executable.  For Windows environments, make
+  sure to use the double backslash characters to represent Windows specific file separators
+  (i.e. \\).
+
+
+* **ERE_CONNECTOR_TLS_CERT_TRUST_STORE_FILE**
+
+  Specifies the path of the Titus Connector TLS certificate trust store. Paths can be
+  absolute or relative to the path location of the ere-ps-app.jar executable. For Windows
+  environments, make sure to use the double backslash characters to represent Windows specific
+  file separators (i.e. \\).
+
+
+* **ERE_CONNECTOR_TLS_CERT_TRUST_STORE_PWD**
+
+  Password for the Titus TLS certificate trust store. For Windows environments, make sure to use
+  double quotes around numeric values that are to be interpreted as a string.
+
+
+* **MUSTER16_TEMPLATE_CONFIGURATION**
+
+  Allows for configuring which parsing profile the SVGExtractor module should use on startup of
+  the application.
+
+In the development `dev` profile, all environment variables have default values, provided through the
+`application.properties` file. Under other profiles, certain variable values are required to be explicitly provided
+as an environment variable.
+Namely, `ERE_CONNECTOR_TLS_CERT_TRUST_STORE_FILE` and `ERE_CONNECTOR_TLS_CERT_TRUST_STORE_PWD`.
+
+The .env file should be located in the root project folder (ere-ps-app).
+
+> Important! Configure the .env file to be ignored and not checked into the source code repository.
+
+In regard to file and directory paths, configure the values for the environment variables in the
+.env file to reference paths on your local computer.
+
+An example of the layout of the contents in the .env file is shown below:
+
+```
+ERE_DIRECTORY_WATCHER_DIR=<YOUR_LOCAL_PATH>/watch-pdf
+ERE_CONNECTOR_TLS_CERT_TRUST_STORE_FILE=<YOUR_LOCAL_PATH>/ere-ps-app/src/test/resources/certs/ps_erp_incentergy_01.p12
+ERE_CONNECTOR_TLS_CERT_TRUST_STORE_PWD=<SECRET_VALUE_ON_YOUR_COMPUTER>
+```
+
+####  Table
+
+---
+
+[Back to Readme](README.md)

INSTALL.md

@@ -1,15 +1,20 @@
 # INSTALLATION
 
+[Back to Readme](README.md)
+
+---
+
 ## Windows
 
-Download and execute the following file:
-https://ere.health/ere-health-installer.bat
+Download and execute the following https://ere.health/ere-health-installer.bat on Windows 10.
 
 This will:
  * Install a JDK if not available
  * Install Chrome if not available
  * Install ere-health and add it to autostart
 
+---
+
 ## Linux (systemd service)
 
 Prequisite:
@@ -41,4 +46,10 @@ Check the log
 sudo journalctl -f -u ere-health
 ```
 
-Based on: https://dzone.com/articles/run-your-java-application-as-a-service-on-ubuntu
+Based on: https://dzone.com/articles/run-your-java-application-as-a-service-on-ubuntu
+
+
+
+---
+
+[Back to Readme](README.md)