From 934ae0074947917980c4531f16ac2375a3802a7a Mon Sep 17 00:00:00 2001 From: Ralph Soika Date: Mon, 16 Nov 2020 13:56:38 +0100 Subject: [PATCH] init --- Dockerfile | 2 +- docker-compose.yml | 10 +- .../main/resources/META-INF/persistence.xml | 16 +- .../resources/bundle/custom_de.properties | 1 + .../resources/bundle/custom_en.properties | 1 + .../src/main/resources/imixs.properties | 63 +- pom.xml | 24 +- workflow/system-de-1.1.0.bpmn | 1474 +++++++++++++++++ 8 files changed, 1533 insertions(+), 58 deletions(-) create mode 100644 workflow/system-de-1.1.0.bpmn diff --git a/Dockerfile b/Dockerfile index 9651fca..83946cb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM imixs/imixs-office-workflow:4.3.1 +FROM imixs/imixs-office-workflow:latest # Deploy artefact RUN rm -r /opt/jboss/wildfly/standalone/deployments/* diff --git a/docker-compose.yml b/docker-compose.yml index 146ae49..69b00e0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -19,7 +19,8 @@ services: POSTGRES_PASSWORD: "adminadmin" POSTGRES_CONNECTION: "jdbc:postgresql://db/office-alexander-logistics" TZ: "CET" - LANG: "en_US.UTF-8" + LANG: "en_US.UTF-8" + MAILGATEWAY: "mailgateway" ports: - "8080:8080" - "9990:9990" @@ -32,6 +33,13 @@ services: ports: - "8888:8080" + mailgateway: + image: imixs/exim4 + environment: + EXIM_SMARTHOST: "www149.your-server.de:25" + EXIM_PASSWORD: "www149.your-server.de:webmaster@imixs.com:webmaster4imixsmail" + EXIM_ALLOWED_SENDERS: "10.0.0.0/8:172.16.0.0/12:192.168.0.0/16" + volumes: dbdata: \ No newline at end of file diff --git a/office-alexander-logistics-app/src/main/resources/META-INF/persistence.xml b/office-alexander-logistics-app/src/main/resources/META-INF/persistence.xml index 171c32c..303852f 100644 --- a/office-alexander-logistics-app/src/main/resources/META-INF/persistence.xml +++ b/office-alexander-logistics-app/src/main/resources/META-INF/persistence.xml @@ -1,8 +1,5 @@ - + + - + - - + - \ No newline at end of file + + + diff --git a/office-alexander-logistics-app/src/main/resources/bundle/custom_de.properties b/office-alexander-logistics-app/src/main/resources/bundle/custom_de.properties index d772cee..836cabc 100644 --- a/office-alexander-logistics-app/src/main/resources/bundle/custom_de.properties +++ b/office-alexander-logistics-app/src/main/resources/bundle/custom_de.properties @@ -1,2 +1,3 @@ # Custom resource bundle +app.application_title=Alexander Global Logistics \ No newline at end of file diff --git a/office-alexander-logistics-app/src/main/resources/bundle/custom_en.properties b/office-alexander-logistics-app/src/main/resources/bundle/custom_en.properties index d772cee..836cabc 100644 --- a/office-alexander-logistics-app/src/main/resources/bundle/custom_en.properties +++ b/office-alexander-logistics-app/src/main/resources/bundle/custom_en.properties @@ -1,2 +1,3 @@ # Custom resource bundle +app.application_title=Alexander Global Logistics \ No newline at end of file diff --git a/office-alexander-logistics-app/src/main/resources/imixs.properties b/office-alexander-logistics-app/src/main/resources/imixs.properties index d1172b1..f81f350 100644 --- a/office-alexander-logistics-app/src/main/resources/imixs.properties +++ b/office-alexander-logistics-app/src/main/resources/imixs.properties @@ -1,44 +1,35 @@ -# Imixs-Workflow -model.default.data=system-de-1.1.0.bpmn -lucence.indexDir=${imixs-office.IndexDir} -lucence.fulltextFieldList=txtsearchstring,txtSubject,txtname,txtEmail,txtUserName,namCreator,txtworkflowgroup,txtworkflowstatus,txtWorkflowAbstract,txtWorkflowSummary,txtworkflowhistory,txtspacename,txtprocessname,_subject,_description,_name,_projectnumber,_projectname,_ordernumber,_contractnumber,datDueDate,txtcommentlog,htmldescription,htmldocumentation,dms,dms_names,_childitems -lucence.indexFieldListAnalyze=txtUsername -lucence.indexFieldListNoAnalyze=type,$UniqueIDRef,$created,$modified,$ModelVersion,namCreator,$ProcessID,datDate,txtWorkflowGroup,txtemail, datdate, datfrom, datto, numsequencenumber,dms_count -lucence.indexFieldListStore=txtProcessName,txtWorkflowImageURL +############################## +# Imixs Properties +############################## -# Marty Setup setup.mode=auto setup.system.model=system-de-1.1 +# allow duplicated email addresses +security.email.unique=false - -# Marty Login & Profile Properties -security.userid.input.mode=LOWERCASE -security.email.unique=true -#security.userid.input.pattern= - - - -# Mail -# mail.defaultSender=info@imixs.com - - - -# Imixs Archive -snapshot.history=1 -snapshot.overwriteFileContent=false - - - -# Image reziser -image.fileExtension=jpg,gif -image.maxWidth=2048 - - -# Office Setup +# Office Properties BASIC.maxviewentries=10 -# Space selector (none, root, all) -search.filter.spaces=root -dms.search=true + +############################## +# Imixs Lucene Plugin +############################## + +# Search Index Direcotry +lucence.indexDir=${imixs-office.IndexDir} +# Fields to be added into the searchindex +#index.fields=txtsearchstring,txtSubject,txtname,txtEmail,txtUserName,namCreator,txtworkflowgroup,txtworkflowstatus,txtWorkflowAbstract,txtWorkflowSummary,txtworkflowhistory,_subject,_description,_name,_projectnumber,_projectname,_ordernumber,_contractnumber,datDueDate,txtcommentlog,htmldescription,htmldocumentation,dms,dms_names +#index.fields.analyze=txtUsername +#index.fields.noanalyze=type,$UniqueIDRef,$created,$modified,$ModelVersion,namCreator,$ProcessID,datDate,txtWorkflowGroup,txtemail, datdate, datfrom, datto, numsequencenumber,dms_count +#index.fields.store=txtProcessName,txtWorkflowImageURL +index.fields=txtsearchstring,txtSubject,txtname,txtEmail,txtUserName,namCreator,txtworkflowgroup,txtworkflowstatus,txtWorkflowAbstract,txtWorkflowSummary,txtworkflowhistory,txtspacename,txtprocessname,_subject,_description,_name,_projectnumber,_projectname,_ordernumber,_contractnumber,datDueDate,txtcommentlog,htmldescription,htmldocumentation,dms,dms_names,_childitems,$file.names +index.fields.analyze=txtUsername +index.fields.noanalyze=type,$UniqueIDRef,$created,$modified,$ModelVersion,namCreator,$ProcessID,datDate,txtWorkflowGroup,txtemail, datdate, datfrom, datto, numsequencenumber,dms_count +index.fields.store=process.name,txtProcessName,txtWorkflowImageURL + + + +dms.search=true +comments.history=true diff --git a/pom.xml b/pom.xml index e7d068a..1c1f7f3 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ 5.2.5 4.1.8 - 4.3.1 + 4.3.2-SNAPSHOT 2.2.3 2.2.4 1.0.19 @@ -48,12 +48,16 @@ lucene/office-index office-alexander-logistics - java:/mail/org.imixs.workflow.mail - war office-alexander-logistics + + + java:/mail/org.imixs.workflow.mail + + registry.ixchel.imixs.com/library + @@ -87,6 +91,10 @@ docker-push + + kubernetes + + @@ -107,15 +115,9 @@ 1.8 - - org.apache.maven.plugins - maven-resources-plugin - 2.6 - - ${project.build.sourceEncoding} - - + + office-alexander-logistics diff --git a/workflow/system-de-1.1.0.bpmn b/workflow/system-de-1.1.0.bpmn new file mode 100644 index 0000000..4ab87a4 --- /dev/null +++ b/workflow/system-de-1.1.0.bpmn @@ -0,0 +1,1474 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SequenceFlow_16 + + + + + true + + + SequenceFlow_23 + SequenceFlow_24 + SequenceFlow_25 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + /pages/admin/profilelist]]> + + + + + + + + + false + + + SequenceFlow_11 + SequenceFlow_33 + SequenceFlow_1 + + + + + true + + + + + + + + + SequenceFlow_20 + SequenceFlow_1 + SequenceFlow_36 + SequenceFlow_8 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + /pages/admin/profilelist]]> + + + + + + namcurrentEditor]]> + + + false + + + SequenceFlow_31 + SequenceFlow_35 + SequenceFlow_23 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + /pages/admin/profilelist]]> + + + + + + namcurrentEditor]]> + + + false + + + SequenceFlow_25 + SequenceFlow_36 + + + + + + + + SequenceFlow_16 + SequenceFlow_17 + + + SequenceFlow_24 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + /pages/admin/profilelist]]> + + + + + + + + + false + + + Erster Zugriff eines neuen Users, eMail mit Info geht raus, User erhält Autorenrecht. + SequenceFlow_17 + SequenceFlow_20 + + + + + + + + + + SequenceFlow_8 + SequenceFlow_11 + SequenceFlow_34 + SequenceFlow_35 + + + + + + SequenceFlow_27 + SequenceFlow_30 + SequenceFlow_33 + + + + + + + + + + + + + + + + + + + + + + + SequenceFlow_34 + SequenceFlow_27 + + + + + + + + + + + + + + + + + + + + + + + + + SequenceFlow_30 + SequenceFlow_31 + + + + + + + + + + ID:90 - Remove assigend Access Roles + + + + Inaktiv + + + + + + + + + + + + true + + + + + + SequenceFlow_2 + SequenceFlow_4 + SequenceFlow_19 + SequenceFlow_47 + SequenceFlow_3 + SequenceFlow_44 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + /pages/admin/processlist]]> + + + Daten speichern und aktualisieren + SequenceFlow_4 + + + SequenceFlow_2 + + + + + SequenceFlow_13 + + + + + + true + + + + + + + + + SequenceFlow_7 + SequenceFlow_13 + SequenceFlow_18 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + /pages/admin/processlist]]> + + + + SequenceFlow_3 + SequenceFlow_39 + SequenceFlow_7 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + /pages/admin/processlist]]> + + + + SequenceFlow_18 + SequenceFlow_19 + + + + + + + + + + true + + + + + + + SequenceFlow_45 + SequenceFlow_49 + SequenceFlow_39 + SequenceFlow_46 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + /pages/admin/processlist]]> + + + Daten speichern und aktualisieren + SequenceFlow_44 + SequenceFlow_45 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + /pages/admin/processlist]]> + + + Daten speichern und aktualisieren + SequenceFlow_46 + SequenceFlow_47 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + /pages/admin/processlist]]> + + + Daten speichern und aktualisieren + SequenceFlow_49 + + + + + + + + true + + + + + + + + + SequenceFlow_6 + SequenceFlow_5 + SequenceFlow_22 + SequenceFlow_10 + SequenceFlow_9 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + + + /pages/admin/spaces]]> + + + Daten speichern und aktualisieren + SequenceFlow_5 + + + SequenceFlow_6 + + + + + SequenceFlow_14 + + + + + + true + + + + + + + + + SequenceFlow_15 + SequenceFlow_14 + SequenceFlow_21 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + /pages/admin/spaces]]> + + + + SequenceFlow_10 + SequenceFlow_26 + SequenceFlow_15 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + /pages/admin/spaces]]> + + + + SequenceFlow_21 + SequenceFlow_28 + SequenceFlow_22 + + + + + + + true + + + + + + + + + SequenceFlow_12 + SequenceFlow_26 + SequenceFlow_28 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + /pages/admin/spaces]]> + + + + SequenceFlow_9 + SequenceFlow_12 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file