diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgPythonScript.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgPythonScript.java index a7c5ef6069..0e4b05b101 100644 --- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgPythonScript.java +++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgPythonScript.java @@ -38,80 +38,30 @@ import java.io.File; */ public enum HgPythonScript { - HOOK("scmhooks.py"), HGWEB("hgweb.py"), VERSION("version.py"); + HOOK("scmhooks.py"), HGWEB("hgweb.py"); - /** Field description */ - private static final String BASE_DIRECTORY = - "lib".concat(File.separator).concat("python"); - - /** Field description */ + private static final String BASE_DIRECTORY = "lib".concat(File.separator).concat("python"); private static final String BASE_RESOURCE = "/sonia/scm/python/"; - //~--- constructors --------------------------------------------------------- + private final String name; - /** - * Constructs ... - * - * - * @param name - */ - private HgPythonScript(String name) - { + HgPythonScript(String name) { this.name = name; } - //~--- get methods ---------------------------------------------------------- - - /** - * Method description - * - * - * @param context - * - * @return - */ - public static File getScriptDirectory(SCMContextProvider context) - { + public static File getScriptDirectory(SCMContextProvider context) { return new File(context.getBaseDirectory(), BASE_DIRECTORY); } - /** - * Method description - * - * - * @param context - * - * @return - */ - public File getFile(SCMContextProvider context) - { + public File getFile(SCMContextProvider context) { return new File(getScriptDirectory(context), name); } - /** - * Method description - * - * - * @return - */ - public String getName() - { + public String getName() { return name; } - /** - * Method description - * - * - * @return - */ - public String getResourcePath() - { + public String getResourcePath() { return BASE_RESOURCE.concat(name); } - - //~--- fields --------------------------------------------------------------- - - /** Field description */ - private String name; } diff --git a/scm-plugins/scm-hg-plugin/src/main/resources/sonia/scm/python/version.py b/scm-plugins/scm-hg-plugin/src/main/resources/sonia/scm/python/version.py deleted file mode 100644 index 25c35fe8a2..0000000000 --- a/scm-plugins/scm-hg-plugin/src/main/resources/sonia/scm/python/version.py +++ /dev/null @@ -1,45 +0,0 @@ -# -# MIT License -# -# Copyright (c) 2020-present Cloudogu GmbH and Contributors -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in all -# copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. -# - -import sys -from mercurial import util -from xml.dom.minidom import Document - -pyVersion = sys.version_info -pyVersion = str(pyVersion.major) + "." + str(pyVersion.minor) + "." + str(pyVersion.micro) -hgVersion = util.version() - -doc = Document() -root = doc.createElement('version') - -pyNode = doc.createElement('python') -pyNode.appendChild(doc.createTextNode(pyVersion)) -root.appendChild(pyNode) - -hgNode = doc.createElement('mercurial') -hgNode.appendChild(doc.createTextNode(hgVersion)) -root.appendChild(hgNode) - -doc.appendChild(root) -doc.writexml(sys.stdout, encoding='UTF-8') \ No newline at end of file