Minor bug fix

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

@@ -1,3 +1,3 @@
-i18n.enable = false
+i18n.enable = true
 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,7 +24,6 @@
 
 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;
@@ -34,7 +33,6 @@
 @NoArgsConstructor
 @AllArgsConstructor
 @ConfigurationProperties
-@Qualifier("configBean")
 public class ConfigBean {
   private String logsDir = "../Event-Logs-Repository";
   private String numOfEvent;

Apromore-Core-Components/Apromore-Manager/src/main/java/org/apromore/service/EventLogService.java

@@ -31,6 +31,7 @@
 import java.util.List;
 import org.apromore.apmlog.APMLog;
 import org.apromore.calendar.model.CalendarModel;
+import org.apromore.commons.config.ConfigBean;
 import org.apromore.dao.model.Log;
 import org.apromore.dao.model.User;
 import org.apromore.exception.ImportException;
@@ -148,5 +149,7 @@ void cloneLog(String username, Integer folderId, String logName, Integer sourcel
    * @throws ObjectCreationException
    */
   boolean saveFileToVolume(String filename, String volumePath, String prefix,
-                           ByteArrayOutputStream baos) throws IOException, ObjectCreationException;
+      ByteArrayOutputStream baos) throws IOException, ObjectCreationException;
+
+  ConfigBean getConfigBean();
 }

Apromore-Core-Components/Apromore-Manager/src/main/java/org/apromore/service/impl/EventLogServiceImpl.java

@@ -94,6 +94,7 @@
 import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
+import lombok.Getter;
 
 
 /**
@@ -116,7 +117,9 @@ public class EventLogServiceImpl implements EventLogService {
   private UsermetadataRepository usermetadataRepo;
   private TemporaryCacheService tempCacheService;
   private StorageManagementFactory<StorageClient> storageFactory;
-  private ConfigBean config;
+
+  @Getter
+  private ConfigBean configBean;
   private EventLogFileService logFileService;
   private StorageRepository storageRepository;
   private CustomCalendarRepository customCalendarRepository;
@@ -156,7 +159,7 @@ public EventLogServiceImpl(final LogRepository logRepository,
     this.usermetadataRepo = usermetadataRepository;
     this.tempCacheService = temporaryCacheService;
     this.storageFactory = storageFactory;
-    this.config = configBean;
+    this.configBean = configBean;
     this.logFileService = logFileService;
     this.storageRepository = storageRepository;
     this.customCalendarRepository = customCalendarRepository;
@@ -388,14 +391,14 @@ private void updateLogName(Log log, String newName) throws Exception {
       String file_name = log.getFilePath() + "_" + log.getName() + ".xes.gz";
       String new_file_name = log.getFilePath() + "_" + newName + ".xes.gz";
       Storage storage = new Storage();
-      storage.setStoragePath(config.getStoragePath());
+      storage.setStoragePath(configBean.getStoragePath());
       storage.setKey(new_file_name);
       storage.setPrefix("log");
       log.setStorage(storageRepository.saveAndFlush(storage));
 
       StorageClient currentStorage = storageFactory
-          .getStorageClient("FILE" + StorageType.STORAGE_PATH_SEPARATOR + config.getLogsDir());
-      StorageClient newStorage = storageFactory.getStorageClient(config.getStoragePath());
+          .getStorageClient("FILE" + StorageType.STORAGE_PATH_SEPARATOR + configBean.getLogsDir());
+      StorageClient newStorage = storageFactory.getStorageClient(configBean.getStoragePath());
 
       OutputStream outputStream;
 

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

@@ -126,7 +126,7 @@ private void populateMenubar(Menubar menubar) {
         if (plugin.getResourceAsStream(plugin.getIconPath()) != null) {
           try {
             menuitem.setClientDataAttribute("itemCode", itemCode);
-            menuitem.setImage("portalPluginResource/" + URLEncoder.encode(group, "utf-8") + "/"
+            menuitem.setImage("/portalPluginResource/" + URLEncoder.encode(group, "utf-8") + "/"
                 + URLEncoder.encode(itemCode, "utf-8") + "/" + plugin.getIconPath());
 
           } catch (UnsupportedEncodingException e) {

Apromore-Custom-Plugins/Access-Control-Portal-Plugin/src/main/java/org/apromore/plugin/portal/accesscontrol/AccessControlPlugin.java

@@ -89,7 +89,7 @@ public Availability getAvailability() {
   public ResourceBundle getLabels() {
     // Locale locale = Locales.getCurrent()
     Locale locale = (Locale) Sessions.getCurrent().getAttribute(Attributes.PREFERRED_LOCALE);
-    return ResourceBundle.getBundle("metainfo.zk-label", locale,
+    return ResourceBundle.getBundle("access-control", locale,
         AccessControlPlugin.class.getClassLoader());
   }
 

Apromore-Custom-Plugins/Access-Control-Portal-Plugin/src/main/java/org/apromore/plugin/portal/accesscontrol/controllers/AccessController.java

@@ -208,7 +208,7 @@ private void checkShowRelatedArtifacts() {
   public ResourceBundle getLabels() {
     // Locale locale = Locales.getCurrent()
     Locale locale = (Locale) Sessions.getCurrent().getAttribute(Attributes.PREFERRED_LOCALE);
-    return ResourceBundle.getBundle("metainfo.zk-label", locale,
+    return ResourceBundle.getBundle("access-control", locale,
         AccessController.class.getClassLoader());
   }
 

Apromore-Custom-Plugins/Log-Animation-Portal-Plugin/src/main/resources/static/loganimation/animateLog.zul

@@ -81,7 +81,7 @@
                     Apromore.CONFIG = {};
                 }
                 //Apromore.CONFIG.SERVER_HANDLER_ROOT_PREFIX = '../../' + '${arg.editor}';
-				Apromore.CONFIG.SERVER_HANDLER_ROOT_PREFIX = '/' + '${arg.editor}';
+				Apromore.CONFIG.SERVER_HANDLER_ROOT_PREFIX = '~./' + '${arg.editor}';
             ]]>
         </n:script>
 

Apromore-Custom-Plugins/Process-Discoverer-Portal-Plugin/src/main/java/org/apromore/plugin/portal/processdiscoverer/plugins/PDAbstractPlugin.java

@@ -22,8 +22,12 @@
 
 package org.apromore.plugin.portal.processdiscoverer.plugins;
 
-import java.util.*;
-
+import java.util.HashSet;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.ResourceBundle;
+import java.util.UUID;
 import org.apromore.logman.attribute.graph.MeasureType;
 import org.apromore.plugin.portal.DefaultPortalPlugin;
 import org.apromore.plugin.portal.PortalContext;
@@ -44,111 +48,114 @@
 
 public class PDAbstractPlugin extends DefaultPortalPlugin {
 
-    private String label = "Discover process map / BPMN model";
-    private String groupLabel = "Discover";
-    protected String sessionId = "";
-
-    @Override
-    public String getLabel(Locale locale) {
-        return label;
-    }
+  private String label = "Discover process map / BPMN model";
+  private String groupLabel = "Discover";
+  protected String sessionId = "";
 
-    public void setLabel(String label) {
-        this.label = label;
-    }
+  @Override
+  public String getLabel(Locale locale) {
+    return label;
+  }
 
-    @Override
-    public String getGroupLabel(Locale locale) {
-        return groupLabel;
-    }
+  public void setLabel(String label) {
+    this.label = label;
+  }
 
-    public void setGroupLabel(String groupLabel) {
-        this.groupLabel = groupLabel;
-    }
-
-    @Override
-    public void execute(PortalContext context) {
-
-    }
+  @Override
+  public String getGroupLabel(Locale locale) {
+    return groupLabel;
+  }
 
-    public ResourceBundle getLabels() {
-        return ResourceBundle.getBundle("metainfo.zk-label",
-            (Locale) Sessions.getCurrent().getAttribute(Attributes.PREFERRED_LOCALE),
-            PDController.class.getClassLoader());
-    }
+  public void setGroupLabel(String groupLabel) {
+    this.groupLabel = groupLabel;
+  }
 
-    public String getLabel(String key) {
-        String label = getLabels().getString(key);
-        if (label == null) {
-            label = "";
-        }
-        return label;
-    }
+  @Override
+  public void execute(PortalContext context) {
 
-    protected boolean prepare(PortalContext context, MeasureType visType) {
-        try {
-            Map<SummaryType, List<VersionSummaryType>> elements = context.getSelection().getSelectedProcessModelVersions();
-            if (elements.size() != 1) {
-                Messagebox.show(getLabel("selectOneLog_message"), "Apromore", Messagebox.OK, Messagebox.INFORMATION);
-                return false;
-            }
-            SummaryType selection = elements.keySet().iterator().next();
-            if (!(selection instanceof LogSummaryType)) {
-            	Messagebox.show(getLabel("selectALog_message"), "Apromore", Messagebox.OK, Messagebox.INFORMATION);
-                return false;
-            }
-
-        	String username = context.getCurrentUser().getUsername();
-            ProcessSummaryType process = new ProcessSummaryType();
-            process.setDomain("Process Discoverer");
-            process.setName("Process Discoverer");
-            process.setId(1);
-            process.setMakePublic(true);
-            VersionSummaryType version = new VersionSummaryType();
-            version.setName("Process Discoverer");
-            version.setVersionNumber("1.0");
-
-            EditSessionType editSession1 = createEditSession(username, process, version);
-            ApromoreSession session = new ApromoreSession(editSession1, null,
-            												(MainController)context.getMainController(), 
-            												process, version, null, null, 
-            												new HashSet<RequestParameterType<?>>());
-            session.put("context", context);
-            session.put("visType", visType);
-            session.put("selection", selection);
-            session.put("pdFactory", new PDCustomFactory());
-
-            sessionId = UUID.randomUUID().toString();
-            UserSessionManager.setEditSession(sessionId, session);
-
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        return true;
+  }
 
+  public ResourceBundle getLabels() {
+    return ResourceBundle.getBundle("pd",
+        (Locale) Sessions.getCurrent().getAttribute(Attributes.PREFERRED_LOCALE),
+        PDController.class.getClassLoader());
+  }
+
+  public String getLabel(String key) {
+    String label = getLabels().getString(key);
+    if (label == null) {
+      label = "";
     }
-
-    public String getSessionId() {
-    	return sessionId;
-    }
-
-    private static EditSessionType createEditSession(final String username, final ProcessSummaryType process, final VersionSummaryType version) {
-        EditSessionType editSession = new EditSessionType();
-        editSession.setDomain(process.getDomain());
-        editSession.setNativeType("BPMN 2.0");
-        editSession.setProcessId(process.getId());
-        editSession.setProcessName(process.getName());
-        editSession.setUsername(username);
-        editSession.setPublicModel(process.isMakePublic());
-        editSession.setOriginalBranchName(version.getName());
-        editSession.setOriginalVersionNumber(version.getVersionNumber());
-        editSession.setCurrentVersionNumber(version.getVersionNumber());
-        editSession.setMaxVersionNumber(process.getLastVersion());
-        editSession.setCreationDate(version.getCreationDate());
-        editSession.setLastUpdate(version.getLastUpdate());
-        editSession.setWithAnnotation(false);
-
-        return editSession;
+    return label;
+  }
+
+  protected boolean prepare(PortalContext context, MeasureType visType) {
+    try {
+      Map<SummaryType, List<VersionSummaryType>> elements =
+          context.getSelection().getSelectedProcessModelVersions();
+      if (elements.size() != 1) {
+        Messagebox.show(getLabel("selectOneLog_message"), "Apromore", Messagebox.OK,
+            Messagebox.INFORMATION);
+        return false;
+      }
+      SummaryType selection = elements.keySet().iterator().next();
+      if (!(selection instanceof LogSummaryType)) {
+        Messagebox.show(getLabel("selectALog_message"), "Apromore", Messagebox.OK,
+            Messagebox.INFORMATION);
+        return false;
+      }
+
+      String username = context.getCurrentUser().getUsername();
+      ProcessSummaryType process = new ProcessSummaryType();
+      process.setDomain("Process Discoverer");
+      process.setName("Process Discoverer");
+      process.setId(1);
+      process.setMakePublic(true);
+      VersionSummaryType version = new VersionSummaryType();
+      version.setName("Process Discoverer");
+      version.setVersionNumber("1.0");
+
+      EditSessionType editSession1 = createEditSession(username, process, version);
+      ApromoreSession session =
+          new ApromoreSession(editSession1, null, (MainController) context.getMainController(),
+              process, version, null, null, new HashSet<RequestParameterType<?>>());
+      session.put("context", context);
+      session.put("visType", visType);
+      session.put("selection", selection);
+      session.put("pdFactory", new PDCustomFactory());
+
+      sessionId = UUID.randomUUID().toString();
+      UserSessionManager.setEditSession(sessionId, session);
+
+    } catch (Exception e) {
+      e.printStackTrace();
     }
+
+    return true;
+
+  }
+
+  public String getSessionId() {
+    return sessionId;
+  }
+
+  private static EditSessionType createEditSession(final String username,
+      final ProcessSummaryType process, final VersionSummaryType version) {
+    EditSessionType editSession = new EditSessionType();
+    editSession.setDomain(process.getDomain());
+    editSession.setNativeType("BPMN 2.0");
+    editSession.setProcessId(process.getId());
+    editSession.setProcessName(process.getName());
+    editSession.setUsername(username);
+    editSession.setPublicModel(process.isMakePublic());
+    editSession.setOriginalBranchName(version.getName());
+    editSession.setOriginalVersionNumber(version.getVersionNumber());
+    editSession.setCurrentVersionNumber(version.getVersionNumber());
+    editSession.setMaxVersionNumber(process.getLastVersion());
+    editSession.setCreationDate(version.getCreationDate());
+    editSession.setLastUpdate(version.getLastUpdate());
+    editSession.setWithAnnotation(false);
+
+    return editSession;
+  }
 }