Fix pd

Apromore-Boot/src/main/resources/application.yml

@@ -138,8 +138,8 @@ site:
 spring:
   datasource:
     password: Apromore#!dev
-    url: jdbc:h2:mem:Manager-Repository;DATABASE_TO_UPPER=FALSE;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE
-#    url : jdbc:mysql://localhost:3306/apromore?createDatabaseIfNotExist=true&autoReconnect=true&allowMultiQueries=true&rewriteBatchedStatements=true&characterEncoding=utf-8&serverTimezone=GMT%2B10
+#    url: jdbc:h2:mem:Manager-Repository;DATABASE_TO_UPPER=FALSE;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE
+    url : jdbc:mysql://localhost:3306/apromore?createDatabaseIfNotExist=true&autoReconnect=true&allowMultiQueries=true&rewriteBatchedStatements=true&characterEncoding=utf-8&serverTimezone=GMT%2B10
     username: apromore
   jpa:
     hibernate:
@@ -149,9 +149,9 @@ spring:
         physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
   liquibase:
     change-log: classpath:db/migration/changeLog.yaml
-    contexts: H2
+    contexts: MYSQL
     password: Apromore#!dev
-    user: apromore
+    user: liquibase_user
 
 
 storage:

Apromore-Boot/src/main/resources/i18n.properties

@@ -0,0 +1,3 @@
+i18n.enable = false
+i18n.languagetags = en|ja
+i18n.datetimepatterns = dd MMM yy, HH:mm|yyyy年MM月dd日, HH:mm

Apromore-Commons/src/main/java/org/apromore/commons/config/ConfigBean.java

@@ -24,6 +24,7 @@
 
 package org.apromore.commons.config;
 
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -33,6 +34,7 @@
 @NoArgsConstructor
 @AllArgsConstructor
 @ConfigurationProperties
+@Qualifier("configBean")
 public class ConfigBean {
   private String logsDir = "../Event-Logs-Repository";
   private String numOfEvent;
@@ -48,6 +50,8 @@ public class ConfigBean {
 
   private int maxEventCount = 1000000;
 
+  private String volumeExportDir;
+
   @Data
   public class Site {
     private String editor;

Apromore-Core-Components/Apromore-Portal/src/main/java/org/apromore/portal/common/i18n/I18nConfig.java

@@ -21,62 +21,68 @@
  */
 package org.apromore.portal.common.i18n;
 
-import org.zkoss.util.Locales;
-import org.zkoss.web.Attributes;
-import org.zkoss.zk.ui.Sessions;
-import org.zkoss.zk.ui.util.Clients;
-
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
-import java.util.LinkedHashMap;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
 import lombok.Getter;
 
+@Component("i18nConfig")
 public class I18nConfig {
 
-    @Getter private Map<Locale, String> supportedLocales;
-    @Getter private boolean enabled;
+  @Getter
+  private Map<Locale, String> supportedLocales;
+  @Getter
+  private boolean enabled;
 
-    /**
-     * Constructor
-     *
-     * @param languageTagList  Vertically-separated list of string languageTags
-     * @param dateTimePatternList  Vertically-separated list of string Date Time patterns
-     */
-    public I18nConfig(boolean enabled, String languageTagList, String dateTimePatternList) {
-        this.enabled = enabled;
-        supportedLocales = new LinkedHashMap<>();
-        List<String> languageTags = Arrays.asList(languageTagList.split("\\|"));
-        List<String> dateTimePatterns = Arrays.asList(dateTimePatternList.split("\\|"));
-        if (languageTags.size() == 0 || languageTags.size() != dateTimePatterns.size()) {
-            return;
-        }
-        for (int i = 0 ; i < languageTags.size() ; i++) {
-            Locale locale = Locale.forLanguageTag(languageTags.get(i));
-            String dateTimePattern = dateTimePatterns.get(i);
-            // Fix encoding issue in site.properties
-            dateTimePattern = new String(dateTimePattern.getBytes(StandardCharsets.ISO_8859_1), StandardCharsets.UTF_8);
-            supportedLocales.put(locale, dateTimePattern);
-        }
-    }
+  /**
+   * Constructor
+   *
+   * @param languageTagList Vertically-separated list of string languageTags
+   * @param dateTimePatternList Vertically-separated list of string Date Time patterns
+   */
 
-    public boolean isSupported(Locale locale) {
-        return supportedLocales.containsKey(locale);
-    }
+  public I18nConfig(@Value("${i18n.enable}") boolean enabled,
+      @Value("${i18n.languagetags}") String languageTagList,
+      @Value("${i18n.datetimepatterns}") String dateTimePatternList) {
 
-    public String getDateTimePattern(Locale locale) {
-        return supportedLocales.get(locale);
+    this.enabled = enabled;
+    supportedLocales = new LinkedHashMap<>();
+    List<String> languageTags = Arrays.asList(languageTagList.split("\\|"));
+    List<String> dateTimePatterns = Arrays.asList(dateTimePatternList.split("\\|"));
+    if (languageTags.size() == 0 || languageTags.size() != dateTimePatterns.size()) {
+      return;
+    }
+    for (int i = 0; i < languageTags.size(); i++) {
+      Locale locale = Locale.forLanguageTag(languageTags.get(i));
+      String dateTimePattern = dateTimePatterns.get(i);
+      // Fix encoding issue in site.properties
+      dateTimePattern =
+          new String(dateTimePattern.getBytes(StandardCharsets.ISO_8859_1), StandardCharsets.UTF_8);
+      supportedLocales.put(locale, dateTimePattern);
     }
+  }
+
+  public boolean isSupported(Locale locale) {
+    return supportedLocales.containsKey(locale);
+  }
+
+  public String getDateTimePattern(Locale locale) {
+    return supportedLocales.get(locale);
+  }
 
-    public LinkedHashMap<String, String> getSelectionSet() {
-        LinkedHashMap<String, String> selectionSet = new LinkedHashMap<>();
-        for (Map.Entry<Locale, String> entry: supportedLocales.entrySet()) {
-            Locale locale = entry.getKey();
-            selectionSet.put(locale.toLanguageTag(), locale.getDisplayName(locale) + " (" + locale.getDisplayName() + ")");
-        }
-        return selectionSet;
+  public LinkedHashMap<String, String> getSelectionSet() {
+    LinkedHashMap<String, String> selectionSet = new LinkedHashMap<>();
+    for (Map.Entry<Locale, String> entry : supportedLocales.entrySet()) {
+      Locale locale = entry.getKey();
+      selectionSet.put(locale.toLanguageTag(),
+          locale.getDisplayName(locale) + " (" + locale.getDisplayName() + ")");
     }
+    return selectionSet;
+  }
 
 }

Apromore-Core-Components/Apromore-Portal/src/main/java/org/apromore/portal/config/PortalWebConfig.java

@@ -1,30 +1,20 @@
 /**
- * #%L
- * This file is part of "Apromore Core".
- * %%
- * Copyright (C) 2018 - 2021 Apromore Pty Ltd.
- * %%
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
+ * #%L This file is part of "Apromore Core". %% Copyright (C) 2018 - 2021 Apromore Pty Ltd. %% This
+ * program is free software: you can redistribute it and/or modify it under the terms of the GNU
+ * Lesser General Public License as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
+ * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Lesser Public License for more details.
  *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * <http://www.gnu.org/licenses/lgpl-3.0.html>.
- * #L%
+ * You should have received a copy of the GNU General Lesser Public License along with this program.
+ * If not, see <http://www.gnu.org/licenses/lgpl-3.0.html>. #L%
  */
 package org.apromore.portal.config;
 
 import java.util.ArrayList;
 import java.util.List;
-
-import org.apromore.plugin.Plugin;
 import org.apromore.plugin.editor.EditorPlugin;
 import org.apromore.plugin.portal.FileImporterPlugin;
 import org.apromore.plugin.portal.PortalPlugin;
@@ -40,81 +30,83 @@
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.security.web.firewall.HttpFirewall;
 import org.springframework.security.web.firewall.StrictHttpFirewall;
-import org.zkoss.spring.SpringUtil;
 
 @Configuration
 @PropertySource(value = {"classpath:git.properties"})
+@PropertySource(value = "classpath:i18n.properties", encoding = "UTF-8")
 public class PortalWebConfig {
 
-	@Autowired
-	List<PortalPlugin> portalPlugins;
-
-	@Autowired(required = false)
-	List<PortalProcessAttributePlugin> portalProcessAttributePlugin = new ArrayList<PortalProcessAttributePlugin>();
-
-	@Autowired(required = false)
-	List<FileImporterPlugin> fileImporterPlugins = new ArrayList<FileImporterPlugin>();
-
-	@Autowired(required = false)
-	List<EditorPlugin> editorPlugins = new ArrayList<EditorPlugin>();
-
-	@Bean
-	public List<EditorPlugin> editorPlugins() {
-		return editorPlugins;
-	}
-
-	@Bean
-	public List<EditorPlugin> bpmnEditorPlugins() {
-		return editorPlugins;
-	}
-
-	@Bean
-	public List<FileImporterPlugin> fileImporterPlugins() {
-		return fileImporterPlugins;
-	}
-
-	@Bean
-	public List<PortalProcessAttributePlugin> portalProcessAttributePlugins() {
-		return portalProcessAttributePlugin;
-	}
-
-	@Bean
-	public List<PortalPlugin> portalPlugins() {
-		return portalPlugins;
-	}
-
-	@Bean
-	public ExplicitComparator portalMenuOrder(@Value("${portal.menuorder}") String menuOrder) {
-		return new ExplicitComparator(menuOrder);
-	}
-
-	@Bean
-	public ExplicitComparator portalFileMenuitemOrder(@Value("${portal.menuitemorder.File}") String menuItemFile) {
-		return new ExplicitComparator(menuItemFile);
-	}
-
-	@Bean
-	public ServletRegistrationBean exampleServletBean() {
-		ServletRegistrationBean bean = new ServletRegistrationBean(new PortalPluginResourceServlet(),
-				"/portalPluginResource/*");
-		bean.setLoadOnStartup(1);
-		return bean;
-	}
-
-	@Bean
-	public ServletRegistrationBean dataChannel() {
-		ServletRegistrationBean bean = new ServletRegistrationBean(new DataChannelServlet(),
-				"/dataRequest/*");
-		bean.setLoadOnStartup(1);
-		return bean;
-	}
-
-//	This bean allows spaces which are url encoded
-	@Bean
-    public HttpFirewall allowUrlEncodedSlashHttpFirewall() {
-        StrictHttpFirewall firewall = new StrictHttpFirewall();
-        firewall.setAllowUrlEncodedPercent(true);    
-        return firewall;
-    }
+  @Autowired
+  List<PortalPlugin> portalPlugins;
+
+  @Autowired(required = false)
+  List<PortalProcessAttributePlugin> portalProcessAttributePlugin =
+      new ArrayList<PortalProcessAttributePlugin>();
+
+  @Autowired(required = false)
+  List<FileImporterPlugin> fileImporterPlugins = new ArrayList<FileImporterPlugin>();
+
+  @Autowired(required = false)
+  List<EditorPlugin> editorPlugins = new ArrayList<EditorPlugin>();
+
+  @Bean
+  public List<EditorPlugin> editorPlugins() {
+    return editorPlugins;
+  }
+
+  @Bean
+  public List<EditorPlugin> bpmnEditorPlugins() {
+    return editorPlugins;
+  }
+
+  @Bean
+  public List<FileImporterPlugin> fileImporterPlugins() {
+    return fileImporterPlugins;
+  }
+
+  @Bean
+  public List<PortalProcessAttributePlugin> portalProcessAttributePlugins() {
+    return portalProcessAttributePlugin;
+  }
+
+  @Bean
+  public List<PortalPlugin> portalPlugins() {
+    return portalPlugins;
+  }
+
+  @Bean
+  public ExplicitComparator portalMenuOrder(@Value("${portal.menuorder}") String menuOrder) {
+    return new ExplicitComparator(menuOrder);
+  }
+
+  @Bean
+  public ExplicitComparator portalFileMenuitemOrder(
+      @Value("${portal.menuitemorder.File}") String menuItemFile) {
+    return new ExplicitComparator(menuItemFile);
+  }
+
+  @Bean
+  public ServletRegistrationBean exampleServletBean() {
+    ServletRegistrationBean bean =
+        new ServletRegistrationBean(new PortalPluginResourceServlet(), "/portalPluginResource/*");
+    bean.setLoadOnStartup(1);
+    return bean;
+  }
+
+  @Bean
+  public ServletRegistrationBean dataChannel() {
+    ServletRegistrationBean bean =
+        new ServletRegistrationBean(new DataChannelServlet(), "/dataRequest/*");
+    bean.setLoadOnStartup(1);
+    return bean;
+  }
+
+  // This bean allows spaces which are url encoded
+  @Bean
+  public HttpFirewall allowUrlEncodedSlashHttpFirewall() {
+    StrictHttpFirewall firewall = new StrictHttpFirewall();
+    firewall.setAllowUrlEncodedPercent(true);
+    return firewall;
+  }
 
 }

Apromore-Core-Components/Apromore-Portal/src/main/java/org/apromore/portal/dialogController/ImportController.java

@@ -144,7 +144,7 @@ public void show(String message) {
     };
 
     try {
-      final Window win = (Window) Executions.createComponents("macros/import.zul", null, null);
+      final Window win = (Window) Executions.createComponents("~./macros/import.zul", null, null);
       this.importWindow = (Window) win.getFellow("importWindow");
       Button uploadButton = (Button) this.importWindow.getFellow("uploadButton");
       uploadButton.setClientDataAttribute(MAX_UPLOAD_SIZE, Long.toString(this.maxUploadSize));