Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/release/0.3.1' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
hhund committed Jun 3, 2021
2 parents 9e561fd + d93daab commit 2037952
Show file tree
Hide file tree
Showing 30 changed files with 39 additions and 39 deletions.
2 changes: 1 addition & 1 deletion codex-process-data-transfer/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>de.netzwerk-universitaetsmedizin.codex</groupId>
<artifactId>codex-processes-ap1</artifactId>
<version>0.3.0</version>
<version>0.3.1</version>
</parent>

<properties>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

public class DataTransferProcessPluginDefinition implements ProcessPluginDefinition
{
public static final String VERSION = "0.3.0";
public static final String VERSION = "0.3.1";

@Override
public String getName()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="Definitions_18azqkl" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="4.2.0">
<bpmn:process id="dataReceive" isExecutable="true" camunda:versionTag="0.3.0">
<bpmn:process id="dataReceive" isExecutable="true" camunda:versionTag="0.3.1">
<bpmn:startEvent id="DataReceiveMessageStartEvent" name="start data receive process">
<bpmn:outgoing>Flow_1gyqorb</bpmn:outgoing>
<bpmn:messageEventDefinition id="MessageEventDefinition_1qwi1k6" messageRef="Message_157qpi8" />
Expand Down
4 changes: 2 additions & 2 deletions codex-process-data-transfer/src/main/resources/bpe/send.bpmn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_008keuw" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="4.8.1">
<bpmn:process id="dataSend" isExecutable="true" camunda:versionTag="0.3.0">
<bpmn:process id="dataSend" isExecutable="true" camunda:versionTag="0.3.1">
<bpmn:startEvent id="DataSendMessageStartEvent" name="start data send process">
<bpmn:outgoing>Flow_1km61ly</bpmn:outgoing>
<bpmn:messageEventDefinition id="MessageEventDefinition_07sumgd" messageRef="Message_0mcjkpi" />
Expand All @@ -21,7 +21,7 @@
<bpmn:extensionElements>
<camunda:inputOutput>
<camunda:inputParameter name="processDefinitionKey">dataTranslate</camunda:inputParameter>
<camunda:inputParameter name="versionTag">0.3.0</camunda:inputParameter>
<camunda:inputParameter name="versionTag">0.3.1</camunda:inputParameter>
<camunda:inputParameter name="messageName">startDataTranslate</camunda:inputParameter>
<camunda:inputParameter name="profile">http://www.netzwerk-universitaetsmedizin.de/fhir/StructureDefinition/task-start-data-translate</camunda:inputParameter>
</camunda:inputOutput>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="Definitions_1davgtw" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="4.2.0">
<bpmn:process id="dataTranslate" isExecutable="true" camunda:versionTag="0.3.0">
<bpmn:process id="dataTranslate" isExecutable="true" camunda:versionTag="0.3.1">
<bpmn:startEvent id="DataTranslateMessageStartEvent" name="start data translate process">
<bpmn:outgoing>Flow_185r1m5</bpmn:outgoing>
<bpmn:messageEventDefinition id="MessageEventDefinition_0nqjzhp" messageRef="Message_1nly3ld" />
Expand All @@ -25,7 +25,7 @@
<bpmn:extensionElements>
<camunda:inputOutput>
<camunda:inputParameter name="processDefinitionKey">dataReceive</camunda:inputParameter>
<camunda:inputParameter name="versionTag">0.3.0</camunda:inputParameter>
<camunda:inputParameter name="versionTag">0.3.1</camunda:inputParameter>
<camunda:inputParameter name="messageName">startDataReceive</camunda:inputParameter>
<camunda:inputParameter name="profile">http://www.netzwerk-universitaetsmedizin.de/fhir/StructureDefinition/task-start-data-receive</camunda:inputParameter>
</camunda:inputOutput>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="Definitions_1bd6yss" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="4.8.1">
<bpmn:process id="dataTrigger" isExecutable="true" camunda:versionTag="0.3.0">
<bpmn:process id="dataTrigger" isExecutable="true" camunda:versionTag="0.3.1">
<bpmn:serviceTask id="FindNewData" name="find new data" camunda:class="de.netzwerk_universitaetsmedizin.codex.processes.data_transfer.service.FindNewData">
<bpmn:incoming>Flow_0jy9ipp</bpmn:incoming>
<bpmn:outgoing>Flow_0xlfzol</bpmn:outgoing>
Expand All @@ -9,7 +9,7 @@
<bpmn:extensionElements>
<camunda:inputOutput>
<camunda:inputParameter name="processDefinitionKey">dataSend</camunda:inputParameter>
<camunda:inputParameter name="versionTag">0.3.0</camunda:inputParameter>
<camunda:inputParameter name="versionTag">0.3.1</camunda:inputParameter>
<camunda:inputParameter name="messageName">startDataSend</camunda:inputParameter>
<camunda:inputParameter name="profile">http://www.netzwerk-universitaetsmedizin.de/fhir/StructureDefinition/task-start-data-send</camunda:inputParameter>
</camunda:inputOutput>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<!-- status managed by bpe -->
<status value="unknown" />
<experimental value="false" />
<date value="2021-06-02" />
<date value="2021-06-03" />
<publisher value="NUM-CODEX" />
<contact>
<name value="NUM-CODEX" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<!-- status managed by bpe -->
<status value="unknown" />
<experimental value="false" />
<date value="2021-06-02" />
<date value="2021-06-03" />
<publisher value="NUM-CODEX" />
<contact>
<name value="NUM-CODEX" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<!-- status managed by bpe -->
<status value="unknown" />
<experimental value="false" />
<date value="2021-06-02" />
<date value="2021-06-03" />
<publisher value="NUM-CODEX" />
<contact>
<name value="NUM-CODEX" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
<!-- status managed by bpe -->
<status value="unknown" />
<experimental value="false" />
<date value="2021-06-02" />
<date value="2021-06-03" />
<publisher value="NUM-CODEX" />
<contact>
<name value="NUM-CODEX" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<!-- status managed by bpe -->
<status value="unknown" />
<experimental value="false" />
<date value="2021-06-02" />
<date value="2021-06-03" />
<publisher value="NUM-CODEX" />
<description value="CodeSystem with standard values for the NUM-CODEX data-transfer processes" />
<caseSensitive value="true" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<name value="NUM-CODEX_Bloom-Filter_Identifier"/>
<status value="active" />
<kind value="identifier"/>
<date value="2021-06-02"/>
<date value="2021-06-03"/>
<publisher value="NUM-Codex"/>
<responsible value="THS Greifswald"/>
<description value="Bloom Filter"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<name value="NUM-CODEX_CRR_Pseudonym_Identifier"/>
<status value="active" />
<kind value="identifier"/>
<date value="2021-06-02"/>
<date value="2021-06-03"/>
<publisher value="NUM-Codex"/>
<responsible value="THS Greifswald"/>
<description value="CODEX specific pseudonym"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
<name value="NUM-CODEX_DIC_Pseudonym_Identifier"/>
<status value="active" />
<kind value="identifier"/>
<date value="2021-06-02"/>
<date value="2021-06-03"/>
<publisher value="NUM-Codex"/>
<responsible value="THS Greifswald"/>
<description value="DIZ specific pseudonym"/>
<usage value="Used withing the NUM-CODEX project for data integration center pseudonyms"/>
<uniqueId>
<type value="other"/>
<value value="http://netzwerk-universitaetsmedizin.de/sid/dic-pseudonym"/>
<value value="http://www.netzwerk-universitaetsmedizin.de/sid/dic-pseudonym"/>
</uniqueId>
</NamingSystem>
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<name value="TaskStartDataReceive" />
<status value="unknown" />
<experimental value="false" />
<date value="2021-06-02" />
<date value="2021-06-03" />
<fhirVersion value="4.0.1" />
<kind value="resource" />
<abstract value="false" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<name value="TaskStartDataSend" />
<status value="unknown" />
<experimental value="false" />
<date value="2021-06-02" />
<date value="2021-06-03" />
<fhirVersion value="4.0.1" />
<kind value="resource" />
<abstract value="false" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<name value="TaskStartDataTranslate" />
<status value="unknown" />
<experimental value="false" />
<date value="2021-06-02" />
<date value="2021-06-03" />
<fhirVersion value="4.0.1" />
<kind value="resource" />
<abstract value="false" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<name value="TaskStartDataTrigger" />
<status value="unknown" />
<experimental value="false" />
<date value="2021-06-02" />
<date value="2021-06-03" />
<fhirVersion value="4.0.1" />
<kind value="resource" />
<abstract value="false" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<name value="TaskStopDataTrigger" />
<status value="unknown" />
<experimental value="false" />
<date value="2021-06-02" />
<date value="2021-06-03" />
<fhirVersion value="4.0.1" />
<kind value="resource" />
<abstract value="false" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<!-- status managed by bpe -->
<status value="unknown" />
<experimental value="false"/>
<date value="2021-06-02"/>
<date value="2021-06-03"/>
<publisher value="NUM-CODEX"/>
<description value="CodeSystem with standard values for the NUM-CODEX data-transfer processes"/>
<immutable value="true"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<meta>
<profile value="http://www.netzwerk-universitaetsmedizin.de/fhir/StructureDefinition/task-start-data-send"/>
</meta>
<instantiatesUri value="http://highmed.org/bpe/Process/dataSend/0.3.0"/>
<instantiatesUri value="http://highmed.org/bpe/Process/dataSend/0.3.1"/>
<status value="requested"/>
<intent value="order"/>
<authoredOn value="2021-04-07T12:30:00+01:00"/>
Expand Down Expand Up @@ -54,7 +54,7 @@
<code value="export-to"/>
</coding>
</type>
<valueInstant value="2021-04-07T12:30:00+01:00"/>
<valueInstant value="2021-06-03T34:46:00+01:00"/>
</input>
<!-- optional parameter specifying GECCO resources should be send starting
at the defined date, resources older than the specified date will not be
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<meta>
<profile value="http://www.netzwerk-universitaetsmedizin.de/fhir/StructureDefinition/task-start-data-send"/>
</meta>
<instantiatesUri value="http://highmed.org/bpe/Process/dataSend/0.3.0"/>
<instantiatesUri value="http://highmed.org/bpe/Process/dataSend/0.3.1"/>
<status value="requested"/>
<intent value="order"/>
<authoredOn value="2021-04-07T12:30:00+01:00"/>
<authoredOn value="2021-06-03T23:46:00+01:00"/>
<requester>
<type value="Organization"/>
<identifier>
Expand Down Expand Up @@ -43,7 +43,7 @@
</type>
<valueReference>
<identifier>
<system value="http://www.netzwerk-universitaetsmedizin.de/fhir/NamingSystem/dic-pseudonym"/>
<system value="http://www.netzwerk-universitaetsmedizin.de/sid/dic-pseudonym"/>
<value value="source/original"/>
</identifier>
</valueReference>
Expand All @@ -58,7 +58,7 @@
<code value="export-to"/>
</coding>
</type>
<valueInstant value="2021-04-07T12:30:00+01:00"/>
<valueInstant value="2021-06-03T23:46:00+01:00"/>
</input>
<!-- optional parameter specifying GECCO resources should be send starting
at the defined date, resources older than the specified date will not be
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<meta>
<profile value="http://www.netzwerk-universitaetsmedizin.de/fhir/StructureDefinition/task-start-data-trigger"/>
</meta>
<instantiatesUri value="http://highmed.org/bpe/Process/dataTrigger/0.3.0"/>
<instantiatesUri value="http://highmed.org/bpe/Process/dataTrigger/0.3.1"/>
<status value="requested"/>
<intent value="order"/>
<authoredOn value="2021-04-07T12:30:00+01:00"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<meta>
<profile value="http://www.netzwerk-universitaetsmedizin.de/fhir/StructureDefinition/task-stop-data-trigger"/>
</meta>
<instantiatesUri value="http://highmed.org/bpe/Process/dataTrigger/0.3.0"/>
<instantiatesUri value="http://highmed.org/bpe/Process/dataTrigger/0.3.1"/>
<status value="requested"/>
<intent value="order"/>
<authoredOn value="2021-04-07T12:30:00+01:00"/>
Expand Down
4 changes: 2 additions & 2 deletions codex-processes-ap1-docker-test-setup/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ docker-compose up -d crr-bpe-app crr-bpe-db && docker-compose logs -f crr-fhir-a
````
Webbrowser at http://localhost:8003/: Add Demo Data to DIC HAPI FHIR Server via Transaction-Bundle at
[dic_fhir_store_demo_psn.json](codex-process-data-transfer/src/test/resources/fhir/Bundle/dic_fhir_store_demo_psn.json) or
[dic_fhir_store_demo_bf.json](codex-process-data-transfer/src/test/resources/fhir/Bundle/dic_fhir_store_demo_bf.json)
[dic_fhir_store_demo_psn.json](../codex-process-data-transfer/src/test/resources/fhir/Bundle/dic_fhir_store_demo_psn.json) or
[dic_fhir_store_demo_bf.json](../codex-process-data-transfer/src/test/resources/fhir/Bundle/dic_fhir_store_demo_bf.json)
*Start curl command from root-folder:* `codex-processes-ap1`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ org.highmed.dsf.bpe.fhir.task.subscription.lastEventTimeFile=last_event/time.fil
#org.highmed.dsf.bpe.mpi.pdq.assigningAuthority.namespaceId=
#org.highmed.dsf.bpe.mpi.pdq.assigningAuthority.universalId=

org.highmed.dsf.bpe.process.excluded=dataTrigger/0.3.0,dataSend/0.3.0,dataTranslate/0.3.0
org.highmed.dsf.bpe.process.excluded=dataTrigger/0.3.1,dataSend/0.3.1,dataTranslate/0.3.1
#org.highmed.dsf.bpe.process.retired=
#org.highmed.dsf.bpe.process_plugin_directroy=process

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ org.highmed.dsf.bpe.fhir.task.subscription.lastEventTimeFile=last_event/time.fil
#org.highmed.dsf.bpe.mpi.pdq.assigningAuthority.namespaceId=
#org.highmed.dsf.bpe.mpi.pdq.assigningAuthority.universalId=

org.highmed.dsf.bpe.process.excluded=dataTranslate/0.3.0,dataReceive/0.3.0
org.highmed.dsf.bpe.process.excluded=dataTranslate/0.3.1,dataReceive/0.3.1
#org.highmed.dsf.bpe.process.retired=
#org.highmed.dsf.bpe.process_plugin_directroy=process

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ org.highmed.dsf.bpe.fhir.task.subscription.lastEventTimeFile=last_event/time.fil
#org.highmed.dsf.bpe.mpi.pdq.assigningAuthority.namespaceId=
#org.highmed.dsf.bpe.mpi.pdq.assigningAuthority.universalId=

org.highmed.dsf.bpe.process.excluded=dataTrigger/0.3.0,dataSend/0.3.0,dataReceive/0.3.0
org.highmed.dsf.bpe.process.excluded=dataTrigger/0.3.1,dataSend/0.3.1,dataReceive/0.3.1
#org.highmed.dsf.bpe.process.retired=
#org.highmed.dsf.bpe.process_plugin_directroy=process

Expand Down
2 changes: 1 addition & 1 deletion codex-processes-ap1-test-data-generator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>de.netzwerk-universitaetsmedizin.codex</groupId>
<artifactId>codex-processes-ap1</artifactId>
<version>0.3.0</version>
<version>0.3.1</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>de.netzwerk-universitaetsmedizin.codex</groupId>
<artifactId>codex-processes-ap1</artifactId>
<version>0.3.0</version>
<version>0.3.1</version>
<packaging>pom</packaging>

<modules>
Expand Down

0 comments on commit 2037952

Please sign in to comment.