draft

Issue #1

Dockerfile

@@ -1,11 +1,20 @@
-FROM imixs/wildfly:1.2.7
+FROM open-liberty:kernel
+
+
+# Imixs-Documents
+MAINTAINER [email protected]
+
+# Copy postgres JDBC driver
+COPY ./src/docker/configuration/openliberty/postgresql-9.4.1212.jar /opt/ol/wlp/lib
+
+# Add config
+COPY --chown=1001:0 ./src/docker/configuration/openliberty/server.xml /config/
+
+# Activate Debug Mode...
+#COPY --chown=1001:0 ./src/docker/configuration/openliberty/jvm.options /config/
+
+# Copy sample application
+COPY ./target/imixs-documents.war /config/dropins/
 
-# Setup configuration
-COPY ./src/docker/configuration/imixsrealm.properties ${WILDFLY_CONFIG}/
-COPY ./src/docker/configuration/standalone.xml ${WILDFLY_CONFIG}/
 
-# OPTIONAL: copy the standalone.conf file for custom VM setup (e.g. heap size)
-#COPY ./src/docker/configuration/standalone.conf ${WILDFLY_HOME}/bin/
 
-# Deploy artefact
-COPY ./target/*.war ${WILDFLY_DEPLOYMENT}/

Dockerfile-dev

@@ -0,0 +1,20 @@
+FROM open-liberty:kernel
+
+
+# Imixs-Documents
+MAINTAINER [email protected]
+
+# Copy postgres JDBC driver
+COPY ./src/docker/configuration/openliberty/postgresql-9.4.1212.jar /opt/ol/wlp/lib
+
+# Add config
+COPY --chown=1001:0 ./src/docker/configuration/openliberty/server-dev.xml /config/server.xml
+
+# Activate Debug Mode...
+COPY --chown=1001:0 ./src/docker/configuration/openliberty/jvm.options /config/
+
+# Copy sample application
+COPY ./target/imixs-documents.war /config/dropins/
+
+
+

HOTDEPLOY.md

@@ -0,0 +1,6 @@
+# Hotdeploy
+
+See this guide:
+
+https://github.com/OpenLiberty/open-liberty/issues/1527
+

docker-compose-dev.yml

@@ -12,20 +12,20 @@ services:
     depends_on:
       - db
     environment:
-      WILDFLY_PASS: adminadmin
-      DEBUG: "true"
       POSTGRES_USER: "postgres"
       POSTGRES_PASSWORD: "adminadmin"
       POSTGRES_CONNECTION: "jdbc:postgresql://db/office"      
+      TZ: "Europe/Berlin"
     ports:
-      - "8080:8080"
-      - "9990:9990"
-      - "8787:8787"
+      - "9080:9080"
+      - "9443:9443"
+      - "7777:7777"
     volumes:
-        - ~/git/imixs-documents/src/docker/deployments:/opt/wildfly/standalone/deployments/
+      - ~/git/imixs-documents/src/docker/deployments:/config/dropins/ 
+
 
-  imixsadmin:
-    image: imixs/imixs-admin
-    ports:
-      - "8888:8080"
+#  imixsadmin:
+#    image: imixs/imixs-admin
+#    ports:
+#      - "8888:8080"
 

docker-compose.yml

@@ -0,0 +1,32 @@
+version: "3.1"
+services:
+
+  db:
+    image: postgres:9.6.1
+    environment:
+      POSTGRES_PASSWORD: adminadmin
+      POSTGRES_DB: office
+
+  app:
+    image: imixs/imixs-documents
+    depends_on:
+      - db
+    environment:
+      POSTGRES_USER: "postgres"
+      POSTGRES_PASSWORD: "adminadmin"
+      POSTGRES_CONNECTION: "jdbc:postgresql://db/office"      
+      TZ: "Europe/Berlin"
+    ports:
+      - "9080:9080"
+      - "9443:9443"
+      - "7777:7777"
+#    volumes:
+#      - ~/git/imixs-jsf-example/src/docker/deployments:/config/dropins/   
+
+
+
+
+#  imixsadmin:
+#    image: imixs/imixs-admin
+#    ports:
+#      - "8888:8

pom.xml

@@ -5,7 +5,7 @@
 	<artifactId>imixs-documents</artifactId>
 	<packaging>war</packaging>
 	<name>Imixs Documents</name>
-	<version>0.0.1</version>
+	<version>0.1.0</version>
 	<description>Imixs Documents - A collaboration platform for documents. </description>
 
 	<organization>
@@ -56,7 +56,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<org.imixs.workflow.version>4.5.0</org.imixs.workflow.version>
+		<org.imixs.workflow.version>5.1.10-SNAPSHOT</org.imixs.workflow.version>
 		<custom.webResources>src/main/webapp</custom.webResources>
 		<custom.unpackTypes>war</custom.unpackTypes>
 		<lucene.version>7.5.0</lucene.version>
@@ -66,16 +66,16 @@
 		<maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format>
 
 		<!-- Dependency Versions -->
-		<org.imixs.workflow.version>4.5.2</org.imixs.workflow.version>
-		<org.imixs.marty.version>3.4.2</org.imixs.marty.version>
-		<org.imixs.office.version>3.5.1</org.imixs.office.version>
-		<!-- 6.6.1 -->
-		<lucene.version>7.5.0</lucene.version>
-		<org.imixs.adapters.version>1.6.0</org.imixs.adapters.version>
+		<org.imixs.workflow.version>5.1.10-SNAPSHOT</org.imixs.workflow.version>
+		<org.imixs.marty.version>4.1.3-SNAPSHOT</org.imixs.marty.version>
+		<org.imixs.office.version>4.1.3-SNAPSHOT</org.imixs.office.version>
 		<org.imixs.archive.version>1.2.2</org.imixs.archive.version>
-		<apache.poi.version>3.17</apache.poi.version>
-		<apache.pdfbox.version>2.0.12</apache.pdfbox.version>
-		<apache.tika.version>1.16</apache.tika.version>
+		<org.imixs.adapters.version>2.0.0</org.imixs.adapters.version>
+		<org.imixs.archive.version>2.1.0</org.imixs.archive.version>
+		<org.imixs.melman.version>1.0.9</org.imixs.melman.version>
+		<apache.poi.version>4.0.0</apache.poi.version>
+		<apache.pdfbox.version>[2.0.15,)</apache.pdfbox.version>
+		<apache.tika.version>[1.20,)</apache.tika.version>
 
 		<custom.webResources>src/main/webapp</custom.webResources>
 
@@ -150,9 +150,9 @@
 				</plugins>
 			</build>
 		</profile>    
-
+		
 		<profile>
-			<id>docker-build</id>
+			<id>dev</id>
 			<build>
 				<plugins>
 					<plugin>
@@ -163,10 +163,11 @@
 							<execution>
 								<phase>install</phase>
 								<configuration>
-
 									<target>
 										<exec executable="docker">
 											<arg value="build" />
+											<arg value="-f" />
+											<arg value="Dockerfile-dev" />
 											<arg value="-t" />
 											<arg value="imixs/imixs-documents" />
 											<arg value="./" />
@@ -182,7 +183,9 @@
 
 				</plugins>
 			</build>
-		</profile>
+		</profile>    
+
+
 	</profiles>
 
 	<build>
@@ -250,6 +253,8 @@
 			</plugin>
 
 		</plugins>
+
+		<finalName>imixs-documents</finalName>
 	</build>
 
 	<dependencies>
@@ -297,6 +302,11 @@
 			<version>${org.imixs.workflow.version}</version>
 			<scope>compile</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.imixs.workflow</groupId>
+			<artifactId>imixs-workflow-index-lucene</artifactId>
+			<version>${org.imixs.workflow.version}</version>
+		</dependency>
 
 		<!-- Marty -->
 		<dependency>
@@ -330,35 +340,6 @@
 
 
 
-		<!-- Apache Lucene -->
-		<dependency>
-			<groupId>org.apache.lucene</groupId>
-			<artifactId>lucene-core</artifactId>
-			<version>${lucene.version}</version>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.lucene</groupId>
-			<artifactId>lucene-analyzers-common</artifactId>
-			<version>${lucene.version}</version>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.lucene</groupId>
-			<artifactId>lucene-queryparser</artifactId>
-			<version>${lucene.version}</version>
-			<scope>compile</scope>
-		</dependency>
-
-
-		<!-- QR-Code service -->
-		<dependency>
-			<groupId>org.imixs.workflow</groupId>
-			<artifactId>imixs-adapters-qrcode</artifactId>
-			<version>${org.imixs.adapters.version}</version>
-			<scope>runtime</scope>
-		</dependency>
-
 		<!-- Imixs-Archive -->
 		<dependency>
 			<groupId>org.imixs.workflow</groupId>

src/docker/configuration/openliberty/README.md

@@ -0,0 +1,24 @@
+# Open Liberty
+
+This folder contains configuration files used to build a docker container running Open Libertry
+
+To build the Docker Image for Payara run:
+
+	$ mvn clean install -Pdocker-build-openliberty
+
+After you have build the payara image with the sample application you can start the corresponding Docker-Stack with:
+
+	$ docker-compose -f docker-compose-openliberty.yml up
+
+and run the sample applciation at:
+
+	http://localhost:9080/
+
+
+## Configuration
+
+You can find the server configuration details for the Open Libertry server in the config directory
+
+	/src/docker/configuration/openliberty/
+
+

src/docker/configuration/openliberty/jvm.options

@@ -0,0 +1,2 @@
+-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=7777
+-Dcom.ibm.ws.app.manager.minorUpdateFileExtensions=.html,.png,.jpg,.xhtml