Skip to content

Commit 502d2ae

Browse files
rsoikarsoika
committed
started version 2.1.2, added marty component (Issue #32)
1 parent 690c059 commit 502d2ae

8 files changed

Lines changed: 3551 additions & 124 deletions

File tree

‎docker-compose-wildfly.yaml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
version: "3.6"
2+
services:
3+
4+
imixs-db:
5+
image: postgres:13.11
6+
environment:
7+
POSTGRES_PASSWORD: adminadmin
8+
POSTGRES_DB: workflow-db
9+
volumes:
10+
- dbdata:/var/lib/postgresql/data
11+
12+
imixs-app:
13+
image: imixs/imixs-process-manager:latest
14+
environment:
15+
TZ: "CET"
16+
LANG: "en_US.UTF-8"
17+
JAVA_OPTS: "-Dnashorn.args=--no-deprecation-warning"
18+
POSTGRES_USER: "postgres"
19+
POSTGRES_PASSWORD: "adminadmin"
20+
POSTGRES_CONNECTION: "jdbc:postgresql://imixs-db/workflow-db"
21+
ports:
22+
- "8080:8080"
23+
- "8787:8787"
24+
- "9990:9990"
25+
volumes:
26+
dbdata:

‎pom.xml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<artifactId>imixs-process-manager</artifactId>
77
<packaging>war</packaging>
88
<name>imixs-process-manager</name>
9-
<version>2.1.1</version>
9+
<version>2.1.2</version>
1010
<description>Imixs Process Manager</description>
1111
<url>https://github.com/imixs/imixs-process-manager</url>
1212
<organization>
@@ -58,6 +58,7 @@
5858
<properties>
5959
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
6060
<org.imixs.workflow.version>6.1.4</org.imixs.workflow.version>
61+
<org.imixs.marty.version>5.1.0</org.imixs.marty.version>
6162
<org.imixs.micro.version>1.0.0</org.imixs.micro.version>
6263
<microprofile.version>6.0</microprofile.version>
6364
<junit.jupiter.version>5.9.2</junit.jupiter.version>
@@ -482,6 +483,13 @@
482483
<artifactId>imixs-workflow-index-solr</artifactId> <version>${org.imixs.workflow.version}</version>
483484
</dependency> -->
484485

486+
<!-- Imixs Marty -->
487+
<dependency>
488+
<groupId>org.imixs.workflow</groupId>
489+
<artifactId>imixs-marty</artifactId>
490+
<version>${org.imixs.marty.version}</version>
491+
</dependency>
492+
485493

486494
<!-- Testing -->
487495
<dependency>

‎src/main/java/org/imixs/application/ui/TeamController.java‎

Lines changed: 0 additions & 105 deletions
This file was deleted.

src/main/java/org/imixs/application/ui/TeamlistController.java renamed to src/main/java/org/imixs/application/ui/view/TeamlistController.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
package org.imixs.application.ui;
1+
package org.imixs.application.ui.view;
22

33
import java.io.Serializable;
44
import java.util.logging.Logger;
55

6+
import org.imixs.workflow.faces.data.ViewController;
7+
68
import jakarta.annotation.PostConstruct;
79
import jakarta.faces.view.ViewScoped;
810
import jakarta.inject.Named;
911

10-
import org.imixs.workflow.faces.data.ViewController;
11-
1212
/**
1313
* Select the list of teams sorted by name
1414
*

‎src/main/resources/META-INF/persistence.xml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<persistence xmlns="https://jakarta.ee/xml/ns/persistence"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd"
5-
version="3.0">
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd"
5+
version="3.0">
66

77
<!--
88
Imixs JPA definition Make sure that the imixs-workflow-jee library
99
version maches the version provided by the EAR/EJB
1010
-->
1111

1212
<!-- eclipselink -->
13-
<persistence-unit name="org.imixs.workflow.jpa" transaction-type="JTA">
14-
<!-- -->
13+
<persistence-unit name="org.imixs.workflow.jpa" transaction-type="JTA">
14+
<!-- -->
1515
<provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
16-
16+
1717
<jta-data-source>jdbc/workflow</jta-data-source>
1818
<jar-file>lib/imixs-workflow-engine-${org.imixs.workflow.version}.jar</jar-file>
19+
<jar-file>lib/imixs-marty-${org.imixs.marty.version}.jar</jar-file>
1920
<properties>
2021
<!-- target-database Auto MySQL PostgreSQL -->
2122
<property name="eclipselink.target-database" value="Auto" />
2223
<property name="eclipselink.ddl-generation" value="create-or-extend-tables" />
2324
<property name="eclipselink.deploy-on-startup" value="true" />
24-
<property name="eclipselink.logging.level" value="INFO" />
25+
<property name="eclipselink.logging.level" value="INFO" />
2526

2627
<!-- disable 2nd level cache
2728
<property name="eclipselink.cache.shared.default" value="false" />
2829
<property name="eclipselink.query-results-cache" value="false"/>
2930
-->
30-
31+
3132
<!-- hybernate
3233
<property name="hibernate.hbm2ddl.auto" value="update"/>
3334
-->
34-
</properties>
35+
</properties>
3536
</persistence-unit>
36-
37-
38-
39-
</persistence>
37+
38+
39+
</persistence>

‎src/main/resources/imixs.properties‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,23 @@
55
# Mail Plugin configuration
66
mail.defaultSender=info@mydomain.com
77

8-
# Default Model
9-
model.default.data=ticket.bpmn
8+
##############################
9+
# Model Setup
10+
##############################
11+
model.default.data=ticket.bpmn;system-en-1.3.0.bpmn
12+
setup.system.model=system-en-1.3
13+
14+
15+
##############################
16+
# Marty Security
17+
##############################
18+
security.setup.mode=auto
19+
security.userid.input.mode=LOWERCASE
20+
security.email.unique=false
1021

1122

23+
##############################
24+
# Lucene Index
25+
##############################
1226
index.fields.analyze=
1327
index.fields=description

0 commit comments

Comments
 (0)
⚡