diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..8227403 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,13 @@ +{ + // Wildfly Debug Configuration + "configurations": [ + { + "type": "java", + "name": "Debug Wildfly", + "request": "attach", + "hostName": "localhost", + "projectName": "imixs-microservice", + "port": "8787" + } +] +} diff --git a/Dockerfile-Debug b/Dockerfile-Debug new file mode 100644 index 0000000..cc08fc4 --- /dev/null +++ b/Dockerfile-Debug @@ -0,0 +1,19 @@ +FROM quay.io/wildfly/wildfly:27.0.1.Final-jdk11 + +LABEL description="Imixs-Microservice" +LABEL maintainer="ralph.soika@imixs.com" + +# Copy EclipseLink and Postgres Driver +COPY ./docker/configuration/wildfly/modules/ /opt/jboss/wildfly/modules/ + +# Setup configuration +COPY ./docker/configuration/wildfly/*.properties /opt/jboss/wildfly/standalone/configuration/ +COPY ./docker/configuration/wildfly/standalone.xml /opt/jboss/wildfly/standalone/configuration/ + +# Deploy artefact +#ADD ./target/*.war /opt/jboss/wildfly/standalone/deployments/ +ADD ./target/imixs-microservice/ /opt/jboss/wildfly/standalone/deployments/imixs-microservice.war/ +COPY ./docker/configuration/wildfly/imixs-microservice.war.dodeploy /opt/jboss/wildfly/standalone/deployments/imixs-microservice.war.dodeploy +WORKDIR /opt/jboss/wildfly +# Run in Debug Mode +CMD ["/opt/jboss/wildfly/bin/standalone.sh", "-b", "0.0.0.0", "-bmanagement", "0.0.0.0", "--debug", "*:8787"] diff --git a/pom.xml b/pom.xml index c58fdcc..6247e38 100644 --- a/pom.xml +++ b/pom.xml @@ -4,12 +4,12 @@ 4.0.0 org.imixs.workflow imixs-microservice - 3.0.0 + 3.1.0 war UTF-8 - 6.0.6 + 6.1.1-SNAPSHOT 6.0 src/main/webapp @@ -53,8 +53,6 @@ - - @@ -67,6 +65,40 @@ + + + debug + + + + org.apache.maven.plugins + maven-antrun-plugin + 3.1.0 + + + install + + + + + + + + + + + + + + run + + + + + + + + docker-hub diff --git a/src/main/resources/imixs.properties b/src/main/resources/imixs.properties index 1dc005a..b51cfb2 100644 --- a/src/main/resources/imixs.properties +++ b/src/main/resources/imixs.properties @@ -9,4 +9,4 @@ mail.defaultSender=info@mydomain.com # lucence.indexDir=lucene/imixs-microservice-index # Default Model -model.default.data=ticket-en-1.0.0.bpmn \ No newline at end of file +model.default.data=ticket-en-1.0.1.bpmn \ No newline at end of file diff --git a/src/main/resources/ticket-en-1.0.0.bpmn b/src/main/resources/ticket-en-1.0.0.bpmn deleted file mode 100644 index 6d6c54b..0000000 --- a/src/main/resources/ticket-en-1.0.0.bpmn +++ /dev/null @@ -1,510 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - SequenceFlow_1 - - - - - - - SequenceFlow_12 - - - - - - subject ]]> - - - - - - Create a new ticket - SequenceFlow_1 - SequenceFlow_14 - SequenceFlow_11 - - - - - subject ]]> - - - true - - - - - - - - - SequenceFlow_3 - SequenceFlow_6 - SequenceFlow_4 - - - - - - subject ]]> - - - true - - - - - - - - - - SequenceFlow_8 - SequenceFlow_16 - SequenceFlow_9 - - - - - - subject ]]> - - - true - - - SequenceFlow_19 - SequenceFlow_12 - - - - - - namcurrentEditor]]> - - - worklist]]> - - - false - - - - - - - - - - <b>Submit</b> a new ticket - SequenceFlow_11 - SequenceFlow_3 - - - DataOutput_1 - - - DataOutput_1 - - - - - - - namcurrentEditor]]> - - - SequenceFlow_17 - SequenceFlow_6 - - - - - - namcurrentEditor]]> - - - - - - false - - - - - - - - - - - SequenceFlow_18 - SequenceFlow_8 - - - - - - - SequenceFlow_4 - SequenceFlow_17 - SequenceFlow_18 - - - - SequenceFlow_9 - SequenceFlow_20 - SequenceFlow_21 - SequenceFlow_22 - - - - - - - - - - - - - - - namcurrentEditor]]> - - - worklist]]> - - - false - - - - - - - - - SequenceFlow_21 - SequenceFlow_14 - - - - - - namcurrentEditor]]> - - - worklist]]> - - - false - - - - SequenceFlow_22 - SequenceFlow_19 - - - - - - namcurrentEditor]]> - - - SequenceFlow_20 - SequenceFlow_16 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Calls the DemoAdapter - - - - - - - - - - - - - - - - - - -]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/ticket-en-1.0.1.bpmn b/src/main/resources/ticket-en-1.0.1.bpmn new file mode 100644 index 0000000..f43f80a --- /dev/null +++ b/src/main/resources/ticket-en-1.0.1.bpmn @@ -0,0 +1,498 @@ + + + + + + + + + + + + + + + + + + + + true + + + + + + + + + + + + + + + + + + + + IntermediateCatchEvent_1 + StartEvent_1 + Task_1 + Task_4 + EndEvent_1 + + dataObject_tmzGVg + + + + Task_2 + event_NXm6Lg + gateway_e3K0XA + event_iCi0Uw + IntermediateCatchEvent_5 + Task_3 + event_SPIf0A + event_jDVCZw + + + + + + subject ]]> + + + true + + + + + + + + + SequenceFlow_3 + + sequenceFlow_ZHLeiw + sequenceFlow_oMaLFA + + + + + $Editor]]> + + + false + + + + + + + SequenceFlow_10 + SequenceFlow_19 + + + + + + + + + + subject ]]> + + + true + + + + + + + + + + SequenceFlow_10 + + sequenceFlow_DC5e4g + sequenceFlow_6Jh9fA + + + SequenceFlow_12 + + + + + + $Editor]]> + + + + + + false + + + + + + + + + + <b>Submit</b> a new ticket + SequenceFlow_11 + SequenceFlow_3 + + + + + + + + + subject ]]> + + + true + + + SequenceFlow_19 + SequenceFlow_12 + + + + + + + SequenceFlow_1 + + + + + + + + + subject ]]> + + + + + + Create a new ticket + SequenceFlow_1 + SequenceFlow_11 + sequenceFlow_tlgXRQ + + + + + + + + + + + + + + false + + + + + + + + sequenceFlow_CHsjoA + sequenceFlow_DC5e4g + + + + sequenceFlow_ZHLeiw + sequenceFlow_CHsjoA + sequenceFlow_6ZYhnA + + + + + + + + + + + + + + false + + + + + + + + sequenceFlow_6ZYhnA + sequenceFlow_tlgXRQ + + + + + + + + + + + + + + + + + + + + false + + + + + + + + + + Upadate a new ticket]]> + + sequenceFlow_oMaLFA + + + + + + + + + + + + + + false + + + + + + + + + + Upadate a new ticket]]> + + sequenceFlow_6Jh9fA + + + + + + + + + + + + + + + + +]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/workflow/ticket-en-1.0.0.bpmn b/workflow/ticket-en-1.0.0.bpmn deleted file mode 100644 index f2418c4..0000000 --- a/workflow/ticket-en-1.0.0.bpmn +++ /dev/null @@ -1,430 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - SequenceFlow_1 - - - - SequenceFlow_12 - - - - - subject ]]> - - - - - - Create a new ticket - SequenceFlow_1 - SequenceFlow_14 - SequenceFlow_11 - - - - - subject ]]> - - - true - - - - - - - - - SequenceFlow_3 - SequenceFlow_6 - SequenceFlow_4 - - - - - subject ]]> - - - true - - - - - - - - - - SequenceFlow_8 - SequenceFlow_16 - SequenceFlow_9 - - - - - subject ]]> - - - true - - - SequenceFlow_19 - SequenceFlow_12 - - - - - namcurrentEditor]]> - - - worklist]]> - - - false - - - - - - - - - - <b>Submit</b> a new ticket - SequenceFlow_11 - SequenceFlow_3 - - - DataOutput_1 - - - DataOutput_1 - - - - - - - namcurrentEditor]]> - - - SequenceFlow_17 - SequenceFlow_6 - - - - - namcurrentEditor]]> - - - - - - false - - - - - - - - - - - SequenceFlow_18 - SequenceFlow_8 - - - - SequenceFlow_4 - SequenceFlow_17 - SequenceFlow_18 - - - SequenceFlow_9 - SequenceFlow_20 - SequenceFlow_21 - SequenceFlow_22 - - - - - - - - namcurrentEditor]]> - - - worklist]]> - - - false - - - - - - - - - SequenceFlow_21 - SequenceFlow_14 - - - - - namcurrentEditor]]> - - - worklist]]> - - - false - - - - SequenceFlow_22 - SequenceFlow_19 - - - - - namcurrentEditor]]> - - - SequenceFlow_20 - SequenceFlow_16 - - - - - - - - - - - - - - Calls the DemoAdapter - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/workflow/ticket-en-1.0.1.bpmn b/workflow/ticket-en-1.0.1.bpmn new file mode 100644 index 0000000..f43f80a --- /dev/null +++ b/workflow/ticket-en-1.0.1.bpmn @@ -0,0 +1,498 @@ + + + + + + + + + + + + + + + + + + + + true + + + + + + + + + + + + + + + + + + + + IntermediateCatchEvent_1 + StartEvent_1 + Task_1 + Task_4 + EndEvent_1 + + dataObject_tmzGVg + + + + Task_2 + event_NXm6Lg + gateway_e3K0XA + event_iCi0Uw + IntermediateCatchEvent_5 + Task_3 + event_SPIf0A + event_jDVCZw + + + + + + subject ]]> + + + true + + + + + + + + + SequenceFlow_3 + + sequenceFlow_ZHLeiw + sequenceFlow_oMaLFA + + + + + $Editor]]> + + + false + + + + + + + SequenceFlow_10 + SequenceFlow_19 + + + + + + + + + + subject ]]> + + + true + + + + + + + + + + SequenceFlow_10 + + sequenceFlow_DC5e4g + sequenceFlow_6Jh9fA + + + SequenceFlow_12 + + + + + + $Editor]]> + + + + + + false + + + + + + + + + + <b>Submit</b> a new ticket + SequenceFlow_11 + SequenceFlow_3 + + + + + + + + + subject ]]> + + + true + + + SequenceFlow_19 + SequenceFlow_12 + + + + + + + SequenceFlow_1 + + + + + + + + + subject ]]> + + + + + + Create a new ticket + SequenceFlow_1 + SequenceFlow_11 + sequenceFlow_tlgXRQ + + + + + + + + + + + + + + false + + + + + + + + sequenceFlow_CHsjoA + sequenceFlow_DC5e4g + + + + sequenceFlow_ZHLeiw + sequenceFlow_CHsjoA + sequenceFlow_6ZYhnA + + + + + + + + + + + + + + false + + + + + + + + sequenceFlow_6ZYhnA + sequenceFlow_tlgXRQ + + + + + + + + + + + + + + + + + + + + false + + + + + + + + + + Upadate a new ticket]]> + + sequenceFlow_oMaLFA + + + + + + + + + + + + + + false + + + + + + + + + + Upadate a new ticket]]> + + sequenceFlow_6Jh9fA + + + + + + + + + + + + + + + + +]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +