From f08fd38a76e4c612d3161cdefd3fc30eb816d41e Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sun, 30 Jan 2011 23:51:35 -0800 Subject: [PATCH] hudson-cli.jar to jenkins-cli.jar rename --- .../main/resources/hudson/cli/client/Messages.properties | 4 ++-- .../main/resources/hudson/cli/client/Messages_da.properties | 2 +- .../main/resources/hudson/cli/client/Messages_de.properties | 2 +- .../main/resources/hudson/cli/client/Messages_es.properties | 2 +- .../main/resources/hudson/cli/client/Messages_ja.properties | 4 ++-- .../resources/hudson/cli/client/Messages_pt_BR.properties | 4 ++-- core/src/main/java/hudson/cli/CLICommand.java | 4 ++-- core/src/main/java/hudson/model/Slave.java | 6 ++++-- war/pom.xml | 2 +- 9 files changed, 16 insertions(+), 14 deletions(-) diff --git a/cli/src/main/resources/hudson/cli/client/Messages.properties b/cli/src/main/resources/hudson/cli/client/Messages.properties index a06ccbabf7..3e6b21b438 100644 --- a/cli/src/main/resources/hudson/cli/client/Messages.properties +++ b/cli/src/main/resources/hudson/cli/client/Messages.properties @@ -1,9 +1,9 @@ CLI.Usage=Hudson CLI\n\ - Usage: java -jar hudson-cli.jar [-s URL] command [opts...] args...\n\ + Usage: java -jar jenkins-cli.jar [-s URL] command [opts...] args...\n\ Options:\n\ \ -s URL : specify the server URL (defaults to the HUDSON_URL env var)\n\ \n\ The available commands depend on the server. Run the 'help' command to\n\ see the list. CLI.NoURL=Neither -s nor the HUDSON_URL env var is specified. -CLI.VersionMismatch=Version mismatch. This CLI cannot work with this Hudson server \ No newline at end of file +CLI.VersionMismatch=Version mismatch. This CLI cannot work with this Hudson server diff --git a/cli/src/main/resources/hudson/cli/client/Messages_da.properties b/cli/src/main/resources/hudson/cli/client/Messages_da.properties index 264c9c146a..945dd1b4a2 100644 --- a/cli/src/main/resources/hudson/cli/client/Messages_da.properties +++ b/cli/src/main/resources/hudson/cli/client/Messages_da.properties @@ -22,7 +22,7 @@ CLI.VersionMismatch=Versionskonflikt. CLI''en fungerer ikke med denne Hudson server CLI.Usage=Hudson CLI\n\ -Brug: java -jar hudson-cli.jar [-s URL] command [opts...] args...\n\ +Brug: java -jar jenkins-cli.jar [-s URL] command [opts...] args...\n\ Tilvalg:\n\ De tilg\u00e6ngelige kommandoer afh\u00e6nger af serveren. K\u00f8r 'help' kommandoen for at se listen. CLI.NoURL=Hverken -s eller HUDSON_URL milj\u00f8variablen er defineret diff --git a/cli/src/main/resources/hudson/cli/client/Messages_de.properties b/cli/src/main/resources/hudson/cli/client/Messages_de.properties index 4b290fa05f..b693d5ffe8 100644 --- a/cli/src/main/resources/hudson/cli/client/Messages_de.properties +++ b/cli/src/main/resources/hudson/cli/client/Messages_de.properties @@ -1,5 +1,5 @@ CLI.Usage=Hudson Kommandozeilenschnittstelle (Hudson CLI)\n\ - Verwendung: java -jar hudson-cli.jar [-s URL] command [opts...] args...\n\ + Verwendung: java -jar jenkins-cli.jar [-s URL] command [opts...] args...\n\ Optionen:\n\ \ -s URL : URL des Hudson-Servers (Wert der Umgebungsvariable HUDSON_URL ist der Vorgabewert)\n\ \n\ diff --git a/cli/src/main/resources/hudson/cli/client/Messages_es.properties b/cli/src/main/resources/hudson/cli/client/Messages_es.properties index 5da93a62e2..7e69202a93 100644 --- a/cli/src/main/resources/hudson/cli/client/Messages_es.properties +++ b/cli/src/main/resources/hudson/cli/client/Messages_es.properties @@ -1,5 +1,5 @@ CLI.Usage=Hudson CLI\n\ - Usar: java -jar hudson-cli.jar [-s URL] command [opts...] args...\n\ + Usar: java -jar jenkins-cli.jar [-s URL] command [opts...] args...\n\ Options:\n\ \ -s URL : dirección web (por defecto se usa la variable HUDSON_URL)\n\ \n\ diff --git a/cli/src/main/resources/hudson/cli/client/Messages_ja.properties b/cli/src/main/resources/hudson/cli/client/Messages_ja.properties index 3be9f9dda2..82944b3b44 100644 --- a/cli/src/main/resources/hudson/cli/client/Messages_ja.properties +++ b/cli/src/main/resources/hudson/cli/client/Messages_ja.properties @@ -25,14 +25,14 @@ CLI.NoURL=-s\u3082\u74B0\u5883\u5909\u6570HUDSON_URL\u3082\u6307\u5B9A\u3055\u30 # Version mismatch. This CLI cannot work with this Hudson server CLI.VersionMismatch=\u30D0\u30FC\u30B8\u30E7\u30F3\u30DF\u30B9\u30DE\u30C3\u30C1\u3067\u3059\u3002\u3053\u306ECLI\u306FHudson\u30B5\u30FC\u30D0\u3067\u306F\u52D5\u304D\u307E\u305B\u3093\u3002 # Hudson CLI\n\ -# Usage: java -jar hudson-cli.jar [-s URL] command [opts...] args...\n\ +# Usage: java -jar jenkins-cli.jar [-s URL] command [opts...] args...\n\ # Options:\n\ # \ -s URL : specify the server URL (defaults to the HUDSON_URL env var)\n\ # \n\ # The available commands depend on the server. Run the 'help' command to\n\ # see the list. CLI.Usage=Hudson CLI\n\ - \u4F7F\u7528\u65B9\u6CD5: java -jar hudson-cli.jar [-s URL] command [opts...] args...\n\ + \u4F7F\u7528\u65B9\u6CD5: java -jar jenkins-cli.jar [-s URL] command [opts...] args...\n\ \u30AA\u30D7\u30B7\u30E7\u30F3:\n\ \ -s URL : \u30B5\u30FC\u30D0\u306EURL\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\uFF08\u30C7\u30D5\u30A9\u30EB\u30C8\u306F\u74B0\u5883\u5909\u6570HUDSON_URL\u3067\u3059\uFF09\u3002\n\ \n\ diff --git a/cli/src/main/resources/hudson/cli/client/Messages_pt_BR.properties b/cli/src/main/resources/hudson/cli/client/Messages_pt_BR.properties index 82f3dafc39..9a48e0af2a 100644 --- a/cli/src/main/resources/hudson/cli/client/Messages_pt_BR.properties +++ b/cli/src/main/resources/hudson/cli/client/Messages_pt_BR.properties @@ -23,14 +23,14 @@ # Version mismatch. This CLI cannot work with this Hudson server CLI.VersionMismatch=A vers\ufffdo n\ufffdo coincide. Esta CLI n\ufffdo pode funcionar com este servidor Hudson # Hudson CLI\n\ -# Usage: java -jar hudson-cli.jar [-s URL] command [opts...] args...\n\ +# Usage: java -jar jenkins-cli.jar [-s URL] command [opts...] args...\n\ # Options:\n\ # \ -s URL : specify the server URL (defaults to the HUDSON_URL env var)\n\ # \n\ # The available commands depend on the server. Run the 'help' command to\n\ # see the list. CLI.Usage=Hudson CLI\n\ - Uso: java -jar hudson-cli.jar [-s URL] comando [op\ufffd\ufffdes...] par\ufffdmetros...\n\ + Uso: java -jar jenkins-cli.jar [-s URL] comando [op\ufffd\ufffdes...] par\ufffdmetros...\n\ Op\ufffd\ufffdes:\n\ \ -s URL : a URL do servidor (por padr\ufffdo a vari\ufffdvel de ambiente HUDSON_URL \ufffd usada)\n\ \n\ diff --git a/core/src/main/java/hudson/cli/CLICommand.java b/core/src/main/java/hudson/cli/CLICommand.java index 1c259b8c83..80e97c1835 100644 --- a/core/src/main/java/hudson/cli/CLICommand.java +++ b/core/src/main/java/hudson/cli/CLICommand.java @@ -61,7 +61,7 @@ import java.util.logging.Logger; *

How does a CLI command work

*

* The users starts {@linkplain CLI the "CLI agent"} on a remote system, by specifying arguments, like - * "java -jar hudson-cli.jar command arg1 arg2 arg3". The CLI agent creates + * "java -jar jenkins-cli.jar command arg1 arg2 arg3". The CLI agent creates * a remoting channel with the server, and it sends the entire arguments to the server, along with * the remoted stdin/out/err. * @@ -268,7 +268,7 @@ public abstract class CLICommand implements ExtensionPoint, Cloneable { protected abstract int run() throws Exception; protected void printUsage(PrintStream stderr, CmdLineParser p) { - stderr.println("java -jar hudson-cli.jar "+getName()+" args..."); + stderr.println("java -jar jenkins-cli.jar "+getName()+" args..."); printUsageSummary(stderr); p.printUsage(stderr); } diff --git a/core/src/main/java/hudson/model/Slave.java b/core/src/main/java/hudson/model/Slave.java index e8186e53de..86ad032d34 100644 --- a/core/src/main/java/hudson/model/Slave.java +++ b/core/src/main/java/hudson/model/Slave.java @@ -284,10 +284,12 @@ public abstract class Slave extends Node implements Serializable { } public URL getURL() throws MalformedURLException { - URL res = Hudson.getInstance().servletContext.getResource("/WEB-INF/" + fileName); + String name = fileName; + if (name.equals("hudson-cli.jar")) name="jenkins-cli.jar"; + URL res = Hudson.getInstance().servletContext.getResource("/WEB-INF/" + name); if(res==null) { // during the development this path doesn't have the files. - res = new URL(new File(".").getAbsoluteFile().toURI().toURL(),"target/generated-resources/WEB-INF/"+fileName); + res = new URL(new File(".").getAbsoluteFile().toURI().toURL(),"target/generated-resources/WEB-INF/"+name); } return res; } diff --git a/war/pom.xml b/war/pom.xml index 73365cfac6..51d53be506 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -119,7 +119,7 @@ THE SOFTWARE. - + -- GitLab