Merge remote-tracking branch 'origin/release/0.3.0'

.github/workflows/maven.yml

@@ -17,4 +17,4 @@ jobs:
       with:
         java-version: 11
     - name: Build with Maven
-      run: mvn -B package --file pom.xml
+      run: mvn -B verify --file pom.xml

.gitignore

@@ -1,5 +1,69 @@
-/.project
-/.settings/
-/.idea
-/*.ipr
-/*.iws
+###
+# dsf common ignores
+###
+**/.classpath
+**/.project
+**/.idea/
+**/.settings/
+**/target/
+
+**/*.iml
+
+###
+# dsf-bpe ignores
+###
+dsf-bpe/dsf-bpe-server-jetty/docker/dsf_bpe.jar
+dsf-bpe/dsf-bpe-server-jetty/docker/lib/*.jar
+dsf-bpe/dsf-bpe-server-jetty/docker/plugin/*.jar
+
+###
+# dsf-fhir ignores
+###
+dsf-fhir/dsf-fhir-server-jetty/conf/bundle.xml
+dsf-fhir/dsf-fhir-server-jetty/conf/config.properties
+dsf-fhir/dsf-fhir-server-jetty/docker/dsf_fhir.jar
+dsf-fhir/dsf-fhir-server-jetty/docker/lib/*.jar
+
+###
+# dsf-docker-test-setup ignores
+###
+dsf-docker-test-setup/bpe/app/conf/*.p12
+dsf-docker-test-setup/bpe/app/last_event/time.file
+dsf-docker-test-setup/bpe/app/log/*.log
+dsf-docker-test-setup/bpe/app/log/*.log.gz
+dsf-docker-test-setup/bpe/app/plugin/*.jar
+dsf-docker-test-setup/bpe/db/postgres-data/
+dsf-docker-test-setup/bpe/proxy/ssl/*.pem
+
+dsf-docker-test-setup/fhir/app/conf/*.p12
+dsf-docker-test-setup/fhir/app/conf/bundle.xml
+dsf-docker-test-setup/fhir/app/conf/config.properties
+dsf-docker-test-setup/fhir/app/log/*.log
+dsf-docker-test-setup/fhir/app/log/*.log.gz
+dsf-docker-test-setup/fhir/db/postgres-data/
+dsf-docker-test-setup/fhir/proxy/ssl/*.pem
+
+###
+# dsf-docker-test-setup-3medic-ttp ignores
+###
+dsf-docker-test-setup-3medic-ttp/**/bpe/app/conf/*.p12
+dsf-docker-test-setup-3medic-ttp/**/bpe/app/conf/config.properties
+dsf-docker-test-setup-3medic-ttp/**/bpe/app/plugin/*.jar
+dsf-docker-test-setup-3medic-ttp/**/bpe/proxy/ssl/*.pem
+
+dsf-docker-test-setup-3medic-ttp/**/fhir/app/conf/*.p12
+dsf-docker-test-setup-3medic-ttp/**/fhir/app/conf/bundle.xml
+dsf-docker-test-setup-3medic-ttp/**/fhir/app/conf/config.properties
+dsf-docker-test-setup-3medic-ttp/**/fhir/proxy/ssl/*.pem
+
+###
+# dsf-tools ignores
+###
+dsf-tools/dsf-tools-test-data-generator/bundle/*.xml
+
+dsf-tools/dsf-tools-test-data-generator/cert/**/*.pem
+dsf-tools/dsf-tools-test-data-generator/cert/**/*.csr
+dsf-tools/dsf-tools-test-data-generator/cert/**/*.p12
+dsf-tools/dsf-tools-test-data-generator/cert/thumbprints.txt
+
+dsf-tools/dsf-tools-test-data-generator/config/*.properties

dsf-bpe/dsf-bpe-process-base/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.highmed.dsf</groupId>
 		<artifactId>dsf-bpe-pom</artifactId>
-		<version>0.2.1</version>
+		<version>0.3.0</version>
 	</parent>
 
 	<dependencies>
@@ -17,7 +17,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.highmed.dsf</groupId>
-			<artifactId>dsf-openehr-webservice-client</artifactId>
+			<artifactId>dsf-openehr-client</artifactId>
 		</dependency>
 
 		<dependency>

dsf-bpe/dsf-bpe-process-base/src/main/java/org/highmed/dsf/bpe/ConstantsBase.java

@@ -0,0 +1,45 @@
+package org.highmed.dsf.bpe;
+
+import org.hl7.fhir.r4.model.CodeType;
+
+public interface ConstantsBase
+{
+	String VARIABLE_MESSAGE_NAME = "messageName";
+	String VARIABLE_PROCESS_DEFINITION_KEY = "processDefinitionKey";
+	String VARIABLE_VERSION_TAG = "versionTag";
+	String VARIABLE_PROFILE = "profile";
+	// String VARIABLE_TARGET_ORGANIZATION_ID = "targetOrganizationId";
+	// String VARIABLE_CORRELATION_KEY = "correlationKey";
+	String VARIABLE_MULTI_INSTANCE_TARGET = "multiInstanceTarget";
+	String VARIABLE_MULTI_INSTANCE_TARGETS = "multiInstanceTargets";
+	String VARIABLE_TASK = "task";
+	String VARIABLE_LEADING_TASK = "leadingTask";
+	String VARIABLE_BUNDLE_ID = "bundleId";
+	String VARIABLE_QUERY_PARAMETERS = "queryParameters";
+	String VARIABLE_TTP_IDENTIFIER = "ttp";
+
+	/**
+	 * Used to distinguish if I am at the moment in a process called by another process by a CallActivity or not
+	 */
+	String VARIABLE_IN_CALLED_PROCESS = "inCalledProcess";
+
+	String CODESYSTEM_HIGHMED_BPMN = "http://highmed.org/fhir/CodeSystem/bpmn-message";
+	String CODESYSTEM_HIGHMED_BPMN_VALUE_MESSAGE_NAME = "message-name";
+	String CODESYSTEM_HIGHMED_BPMN_VALUE_BUSINESS_KEY = "business-key";
+	String CODESYSTEM_HIGHMED_BPMN_VALUE_CORRELATION_KEY = "correlation-key";
+	String CODESYSTEM_HIGHMED_BPMN_VALUE_ERROR_MESSAGE = "error";
+
+	String PROCESS_URI_BASE = "http://highmed.org/bpe/Process/";
+
+	String ORGANIZATION_IDENTIFIER_SYSTEM = "http://highmed.org/fhir/NamingSystem/organization-identifier";
+	String ORGANIZATION_TYPE_SYSTEM = "http://highmed.org/fhir/CodeSystem/organization-type";
+	String ORGANIZATION_TYPE_TTP = "TTP";
+	String ENDPOINT_IDENTIFIER_SYSTEM = "http://highmed.org/fhir/NamingSystem/endpoint-identifier";
+
+	String EXTENSION_QUERY_URI = "http://highmed.org/fhir/StructureDefinition/query";
+	String CODESYSTEM_QUERY_TYPE = "http://highmed.org/fhir/CodeSystem/query-type";
+	String CODESYSTEM_QUERY_TYPE_AQL = "application/x-aql-query";
+	CodeType AQL_QUERY_TYPE = new CodeType(CODESYSTEM_QUERY_TYPE_AQL).setSystem(CODESYSTEM_QUERY_TYPE);
+
+	String OPENEHR_MIMETYPE_JSON = "application/json";
+}