diff --git a/maxkey-core/.classpath b/maxkey-core/.classpath
index 7f272a8f1..a9cfdaea5 100644
--- a/maxkey-core/.classpath
+++ b/maxkey-core/.classpath
@@ -1,22 +1,24 @@
-
+
-
-
+
+
-
+
-
-
+
+
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/maxkey-core/.settings/org.eclipse.wst.common.component b/maxkey-core/.settings/org.eclipse.wst.common.component
index 458539508..cc7250647 100644
--- a/maxkey-core/.settings/org.eclipse.wst.common.component
+++ b/maxkey-core/.settings/org.eclipse.wst.common.component
@@ -1,8 +1,7 @@
-
-
+
-
-
+
+
+
diff --git a/maxkey-core/src/main/java/org/maxkey/util/PathUtils.java b/maxkey-core/src/main/java/org/maxkey/util/PathUtils.java
index dfe8153e4..10eacfc90 100644
--- a/maxkey-core/src/main/java/org/maxkey/util/PathUtils.java
+++ b/maxkey-core/src/main/java/org/maxkey/util/PathUtils.java
@@ -10,6 +10,7 @@ public class PathUtils {
private String classPath;
private String appPath;
public static String WEB_INFO = "/WEB-INF/";
+ private static final String PATH_FILE_NAME = "PathUtils.properties";
/**
* getInstance .
@@ -29,7 +30,7 @@ public class PathUtils {
public PathUtils() {
try {
classPath = java.net.URLDecoder.decode(
- PathUtils.class.getResource("PathUtils.xml").getFile(),
+ PathUtils.class.getResource(PATH_FILE_NAME).getFile(),
"UTF-8"
);
_logger.debug("PathUtils() PathUtils " + classPath);
@@ -37,7 +38,7 @@ public class PathUtils {
e.printStackTrace();
}
- String fileProtocol = PathUtils.class.getResource("PathUtils.properties").getProtocol();
+ String fileProtocol = PathUtils.class.getResource(PATH_FILE_NAME).getProtocol();
_logger.info("Properties Protocol:"
+ PathUtils.class.getResource("PathUtils.properties").getProtocol());
@@ -53,7 +54,8 @@ public class PathUtils {
}
_logger.info("PathUtils Class Path : " + classPath);
- classPath = classPath.substring(0, classPath.indexOf("/org/maxkey/util/PathUtils.xml"));
+ classPath = classPath.substring(0,
+ classPath.indexOf("/org/maxkey/util/" + PATH_FILE_NAME));
if (classPath.indexOf(WEB_INFO) == -1) {
appPath = classPath.substring(0, classPath.lastIndexOf("/"));
} else {
diff --git a/maxkey-core/src/main/java/org/maxkey/util/PathUtils.xml b/maxkey-core/src/main/java/org/maxkey/util/PathUtils.xml
deleted file mode 100644
index 9b45ef067..000000000
--- a/maxkey-core/src/main/java/org/maxkey/util/PathUtils.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-
-org.maxkey.util.PathUtils
-
\ No newline at end of file
diff --git a/maxkey-core/src/main/resources/org/maxkey/util/PathUtils.properties b/maxkey-core/src/main/resources/org/maxkey/util/PathUtils.properties
new file mode 100644
index 000000000..c7292c84b
--- /dev/null
+++ b/maxkey-core/src/main/resources/org/maxkey/util/PathUtils.properties
@@ -0,0 +1 @@
+org.maxkey.util.PathUtils
\ No newline at end of file