LiRuochen_WorkFlow/MaxKey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v1.3 RC

Browse Source
This commit is contained in:
shimingxy
2020-04-02 09:21:31 +08:00
parent d254e8a27d
commit 5f749653c8
5 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maxkey-core/.classpath
+15 -13
View File
@@ -1,22 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="src" output="bin/main" <classpathentry kind="src" output="bin/main" path="src/main/java">
path="src/main/java">
<attributes> <attributes>
<attribute name="gradle_scope" value="main" /> <attribute name="gradle_scope" value="main"/>
<attribute name="gradle_used_by_scope" value="main,test" /> <attribute name="gradle_used_by_scope" value="main,test"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="src" output="bin/test" <classpathentry kind="src" output="bin/test" path="src/test/java">
path="src/test/java">
<attributes> <attributes>
<attribute name="gradle_scope" value="test" /> <attribute name="gradle_scope" value="test"/>
<attribute name="gradle_used_by_scope" value="test" /> <attribute name="gradle_used_by_scope" value="test"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="con" <classpathentry kind="src" output="bin/main" path="src/main/resources">
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/" /> <attributes>
<classpathentry kind="con" <attribute name="gradle_scope" value="main"/>
path="org.eclipse.buildship.core.gradleclasspathcontainer" /> <attribute name="gradle_used_by_scope" value="main,test"/>
<classpathentry kind="output" path="bin/default" /> </attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
<classpathentry kind="output" path="bin/default"/>
</classpath> </classpath>
maxkey-core/.settings/org.eclipse.wst.common.component
+4 -5
View File
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
<project-modules id="moduleCoreId"
project-version="1.5.0">
<wb-module deploy-name="maxkey-core"> <wb-module deploy-name="maxkey-core">
<wb-resource deploy-path="/" source-path="/src/main/java" /> <wb-resource deploy-path="/" source-path="/src/main/java"/>
<wb-resource deploy-path="/" source-path="/src/test/java" /> <wb-resource deploy-path="/" source-path="/src/test/java"/>
<wb-resource deploy-path="/" source-path="/src/main/resources"/>
</wb-module> </wb-module>
</project-modules> </project-modules>
maxkey-core/src/main/java/org/maxkey/util/PathUtils.java
+5 -3
View File
@@ -10,6 +10,7 @@ public class PathUtils {
private String classPath; private String classPath;
private String appPath; private String appPath;
public static String WEB_INFO = "/WEB-INF/"; public static String WEB_INFO = "/WEB-INF/";
private static final String PATH_FILE_NAME = "PathUtils.properties";
/** /**
* getInstance . * getInstance .
@@ -29,7 +30,7 @@ public class PathUtils {
public PathUtils() { public PathUtils() {
try { try {
classPath = java.net.URLDecoder.decode( classPath = java.net.URLDecoder.decode(
PathUtils.class.getResource("PathUtils.xml").getFile(), PathUtils.class.getResource(PATH_FILE_NAME).getFile(),
"UTF-8" "UTF-8"
); );
_logger.debug("PathUtils() PathUtils " + classPath); _logger.debug("PathUtils() PathUtils " + classPath);
@@ -37,7 +38,7 @@ public class PathUtils {
e.printStackTrace(); e.printStackTrace();
} }
String fileProtocol = PathUtils.class.getResource("PathUtils.properties").getProtocol(); String fileProtocol = PathUtils.class.getResource(PATH_FILE_NAME).getProtocol();
_logger.info("Properties Protocol:" _logger.info("Properties Protocol:"
+ PathUtils.class.getResource("PathUtils.properties").getProtocol()); + PathUtils.class.getResource("PathUtils.properties").getProtocol());
@@ -53,7 +54,8 @@ public class PathUtils {
} }
_logger.info("PathUtils Class Path : " + classPath); _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) { if (classPath.indexOf(WEB_INFO) == -1) {
appPath = classPath.substring(0, classPath.lastIndexOf("/")); appPath = classPath.substring(0, classPath.lastIndexOf("/"));
} else { } else {
maxkey-core/src/main/java/org/maxkey/util/PathUtils.xml
-3
View File
@@ -1,3 +0,0 @@
<root>
org.maxkey.util.PathUtils
</root>
maxkey-core/src/main/resources/org/maxkey/util/PathUtils.properties
+1
View File
@@ -0,0 +1 @@
org.maxkey.util.PathUtils