Issue/397 fix 2.0.0 rc2 bugs

.gitignore

@@ -16,6 +16,8 @@ cert/**
 ###
 # dsf-bpe ignores
 ###
+dsf-bpe/dsf-bpe-process-api-v1/dependency-reduced-pom.xml
+dsf-bpe/dsf-bpe-process-api-v1-operaton/dependency-reduced-pom.xml
 dsf-bpe/dsf-bpe-server-jetty/cert/*.crt
 dsf-bpe/dsf-bpe-server-jetty/cert/*.key
 dsf-bpe/dsf-bpe-server-jetty/conf/config.properties
@@ -52,6 +54,7 @@ dsf-docker-dev-setup/bpe/secrets/ca_chain.crt
 dsf-docker-dev-setup/bpe/secrets/issuing_ca.crt
 dsf-docker-dev-setup/bpe/secrets/root_ca.crt
 dsf-docker-dev-setup/bpe/.env
+dsf-docker-dev-setup/bpe/docker-compose.override.yml
 
 dsf-docker-dev-setup/fhir/log/*.log
 dsf-docker-dev-setup/fhir/log/*.log.gz
@@ -63,6 +66,7 @@ dsf-docker-dev-setup/fhir/secrets/fhir.key.plain
 dsf-docker-dev-setup/fhir/secrets/issuing_ca.crt
 dsf-docker-dev-setup/fhir/secrets/root_ca.crt
 dsf-docker-dev-setup/fhir/.env
+dsf-docker-dev-setup/fhir/docker-compose.override.yml
 
 ###
 # dsf-docker-dev-setup-3dic-ttp ignores

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

@@ -0,0 +1,95 @@
+<!--
+
+    Copyright 2018-2025 Heilbronn University of Applied Sciences
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<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">
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>dsf-bpe-process-api-v1-base</artifactId>
+
+	<parent>
+		<groupId>dev.dsf</groupId>
+		<artifactId>dsf-bpe-pom</artifactId>
+		<version>2.0.0-SNAPSHOT</version>
+	</parent>
+
+	<properties>
+		<main.basedir>${project.parent.parent.basedir}</main.basedir>
+	</properties>
+
+	<name>DSF BPE Process API v1 (Base)</name>
+
+	<dependencies>
+		<dependency>
+			<groupId>ca.uhn.hapi.fhir</groupId>
+			<artifactId>hapi-fhir-structures-r4</artifactId>
+			<version>${hapi.fhir.version.v1}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-context</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.sun.mail</groupId>
+			<artifactId>jakarta.mail</artifactId>
+		</dependency>
+		<dependency>
+			<artifactId>jakarta.ws.rs-api</artifactId>
+			<groupId>jakarta.ws.rs</groupId>
+		</dependency>
+
+		<!-- optional dependencies provided by the DSF bpe -->
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-web</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>de.hs-heilbronn.mi</groupId>
+			<artifactId>crypto-utils</artifactId>
+			<version>${crypto-utils.version.v1}</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>ca.uhn.hapi.fhir</groupId>
+			<artifactId>hapi-fhir-validation</artifactId>
+			<version>${hapi.fhir.version.v1}</version>
+			<optional>true</optional>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>

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

@@ -29,9 +29,6 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Scope;
 
-import dev.dsf.bpe.v1.activity.AbstractServiceDelegate;
-import dev.dsf.bpe.v1.activity.AbstractTaskMessageSend;
-import dev.dsf.bpe.v1.activity.DefaultUserTaskListener;
 import dev.dsf.bpe.v1.documentation.ProcessDocumentation;
 
 /**
@@ -146,9 +143,9 @@ default LocalDate getResourceReleaseDate()
 	 * plugin also add the {@link ProcessDocumentation} annotation.
 	 *
 	 * @return {@link Configuration} annotated classes, defining {@link Bean} annotated factory methods
-	 * @see AbstractServiceDelegate
-	 * @see AbstractTaskMessageSend
-	 * @see DefaultUserTaskListener
+	 * @see dev.dsf.bpe.v1.activity.AbstractServiceDelegate
+	 * @see dev.dsf.bpe.v1.activity.AbstractTaskMessageSend
+	 * @see dev.dsf.bpe.v1.activity.DefaultUserTaskListener
 	 * @see ConfigurableBeanFactory#SCOPE_PROTOTYPE
 	 */
 	List<Class<?>> getSpringConfigurations();

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

@@ -15,14 +15,12 @@
  */
 package dev.dsf.bpe.v1.constants;
 
-import dev.dsf.bpe.v1.activity.AbstractTaskMessageSend;
 import dev.dsf.bpe.v1.variables.Target;
-import dev.dsf.bpe.v1.variables.Variables;
 
 /**
  * Defines names of standard process engine variables used by the bpe
  *
- * @see Variables
+ * @see dev.dsf.bpe.v1.variables.Variables
  */
 public final class BpmnExecutionVariables
 {
@@ -31,24 +29,24 @@ private BpmnExecutionVariables()
 	}
 
 	/**
-	 * Values from the <code>target</code> variable are used to configure {@link AbstractTaskMessageSend} activities for
-	 * sending Task resource messages
+	 * Values from the <code>target</code> variable are used to configure
+	 * {@link dev.dsf.bpe.v1.activity.AbstractTaskMessageSend} activities for sending Task resource messages
 	 *
-	 * @see Variables#createTarget(String, String, String, String)
-	 * @see Variables#createTarget(String, String, String)
-	 * @see Variables#setTarget(dev.dsf.bpe.v1.variables.Target)
-	 * @see Variables#getTarget()
+	 * @see dev.dsf.bpe.v1.variables.Variables#createTarget(String, String, String, String)
+	 * @see dev.dsf.bpe.v1.variables.Variables#createTarget(String, String, String)
+	 * @see dev.dsf.bpe.v1.variables.Variables#setTarget(dev.dsf.bpe.v1.variables.Target)
+	 * @see dev.dsf.bpe.v1.variables.Variables#getTarget()
 	 */
 	public static final String TARGET = "target";
 
 	/**
 	 * The <code>targets</code> variable is typically used to iterate over {@link Target} variables in multi instance
 	 * send/receive tasks or multi instance subprocesses
 	 *
-	 * @see Variables#createTargets(java.util.List)
-	 * @see Variables#createTargets(dev.dsf.bpe.v1.variables.Target...)
-	 * @see Variables#setTargets(dev.dsf.bpe.v1.variables.Targets)
-	 * @see Variables#getTargets()
+	 * @see dev.dsf.bpe.v1.variables.Variables#createTargets(java.util.List)
+	 * @see dev.dsf.bpe.v1.variables.Variables#createTargets(dev.dsf.bpe.v1.variables.Target...)
+	 * @see dev.dsf.bpe.v1.variables.Variables#setTargets(dev.dsf.bpe.v1.variables.Targets)
+	 * @see dev.dsf.bpe.v1.variables.Variables#getTargets()
 	 */
 	public static final String TARGETS = "targets";
 
@@ -63,10 +61,10 @@ private BpmnExecutionVariables()
 	/**
 	 * Value of the <code>alternativeBusinessKey</code> variable is used to correlated incoming Task resource to a
 	 * waiting process instance if an alternative business-key was created for a communication target. See corresponding
-	 * <code>protected</code> method in {@link AbstractTaskMessageSend} on how to create and use an alternative
-	 * business-key.
+	 * <code>protected</code> method in {@link dev.dsf.bpe.v1.activity.AbstractTaskMessageSend} on how to create and use
+	 * an alternative business-key.
 	 *
-	 * @see AbstractTaskMessageSend
+	 * @see dev.dsf.bpe.v1.activity.AbstractTaskMessageSend
 	 */
 	public static final String ALTERNATIVE_BUSINESS_KEY = "alternativeBusinessKey";
 }

dsf-bpe/dsf-bpe-process-api-v1/src/main/java/dev/dsf/bpe/v1/variables/Target.java → dsf-bpe/dsf-bpe-process-api-v1-base/src/main/java/dev/dsf/bpe/v1/variables/Target.java

@@ -15,12 +15,10 @@
  */
 package dev.dsf.bpe.v1.variables;
 
-import dev.dsf.bpe.v1.constants.BpmnExecutionVariables;
-
 /**
  * Specifies a communication target for FHIR Task resources.
  *
- * @see BpmnExecutionVariables#TARGET
+ * @see dev.dsf.bpe.v1.constants.BpmnExecutionVariables#TARGET
  * @see Variables#createTarget(String, String, String, String)
  * @see Variables#createTarget(String, String, String)
  * @see Targets

dsf-bpe/dsf-bpe-process-api-v1/src/main/java/dev/dsf/bpe/v1/variables/Targets.java → dsf-bpe/dsf-bpe-process-api-v1-base/src/main/java/dev/dsf/bpe/v1/variables/Targets.java

@@ -18,12 +18,10 @@
 import java.util.Collection;
 import java.util.List;
 
-import dev.dsf.bpe.v1.constants.BpmnExecutionVariables;
-
 /**
  * Specifies a list of communication targets for FHIR Task resources.
  *
- * @see BpmnExecutionVariables#TARGETS
+ * @see dev.dsf.bpe.v1.constants.BpmnExecutionVariables#TARGETS
  * @see Variables#createTargets(List)
  * @see Variables#createTargets(Target...)
  * @see Target

dsf-bpe/dsf-bpe-process-api-v1-impl/pom.xml

@@ -39,7 +39,7 @@
 		</dependency>
 		<dependency>
 			<groupId>dev.dsf</groupId>
-			<artifactId>dsf-bpe-process-api-v1</artifactId>
+			<artifactId>dsf-bpe-process-api-v1-operaton</artifactId>
 		</dependency>
 
 		<dependency>
@@ -117,7 +117,7 @@
 							<artifactItems>
 								<artifactItem>
 									<groupId>dev.dsf</groupId>
-									<artifactId>dsf-bpe-process-api-v1</artifactId>
+									<artifactId>dsf-bpe-process-api-v1-operaton</artifactId>
 								</artifactItem>
 								<artifactItem>
 									<groupId>dev.dsf</groupId>

dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/plugin/ProcessPluginClassLoader.java

@@ -98,7 +98,14 @@ public void visitFieldInsn(int opcode, String owner, String name, String descrip
 						public void visitMethodInsn(int opcode, String owner, String name, String descriptor,
 								boolean isInterface)
 						{
-							super.visitMethodInsn(opcode, replace(owner), name, replace(descriptor), isInterface);
+							if ((FROM_PACKAGE + "/model/bpmn/instance/UserTask").equals(owner)
+									&& "getCamundaFormKey".equals(name) && "()Ljava/lang/String;".equals(descriptor))
+							{
+								super.visitMethodInsn(opcode, TO_PACKAGE + "/bpm/model/bpmn/instance/UserTask",
+										"getOperatonFormKey", "()Ljava/lang/String;", isInterface);
+							}
+							else
+								super.visitMethodInsn(opcode, replace(owner), name, replace(descriptor), isInterface);
 						}
 
 						@Override

dsf-bpe/dsf-bpe-process-api-v1-operaton/pom.xml

@@ -0,0 +1,123 @@
+<!--
+
+    Copyright 2018-2025 Heilbronn University of Applied Sciences
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<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">
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>dsf-bpe-process-api-v1-operaton</artifactId>
+
+	<parent>
+		<groupId>dev.dsf</groupId>
+		<artifactId>dsf-bpe-pom</artifactId>
+		<version>2.0.0-SNAPSHOT</version>
+	</parent>
+
+	<properties>
+		<main.basedir>${project.parent.parent.basedir}</main.basedir>
+	</properties>
+
+	<name>DSF BPE Process API v1 (Operaton)</name>
+
+	<dependencies>
+		<dependency>
+			<groupId>dev.dsf</groupId>
+			<artifactId>dsf-bpe-process-api-v1-base</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>ca.uhn.hapi.fhir</groupId>
+			<artifactId>hapi-fhir-structures-r4</artifactId>
+			<version>${hapi.fhir.version.v1}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.operaton.bpm</groupId>
+			<artifactId>operaton-engine</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-context</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.sun.mail</groupId>
+			<artifactId>jakarta.mail</artifactId>
+		</dependency>
+		<dependency>
+			<artifactId>jakarta.ws.rs-api</artifactId>
+			<groupId>jakarta.ws.rs</groupId>
+		</dependency>
+
+		<!-- optional dependencies provided by the DSF bpe -->
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-web</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>de.hs-heilbronn.mi</groupId>
+			<artifactId>crypto-utils</artifactId>
+			<version>${crypto-utils.version.v1}</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>ca.uhn.hapi.fhir</groupId>
+			<artifactId>hapi-fhir-validation</artifactId>
+			<version>${hapi.fhir.version.v1}</version>
+			<optional>true</optional>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-shade-plugin</artifactId>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>shade</goal>
+						</goals>
+						<configuration>
+							<artifactSet>
+								<includes>
+									<include>dev.dsf:dsf-bpe-process-api-v1-base</include>
+								</includes>
+							</artifactSet>
+							<createDependencyReducedPom>true</createDependencyReducedPom>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<configuration>
+					<sourcepath>src/main/java;../dsf-bpe-process-api-v1-base/src/main/java</sourcepath>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>