Skip to content
This repository has been archived by the owner on Mar 22, 2024. It is now read-only.

Commit

Permalink
build shaded jar, move business key to constant
Browse files Browse the repository at this point in the history
  • Loading branch information
@wetret
wetret committed Jul 29, 2022
1 parent f2b2fe9 commit ee888eb
Show file tree
Hide file tree
Showing 7 changed files with 148 additions and 153 deletions.
4 changes: 3 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
###
# mii processes projectathon common ignores
# mii processes common ignores
###
**/.classpath
**/.project
Expand All @@ -9,6 +9,8 @@

**/*.iml

**/dependency-reduced-pom.xml

###
# test data generator ignores
###
Expand Down
147 changes: 89 additions & 58 deletions mii-dsf-process-kds-report/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
<dependency>
<groupId>de.medizininformatik-initiative</groupId>
<artifactId>mii-dsf-processes-kds-client</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
Expand All @@ -36,10 +35,12 @@
<dependency>
<groupId>org.highmed.dsf</groupId>
<artifactId>dsf-tools-documentation-generator</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>de.hs-heilbronn.mi</groupId>
<artifactId>log4j2-utils</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
Expand Down Expand Up @@ -91,6 +92,25 @@
<workingDirectory>${project.basedir}</workingDirectory>
</configuration>
</plugin>
<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>de.medizininformatik-initiative:mii-dsf-processes-kds-client</include>
</includes>
</artifactSet>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
Expand All @@ -108,19 +128,28 @@
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
</artifactItem>
<artifactItem>
<groupId>de.medizininformatik-initiative</groupId>
<artifactId>mii-dsf-processes-kds-client</artifactId>
<version>${project.version}</version>
</artifactItem>
</artifactItems>
<outputDirectory>
../mii-dsf-processes-docker-test-setup/dic1/bpe/process
</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-dependencies/dic1</id>
<phase>package</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-client</artifactId>
<version>${hapi.version}</version>
</artifactItem>
</artifactItems>
<outputDirectory>
../mii-dsf-processes-docker-test-setup/dic1/bpe/process/${project.artifactId}-${project.version}
../mii-dsf-processes-docker-test-setup/dic1/bpe/plugin
</outputDirectory>
</configuration>
</execution>
Expand All @@ -137,19 +166,28 @@
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
</artifactItem>
<artifactItem>
<groupId>de.medizininformatik-initiative</groupId>
<artifactId>mii-dsf-processes-kds-client</artifactId>
<version>${project.version}</version>
</artifactItem>
</artifactItems>
<outputDirectory>
../mii-dsf-processes-docker-test-setup/dic2/bpe/process
</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-dependencies/dic2</id>
<phase>package</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-client</artifactId>
<version>${hapi.version}</version>
</artifactItem>
</artifactItems>
<outputDirectory>
../mii-dsf-processes-docker-test-setup/dic2/bpe/process/${project.artifactId}-${project.version}
../mii-dsf-processes-docker-test-setup/dic2/bpe/plugin
</outputDirectory>
</configuration>
</execution>
Expand All @@ -166,42 +204,29 @@
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
</artifactItem>
<artifactItem>
<groupId>de.medizininformatik-initiative</groupId>
<artifactId>mii-dsf-processes-kds-client</artifactId>
<version>${project.version}</version>
</artifactItem>
<artifactItem>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-client</artifactId>
<version>${hapi.version}</version>
</artifactItem>
</artifactItems>
<outputDirectory>
../mii-dsf-processes-docker-test-setup/hrp/bpe/process/${project.artifactId}-${project.version}
../mii-dsf-processes-docker-test-setup/hrp/bpe/process
</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-dependencies/assembly</id>
<id>copy-dependencies/hrp</id>
<phase>package</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>de.medizininformatik-initiative</groupId>
<artifactId>mii-dsf-processes-kds-client</artifactId>
<version>${project.version}</version>
</artifactItem>
<artifactItem>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-client</artifactId>
<version>${hapi.version}</version>
</artifactItem>
</artifactItems>
<outputDirectory>${project.build.directory}/lib</outputDirectory>
<outputDirectory>
../mii-dsf-processes-docker-test-setup/hrp/bpe/plugin
</outputDirectory>
</configuration>
</execution>
</executions>
Expand All @@ -213,55 +238,61 @@
<filesets>
<fileset>
<directory>
../mii-dsf-processes-docker-test-setup/dic1/bpe/process/${project.artifactId}-${project.version}
../mii-dsf-processes-docker-test-setup/dic1/bpe/process
</directory>
<includes>
<include>**</include>
<include>${project.artifactId}-${project.version}.jar</include>
</includes>
<followSymlinks>false</followSymlinks>
</fileset>
<fileset>
<directory>
../mii-dsf-processes-docker-test-setup/dic2/bpe/process/${project.artifactId}-${project.version}
../mii-dsf-processes-docker-test-setup/dic1/bpe/plugin
</directory>
<includes>
<include>**</include>
<include>hapi-fhir-client-${hapi.version}.jar</include>
</includes>
<followSymlinks>false</followSymlinks>
</fileset>
<fileset>
<directory>
../mii-dsf-processes-docker-test-setup/hrp/bpe/process/${project.artifactId}-${project.version}
../mii-dsf-processes-docker-test-setup/dic2/bpe/process
</directory>
<includes>
<include>**</include>
<include>${project.artifactId}-${project.version}.jar</include>
</includes>
<followSymlinks>false</followSymlinks>
</fileset>
<fileset>
<directory>
../mii-dsf-processes-docker-test-setup/dic2/bpe/plugin
</directory>
<includes>
<include>hapi-fhir-client-${hapi.version}.jar</include>
</includes>
<followSymlinks>false</followSymlinks>
</fileset>
<fileset>
<directory>
../mii-dsf-processes-docker-test-setup/hrp/bpe/process
</directory>
<includes>
<include>${project.artifactId}-${project.version}.jar</include>
</includes>
<followSymlinks>false</followSymlinks>
</fileset>
<fileset>
<directory>
../mii-dsf-processes-docker-test-setup/hrp/bpe/plugin
</directory>
<includes>
<include>hapi-fhir-client-${hapi.version}.jar</include>
</includes>
<followSymlinks>false</followSymlinks>
</fileset>
</filesets>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<id>tar-gz-assembly</id>
<phase>install</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
<configuration>
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
<descriptor>src/assembly/tar-gz.xml</descriptor>
</descriptors>
<overrideUid>0</overrideUid>
<overrideGid>2202</overrideGid>
</configuration>
</plugin>
</plugins>
</build>
</project>
4 changes: 3 additions & 1 deletion ...rmatik_initiative/process/kds/report/bpe/start/KdsReportAutostartStartExampleStarter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@

public class KdsReportAutostartStartExampleStarter
{
public static final String AUTOSTART_BUSINESS_KEY = "9ad28295-eccc-41c2-b0f0-c9db0b229f26";

private static final String DIC_URL = "https://dic1/fhir";
private static final String DIC_IDENTIFIER = "Test_DIC1";

Expand Down Expand Up @@ -45,7 +47,7 @@ private static Task createTask()
task.getRestriction().addRecipient().setType(ResourceType.Organization.name()).getIdentifier()
.setSystem(NAMINGSYSTEM_HIGHMED_ORGANIZATION_IDENTIFIER).setValue(DIC_IDENTIFIER);

task.addInput().setValue(new StringType("9ad28295-eccc-41c2-b0f0-c9db0b229f26")).getType().addCoding()
task.addInput().setValue(new StringType(AUTOSTART_BUSINESS_KEY)).getType().addCoding()
.setSystem(CODESYSTEM_HIGHMED_BPMN).setCode(CODESYSTEM_HIGHMED_BPMN_VALUE_BUSINESS_KEY);
task.addInput()
.setValue(new StringType(ConstantsKdsReport.PROFILE_MII_KDS_REPORT_TASK_AUTOSTART_START_MESSAGE_NAME))
Expand Down
3 changes: 2 additions & 1 deletion ...ormatik_initiative/process/kds/report/bpe/start/KdsReportAutostartStopExampleStarter.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package de.medizininformatik_initiative.process.kds.report.bpe.start;

import static de.medizininformatik_initiative.process.kds.report.bpe.start.KdsReportAutostartStartExampleStarter.AUTOSTART_BUSINESS_KEY;
import static org.highmed.dsf.bpe.ConstantsBase.CODESYSTEM_HIGHMED_BPMN;
import static org.highmed.dsf.bpe.ConstantsBase.CODESYSTEM_HIGHMED_BPMN_VALUE_BUSINESS_KEY;
import static org.highmed.dsf.bpe.ConstantsBase.CODESYSTEM_HIGHMED_BPMN_VALUE_MESSAGE_NAME;
Expand Down Expand Up @@ -47,7 +48,7 @@ private static Task createTask()
.setValue(new StringType(ConstantsKdsReport.PROFILE_MII_KDS_REPORT_TASK_AUTOSTART_STOP_MESSAGE_NAME))
.getType().addCoding().setSystem(CODESYSTEM_HIGHMED_BPMN)
.setCode(CODESYSTEM_HIGHMED_BPMN_VALUE_MESSAGE_NAME);
task.addInput().setValue(new StringType("9ad28295-eccc-41c2-b0f0-c9db0b229f26")).getType().addCoding()
task.addInput().setValue(new StringType(AUTOSTART_BUSINESS_KEY)).getType().addCoding()
.setSystem(CODESYSTEM_HIGHMED_BPMN).setCode(CODESYSTEM_HIGHMED_BPMN_VALUE_BUSINESS_KEY);

return task;
Expand Down
Loading

0 comments on commit ee888eb

Please sign in to comment.