Skip to content

Commit

Permalink
Merge pull request #108 from medizininformatik-initiative/102-renamin…
Browse files Browse the repository at this point in the history
…g-of-repository

Rename Project and Package to Match Other DSF Process Plugins
  • Loading branch information
EmteZogaf authored Feb 19, 2024
2 parents cbe4e70 + f484413 commit 6edf011
Show file tree
Hide file tree
Showing 224 changed files with 621 additions and 647 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ jobs:
run: mvn -q versions:set -DnewVersion="${{ steps.prep.outputs.version }}" -DprocessAllModules=true

- name: Build with Maven
run: mvn -B deploy -DskipTests --file feasibility-dsf-process/pom.xml
run: mvn -B deploy -DskipTests --file mii-process-feasibility/pom.xml
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
USERNAME: ${{ github.actor }}
Expand All @@ -97,7 +97,7 @@ jobs:
draft: true
generate_release_notes: true
files: |
feasibility-dsf-process/target/feasibility-dsf-process-*.jar
feasibility-dsf-process/target/feasibility-dsf-process-*.jar.sha256
name: "Feasibility DSF Process - v${{ steps.prep.outputs.version }}"
mii-process-feasibility/target/mii-process-feasibility-*.jar
mii-process-feasibility/target/mii-process-feasibility-*.jar.sha256
name: "MII Process Feasibility - v${{ steps.prep.outputs.version }}"

102 changes: 51 additions & 51 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,54 +1,54 @@
/feasibility-dsf-process/target/
/feasibility-dsf-process/src/test/resources/de/medizininformatik_initiative/feasibility_dsf_process/client/store/certs

/feasibility-dsf-process-docker-test-setup/certs/*.pem
/feasibility-dsf-process-docker-test-setup/certs/*.p12

/feasibility-dsf-process-docker-test-setup/.env
/feasibility-dsf-process-docker-test-setup/secrets/*.pem
/feasibility-dsf-process-docker-test-setup/secrets/*.p12

/feasibility-dsf-process-docker-test-setup/dic-1/bpe/log/*.log
/feasibility-dsf-process-docker-test-setup/dic-1/bpe/log/*.log.gz
/feasibility-dsf-process-docker-test-setup/dic-1/bpe/plugin/*.jar
/feasibility-dsf-process-docker-test-setup/dic-1/bpe/process/*.jar
/feasibility-dsf-process-docker-test-setup/dic-1/fhir/conf/bundle.xml
/feasibility-dsf-process-docker-test-setup/dic-1/fhir/conf/config.properties
/feasibility-dsf-process-docker-test-setup/dic-1/fhir/log/*.log
/feasibility-dsf-process-docker-test-setup/dic-1/fhir/log/*.log.gz

/feasibility-dsf-process-docker-test-setup/dic-2/bpe/log/*.log
/feasibility-dsf-process-docker-test-setup/dic-2/bpe/log/*.log.gz
/feasibility-dsf-process-docker-test-setup/dic-2/bpe/plugin/*.jar
/feasibility-dsf-process-docker-test-setup/dic-2/bpe/process/*.jar
/feasibility-dsf-process-docker-test-setup/dic-2/fhir/conf/bundle.xml
/feasibility-dsf-process-docker-test-setup/dic-2/fhir/conf/config.properties
/feasibility-dsf-process-docker-test-setup/dic-2/fhir/log/*.log
/feasibility-dsf-process-docker-test-setup/dic-2/fhir/log/*.log.gz

/feasibility-dsf-process-docker-test-setup/dic-3/bpe/log/*.log
/feasibility-dsf-process-docker-test-setup/dic-3/bpe/log/*.log.gz
/feasibility-dsf-process-docker-test-setup/dic-3/bpe/plugin/*.jar
/feasibility-dsf-process-docker-test-setup/dic-3/bpe/process/*.jar
/feasibility-dsf-process-docker-test-setup/dic-3/fhir/conf/bundle.xml
/feasibility-dsf-process-docker-test-setup/dic-3/fhir/conf/config.properties
/feasibility-dsf-process-docker-test-setup/dic-3/fhir/log/*.log
/feasibility-dsf-process-docker-test-setup/dic-3/fhir/log/*.log.gz

/feasibility-dsf-process-docker-test-setup/zars/bpe/log/*.log
/feasibility-dsf-process-docker-test-setup/zars/bpe/log/*.log.gz
/feasibility-dsf-process-docker-test-setup/zars/bpe/plugin/*.jar
/feasibility-dsf-process-docker-test-setup/zars/bpe/process/*.jar
/feasibility-dsf-process-docker-test-setup/zars/fhir/conf/bundle.xml
/feasibility-dsf-process-docker-test-setup/zars/fhir/conf/config.properties
/feasibility-dsf-process-docker-test-setup/zars/fhir/log/*.log
/feasibility-dsf-process-docker-test-setup/zars/fhir/log/*.log.gz

/feasibility-dsf-process-tools/feasibility-dsf-process-test-data-generator/bundle/*.xml
/feasibility-dsf-process-tools/feasibility-dsf-process-test-data-generator/cert/*/
/feasibility-dsf-process-tools/feasibility-dsf-process-test-data-generator/cert/*.txt
/feasibility-dsf-process-tools/feasibility-dsf-process-test-data-generator/config/*.properties
/feasibility-dsf-process-tools/feasibility-dsf-process-test-data-generator/target/
/mii-process-feasibility/target/
/mii-process-feasibility/src/test/resources/de/medizininformatik_initiative/feasibility_dsf_process/client/store/certs

/mii-process-feasibility-docker-test-setup/certs/*.pem
/mii-process-feasibility-docker-test-setup/certs/*.p12

/mii-process-feasibility-docker-test-setup/.env
/mii-process-feasibility-docker-test-setup/secrets/*.pem
/mii-process-feasibility-docker-test-setup/secrets/*.p12

/mii-process-feasibility-docker-test-setup/dic-1/bpe/log/*.log
/mii-process-feasibility-docker-test-setup/dic-1/bpe/log/*.log.gz
/mii-process-feasibility-docker-test-setup/dic-1/bpe/plugin/*.jar
/mii-process-feasibility-docker-test-setup/dic-1/bpe/process/*.jar
/mii-process-feasibility-docker-test-setup/dic-1/fhir/conf/bundle.xml
/mii-process-feasibility-docker-test-setup/dic-1/fhir/conf/config.properties
/mii-process-feasibility-docker-test-setup/dic-1/fhir/log/*.log
/mii-process-feasibility-docker-test-setup/dic-1/fhir/log/*.log.gz

/mii-process-feasibility-docker-test-setup/dic-2/bpe/log/*.log
/mii-process-feasibility-docker-test-setup/dic-2/bpe/log/*.log.gz
/mii-process-feasibility-docker-test-setup/dic-2/bpe/plugin/*.jar
/mii-process-feasibility-docker-test-setup/dic-2/bpe/process/*.jar
/mii-process-feasibility-docker-test-setup/dic-2/fhir/conf/bundle.xml
/mii-process-feasibility-docker-test-setup/dic-2/fhir/conf/config.properties
/mii-process-feasibility-docker-test-setup/dic-2/fhir/log/*.log
/mii-process-feasibility-docker-test-setup/dic-2/fhir/log/*.log.gz

/mii-process-feasibility-docker-test-setup/dic-3/bpe/log/*.log
/mii-process-feasibility-docker-test-setup/dic-3/bpe/log/*.log.gz
/mii-process-feasibility-docker-test-setup/dic-3/bpe/plugin/*.jar
/mii-process-feasibility-docker-test-setup/dic-3/bpe/process/*.jar
/mii-process-feasibility-docker-test-setup/dic-3/fhir/conf/bundle.xml
/mii-process-feasibility-docker-test-setup/dic-3/fhir/conf/config.properties
/mii-process-feasibility-docker-test-setup/dic-3/fhir/log/*.log
/mii-process-feasibility-docker-test-setup/dic-3/fhir/log/*.log.gz

/mii-process-feasibility-docker-test-setup/zars/bpe/log/*.log
/mii-process-feasibility-docker-test-setup/zars/bpe/log/*.log.gz
/mii-process-feasibility-docker-test-setup/zars/bpe/plugin/*.jar
/mii-process-feasibility-docker-test-setup/zars/bpe/process/*.jar
/mii-process-feasibility-docker-test-setup/zars/fhir/conf/bundle.xml
/mii-process-feasibility-docker-test-setup/zars/fhir/conf/config.properties
/mii-process-feasibility-docker-test-setup/zars/fhir/log/*.log
/mii-process-feasibility-docker-test-setup/zars/fhir/log/*.log.gz

/mii-process-feasibility-tools/mii-process-feasibility-test-data-generator/bundle/*.xml
/mii-process-feasibility-tools/mii-process-feasibility-test-data-generator/cert/*/
/mii-process-feasibility-tools/mii-process-feasibility-test-data-generator/cert/*.txt
/mii-process-feasibility-tools/mii-process-feasibility-test-data-generator/config/*.properties
/mii-process-feasibility-tools/mii-process-feasibility-test-data-generator/target/

/docker/bpe/plugin/*.jar
/docker/bpe/process/*.jar
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ mvn clean package

## Usage

You can test the processes by following the [README](feasibility-dsf-process-docker-test-setup/README.md) in
the `feasibility-dsf-process-docker-test-setup` directory.
You can test the processes by following the [README](mii-process-feasibility-docker-test-setup/README.md) in
the `mii-process-feasibility-docker-test-setup` directory.

## Edit
You should edit the *.bpmn files only with the standalone Camunda Modeller, because of different
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ After that, you can query the [CapabilityStatement][1] of the inbox:

```sh
curl \
--cacert ../feasibility-dsf-process-tools/feasibility-dsf-process-test-data-generator/cert/ca/testca_certificate.pem \
--cacert ../mii-process-feasibility-tools/mii-process-feasibility-test-data-generator/cert/ca/testca_certificate.pem \
--cert-type P12 \
--cert ../feasibility-dsf-process-tools/feasibility-dsf-process-test-data-generator/cert/Webbrowser_Test_User/Webbrowser_Test_User_certificate.p12:password \
--cert ../mii-process-feasibility-tools/mii-process-feasibility-test-data-generator/cert/Webbrowser_Test_User/Webbrowser_Test_User_certificate.p12:password \
-H accept:application/fhir+json \
-s https://zars/fhir/metadata |\
jq '.software, .implementation'
Expand All @@ -73,9 +73,9 @@ The following command should return the CapabilityStatement:

```sh
curl \
--cacert ../feasibility-dsf-process-tools/feasibility-dsf-process-test-data-generator/cert/ca/testca_certificate.pem \
--cacert ../mii-process-feasibility-tools/mii-process-feasibility-test-data-generator/cert/ca/testca_certificate.pem \
--cert-type P12 \
--cert ../feasibility-dsf-process-tools/feasibility-dsf-process-test-data-generator/cert/Webbrowser_Test_User/Webbrowser_Test_User_certificate.p12:password \
--cert ../mii-process-feasibility-tools/mii-process-feasibility-test-data-generator/cert/Webbrowser_Test_User/Webbrowser_Test_User_certificate.p12:password \
-H accept:application/fhir+json \
-s https://dic-1/fhir/metadata |\
jq '.software, .implementation'
Expand All @@ -93,9 +93,9 @@ After that we can POST the first Task to the ZARS:

```sh
curl \
--cacert ../feasibility-dsf-process-tools/feasibility-dsf-process-test-data-generator/cert/ca/testca_certificate.pem \
--cacert ../mii-process-feasibility-tools/mii-process-feasibility-test-data-generator/cert/ca/testca_certificate.pem \
--cert-type P12 \
--cert ../feasibility-dsf-process-tools/feasibility-dsf-process-test-data-generator/cert/Webbrowser_Test_User/Webbrowser_Test_User_certificate.p12:password \
--cert ../mii-process-feasibility-tools/mii-process-feasibility-test-data-generator/cert/Webbrowser_Test_User/Webbrowser_Test_User_certificate.p12:password \
-H accept:application/fhir+json \
-H content-type:application/fhir+json \
-d @data/feasibility-bundle.json \
Expand All @@ -107,9 +107,9 @@ After exporting the Task ID to $TASK_ID, you can fetch the task:

```sh
curl \
--cacert ../feasibility-dsf-process-tools/feasibility-dsf-process-test-data-generator/cert/ca/testca_certificate.pem \
--cacert ../mii-process-feasibility-tools/mii-process-feasibility-test-data-generator/cert/ca/testca_certificate.pem \
--cert-type P12 \
--cert ../feasibility-dsf-process-tools/feasibility-dsf-process-test-data-generator/cert/Webbrowser_Test_User/Webbrowser_Test_User_certificate.p12:password \
--cert ../mii-process-feasibility-tools/mii-process-feasibility-test-data-generator/cert/Webbrowser_Test_User/Webbrowser_Test_User_certificate.p12:password \
-H accept:application/fhir+json \
-s "https://zars/fhir/Task/${TASK_ID}" |\
jq .
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ set -e

BASE_DIR="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"

mvn -f ../feasibility-dsf-process/pom.xml clean package
mvn -f ../feasibility-dsf-process-tools/feasibility-dsf-process-test-data-generator/pom.xml clean package
mvn -f ../mii-process-feasibility/pom.xml clean package
mvn -f ../mii-process-feasibility-tools/mii-process-feasibility-test-data-generator/pom.xml clean package

# Create a self signed CA
openssl req -x509 -sha256 -days 365 -nodes -newkey rsa:2048 -keyout ${BASE_DIR}/secrets/dic_3_store_proxy_self_signed_ca_key.pem \
Expand Down Expand Up @@ -41,4 +41,4 @@ rm -f ${BASE_DIR}/secrets/dic_3_store_proxy_self_signed_ca.srl

# Bundle Proxy Certificates
cat ${BASE_DIR}/secrets/dic_3_store_proxy_cert.pem > ${BASE_DIR}/secrets/dic_3_store_proxy_cert_bundle.pem
cat ${BASE_DIR}/secrets/dic_3_store_proxy_self_signed_ca.pem >> ${BASE_DIR}/secrets/dic_3_store_proxy_cert_bundle.pem
cat ${BASE_DIR}/secrets/dic_3_store_proxy_self_signed_ca.pem >> ${BASE_DIR}/secrets/dic_3_store_proxy_cert_bundle.pem
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<artifactId>feasibility-dsf-process-test-data-generator</artifactId>
<artifactId>mii-process-feasibility-test-data-generator</artifactId>

<parent>
<groupId>de.medizininformatik-initiative</groupId>
<artifactId>feasibility-dsf-process-tools</artifactId>
<artifactId>mii-process-feasibility-tools</artifactId>
<version>0.0.0.0</version>
</parent>

<name>MII Feasibility Process Test Data Generator</name>
<name>MII Process Feasibility Test Data Generator</name>

<dependencies>
<dependency>
Expand Down Expand Up @@ -59,7 +59,7 @@
<arguments>
<argument>-classpath</argument>
<classpath/>
<argument>de.medizininformatik_initiative.feasibility_dsf_process.tools.generator.TestDataGenerator
<argument>de.medizininformatik_initiative.process.feasibility.tools.generator.TestDataGenerator
</argument>
</arguments>
<workingDirectory>${project.basedir}</workingDirectory>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package de.medizininformatik_initiative.feasibility_dsf_process.tools.generator;
package de.medizininformatik_initiative.process.feasibility.tools.generator;

import ca.uhn.fhir.context.FhirContext;
import ca.uhn.fhir.parser.IParser;
Expand Down Expand Up @@ -159,23 +159,23 @@ private void createDockerTestZarsBundle(Map<String, CertificateGenerator.Certifi
}

public void copyDockerTestBundles() {
Path dic1BundleFile = Paths.get("../../feasibility-dsf-process-docker-test-setup/dic-1/fhir/conf/bundle.xml");
Path dic1BundleFile = Paths.get("../../mii-process-feasibility-docker-test-setup/dic-1/fhir/conf/bundle.xml");
logger.info("Copying fhir bundle to {}", dic1BundleFile);
writeBundle(dic1BundleFile, dic1Bundle);

Path dic2BundleFile = Paths.get("../../feasibility-dsf-process-docker-test-setup/dic-2/fhir/conf/bundle.xml");
Path dic2BundleFile = Paths.get("../../mii-process-feasibility-docker-test-setup/dic-2/fhir/conf/bundle.xml");
logger.info("Copying fhir bundle to {}", dic2BundleFile);
writeBundle(dic2BundleFile, dic2Bundle);

Path dic3BundleFile = Paths.get("../../feasibility-dsf-process-docker-test-setup/dic-3/fhir/conf/bundle.xml");
Path dic3BundleFile = Paths.get("../../mii-process-feasibility-docker-test-setup/dic-3/fhir/conf/bundle.xml");
logger.info("Copying fhir bundle to {}", dic3BundleFile);
writeBundle(dic3BundleFile, dic3Bundle);

Path dic4BundleFile = Paths.get("../../feasibility-dsf-process-docker-test-setup/dic-4/fhir/conf/bundle.xml");
Path dic4BundleFile = Paths.get("../../mii-process-feasibility-docker-test-setup/dic-4/fhir/conf/bundle.xml");
logger.info("Copying fhir bundle to {}", dic4BundleFile);
writeBundle(dic4BundleFile, dic4Bundle);

Path zarsBundleFile = Paths.get("../../feasibility-dsf-process-docker-test-setup/zars/fhir/conf/bundle.xml");
Path zarsBundleFile = Paths.get("../../mii-process-feasibility-docker-test-setup/zars/fhir/conf/bundle.xml");
logger.info("Copying fhir bundle to {}", zarsBundleFile);
writeBundle(zarsBundleFile, zarsBundle);

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package de.medizininformatik_initiative.feasibility_dsf_process.tools.generator;
package de.medizininformatik_initiative.process.feasibility.tools.generator;

import com.google.common.collect.Streams;
import de.rwh.utils.crypto.CertificateAuthority;
Expand Down Expand Up @@ -395,7 +395,7 @@ private byte[] calculateSha512CertificateThumbprint(X509Certificate certificate)
}

public void copyDockerTestClientCerts() {
Path baseFolder = Paths.get("../../feasibility-dsf-process-docker-test-setup");
Path baseFolder = Paths.get("../../mii-process-feasibility-docker-test-setup");

Arrays.stream(CLIENT_COMMON_NAMES).filter(cn -> !cn.equals("Webbrowser Test User"))
.forEach(cn -> copyDockerTestClientCertFiles(baseFolder.resolve("secrets").toString(), cn));
Expand All @@ -419,15 +419,15 @@ private void copyDockerTestClientCertFiles(String folder, String commonName) {
}

public void copyDockerTestServerCert() {
Path baseFolder = Paths.get("../../feasibility-dsf-process-docker-test-setup");
Path baseFolder = Paths.get("../../mii-process-feasibility-docker-test-setup");

final X509Certificate testCaCertificate = ca.getCertificate();

Path testCaCertificateFile = baseFolder.resolve("secrets/proxy_trusted_client_cas.pem");
logger.info("Copying Test CA certificate file to {}", testCaCertificateFile);
writeCertificate(testCaCertificateFile, testCaCertificate);

copyDockerTestServerCertFiles("../../feasibility-dsf-process-docker-test-setup/secrets");
copyDockerTestServerCertFiles("../../mii-process-feasibility-docker-test-setup/secrets");
}

private void copyDockerTestServerCertFiles(String folder) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package de.medizininformatik_initiative.feasibility_dsf_process.tools.generator;
package de.medizininformatik_initiative.process.feasibility.tools.generator;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down Expand Up @@ -89,7 +89,7 @@ public void generateAndWriteDockerTestFhirEnvFiles(Map<String, CertificateGenera

new EnvEntry("WEBBROWSER_TEST_USER_THUMBPRINT", webBrowserTestUserThumbprint));

writeEnvFile(Paths.get("../../feasibility-dsf-process-docker-test-setup/.env"), entries);
writeEnvFile(Paths.get("../../mii-process-feasibility-docker-test-setup/.env"), entries);
}

private Stream<String> filterAndMapToThumbprint(Map<String, CertificateGenerator.CertificateFiles> clientCertificateFilesByCommonName,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package de.medizininformatik_initiative.feasibility_dsf_process.tools.generator;
package de.medizininformatik_initiative.process.feasibility.tools.generator;

import de.medizininformatik_initiative.feasibility_dsf_process.tools.generator.CertificateGenerator.CertificateFiles;
import de.medizininformatik_initiative.process.feasibility.tools.generator.CertificateGenerator.CertificateFiles;
import de.rwh.utils.crypto.CertificateAuthority;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<artifactId>feasibility-dsf-process-tools</artifactId>
<artifactId>mii-process-feasibility-tools</artifactId>
<packaging>pom</packaging>

<parent>
<groupId>de.medizininformatik-initiative</groupId>
<artifactId>feasibility-dsf-process-parent</artifactId>
<artifactId>mii-process-feasibility-parent</artifactId>
<version>0.0.0.0</version>
</parent>

<modules>
<module>feasibility-dsf-process-test-data-generator</module>
<module>mii-process-feasibility-test-data-generator</module>
</modules>

<name>MII Feasibility Process Tools</name>
<name>MII Process Feasibility Tools</name>

<dependencyManagement>
<dependencies>
Expand Down
File renamed without changes.
Loading

0 comments on commit 6edf011

Please sign in to comment.