refactoring

Issue #182
imixs · Jun 11, 2023 · 5e33503 · 5e33503
1 parent 2bc2a62
commit 5e33503
Show file tree

Hide file tree

Showing 8 changed files with 116 additions and 14 deletions.
diff --git a/docker-compose-test.yml b/docker-compose-test.yml
@@ -0,0 +1,102 @@
+version: "3"
+services:
+  ##################
+  # Database
+  ##################
+  db:
+    image: postgres:9.6.1
+    environment:
+      POSTGRES_PASSWORD: adminadmin
+      POSTGRES_DB: office
+    volumes:
+      - dbdata:/var/lib/postgresql/data
+
+  ##################
+  # Imixs-Office-Worklfow
+  ##################
+  imixs-office:
+    image: imixs/imixs-office-workflow:latest
+    depends_on:
+      - db
+    environment:
+      JAVA_OPTS: "-Dnashorn.args=--no-deprecation-warning"
+      POSTGRES_USER: "postgres"
+      POSTGRES_PASSWORD: "adminadmin"
+      POSTGRES_CONNECTION: "jdbc:postgresql://db/office"
+      TZ: "Europe/Berlin"
+      MAILGATEWAY: "localhost"
+    ports:
+      - "8080:8080"
+      - "8787:8787"
+      - "9990:9990"            
+
+  ##################
+  # Exporter Service
+  ##################
+  imixsexporter-app:
+    image: imixs/imixs-archive-exporter:latest
+    environment:
+      WILDFLY_PASS: adminadmin
+      DEBUG: "true"
+
+      # EXAMPLE SETUP
+      WORKFLOW_SERVICE_ENDPOINT: "http://imixs-office:8080/api"
+      WORKFLOW_SERVICE_USER: "dataservice"
+      WORKFLOW_SERVICE_PASSWORD: "adminadmin"
+      WORKFLOW_SERVICE_AUTHMETHOD: "form"
+
+      METRICS_ENDPOINT: "http://localhost:9991/metrics"
+      HEALTH_ENDPOINT: "http://localhost:9991/health"
+      # Optional FTP Export
+      #EXPORT_FTP_HOST: "ftp.storage.foo"
+      #EXPORT_FTP_PATH: "/test/export-service/"
+      #EXPORT_FTP_PORT: "21"
+      #EXPORT_FTP_USER: ""
+      #EXPORT_FTP_PASSWORD: ""
+    ports:
+      - "8081:8080"
+      - "8788:8787"      
+      - "9991:9990"
+    volumes:
+      - ./imixs-archive-exporter/docker/deployments:/opt/jboss/wildfly/standalone/deployments/
+
+  ##################
+  # Backup Service
+  ##################
+  imixsbackup-app:
+    image: imixs/imixs-archive-backup:latest
+    environment:
+      WILDFLY_PASS: adminadmin
+      DEBUG: "true"
+
+      # EXAMPLE SETUP
+      WORKFLOW_SERVICE_ENDPOINT: "http://imixs-office:8080/api"
+      WORKFLOW_SERVICE_USER: "dataservice"
+      WORKFLOW_SERVICE_PASSWORD: "adminadmin"
+      WORKFLOW_SERVICE_AUTHMETHOD: "form"
+
+      EXPORT_FTP_HOST: "ftp.storage.foo"
+      EXPORT_FTP_PATH: "/test/backup-service"
+      EXPORT_FTP_PORT: "21"
+      EXPORT_FTP_USER: ""
+      EXPORT_FTP_PASSWORD: ""
+
+      METRICS_ENDPOINT: "http://localhost:9992/metrics"
+      HEALTH_ENDPOINT: "http://localhost:9992/health"
+    ports:
+      - "8082:8080"
+      - "8789:8787"      
+      - "9992:9990"
+    volumes:
+      - ./imixs-archive-backup/docker/deployments:/opt/jboss/wildfly/standalone/deployments/
+
+  ##################
+  # Admin Client
+  ##################
+  imixsadmin:
+    image: imixs/imixs-admin
+    ports:
+      - "8888:8080"
+
+volumes:
+  dbdata:
diff --git a/imixs-archive-backup/src/main/java/org/imixs/archive/backup/BackupController.java b/imixs-archive-backup/src/main/java/org/imixs/archive/backup/BackupController.java
@@ -12,7 +12,7 @@
 import org.eclipse.microprofile.metrics.MetricID;
 import org.eclipse.microprofile.metrics.MetricRegistry;
 import org.eclipse.microprofile.metrics.annotation.RegistryType;
-import org.imixs.archive.util.LogController;
+import org.imixs.archive.backup.util.LogController;
 
 import jakarta.enterprise.context.RequestScoped;
 import jakarta.inject.Inject;

diff --git a/imixs-archive-backup/src/main/java/org/imixs/archive/backup/BackupService.java b/imixs-archive-backup/src/main/java/org/imixs/archive/backup/BackupService.java
@@ -27,9 +27,9 @@
 import java.util.logging.Logger;
 
 import org.eclipse.microprofile.config.inject.ConfigProperty;
-import org.imixs.archive.util.FTPConnector;
-import org.imixs.archive.util.LogController;
-import org.imixs.archive.util.RestClientHelper;
+import org.imixs.archive.backup.util.FTPConnector;
+import org.imixs.archive.backup.util.LogController;
+import org.imixs.archive.backup.util.RestClientHelper;
 import org.imixs.melman.DocumentClient;
 import org.imixs.melman.EventLogClient;
 import org.imixs.melman.RestAPIException;

diff --git a/imixs-archive-backup/src/main/java/org/imixs/archive/backup/RestoreController.java b/imixs-archive-backup/src/main/java/org/imixs/archive/backup/RestoreController.java
@@ -6,7 +6,7 @@
 import java.util.logging.Logger;
 
 import org.eclipse.microprofile.config.inject.ConfigProperty;
-import org.imixs.archive.util.LogController;
+import org.imixs.archive.backup.util.LogController;
 import org.imixs.workflow.ItemCollection;
 
 import jakarta.enterprise.context.RequestScoped;

diff --git a/imixs-archive-backup/src/main/java/org/imixs/archive/backup/RestoreService.java b/imixs-archive-backup/src/main/java/org/imixs/archive/backup/RestoreService.java
@@ -30,9 +30,9 @@
 import org.apache.commons.net.ftp.FTPFile;
 import org.apache.commons.net.ftp.FTPSClient;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
-import org.imixs.archive.util.FTPConnector;
-import org.imixs.archive.util.LogController;
-import org.imixs.archive.util.RestClientHelper;
+import org.imixs.archive.backup.util.FTPConnector;
+import org.imixs.archive.backup.util.LogController;
+import org.imixs.archive.backup.util.RestClientHelper;
 import org.imixs.melman.DocumentClient;
 import org.imixs.melman.RestAPIException;
 import org.imixs.workflow.ItemCollection;

diff --git a/.../org/imixs/archive/util/FTPConnector.java → ...ixs/archive/backup/util/FTPConnector.java b/.../org/imixs/archive/util/FTPConnector.java → ...ixs/archive/backup/util/FTPConnector.java
@@ -20,7 +20,7 @@
  *  	Imixs Software Solutions GmbH - initial API and implementation
  *  	Ralph Soika
  *******************************************************************************/
-package org.imixs.archive.util;
+package org.imixs.archive.backup.util;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

diff --git a/...org/imixs/archive/util/LogController.java → ...xs/archive/backup/util/LogController.java b/...org/imixs/archive/util/LogController.java → ...xs/archive/backup/util/LogController.java
@@ -1,4 +1,4 @@
-package org.imixs.archive.util;
+package org.imixs.archive.backup.util;
 
 import java.io.Serializable;
 import java.text.SimpleDateFormat;
@@ -91,8 +91,8 @@ public List<String> getLogEntries(String context) {
         return logTopics.get(context);
     }
 
-//    public void setLogEntries(List<String> logEntries) {
-//        this.logEntries = logEntries;
-//    }
+    // public void setLogEntries(List<String> logEntries) {
+    // this.logEntries = logEntries;
+    // }
 
 }
diff --git a/.../imixs/archive/util/RestClientHelper.java → ...archive/backup/util/RestClientHelper.java b/.../imixs/archive/util/RestClientHelper.java → ...archive/backup/util/RestClientHelper.java
@@ -1,4 +1,4 @@
-package org.imixs.archive.util;
+package org.imixs.archive.backup.util;
 
 import java.io.Serializable;
 import java.util.List;