Merge pull request #680 from Megala21/master

Fixing issues in virtual fire alarm

components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.advanced.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/advanced/core/AgentUtilOperations.java

@@ -29,6 +29,7 @@ import org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.advanced.transport.
 
 import java.io.*;
 import java.net.URL;
+import java.net.URLDecoder;
 import java.nio.charset.StandardCharsets;
 import java.security.PrivateKey;
 import java.security.PublicKey;
@@ -67,15 +68,14 @@ public class AgentUtilOperations {
         try {
             ClassLoader loader = AgentUtilOperations.class.getClassLoader();
             URL path = loader.getResource(propertiesFileName);
-            System.out.println(path);
+            log.info(AgentConstants.LOG_APPENDER + path);
-            String root = path.getPath().replace(
+            String rootPath = path.getPath().replace("wso2-firealarm-virtual-agent-advanced.jar!/deviceConfig"
-                    "wso2-firealarm-virtual-agent-advanced.jar!/deviceConfig.properties",
+                    + ".properties", "").replace("jar:", "").replace("file:", "");
-                    "").replace("jar:", "").replace("file:", "");
+
-
+            rootPath = URLDecoder.decode(rootPath, StandardCharsets.UTF_8.toString());
-            agentManager.setRootPath(root);
+            agentManager.setRootPath(rootPath);
-
+            String deviceConfigFilePath = rootPath + AgentConstants.AGENT_PROPERTIES_FILE_NAME;
-            propertiesInputStream = new FileInputStream(
+            propertiesInputStream = new FileInputStream(deviceConfigFilePath);
-                    root + AgentConstants.AGENT_PROPERTIES_FILE_NAME);
 
             //load a properties file from class path, inside static method
             properties.load(propertiesInputStream);

pom.xml

@@ -1132,7 +1132,7 @@
         <carbon.devicemgt.version.range>[2.0.0, 3.0.0)</carbon.devicemgt.version.range>
 
         <!-- Carbon App Management -->
-        <carbon.appmgt.version>1.2.15</carbon.appmgt.version>
+        <carbon.appmgt.version>1.2.25</carbon.appmgt.version>
 
         <!-- Carbon Device Management Plugins -->
         <carbon.devicemgt.plugins.version>3.0.36-SNAPSHOT</carbon.devicemgt.plugins.version>