Skip to content

Commit 8067e69

Browse files
hhundhhund
committed
Merge remote-tracking branch 'origin/issue/397_Fix_2.0.0-RC2_Bugs' into
develop_2
2 parents e61aac9 + b886931 commit 8067e69

File tree

77 files changed

+2250
-244
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+2250
-244
lines changed

‎.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ cert/**
1616
###
1717
# dsf-bpe ignores
1818
###
19+
dsf-bpe/dsf-bpe-process-api-v1/dependency-reduced-pom.xml
20+
dsf-bpe/dsf-bpe-process-api-v1-operaton/dependency-reduced-pom.xml
1921
dsf-bpe/dsf-bpe-server-jetty/cert/*.crt
2022
dsf-bpe/dsf-bpe-server-jetty/cert/*.key
2123
dsf-bpe/dsf-bpe-server-jetty/conf/config.properties
@@ -52,6 +54,7 @@ dsf-docker-dev-setup/bpe/secrets/ca_chain.crt
5254
dsf-docker-dev-setup/bpe/secrets/issuing_ca.crt
5355
dsf-docker-dev-setup/bpe/secrets/root_ca.crt
5456
dsf-docker-dev-setup/bpe/.env
57+
dsf-docker-dev-setup/bpe/docker-compose.override.yml
5558

5659
dsf-docker-dev-setup/fhir/log/*.log
5760
dsf-docker-dev-setup/fhir/log/*.log.gz
@@ -63,6 +66,7 @@ dsf-docker-dev-setup/fhir/secrets/fhir.key.plain
6366
dsf-docker-dev-setup/fhir/secrets/issuing_ca.crt
6467
dsf-docker-dev-setup/fhir/secrets/root_ca.crt
6568
dsf-docker-dev-setup/fhir/.env
69+
dsf-docker-dev-setup/fhir/docker-compose.override.yml
6670

6771
###
6872
# dsf-docker-dev-setup-3dic-ttp ignores

‎dsf-bpe/dsf-bpe-process-api-v1-base/pom.xml‎

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
<!--
2+
3+
Copyright 2018-2025 Heilbronn University of Applied Sciences
4+
5+
Licensed under the Apache License, Version 2.0 (the "License");
6+
you may not use this file except in compliance with the License.
7+
You may obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
See the License for the specific language governing permissions and
15+
limitations under the License.
16+
17+
-->
18+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
19+
<modelVersion>4.0.0</modelVersion>
20+
21+
<artifactId>dsf-bpe-process-api-v1-base</artifactId>
22+
23+
<parent>
24+
<groupId>dev.dsf</groupId>
25+
<artifactId>dsf-bpe-pom</artifactId>
26+
<version>2.0.0-SNAPSHOT</version>
27+
</parent>
28+
29+
<properties>
30+
<main.basedir>${project.parent.parent.basedir}</main.basedir>
31+
</properties>
32+
33+
<name>DSF BPE Process API v1 (Base)</name>
34+
35+
<dependencies>
36+
<dependency>
37+
<groupId>ca.uhn.hapi.fhir</groupId>
38+
<artifactId>hapi-fhir-structures-r4</artifactId>
39+
<version>${hapi.fhir.version.v1}</version>
40+
</dependency>
41+
<dependency>
42+
<groupId>org.springframework</groupId>
43+
<artifactId>spring-context</artifactId>
44+
</dependency>
45+
<dependency>
46+
<groupId>com.fasterxml.jackson.core</groupId>
47+
<artifactId>jackson-databind</artifactId>
48+
</dependency>
49+
<dependency>
50+
<groupId>com.sun.mail</groupId>
51+
<artifactId>jakarta.mail</artifactId>
52+
</dependency>
53+
<dependency>
54+
<artifactId>jakarta.ws.rs-api</artifactId>
55+
<groupId>jakarta.ws.rs</groupId>
56+
</dependency>
57+
58+
<!-- optional dependencies provided by the DSF bpe -->
59+
<dependency>
60+
<groupId>org.springframework</groupId>
61+
<artifactId>spring-web</artifactId>
62+
<optional>true</optional>
63+
</dependency>
64+
<dependency>
65+
<groupId>de.hs-heilbronn.mi</groupId>
66+
<artifactId>crypto-utils</artifactId>
67+
<version>${crypto-utils.version.v1}</version>
68+
<optional>true</optional>
69+
</dependency>
70+
<dependency>
71+
<groupId>ca.uhn.hapi.fhir</groupId>
72+
<artifactId>hapi-fhir-validation</artifactId>
73+
<version>${hapi.fhir.version.v1}</version>
74+
<optional>true</optional>
75+
<exclusions>
76+
<exclusion>
77+
<groupId>commons-logging</groupId>
78+
<artifactId>commons-logging</artifactId>
79+
</exclusion>
80+
</exclusions>
81+
</dependency>
82+
</dependencies>
83+
84+
<build>
85+
<plugins>
86+
<plugin>
87+
<groupId>org.apache.maven.plugins</groupId>
88+
<artifactId>maven-javadoc-plugin</artifactId>
89+
<configuration>
90+
<skip>true</skip>
91+
</configuration>
92+
</plugin>
93+
</plugins>
94+
</build>
95+
</project>

dsf-bpe/dsf-bpe-process-api-v1/src/main/java/dev/dsf/bpe/v1/ProcessPluginDefinition.java renamed to dsf-bpe/dsf-bpe-process-api-v1-base/src/main/java/dev/dsf/bpe/v1/ProcessPluginDefinition.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@
2929
import org.springframework.context.annotation.Configuration;
3030
import org.springframework.context.annotation.Scope;
3131

32-
import dev.dsf.bpe.v1.activity.AbstractServiceDelegate;
33-
import dev.dsf.bpe.v1.activity.AbstractTaskMessageSend;
34-
import dev.dsf.bpe.v1.activity.DefaultUserTaskListener;
3532
import dev.dsf.bpe.v1.documentation.ProcessDocumentation;
3633

3734
/**
@@ -146,9 +143,9 @@ default LocalDate getResourceReleaseDate()
146143
* plugin also add the {@link ProcessDocumentation} annotation.
147144
*
148145
* @return {@link Configuration} annotated classes, defining {@link Bean} annotated factory methods
149-
* @see AbstractServiceDelegate
150-
* @see AbstractTaskMessageSend
151-
* @see DefaultUserTaskListener
146+
* @see dev.dsf.bpe.v1.activity.AbstractServiceDelegate
147+
* @see dev.dsf.bpe.v1.activity.AbstractTaskMessageSend
148+
* @see dev.dsf.bpe.v1.activity.DefaultUserTaskListener
152149
* @see ConfigurableBeanFactory#SCOPE_PROTOTYPE
153150
*/
154151
List<Class<?>> getSpringConfigurations();

dsf-bpe/dsf-bpe-process-api-v1/src/main/java/dev/dsf/bpe/v1/ProcessPluginDeploymentStateListener.java renamed to dsf-bpe/dsf-bpe-process-api-v1-base/src/main/java/dev/dsf/bpe/v1/ProcessPluginDeploymentStateListener.java

File renamed without changes.

dsf-bpe/dsf-bpe-process-api-v1/src/main/java/dev/dsf/bpe/v1/config/ProxyConfig.java renamed to dsf-bpe/dsf-bpe-process-api-v1-base/src/main/java/dev/dsf/bpe/v1/config/ProxyConfig.java

File renamed without changes.

dsf-bpe/dsf-bpe-process-api-v1/src/main/java/dev/dsf/bpe/v1/constants/BpmnExecutionVariables.java renamed to dsf-bpe/dsf-bpe-process-api-v1-base/src/main/java/dev/dsf/bpe/v1/constants/BpmnExecutionVariables.java

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,12 @@
1515
*/
1616
package dev.dsf.bpe.v1.constants;
1717

18-
import dev.dsf.bpe.v1.activity.AbstractTaskMessageSend;
1918
import dev.dsf.bpe.v1.variables.Target;
20-
import dev.dsf.bpe.v1.variables.Variables;
2119

2220
/**
2321
* Defines names of standard process engine variables used by the bpe
2422
*
25-
* @see Variables
23+
* @see dev.dsf.bpe.v1.variables.Variables
2624
*/
2725
public final class BpmnExecutionVariables
2826
{
@@ -31,24 +29,24 @@ private BpmnExecutionVariables()
3129
}
3230

3331
/**
34-
* Values from the <code>target</code> variable are used to configure {@link AbstractTaskMessageSend} activities for
35-
* sending Task resource messages
32+
* Values from the <code>target</code> variable are used to configure
33+
* {@link dev.dsf.bpe.v1.activity.AbstractTaskMessageSend} activities for sending Task resource messages
3634
*
37-
* @see Variables#createTarget(String, String, String, String)
38-
* @see Variables#createTarget(String, String, String)
39-
* @see Variables#setTarget(dev.dsf.bpe.v1.variables.Target)
40-
* @see Variables#getTarget()
35+
* @see dev.dsf.bpe.v1.variables.Variables#createTarget(String, String, String, String)
36+
* @see dev.dsf.bpe.v1.variables.Variables#createTarget(String, String, String)
37+
* @see dev.dsf.bpe.v1.variables.Variables#setTarget(dev.dsf.bpe.v1.variables.Target)
38+
* @see dev.dsf.bpe.v1.variables.Variables#getTarget()
4139
*/
4240
public static final String TARGET = "target";
4341

4442
/**
4543
* The <code>targets</code> variable is typically used to iterate over {@link Target} variables in multi instance
4644
* send/receive tasks or multi instance subprocesses
4745
*
48-
* @see Variables#createTargets(java.util.List)
49-
* @see Variables#createTargets(dev.dsf.bpe.v1.variables.Target...)
50-
* @see Variables#setTargets(dev.dsf.bpe.v1.variables.Targets)
51-
* @see Variables#getTargets()
46+
* @see dev.dsf.bpe.v1.variables.Variables#createTargets(java.util.List)
47+
* @see dev.dsf.bpe.v1.variables.Variables#createTargets(dev.dsf.bpe.v1.variables.Target...)
48+
* @see dev.dsf.bpe.v1.variables.Variables#setTargets(dev.dsf.bpe.v1.variables.Targets)
49+
* @see dev.dsf.bpe.v1.variables.Variables#getTargets()
5250
*/
5351
public static final String TARGETS = "targets";
5452

@@ -63,10 +61,10 @@ private BpmnExecutionVariables()
6361
/**
6462
* Value of the <code>alternativeBusinessKey</code> variable is used to correlated incoming Task resource to a
6563
* waiting process instance if an alternative business-key was created for a communication target. See corresponding
66-
* <code>protected</code> method in {@link AbstractTaskMessageSend} on how to create and use an alternative
67-
* business-key.
64+
* <code>protected</code> method in {@link dev.dsf.bpe.v1.activity.AbstractTaskMessageSend} on how to create and use
65+
* an alternative business-key.
6866
*
69-
* @see AbstractTaskMessageSend
67+
* @see dev.dsf.bpe.v1.activity.AbstractTaskMessageSend
7068
*/
7169
public static final String ALTERNATIVE_BUSINESS_KEY = "alternativeBusinessKey";
7270
}

dsf-bpe/dsf-bpe-process-api-v1/src/main/java/dev/dsf/bpe/v1/constants/CodeSystems.java renamed to dsf-bpe/dsf-bpe-process-api-v1-base/src/main/java/dev/dsf/bpe/v1/constants/CodeSystems.java

File renamed without changes.

dsf-bpe/dsf-bpe-process-api-v1/src/main/java/dev/dsf/bpe/v1/constants/NamingSystems.java renamed to dsf-bpe/dsf-bpe-process-api-v1-base/src/main/java/dev/dsf/bpe/v1/constants/NamingSystems.java

File renamed without changes.

dsf-bpe/dsf-bpe-process-api-v1/src/main/java/dev/dsf/bpe/v1/documentation/ProcessDocumentation.java renamed to dsf-bpe/dsf-bpe-process-api-v1-base/src/main/java/dev/dsf/bpe/v1/documentation/ProcessDocumentation.java

File renamed without changes.

dsf-bpe/dsf-bpe-process-api-v1/src/main/java/dev/dsf/bpe/v1/service/EndpointProvider.java renamed to dsf-bpe/dsf-bpe-process-api-v1-base/src/main/java/dev/dsf/bpe/v1/service/EndpointProvider.java

File renamed without changes.

0 commit comments

Comments
 (0)