From 8cb24423cc2fa4558cb5cd5bcdb9b2fe61c8569d Mon Sep 17 00:00:00 2001 From: kohsuke Date: Wed, 7 Jul 2010 18:07:53 +0000 Subject: [PATCH 001/336] Merged revisions 32496,32499,32501,32505 via svnmerge from https://svn.dev.java.net/svn/hudson/branches/rc ........ r32496 | kohsuke | 2010-07-05 11:27:25 -0700 (Mon, 05 Jul 2010) | 1 line integrated a fix for SECURITY-4 ........ r32499 | kohsuke | 2010-07-05 14:19:34 -0700 (Mon, 05 Jul 2010) | 1 line [maven-release-plugin] prepare release hudson-1_365 ........ r32501 | kohsuke | 2010-07-05 14:19:48 -0700 (Mon, 05 Jul 2010) | 1 line [maven-release-plugin] prepare for next development iteration ........ r32505 | kohsuke | 2010-07-05 15:29:51 -0700 (Mon, 05 Jul 2010) | 1 line updated changelog as a part of the release ........ git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@32558 71c3de6d-444a-0410-be80-ed276b4c234a --- cli/pom.xml | 2 +- core/pom.xml | 4 ++-- debian/debian/changelog | 6 ++++++ maven-agent/pom.xml | 2 +- maven-interceptor/pom.xml | 2 +- maven-plugin/pom.xml | 2 +- pom.xml | 2 +- remoting/pom.xml | 2 +- test/pom.xml | 2 +- ui-samples-plugin/pom.xml | 2 +- war/pom.xml | 4 ++-- 11 files changed, 18 insertions(+), 12 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index 85d1edd5e3..9cffa646c4 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -4,7 +4,7 @@ pom org.jvnet.hudson.main - 1.365-SNAPSHOT + 1.366-SNAPSHOT cli Hudson CLI diff --git a/core/pom.xml b/core/pom.xml index 10651aa0bb..7f0beb8de8 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.365-SNAPSHOT + 1.366-SNAPSHOT ../pom.xml @@ -356,7 +356,7 @@ THE SOFTWARE. org.kohsuke.stapler stapler-jelly - 1.144 + 1.145 commons-jelly diff --git a/debian/debian/changelog b/debian/debian/changelog index 7fef46051c..527c5e7991 100644 --- a/debian/debian/changelog +++ b/debian/debian/changelog @@ -1,3 +1,9 @@ +hudson (1.365) unstable; urgency=low + + * See http://hudson.dev.java.net/changelog.html for more details. + + -- Kohsuke Kawaguchi Mon, 05 Jul 2010 15:26:25 -0700 + hudson (1.364) unstable; urgency=low * See http://hudson.dev.java.net/changelog.html for more details. diff --git a/maven-agent/pom.xml b/maven-agent/pom.xml index 8aa8a5e54e..99e90e6f5d 100644 --- a/maven-agent/pom.xml +++ b/maven-agent/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.365-SNAPSHOT + 1.366-SNAPSHOT ../pom.xml diff --git a/maven-interceptor/pom.xml b/maven-interceptor/pom.xml index c2a88aced0..680bb9aae2 100644 --- a/maven-interceptor/pom.xml +++ b/maven-interceptor/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.365-SNAPSHOT + 1.366-SNAPSHOT ../pom.xml diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 47bf7ae779..49ac886873 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.365-SNAPSHOT + 1.366-SNAPSHOT maven-plugin diff --git a/pom.xml b/pom.xml index 88d1f31325..c8622ce661 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.365-SNAPSHOT + 1.366-SNAPSHOT pom Hudson main module diff --git a/remoting/pom.xml b/remoting/pom.xml index 45c174e67c..ba8f5b1821 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.365-SNAPSHOT + 1.366-SNAPSHOT ../pom.xml diff --git a/test/pom.xml b/test/pom.xml index 812c25c973..d2cf6ca1df 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. pom org.jvnet.hudson.main - 1.365-SNAPSHOT + 1.366-SNAPSHOT 4.0.0 org.jvnet.hudson.main diff --git a/ui-samples-plugin/pom.xml b/ui-samples-plugin/pom.xml index 56a1641718..b03e64e7d2 100644 --- a/ui-samples-plugin/pom.xml +++ b/ui-samples-plugin/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.365-SNAPSHOT + 1.366-SNAPSHOT ui-samples-plugin diff --git a/war/pom.xml b/war/pom.xml index 6c00b11d4a..598e4309e0 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.365-SNAPSHOT + 1.366-SNAPSHOT ../pom.xml @@ -126,7 +126,7 @@ THE SOFTWARE. - + -- GitLab From 52838e1313ba8730087930ad9033ce236f9b85a6 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Wed, 7 Jul 2010 18:24:31 +0000 Subject: [PATCH 002/336] doc improvement git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@32559 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/model/Queue.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/hudson/model/Queue.java b/core/src/main/java/hudson/model/Queue.java index 74956b6242..5bfb2f3ca4 100644 --- a/core/src/main/java/hudson/model/Queue.java +++ b/core/src/main/java/hudson/model/Queue.java @@ -1329,7 +1329,12 @@ public class Queue extends ResourceController implements Saveable { } /** - * Extension point for deciding if particular job should be scheduled or not + * Extension point for deciding if particular job should be scheduled or not. + * + *

+ * This handler is consulted every time someone tries to submit a task to the queue. + * If any of the registered handlers returns false, the task will not be added + * to the queue, and the task will never get executed. * *

* This extension point is still a subject to change, as we are seeking more @@ -1339,7 +1344,7 @@ public class Queue extends ResourceController implements Saveable { */ public static abstract class QueueDecisionHandler implements ExtensionPoint { /** - * Returns whether the new item should be scheduled. + * Returns whether the new item should be scheduled. */ public abstract boolean shouldSchedule(Task p, List actions); -- GitLab From 9c349ecac51cedb3c9541df32d3cf78c3b0adef2 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Thu, 8 Jul 2010 00:26:01 +0000 Subject: [PATCH 003/336] made the concurrency easily customizable git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@32575 71c3de6d-444a-0410-be80-ed276b4c234a --- test/pom.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/test/pom.xml b/test/pom.xml index d2cf6ca1df..e4be5d724b 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -38,6 +38,10 @@ THE SOFTWARE. Unit test harness (src/main) and Unit tests for Hudson core (src/test) + + 1 + + @@ -58,7 +62,7 @@ THE SOFTWARE. true - 1 + ${concurrency} -XX:MaxPermSize=192m -Xmx256m -Dfile.encoding=UTF-8 -- GitLab From ef4f9c9c3139b8eb2f851d36c939d3f20630afce Mon Sep 17 00:00:00 2001 From: kohsuke Date: Thu, 8 Jul 2010 00:27:17 +0000 Subject: [PATCH 004/336] Initialized merge tracking via "svnmerge" with revisions "1-32578" from https://www.dev.java.net/svn/hudson/branches/rc git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@32580 71c3de6d-444a-0410-be80-ed276b4c234a -- GitLab From 3ffa939891d9e28ba3e8907478a21e91f3d2bb6f Mon Sep 17 00:00:00 2001 From: kohsuke Date: Thu, 8 Jul 2010 01:44:34 +0000 Subject: [PATCH 005/336] Show outline structure for Ant execution in the console output view. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@32581 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/tasks/_ant/AntTargetNote.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/java/hudson/tasks/_ant/AntTargetNote.java b/core/src/main/java/hudson/tasks/_ant/AntTargetNote.java index b2e6f19c3e..f123cdfb9a 100644 --- a/core/src/main/java/hudson/tasks/_ant/AntTargetNote.java +++ b/core/src/main/java/hudson/tasks/_ant/AntTargetNote.java @@ -57,5 +57,5 @@ public final class AntTargetNote extends ConsoleNote { } } - public static boolean ENABLED = Boolean.getBoolean(AntTargetNote.class.getName()+".enabled"); + public static boolean ENABLED = !Boolean.getBoolean(AntTargetNote.class.getName()+".disabled"); } -- GitLab From 0908fd4424c59435182a286b25e140d533e69526 Mon Sep 17 00:00:00 2001 From: mindless Date: Thu, 8 Jul 2010 06:14:30 +0000 Subject: [PATCH 006/336] [FIXED HUDSON-6923] add data attribute with numeric duration for proper sorting git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@32584 71c3de6d-444a-0410-be80-ed276b4c234a --- .../resources/hudson/tasks/test/MatrixTestResult/index.jelly | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/resources/hudson/tasks/test/MatrixTestResult/index.jelly b/core/src/main/resources/hudson/tasks/test/MatrixTestResult/index.jelly index 8357c5276a..4a61b9d85d 100644 --- a/core/src/main/resources/hudson/tasks/test/MatrixTestResult/index.jelly +++ b/core/src/main/resources/hudson/tasks/test/MatrixTestResult/index.jelly @@ -43,7 +43,7 @@ THE SOFTWARE. ${report.child.project.name} - + ${report.result.durationString} -- GitLab From 63047163e4c664a14aa8d37968f59cc494e140d1 Mon Sep 17 00:00:00 2001 From: rseguy Date: Fri, 9 Jul 2010 12:26:03 +0000 Subject: [PATCH 007/336] Added some more explanations for when no file is actually uploaded. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@32656 71c3de6d-444a-0410-be80-ed276b4c234a --- war/resources/help/parameter/file.html | 25 ++++++++++++----------- war/resources/help/parameter/file_fr.html | 25 +++++++++++++---------- 2 files changed, 27 insertions(+), 23 deletions(-) diff --git a/war/resources/help/parameter/file.html b/war/resources/help/parameter/file.html index d2ecc0790e..5c727cbe04 100644 --- a/war/resources/help/parameter/file.html +++ b/war/resources/help/parameter/file.html @@ -1,14 +1,15 @@

- Accepts a file submission from a browser as a build parameter. - The uploaded file will be placed at the specified location in the workspace, - which your build can then access and use. - -

- This is useful for many situations, such as: - -

    -
  1. Letting people run tests on the artifacts they built. -
  2. Automating the upload/release/deployment process by allowing the user to place the file. -
  3. Perform data processing by uploading a dataset. -
+ Accepts a file submission from a browser as a build parameter. The uploaded + file will be placed at the specified location in the workspace, which your + build can then access and use. +

This is useful for many situations, such as:

    +
  1. Letting people run tests on the artifacts they built.
    2. +
  2. Automating the upload/release/deployment process by allowing the user to + place the file.
    3. +
  3. Perform data processing by uploading a dataset.
    4. +

+

It is possible to not submit any file. If it's case and if no file is + already present at the specified location in the workspace, then nothing + happens. If there's already a file present in the workspace, then this file + will be kept as-is.

\ No newline at end of file diff --git a/war/resources/help/parameter/file_fr.html b/war/resources/help/parameter/file_fr.html index 477aceff52..d899e81ebf 100644 --- a/war/resources/help/parameter/file_fr.html +++ b/war/resources/help/parameter/file_fr.html @@ -1,14 +1,17 @@ -
+
Prend un fichier passé par un navigateur web comme paramètre de build. - Le fichier uploadé sera placé à un endroit spécifié dans le workspace, + Le fichier uploadé sera placé à l'endroit spécifié dans le workspace, auquel votre build pourra ensuite accéder. - -

- Cela est utile pour de nombreuses situations, telles que: - -

    -
  1. Permettre aux utilisateurs de lancer des tests sur les artefacts qu'ils ont construits. -
  2. Automatiser la procédure de upload/livraison/déploiement en permettant à l'utilisateur de placer directement le fichier. -
  3. Réaliser du traitement de données en uploadant une collection de données. -
+

Cela est utile pour de nombreuses situations, telles que :

    +
  1. Permettre aux utilisateurs de lancer des tests sur les artefacts qu'ils + ont construits ;
    2. +
  2. Automatiser la procédure de upload/livraison/déploiement en permettant à + l'utilisateur de placer directement le fichier ;
    3. +
  3. Réaliser du traitement de données en uploadant une collection de + données.
    4. +

+

Il est possible de ne rien uploader. Dans ce cas, et si aucun fichier + n'est déjà présent à l'endroit spécifié dans le workspace, alors rien ne se + passera. Si par contre il existe déjà un fichier dans le workspace, alors ce + fichier sera gardé tel quel.

\ No newline at end of file -- GitLab From 114a00bdb138a1ac1abaadc65d7e24355d766d71 Mon Sep 17 00:00:00 2001 From: mindless Date: Fri, 9 Jul 2010 18:09:17 +0000 Subject: [PATCH 008/336] Some people see PingThread terminating slaves with running builds ( http://hudson.361315.n4.nabble.com/Regarding-the-IOException2-ChannelClosedException-many-of-us-has-been-seeing-lately-td2280769.html ). Increase defaults to ping every 10 min with 4 min timeout (was every 5 min with 1 min timeout), and add system properties that can override these defaults or disable ping thread. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@32664 71c3de6d-444a-0410-be80-ed276b4c234a --- .../main/java/hudson/remoting/Launcher.java | 11 +++++--- .../main/java/hudson/remoting/PingThread.java | 25 +++++++++++-------- 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/remoting/src/main/java/hudson/remoting/Launcher.java b/remoting/src/main/java/hudson/remoting/Launcher.java index 22ffbb7662..57658594c5 100644 --- a/remoting/src/main/java/hudson/remoting/Launcher.java +++ b/remoting/src/main/java/hudson/remoting/Launcher.java @@ -1,7 +1,7 @@ /* * The MIT License * - * Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi + * Copyright (c) 2004-2010, Sun Microsystems, Inc., Kohsuke Kawaguchi * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -403,9 +403,12 @@ public class Launcher { ExecutorService executor = Executors.newCachedThreadPool(); Channel channel = new Channel("channel", executor, mode, is, os); System.err.println("channel started"); - if(performPing) { -// System.err.println("Starting periodic ping thread"); - new PingThread(channel) { + long timeout = 1000 * Long.parseLong( + System.getProperty("hudson.remoting.Launcher.pingTimeoutSec", "240")), + interval = 1000 * Long.parseLong( + System.getProperty("hudson.remoting.Launcher.pingIntervalSec", "600")); + if (performPing && timeout > 0 && interval > 0) { + new PingThread(channel, timeout, interval) { @Override protected void onDead() { System.err.println("Ping failed. Terminating"); diff --git a/remoting/src/main/java/hudson/remoting/PingThread.java b/remoting/src/main/java/hudson/remoting/PingThread.java index 09cee3fa27..9ef700dbb9 100644 --- a/remoting/src/main/java/hudson/remoting/PingThread.java +++ b/remoting/src/main/java/hudson/remoting/PingThread.java @@ -1,7 +1,7 @@ /* * The MIT License * - * Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi + * Copyright (c) 2004-2010, Sun Microsystems, Inc., Kohsuke Kawaguchi * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -46,20 +46,31 @@ import java.util.logging.Logger; public abstract class PingThread extends Thread { private final Channel channel; + /** + * Time out in milliseconds. + * If the response doesn't come back by then, the channel is considered dead. + */ + private final long timeout; + /** * Performs a check every this milliseconds. */ private final long interval; - public PingThread(Channel channel, long interval) { + public PingThread(Channel channel, long timeout, long interval) { super("Ping thread for channel "+channel); this.channel = channel; + this.timeout = timeout; this.interval = interval; setDaemon(true); } + public PingThread(Channel channel, long interval) { + this(channel, 4*60*1000/*4 mins*/, interval); + } + public PingThread(Channel channel) { - this(channel,5*60*1000/*5 mins*/); + this(channel,10*60*1000/*10 mins*/); } public void run() { @@ -87,7 +98,7 @@ public abstract class PingThread extends Thread { private void ping() throws IOException, InterruptedException { Future f = channel.callAsync(new Ping()); try { - f.get(TIME_OUT,MILLISECONDS); + f.get(timeout,MILLISECONDS); } catch (ExecutionException e) { if (e.getCause() instanceof RequestAbortedException) return; // connection has shut down orderly. @@ -110,11 +121,5 @@ public abstract class PingThread extends Thread { } } - /** - * Time out in milliseconds. - * If the response doesn't come back by then, the channel is considered dead. - */ - private static final long TIME_OUT = 60*1000; // 1 min - private static final Logger LOGGER = Logger.getLogger(PingThread.class.getName()); } -- GitLab From 8415e09081124f5140c5f024211a8eb5928c68c1 Mon Sep 17 00:00:00 2001 From: manuel_carrasco Date: Sat, 10 Jul 2010 04:56:41 +0000 Subject: [PATCH 009/336] updated spanish translation git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@32684 71c3de6d-444a-0410-be80-ed276b4c234a --- .../PluginManager/advanced_es.properties | 2 ++ .../hudson/PluginManager/table_es.properties | 1 + .../message_es.properties | 26 +++++++++++++++++++ .../model/Hudson/configure_es.properties | 1 + .../ListView/configure-entries_es.properties | 9 ++++++- .../hudson/model/Messages_es.properties | 4 +++ .../hudson/model/View/viewTabs_es.properties | 23 ++++++++++++++++ .../BuildHistoryWidget/entries_es.properties | 2 +- .../lib/form/booleanRadio_es.properties | 2 +- .../MavenModuleSetBuild/main_es.properties | 2 ++ 10 files changed, 69 insertions(+), 3 deletions(-) create mode 100644 core/src/main/resources/hudson/diagnosis/ReverseProxySetupMonitor/message_es.properties create mode 100644 core/src/main/resources/hudson/model/View/viewTabs_es.properties diff --git a/core/src/main/resources/hudson/PluginManager/advanced_es.properties b/core/src/main/resources/hudson/PluginManager/advanced_es.properties index f7917a7448..f0205fc2fc 100644 --- a/core/src/main/resources/hudson/PluginManager/advanced_es.properties +++ b/core/src/main/resources/hudson/PluginManager/advanced_es.properties @@ -33,3 +33,5 @@ File=Archivo Upload\ Plugin=Subir un plugin Upload=Subir HTTP\ Proxy\ Configuration=Configuracin de proxy +Update\ Site=Direccin para la actualizacin +URL=Url diff --git a/core/src/main/resources/hudson/PluginManager/table_es.properties b/core/src/main/resources/hudson/PluginManager/table_es.properties index 6b623ce7d4..4031456ff2 100644 --- a/core/src/main/resources/hudson/PluginManager/table_es.properties +++ b/core/src/main/resources/hudson/PluginManager/table_es.properties @@ -33,3 +33,4 @@ Inactive=Desactivado Installed=Instalado Name=Nombre Install=Instalar +Click\ this\ heading\ to\ sort\ by\ category=Pulse sobre este encabezado para ordenar por categora diff --git a/core/src/main/resources/hudson/diagnosis/ReverseProxySetupMonitor/message_es.properties b/core/src/main/resources/hudson/diagnosis/ReverseProxySetupMonitor/message_es.properties new file mode 100644 index 0000000000..ecf5bb1824 --- /dev/null +++ b/core/src/main/resources/hudson/diagnosis/ReverseProxySetupMonitor/message_es.properties @@ -0,0 +1,26 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Dismiss=Cerrar +More\ Info=Ms informacin +# It appears that your reverse proxy set up is broken. +blurb=Parece que la configuracin de proxy inverso est mal diff --git a/core/src/main/resources/hudson/model/Hudson/configure_es.properties b/core/src/main/resources/hudson/model/Hudson/configure_es.properties index e2ccc98df0..753405a5a7 100644 --- a/core/src/main/resources/hudson/model/Hudson/configure_es.properties +++ b/core/src/main/resources/hudson/model/Hudson/configure_es.properties @@ -46,3 +46,4 @@ Add\ a\ new\ cloud=A System\ Message=Mensaje del sistema Prevent\ Cross\ Site\ Request\ Forgery\ exploits=Prevenir ataques "Cross site request forgery" LOADING=CARGANDO +Delete\ cloud=Borrar la nube diff --git a/core/src/main/resources/hudson/model/ListView/configure-entries_es.properties b/core/src/main/resources/hudson/model/ListView/configure-entries_es.properties index 05f2fec9c6..928921deff 100644 --- a/core/src/main/resources/hudson/model/ListView/configure-entries_es.properties +++ b/core/src/main/resources/hudson/model/ListView/configure-entries_es.properties @@ -21,7 +21,14 @@ # THE SOFTWARE. Jobs=Proyectos -Use\ a\ regular\ expression\ to\ include\ jobs\ into\ the\ view=Utilizar una expresin regular para incluir proyectos dentro de la vista +Use\ a\ regular\ expression\ to\ include\ jobs\ into\ the\ view=\ + Utilizar una expresin regular para incluir proyectos dentro de la vista Regular\ expression=Expresin regular Columns=Columnas Add\ column=Aadir columna +All\ selected\ jobs=Todos los trabajos seleccionados +Status\ Filter=Estado del filtro +Job\ Filters=Filtros +Add\ Job\ Filter=Aadir un filtro +Disabled\ jobs\ only=Desacivar slo estos trabajos +Enabled\ jobs\ only=Activar slo estos trabajos diff --git a/core/src/main/resources/hudson/model/Messages_es.properties b/core/src/main/resources/hudson/model/Messages_es.properties index 8424fec066..0f58f8a90d 100644 --- a/core/src/main/resources/hudson/model/Messages_es.properties +++ b/core/src/main/resources/hudson/model/Messages_es.properties @@ -277,3 +277,7 @@ Node.LabelMissing={0} no tiene etiqueta {1} Node.BecauseNodeIsReserved={0} est reservado para trabajos asignados a este nodo. Permalink.LastUnsuccessfulBuild=ltima ejecucin fallida Permalink.LastUnstableBuild=ltima ejecucin inestable +# Slave node offline or not a remote channel (such as master node). +Computer.BadChannel=El nodo est apagado o no existe el canal remoto (como puede ocurrir en un nodo principal) +# My Views +MyViewsProperty.DisplayName=Mis vistas diff --git a/core/src/main/resources/hudson/model/View/viewTabs_es.properties b/core/src/main/resources/hudson/model/View/viewTabs_es.properties new file mode 100644 index 0000000000..4df3f2f531 --- /dev/null +++ b/core/src/main/resources/hudson/model/View/viewTabs_es.properties @@ -0,0 +1,23 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +New\ View=Nueva vista diff --git a/core/src/main/resources/hudson/widgets/BuildHistoryWidget/entries_es.properties b/core/src/main/resources/hudson/widgets/BuildHistoryWidget/entries_es.properties index 0416a6cd39..003d058296 100644 --- a/core/src/main/resources/hudson/widgets/BuildHistoryWidget/entries_es.properties +++ b/core/src/main/resources/hudson/widgets/BuildHistoryWidget/entries_es.properties @@ -21,4 +21,4 @@ # THE SOFTWARE. pending=pendiente -cancel\ this\ build=Cancelar esta ejecución +cancel\ this\ build=Cancelar esta ejecucin diff --git a/core/src/main/resources/lib/form/booleanRadio_es.properties b/core/src/main/resources/lib/form/booleanRadio_es.properties index a313970c2c..f640084696 100644 --- a/core/src/main/resources/lib/form/booleanRadio_es.properties +++ b/core/src/main/resources/lib/form/booleanRadio_es.properties @@ -20,5 +20,5 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Yes=Sí +Yes=S No=No diff --git a/maven-plugin/src/main/resources/hudson/maven/MavenModuleSetBuild/main_es.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSetBuild/main_es.properties index c4a941a5ef..fc8341f22a 100644 --- a/maven-plugin/src/main/resources/hudson/maven/MavenModuleSetBuild/main_es.properties +++ b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSetBuild/main_es.properties @@ -21,3 +21,5 @@ # THE SOFTWARE. Module\ Builds=Mdulos +# didn''t run +noRun=No se ejecut -- GitLab From 76c79395feed3f0c9e73d3c0819c0d9c0d1ee0f7 Mon Sep 17 00:00:00 2001 From: sogabe Date: Sat, 10 Jul 2010 13:21:40 +0000 Subject: [PATCH 010/336] updated Japanese help files. #32656, #32268. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@32697 71c3de6d-444a-0410-be80-ed276b4c234a --- war/resources/help/parameter/file_ja.html | 6 +++--- war/resources/help/view-config/includeregex_ja.html | 6 +++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/war/resources/help/parameter/file_ja.html b/war/resources/help/parameter/file_ja.html index c446e32741..63fbe50faf 100644 --- a/war/resources/help/parameter/file_ja.html +++ b/war/resources/help/parameter/file_ja.html @@ -2,12 +2,12 @@ ブラウザからアップロードしたファイルを、ビルドのパラメータとして受け付けます。 アップロードされたファイルは、ワークスペースの指定した場所に置かれ、ビルド時にアクセスし使用できます。 -

- 次のような多くのケースでとても便利です。 - +

次のような多くのケースでとても便利です。

  1. ユーザーにユーザー自身がビルドした成果物を試験させる。
  2. ユーザー自身がファイルを置くことで、アップロード/リリース/デプロイの自動化を行う。
  3. アップロードしたデータセットのデータ処理を行う。
+

ファイルをアップロードしないこともできます。アップロードしない場合でワークスペースの特定の場所にすでに存在しない場合、 + 何も実行されません。ワークスペースにファイルがすでにある場合、ファイルはそのままにします。

\ No newline at end of file diff --git a/war/resources/help/view-config/includeregex_ja.html b/war/resources/help/view-config/includeregex_ja.html index b68c6b09b5..0ee95cf01c 100644 --- a/war/resources/help/view-config/includeregex_ja.html +++ b/war/resources/help/view-config/includeregex_ja.html @@ -1,3 +1,7 @@ 
- 設定すると、その正規表現をすべてのジョブ名に適用して、一致するジョブ名をこのビューに表示します。 +

その正規表現をすべてのジョブ名に適用して、一致するジョブ名をこのビューに表示します。

+

+ Tip: あるパターンを除くには、否定先読みを使用します。 + 例えば、testsomething以外のすべてのジョブを表示するには、(?!test.*).*を使用します。 +

-- GitLab From c03314d283f659e520c1320299815c711b4f84ab Mon Sep 17 00:00:00 2001 From: mindless Date: Mon, 12 Jul 2010 15:49:50 +0000 Subject: [PATCH 011/336] update nabble url git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@32790 71c3de6d-444a-0410-be80-ed276b4c234a --- war/resources/help/system-config/usage-statistics.html | 4 ++-- war/resources/help/system-config/usage-statistics_de.html | 4 ++-- war/resources/help/system-config/usage-statistics_fr.html | 4 ++-- war/resources/help/system-config/usage-statistics_ja.html | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/war/resources/help/system-config/usage-statistics.html b/war/resources/help/system-config/usage-statistics.html index aeba5c8e39..8fd41d7817 100644 --- a/war/resources/help/system-config/usage-statistics.html +++ b/war/resources/help/system-config/usage-statistics.html @@ -19,6 +19,6 @@ data of these usage statistics submissions will be shared with the community.

- You can read + You can read the discussion of this mechanism in the community, and you are welcome to add your voice here. - \ No newline at end of file + diff --git a/war/resources/help/system-config/usage-statistics_de.html b/war/resources/help/system-config/usage-statistics_de.html index 7ef24098ee..389a3cd954 100644 --- a/war/resources/help/system-config/usage-statistics_de.html +++ b/war/resources/help/system-config/usage-statistics_de.html @@ -19,6 +19,6 @@ Nutzungsstatistiken der Hudson-Community zur Verfügung gestellt.

- Lesen Sie die + Lesen Sie die Diskussion dieser Funktion in der Hudson-Community - und steuern Sie gerne Ihre Meinung dazu bei! - \ No newline at end of file + diff --git a/war/resources/help/system-config/usage-statistics_fr.html b/war/resources/help/system-config/usage-statistics_fr.html index a6ac2bc344..d225191974 100644 --- a/war/resources/help/system-config/usage-statistics_fr.html +++ b/war/resources/help/system-config/usage-statistics_fr.html @@ -20,6 +20,6 @@ Les données compilées de ces statistiques d'utilisation selon partagées avec la communauté.

- N'hésitez pas à lire + N'hésitez pas à lire la discussion sur ce mécanisme et à contribuer aux débats. - \ No newline at end of file + diff --git a/war/resources/help/system-config/usage-statistics_ja.html b/war/resources/help/system-config/usage-statistics_ja.html index eb875bcc81..e4268cd78f 100644 --- a/war/resources/help/system-config/usage-statistics_ja.html +++ b/war/resources/help/system-config/usage-statistics_ja.html @@ -17,6 +17,6 @@ 送信された利用状況の一覧データは、コミュニティで共有されます。

- + コミュニティでのこの仕組みに関するディスカッションを参考にしてください。ご意見はこちらにお願いします。 - \ No newline at end of file + -- GitLab From 795634ed10291872b3b6e1a360ed5462fe6796de Mon Sep 17 00:00:00 2001 From: bagrehc Date: Mon, 12 Jul 2010 17:50:46 +0000 Subject: [PATCH 012/336] Update the propertie files of brazilian portuguese translation. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@32799 71c3de6d-444a-0410-be80-ed276b4c234a --- .../hudson/cli/Messages_pt_BR.properties | 34 +++ .../hudson/Messages_pt_BR.properties | 26 +- .../PluginManager/advanced_pt_BR.properties | 14 +- .../PluginManager/available_pt_BR.properties | 3 - .../checkUpdates_pt_BR.properties | 25 ++ .../PluginManager/index_pt_BR.properties | 7 +- .../PluginManager/installed_pt_BR.properties | 5 + .../PluginManager/sites_pt_BR.properties | 24 ++ .../PluginManager/tabBar_pt_BR.properties | 1 + .../PluginManager/table_pt_BR.properties | 38 +++ .../index_pt_BR.properties | 38 +++ .../message_pt_BR.properties | 27 ++ .../MemoryUsageMonitor/index_pt_BR.properties | 27 ++ .../diagnosis/Messages_pt_BR.properties | 28 ++ .../OldDataMonitor/manage_pt_BR.properties | 67 ++++ .../OldDataMonitor/message_pt_BR.properties | 25 ++ .../message_pt_BR.properties | 27 ++ .../message_pt_BR.properties | 28 ++ .../hudson/fsp/Messages_pt_BR.properties | 35 +++ .../init/impl/Messages_pt_BR.properties | 26 ++ .../lifecycle/Messages_pt_BR.properties | 34 +++ .../_restart_pt_BR.properties | 28 ++ .../index_pt_BR.properties | 32 ++ .../LogRecorder/configure_pt_BR.properties | 28 ++ .../LogRecorder/delete_pt_BR.properties | 24 ++ .../LogRecorder/sidepanel_pt_BR.properties | 26 ++ .../LogRecorderManager/all_pt_BR.properties | 23 ++ .../LogRecorderManager/feeds_pt_BR.properties | 25 ++ .../LogRecorderManager/index_pt_BR.properties | 11 +- .../levels_pt_BR.properties | 32 ++ .../LogRecorderManager/new_pt_BR.properties | 23 ++ .../sidepanel_pt_BR.properties | 27 ++ .../hudson/logging/Messages_pt_BR.properties | 26 ++ .../MatrixBuild/ajaxMatrix_pt_BR.properties | 23 ++ .../MatrixProject/ajaxMatrix_pt_BR.properties | 23 ++ .../configure-entries_pt_BR.properties | 15 +- .../hudson/matrix/Messages_pt_BR.properties | 5 +- .../AbstractBuild/index_pt_BR.properties | 4 +- .../AbstractBuild/sidepanel_pt_BR.properties | 5 - .../AbstractBuild/tasks_pt_BR.properties | 1 + .../configure-common_pt_BR.properties | 7 + .../AbstractItem/noWorkspace_pt_BR.properties | 6 +- .../descriptionForm_pt_BR.properties | 23 ++ .../editDescription_pt_BR.properties | 23 ++ .../error_pt_BR.properties | 24 ++ .../AbstractProject/changes_pt_BR.properties | 6 + .../sidepanel_pt_BR.properties | 1 + .../svn-password_pt_BR.properties | 41 +++ .../wipeOutWorkspaceBlocked_pt_BR.properties | 25 ++ .../wipeOutWorkspace_pt_BR.properties | 25 ++ .../model/AgentSlave/config_pt_BR.properties | 23 ++ .../AllView/newViewDetail_pt_BR.properties | 25 ++ .../model/AllView/noJob_pt_BR.properties | 2 +- .../config_pt_BR.properties | 25 ++ .../config_pt_BR.properties | 27 ++ .../description_pt_BR.properties | 24 ++ .../UserCause/description_pt_BR.properties | 24 ++ .../CauseAction/summary_pt_BR.properties | 24 ++ .../config_pt_BR.properties | 25 ++ .../model/Computer/_script_pt_BR.properties | 23 ++ .../model/Computer/builds_pt_BR.properties | 24 ++ .../model/Computer/configure_pt_BR.properties | 26 ++ .../model/Computer/delete_pt_BR.properties | 24 ++ .../model/Computer/index_pt_BR.properties | 32 ++ .../Computer/markOffline_pt_BR.properties | 29 ++ .../model/Computer/sidepanel_pt_BR.properties | 5 + .../model/ComputerSet/_new_pt_BR.properties | 25 ++ .../ComputerSet/configure_pt_BR.properties | 24 ++ .../model/ComputerSet/index_pt_BR.properties | 25 ++ .../model/ComputerSet/new_pt_BR.properties | 24 ++ .../ComputerSet/sidepanel_pt_BR.properties | 2 + .../dir_pt_BR.properties | 1 + .../Executor/causeOfDeath_pt_BR.properties | 26 ++ .../ExternalJob/sidepanel_pt_BR.properties | 26 ++ .../ExternalRun/sidepanel_pt_BR.properties | 27 ++ .../config_pt_BR.properties | 24 ++ .../model/Fingerprint/index_pt_BR.properties | 2 + .../hudson/model/Hudson/_cli_pt_BR.properties | 28 ++ .../model/Hudson/_restart_pt_BR.properties | 24 ++ .../Hudson/_safeRestart_pt_BR.properties | 24 ++ .../Hudson/accessDenied_pt_BR.properties | 27 ++ .../model/Hudson/configure_pt_BR.properties | 29 +- .../Hudson/fingerprintCheck_pt_BR.properties | 8 + .../model/Hudson/legend_pt_BR.properties | 49 +++ .../model/Hudson/loginError_pt_BR.properties | 2 + .../model/Hudson/manage_pt_BR.properties | 7 +- .../model/Hudson/noPrincipal_pt_BR.properties | 27 ++ .../projectRelationship-help_pt_BR.properties | 2 +- .../projectRelationship_pt_BR.properties | 1 + .../model/Hudson/threadDump_pt_BR.properties | 24 ++ .../model/Job/buildTimeTrend_pt_BR.properties | 2 + .../model/Job/configure_pt_BR.properties | 1 + .../hudson/model/Job/index_pt_BR.properties | 7 +- .../hudson/model/Job/rename_pt_BR.properties | 34 +++ .../hudson/model/Label/index_pt_BR.properties | 25 ++ .../model/Label/sidepanel_pt_BR.properties | 25 ++ .../configure-entries_pt_BR.properties | 10 + .../ListView/newViewDetail_pt_BR.properties | 26 ++ .../LoadStatistics/main_pt_BR.properties | 60 ++++ .../hudson/model/Messages_pt_BR.properties | 288 ++++++++++++++++++ .../MyView/newViewDetail_pt_BR.properties | 26 ++ .../model/MyView/noJob_pt_BR.properties | 25 ++ .../MyViewsProperty/config_pt_BR.properties | 25 ++ .../MyViewsProperty/newView_pt_BR.properties | 23 ++ .../NoFingerprintMatch/index_pt_BR.properties | 34 +++ .../ParametersAction/index_pt_BR.properties | 1 + .../config_pt_BR.properties | 2 +- .../index_pt_BR.properties | 1 + .../config_pt_BR.properties | 25 ++ .../configure-entries_pt_BR.properties | 24 ++ .../ProxyView/newViewDetail_pt_BR.properties | 23 ++ .../KeepLogBuildBadge/badge_pt_BR.properties | 23 ++ .../Run/artifacts-index_pt_BR.properties | 23 ++ .../hudson/model/Run/console_pt_BR.properties | 2 + .../hudson/model/Run/logKeep_pt_BR.properties | 3 +- .../config_pt_BR.properties | 25 ++ .../Slave/help-launcher_pt_BR.properties | 23 ++ .../config_pt_BR.properties | 25 ++ .../TreeView/sidepanel2_pt_BR.properties | 23 ++ .../message_pt_BR.properties | 30 ++ .../Failure/status_pt_BR.properties | 24 ++ .../Installing/status_pt_BR.properties | 23 ++ .../Pending/status_pt_BR.properties | 23 ++ .../Success/status_pt_BR.properties | 23 ++ .../model/UpdateCenter/index_pt_BR.properties | 27 ++ .../UpdateCenter/sidepanel_pt_BR.properties | 1 + .../model/User/configure_pt_BR.properties | 2 + .../hudson/model/User/delete_pt_BR.properties | 24 ++ .../model/User/sidepanel_pt_BR.properties | 2 + .../model/View/People/index_pt_BR.properties | 2 + .../hudson/model/View/builds_pt_BR.properties | 3 +- .../model/View/configure_pt_BR.properties | 4 +- .../hudson/model/View/newJob_pt_BR.properties | 2 +- .../hudson/model/View/noJob_pt_BR.properties | 26 ++ .../model/View/viewTabs_pt_BR.properties | 23 ++ .../model/queue/Messages_pt_BR.properties | 24 ++ .../config_pt_BR.properties | 23 ++ .../DiskSpace/cause_pt_BR.properties | 25 ++ .../node_monitors/Messages_pt_BR.properties | 13 +- .../message_pt_BR.properties | 28 ++ .../Data/cause_pt_BR.properties | 23 ++ .../message_pt_BR.properties | 24 ++ .../index_pt_BR.properties | 23 ++ .../message_pt_BR.properties | 24 ++ .../askRootPassword_pt_BR.properties | 31 ++ .../ZFSInstaller/confirm_pt_BR.properties | 37 +++ .../ZFSInstaller/message_pt_BR.properties | 28 ++ .../config_pt_BR.properties | 24 ++ .../help_pt_BR.properties | 27 ++ .../os/windows/Messages_pt_BR.properties | 49 +++ .../hudson/scm/Messages_pt_BR.properties | 4 + .../scm/SCM/project-changes_pt_BR.properties | 1 + .../Search/search-failed_pt_BR.properties | 2 +- .../config_pt_BR.properties | 4 - .../_entryForm_pt_BR.properties | 28 ++ .../firstUser_pt_BR.properties | 23 ++ .../index_pt_BR.properties | 5 +- .../success_pt_BR.properties | 25 ++ .../LDAPSecurityRealm/config_pt_BR.properties | 3 + .../hudson/security/Messages_pt_BR.properties | 43 +++ .../PAMSecurityRealm/config_pt_BR.properties | 24 ++ .../security/csrf/Messages_pt_BR.properties | 24 ++ .../CommandLauncher/help_pt_BR.properties | 26 ++ .../ComputerLauncher/main_pt_BR.properties | 27 ++ .../configure-entries_pt_BR.properties | 12 +- .../newInstanceDetail_pt_BR.properties | 28 ++ .../config_pt_BR.properties | 25 ++ .../JNLPLauncher/config_pt_BR.properties | 24 ++ .../slaves/JNLPLauncher/help_pt_BR.properties | 28 ++ .../slaves/JNLPLauncher/main_pt_BR.properties | 32 ++ .../hudson/slaves/Messages_pt_BR.properties | 22 +- .../ChannelTermination/cause_pt_BR.properties | 23 ++ .../LaunchFailed/cause_pt_BR.properties | 23 ++ .../Demand/config_pt_BR.properties | 4 +- .../config_pt_BR.properties | 29 ++ .../SlaveComputer/disconnect_pt_BR.properties | 28 ++ .../SlaveComputer/sidepanel2_pt_BR.properties | 25 ++ .../SlaveComputer/systemInfo_pt_BR.properties | 26 ++ .../SlaveComputer/threadDump_pt_BR.properties | 25 ++ .../AntInstallation/config_pt_BR.properties | 23 ++ .../ArtifactArchiver/config_pt_BR.properties | 4 +- .../tasks/BatchFile/config_pt_BR.properties | 25 ++ .../FingerprintAction/index_pt_BR.properties | 2 + .../Fingerprinter/config_pt_BR.properties | 3 + .../JavadocArchiver/config_pt_BR.properties | 3 +- .../tasks/LogRotator/config_pt_BR.properties | 4 + .../tasks/Mailer/global_pt_BR.properties | 3 + .../MavenInstallation/config_pt_BR.properties | 3 - .../tasks/Maven/config_pt_BR.properties | 4 + .../hudson/tasks/Messages_pt_BR.properties | 36 +++ .../DescriptorImpl/outline_pt_BR.properties | 23 ++ .../junit/CaseResult/index_pt_BR.properties | 2 + .../junit/CaseResult/list_pt_BR.properties | 26 ++ .../junit/CaseResult/summary_pt_BR.properties | 24 ++ .../junit/ClassResult/list_pt_BR.properties | 28 ++ .../junit/History/index_pt_BR.properties | 25 ++ .../config_pt_BR.properties | 7 +- .../tasks/junit/Messages_pt_BR.properties | 23 +- .../summary_pt_BR.properties | 2 +- .../TestResultAction/index_pt_BR.properties | 30 ++ .../tasks/test/Messages_pt_BR.properties | 15 + .../MetaTabulatedResult/body_pt_BR.properties | 2 + .../MetaTabulatedResult/list_pt_BR.properties | 28 ++ .../TestObject/sidepanel_pt_BR.properties | 25 ++ .../test/TestResult/index_pt_BR.properties | 24 ++ .../CommandInstaller/config_pt_BR.properties | 24 ++ .../config_pt_BR.properties | 23 ++ .../config_pt_BR.properties | 24 ++ .../JDKInstaller/config_pt_BR.properties | 24 ++ .../hudson/tools/Messages_pt_BR.properties | 50 +++ .../ToolInstallation/config_pt_BR.properties | 24 ++ .../ToolInstallation/global_pt_BR.properties | 30 ++ .../config_pt_BR.properties | 25 ++ .../config_pt_BR.properties | 24 ++ .../hudson/tools/label_pt_BR.properties | 23 ++ .../hudson/triggers/Messages_pt_BR.properties | 6 + .../message_pt_BR.properties | 28 ++ .../DescriptorImpl/index_pt_BR.properties | 31 ++ .../util/AWTProblem/index_pt_BR.properties | 25 ++ .../message_pt_BR.properties | 23 ++ .../index_pt_BR.properties | 2 + .../HudsonIsRestarting/index_pt_BR.properties | 24 ++ .../index_pt_BR.properties | 33 ++ .../index_pt_BR.properties | 36 +++ .../JNADoublyLoaded/index_pt_BR.properties | 27 ++ .../hudson/util/Messages_pt_BR.properties | 30 ++ .../util/NoHomeDir/index_pt_BR.properties | 32 ++ .../columnHeader_pt_BR.properties | 23 ++ .../LastStableColumn/column_pt_BR.properties | 23 ++ .../hudson/views/Messages_pt_BR.properties | 38 +++ .../entries_pt_BR.properties | 24 ++ .../lib/form/booleanRadio_pt_BR.properties | 24 ++ .../form/expandableTextbox_pt_BR.properties | 26 ++ .../lib/form/helpArea_pt_BR.properties | 23 ++ .../lib/form/hetero-list_pt_BR.properties | 23 ++ .../lib/form/slave-mode_pt_BR.properties | 23 ++ .../lib/hudson/artifactList_pt_BR.properties | 23 ++ .../hudson/buildListTable_pt_BR.properties | 2 + .../lib/hudson/executors_pt_BR.properties | 3 + .../hudson/newFromList/form_pt_BR.properties | 23 ++ ...blockWhenUpstreamBuilding_pt_BR.properties | 23 ++ .../project/config-builders_pt_BR.properties | 1 + .../config-retryCount_pt_BR.properties | 2 +- ...g-upstream-pseudo-trigger_pt_BR.properties | 3 +- .../lib/hudson/queue_pt_BR.properties | 1 + .../lib/hudson/scriptConsole_pt_BR.properties | 6 + .../lib/layout/main-panel_pt_BR.properties | 23 ++ .../resources/lib/test/bar_pt_BR.properties | 3 +- .../MavenModuleSet/actions_pt_BR.properties | 1 + .../configure-entries_pt_BR.properties | 11 +- .../MavenModuleSet/global_pt_BR.properties | 24 ++ .../MavenModuleSet/index_pt_BR.properties | 6 +- .../MavenModuleSetBuild/main_pt_BR.properties | 25 ++ .../hudson/maven/Messages_pt_BR.properties | 15 +- .../RedeployPublisher/config_pt_BR.properties | 3 + .../badge_pt_BR.properties | 23 ++ .../index_pt_BR.properties | 25 ++ .../maven/reporters/Messages_pt_BR.properties | 11 +- 258 files changed, 5335 insertions(+), 101 deletions(-) create mode 100644 cli/src/main/resources/hudson/cli/Messages_pt_BR.properties create mode 100644 core/src/main/resources/hudson/PluginManager/checkUpdates_pt_BR.properties create mode 100644 core/src/main/resources/hudson/PluginManager/sites_pt_BR.properties create mode 100644 core/src/main/resources/hudson/PluginManager/table_pt_BR.properties create mode 100644 core/src/main/resources/hudson/diagnosis/HudsonHomeDiskUsageMonitor/index_pt_BR.properties create mode 100644 core/src/main/resources/hudson/diagnosis/HudsonHomeDiskUsageMonitor/message_pt_BR.properties create mode 100644 core/src/main/resources/hudson/diagnosis/MemoryUsageMonitor/index_pt_BR.properties create mode 100644 core/src/main/resources/hudson/diagnosis/Messages_pt_BR.properties create mode 100644 core/src/main/resources/hudson/diagnosis/OldDataMonitor/manage_pt_BR.properties create mode 100644 core/src/main/resources/hudson/diagnosis/OldDataMonitor/message_pt_BR.properties create mode 100644 core/src/main/resources/hudson/diagnosis/ReverseProxySetupMonitor/message_pt_BR.properties create mode 100644 core/src/main/resources/hudson/diagnosis/TooManyJobsButNoView/message_pt_BR.properties create mode 100644 core/src/main/resources/hudson/fsp/Messages_pt_BR.properties create mode 100644 core/src/main/resources/hudson/init/impl/Messages_pt_BR.properties create mode 100644 core/src/main/resources/hudson/lifecycle/Messages_pt_BR.properties create mode 100644 core/src/main/resources/hudson/lifecycle/WindowsInstallerLink/_restart_pt_BR.properties create mode 100644 core/src/main/resources/hudson/lifecycle/WindowsInstallerLink/index_pt_BR.properties create mode 100644 core/src/main/resources/hudson/logging/LogRecorder/configure_pt_BR.properties create mode 100644 core/src/main/resources/hudson/logging/LogRecorder/delete_pt_BR.properties create mode 100644 core/src/main/resources/hudson/logging/LogRecorder/sidepanel_pt_BR.properties create mode 100644 core/src/main/resources/hudson/logging/LogRecorderManager/all_pt_BR.properties create mode 100644 core/src/main/resources/hudson/logging/LogRecorderManager/feeds_pt_BR.properties create mode 100644 core/src/main/resources/hudson/logging/LogRecorderManager/levels_pt_BR.properties create mode 100644 core/src/main/resources/hudson/logging/LogRecorderManager/new_pt_BR.properties create mode 100644 core/src/main/resources/hudson/logging/LogRecorderManager/sidepanel_pt_BR.properties create mode 100644 core/src/main/resources/hudson/logging/Messages_pt_BR.properties create mode 100644 core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix_pt_BR.properties create mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_pt_BR.properties create mode 100644 core/src/main/resources/hudson/model/AbstractModelObject/descriptionForm_pt_BR.properties create mode 100644 core/src/main/resources/hudson/model/AbstractModelObject/editDescription_pt_BR.properties create mode 100644 core/src/main/resources/hudson/model/AbstractModelObject/error_pt_BR.properties create mode 100644 core/src/main/resources/hudson/model/AbstractProject/svn-password_pt_BR.properties create mode 100644 core/src/main/resources/hudson/model/AbstractProject/wipeOutWorkspaceBlocked_pt_BR.properties create mode 100644 core/src/main/resources/hudson/model/AbstractProject/wipeOutWorkspace_pt_BR.properties create mode 100644 core/src/main/resources/hudson/model/AgentSlave/config_pt_BR.properties create mode 100644 core/src/main/resources/hudson/model/AllView/newViewDetail_pt_BR.properties create mode 100644 core/src/main/resources/hudson/model/BooleanParameterDefinition/config_pt_BR.properties create mode 100644 core/src/main/resources/hudson/model/BuildAuthorizationToken/config_pt_BR.properties create mode 100644 core/src/main/resources/hudson/model/Cause/UpstreamCause/description_pt_BR.properties create mode 100644 core/src/main/resources/hudson/model/Cause/UserCause/description_pt_BR.properties create mode 100644 core/src/main/resources/hudson/model/CauseAction/summary_pt_BR.properties create mode 100644 core/src/main/resources/hudson/model/ChoiceParameterDefinition/config_pt_BR.properties create mode 100644 core/src/main/resources/hudson/model/Computer/_script_pt_BR.properties create mode 100644 core/src/main/resources/hudson/model/Computer/builds_pt_BR.properties create mode 100644 core/src/main/resources/hudson/model/Computer/configure_pt_BR.properties create mode 100644 core/src/main/resources/hudson/model/Computer/delete_pt_BR.properties create mode 100644 core/src/main/resources/hudson/model/Computer/index_pt_BR.properties create mode 100644 core/src/main/resources/hudson/model/Computer/markOffline_pt_BR.properties create mode 100644 core/src/main/resources/hudson/model/ComputerSet/_new_pt_BR.properties create mode 100644 core/src/main/resources/hudson/model/ComputerSet/configure_pt_BR.properties create mode 100644 core/src/main/resources/hudson/model/ComputerSet/index_pt_BR.properties create mode 100644 core/src/main/resources/hudson/model/ComputerSet/new_pt_BR.properties create mode 100644 core/src/main/resources/hudson/model/Executor/causeOfDeath_pt_BR.properties create mode 100644 core/src/main/resources/hudson/model/ExternalJob/sidepanel_pt_BR.properties create mode 100644 core/src/main/resources/hudson/model/ExternalRun/sidepanel_pt_BR.properties create mode 100644 core/src/main/resources/hudson/model/FileParameterDefinition/config_pt_BR.properties create mode 100644 core/src/main/resources/hudson/model/Hudson/_cli_pt_BR.properties create mode 100644 core/src/main/resources/hudson/model/Hudson/_restart_pt_BR.properties create mode 100644 core/src/main/resources/hudson/model/Hudson/_safeRestart_pt_BR.properties create mode 100644 core/src/main/resources/hudson/model/Hudson/accessDenied_pt_BR.properties create mode 100644 core/src/main/resources/hudson/model/Hudson/legend_pt_BR.properties create mode 100644 core/src/main/resources/hudson/model/Hudson/noPrincipal_pt_BR.properties create mode 100644 core/src/main/resources/hudson/model/Hudson/threadDump_pt_BR.properties create mode 100644 core/src/main/resources/hudson/model/Job/rename_pt_BR.properties create mode 100644 core/src/main/resources/hudson/model/Label/index_pt_BR.properties create mode 100644 core/src/main/resources/hudson/model/Label/sidepanel_pt_BR.properties create mode 100644 core/src/main/resources/hudson/model/ListView/newViewDetail_pt_BR.properties create mode 100644 core/src/main/resources/hudson/model/LoadStatistics/main_pt_BR.properties create mode 100644 core/src/main/resources/hudson/model/MyView/newViewDetail_pt_BR.properties create mode 100644 core/src/main/resources/hudson/model/MyView/noJob_pt_BR.properties create mode 100644 core/src/main/resources/hudson/model/MyViewsProperty/config_pt_BR.properties create mode 100644 core/src/main/resources/hudson/model/MyViewsProperty/newView_pt_BR.properties create mode 100644 core/src/main/resources/hudson/model/NoFingerprintMatch/index_pt_BR.properties create mode 100644 core/src/main/resources/hudson/model/PasswordParameterDefinition/config_pt_BR.properties create mode 100644 core/src/main/resources/hudson/model/ProxyView/configure-entries_pt_BR.properties create mode 100644 core/src/main/resources/hudson/model/ProxyView/newViewDetail_pt_BR.properties create mode 100644 core/src/main/resources/hudson/model/Run/KeepLogBuildBadge/badge_pt_BR.properties create mode 100644 core/src/main/resources/hudson/model/Run/artifacts-index_pt_BR.properties create mode 100644 core/src/main/resources/hudson/model/RunParameterDefinition/config_pt_BR.properties create mode 100644 core/src/main/resources/hudson/model/Slave/help-launcher_pt_BR.properties create mode 100644 core/src/main/resources/hudson/model/StringParameterDefinition/config_pt_BR.properties create mode 100644 core/src/main/resources/hudson/model/TreeView/sidepanel2_pt_BR.properties create mode 100644 core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_pt_BR.properties create mode 100644 core/src/main/resources/hudson/model/UpdateCenter/DownloadJob/Failure/status_pt_BR.properties create mode 100644 core/src/main/resources/hudson/model/UpdateCenter/DownloadJob/Installing/status_pt_BR.properties create mode 100644 core/src/main/resources/hudson/model/UpdateCenter/DownloadJob/Pending/status_pt_BR.properties create mode 100644 core/src/main/resources/hudson/model/UpdateCenter/DownloadJob/Success/status_pt_BR.properties create mode 100644 core/src/main/resources/hudson/model/UpdateCenter/index_pt_BR.properties create mode 100644 core/src/main/resources/hudson/model/User/delete_pt_BR.properties create mode 100644 core/src/main/resources/hudson/model/View/noJob_pt_BR.properties create mode 100644 core/src/main/resources/hudson/model/View/viewTabs_pt_BR.properties create mode 100644 core/src/main/resources/hudson/model/queue/Messages_pt_BR.properties create mode 100644 core/src/main/resources/hudson/node_monitors/AbstractDiskSpaceMonitor/config_pt_BR.properties create mode 100644 core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause_pt_BR.properties create mode 100644 core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message_pt_BR.properties create mode 100644 core/src/main/resources/hudson/node_monitors/ResponseTimeMonitor/Data/cause_pt_BR.properties create mode 100644 core/src/main/resources/hudson/os/solaris/ZFSInstaller/MigrationCompleteNotice/message_pt_BR.properties create mode 100644 core/src/main/resources/hudson/os/solaris/ZFSInstaller/MigrationFailedNotice/index_pt_BR.properties create mode 100644 core/src/main/resources/hudson/os/solaris/ZFSInstaller/MigrationFailedNotice/message_pt_BR.properties create mode 100644 core/src/main/resources/hudson/os/solaris/ZFSInstaller/askRootPassword_pt_BR.properties create mode 100644 core/src/main/resources/hudson/os/solaris/ZFSInstaller/confirm_pt_BR.properties create mode 100644 core/src/main/resources/hudson/os/solaris/ZFSInstaller/message_pt_BR.properties create mode 100644 core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/config_pt_BR.properties create mode 100644 core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help_pt_BR.properties create mode 100644 core/src/main/resources/hudson/os/windows/Messages_pt_BR.properties create mode 100644 core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_pt_BR.properties create mode 100644 core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/firstUser_pt_BR.properties create mode 100644 core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/success_pt_BR.properties create mode 100644 core/src/main/resources/hudson/security/PAMSecurityRealm/config_pt_BR.properties create mode 100644 core/src/main/resources/hudson/security/csrf/Messages_pt_BR.properties create mode 100644 core/src/main/resources/hudson/slaves/CommandLauncher/help_pt_BR.properties create mode 100644 core/src/main/resources/hudson/slaves/ComputerLauncher/main_pt_BR.properties create mode 100644 core/src/main/resources/hudson/slaves/DumbSlave/newInstanceDetail_pt_BR.properties create mode 100644 core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_pt_BR.properties create mode 100644 core/src/main/resources/hudson/slaves/JNLPLauncher/config_pt_BR.properties create mode 100644 core/src/main/resources/hudson/slaves/JNLPLauncher/help_pt_BR.properties create mode 100644 core/src/main/resources/hudson/slaves/JNLPLauncher/main_pt_BR.properties create mode 100644 core/src/main/resources/hudson/slaves/OfflineCause/ChannelTermination/cause_pt_BR.properties create mode 100644 core/src/main/resources/hudson/slaves/OfflineCause/LaunchFailed/cause_pt_BR.properties create mode 100644 core/src/main/resources/hudson/slaves/SimpleScheduledRetentionStrategy/config_pt_BR.properties create mode 100644 core/src/main/resources/hudson/slaves/SlaveComputer/disconnect_pt_BR.properties create mode 100644 core/src/main/resources/hudson/slaves/SlaveComputer/sidepanel2_pt_BR.properties create mode 100644 core/src/main/resources/hudson/slaves/SlaveComputer/systemInfo_pt_BR.properties create mode 100644 core/src/main/resources/hudson/slaves/SlaveComputer/threadDump_pt_BR.properties create mode 100644 core/src/main/resources/hudson/tasks/Ant/AntInstallation/config_pt_BR.properties create mode 100644 core/src/main/resources/hudson/tasks/BatchFile/config_pt_BR.properties create mode 100644 core/src/main/resources/hudson/tasks/_ant/AntTargetNote/DescriptorImpl/outline_pt_BR.properties create mode 100644 core/src/main/resources/hudson/tasks/junit/CaseResult/list_pt_BR.properties create mode 100644 core/src/main/resources/hudson/tasks/junit/CaseResult/summary_pt_BR.properties create mode 100644 core/src/main/resources/hudson/tasks/junit/ClassResult/list_pt_BR.properties create mode 100644 core/src/main/resources/hudson/tasks/junit/History/index_pt_BR.properties create mode 100644 core/src/main/resources/hudson/tasks/test/AggregatedTestResultPublisher/TestResultAction/index_pt_BR.properties create mode 100644 core/src/main/resources/hudson/tasks/test/MetaTabulatedResult/list_pt_BR.properties create mode 100644 core/src/main/resources/hudson/tasks/test/TestObject/sidepanel_pt_BR.properties create mode 100644 core/src/main/resources/hudson/tasks/test/TestResult/index_pt_BR.properties create mode 100644 core/src/main/resources/hudson/tools/CommandInstaller/config_pt_BR.properties create mode 100644 core/src/main/resources/hudson/tools/DownloadFromUrlInstaller/config_pt_BR.properties create mode 100644 core/src/main/resources/hudson/tools/InstallSourceProperty/config_pt_BR.properties create mode 100644 core/src/main/resources/hudson/tools/JDKInstaller/config_pt_BR.properties create mode 100644 core/src/main/resources/hudson/tools/Messages_pt_BR.properties create mode 100644 core/src/main/resources/hudson/tools/ToolInstallation/config_pt_BR.properties create mode 100644 core/src/main/resources/hudson/tools/ToolInstallation/global_pt_BR.properties create mode 100644 core/src/main/resources/hudson/tools/ToolLocationNodeProperty/config_pt_BR.properties create mode 100644 core/src/main/resources/hudson/tools/ZipExtractionInstaller/config_pt_BR.properties create mode 100644 core/src/main/resources/hudson/tools/label_pt_BR.properties create mode 100644 core/src/main/resources/hudson/triggers/SCMTrigger/AdministrativeMonitorImpl/message_pt_BR.properties create mode 100644 core/src/main/resources/hudson/triggers/SCMTrigger/DescriptorImpl/index_pt_BR.properties create mode 100644 core/src/main/resources/hudson/util/AWTProblem/index_pt_BR.properties create mode 100644 core/src/main/resources/hudson/util/AdministrativeError/message_pt_BR.properties create mode 100644 core/src/main/resources/hudson/util/HudsonIsRestarting/index_pt_BR.properties create mode 100644 core/src/main/resources/hudson/util/IncompatibleVMDetected/index_pt_BR.properties create mode 100644 core/src/main/resources/hudson/util/InsufficientPermissionDetected/index_pt_BR.properties create mode 100644 core/src/main/resources/hudson/util/JNADoublyLoaded/index_pt_BR.properties create mode 100644 core/src/main/resources/hudson/util/Messages_pt_BR.properties create mode 100644 core/src/main/resources/hudson/util/NoHomeDir/index_pt_BR.properties create mode 100644 core/src/main/resources/hudson/views/LastStableColumn/columnHeader_pt_BR.properties create mode 100644 core/src/main/resources/hudson/views/LastStableColumn/column_pt_BR.properties create mode 100644 core/src/main/resources/hudson/views/Messages_pt_BR.properties create mode 100644 core/src/main/resources/hudson/widgets/BuildHistoryWidget/entries_pt_BR.properties create mode 100644 core/src/main/resources/lib/form/booleanRadio_pt_BR.properties create mode 100644 core/src/main/resources/lib/form/expandableTextbox_pt_BR.properties create mode 100644 core/src/main/resources/lib/form/helpArea_pt_BR.properties create mode 100644 core/src/main/resources/lib/form/hetero-list_pt_BR.properties create mode 100644 core/src/main/resources/lib/form/slave-mode_pt_BR.properties create mode 100644 core/src/main/resources/lib/hudson/artifactList_pt_BR.properties create mode 100644 core/src/main/resources/lib/hudson/newFromList/form_pt_BR.properties create mode 100644 core/src/main/resources/lib/hudson/project/config-blockWhenUpstreamBuilding_pt_BR.properties create mode 100644 core/src/main/resources/lib/layout/main-panel_pt_BR.properties create mode 100644 maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/global_pt_BR.properties create mode 100644 maven-plugin/src/main/resources/hudson/maven/MavenModuleSetBuild/main_pt_BR.properties create mode 100644 maven-plugin/src/main/resources/hudson/maven/reporters/MavenAbstractArtifactRecord/badge_pt_BR.properties create mode 100644 maven-plugin/src/main/resources/hudson/maven/reporters/MavenAbstractArtifactRecord/index_pt_BR.properties diff --git a/cli/src/main/resources/hudson/cli/Messages_pt_BR.properties b/cli/src/main/resources/hudson/cli/Messages_pt_BR.properties new file mode 100644 index 0000000000..71030315c4 --- /dev/null +++ b/cli/src/main/resources/hudson/cli/Messages_pt_BR.properties @@ -0,0 +1,34 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +# Version mismatch. This CLI cannot work with this Hudson server +CLI.VersionMismatch= +# Hudson CLI\n\ +# Usage: java -jar hudson-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= +# Neither -s nor the HUDSON_URL env var is specified. +CLI.NoURL= diff --git a/core/src/main/resources/hudson/Messages_pt_BR.properties b/core/src/main/resources/hudson/Messages_pt_BR.properties index 8a0c6e28a6..5fd094efbb 100644 --- a/core/src/main/resources/hudson/Messages_pt_BR.properties +++ b/core/src/main/resources/hudson/Messages_pt_BR.properties @@ -35,4 +35,28 @@ Util.year ={0} {0,choice,0#anos|1#ano|1in progress or failed. +UpdatePageLegend= diff --git a/core/src/main/resources/hudson/PluginManager/installed_pt_BR.properties b/core/src/main/resources/hudson/PluginManager/installed_pt_BR.properties index a49a33913b..0f520e81b8 100644 --- a/core/src/main/resources/hudson/PluginManager/installed_pt_BR.properties +++ b/core/src/main/resources/hudson/PluginManager/installed_pt_BR.properties @@ -23,3 +23,8 @@ No\ plugins\ installed.=Nenhum plugin instalado. New\ plugins\ will\ take\ effect\ once\ you\ restart\ Hudson=O novos plugins s\u00F3 estar\u00E3o dispon\u00EDveis ap\u00F3s voc\u00EA reiniciar o Hudson Changes\ will\ take\ effect\ when\ you\ restart\ Hudson=A mudan\u00E7as ter\u00E3o efeito quando voc\u00EA reiniciar o Hudson +Uncheck\ to\ disable\ the\ plugin= +Enabled= +Restart\ Once\ No\ Jobs\ Are\ Running= +Version= +Name= diff --git a/core/src/main/resources/hudson/PluginManager/sites_pt_BR.properties b/core/src/main/resources/hudson/PluginManager/sites_pt_BR.properties new file mode 100644 index 0000000000..fe8c849e07 --- /dev/null +++ b/core/src/main/resources/hudson/PluginManager/sites_pt_BR.properties @@ -0,0 +1,24 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Remove= +Add...= diff --git a/core/src/main/resources/hudson/PluginManager/tabBar_pt_BR.properties b/core/src/main/resources/hudson/PluginManager/tabBar_pt_BR.properties index aff3e23849..40aa8dbf62 100644 --- a/core/src/main/resources/hudson/PluginManager/tabBar_pt_BR.properties +++ b/core/src/main/resources/hudson/PluginManager/tabBar_pt_BR.properties @@ -24,3 +24,4 @@ Updates=Atualiza\u00E7\u00F5es Available=Dispon\u00EDveis Installed=Instalados Advanced=Avan\u00E7ado +Sites= diff --git a/core/src/main/resources/hudson/PluginManager/table_pt_BR.properties b/core/src/main/resources/hudson/PluginManager/table_pt_BR.properties new file mode 100644 index 0000000000..60612ebbd0 --- /dev/null +++ b/core/src/main/resources/hudson/PluginManager/table_pt_BR.properties @@ -0,0 +1,38 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +# \ +# Warning: This plugin is built for Hudson {0} or newer. \ +# It may or may not work in your Hudson. +coreWarning= +# \ +# Warning: New version not compatible with installed version. \ +# Jobs using this plugin may need to be reconfigured. +compatWarning= +Version= +Inactive= +Check\ to\ install\ the\ plugin= +No\ updates= +Installed=Instalados +Install= +Click\ this\ heading\ to\ sort\ by\ category= +Name= diff --git a/core/src/main/resources/hudson/diagnosis/HudsonHomeDiskUsageMonitor/index_pt_BR.properties b/core/src/main/resources/hudson/diagnosis/HudsonHomeDiskUsageMonitor/index_pt_BR.properties new file mode 100644 index 0000000000..40d4d5b901 --- /dev/null +++ b/core/src/main/resources/hudson/diagnosis/HudsonHomeDiskUsageMonitor/index_pt_BR.properties @@ -0,0 +1,38 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +# To prevent that problem, you should act now. +description.2= +# \ +# Your HUDSON_HOME ({0}) is almost full. \ +# When this directory completely fills up, it\'ll wreak havoc because Hudson can\'t store any more data. +description.1= +# \ +# Move HUDSON_HOME to a bigger partition. \ +# See our Wiki for how to do this. +solution.2= +HUDSON_HOME\ is\ almost\ full= +# HUDSON_HOME is almost full +blurb=\ +# Estes usu\u00E1rios podem se logar no Hudson. Este \u00E9 um super conjunto desta lista, \ +# Clean up some files from this partition to make more room. +solution.1= diff --git a/core/src/main/resources/hudson/diagnosis/HudsonHomeDiskUsageMonitor/message_pt_BR.properties b/core/src/main/resources/hudson/diagnosis/HudsonHomeDiskUsageMonitor/message_pt_BR.properties new file mode 100644 index 0000000000..ed7e289494 --- /dev/null +++ b/core/src/main/resources/hudson/diagnosis/HudsonHomeDiskUsageMonitor/message_pt_BR.properties @@ -0,0 +1,27 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Dismiss= +# Your Hudson data directory "{0}" (AKA HUDSON_HOME) is almost full. You should act on it before it gets completely full. +blurb=\ +# Estes usu\u00E1rios podem se logar no Hudson. Este \u00E9 um super conjunto desta lista, \ +Tell\ me\ more= diff --git a/core/src/main/resources/hudson/diagnosis/MemoryUsageMonitor/index_pt_BR.properties b/core/src/main/resources/hudson/diagnosis/MemoryUsageMonitor/index_pt_BR.properties new file mode 100644 index 0000000000..aad959faf3 --- /dev/null +++ b/core/src/main/resources/hudson/diagnosis/MemoryUsageMonitor/index_pt_BR.properties @@ -0,0 +1,27 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Short= +Timespan= +JVM\ Memory\ Usage= +Medium= +Long= diff --git a/core/src/main/resources/hudson/diagnosis/Messages_pt_BR.properties b/core/src/main/resources/hudson/diagnosis/Messages_pt_BR.properties new file mode 100644 index 0000000000..8fc97519e0 --- /dev/null +++ b/core/src/main/resources/hudson/diagnosis/Messages_pt_BR.properties @@ -0,0 +1,28 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +# Used +MemoryUsageMonitor.USED= +# Total +MemoryUsageMonitor.TOTAL= +# Old Data +OldDataMonitor.DisplayName= diff --git a/core/src/main/resources/hudson/diagnosis/OldDataMonitor/manage_pt_BR.properties b/core/src/main/resources/hudson/diagnosis/OldDataMonitor/manage_pt_BR.properties new file mode 100644 index 0000000000..a67f7ca35a --- /dev/null +++ b/core/src/main/resources/hudson/diagnosis/OldDataMonitor/manage_pt_BR.properties @@ -0,0 +1,67 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Type= +# \ +# It is acceptable to leave unreadable data in these files, as Hudson will safely ignore it. \ +# To avoid the log messages at Hudson startup you can permanently delete the unreadable data \ +# by resaving these files using the button below. +blurb.6= +Discard\ Unreadable\ Data= +# \ +# Eventually the code supporting these data migrations may be removed. Compatibility will be \ +# retained for at least 150 releases since the structure change. Versions older than this are \ +# in bold above, and it is recommended to resave these files. +blurb.4= +Version= +Upgrade= +# \ +# (downgrade as far back as the selected version may still be possible) +blurb.5= +# \ +# Sometimes errors occur while reading data (if a plugin adds some data and that plugin is \ +# later disabled, if migration code is not written for structure changes, or if Hudson is \ +# downgraded after it has already written data not readable by the older version). \ +# These errors are logged, but the unreadable data is then skipped over, allowing Hudson to \ +# startup and function properly. +blurb.2= +Error=Erro +Unreadable\ Data= +# \ +# When there are changes in how data is stored on disk, Hudson uses the following strategy: \ +# data is migrated to the new structure when it is loaded, but the file is not resaved in the \ +# new format. This allows for downgrading Hudson if needed. However, it can also leave data \ +# on disk in the old format indefinitely. The table below lists files containing such data, \ +# and the Hudson version(s) where the data structure was changed. +blurb.1= +Resave\ data\ files\ with\ structure\ changes\ no\ newer\ than\ Hudson= +No\ old\ data\ was\ found.= +# \ +# The form below may be used to resave these files in the current format. Doing so means a \ +# downgrade to a Hudson release older than the selected version will not be able to read the \ +# data stored in the new format. Note that simply using Hudson to create and configure jobs \ +# and run builds can save data that may not be readable by older Hudson releases, even when \ +# this form is not used. Also if any unreadable data errors are reported in the right side \ +# of the table above, note that this data will be lost when the file is resaved. +blurb.3= +Name= +Manage\ Old\ Data= diff --git a/core/src/main/resources/hudson/diagnosis/OldDataMonitor/message_pt_BR.properties b/core/src/main/resources/hudson/diagnosis/OldDataMonitor/message_pt_BR.properties new file mode 100644 index 0000000000..311d1bcab4 --- /dev/null +++ b/core/src/main/resources/hudson/diagnosis/OldDataMonitor/message_pt_BR.properties @@ -0,0 +1,25 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Dismiss= +You\ have\ data\ stored\ in\ an\ older\ format\ and/or\ unreadable\ data.= +Manage= diff --git a/core/src/main/resources/hudson/diagnosis/ReverseProxySetupMonitor/message_pt_BR.properties b/core/src/main/resources/hudson/diagnosis/ReverseProxySetupMonitor/message_pt_BR.properties new file mode 100644 index 0000000000..1db0a97bad --- /dev/null +++ b/core/src/main/resources/hudson/diagnosis/ReverseProxySetupMonitor/message_pt_BR.properties @@ -0,0 +1,27 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Dismiss= +More\ Info= +# It appears that your reverse proxy set up is broken. +blurb=\ +# Estes usu\u00E1rios podem se logar no Hudson. Este \u00E9 um super conjunto desta lista, \ diff --git a/core/src/main/resources/hudson/diagnosis/TooManyJobsButNoView/message_pt_BR.properties b/core/src/main/resources/hudson/diagnosis/TooManyJobsButNoView/message_pt_BR.properties new file mode 100644 index 0000000000..3b5fe76fb1 --- /dev/null +++ b/core/src/main/resources/hudson/diagnosis/TooManyJobsButNoView/message_pt_BR.properties @@ -0,0 +1,28 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Dismiss= +# There appears to be a large number of jobs. Did you know that you can organize your jobs to different views? \ +# You can click '+' in the top page to create a new view any time. +blurb=\ +# Estes usu\u00E1rios podem se logar no Hudson. Este \u00E9 um super conjunto desta lista, \ +Create\ a\ view\ now= diff --git a/core/src/main/resources/hudson/fsp/Messages_pt_BR.properties b/core/src/main/resources/hudson/fsp/Messages_pt_BR.properties new file mode 100644 index 0000000000..bcfb0139f8 --- /dev/null +++ b/core/src/main/resources/hudson/fsp/Messages_pt_BR.properties @@ -0,0 +1,35 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +# {0} isn''t a job that has a workspace. +WorkspaceSnapshotSCM.IncorrectJobType= +# No such permalink ''{0}'' exists for {1} +WorkspaceSnapshotSCM.NoSuchPermalink= +# There''s no qualifying build for the {0} permalink in {1} +WorkspaceSnapshotSCM.NoBuild= +# \ +# {0} {1} doesn''t have a workspace snapshot attached,\n\ +# probably because when the build was done, no other jobs needed its workspace snapshot.\n\ +# Please run another build in {0} to get the workspace snapshot taken. +WorkspaceSnapshotSCM.NoWorkspace= +# No such job ''{0}'' exists. Perhaps you meant ''{1}''? +WorkspaceSnapshotSCM.NoSuchJob= diff --git a/core/src/main/resources/hudson/init/impl/Messages_pt_BR.properties b/core/src/main/resources/hudson/init/impl/Messages_pt_BR.properties new file mode 100644 index 0000000000..a3acaec42f --- /dev/null +++ b/core/src/main/resources/hudson/init/impl/Messages_pt_BR.properties @@ -0,0 +1,26 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +# Executing user-defined init script +GroovyInitScript.init= +# Preparing initial user content +InitialUserContent.init= diff --git a/core/src/main/resources/hudson/lifecycle/Messages_pt_BR.properties b/core/src/main/resources/hudson/lifecycle/Messages_pt_BR.properties new file mode 100644 index 0000000000..b4ac3c38e3 --- /dev/null +++ b/core/src/main/resources/hudson/lifecycle/Messages_pt_BR.properties @@ -0,0 +1,34 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +# Install as Windows Service +WindowsInstallerLink.DisplayName= +# Slave root directory ''{0}'' doesn''t exist +WindowsSlaveInstaller.RootFsDoesntExist= +# .NET Framework 2.0 or later is required for this feature +WindowsSlaveInstaller.DotNetRequired= +# This will install a slave agent as a Windows service, so that a Hudson slave starts automatically when the machine boots. +WindowsSlaveInstaller.ConfirmInstallation= +# Installation was successful. Would you like to start the service now? +WindowsSlaveInstaller.InstallationSuccessful= +# Installs Hudson as a Windows service to this system, so that Hudson starts automatically when the machine boots. +WindowsInstallerLink.Description= diff --git a/core/src/main/resources/hudson/lifecycle/WindowsInstallerLink/_restart_pt_BR.properties b/core/src/main/resources/hudson/lifecycle/WindowsInstallerLink/_restart_pt_BR.properties new file mode 100644 index 0000000000..174ef5d9df --- /dev/null +++ b/core/src/main/resources/hudson/lifecycle/WindowsInstallerLink/_restart_pt_BR.properties @@ -0,0 +1,28 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Please\ wait\ while\ Hudson\ is\ restarting= +# You should be taken automatically to the new Hudson in a few seconds. \ +# If for some reasons the service fails to start, check Windows event log for errors and consult \ +# online wiki page. +blurb=\ +# Estes usu\u00E1rios podem se logar no Hudson. Este \u00E9 um super conjunto desta lista, \ diff --git a/core/src/main/resources/hudson/lifecycle/WindowsInstallerLink/index_pt_BR.properties b/core/src/main/resources/hudson/lifecycle/WindowsInstallerLink/index_pt_BR.properties new file mode 100644 index 0000000000..caf4acf476 --- /dev/null +++ b/core/src/main/resources/hudson/lifecycle/WindowsInstallerLink/index_pt_BR.properties @@ -0,0 +1,32 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +# Installation is successfully completed. Do you want to stop this Hudson and start a newly installed Windows service? +restartBlurb= +Installation\ Directory= +Install\ as\ Windows\ Service= +Yes=Sim +Install= +# Installing Hudson as a Windows service allows you to start Hudson as soon as the machine starts, and regardless of \ +# who is interactively using Hudson. +installBlurb= +Installation\ Complete= diff --git a/core/src/main/resources/hudson/logging/LogRecorder/configure_pt_BR.properties b/core/src/main/resources/hudson/logging/LogRecorder/configure_pt_BR.properties new file mode 100644 index 0000000000..ef97c0fd95 --- /dev/null +++ b/core/src/main/resources/hudson/logging/LogRecorder/configure_pt_BR.properties @@ -0,0 +1,28 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Log\ level= +List\ of\ loggers\ and\ the\ log\ levels\ to\ record= +Logger= +Save= +Loggers= +Name= diff --git a/core/src/main/resources/hudson/logging/LogRecorder/delete_pt_BR.properties b/core/src/main/resources/hudson/logging/LogRecorder/delete_pt_BR.properties new file mode 100644 index 0000000000..72ff0607a8 --- /dev/null +++ b/core/src/main/resources/hudson/logging/LogRecorder/delete_pt_BR.properties @@ -0,0 +1,24 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Yes=Sim +Are\ you\ sure\ about\ deleting\ this\ log\ recorder?= diff --git a/core/src/main/resources/hudson/logging/LogRecorder/sidepanel_pt_BR.properties b/core/src/main/resources/hudson/logging/LogRecorder/sidepanel_pt_BR.properties new file mode 100644 index 0000000000..768659ecc3 --- /dev/null +++ b/core/src/main/resources/hudson/logging/LogRecorder/sidepanel_pt_BR.properties @@ -0,0 +1,26 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Configure=Configurar +Delete= +Back\ to\ Loggers= +Log\ records= diff --git a/core/src/main/resources/hudson/logging/LogRecorderManager/all_pt_BR.properties b/core/src/main/resources/hudson/logging/LogRecorderManager/all_pt_BR.properties new file mode 100644 index 0000000000..c7eb4f2a86 --- /dev/null +++ b/core/src/main/resources/hudson/logging/LogRecorderManager/all_pt_BR.properties @@ -0,0 +1,23 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Hudson\ Log=Log do Hudson diff --git a/core/src/main/resources/hudson/logging/LogRecorderManager/feeds_pt_BR.properties b/core/src/main/resources/hudson/logging/LogRecorderManager/feeds_pt_BR.properties new file mode 100644 index 0000000000..af075b5c03 --- /dev/null +++ b/core/src/main/resources/hudson/logging/LogRecorderManager/feeds_pt_BR.properties @@ -0,0 +1,25 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +>\ WARNING=AVISO +All=Tudo +>\ SEVERE=SEVERO diff --git a/core/src/main/resources/hudson/logging/LogRecorderManager/index_pt_BR.properties b/core/src/main/resources/hudson/logging/LogRecorderManager/index_pt_BR.properties index bb3f5d1d83..3b819ca2f5 100644 --- a/core/src/main/resources/hudson/logging/LogRecorderManager/index_pt_BR.properties +++ b/core/src/main/resources/hudson/logging/LogRecorderManager/index_pt_BR.properties @@ -20,11 +20,8 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Hudson\ Log=Log do Hudson -Logger\ Configuration=Configura\u00E7\u00E3o do Logger Name=Nome -Level=N\u00EDvel -Submit=Submeter -All=Tudo ->\ SEVERE=SEVERO ->\ WARNING=AVISO +All\ Hudson\ Logs= +Log\ Recorders= +Add\ new\ log\ recorder= +Log= diff --git a/core/src/main/resources/hudson/logging/LogRecorderManager/levels_pt_BR.properties b/core/src/main/resources/hudson/logging/LogRecorderManager/levels_pt_BR.properties new file mode 100644 index 0000000000..575660979e --- /dev/null +++ b/core/src/main/resources/hudson/logging/LogRecorderManager/levels_pt_BR.properties @@ -0,0 +1,32 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Level=N\u00EDvel +# http://wiki.hudson-ci.org/display/HUDSON/Logger+Configuration +url= +# Logger with no name is the default logger. \ +# This level will be inherited by all loggers without a configured level. +defaultLoggerMsg= +Name= +Adjust\ Levels= +Submit=Submeter +Logger\ Configuration=Configura\u00E7\u00E3o do Logger diff --git a/core/src/main/resources/hudson/logging/LogRecorderManager/new_pt_BR.properties b/core/src/main/resources/hudson/logging/LogRecorderManager/new_pt_BR.properties new file mode 100644 index 0000000000..d9ff37731e --- /dev/null +++ b/core/src/main/resources/hudson/logging/LogRecorderManager/new_pt_BR.properties @@ -0,0 +1,23 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Name= diff --git a/core/src/main/resources/hudson/logging/LogRecorderManager/sidepanel_pt_BR.properties b/core/src/main/resources/hudson/logging/LogRecorderManager/sidepanel_pt_BR.properties new file mode 100644 index 0000000000..8ca6060ec0 --- /dev/null +++ b/core/src/main/resources/hudson/logging/LogRecorderManager/sidepanel_pt_BR.properties @@ -0,0 +1,27 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +All\ Logs= +New\ Log\ Recorder= +Back\ to\ Dashboard= +Logger\ List= +Log\ Levels= diff --git a/core/src/main/resources/hudson/logging/Messages_pt_BR.properties b/core/src/main/resources/hudson/logging/Messages_pt_BR.properties new file mode 100644 index 0000000000..7e8d36a143 --- /dev/null +++ b/core/src/main/resources/hudson/logging/Messages_pt_BR.properties @@ -0,0 +1,26 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +# Initialing log recorders +LogRecorderManager.init= +# log +LogRecorderManager.DisplayName= diff --git a/core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix_pt_BR.properties b/core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix_pt_BR.properties new file mode 100644 index 0000000000..0d0099d217 --- /dev/null +++ b/core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix_pt_BR.properties @@ -0,0 +1,23 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Not\ run= diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_pt_BR.properties b/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_pt_BR.properties new file mode 100644 index 0000000000..163e84e82c --- /dev/null +++ b/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_pt_BR.properties @@ -0,0 +1,23 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Not\ configured= diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries_pt_BR.properties b/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries_pt_BR.properties index edc29366d5..2c8d72e038 100644 --- a/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries_pt_BR.properties +++ b/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries_pt_BR.properties @@ -27,4 +27,17 @@ Node=Nodo Name=Nome Values=Valor Add\ more\ axis=Adicionar mais eixos -Delete=Apagar \ No newline at end of file +Delete=ApagarAxes= +Execute\ touchstone\ builds\ first= +Unstable= +Labels=Etiquettes +Run\ each\ configuration\ sequentially= +Individual\ nodes= +Stable= +Required\ result= +Filter= +Combination\ Filter= +# \ +# Execute the rest of the combinations only if the touchstone builds has (at least) the selected result. +required.result.description= +Axes= diff --git a/core/src/main/resources/hudson/matrix/Messages_pt_BR.properties b/core/src/main/resources/hudson/matrix/Messages_pt_BR.properties index 8024a4c890..e69476244a 100644 --- a/core/src/main/resources/hudson/matrix/Messages_pt_BR.properties +++ b/core/src/main/resources/hudson/matrix/Messages_pt_BR.properties @@ -27,4 +27,7 @@ MatrixBuild.AppearsCancelled={0} parece estar cancelado MatrixBuild.Cancelled=Cancelado {0} MatrixBuild.Interrupting=Interrompendo {0} -MatrixConfiguration.Pronoun=Configura\u00E7\u00E3o \ No newline at end of file +MatrixConfiguration.Pronoun=Configura\u00E7\u00E3o# Kept because {0} is kept +MatrixRun.KeptBecauseOfParent= +# Duplicate axis name +MatrixProject.DuplicateAxisName= diff --git a/core/src/main/resources/hudson/model/AbstractBuild/index_pt_BR.properties b/core/src/main/resources/hudson/model/AbstractBuild/index_pt_BR.properties index 7a07e412f4..84c638f4bf 100644 --- a/core/src/main/resources/hudson/model/AbstractBuild/index_pt_BR.properties +++ b/core/src/main/resources/hudson/model/AbstractBuild/index_pt_BR.properties @@ -31,5 +31,5 @@ log= Upstream\ Builds=Constru\u00E7\u00F5es Pai Downstream\ Builds=Contru\u00E7\u00F5es Filho none=nenhum -Permalinks=Links Permantes -Build\ number=N\u00FAmero da constru\u00E7\u00E3o +Took= +on= diff --git a/core/src/main/resources/hudson/model/AbstractBuild/sidepanel_pt_BR.properties b/core/src/main/resources/hudson/model/AbstractBuild/sidepanel_pt_BR.properties index 391c56b615..80c2bf5d47 100644 --- a/core/src/main/resources/hudson/model/AbstractBuild/sidepanel_pt_BR.properties +++ b/core/src/main/resources/hudson/model/AbstractBuild/sidepanel_pt_BR.properties @@ -20,10 +20,5 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Back\ to\ Project=Voltar para Projeto -Status=Estado -Changes=Mudan\u00E7as -Console\ Output=Sa\u00EDda do Console -raw=sem formata\u00E7\u00E3o Previous\ Build=Constru\u00E7\u00E3o Anterior Next\ Build=Pr\u00F3xima Constru\u00E7\u00E3o diff --git a/core/src/main/resources/hudson/model/AbstractBuild/tasks_pt_BR.properties b/core/src/main/resources/hudson/model/AbstractBuild/tasks_pt_BR.properties index cced92e2c2..3281f3d814 100644 --- a/core/src/main/resources/hudson/model/AbstractBuild/tasks_pt_BR.properties +++ b/core/src/main/resources/hudson/model/AbstractBuild/tasks_pt_BR.properties @@ -24,3 +24,4 @@ Back\ to\ Project=Voltar ao Projeto Changes=Mudan\u00E7as Console\ Output=Sa\u00EDda do Console Status=Estado +raw=sem formata\u00E7\u00E3o diff --git a/core/src/main/resources/hudson/model/AbstractItem/configure-common_pt_BR.properties b/core/src/main/resources/hudson/model/AbstractItem/configure-common_pt_BR.properties index 22b0c9175d..42d537dbab 100644 --- a/core/src/main/resources/hudson/model/AbstractItem/configure-common_pt_BR.properties +++ b/core/src/main/resources/hudson/model/AbstractItem/configure-common_pt_BR.properties @@ -21,3 +21,10 @@ # THE SOFTWARE. Advanced\ Project\ Options\ configure-common=Op\u00E7\u00F5es Avan\u00E7adas do Projeto +# (Default) +default.value= +Node=Nodo +# Execute concurrent builds if necessary (beta) +title.concurrentbuilds= +Tie\ this\ project\ to\ a\ node= +JDK\ to\ be\ used\ for\ this\ project= diff --git a/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_pt_BR.properties b/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_pt_BR.properties index f997c84ca7..ca934e507f 100644 --- a/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_pt_BR.properties +++ b/core/src/main/resources/hudson/model/AbstractItem/noWorkspace_pt_BR.properties @@ -21,9 +21,11 @@ # THE SOFTWARE. Error\:\ no\ workspace=Erro: nenhum workspace -A\ project\ won't\ have\ any\ workspace\ until\ at\ least\ one\ build\ is\ performed.=Um projeto n\u00E3o ter\u00E1 nehum workspace at\u00E9 que pelo menos uma constru\u00E7\u00E3o seja feita. -There's\ no\ workspace\ for\ this\ project.\ Possible\ reasons\ are\:=N\u00E3o h\u00E1 nenhum workspace para este projeto. As poss\u00EDveis raz\u00F5es s\u00E3o: The\ project\ was\ renamed\ recently\ and\ no\ build\ was\ done\ under\ the\ new\ name.=O projeto foi renomeado recentemente e nenhuma constru\u00E7\u00E3o foi feita sob o novo nome. The\ slave\ this\ project\ has\ run\ on\ for\ the\ last\ time\ was\ removed.=A m\u00E1quina slave que este projeto executou pela \u00FAltima vez foi removida. li3=O diret\u00F3rio de workspace ({0}) foi removido externamente do Hudson. text=Executar uma constru\u00E7\u00E3o para que o Hudson crie um workspace. +There''s\ no\ workspace\ for\ this\ project.\ Possible\ reasons\ are\:= +A\ project\ won''t\ have\ any\ workspace\ until\ at\ least\ one\ build\ is\ performed.= +A\ project\ won't\ have\ any\ workspace\ until\ at\ least\ one\ build\ is\ performed.= +There's\ no\ workspace\ for\ this\ project.\ Possible\ reasons\ are\:= diff --git a/core/src/main/resources/hudson/model/AbstractModelObject/descriptionForm_pt_BR.properties b/core/src/main/resources/hudson/model/AbstractModelObject/descriptionForm_pt_BR.properties new file mode 100644 index 0000000000..6fe38bc841 --- /dev/null +++ b/core/src/main/resources/hudson/model/AbstractModelObject/descriptionForm_pt_BR.properties @@ -0,0 +1,23 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Submit=Submeter diff --git a/core/src/main/resources/hudson/model/AbstractModelObject/editDescription_pt_BR.properties b/core/src/main/resources/hudson/model/AbstractModelObject/editDescription_pt_BR.properties new file mode 100644 index 0000000000..6fe38bc841 --- /dev/null +++ b/core/src/main/resources/hudson/model/AbstractModelObject/editDescription_pt_BR.properties @@ -0,0 +1,23 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Submit=Submeter diff --git a/core/src/main/resources/hudson/model/AbstractModelObject/error_pt_BR.properties b/core/src/main/resources/hudson/model/AbstractModelObject/error_pt_BR.properties new file mode 100644 index 0000000000..8c1ddd2eac --- /dev/null +++ b/core/src/main/resources/hudson/model/AbstractModelObject/error_pt_BR.properties @@ -0,0 +1,24 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Detail...= +Error=Erro diff --git a/core/src/main/resources/hudson/model/AbstractProject/changes_pt_BR.properties b/core/src/main/resources/hudson/model/AbstractProject/changes_pt_BR.properties index 0b14733d44..d195567921 100644 --- a/core/src/main/resources/hudson/model/AbstractProject/changes_pt_BR.properties +++ b/core/src/main/resources/hudson/model/AbstractProject/changes_pt_BR.properties @@ -21,3 +21,9 @@ # THE SOFTWARE. Changes=Mudan\u00E7as +# from #{0} +from.label= +# to #{0} +to.label= +# {0} Changes +changes.title= diff --git a/core/src/main/resources/hudson/model/AbstractProject/sidepanel_pt_BR.properties b/core/src/main/resources/hudson/model/AbstractProject/sidepanel_pt_BR.properties index 93238c829d..afa3b3c753 100644 --- a/core/src/main/resources/hudson/model/AbstractProject/sidepanel_pt_BR.properties +++ b/core/src/main/resources/hudson/model/AbstractProject/sidepanel_pt_BR.properties @@ -29,3 +29,4 @@ Workspace=\u00C1rea de Trabalho Build\ Now=Construir Agora delete=Excluir {0} Configure=Configurar +View\ Configuration= diff --git a/core/src/main/resources/hudson/model/AbstractProject/svn-password_pt_BR.properties b/core/src/main/resources/hudson/model/AbstractProject/svn-password_pt_BR.properties new file mode 100644 index 0000000000..89274debef --- /dev/null +++ b/core/src/main/resources/hudson/model/AbstractProject/svn-password_pt_BR.properties @@ -0,0 +1,41 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +# Logon to the server that runs Hudson, by using the same user account Hudson uses. +step.1= +# Note that this approach still doesn''t really make your password secure, it just makes it a bit harder to read. +final.words= +# People can read your password by using pargs. +reason.1= +# Subversion asks you the password interactively. Type in the password. +step.3= +# Manually run svn co ... +step.2= +How\ to\ set\ Subversion\ password?= +# Password will be stored in a clear text in Hudson. +reason.2= +# While subversion allows you to specify the ''--password'' option explicitly in the command line, this is generally not desirable when you are using Hudson, because: +explanation.introduction= +# A preferable approach is to do the following steps: +alternative.introduction= +# Subversion stores it in its authentication cache, and for successive svn co ... it will use the password stored in the cache. +step.4= diff --git a/core/src/main/resources/hudson/model/AbstractProject/wipeOutWorkspaceBlocked_pt_BR.properties b/core/src/main/resources/hudson/model/AbstractProject/wipeOutWorkspaceBlocked_pt_BR.properties new file mode 100644 index 0000000000..537e65cfe5 --- /dev/null +++ b/core/src/main/resources/hudson/model/AbstractProject/wipeOutWorkspaceBlocked_pt_BR.properties @@ -0,0 +1,25 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Error\:\ Wipe\ Out\ Workspace\ blocked\ by\ SCM= +The\ SCM\ for\ this\ project\ has\ blocked\ this\ attempt\ to\ wipe\ out\ the\ project''s\ workspace.= +The\ SCM\ for\ this\ project\ has\ blocked\ this\ attempt\ to\ wipe\ out\ the\ project's\ workspace.= diff --git a/core/src/main/resources/hudson/model/AbstractProject/wipeOutWorkspace_pt_BR.properties b/core/src/main/resources/hudson/model/AbstractProject/wipeOutWorkspace_pt_BR.properties new file mode 100644 index 0000000000..80d0317026 --- /dev/null +++ b/core/src/main/resources/hudson/model/AbstractProject/wipeOutWorkspace_pt_BR.properties @@ -0,0 +1,25 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Yes=Sim +# Are you sure about wiping out the workspace? +title= diff --git a/core/src/main/resources/hudson/model/AgentSlave/config_pt_BR.properties b/core/src/main/resources/hudson/model/AgentSlave/config_pt_BR.properties new file mode 100644 index 0000000000..7420bd5854 --- /dev/null +++ b/core/src/main/resources/hudson/model/AgentSlave/config_pt_BR.properties @@ -0,0 +1,23 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +launch\ command=comando de lan\u00E7amento diff --git a/core/src/main/resources/hudson/model/AllView/newViewDetail_pt_BR.properties b/core/src/main/resources/hudson/model/AllView/newViewDetail_pt_BR.properties new file mode 100644 index 0000000000..d342ca2f0e --- /dev/null +++ b/core/src/main/resources/hudson/model/AllView/newViewDetail_pt_BR.properties @@ -0,0 +1,25 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +# This view shows all the jobs on Hudson. +blurb=\ +# Estes usu\u00E1rios podem se logar no Hudson. Este \u00E9 um super conjunto desta lista, \ diff --git a/core/src/main/resources/hudson/model/AllView/noJob_pt_BR.properties b/core/src/main/resources/hudson/model/AllView/noJob_pt_BR.properties index b2f86bb252..ecfd510fd7 100644 --- a/core/src/main/resources/hudson/model/AllView/noJob_pt_BR.properties +++ b/core/src/main/resources/hudson/model/AllView/noJob_pt_BR.properties @@ -20,7 +20,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Welcome\ to\ Hudson\!=Bem vindo ao Hudson! newJob=Por favor crie novas tarefas para iniciar. login=Efetue login para criar novas tarefas. signup=Se voc\u00EA ainda n\u00E3o tem uma conta, voc\u00EA pode criar uma conta agora. +Welcome\ to\ Hudson!= diff --git a/core/src/main/resources/hudson/model/BooleanParameterDefinition/config_pt_BR.properties b/core/src/main/resources/hudson/model/BooleanParameterDefinition/config_pt_BR.properties new file mode 100644 index 0000000000..c92c06cfcf --- /dev/null +++ b/core/src/main/resources/hudson/model/BooleanParameterDefinition/config_pt_BR.properties @@ -0,0 +1,25 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Name= +Default\ Value= +Description= diff --git a/core/src/main/resources/hudson/model/BuildAuthorizationToken/config_pt_BR.properties b/core/src/main/resources/hudson/model/BuildAuthorizationToken/config_pt_BR.properties new file mode 100644 index 0000000000..75adff0fdb --- /dev/null +++ b/core/src/main/resources/hudson/model/BuildAuthorizationToken/config_pt_BR.properties @@ -0,0 +1,27 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Use\ the\ following\ URL\ to\ trigger\ build\ remotely\:= +Authentication\ Token= +Optionally\ append\ &cause\=Cause+Text\ to\ provide\ text\ that\ will\ be\ included\ in\ the\ recorded\ build\ cause.= +Trigger\ builds\ remotely= +e.g.,\ from\ scripts= diff --git a/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_pt_BR.properties b/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_pt_BR.properties new file mode 100644 index 0000000000..e6fbe28478 --- /dev/null +++ b/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_pt_BR.properties @@ -0,0 +1,24 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +# Started by upstream project {0} build number {1} +started_by_project= diff --git a/core/src/main/resources/hudson/model/Cause/UserCause/description_pt_BR.properties b/core/src/main/resources/hudson/model/Cause/UserCause/description_pt_BR.properties new file mode 100644 index 0000000000..92827e6d79 --- /dev/null +++ b/core/src/main/resources/hudson/model/Cause/UserCause/description_pt_BR.properties @@ -0,0 +1,24 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +# Started by user {0} +started_by_user= diff --git a/core/src/main/resources/hudson/model/CauseAction/summary_pt_BR.properties b/core/src/main/resources/hudson/model/CauseAction/summary_pt_BR.properties new file mode 100644 index 0000000000..4b9c3f55e4 --- /dev/null +++ b/core/src/main/resources/hudson/model/CauseAction/summary_pt_BR.properties @@ -0,0 +1,24 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +# ({0} times) +Ntimes= diff --git a/core/src/main/resources/hudson/model/ChoiceParameterDefinition/config_pt_BR.properties b/core/src/main/resources/hudson/model/ChoiceParameterDefinition/config_pt_BR.properties new file mode 100644 index 0000000000..04a0b6bd9d --- /dev/null +++ b/core/src/main/resources/hudson/model/ChoiceParameterDefinition/config_pt_BR.properties @@ -0,0 +1,25 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Choices= +Name= +Description= diff --git a/core/src/main/resources/hudson/model/Computer/_script_pt_BR.properties b/core/src/main/resources/hudson/model/Computer/_script_pt_BR.properties new file mode 100644 index 0000000000..5effb7ca72 --- /dev/null +++ b/core/src/main/resources/hudson/model/Computer/_script_pt_BR.properties @@ -0,0 +1,23 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +This\ execution\ happens\ in\ the\ slave\ agent\ JVM.= diff --git a/core/src/main/resources/hudson/model/Computer/builds_pt_BR.properties b/core/src/main/resources/hudson/model/Computer/builds_pt_BR.properties new file mode 100644 index 0000000000..4d55786710 --- /dev/null +++ b/core/src/main/resources/hudson/model/Computer/builds_pt_BR.properties @@ -0,0 +1,24 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +# Build History on {0} +title= diff --git a/core/src/main/resources/hudson/model/Computer/configure_pt_BR.properties b/core/src/main/resources/hudson/model/Computer/configure_pt_BR.properties new file mode 100644 index 0000000000..a424efdb55 --- /dev/null +++ b/core/src/main/resources/hudson/model/Computer/configure_pt_BR.properties @@ -0,0 +1,26 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +# {0} Configuration +title= +Save= +Name= diff --git a/core/src/main/resources/hudson/model/Computer/delete_pt_BR.properties b/core/src/main/resources/hudson/model/Computer/delete_pt_BR.properties new file mode 100644 index 0000000000..c07c002508 --- /dev/null +++ b/core/src/main/resources/hudson/model/Computer/delete_pt_BR.properties @@ -0,0 +1,24 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Yes=Sim +Are\ you\ sure\ about\ deleting\ the\ slave?= diff --git a/core/src/main/resources/hudson/model/Computer/index_pt_BR.properties b/core/src/main/resources/hudson/model/Computer/index_pt_BR.properties new file mode 100644 index 0000000000..59a0b6de48 --- /dev/null +++ b/core/src/main/resources/hudson/model/Computer/index_pt_BR.properties @@ -0,0 +1,32 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +# This node has an availability policy that will "{0}". Currently, this mandates that the node be off-line. +title.no_manual_launch= +Labels\:= +# This node is back online +submit.temporarilyOffline= +None= +# Mark this node temporarily offline +submit.not.temporarilyOffline= +# Projects tied to {0} +title.projects_tied_on= diff --git a/core/src/main/resources/hudson/model/Computer/markOffline_pt_BR.properties b/core/src/main/resources/hudson/model/Computer/markOffline_pt_BR.properties new file mode 100644 index 0000000000..65b200b165 --- /dev/null +++ b/core/src/main/resources/hudson/model/Computer/markOffline_pt_BR.properties @@ -0,0 +1,29 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +# Taking {0} Offline +title= +# Mark this node temporarily offline +submit= +# You can optionally explain why you are taking this node offline, so that others can see why: +blurb=\ +# Estes usu\u00E1rios podem se logar no Hudson. Este \u00E9 um super conjunto desta lista, \ diff --git a/core/src/main/resources/hudson/model/Computer/sidepanel_pt_BR.properties b/core/src/main/resources/hudson/model/Computer/sidepanel_pt_BR.properties index 499b65ce8d..f21690b280 100644 --- a/core/src/main/resources/hudson/model/Computer/sidepanel_pt_BR.properties +++ b/core/src/main/resources/hudson/model/Computer/sidepanel_pt_BR.properties @@ -22,3 +22,8 @@ Back\ to\ List=Voltar para a Lista Build\ History=Hist\u00F3rico de Constru\u00E7\u00F5es +Configure=Configurar +Status=Estado +Delete\ Slave= +Load\ Statistics=Carregar Estat\u00EDsticas +Script\ Console=Console de Script diff --git a/core/src/main/resources/hudson/model/ComputerSet/_new_pt_BR.properties b/core/src/main/resources/hudson/model/ComputerSet/_new_pt_BR.properties new file mode 100644 index 0000000000..3951eee3c8 --- /dev/null +++ b/core/src/main/resources/hudson/model/ComputerSet/_new_pt_BR.properties @@ -0,0 +1,25 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Save= +Name\ is\ mandatory=Le nom est obligatoire +Name= diff --git a/core/src/main/resources/hudson/model/ComputerSet/configure_pt_BR.properties b/core/src/main/resources/hudson/model/ComputerSet/configure_pt_BR.properties new file mode 100644 index 0000000000..64466cca5d --- /dev/null +++ b/core/src/main/resources/hudson/model/ComputerSet/configure_pt_BR.properties @@ -0,0 +1,24 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Preventive\ Node\ Monitoring= +Node\ Monitoring\ Configuration= diff --git a/core/src/main/resources/hudson/model/ComputerSet/index_pt_BR.properties b/core/src/main/resources/hudson/model/ComputerSet/index_pt_BR.properties new file mode 100644 index 0000000000..e1ca98a731 --- /dev/null +++ b/core/src/main/resources/hudson/model/ComputerSet/index_pt_BR.properties @@ -0,0 +1,25 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Configure=Configurar +Refresh\ status= +Name= diff --git a/core/src/main/resources/hudson/model/ComputerSet/new_pt_BR.properties b/core/src/main/resources/hudson/model/ComputerSet/new_pt_BR.properties new file mode 100644 index 0000000000..c8c3bb10c8 --- /dev/null +++ b/core/src/main/resources/hudson/model/ComputerSet/new_pt_BR.properties @@ -0,0 +1,24 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Node\ name= +Copy\ Existing\ Node= diff --git a/core/src/main/resources/hudson/model/ComputerSet/sidepanel_pt_BR.properties b/core/src/main/resources/hudson/model/ComputerSet/sidepanel_pt_BR.properties index e9766effac..0e07ca0783 100644 --- a/core/src/main/resources/hudson/model/ComputerSet/sidepanel_pt_BR.properties +++ b/core/src/main/resources/hudson/model/ComputerSet/sidepanel_pt_BR.properties @@ -21,3 +21,5 @@ # THE SOFTWARE. Back\ to\ Dashboard=Voltar ao Painel Principal +Configure=Configurar +New\ Node= diff --git a/core/src/main/resources/hudson/model/DirectoryBrowserSupport/dir_pt_BR.properties b/core/src/main/resources/hudson/model/DirectoryBrowserSupport/dir_pt_BR.properties index 2d5c1ab732..39bec320d4 100644 --- a/core/src/main/resources/hudson/model/DirectoryBrowserSupport/dir_pt_BR.properties +++ b/core/src/main/resources/hudson/model/DirectoryBrowserSupport/dir_pt_BR.properties @@ -22,3 +22,4 @@ all\ files\ in\ zip=Todos os arquivos zipados view=ver +No\ files\ in\ directory= diff --git a/core/src/main/resources/hudson/model/Executor/causeOfDeath_pt_BR.properties b/core/src/main/resources/hudson/model/Executor/causeOfDeath_pt_BR.properties new file mode 100644 index 0000000000..52e6578f40 --- /dev/null +++ b/core/src/main/resources/hudson/model/Executor/causeOfDeath_pt_BR.properties @@ -0,0 +1,26 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +more\ info= +Thread\ has\ died= +Back= +Thread\ is\ still\ alive= diff --git a/core/src/main/resources/hudson/model/ExternalJob/sidepanel_pt_BR.properties b/core/src/main/resources/hudson/model/ExternalJob/sidepanel_pt_BR.properties new file mode 100644 index 0000000000..af44a5ee4b --- /dev/null +++ b/core/src/main/resources/hudson/model/ExternalJob/sidepanel_pt_BR.properties @@ -0,0 +1,26 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Configure=Configurar +Back\ to\ Dashboard= +Status=Estado +Delete\ Job= diff --git a/core/src/main/resources/hudson/model/ExternalRun/sidepanel_pt_BR.properties b/core/src/main/resources/hudson/model/ExternalRun/sidepanel_pt_BR.properties new file mode 100644 index 0000000000..61b8029727 --- /dev/null +++ b/core/src/main/resources/hudson/model/ExternalRun/sidepanel_pt_BR.properties @@ -0,0 +1,27 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Next\ Run= +Artifacts= +Previous\ Run= +Console\ Output=Sa\u00EDda do Console +Back\ to\ Job= diff --git a/core/src/main/resources/hudson/model/FileParameterDefinition/config_pt_BR.properties b/core/src/main/resources/hudson/model/FileParameterDefinition/config_pt_BR.properties new file mode 100644 index 0000000000..2b57df0b23 --- /dev/null +++ b/core/src/main/resources/hudson/model/FileParameterDefinition/config_pt_BR.properties @@ -0,0 +1,24 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +File\ location= +Description= diff --git a/core/src/main/resources/hudson/model/Fingerprint/index_pt_BR.properties b/core/src/main/resources/hudson/model/Fingerprint/index_pt_BR.properties index 050438c1bc..c5c97e42ee 100644 --- a/core/src/main/resources/hudson/model/Fingerprint/index_pt_BR.properties +++ b/core/src/main/resources/hudson/model/Fingerprint/index_pt_BR.properties @@ -24,3 +24,5 @@ introduced=Introduzido {0} atr\u00E1s outside\ Hudson=fora do Hudson This\ file\ has\ not\ been\ used\ anywhere\ else.=Este arquivo n\u00E3o foi usado em nehum lugar. This\ file\ has\ been\ used\ in\ the\ following\ places=Este arquivo foi usado nos seguintes lugares +Back\ to\ Dashboard= +Usage=Utilisation diff --git a/core/src/main/resources/hudson/model/Hudson/_cli_pt_BR.properties b/core/src/main/resources/hudson/model/Hudson/_cli_pt_BR.properties new file mode 100644 index 0000000000..f1a9abd82f --- /dev/null +++ b/core/src/main/resources/hudson/model/Hudson/_cli_pt_BR.properties @@ -0,0 +1,28 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Hudson\ CLI= +# You can access various features in Hudson through a command-line tool. See \ +# the Wiki for more details of this feature.\ +# To get started, download hudson-cli.jar, and run it as follows: +blurb=\ +# Estes usu\u00E1rios podem se logar no Hudson. Este \u00E9 um super conjunto desta lista, \ diff --git a/core/src/main/resources/hudson/model/Hudson/_restart_pt_BR.properties b/core/src/main/resources/hudson/model/Hudson/_restart_pt_BR.properties new file mode 100644 index 0000000000..24522aa904 --- /dev/null +++ b/core/src/main/resources/hudson/model/Hudson/_restart_pt_BR.properties @@ -0,0 +1,24 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Yes=Sim +Are\ you\ sure\ about\ restarting\ Hudson?= diff --git a/core/src/main/resources/hudson/model/Hudson/_safeRestart_pt_BR.properties b/core/src/main/resources/hudson/model/Hudson/_safeRestart_pt_BR.properties new file mode 100644 index 0000000000..ba30c96024 --- /dev/null +++ b/core/src/main/resources/hudson/model/Hudson/_safeRestart_pt_BR.properties @@ -0,0 +1,24 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Yes=Sim +Are\ you\ sure\ about\ restarting\ Hudson?\ Hudson\ will\ restart\ once\ all\ running\ jobs\ are\ finished.= diff --git a/core/src/main/resources/hudson/model/Hudson/accessDenied_pt_BR.properties b/core/src/main/resources/hudson/model/Hudson/accessDenied_pt_BR.properties new file mode 100644 index 0000000000..5650fda476 --- /dev/null +++ b/core/src/main/resources/hudson/model/Hudson/accessDenied_pt_BR.properties @@ -0,0 +1,27 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Password=Senha +login= +User=Usu\u00E1rio +Hudson\ Login= +Access\ Denied= diff --git a/core/src/main/resources/hudson/model/Hudson/configure_pt_BR.properties b/core/src/main/resources/hudson/model/Hudson/configure_pt_BR.properties index 15f6f63b88..cdcdf44573 100644 --- a/core/src/main/resources/hudson/model/Hudson/configure_pt_BR.properties +++ b/core/src/main/resources/hudson/model/Hudson/configure_pt_BR.properties @@ -32,20 +32,19 @@ Disable=Desabilitar Access\ Control=Control de Acesso Security\ Realm=Dom\u00EDnio (Realm) de Seguran\u00E7a Authorization=Autoriza\u00E7\u00E3o -Master/Slave\ Support=Suporte a Master/Slave -Slaves= -slaves.description=\ - Lista de m\u00E1quinas slave registradas para este Hudson master. Tarefas podem ser configuradas para \ - executar nas m\u00E1quinas slave para manipular uma grande quantidade de tarefas. -name=nome -launch\ command=comando de lan\u00E7amento -description=descri\u00E7\u00E3o -remote\ FS\ root=raiz do sistema de arquivos remoto -usage=uso -labels=t\u00EDtulos -JDKs= -JDK\ installations=Instala\u00E7\u00E3o de JDK -List\ of\ JDK\ installations\ on\ this\ system=Lista de Instala\u00E7\u00F5es de JDK neste sistema -no.such.JDK=N\u00E3o existe tal JDK Save=Salvar +Prevent\ Cross\ Site\ Request\ Forgery\ exploits= +Default\ view= +Delete\ cloud= +Labels=Etiquettes +Crumbs= +SCM\ checkout\ retry\ count= +LOADING= +Global\ properties= +Cloud= +# \ +# Help make Hudson better by sending anonymous usage statistics and crash reports to the Hudson project. +statsBlurb= +Crumb\ Algorithm= +Add\ a\ new\ cloud= diff --git a/core/src/main/resources/hudson/model/Hudson/fingerprintCheck_pt_BR.properties b/core/src/main/resources/hudson/model/Hudson/fingerprintCheck_pt_BR.properties index e3a4e4b8ca..07d0a39f56 100644 --- a/core/src/main/resources/hudson/model/Hudson/fingerprintCheck_pt_BR.properties +++ b/core/src/main/resources/hudson/model/Hudson/fingerprintCheck_pt_BR.properties @@ -23,3 +23,11 @@ Check\ File\ Fingerprint=Verificar Fingerprint de Arquivo File\ to\ check=Arquivo para verificar Check=Verificar +# http://hudson-ci.org/fingerprint.html +fingerprint.link= +# \ +# Got a jar file but don''t know which version it is?
\ +# Find that out by checking the fingerprint against \ +# the database in Hudson +description= +more\ details=mais detalhes diff --git a/core/src/main/resources/hudson/model/Hudson/legend_pt_BR.properties b/core/src/main/resources/hudson/model/Hudson/legend_pt_BR.properties new file mode 100644 index 0000000000..c2db53c15c --- /dev/null +++ b/core/src/main/resources/hudson/model/Hudson/legend_pt_BR.properties @@ -0,0 +1,49 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +# The last build was successful but unstable. A new build is in progress. +yellow_anime= +# Project health is over 20% and up to 40%. You can hover the mouse over the project''s icon for a more detailed explanation. +health-21to40= +# Project health is over 40% and up to 60%. You can hover the mouse over the project''s icon for a more detailed explanation. +health-41to60= +# The last build fatally failed. +red= +# The project has never been built before, or the project is disabled. +grey= +# Project health is over 60% and up to 80%. You can hover the mouse over the project''s icon for a more detailed explanation. +health-61to80= +# The last build was successful but unstable.\ +# This is primarily used to represent test failures. +yellow= +# The last build was successful. A new build is in progress. +blue_anime= +# Project health is 20% or less. You can hover the mouse over the project''s icon for a more detailed explanation. +health-00to20= +# The first build of the project is in progress. +grey_anime= +# The last build was successful. +blue= +# Project health is over 80%. You can hover the mouse over the project''s icon for a more detailed explanation. +health-81plus= +# The last build fatally failed. A new build is in progress. +red_anime= diff --git a/core/src/main/resources/hudson/model/Hudson/loginError_pt_BR.properties b/core/src/main/resources/hudson/model/Hudson/loginError_pt_BR.properties index 9fb96f4cd3..e889f6e9b4 100644 --- a/core/src/main/resources/hudson/model/Hudson/loginError_pt_BR.properties +++ b/core/src/main/resources/hudson/model/Hudson/loginError_pt_BR.properties @@ -22,3 +22,5 @@ Invalid\ login\ information.\ Please\ try\ again.=Informa\u00E7\u00E3o de login inv\u00E1lida. Por favor tente novamente. Try\ again=Tente novamente +Login\ Error= +If\ you\ are\ a\ system\ administrator\ and\ suspect\ this\ to\ be\ a\ configuration\ problem,\ see\ the\ server\ console\ output\ for\ more\ details.= diff --git a/core/src/main/resources/hudson/model/Hudson/manage_pt_BR.properties b/core/src/main/resources/hudson/model/Hudson/manage_pt_BR.properties index f84383e411..d40cba6fc5 100644 --- a/core/src/main/resources/hudson/model/Hudson/manage_pt_BR.properties +++ b/core/src/main/resources/hudson/model/Hudson/manage_pt_BR.properties @@ -24,7 +24,6 @@ HudsonCliText=Acesse/mantenha o Hudson pelo shell, ou pelo seu script. Load\ Statistics=Carregar Estat\u00EDsticas LoadStatisticsText=Verifica sua utiliza\u00E7\u00E3o de recursos e se voc\u00EA precisa de mais computadores para suas conrtu\u00E7\u00F5es Manage\ Hudson=Gerenciar Hudson -System\ Configuration=Configura\u00E7\u00E3o do Sistema Reload\ Configuration\ from\ Disk=Recarregar Configura\u00E7\u00E3o do Disco Configure\ System=Configurar sistema Configure\ global\ settings\ and\ paths.=Configurar op\u00E7\u00F5es globais e caminhos @@ -38,9 +37,11 @@ SystemLogText=\ O log do sistema captura a sa\u00EDda de java.util.logging sa\u00EDda relacionada ao Hudson. Script\ Console=Console de Script Executes\ arbitrary\ script\ for\ administration/trouble-shooting/diagnostics.=Executa script arbitr\u00E1rio para administra\u00E7\u00E3o/trouble-shooting/diagn\u00F3sticos. -Manage\ Slaves=Gerenciar Slaves -Check\ the\ health\ of\ slaves\ and\ controls\ them.=Verificar a sa\u00FAde de slaves e control\u00E1-los. Add,\ remove,\ disable\ or\ enable\ plugins\ that\ can\ extend\ the\ functionality\ of\ Hudson.=Adiciona, remove, desabilita e habilita plugins que podem incrementar as funcionalidades do Hudson Cancel\ Shutdown=Cancelar Desligamento Prepare\ for\ Shutdown=Preparar para Desligar Stops\ executing\ new\ builds,\ so\ that\ the\ system\ can\ be\ eventually\ shut\ down\ safely.=Para de executar novas constru\u00E7\u00F5es, para que o sistema possa ser eventualmente desligado com seguran\u00E7a. +updates\ available= +Add,\ remove,\ control\ and\ monitor\ the\ various\ nodes\ that\ Hudson\ runs\ jobs\ on.= +Hudson\ CLI= +Manage\ Nodes= diff --git a/core/src/main/resources/hudson/model/Hudson/noPrincipal_pt_BR.properties b/core/src/main/resources/hudson/model/Hudson/noPrincipal_pt_BR.properties new file mode 100644 index 0000000000..da740627e2 --- /dev/null +++ b/core/src/main/resources/hudson/model/Hudson/noPrincipal_pt_BR.properties @@ -0,0 +1,27 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +# \ +# The web container doesn't seem to be configured to do authentication. \ +# Check the container documentation and/or also consult users@hudson.dev.java.net +blurb=\ +# Estes usu\u00E1rios podem se logar no Hudson. Este \u00E9 um super conjunto desta lista, \ diff --git a/core/src/main/resources/hudson/model/Hudson/projectRelationship-help_pt_BR.properties b/core/src/main/resources/hudson/model/Hudson/projectRelationship-help_pt_BR.properties index 8455a7676f..dbe86f3caa 100644 --- a/core/src/main/resources/hudson/model/Hudson/projectRelationship-help_pt_BR.properties +++ b/core/src/main/resources/hudson/model/Hudson/projectRelationship-help_pt_BR.properties @@ -28,5 +28,5 @@ body=\ suporte de fingerprint. For\ this\ feature\ to\ work,\ the\ following\ conditions\ need\ to\ be\ met\:=Para esta caracter\u00EDstica funcionar, as seguintes condi\u00E7\u00F5es precis\u00E3o s\u00E3o requisitadas The\ upstream\ project\ records\ the\ fingerprints\ of\ its\ build\ artifacts=O projeto pai grava os fingerprints de seus artefatos de contru\u00E7\u00E3o -The\ downstream\ project\ records\ the\ fingerprints\ of\ the\ upstream\ jar\ files\ it\ uses=O projeto filho grava os fingerpints dos arquivos jar do projeto pai que ele usa This\ allows\ Hudson\ to\ correlate\ two\ projects.=Isto permite que o Hudson correlacione dois projetos. +The\ downstream\ project\ records\ the\ fingerprints\ of\ the\ upstream\ files\ it\ uses= diff --git a/core/src/main/resources/hudson/model/Hudson/projectRelationship_pt_BR.properties b/core/src/main/resources/hudson/model/Hudson/projectRelationship_pt_BR.properties index 9e58d74ddc..a908a5fc1c 100644 --- a/core/src/main/resources/hudson/model/Hudson/projectRelationship_pt_BR.properties +++ b/core/src/main/resources/hudson/model/Hudson/projectRelationship_pt_BR.properties @@ -24,3 +24,4 @@ Project\ Relationship=Relacionamento entre Projetos upstream\ project=projeto pai downstream\ project=projeto filho Compare=Comparar +There\ are\ no\ fingerprint\ records\ that\ connect\ these\ two\ projects.= diff --git a/core/src/main/resources/hudson/model/Hudson/threadDump_pt_BR.properties b/core/src/main/resources/hudson/model/Hudson/threadDump_pt_BR.properties new file mode 100644 index 0000000000..f27aad26ba --- /dev/null +++ b/core/src/main/resources/hudson/model/Hudson/threadDump_pt_BR.properties @@ -0,0 +1,24 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Thread\ Dump=Limpar Threads +Thread\ dump= diff --git a/core/src/main/resources/hudson/model/Job/buildTimeTrend_pt_BR.properties b/core/src/main/resources/hudson/model/Job/buildTimeTrend_pt_BR.properties index 5085acdfc9..85d652d851 100644 --- a/core/src/main/resources/hudson/model/Job/buildTimeTrend_pt_BR.properties +++ b/core/src/main/resources/hudson/model/Job/buildTimeTrend_pt_BR.properties @@ -25,3 +25,5 @@ Build=Constru\u00E7\u00E3o Duration=Dura\u00E7\u00E3o Slave= More\ than\ 1\ builds\ are\ needed\ for\ the\ trend\ report.=Mais do que uma constru\u00E7\u00E3o \u00E9 necess\u00E1ria para o relat\u00F3rio de tend\u00EAncia. +Build\ Time\ Trend= +Timeline= diff --git a/core/src/main/resources/hudson/model/Job/configure_pt_BR.properties b/core/src/main/resources/hudson/model/Job/configure_pt_BR.properties index c8c6e56d6f..a90b5e5904 100644 --- a/core/src/main/resources/hudson/model/Job/configure_pt_BR.properties +++ b/core/src/main/resources/hudson/model/Job/configure_pt_BR.properties @@ -24,3 +24,4 @@ name={0} nome Description=Descri\u00E7\u00E3o Discard\ Old\ Builds=Descartar Constru\u00E7\u00F5es Antigas Save=Salvar +LOADING= diff --git a/core/src/main/resources/hudson/model/Job/index_pt_BR.properties b/core/src/main/resources/hudson/model/Job/index_pt_BR.properties index d6e6354375..e518ddf964 100644 --- a/core/src/main/resources/hudson/model/Job/index_pt_BR.properties +++ b/core/src/main/resources/hudson/model/Job/index_pt_BR.properties @@ -20,8 +20,5 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Permalinks=Links permanentes -Last\ build=\u00DAltima constru\u00E7\u00E3o -Last\ stable\ build=\u00DAltima constru\u00E7\u00E3o est\u00E1vel -Last\ successful\ build=\u00DAltima constru\u00E7\u00E3o bem sucedida -Last\ failed\ build=\u00DAltima constru\u00E7\u00E3o que falhou +Enable= +This\ project\ is\ currently\ disabled= diff --git a/core/src/main/resources/hudson/model/Job/rename_pt_BR.properties b/core/src/main/resources/hudson/model/Job/rename_pt_BR.properties new file mode 100644 index 0000000000..7072c54e7b --- /dev/null +++ b/core/src/main/resources/hudson/model/Job/rename_pt_BR.properties @@ -0,0 +1,34 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +# Unable to rename a job while it is building. +noRenameWhileBuilding= +# Yes +Yes=Sim +# No +No= +# All other configuration options were saved. +configWasSaved= +# Are you sure about renaming {0} to {1}? +description= +# The name {0} is already in use. +newNameInUse= diff --git a/core/src/main/resources/hudson/model/Label/index_pt_BR.properties b/core/src/main/resources/hudson/model/Label/index_pt_BR.properties new file mode 100644 index 0000000000..f034289c9a --- /dev/null +++ b/core/src/main/resources/hudson/model/Label/index_pt_BR.properties @@ -0,0 +1,25 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Nodes\:= +None= +Projects= diff --git a/core/src/main/resources/hudson/model/Label/sidepanel_pt_BR.properties b/core/src/main/resources/hudson/model/Label/sidepanel_pt_BR.properties new file mode 100644 index 0000000000..3dbe6ae872 --- /dev/null +++ b/core/src/main/resources/hudson/model/Label/sidepanel_pt_BR.properties @@ -0,0 +1,25 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Back\ to\ Dashboard= +Overview={0}Vis\u00E3o Geral +Load\ Statistics=Carregar Estat\u00EDsticas diff --git a/core/src/main/resources/hudson/model/ListView/configure-entries_pt_BR.properties b/core/src/main/resources/hudson/model/ListView/configure-entries_pt_BR.properties index fdab636e2b..c131d61ae1 100644 --- a/core/src/main/resources/hudson/model/ListView/configure-entries_pt_BR.properties +++ b/core/src/main/resources/hudson/model/ListView/configure-entries_pt_BR.properties @@ -21,3 +21,13 @@ # THE SOFTWARE. Jobs=Tarefas +All\ selected\ jobs= +Status\ Filter= +Use\ a\ regular\ expression\ to\ include\ jobs\ into\ the\ view= +Regular\ expression= +Columns= +Add\ column= +Job\ Filters= +Add\ Job\ Filter= +Disabled\ jobs\ only= +Enabled\ jobs\ only= diff --git a/core/src/main/resources/hudson/model/ListView/newViewDetail_pt_BR.properties b/core/src/main/resources/hudson/model/ListView/newViewDetail_pt_BR.properties new file mode 100644 index 0000000000..0185b6292e --- /dev/null +++ b/core/src/main/resources/hudson/model/ListView/newViewDetail_pt_BR.properties @@ -0,0 +1,26 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +# \ +# Shows jobs in a simple list format. You can choose which jobs are to be displayed in which view. +blurb=\ +# Estes usu\u00E1rios podem se logar no Hudson. Este \u00E9 um super conjunto desta lista, \ diff --git a/core/src/main/resources/hudson/model/LoadStatistics/main_pt_BR.properties b/core/src/main/resources/hudson/model/LoadStatistics/main_pt_BR.properties new file mode 100644 index 0000000000..89338e5f86 --- /dev/null +++ b/core/src/main/resources/hudson/model/LoadStatistics/main_pt_BR.properties @@ -0,0 +1,60 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +# Load statistics: {0} +title= +Short= +Load\ statistics\ graph= +Medium= +Timespan= +# \ +# Load statistics keep track of three key metrics of resource utilization: \ +#

\ +#
Total number of executors
\ +#
\ +# For a computer, this is the number of executors that the computer has. \ +# For a label, this is the sum of all executors across all computers in this label. \ +# For the entire Hudson, this is the sum of all executors across all computers in this Hudson installation. \ +# Other than configuration changes, this value can also change when slaves go offline. \ +#
\ +#
Number of busy executors
\ +#
\ +# This line tracks the number of executors (among the executors counted above) \ +# that are carrying out builds. The ratio of this to the total number of executors \ +# gives you the resource utilization. If all your executors are busy for \ +# a prolonged period of time, consider adding more computers to your Hudson cluster.\ +#
\ +#
Queue length
\ +#
\ +# This is the number of jobs that are in the build queue, waiting for an \ +# available executor (of this computer, of this label, or in this Hudson, respectively.) \ +# This doesn't include jobs that are in the quiet period, nor does it include \ +# jobs that are in the queue because earlier builds are still in progress. \ +# If this line ever goes above 0, that means your Hudson will run more builds by \ +# adding more computers.\ +#
\ +#
\ +# The graph is exponential moving average of periodically collected data values. \ +# 3 timespans are updated every 10 seconds, 1 minute, and 1 hour respectively. +blurb=\ +# Estes usu\u00E1rios podem se logar no Hudson. Este \u00E9 um super conjunto desta lista, \ +Long= diff --git a/core/src/main/resources/hudson/model/Messages_pt_BR.properties b/core/src/main/resources/hudson/model/Messages_pt_BR.properties index 086a4b4c76..3fd8256634 100644 --- a/core/src/main/resources/hudson/model/Messages_pt_BR.properties +++ b/core/src/main/resources/hudson/model/Messages_pt_BR.properties @@ -104,3 +104,291 @@ Permalink.LastBuild=\u00DAltima constru\u00E7\u00E3o Permalink.LastStableBuild=\u00DAltima constru\u00E7\u00E3o est\u00E1vel Permalink.LastSuccessfulBuild=\u00DAltima constru\u00E7\u00E3o bem sucedida Permalink.LastFailedBuild=\u00DAltima constru\u00E7\u00E3o que falhou +# Waiting for next available executor +Queue.WaitingForNextAvailableExecutor= +# {0} {0,choice,0#tests|1#test|1Failed to resolve host name {0}. \ +# Perhaps you need to configure HTTP proxy? +UpdateCenter.Status.UnknownHostException= +# \ +# Your container doesn''t use UTF-8 to decode URLs. If you use non-ASCII characters as a job name etc, \ +# this will cause problems. \ +# See Containers and \ +# Tomcat i18n for more details. +Hudson.NotUsesUTF8ToDecodeURL= +# Checking internet connectivity +UpdateCenter.Status.CheckingInternet= +# \ +# This permission allows users to delete existing views. +View.DeletePermission.Description= +# Checking hudson-ci.org connectivity +UpdateCenter.Status.CheckingJavaNet= +# Authentication and User Management +UpdateCenter.PluginCategory.user= +# My View +MyView.DisplayName= +# Files in this directory will be served under your http://server/hudson/userContent/ +Hudson.USER_CONTENT_README= +# Source Code Management related +UpdateCenter.PluginCategory.scm-related= +# Cancel the effect of the "quiet-down" command. +CLI.cancel-quiet-down.shortDescription= +# Clears the build queue +CLI.clear-queue.shortDescription= +# Upstream project {0} is already building. +AbstractProject.UpstreamBuildInProgress= +# A view with name {0} does not exist +MyViewsProperty.ViewExistsCheck.NotExist= +# {0} {0,choice,0#test failures|1#test failure|1Failed to connect to {0}. \ +# Perhaps you need to configure HTTP proxy? +UpdateCenter.Status.ConnectionFailed= +# Maven +UpdateCenter.PluginCategory.maven= +# Slave +Computer.Permissions.Title= +# Resume using a node for performing builds, to cancel out the earlier "offline-node" command. +CLI.online-node.shortDescription= +# Artifact Uploaders +UpdateCenter.PluginCategory.upload= +# Last unstable build +Permalink.LastUnstableBuild= +# Enables a job +CLI.enable-job.shortDescription= +# ? +Run.Summary.Unknown= +# Parameters +ParametersDefinitionProperty.DisplayName= +# \ +# This permission grants the ability to start a new build. +AbstractProject.BuildPermission.Description= +# Are you sure you want to use network mounted file system for FS root? Note that this directory does not need to be visible to the master. +Slave.Network.Mounted.File.System.Warning= +# group of {0} +Label.GroupOf= +# All nodes of label ''{0}'' are offline +Queue.AllNodesOffline= +# Busy executors +LoadStatistics.Legends.BusyExecutors= diff --git a/core/src/main/resources/hudson/model/MyView/newViewDetail_pt_BR.properties b/core/src/main/resources/hudson/model/MyView/newViewDetail_pt_BR.properties new file mode 100644 index 0000000000..2aa7fd56ad --- /dev/null +++ b/core/src/main/resources/hudson/model/MyView/newViewDetail_pt_BR.properties @@ -0,0 +1,26 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +# \ +# This view automatically displays all the jobs that the current user has an access to. +blurb=\ +# Estes usu\u00E1rios podem se logar no Hudson. Este \u00E9 um super conjunto desta lista, \ diff --git a/core/src/main/resources/hudson/model/MyView/noJob_pt_BR.properties b/core/src/main/resources/hudson/model/MyView/noJob_pt_BR.properties new file mode 100644 index 0000000000..adb3c8e972 --- /dev/null +++ b/core/src/main/resources/hudson/model/MyView/noJob_pt_BR.properties @@ -0,0 +1,25 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +# This view has no jobs. +blurb=\ +# Estes usu\u00E1rios podem se logar no Hudson. Este \u00E9 um super conjunto desta lista, \ diff --git a/core/src/main/resources/hudson/model/MyViewsProperty/config_pt_BR.properties b/core/src/main/resources/hudson/model/MyViewsProperty/config_pt_BR.properties new file mode 100644 index 0000000000..19a629994a --- /dev/null +++ b/core/src/main/resources/hudson/model/MyViewsProperty/config_pt_BR.properties @@ -0,0 +1,25 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Default\ View= +# The view selected by default when navigating to the users' private views +description= diff --git a/core/src/main/resources/hudson/model/MyViewsProperty/newView_pt_BR.properties b/core/src/main/resources/hudson/model/MyViewsProperty/newView_pt_BR.properties new file mode 100644 index 0000000000..e2affaf347 --- /dev/null +++ b/core/src/main/resources/hudson/model/MyViewsProperty/newView_pt_BR.properties @@ -0,0 +1,23 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +View\ name=Visualizar nome diff --git a/core/src/main/resources/hudson/model/NoFingerprintMatch/index_pt_BR.properties b/core/src/main/resources/hudson/model/NoFingerprintMatch/index_pt_BR.properties new file mode 100644 index 0000000000..fd933fe38b --- /dev/null +++ b/core/src/main/resources/hudson/model/NoFingerprintMatch/index_pt_BR.properties @@ -0,0 +1,34 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +# \ +# Perhaps the projects are not set up correctly and not recording \ +# fingerprints. Check the project setting. +cause.2= +Back\ to\ Dashboard= +# The fingerprint {0} did not match any of the recorded data. +description= +No\ matching\ record\ found= +# \ +# Perhaps the file was not created under Hudson. \ +# Maybe it''s a version that someone built locally on his/her own machine. +cause.1= diff --git a/core/src/main/resources/hudson/model/ParametersAction/index_pt_BR.properties b/core/src/main/resources/hudson/model/ParametersAction/index_pt_BR.properties index 11d3274c4a..6ec986830c 100644 --- a/core/src/main/resources/hudson/model/ParametersAction/index_pt_BR.properties +++ b/core/src/main/resources/hudson/model/ParametersAction/index_pt_BR.properties @@ -21,3 +21,4 @@ # THE SOFTWARE. Build=Construir +Parameters= diff --git a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_pt_BR.properties b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_pt_BR.properties index 1eb0112f13..72ed00f021 100644 --- a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_pt_BR.properties +++ b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_pt_BR.properties @@ -21,4 +21,4 @@ # THE SOFTWARE. This\ build\ is\ parameterized=Esta constru\u00E7\u00E3o \u00E9 parametrizada -Add\ Parameter=Adicionar Par\u00E2metro \ No newline at end of file +Add\ Parameter=Adicionar Par\u00E2metro diff --git a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/index_pt_BR.properties b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/index_pt_BR.properties index 603560e082..a1ae472e85 100644 --- a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/index_pt_BR.properties +++ b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/index_pt_BR.properties @@ -21,3 +21,4 @@ # THE SOFTWARE. description=Esta constru\u00E7\u00E3o requer os par\u00E2metros: +Build= diff --git a/core/src/main/resources/hudson/model/PasswordParameterDefinition/config_pt_BR.properties b/core/src/main/resources/hudson/model/PasswordParameterDefinition/config_pt_BR.properties new file mode 100644 index 0000000000..c92c06cfcf --- /dev/null +++ b/core/src/main/resources/hudson/model/PasswordParameterDefinition/config_pt_BR.properties @@ -0,0 +1,25 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Name= +Default\ Value= +Description= diff --git a/core/src/main/resources/hudson/model/ProxyView/configure-entries_pt_BR.properties b/core/src/main/resources/hudson/model/ProxyView/configure-entries_pt_BR.properties new file mode 100644 index 0000000000..628e341563 --- /dev/null +++ b/core/src/main/resources/hudson/model/ProxyView/configure-entries_pt_BR.properties @@ -0,0 +1,24 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +The\ name\ of\ a\ global\ view\ that\ will\ be\ shown.= +View\ name=Visualizar nome diff --git a/core/src/main/resources/hudson/model/ProxyView/newViewDetail_pt_BR.properties b/core/src/main/resources/hudson/model/ProxyView/newViewDetail_pt_BR.properties new file mode 100644 index 0000000000..1baeef17d7 --- /dev/null +++ b/core/src/main/resources/hudson/model/ProxyView/newViewDetail_pt_BR.properties @@ -0,0 +1,23 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Shows\ the\ content\ of\ a\ global\ view.= diff --git a/core/src/main/resources/hudson/model/Run/KeepLogBuildBadge/badge_pt_BR.properties b/core/src/main/resources/hudson/model/Run/KeepLogBuildBadge/badge_pt_BR.properties new file mode 100644 index 0000000000..5f65df8fcb --- /dev/null +++ b/core/src/main/resources/hudson/model/Run/KeepLogBuildBadge/badge_pt_BR.properties @@ -0,0 +1,23 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Keep\ this\ build\ forever=Manter esta constru\u00E7\u00E3o sempre diff --git a/core/src/main/resources/hudson/model/Run/artifacts-index_pt_BR.properties b/core/src/main/resources/hudson/model/Run/artifacts-index_pt_BR.properties new file mode 100644 index 0000000000..dbe2cc7092 --- /dev/null +++ b/core/src/main/resources/hudson/model/Run/artifacts-index_pt_BR.properties @@ -0,0 +1,23 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Build\ Artifacts=Artefatos de Constru\u00E7\u00E3o diff --git a/core/src/main/resources/hudson/model/Run/console_pt_BR.properties b/core/src/main/resources/hudson/model/Run/console_pt_BR.properties index c34974d444..0f45dd702f 100644 --- a/core/src/main/resources/hudson/model/Run/console_pt_BR.properties +++ b/core/src/main/resources/hudson/model/Run/console_pt_BR.properties @@ -22,3 +22,5 @@ Console\ Output=Sa\u00EDda do Console View\ as\ plain\ text=Visualizar como somente texto +# Skipping {0,number,integer} KB.. Full Log +skipSome= diff --git a/core/src/main/resources/hudson/model/Run/logKeep_pt_BR.properties b/core/src/main/resources/hudson/model/Run/logKeep_pt_BR.properties index ced7efc7b5..adcfe95593 100644 --- a/core/src/main/resources/hudson/model/Run/logKeep_pt_BR.properties +++ b/core/src/main/resources/hudson/model/Run/logKeep_pt_BR.properties @@ -20,5 +20,6 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Don't\ keep\ this\ build\ forever=N\u00E3o manter esta constru\u00E7\u00E3o nunca Keep\ this\ build\ forever=Manter esta constru\u00E7\u00E3o sempre +Don''t\ keep\ this\ build\ forever= +Don't\ keep\ this\ build\ forever= diff --git a/core/src/main/resources/hudson/model/RunParameterDefinition/config_pt_BR.properties b/core/src/main/resources/hudson/model/RunParameterDefinition/config_pt_BR.properties new file mode 100644 index 0000000000..2020feb99c --- /dev/null +++ b/core/src/main/resources/hudson/model/RunParameterDefinition/config_pt_BR.properties @@ -0,0 +1,25 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Project=Projeto +Name= +Description= diff --git a/core/src/main/resources/hudson/model/Slave/help-launcher_pt_BR.properties b/core/src/main/resources/hudson/model/Slave/help-launcher_pt_BR.properties new file mode 100644 index 0000000000..77deb113b7 --- /dev/null +++ b/core/src/main/resources/hudson/model/Slave/help-launcher_pt_BR.properties @@ -0,0 +1,23 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Controls\ how\ Hudson\ starts\ this\ slave.= diff --git a/core/src/main/resources/hudson/model/StringParameterDefinition/config_pt_BR.properties b/core/src/main/resources/hudson/model/StringParameterDefinition/config_pt_BR.properties new file mode 100644 index 0000000000..c92c06cfcf --- /dev/null +++ b/core/src/main/resources/hudson/model/StringParameterDefinition/config_pt_BR.properties @@ -0,0 +1,25 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Name= +Default\ Value= +Description= diff --git a/core/src/main/resources/hudson/model/TreeView/sidepanel2_pt_BR.properties b/core/src/main/resources/hudson/model/TreeView/sidepanel2_pt_BR.properties new file mode 100644 index 0000000000..648e82c0c5 --- /dev/null +++ b/core/src/main/resources/hudson/model/TreeView/sidepanel2_pt_BR.properties @@ -0,0 +1,23 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +New\ View= diff --git a/core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_pt_BR.properties b/core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_pt_BR.properties new file mode 100644 index 0000000000..a83daf6d15 --- /dev/null +++ b/core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_pt_BR.properties @@ -0,0 +1,30 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +# Upgrade to Hudson {0} is complete, awaiting restart. +UpgradeComplete= +# Upgrade to Hudson {0} is in progress or failed. +UpgradeProgress= +Or\ Upgrade\ Automatically= +# New version of Hudson ({0}) is available for download \ +# (changelog). +NewVersionAvailable= diff --git a/core/src/main/resources/hudson/model/UpdateCenter/DownloadJob/Failure/status_pt_BR.properties b/core/src/main/resources/hudson/model/UpdateCenter/DownloadJob/Failure/status_pt_BR.properties new file mode 100644 index 0000000000..fe6de6797f --- /dev/null +++ b/core/src/main/resources/hudson/model/UpdateCenter/DownloadJob/Failure/status_pt_BR.properties @@ -0,0 +1,24 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Failure= +Details= diff --git a/core/src/main/resources/hudson/model/UpdateCenter/DownloadJob/Installing/status_pt_BR.properties b/core/src/main/resources/hudson/model/UpdateCenter/DownloadJob/Installing/status_pt_BR.properties new file mode 100644 index 0000000000..e618c3ebc1 --- /dev/null +++ b/core/src/main/resources/hudson/model/UpdateCenter/DownloadJob/Installing/status_pt_BR.properties @@ -0,0 +1,23 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Installing= diff --git a/core/src/main/resources/hudson/model/UpdateCenter/DownloadJob/Pending/status_pt_BR.properties b/core/src/main/resources/hudson/model/UpdateCenter/DownloadJob/Pending/status_pt_BR.properties new file mode 100644 index 0000000000..093fc0bd72 --- /dev/null +++ b/core/src/main/resources/hudson/model/UpdateCenter/DownloadJob/Pending/status_pt_BR.properties @@ -0,0 +1,23 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Pending= diff --git a/core/src/main/resources/hudson/model/UpdateCenter/DownloadJob/Success/status_pt_BR.properties b/core/src/main/resources/hudson/model/UpdateCenter/DownloadJob/Success/status_pt_BR.properties new file mode 100644 index 0000000000..6c34cd243d --- /dev/null +++ b/core/src/main/resources/hudson/model/UpdateCenter/DownloadJob/Success/status_pt_BR.properties @@ -0,0 +1,23 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Success= diff --git a/core/src/main/resources/hudson/model/UpdateCenter/index_pt_BR.properties b/core/src/main/resources/hudson/model/UpdateCenter/index_pt_BR.properties new file mode 100644 index 0000000000..32d0772627 --- /dev/null +++ b/core/src/main/resources/hudson/model/UpdateCenter/index_pt_BR.properties @@ -0,0 +1,27 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Update\ Center= +# Once the installation is completed, Hudson needs to be restarted for changes to take effect. +warning= +Installing\ Plugins/Upgrades= +Restart\ When\ No\ Jobs\ Are\ Running= diff --git a/core/src/main/resources/hudson/model/UpdateCenter/sidepanel_pt_BR.properties b/core/src/main/resources/hudson/model/UpdateCenter/sidepanel_pt_BR.properties index e9766effac..30814dc5f0 100644 --- a/core/src/main/resources/hudson/model/UpdateCenter/sidepanel_pt_BR.properties +++ b/core/src/main/resources/hudson/model/UpdateCenter/sidepanel_pt_BR.properties @@ -21,3 +21,4 @@ # THE SOFTWARE. Back\ to\ Dashboard=Voltar ao Painel Principal +Manage\ Plugins=Gerenciar Plugins diff --git a/core/src/main/resources/hudson/model/User/configure_pt_BR.properties b/core/src/main/resources/hudson/model/User/configure_pt_BR.properties index fbc470bd23..a503cfe3d0 100644 --- a/core/src/main/resources/hudson/model/User/configure_pt_BR.properties +++ b/core/src/main/resources/hudson/model/User/configure_pt_BR.properties @@ -23,3 +23,5 @@ Your\ name=Seu nome Description=Descri\u00E7\u00E3o Save=Salvar +# User ''{0}'' Configuration +title= diff --git a/core/src/main/resources/hudson/model/User/delete_pt_BR.properties b/core/src/main/resources/hudson/model/User/delete_pt_BR.properties new file mode 100644 index 0000000000..05e4cc542d --- /dev/null +++ b/core/src/main/resources/hudson/model/User/delete_pt_BR.properties @@ -0,0 +1,24 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Yes=Sim +Are\ you\ sure\ about\ deleting\ the\ user\ from\ Hudson?= diff --git a/core/src/main/resources/hudson/model/User/sidepanel_pt_BR.properties b/core/src/main/resources/hudson/model/User/sidepanel_pt_BR.properties index 06f5ecca0b..b8ff56635f 100644 --- a/core/src/main/resources/hudson/model/User/sidepanel_pt_BR.properties +++ b/core/src/main/resources/hudson/model/User/sidepanel_pt_BR.properties @@ -24,3 +24,5 @@ People=Pessoas Status=Estado Builds=Constru\u00E7\u00F5es Configure=Configurar +Delete= +My\ Views= diff --git a/core/src/main/resources/hudson/model/View/People/index_pt_BR.properties b/core/src/main/resources/hudson/model/View/People/index_pt_BR.properties index 98ba50b4f6..d25d77f754 100644 --- a/core/src/main/resources/hudson/model/View/People/index_pt_BR.properties +++ b/core/src/main/resources/hudson/model/View/People/index_pt_BR.properties @@ -23,3 +23,5 @@ Name=Nome Last\ Active=\u00DAltimo Ativo On=Ligado +People=Pessoas +All\ People= diff --git a/core/src/main/resources/hudson/model/View/builds_pt_BR.properties b/core/src/main/resources/hudson/model/View/builds_pt_BR.properties index b74efacc49..e971cca2e6 100644 --- a/core/src/main/resources/hudson/model/View/builds_pt_BR.properties +++ b/core/src/main/resources/hudson/model/View/builds_pt_BR.properties @@ -20,4 +20,5 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -buildHistory=Hist\u00F3rico de Constru\u00E7\u00E3o de {0} \ No newline at end of file +buildHistory=Hist\u00F3rico de Constru\u00E7\u00E3o de {0}Export\ as\ plain\ XML= +Export\ as\ plain\ XML= diff --git a/core/src/main/resources/hudson/model/View/configure_pt_BR.properties b/core/src/main/resources/hudson/model/View/configure_pt_BR.properties index 622d057e4d..371649c6a4 100644 --- a/core/src/main/resources/hudson/model/View/configure_pt_BR.properties +++ b/core/src/main/resources/hudson/model/View/configure_pt_BR.properties @@ -21,4 +21,6 @@ # THE SOFTWARE. Name=Nome -Description=Descri\u00E7\u00E3o \ No newline at end of file +Description=Descri\u00E7\u00E3oFilter\ build\ queue= +Filter\ build\ executors= +Filter\ build\ queue= diff --git a/core/src/main/resources/hudson/model/View/newJob_pt_BR.properties b/core/src/main/resources/hudson/model/View/newJob_pt_BR.properties index f6c27122e9..0e16a87ad4 100644 --- a/core/src/main/resources/hudson/model/View/newJob_pt_BR.properties +++ b/core/src/main/resources/hudson/model/View/newJob_pt_BR.properties @@ -22,4 +22,4 @@ Job\ name=Nome da tarefa Copy\ existing\ job=Copiar tarefa existente -Copy\ from=Copiar de +New\ Job=Nova Tarefa diff --git a/core/src/main/resources/hudson/model/View/noJob_pt_BR.properties b/core/src/main/resources/hudson/model/View/noJob_pt_BR.properties new file mode 100644 index 0000000000..69749f1cd5 --- /dev/null +++ b/core/src/main/resources/hudson/model/View/noJob_pt_BR.properties @@ -0,0 +1,26 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +# This view has no jobs associated with it. +description_1= +# Please add some. +description_2= diff --git a/core/src/main/resources/hudson/model/View/viewTabs_pt_BR.properties b/core/src/main/resources/hudson/model/View/viewTabs_pt_BR.properties new file mode 100644 index 0000000000..648e82c0c5 --- /dev/null +++ b/core/src/main/resources/hudson/model/View/viewTabs_pt_BR.properties @@ -0,0 +1,23 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +New\ View= diff --git a/core/src/main/resources/hudson/model/queue/Messages_pt_BR.properties b/core/src/main/resources/hudson/model/queue/Messages_pt_BR.properties new file mode 100644 index 0000000000..ac326da7bb --- /dev/null +++ b/core/src/main/resources/hudson/model/queue/Messages_pt_BR.properties @@ -0,0 +1,24 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +# Installing default queue sorter +QueueSorter.installDefaultQueueSorter= diff --git a/core/src/main/resources/hudson/node_monitors/AbstractDiskSpaceMonitor/config_pt_BR.properties b/core/src/main/resources/hudson/node_monitors/AbstractDiskSpaceMonitor/config_pt_BR.properties new file mode 100644 index 0000000000..a7fbf2ca32 --- /dev/null +++ b/core/src/main/resources/hudson/node_monitors/AbstractDiskSpaceMonitor/config_pt_BR.properties @@ -0,0 +1,23 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Free\ Space\ Threshold= diff --git a/core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause_pt_BR.properties b/core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause_pt_BR.properties new file mode 100644 index 0000000000..35d0985412 --- /dev/null +++ b/core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause_pt_BR.properties @@ -0,0 +1,25 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +# Disk space is too low. Only {0}GB left. +blurb=\ +# Estes usu\u00E1rios podem se logar no Hudson. Este \u00E9 um super conjunto desta lista, \ diff --git a/core/src/main/resources/hudson/node_monitors/Messages_pt_BR.properties b/core/src/main/resources/hudson/node_monitors/Messages_pt_BR.properties index 634b9bb383..4902e3908f 100644 --- a/core/src/main/resources/hudson/node_monitors/Messages_pt_BR.properties +++ b/core/src/main/resources/hudson/node_monitors/Messages_pt_BR.properties @@ -22,4 +22,15 @@ ArchitectureMonitor.DisplayName=Arquitetura ClockMonitor.DisplayName=Diferen\u00E7a de Rel\u00F3gio -DiskSpaceMonitor.DisplayName=Espa\u00E7o Livre em Disco \ No newline at end of file +DiskSpaceMonitor.DisplayName=Espa\u00E7o Livre em Disco# Time out for last {0} try +ResponseTimeMonitor.TimeOut= +# Free Temp Space +TemporarySpaceMonitor.DisplayName= +# Response Time +ResponseTimeMonitor.DisplayName= +# Making {0} offline temporarily due to the lack of disk space +DiskSpaceMonitor.MarkedOffline= +# Free Swap Space +SwapSpaceMonitor.DisplayName= +# Making {0} offline temporarily because it''s not responding +ResponseTimeMonitor.MarkedOffline= diff --git a/core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message_pt_BR.properties b/core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message_pt_BR.properties new file mode 100644 index 0000000000..3814b40d30 --- /dev/null +++ b/core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message_pt_BR.properties @@ -0,0 +1,28 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Dismiss= +# Hudson took some slaves offline because their key health metrics went below a threshold. \ +# If you don''t want Hudson to do this, \ +# change the setting. +blurb=\ +# Estes usu\u00E1rios podem se logar no Hudson. Este \u00E9 um super conjunto desta lista, \ diff --git a/core/src/main/resources/hudson/node_monitors/ResponseTimeMonitor/Data/cause_pt_BR.properties b/core/src/main/resources/hudson/node_monitors/ResponseTimeMonitor/Data/cause_pt_BR.properties new file mode 100644 index 0000000000..42364d87ff --- /dev/null +++ b/core/src/main/resources/hudson/node_monitors/ResponseTimeMonitor/Data/cause_pt_BR.properties @@ -0,0 +1,23 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Ping\ response\ time\ is\ too\ long\ or\ timed\ out.= diff --git a/core/src/main/resources/hudson/os/solaris/ZFSInstaller/MigrationCompleteNotice/message_pt_BR.properties b/core/src/main/resources/hudson/os/solaris/ZFSInstaller/MigrationCompleteNotice/message_pt_BR.properties new file mode 100644 index 0000000000..d555a93898 --- /dev/null +++ b/core/src/main/resources/hudson/os/solaris/ZFSInstaller/MigrationCompleteNotice/message_pt_BR.properties @@ -0,0 +1,24 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +OK= +Data\ was\ successfully\ migrated\ to\ ZFS.= diff --git a/core/src/main/resources/hudson/os/solaris/ZFSInstaller/MigrationFailedNotice/index_pt_BR.properties b/core/src/main/resources/hudson/os/solaris/ZFSInstaller/MigrationFailedNotice/index_pt_BR.properties new file mode 100644 index 0000000000..4b752d65fa --- /dev/null +++ b/core/src/main/resources/hudson/os/solaris/ZFSInstaller/MigrationFailedNotice/index_pt_BR.properties @@ -0,0 +1,23 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +ZFS\ Migration\ Problem= diff --git a/core/src/main/resources/hudson/os/solaris/ZFSInstaller/MigrationFailedNotice/message_pt_BR.properties b/core/src/main/resources/hudson/os/solaris/ZFSInstaller/MigrationFailedNotice/message_pt_BR.properties new file mode 100644 index 0000000000..32cea78f9d --- /dev/null +++ b/core/src/main/resources/hudson/os/solaris/ZFSInstaller/MigrationFailedNotice/message_pt_BR.properties @@ -0,0 +1,24 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +ZFS\ migration\ failed.= +See\ the\ log\ for\ more\ details= diff --git a/core/src/main/resources/hudson/os/solaris/ZFSInstaller/askRootPassword_pt_BR.properties b/core/src/main/resources/hudson/os/solaris/ZFSInstaller/askRootPassword_pt_BR.properties new file mode 100644 index 0000000000..548a30259c --- /dev/null +++ b/core/src/main/resources/hudson/os/solaris/ZFSInstaller/askRootPassword_pt_BR.properties @@ -0,0 +1,31 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +OK= +See\ errors...= +Password=Senha +Username= +Permission\ Denied= +# It appears that the current user account lacks necessary permissions to create a ZFS file system. \ +# Please provide the username and the password that's capable of doing this, such as root. +blurb=\ +# Estes usu\u00E1rios podem se logar no Hudson. Este \u00E9 um super conjunto desta lista, \ diff --git a/core/src/main/resources/hudson/os/solaris/ZFSInstaller/confirm_pt_BR.properties b/core/src/main/resources/hudson/os/solaris/ZFSInstaller/confirm_pt_BR.properties new file mode 100644 index 0000000000..cff8467191 --- /dev/null +++ b/core/src/main/resources/hudson/os/solaris/ZFSInstaller/confirm_pt_BR.properties @@ -0,0 +1,37 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +# Rename {0} to {0}.backup +rename= +You\ will\ need\ the\ root\ password\ of\ the\ system\ to\ do\ this.= +# Mount a new ZFS file system at {0} +mount= +# Delete {0}.backup +delete=Excluir {0} +# Hudson will perform the following steps to migrate your existing data to a ZFS file system. +blurb=\ +# Estes usu\u00E1rios podem se logar no Hudson. Este \u00E9 um super conjunto desta lista, \ +# Create a new ZFS file system {0} and copy all the data into it +create= +Start\ migration= +Restart\ itself\ so\ that\ the\ migration\ can\ be\ done\ without\ worrying\ about\ concurrent\ data\ modifications= +ZFS\ file\ system\ creation= diff --git a/core/src/main/resources/hudson/os/solaris/ZFSInstaller/message_pt_BR.properties b/core/src/main/resources/hudson/os/solaris/ZFSInstaller/message_pt_BR.properties new file mode 100644 index 0000000000..accc0ac03a --- /dev/null +++ b/core/src/main/resources/hudson/os/solaris/ZFSInstaller/message_pt_BR.properties @@ -0,0 +1,28 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Yes,\ please= +# You are running on Solaris. Would you like Hudson to create a ZFS file system for you \ +# so that you can get the most out of Solaris? +blurb=\ +# Estes usu\u00E1rios podem se logar no Hudson. Este \u00E9 um super conjunto desta lista, \ +No,\ thank\ you= diff --git a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/config_pt_BR.properties b/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/config_pt_BR.properties new file mode 100644 index 0000000000..bce9fbac61 --- /dev/null +++ b/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/config_pt_BR.properties @@ -0,0 +1,24 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Password=Senha +Administrator\ user\ name= diff --git a/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help_pt_BR.properties b/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help_pt_BR.properties new file mode 100644 index 0000000000..378a80e68d --- /dev/null +++ b/core/src/main/resources/hudson/os/windows/ManagedWindowsServiceLauncher/help_pt_BR.properties @@ -0,0 +1,27 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +# Starts a Windows slave by a remote management facility built into Windows. \ +# Suitable for managing Windows slaves. \ +# Slaves need to be IP reachable from the master. +blurb=\ +# Estes usu\u00E1rios podem se logar no Hudson. Este \u00E9 um super conjunto desta lista, \ diff --git a/core/src/main/resources/hudson/os/windows/Messages_pt_BR.properties b/core/src/main/resources/hudson/os/windows/Messages_pt_BR.properties new file mode 100644 index 0000000000..2ffd7daef0 --- /dev/null +++ b/core/src/main/resources/hudson/os/windows/Messages_pt_BR.properties @@ -0,0 +1,49 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +# Stopping the service +ManagedWindowsServiceLauncher.StoppingService= +# Copying hudson-slave.exe +ManagedWindowsServiceLauncher.CopyingSlaveExe= +# Installing the Hudson slave service +ManagedWindowsServiceLauncher.InstallingSlaveService= +# The service didn''t respond. Perphaps it failed to launch? +ManagedWindowsServiceLauncher.ServiceDidntRespond= +# \ +# Let Hudson control this Windows slave as a Windows service +ManagedWindowsServiceLauncher.DisplayName= +# .NET Framework 2.0 or later is required on this computer to run a Hudson slave as a Windows service +ManagedWindowsServiceLauncher.DotNetRequired= +# Connecting to {0} +ManagedWindowsServiceLauncher.ConnectingTo= +# Registering the service +ManagedWindowsServiceLauncher.RegisteringService= +# Copying hudson-slave.xml +ManagedWindowsServiceLauncher.CopyingSlaveXml= +# Connecting to port {0} +ManagedWindowsServiceLauncher.ConnectingToPort= +# Starting the service +ManagedWindowsServiceLauncher.StartingService= +# Waiting for the service to become ready +ManagedWindowsServiceLauncher.WaitingForService= +# Access is denied. See http://wiki.hudson-ci.org/display/HUDSON/Windows+slaves+fail+to+start+via+DCOM for more information about how to resolve this. +ManagedWindowsServiceLauncher.AccessDenied= diff --git a/core/src/main/resources/hudson/scm/Messages_pt_BR.properties b/core/src/main/resources/hudson/scm/Messages_pt_BR.properties index fabb149f06..10a981c402 100644 --- a/core/src/main/resources/hudson/scm/Messages_pt_BR.properties +++ b/core/src/main/resources/hudson/scm/Messages_pt_BR.properties @@ -22,3 +22,7 @@ NullSCM.DisplayName=Nenhum SCM.Permissions.Title=SCM +# \ +# This permission allows users to create a new tag in the source code repository \ +# for a given build. +SCM.TagPermission.Description= diff --git a/core/src/main/resources/hudson/scm/SCM/project-changes_pt_BR.properties b/core/src/main/resources/hudson/scm/SCM/project-changes_pt_BR.properties index 4bf0133d1c..bea541f3ec 100644 --- a/core/src/main/resources/hudson/scm/SCM/project-changes_pt_BR.properties +++ b/core/src/main/resources/hudson/scm/SCM/project-changes_pt_BR.properties @@ -22,3 +22,4 @@ No\ builds.=Sem constru\u00E7\u00F5es. No\ changes\ in\ any\ of\ the\ builds.=Sem mudan\u00E7as em qualquer uma das constru\u00E7\u00F5es. +detail=detalhe diff --git a/core/src/main/resources/hudson/search/Search/search-failed_pt_BR.properties b/core/src/main/resources/hudson/search/Search/search-failed_pt_BR.properties index 794a8a5d73..4306b4bdbd 100644 --- a/core/src/main/resources/hudson/search/Search/search-failed_pt_BR.properties +++ b/core/src/main/resources/hudson/search/Search/search-failed_pt_BR.properties @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Nothing\ seems\ to\ match.=Nada se enquadra. \ No newline at end of file +Nothing\ seems\ to\ match.=Nada se enquadra. diff --git a/core/src/main/resources/hudson/security/AuthorizationMatrixProperty/config_pt_BR.properties b/core/src/main/resources/hudson/security/AuthorizationMatrixProperty/config_pt_BR.properties index 5d3742e955..a29ab957cc 100644 --- a/core/src/main/resources/hudson/security/AuthorizationMatrixProperty/config_pt_BR.properties +++ b/core/src/main/resources/hudson/security/AuthorizationMatrixProperty/config_pt_BR.properties @@ -21,7 +21,3 @@ # THE SOFTWARE. Enable\ project-based\ security=Habilitar seguran\u00E7a baseada em projeto -User/group=Usu\u00E1rio/grupo -Anonymous=An\u00F4nimo -User/group\ to\ add=Usu\u00E1rio/grupo para adicionar -Add=Adicionar \ No newline at end of file diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_pt_BR.properties b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_pt_BR.properties new file mode 100644 index 0000000000..8e806db0f4 --- /dev/null +++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_pt_BR.properties @@ -0,0 +1,28 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Password=Senha +Username= +Enter\ text\ as\ shown= +Full\ name= +Confirm\ password= +E-mail\ address=Endere\u00E7o de e-mail diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/firstUser_pt_BR.properties b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/firstUser_pt_BR.properties new file mode 100644 index 0000000000..95a4e37881 --- /dev/null +++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/firstUser_pt_BR.properties @@ -0,0 +1,23 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Create\ First\ Admin\ User= diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_pt_BR.properties b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_pt_BR.properties index f7d959899c..d3f0c58cdb 100644 --- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_pt_BR.properties +++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_pt_BR.properties @@ -21,6 +21,5 @@ # THE SOFTWARE. blurb=\ -Estes usu\u00E1rios podem se logar no Hudson. Este \u00E9 um super conjunto desta lista, \ -que tamb\u00E9m cont\u00E9m usu\u00E1rios auto-criados que na verdade apenas fizeram algumas submiss\u00F5es em alguns projetos e n\u00E3o t\u00EAm \ -acesso direto ao Hudson. +Name= +Name= diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/success_pt_BR.properties b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/success_pt_BR.properties new file mode 100644 index 0000000000..93f6a85b61 --- /dev/null +++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/success_pt_BR.properties @@ -0,0 +1,25 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +# You are now logged in. Go back to the top page. +description= +Success= diff --git a/core/src/main/resources/hudson/security/LDAPSecurityRealm/config_pt_BR.properties b/core/src/main/resources/hudson/security/LDAPSecurityRealm/config_pt_BR.properties index 0f8e273f33..63cc0d92c2 100644 --- a/core/src/main/resources/hudson/security/LDAPSecurityRealm/config_pt_BR.properties +++ b/core/src/main/resources/hudson/security/LDAPSecurityRealm/config_pt_BR.properties @@ -24,3 +24,6 @@ Server=Servidor root\ DN=DN ra\u00EDz User\ search\ base=Base de busca de usu\u00E1rio User\ search\ filter=Filtro de busca de usu\u00E1rio +Group\ search\ base= +Manager\ Password= +Manager\ DN= diff --git a/core/src/main/resources/hudson/security/Messages_pt_BR.properties b/core/src/main/resources/hudson/security/Messages_pt_BR.properties index 7711a415ed..fff8c481f1 100644 --- a/core/src/main/resources/hudson/security/Messages_pt_BR.properties +++ b/core/src/main/resources/hudson/security/Messages_pt_BR.properties @@ -33,3 +33,46 @@ UserDetailsServiceProxy.UnableToQuery=N\u00E3o foi poss\u00EDvel buscar informa\ # not in use Permission.Permissions.Title=N/A +# Success +PAMSecurityRealm.Success= +# Unable to connect to {0} : {1} +LDAPSecurityRealm.UnableToConnect= +# Logged-in users can do anything +FullControlOnceLoggedInAuthorizationStrategy.DisplayName= +# Unix user/group database +PAMSecurityRealm.DisplayName= +# User ''{0}'' +PAMSecurityRealm.User= +# {0} needs to belong to group {1} to read /etc/shadow +PAMSecurityRealm.BelongToGroup= +# Anyone can do anything +AuthorizationStrategy.DisplayName= +# Project-based Matrix Authorization Strategy +ProjectMatrixAuthorizationStrategy.DisplayName= +# Invalid port number +LDAPSecurityRealm.InvalidPortNumber= +# Unknown host: {0} +LDAPSecurityRealm.UnknownHost= +# uid: {0} +PAMSecurityRealm.Uid= +# \ +# Either Hudson needs to run as {0} or {1} needs to belong to group {2} and ''chmod g+r /etc/shadow'' needs to be done to enable Hudson to read /etc/shadow +PAMSecurityRealm.RunAsUserOrBelongToGroupAndChmod= +# Current User +PAMSecurityRealm.CurrentUser= +# {0} is missing the {1} permission +AccessDeniedException2.MissingPermission= +# Manage Users +HudsonPrivateSecurityRealm.ManageUserLinks.DisplayName= +# Delegate to servlet container +LegacySecurityRealm.Displayname= +# LDAP +LDAPSecurityRealm.DisplayName= +# Hudson''s own user database +HudsonPrivateSecurityRealm.DisplayName= +# Hudson needs to be able to read /etc/shadow +PAMSecurityRealm.ReadPermission= +# Create/delete/modify users that can log in to this Hudson +HudsonPrivateSecurityRealm.ManageUserLinks.Description= +# Syntax of server field is SERVER or SERVER:PORT or ldaps://SERVER[:PORT] +LDAPSecurityRealm.SyntaxOfServerField= diff --git a/core/src/main/resources/hudson/security/PAMSecurityRealm/config_pt_BR.properties b/core/src/main/resources/hudson/security/PAMSecurityRealm/config_pt_BR.properties new file mode 100644 index 0000000000..b335fa963b --- /dev/null +++ b/core/src/main/resources/hudson/security/PAMSecurityRealm/config_pt_BR.properties @@ -0,0 +1,24 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Test= +Service\ Name= diff --git a/core/src/main/resources/hudson/security/csrf/Messages_pt_BR.properties b/core/src/main/resources/hudson/security/csrf/Messages_pt_BR.properties new file mode 100644 index 0000000000..c68d76e4fa --- /dev/null +++ b/core/src/main/resources/hudson/security/csrf/Messages_pt_BR.properties @@ -0,0 +1,24 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +# Default Crumb Issuer +DefaultCrumbIssuer.DisplayName= diff --git a/core/src/main/resources/hudson/slaves/CommandLauncher/help_pt_BR.properties b/core/src/main/resources/hudson/slaves/CommandLauncher/help_pt_BR.properties new file mode 100644 index 0000000000..6218e59689 --- /dev/null +++ b/core/src/main/resources/hudson/slaves/CommandLauncher/help_pt_BR.properties @@ -0,0 +1,26 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +# Starts a slave by having Hudson execute a command from the master. \ +# Use this when the master is capable of remotely executing a process on a slave, such as through ssh/rsh. +blurb=\ +# Estes usu\u00E1rios podem se logar no Hudson. Este \u00E9 um super conjunto desta lista, \ diff --git a/core/src/main/resources/hudson/slaves/ComputerLauncher/main_pt_BR.properties b/core/src/main/resources/hudson/slaves/ComputerLauncher/main_pt_BR.properties new file mode 100644 index 0000000000..135a2e1aba --- /dev/null +++ b/core/src/main/resources/hudson/slaves/ComputerLauncher/main_pt_BR.properties @@ -0,0 +1,27 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Relaunch\ slave\ agent= +# This node is being launched. +launchingDescription= +Launch\ slave\ agent= +See\ log\ for\ more\ details= diff --git a/core/src/main/resources/hudson/slaves/DumbSlave/configure-entries_pt_BR.properties b/core/src/main/resources/hudson/slaves/DumbSlave/configure-entries_pt_BR.properties index ac82a7b232..a83aeba443 100644 --- a/core/src/main/resources/hudson/slaves/DumbSlave/configure-entries_pt_BR.properties +++ b/core/src/main/resources/hudson/slaves/DumbSlave/configure-entries_pt_BR.properties @@ -20,20 +20,10 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Master/Slave\ Support=Support Matre/Esclave -Master=Matre -Name=Nom Description= -This\ Hudson\ server=Ce serveur Hudson \#\ of\ executors=Nombre d''excuteurs -Local\ FS\ root=Racine du systme de fichiers local -Slaves=Esclaves -Name\ is\ mandatory=Le nom est obligatoire -Number\ of\ executors\ is\ mandatory.=Le nombre d''excuteurs est obligatoire. Remote\ FS\ root=Rpertoire de travail du systme distant -Remote\ directory\ is\ mandatory.=Le rpertoire distant est obligatoire. Labels=Etiquettes -Usage=Utilisation Launch\ method=Mthode de lancement Availability=Disponibilit -Save=Sauvegarder +Node\ Properties= diff --git a/core/src/main/resources/hudson/slaves/DumbSlave/newInstanceDetail_pt_BR.properties b/core/src/main/resources/hudson/slaves/DumbSlave/newInstanceDetail_pt_BR.properties new file mode 100644 index 0000000000..6222a04572 --- /dev/null +++ b/core/src/main/resources/hudson/slaves/DumbSlave/newInstanceDetail_pt_BR.properties @@ -0,0 +1,28 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +# \ +# Adds a plain, dumb slave to Hudson. This is called "dumb" because Hudson doesn''t provide \ +# higher level of integration with these slaves, such as dynamic provisioning. \ +# Select this type if no other slave types apply — for example such as when you are adding \ +# a physical computer, virtual machines managed outside Hudson, etc. +detail=detalhe diff --git a/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_pt_BR.properties b/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_pt_BR.properties new file mode 100644 index 0000000000..a6f9ccc6b3 --- /dev/null +++ b/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config_pt_BR.properties @@ -0,0 +1,25 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +value= +name= +List\ of\ key-value\ pairs= diff --git a/core/src/main/resources/hudson/slaves/JNLPLauncher/config_pt_BR.properties b/core/src/main/resources/hudson/slaves/JNLPLauncher/config_pt_BR.properties new file mode 100644 index 0000000000..28aab2e5e1 --- /dev/null +++ b/core/src/main/resources/hudson/slaves/JNLPLauncher/config_pt_BR.properties @@ -0,0 +1,24 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Tunnel\ connection\ through= +JVM\ options= diff --git a/core/src/main/resources/hudson/slaves/JNLPLauncher/help_pt_BR.properties b/core/src/main/resources/hudson/slaves/JNLPLauncher/help_pt_BR.properties new file mode 100644 index 0000000000..f9e99ef728 --- /dev/null +++ b/core/src/main/resources/hudson/slaves/JNLPLauncher/help_pt_BR.properties @@ -0,0 +1,28 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +# Starts a slave by launching an agent program through JNLP. \ +# The launch in this case is initiated by the slave, \ +# thus slaves need not be IP reachable from the master (e.g. behind the firewall.) \ +# It is still possible to start a launch without GUI, for example as a Windows service. +blurb=\ +# Estes usu\u00E1rios podem se logar no Hudson. Este \u00E9 um super conjunto desta lista, \ diff --git a/core/src/main/resources/hudson/slaves/JNLPLauncher/main_pt_BR.properties b/core/src/main/resources/hudson/slaves/JNLPLauncher/main_pt_BR.properties new file mode 100644 index 0000000000..084e0094b3 --- /dev/null +++ b/core/src/main/resources/hudson/slaves/JNLPLauncher/main_pt_BR.properties @@ -0,0 +1,32 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Or\ if\ the\ slave\ is\ headless\:= +# Go to system config screen and change it +configure.link.text= +Connect\ slave\ to\ Hudson\ one\ of\ these\ ways\:= +Run\ from\ slave\ command\ line\:= +launch\ agent= +# TCP port for JNLP slave agents is disabled. +slaveAgentPort.disabled= +Launch\ agent\ from\ browser\ on\ slave= +Connected\ via\ JNLP\ agent.= diff --git a/core/src/main/resources/hudson/slaves/Messages_pt_BR.properties b/core/src/main/resources/hudson/slaves/Messages_pt_BR.properties index 5f0d6571ed..76ce36630d 100644 --- a/core/src/main/resources/hudson/slaves/Messages_pt_BR.properties +++ b/core/src/main/resources/hudson/slaves/Messages_pt_BR.properties @@ -25,4 +25,24 @@ RetentionStrategy.Demand.displayName=Deixar este slave ligado quando em demanda CommandLauncher.displayName=Lan\u00E7ar o slave via execu\u00E7\u00E3o de comando no Master JNLPLauncher.displayName=Lan\u00E7ar os agentes slave via JNLP ComputerLauncher.unexpectedError=Erro ErroUnexpected no lan\u00E7amento de um slave. Este \u00E9 provavelmente um bug no Hudson -ComputerLauncher.abortedLaunch=Processo de lan\u00E7amento de slave abortado. \ No newline at end of file +ComputerLauncher.abortedLaunch=Processo de lan\u00E7amento de slave abortado.# Take this slave on-line according to a schedule +SimpleScheduledRetentionStrategy.displayName= +# This node is offline because Hudson failed to launch the slave agent on it. +OfflineCause.LaunchFailed= +# Disconnected from CLI +OfflineCause.DisconnectedFromCLI= +# No launch command specified +CommandLauncher.NoLaunchCommand= +# Offline because computer was idle; it will be relaunched when needed. +RetentionStrategy.Demand.OfflineIdle= +# Repeated ping attempts failed +ConnectionActivityMonitor.OfflineCause= +# Disconnected by {0}{1} +SlaveComputer.DisconnectedBy= +# Computer has finished its scheduled uptime +SimpleScheduledRetentionStrategy.FinishedUpTime= +NodeProvisioner.EmptyString= +# Environment variables +EnvironmentVariablesNodeProperty.displayName= +# Dumb Slave +DumbSlave.displayName= diff --git a/core/src/main/resources/hudson/slaves/OfflineCause/ChannelTermination/cause_pt_BR.properties b/core/src/main/resources/hudson/slaves/OfflineCause/ChannelTermination/cause_pt_BR.properties new file mode 100644 index 0000000000..b614d0b2c0 --- /dev/null +++ b/core/src/main/resources/hudson/slaves/OfflineCause/ChannelTermination/cause_pt_BR.properties @@ -0,0 +1,23 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Connection\ was\ broken= diff --git a/core/src/main/resources/hudson/slaves/OfflineCause/LaunchFailed/cause_pt_BR.properties b/core/src/main/resources/hudson/slaves/OfflineCause/LaunchFailed/cause_pt_BR.properties new file mode 100644 index 0000000000..9daae5ec7d --- /dev/null +++ b/core/src/main/resources/hudson/slaves/OfflineCause/LaunchFailed/cause_pt_BR.properties @@ -0,0 +1,23 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +See\ log\ for\ more\ details= diff --git a/core/src/main/resources/hudson/slaves/RetentionStrategy/Demand/config_pt_BR.properties b/core/src/main/resources/hudson/slaves/RetentionStrategy/Demand/config_pt_BR.properties index a2b5ccb366..15b05f6bce 100644 --- a/core/src/main/resources/hudson/slaves/RetentionStrategy/Demand/config_pt_BR.properties +++ b/core/src/main/resources/hudson/slaves/RetentionStrategy/Demand/config_pt_BR.properties @@ -21,6 +21,6 @@ # THE SOFTWARE. In\ demand\ delay=Atraso em demanda -In\ demand\ delay\ is\ mandatory.=Atraso em demanda \u00E9 obrigat\u00F3rio. Idle\ delay=Atraso de inatividade -Idle\ delay\ is\ mandatory.=Atraso de inatividade \u00E9 obrigat\u00F3rio. +In\ demand\ delay\ is\ mandatory\ and\ must\ be\ a\ number.= +Idle\ delay\ is\ mandatory\ and\ must\ be\ a\ number.= diff --git a/core/src/main/resources/hudson/slaves/SimpleScheduledRetentionStrategy/config_pt_BR.properties b/core/src/main/resources/hudson/slaves/SimpleScheduledRetentionStrategy/config_pt_BR.properties new file mode 100644 index 0000000000..7b1ea8bf36 --- /dev/null +++ b/core/src/main/resources/hudson/slaves/SimpleScheduledRetentionStrategy/config_pt_BR.properties @@ -0,0 +1,29 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Scheduled\ Uptime= +Startup\ Schedule=Agenda de Inicializa\u00E7\u00E3o +# \ +# The number of minutes to keep the node up for. If this is longer than the startup schedule, then the node will remain constantly on-line. +uptime.description= +Keep\ on-line\ while\ jobs\ are\ running= +Scheduled\ Uptime\ is\ mandatory\ and\ must\ be\ a\ number.= diff --git a/core/src/main/resources/hudson/slaves/SlaveComputer/disconnect_pt_BR.properties b/core/src/main/resources/hudson/slaves/SlaveComputer/disconnect_pt_BR.properties new file mode 100644 index 0000000000..713db1c466 --- /dev/null +++ b/core/src/main/resources/hudson/slaves/SlaveComputer/disconnect_pt_BR.properties @@ -0,0 +1,28 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Are\ you\ sure\ about\ disconnecting?= +disconnect= +Yes=Sim +# You can optionally explain why you are taking this node offline, so that others can see why: +blurb=\ +# Estes usu\u00E1rios podem se logar no Hudson. Este \u00E9 um super conjunto desta lista, \ diff --git a/core/src/main/resources/hudson/slaves/SlaveComputer/sidepanel2_pt_BR.properties b/core/src/main/resources/hudson/slaves/SlaveComputer/sidepanel2_pt_BR.properties new file mode 100644 index 0000000000..4863539a27 --- /dev/null +++ b/core/src/main/resources/hudson/slaves/SlaveComputer/sidepanel2_pt_BR.properties @@ -0,0 +1,25 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Disconnect= +System\ Information=Informa\u00E7\u00E3o de Sistema +Log= diff --git a/core/src/main/resources/hudson/slaves/SlaveComputer/systemInfo_pt_BR.properties b/core/src/main/resources/hudson/slaves/SlaveComputer/systemInfo_pt_BR.properties new file mode 100644 index 0000000000..2a764ccc22 --- /dev/null +++ b/core/src/main/resources/hudson/slaves/SlaveComputer/systemInfo_pt_BR.properties @@ -0,0 +1,26 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +System\ Information=Informa\u00E7\u00E3o de Sistema +System\ Properties=Propriedades do Sistema +Thread\ Dump=Limpar Threads +Environment\ Variables=Vari\u00E1veis de Ambiente diff --git a/core/src/main/resources/hudson/slaves/SlaveComputer/threadDump_pt_BR.properties b/core/src/main/resources/hudson/slaves/SlaveComputer/threadDump_pt_BR.properties new file mode 100644 index 0000000000..9f370e4966 --- /dev/null +++ b/core/src/main/resources/hudson/slaves/SlaveComputer/threadDump_pt_BR.properties @@ -0,0 +1,25 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Thread\ Dump=Limpar Threads +# {0} Thread Dump +title= diff --git a/core/src/main/resources/hudson/tasks/Ant/AntInstallation/config_pt_BR.properties b/core/src/main/resources/hudson/tasks/Ant/AntInstallation/config_pt_BR.properties new file mode 100644 index 0000000000..d9ff37731e --- /dev/null +++ b/core/src/main/resources/hudson/tasks/Ant/AntInstallation/config_pt_BR.properties @@ -0,0 +1,23 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Name= diff --git a/core/src/main/resources/hudson/tasks/ArtifactArchiver/config_pt_BR.properties b/core/src/main/resources/hudson/tasks/ArtifactArchiver/config_pt_BR.properties index 44291c0a40..ef77128086 100644 --- a/core/src/main/resources/hudson/tasks/ArtifactArchiver/config_pt_BR.properties +++ b/core/src/main/resources/hudson/tasks/ArtifactArchiver/config_pt_BR.properties @@ -20,4 +20,6 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -lastBuildOnly=Discartar todos menos o \u00FAltim artefato conclu\u00EDdo com sucesso para economizar espa\u00E7o em disco \ No newline at end of file +lastBuildOnly=Discartar todos menos o \u00FAltim artefato conclu\u00EDdo com sucesso para economizar espa\u00E7o em discoFiles\ to\ archive= +Excludes= +Files\ to\ archive= diff --git a/core/src/main/resources/hudson/tasks/BatchFile/config_pt_BR.properties b/core/src/main/resources/hudson/tasks/BatchFile/config_pt_BR.properties new file mode 100644 index 0000000000..8b6c9dda36 --- /dev/null +++ b/core/src/main/resources/hudson/tasks/BatchFile/config_pt_BR.properties @@ -0,0 +1,25 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +# See the list of available environment variables +description= +Command=Comando diff --git a/core/src/main/resources/hudson/tasks/Fingerprinter/FingerprintAction/index_pt_BR.properties b/core/src/main/resources/hudson/tasks/Fingerprinter/FingerprintAction/index_pt_BR.properties index d363e20fd9..baf701e4ca 100644 --- a/core/src/main/resources/hudson/tasks/Fingerprinter/FingerprintAction/index_pt_BR.properties +++ b/core/src/main/resources/hudson/tasks/Fingerprinter/FingerprintAction/index_pt_BR.properties @@ -25,3 +25,5 @@ File=Arquivo Original\ owner=Propriet\u00E1rio original Age=Idade more\ details=mais detalhes +this\ build= +outside\ Hudson=fora do Hudson diff --git a/core/src/main/resources/hudson/tasks/Fingerprinter/config_pt_BR.properties b/core/src/main/resources/hudson/tasks/Fingerprinter/config_pt_BR.properties index 44a370cb5c..67080125a5 100644 --- a/core/src/main/resources/hudson/tasks/Fingerprinter/config_pt_BR.properties +++ b/core/src/main/resources/hudson/tasks/Fingerprinter/config_pt_BR.properties @@ -23,3 +23,6 @@ description=Pode usar caracteres coringas como em ''module/dist/**/*.zip''. \ Veja o Fileset @includes do Ant para o formato exato. \ O diret\u00F3rio base \u00E9 o workspace. +Keep\ the\ build\ logs\ of\ dependencies= +Files\ to\ fingerprint= +Fingerprint\ all\ archived\ artifacts= diff --git a/core/src/main/resources/hudson/tasks/JavadocArchiver/config_pt_BR.properties b/core/src/main/resources/hudson/tasks/JavadocArchiver/config_pt_BR.properties index df1be75e15..08ca6f3f86 100644 --- a/core/src/main/resources/hudson/tasks/JavadocArchiver/config_pt_BR.properties +++ b/core/src/main/resources/hudson/tasks/JavadocArchiver/config_pt_BR.properties @@ -21,4 +21,5 @@ # THE SOFTWARE. description=Diret\u00F3rio relativo \u00E0 raiz do workspace, tal como 'meuprojeto/construcao/javadoc' -keepAll=Manter sa\u00EDda de javadoc para todas as constru\u00E7\u00F5es de sucesso \ No newline at end of file +Retain\ Javadoc\ for\ each\ successful\ build= +Javadoc\ directory= diff --git a/core/src/main/resources/hudson/tasks/LogRotator/config_pt_BR.properties b/core/src/main/resources/hudson/tasks/LogRotator/config_pt_BR.properties index 3c86daa72b..e882a0d5e3 100644 --- a/core/src/main/resources/hudson/tasks/LogRotator/config_pt_BR.properties +++ b/core/src/main/resources/hudson/tasks/LogRotator/config_pt_BR.properties @@ -24,3 +24,7 @@ Days\ to\ keep\ builds=Dias para manter as contru\u00E7\u00F5es if\ not\ empty,\ build\ records\ are\ only\ kept\ up\ to\ this\ number\ of\ days=se n\u00E3o estiver vazio, registros de constru\u00E7\u00E3o s\u00E3o apenas mantidos para este n\u00FAmero de dias Max\ \#\ of\ builds\ to\ keep=# m\u00E1ximo de constru\u00E7\u00F5es para manter if\ not\ empty,\ only\ up\ to\ this\ number\ of\ build\ records\ are\ kept=se n\u00E3o estiver vazio, apenas at\u00E9 este n\u00FAmero de registros de constru\u00E7\u00E3o s\u00E3o mantidos +Days\ to\ keep\ artifacts= +Max\ \#\ of\ builds\ to\ keep\ with\ artifacts= +if\ not\ empty,\ artifacts\ from\ builds\ older\ than\ this\ number\ of\ days\ will\ be\ deleted,\ but\ the\ logs,\ history,\ reports,\ etc\ for\ the\ build\ will\ be\ kept= +if\ not\ empty,\ only\ up\ to\ this\ number\ of\ builds\ have\ their\ artifacts\ retained= diff --git a/core/src/main/resources/hudson/tasks/Mailer/global_pt_BR.properties b/core/src/main/resources/hudson/tasks/Mailer/global_pt_BR.properties index 9de3889136..6b1af8c8c9 100644 --- a/core/src/main/resources/hudson/tasks/Mailer/global_pt_BR.properties +++ b/core/src/main/resources/hudson/tasks/Mailer/global_pt_BR.properties @@ -29,3 +29,6 @@ Hudson\ URL=URL do Hudson User\ Name=Nome do Usu\u00E1rio Password=Senha Use\ SSL=Usar SSL +SMTP\ Port= +Use\ SMTP\ Authentication= +Charset= diff --git a/core/src/main/resources/hudson/tasks/Maven/MavenInstallation/config_pt_BR.properties b/core/src/main/resources/hudson/tasks/Maven/MavenInstallation/config_pt_BR.properties index d97d13ed78..e93e562f90 100644 --- a/core/src/main/resources/hudson/tasks/Maven/MavenInstallation/config_pt_BR.properties +++ b/core/src/main/resources/hudson/tasks/Maven/MavenInstallation/config_pt_BR.properties @@ -20,7 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Maven= -Maven\ installation=Instala\u00E7\u00E3o do Maven -List\ of\ Maven\ installations\ on\ this\ system.\ Both\ maven\ 1\ and\ 2\ are\ supported.=Lista de instala\u00E7\u00F5es do Maven neste sistema. Ambos maven 1 e 2 s\u00E3o suportados. Name=Nome diff --git a/core/src/main/resources/hudson/tasks/Maven/config_pt_BR.properties b/core/src/main/resources/hudson/tasks/Maven/config_pt_BR.properties index c4b791844f..54165227f0 100644 --- a/core/src/main/resources/hudson/tasks/Maven/config_pt_BR.properties +++ b/core/src/main/resources/hudson/tasks/Maven/config_pt_BR.properties @@ -23,3 +23,7 @@ Maven\ Version=Vers\u00E3o do Maven Default=Padr\u00E3o Goals=Objetivos +POM= +Properties=Propriedades +Use\ private\ Maven\ repository= +JVM\ Options= diff --git a/core/src/main/resources/hudson/tasks/Messages_pt_BR.properties b/core/src/main/resources/hudson/tasks/Messages_pt_BR.properties index 09e8453ce2..566f1e4e0b 100644 --- a/core/src/main/resources/hudson/tasks/Messages_pt_BR.properties +++ b/core/src/main/resources/hudson/tasks/Messages_pt_BR.properties @@ -78,3 +78,39 @@ Maven.NoExecutable=N\u00E3o pode encontrar nehum execut\u00E1vel em {0} Maven.NotADirectory={0} n\u00E3o \u00E9 um diret\u00F3rio Shell.DisplayName=Executar shell +# Changes: +MailSender.FailureMail.Changes= +# Failed to access build log +MailSender.FailureMail.FailedToAccessBuildLog= +# Cannot find executable from the choosen Ant installation "{0}" +Ant.ExecutableNotFound= +# Archiving artifacts +ArtifactArchiver.ARCHIVING_ARTIFACTS= +# Install from Apache +InstallFromApache= +# Hudson build became unstable: +MailSender.UnstableMail.ToUnStable.Subject= +# normal +MailSender.BackToNormal.Normal= +# Hudson build is still unstable: +MailSender.UnstableMail.StillUnstable.Subject= +# No javadoc found in {0}: {1} +JavadocArchiver.NoMatchFound= +# See <{0}{1}> +MailSender.Link= +# stable +MailSender.BackToNormal.Stable= +# address not configured yet +Mailer.Address.Not.Configured= +# This field should be ''@'' followed by a domain name. +Mailer.Suffix.Error= +# Hudson build is back to {0} : +MailSender.BackToNormalMail.Subject= +# Please set a valid host name, instead of localhost +Mailer.Localhost.Error= +# Build failed in Hudson: +MailSender.FailureMail.Subject= +# Unknown host name: +Mailer.Unknown.Host.Name= +# Hudson build is unstable: +MailSender.UnstableMail.Subject= diff --git a/core/src/main/resources/hudson/tasks/_ant/AntTargetNote/DescriptorImpl/outline_pt_BR.properties b/core/src/main/resources/hudson/tasks/_ant/AntTargetNote/DescriptorImpl/outline_pt_BR.properties new file mode 100644 index 0000000000..e27fec1b08 --- /dev/null +++ b/core/src/main/resources/hudson/tasks/_ant/AntTargetNote/DescriptorImpl/outline_pt_BR.properties @@ -0,0 +1,23 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Executed\ Ant\ Targets= diff --git a/core/src/main/resources/hudson/tasks/junit/CaseResult/index_pt_BR.properties b/core/src/main/resources/hudson/tasks/junit/CaseResult/index_pt_BR.properties index 22237e8e65..da14dc918b 100644 --- a/core/src/main/resources/hudson/tasks/junit/CaseResult/index_pt_BR.properties +++ b/core/src/main/resources/hudson/tasks/junit/CaseResult/index_pt_BR.properties @@ -27,3 +27,5 @@ since.before=Desde' ' since.after=' ' Standard\ Output=Sa\u00EDda Padr\u00E3o Standard\ Error=Sa\u00EDda de Erro Padr\u00E3o +Stacktrace= +Error\ Message= diff --git a/core/src/main/resources/hudson/tasks/junit/CaseResult/list_pt_BR.properties b/core/src/main/resources/hudson/tasks/junit/CaseResult/list_pt_BR.properties new file mode 100644 index 0000000000..4e3bb6d891 --- /dev/null +++ b/core/src/main/resources/hudson/tasks/junit/CaseResult/list_pt_BR.properties @@ -0,0 +1,26 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Test\ Description= +Build= +Test\ Duration= +Test\ Result= diff --git a/core/src/main/resources/hudson/tasks/junit/CaseResult/summary_pt_BR.properties b/core/src/main/resources/hudson/tasks/junit/CaseResult/summary_pt_BR.properties new file mode 100644 index 0000000000..3c16cd8d77 --- /dev/null +++ b/core/src/main/resources/hudson/tasks/junit/CaseResult/summary_pt_BR.properties @@ -0,0 +1,24 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Error\ Details= +Stack\ Trace= diff --git a/core/src/main/resources/hudson/tasks/junit/ClassResult/list_pt_BR.properties b/core/src/main/resources/hudson/tasks/junit/ClassResult/list_pt_BR.properties new file mode 100644 index 0000000000..badc242d9d --- /dev/null +++ b/core/src/main/resources/hudson/tasks/junit/ClassResult/list_pt_BR.properties @@ -0,0 +1,28 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Skip= +Duration=Dura\u00E7\u00E3o +Total= +Build= +Fail=Falha +Description= diff --git a/core/src/main/resources/hudson/tasks/junit/History/index_pt_BR.properties b/core/src/main/resources/hudson/tasks/junit/History/index_pt_BR.properties new file mode 100644 index 0000000000..17da24484a --- /dev/null +++ b/core/src/main/resources/hudson/tasks/junit/History/index_pt_BR.properties @@ -0,0 +1,25 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +More\ than\ 1\ builds\ are\ needed\ for\ the\ chart.= +# History for {0} +title= diff --git a/core/src/main/resources/hudson/tasks/junit/JUnitResultArchiver/config_pt_BR.properties b/core/src/main/resources/hudson/tasks/junit/JUnitResultArchiver/config_pt_BR.properties index ba9c70c666..deb547dc78 100644 --- a/core/src/main/resources/hudson/tasks/junit/JUnitResultArchiver/config_pt_BR.properties +++ b/core/src/main/resources/hudson/tasks/junit/JUnitResultArchiver/config_pt_BR.properties @@ -21,7 +21,6 @@ # THE SOFTWARE. description=\ -A configura\u00E7\u00E3o Fileset ''includes'' \ -que especifica os arquivos de relat\u00F3rios XML gerados, \ -tal como ''meuprojeto/target/test-reports/*.xml''. \ -O diret\u00F3rio base do fileset \u00E9 a ra\u00EDz do workspace. +Test\ report\ XMLs= +Retain\ long\ standard\ output/error= +Test\ report\ XMLs= diff --git a/core/src/main/resources/hudson/tasks/junit/Messages_pt_BR.properties b/core/src/main/resources/hudson/tasks/junit/Messages_pt_BR.properties index e225f23101..f5f208f78a 100644 --- a/core/src/main/resources/hudson/tasks/junit/Messages_pt_BR.properties +++ b/core/src/main/resources/hudson/tasks/junit/Messages_pt_BR.properties @@ -26,4 +26,25 @@ TestResult.getChildTitle=Pacote PackageResult.getTitle=Resultado de Teste : {0} PackageResult.getChildTitle=Classe -ClassResult.getTitle=Resultado de Teste : {0} \ No newline at end of file +ClassResult.getTitle=Resultado de Teste : {0}# Failed +CaseResult.Status.Failed= +# Regression +CaseResult.Status.Regression= +# Recording test results +JUnitResultArchiver.Recording= +# Incorrect XML attributes for test results found in {0} +JUnitResultArchiver.BadXML= +# Fixed +CaseResult.Status.Fixed= +# None of the test reports contained any result +JUnitResultArchiver.ResultIsEmpty= +# Passed +CaseResult.Status.Passed= +# No test report files were found. Configuration error? +JUnitResultArchiver.NoTestReportFound= +# Skipped +CaseResult.Status.Skipped= +# Publish JUnit test result report +JUnitResultArchiver.DisplayName= +# Test Results +TestResult.getDisplayName= diff --git a/core/src/main/resources/hudson/tasks/test/AbstractTestResultAction/summary_pt_BR.properties b/core/src/main/resources/hudson/tasks/test/AbstractTestResultAction/summary_pt_BR.properties index abe383e0d0..0aa79c5734 100644 --- a/core/src/main/resources/hudson/tasks/test/AbstractTestResultAction/summary_pt_BR.properties +++ b/core/src/main/resources/hudson/tasks/test/AbstractTestResultAction/summary_pt_BR.properties @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Test\ Result=Resultado de Teste +Show\ all\ failed\ tests= diff --git a/core/src/main/resources/hudson/tasks/test/AggregatedTestResultPublisher/TestResultAction/index_pt_BR.properties b/core/src/main/resources/hudson/tasks/test/AggregatedTestResultPublisher/TestResultAction/index_pt_BR.properties new file mode 100644 index 0000000000..5f18cfaf12 --- /dev/null +++ b/core/src/main/resources/hudson/tasks/test/AggregatedTestResultPublisher/TestResultAction/index_pt_BR.properties @@ -0,0 +1,30 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +N/A= +Fingerprinting\ not\ enabled\ on\ this\ build.\ Test\ aggregation\ requires\ fingerprinting.= +test\ result\ not\ available= +last\ successful\ job\ is\ not\ fingerprinted= +Test= +Total= +Drill\ Down= +Fail=Falha diff --git a/core/src/main/resources/hudson/tasks/test/Messages_pt_BR.properties b/core/src/main/resources/hudson/tasks/test/Messages_pt_BR.properties index 51eb6a8f96..deef13dc26 100644 --- a/core/src/main/resources/hudson/tasks/test/Messages_pt_BR.properties +++ b/core/src/main/resources/hudson/tasks/test/Messages_pt_BR.properties @@ -24,3 +24,18 @@ AbstractTestResultAction.getDisplayName=Resultado de Testes #AbstractTestResultAction.failure=failure #AbstractTestResultAction.skip=skip #AbstractTestResultAction.test=test +# Aggregate downstream test results +AggregatedTestResultPublisher.DisplayName= +# Aggregated Test Result +AggregatedTestResultPublisher.Title= +# {0} {0,choice,0#tests|1#test|1Check if your polling is \ +# hanging, and/or increase the number of threads if necessary. +blurb=\ +# Estes usu\u00E1rios podem se logar no Hudson. Este \u00E9 um super conjunto desta lista, \ diff --git a/core/src/main/resources/hudson/triggers/SCMTrigger/DescriptorImpl/index_pt_BR.properties b/core/src/main/resources/hudson/triggers/SCMTrigger/DescriptorImpl/index_pt_BR.properties new file mode 100644 index 0000000000..852fabd843 --- /dev/null +++ b/core/src/main/resources/hudson/triggers/SCMTrigger/DescriptorImpl/index_pt_BR.properties @@ -0,0 +1,31 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Current\ SCM\ Polling\ Activities= +No\ polling\ activity\ is\ in\ progress.= +The\ following\ polling\ activities\ are\ currently\ in\ progress\:= +# There are more SCM polling activities scheduled than handled, so \ +# the threads are not keeping up with the demands. Check if your polling is \ +# hanging, and/or increase the number of threads if necessary. +clogged= +Running\ for= +Project=Projeto diff --git a/core/src/main/resources/hudson/util/AWTProblem/index_pt_BR.properties b/core/src/main/resources/hudson/util/AWTProblem/index_pt_BR.properties new file mode 100644 index 0000000000..00d6ee0c0c --- /dev/null +++ b/core/src/main/resources/hudson/util/AWTProblem/index_pt_BR.properties @@ -0,0 +1,25 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +# AWT is not properly configured on this server. Perhaps you need to run your container with "-Djava.awt.headless=true"? +errorMessage= +Error=Erro diff --git a/core/src/main/resources/hudson/util/AdministrativeError/message_pt_BR.properties b/core/src/main/resources/hudson/util/AdministrativeError/message_pt_BR.properties new file mode 100644 index 0000000000..26f389b1c0 --- /dev/null +++ b/core/src/main/resources/hudson/util/AdministrativeError/message_pt_BR.properties @@ -0,0 +1,23 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +See\ the\ log\ for\ more\ details= diff --git a/core/src/main/resources/hudson/util/DoubleLaunchChecker/index_pt_BR.properties b/core/src/main/resources/hudson/util/DoubleLaunchChecker/index_pt_BR.properties index bc786c4844..3d567e99d3 100644 --- a/core/src/main/resources/hudson/util/DoubleLaunchChecker/index_pt_BR.properties +++ b/core/src/main/resources/hudson/util/DoubleLaunchChecker/index_pt_BR.properties @@ -28,3 +28,5 @@ message=\ comportamentos estranhos, ent\u00E3o por favor corrija a situa\u00E7\u00E3o. This\ Hudson=Este Hudson Other\ Hudson=Outro Hudson +# Ignore this problem and keep using Hudson anyway +label= diff --git a/core/src/main/resources/hudson/util/HudsonIsRestarting/index_pt_BR.properties b/core/src/main/resources/hudson/util/HudsonIsRestarting/index_pt_BR.properties new file mode 100644 index 0000000000..61b30e7545 --- /dev/null +++ b/core/src/main/resources/hudson/util/HudsonIsRestarting/index_pt_BR.properties @@ -0,0 +1,24 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Please\ wait\ while\ Hudson\ is\ restarting= +Your\ browser\ will\ reload\ automatically\ when\ Hudson\ is\ ready.=Seu browser recarregar\u00E1 automaticamente quando o Hudson estiver pronto. diff --git a/core/src/main/resources/hudson/util/IncompatibleVMDetected/index_pt_BR.properties b/core/src/main/resources/hudson/util/IncompatibleVMDetected/index_pt_BR.properties new file mode 100644 index 0000000000..b26121ce15 --- /dev/null +++ b/core/src/main/resources/hudson/util/IncompatibleVMDetected/index_pt_BR.properties @@ -0,0 +1,33 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +VM\ Name= +Detected\ JVM= +# \ +# We detected that your JVM is not supported by Hudson. \ +# This is due to the limitation is one of the libraries that Hudson uses, namely XStream. \ +# See this FAQ for more details. +errorMessage= +Version= +Vendor= +Error=Erro +OS\ Name= diff --git a/core/src/main/resources/hudson/util/InsufficientPermissionDetected/index_pt_BR.properties b/core/src/main/resources/hudson/util/InsufficientPermissionDetected/index_pt_BR.properties new file mode 100644 index 0000000000..1f4700fabf --- /dev/null +++ b/core/src/main/resources/hudson/util/InsufficientPermissionDetected/index_pt_BR.properties @@ -0,0 +1,36 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +# \ +# We detected that Hudson does not have sufficient permission to run, \ +# as indicated by the stack trace below. Most likely cause of this \ +# problem is that the security manger is on. If that was intended, \ +# you need to grant sufficient permissions for Hudson to run. Otherwise, \ +# or if you have no idea what a security manager is, then the easiest \ +# way to fix the problem is simply to turn the security manager off. +errorMessage.1= +Error=Erro +# \ +# For how to turn off security manager in your container, refer to \ +# \ +# Container-specific documentations of Hudson. +errorMessage.2= diff --git a/core/src/main/resources/hudson/util/JNADoublyLoaded/index_pt_BR.properties b/core/src/main/resources/hudson/util/JNADoublyLoaded/index_pt_BR.properties new file mode 100644 index 0000000000..5644c18ac6 --- /dev/null +++ b/core/src/main/resources/hudson/util/JNADoublyLoaded/index_pt_BR.properties @@ -0,0 +1,27 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Failed\ to\ load\ JNA= +# Another instance of JNA is already loaded in another classloader, thereby making it impossible for Hudson \ +# to load its own copy. See Wiki for more details. +blurb=\ +# Estes usu\u00E1rios podem se logar no Hudson. Este \u00E9 um super conjunto desta lista, \ diff --git a/core/src/main/resources/hudson/util/Messages_pt_BR.properties b/core/src/main/resources/hudson/util/Messages_pt_BR.properties new file mode 100644 index 0000000000..7f9d31e2bd --- /dev/null +++ b/core/src/main/resources/hudson/util/Messages_pt_BR.properties @@ -0,0 +1,30 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +# Failed to check +ClockDifference.Failed= +# \ ahead +ClockDifference.Ahead= +# In sync +ClockDifference.InSync= +# \ behind +ClockDifference.Behind= diff --git a/core/src/main/resources/hudson/util/NoHomeDir/index_pt_BR.properties b/core/src/main/resources/hudson/util/NoHomeDir/index_pt_BR.properties new file mode 100644 index 0000000000..b5eed24736 --- /dev/null +++ b/core/src/main/resources/hudson/util/NoHomeDir/index_pt_BR.properties @@ -0,0 +1,32 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +# \ +# Unable to create the home directory '{0}'. This is most likely a permission problem. +errorMessage.1= +Error=Erro +# \ +# To change the home directory, use HUDSON_HOME environment variable or set the \ +# HUDSON_HOME system property. \ +# See Container-specific documentation \ +# for more details of how to do this. +errorMessage.2= diff --git a/core/src/main/resources/hudson/views/LastStableColumn/columnHeader_pt_BR.properties b/core/src/main/resources/hudson/views/LastStableColumn/columnHeader_pt_BR.properties new file mode 100644 index 0000000000..b795e663af --- /dev/null +++ b/core/src/main/resources/hudson/views/LastStableColumn/columnHeader_pt_BR.properties @@ -0,0 +1,23 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Last\ Stable= diff --git a/core/src/main/resources/hudson/views/LastStableColumn/column_pt_BR.properties b/core/src/main/resources/hudson/views/LastStableColumn/column_pt_BR.properties new file mode 100644 index 0000000000..39762721b1 --- /dev/null +++ b/core/src/main/resources/hudson/views/LastStableColumn/column_pt_BR.properties @@ -0,0 +1,23 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +N/A= diff --git a/core/src/main/resources/hudson/views/Messages_pt_BR.properties b/core/src/main/resources/hudson/views/Messages_pt_BR.properties new file mode 100644 index 0000000000..7671af3d70 --- /dev/null +++ b/core/src/main/resources/hudson/views/Messages_pt_BR.properties @@ -0,0 +1,38 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +# Last Duration +LastDurationColumn.DisplayName= +# Status +StatusColumn.DisplayName= +# Build Button +BuildButtonColumn.DisplayName= +# Weather +WeatherColumn.DisplayName= +# Last Success +LastSuccessColumn.DisplayName= +# Last Failure +LastFailureColumn.DisplayName= +# Last Stable +LastStableColumn.DisplayName= +# Job +JobColumn.DisplayName= diff --git a/core/src/main/resources/hudson/widgets/BuildHistoryWidget/entries_pt_BR.properties b/core/src/main/resources/hudson/widgets/BuildHistoryWidget/entries_pt_BR.properties new file mode 100644 index 0000000000..3ca04aaf27 --- /dev/null +++ b/core/src/main/resources/hudson/widgets/BuildHistoryWidget/entries_pt_BR.properties @@ -0,0 +1,24 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +pending= +cancel\ this\ build= diff --git a/core/src/main/resources/lib/form/booleanRadio_pt_BR.properties b/core/src/main/resources/lib/form/booleanRadio_pt_BR.properties new file mode 100644 index 0000000000..ad2ab9d580 --- /dev/null +++ b/core/src/main/resources/lib/form/booleanRadio_pt_BR.properties @@ -0,0 +1,24 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Yes=Sim +No= diff --git a/core/src/main/resources/lib/form/expandableTextbox_pt_BR.properties b/core/src/main/resources/lib/form/expandableTextbox_pt_BR.properties new file mode 100644 index 0000000000..c3eaae4d45 --- /dev/null +++ b/core/src/main/resources/lib/form/expandableTextbox_pt_BR.properties @@ -0,0 +1,26 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +# \ +# Click to expand to multiple lines
where you can use new lines instead of space.
\ +# To revert back to single line, write everything in one line then submit. +tooltip= diff --git a/core/src/main/resources/lib/form/helpArea_pt_BR.properties b/core/src/main/resources/lib/form/helpArea_pt_BR.properties new file mode 100644 index 0000000000..987f260096 --- /dev/null +++ b/core/src/main/resources/lib/form/helpArea_pt_BR.properties @@ -0,0 +1,23 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Loading...= diff --git a/core/src/main/resources/lib/form/hetero-list_pt_BR.properties b/core/src/main/resources/lib/form/hetero-list_pt_BR.properties new file mode 100644 index 0000000000..a9e7108ebd --- /dev/null +++ b/core/src/main/resources/lib/form/hetero-list_pt_BR.properties @@ -0,0 +1,23 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Add=Adicionar diff --git a/core/src/main/resources/lib/form/slave-mode_pt_BR.properties b/core/src/main/resources/lib/form/slave-mode_pt_BR.properties new file mode 100644 index 0000000000..a39a87f1de --- /dev/null +++ b/core/src/main/resources/lib/form/slave-mode_pt_BR.properties @@ -0,0 +1,23 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Usage=Utilisation diff --git a/core/src/main/resources/lib/hudson/artifactList_pt_BR.properties b/core/src/main/resources/lib/hudson/artifactList_pt_BR.properties new file mode 100644 index 0000000000..3b1ba141f7 --- /dev/null +++ b/core/src/main/resources/lib/hudson/artifactList_pt_BR.properties @@ -0,0 +1,23 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +View= diff --git a/core/src/main/resources/lib/hudson/buildListTable_pt_BR.properties b/core/src/main/resources/lib/hudson/buildListTable_pt_BR.properties index c057b3f1d4..55dcd57a49 100644 --- a/core/src/main/resources/lib/hudson/buildListTable_pt_BR.properties +++ b/core/src/main/resources/lib/hudson/buildListTable_pt_BR.properties @@ -22,3 +22,5 @@ Date=Data Status=Estado +Build= +Console\ output= diff --git a/core/src/main/resources/lib/hudson/executors_pt_BR.properties b/core/src/main/resources/lib/hudson/executors_pt_BR.properties index ee7037b432..580db2ceca 100644 --- a/core/src/main/resources/lib/hudson/executors_pt_BR.properties +++ b/core/src/main/resources/lib/hudson/executors_pt_BR.properties @@ -28,3 +28,6 @@ Dead=Morto Idle=Dispon\u00EDvel Building=Construindo terminate\ this\ build=terminar esta constru\u00E7\u00E3o +Unknown\ Task= +suspended= +Offline= diff --git a/core/src/main/resources/lib/hudson/newFromList/form_pt_BR.properties b/core/src/main/resources/lib/hudson/newFromList/form_pt_BR.properties new file mode 100644 index 0000000000..071b341f27 --- /dev/null +++ b/core/src/main/resources/lib/hudson/newFromList/form_pt_BR.properties @@ -0,0 +1,23 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Copy\ from=Copiar de diff --git a/core/src/main/resources/lib/hudson/project/config-blockWhenUpstreamBuilding_pt_BR.properties b/core/src/main/resources/lib/hudson/project/config-blockWhenUpstreamBuilding_pt_BR.properties new file mode 100644 index 0000000000..1296d9532d --- /dev/null +++ b/core/src/main/resources/lib/hudson/project/config-blockWhenUpstreamBuilding_pt_BR.properties @@ -0,0 +1,23 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Block\ build\ when\ upstream\ project\ is\ building= diff --git a/core/src/main/resources/lib/hudson/project/config-builders_pt_BR.properties b/core/src/main/resources/lib/hudson/project/config-builders_pt_BR.properties index e9a07994b5..8a7f4ba1bd 100644 --- a/core/src/main/resources/lib/hudson/project/config-builders_pt_BR.properties +++ b/core/src/main/resources/lib/hudson/project/config-builders_pt_BR.properties @@ -21,3 +21,4 @@ # THE SOFTWARE. Build=Constru\u00E7\u00E3o +Add\ build\ step= diff --git a/core/src/main/resources/lib/hudson/project/config-retryCount_pt_BR.properties b/core/src/main/resources/lib/hudson/project/config-retryCount_pt_BR.properties index eab05d77f4..7a11aeeb85 100644 --- a/core/src/main/resources/lib/hudson/project/config-retryCount_pt_BR.properties +++ b/core/src/main/resources/lib/hudson/project/config-retryCount_pt_BR.properties @@ -22,4 +22,4 @@ Retry\ Count= -Number\ of\ Retrys\ needed\ if\ checkout\ fails= +SCM\ checkout\ retry\ count= diff --git a/core/src/main/resources/lib/hudson/project/config-upstream-pseudo-trigger_pt_BR.properties b/core/src/main/resources/lib/hudson/project/config-upstream-pseudo-trigger_pt_BR.properties index cbbc2ee37c..3e4246dd64 100644 --- a/core/src/main/resources/lib/hudson/project/config-upstream-pseudo-trigger_pt_BR.properties +++ b/core/src/main/resources/lib/hudson/project/config-upstream-pseudo-trigger_pt_BR.properties @@ -22,4 +22,5 @@ Build\ after\ other\ projects\ are\ built=Construir ap\u00F3s os outros projetos serem constru\u00EDdos Projects\ names=Nomes dos projetos -Multiple\ projects\ can\ be\ specified\ like\ 'abc,\ def'=Projetos m\u00FAltiplos pode ser especificados como 'abc, def' +Multiple\ projects\ can\ be\ specified\ like\ ''abc,\ def''= +Multiple\ projects\ can\ be\ specified\ like\ 'abc,\ def'= diff --git a/core/src/main/resources/lib/hudson/queue_pt_BR.properties b/core/src/main/resources/lib/hudson/queue_pt_BR.properties index c4f23c4667..bf209c723b 100644 --- a/core/src/main/resources/lib/hudson/queue_pt_BR.properties +++ b/core/src/main/resources/lib/hudson/queue_pt_BR.properties @@ -24,3 +24,4 @@ Build\ Queue=Fila de Constru\u00E7\u00E3o No\ builds\ in\ the\ queue.=Nenhuma constru\u00E7\u00E3o na fila. Hudson\ is\ going\ to\ shut\ down.\ No\ further\ builds\ will\ be\ performed.=Hudson est\u00E1 sendo desligado. Nenhuma constru\u00E7\u00E3o futura ser\u00E1 executada. cancel=cancelar +Unknown\ Task= diff --git a/core/src/main/resources/lib/hudson/scriptConsole_pt_BR.properties b/core/src/main/resources/lib/hudson/scriptConsole_pt_BR.properties index 2dfc8ecafe..9b13d81e24 100644 --- a/core/src/main/resources/lib/hudson/scriptConsole_pt_BR.properties +++ b/core/src/main/resources/lib/hudson/scriptConsole_pt_BR.properties @@ -23,3 +23,9 @@ Script\ Console=Console de Script Run=Executar Result=Resultado +# \ +# Type in an arbitrary Groovy script and \ +# execute it on the server. Useful for trouble-shooting and diagnostics. \ +# Use the ''println'' command to see the output (if you use System.out, \ +# it will go to the server''s stdout, which is harder to see.) Example: +description= diff --git a/core/src/main/resources/lib/layout/main-panel_pt_BR.properties b/core/src/main/resources/lib/layout/main-panel_pt_BR.properties new file mode 100644 index 0000000000..ed372fa798 --- /dev/null +++ b/core/src/main/resources/lib/layout/main-panel_pt_BR.properties @@ -0,0 +1,23 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Hudson\ is\ going\ to\ shut\ down= diff --git a/core/src/main/resources/lib/test/bar_pt_BR.properties b/core/src/main/resources/lib/test/bar_pt_BR.properties index a5436da880..b3bfe36ca8 100644 --- a/core/src/main/resources/lib/test/bar_pt_BR.properties +++ b/core/src/main/resources/lib/test/bar_pt_BR.properties @@ -22,4 +22,5 @@ failures={0} falhas skipped={0} n\u00E3o executadas -tests={0} testes \ No newline at end of file +tests={0} testesNo\ tests= +No\ tests= diff --git a/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/actions_pt_BR.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/actions_pt_BR.properties index 7ec708a885..2cdcf7d28e 100644 --- a/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/actions_pt_BR.properties +++ b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/actions_pt_BR.properties @@ -21,3 +21,4 @@ # THE SOFTWARE. Delete\ All\ Disabled\ Modules=Excluir Todo os M\u00F3dulos Desabilitados +Modules=M\u00F3dulos diff --git a/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/configure-entries_pt_BR.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/configure-entries_pt_BR.properties index 55560f035b..b5fb6dacaa 100644 --- a/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/configure-entries_pt_BR.properties +++ b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/configure-entries_pt_BR.properties @@ -23,6 +23,15 @@ Build=Construir Maven\ Version=Vers\u00E3o do Maven Root\ POM=POM Ra\u00EDz -Goals=Objetivos Build\ modules\ in\ parallel=Construir m\u00F3dulos em paralelo Build\ Settings=Configura\u00E7\u00F5es de Constru\u00E7\u00E3o +Disable\ automatic\ artifact\ archiving= +# Please do so from the system configuration. +Maven\ Version.error.2= +Use\ private\ Maven\ repository= +Incremental\ build\ -\ only\ build\ changed\ modules= +# Hudson needs to know where your Maven2 is installed. +Maven\ Version.error.1= +Goals\ and\ options= +Build\ whenever\ a\ SNAPSHOT\ dependency\ is\ built= +Alternate\ settings\ file= diff --git a/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/global_pt_BR.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/global_pt_BR.properties new file mode 100644 index 0000000000..f214a7b02f --- /dev/null +++ b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/global_pt_BR.properties @@ -0,0 +1,24 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Global\ MAVEN_OPTS= +Maven\ Project\ Configuration= diff --git a/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index_pt_BR.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index_pt_BR.properties index dce159fcba..a10b77c185 100644 --- a/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index_pt_BR.properties +++ b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index_pt_BR.properties @@ -20,11 +20,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Modules=M\u00F3dulos -A\ build\ is\ in\ progress\ to\ parse\ the\ list\ of\ modules\ from\ POM.=Uma constru\u00E7\u00E3o est\u00E1 em progresso para analisar a lista de m\u00F3dulos do POM. -text= Please perform a build so that Hudson can\ - parse the list of modules from POM. -Overview={0}Vis\u00E3o Geral Workspace= Recent\ Changes=Mudan\u00E7as Recentes Latest\ Test\ Result=\u00DAltimo Resultado de Teste +Last\ Successful\ Artifacts=\u00DAltimos Artefatos que obtiveram Sucesso diff --git a/maven-plugin/src/main/resources/hudson/maven/MavenModuleSetBuild/main_pt_BR.properties b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSetBuild/main_pt_BR.properties new file mode 100644 index 0000000000..5bf6f67511 --- /dev/null +++ b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSetBuild/main_pt_BR.properties @@ -0,0 +1,25 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Module\ Builds= +# didn''t run +noRun= diff --git a/maven-plugin/src/main/resources/hudson/maven/Messages_pt_BR.properties b/maven-plugin/src/main/resources/hudson/maven/Messages_pt_BR.properties index f148945d7c..7f77bde635 100644 --- a/maven-plugin/src/main/resources/hudson/maven/Messages_pt_BR.properties +++ b/maven-plugin/src/main/resources/hudson/maven/Messages_pt_BR.properties @@ -33,10 +33,23 @@ MavenModuleSet.DiplayName=Construir um projeto maven2 MavenModuleSetBuild.DiscoveredModule=Descoberto um novo m\u00f3dulo {0} {1} MavenModuleSetBuild.FailedToParsePom=Falhou ao analisar POMs -MavenModuleSetBuild.NoSuchFile=Arquivo {0} n\u00e3o encontrado\nTalvez voc\u00ea precise especificar o correto caminho para o arquivo POM na configura\u00e7\u00e3o do projeto. MavenProbeAction.DisplayName=Monitorar Processo Maven ProcessCache.Reusing=Reusar processos maven existentes ReleaseAction.DisplayName=Disponibilizar Nova Vers\u00e3o +# Kept because {0} is kept +MavenBuild.KeptBecauseOfParent= +# No classworlds*.jar found in {0} -- Is this a valid maven2 directory? +MavenProcessFactory.ClassWorldsNotFound= +# No such file {0}\nPerhaps you need to specify the correct POM file path in the project configuration? +MavenModuleSetBuild.NoSuchPOMFile= +# Deploy to Maven repository +MavenRedeployer.DisplayName= +# Deploy artifacts to Maven repository +RedeployPublisher.getDisplayName= +# A Maven installation needs to be available for this project to be built.\nEither your server has no Maven installations defined, or the requested Maven version does not exist. +MavenModuleSetBuild.NoMavenInstall= +# No such settings file {0} exists\nPlease verify that your alternate settings file is specified properly and exists in the workspace. +MavenModuleSetBuild.NoSuchAlternateSettings= diff --git a/maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/config_pt_BR.properties b/maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/config_pt_BR.properties index 4a6ade9073..b42016234e 100644 --- a/maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/config_pt_BR.properties +++ b/maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/config_pt_BR.properties @@ -21,3 +21,6 @@ # THE SOFTWARE. Repository\ URL=URL do reposit\u00F3rio +Deploy\ even\ if\ the\ build\ is\ unstable= +Repository\ ID= +Assign\ unique\ versions\ to\ snapshots= diff --git a/maven-plugin/src/main/resources/hudson/maven/reporters/MavenAbstractArtifactRecord/badge_pt_BR.properties b/maven-plugin/src/main/resources/hudson/maven/reporters/MavenAbstractArtifactRecord/badge_pt_BR.properties new file mode 100644 index 0000000000..d22b386434 --- /dev/null +++ b/maven-plugin/src/main/resources/hudson/maven/reporters/MavenAbstractArtifactRecord/badge_pt_BR.properties @@ -0,0 +1,23 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Deployed\ to\ repository= diff --git a/maven-plugin/src/main/resources/hudson/maven/reporters/MavenAbstractArtifactRecord/index_pt_BR.properties b/maven-plugin/src/main/resources/hudson/maven/reporters/MavenAbstractArtifactRecord/index_pt_BR.properties new file mode 100644 index 0000000000..db0d12ba96 --- /dev/null +++ b/maven-plugin/src/main/resources/hudson/maven/reporters/MavenAbstractArtifactRecord/index_pt_BR.properties @@ -0,0 +1,25 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Redeploy\ Artifacts= +This\ page\ allows\ you\ to\ redeploy\ the\ build\ artifacts\ to\ a\ repository\ after\ the\ fact.= +OK= diff --git a/maven-plugin/src/main/resources/hudson/maven/reporters/Messages_pt_BR.properties b/maven-plugin/src/main/resources/hudson/maven/reporters/Messages_pt_BR.properties index 61778747a8..30985216bc 100644 --- a/maven-plugin/src/main/resources/hudson/maven/reporters/Messages_pt_BR.properties +++ b/maven-plugin/src/main/resources/hudson/maven/reporters/Messages_pt_BR.properties @@ -33,4 +33,13 @@ ReportCollector.DisplayName=Gravar relat\u00F3rios Maven ReportCollector.OutsideSite=Sa\u00EDda do relat\u00F3rio Maven vai para {0}, que \u00E9 fora do caminho de relat\u00F3rio do projeto {1} SurefireArchiver.DisplayName=Publicar relat\u00F3rios Surefire SurefireArchiver.NoReportsDir=Incapaz de obter reportsDirectory do surefire:test mojo -SurefireArchiver.Recording=[HUDSON] Gravando resultados de teste \ No newline at end of file +SurefireArchiver.Recording=[HUDSON] Gravando resultados de teste# Deploying the attached artifact {0} +MavenArtifact.DeployingAttachedArtifact= +# Maven-generated site +MavenSiteArchiver.DisplayName= +# Redeploy Artifacts +MavenAbstractArtifactRecord.Displayname= +# Deploying the main artifact {0} +MavenArtifact.DeployingMainArtifact= +# Deployment History +HistoryWidgetImpl.Displayname= -- GitLab From 72409d8d95943fe590fc866d1d5a71f095fd8a72 Mon Sep 17 00:00:00 2001 From: mindless Date: Mon, 12 Jul 2010 21:09:42 +0000 Subject: [PATCH 013/336] times shown in timeline popup bubbles are timezone converted, so remove the "GMT" always shown here, as it is incorrect for those not in GMT. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@32803 71c3de6d-444a-0410-be80-ed276b4c234a --- core/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/pom.xml b/core/pom.xml index 7f0beb8de8..3c2414b9e6 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -371,7 +371,7 @@ THE SOFTWARE. org.kohsuke.stapler stapler-adjunct-timeline - 1.1 + 1.2 org.kohsuke.stapler -- GitLab From 24408ed660d3e36fa9e31fec93d6d767042e77d7 Mon Sep 17 00:00:00 2001 From: mindless Date: Mon, 12 Jul 2010 22:26:04 +0000 Subject: [PATCH 014/336] [FIXED HUDSON-6649] doQuietDown was sychronized, so safeRestart (calling doQuietDown in blocking mode since 1.361) was locking Hudson object until all jobs complete! Now synchronize just to set isQuietingDown flag, but not while blocking. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@32805 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/model/Hudson.java | 31 ++++++--------------- 1 file changed, 9 insertions(+), 22 deletions(-) diff --git a/core/src/main/java/hudson/model/Hudson.java b/core/src/main/java/hudson/model/Hudson.java index e171aa16ba..245b6e805c 100644 --- a/core/src/main/java/hudson/model/Hudson.java +++ b/core/src/main/java/hudson/model/Hudson.java @@ -2473,32 +2473,19 @@ public final class Hudson extends Node implements ItemGroup, Stapl } @CLIMethod(name="quiet-down") - public synchronized HttpRedirect doQuietDown( + public HttpRedirect doQuietDown( @Option(name="-block",usage="Block until the system really quiets down and no builds are running") @QueryParameter boolean block, @Option(name="-timeout",usage="If non-zero, only block up to the specified number of milliseconds") @QueryParameter int timeout) throws InterruptedException { - checkPermission(ADMINISTER); - isQuietingDown = true; + synchronized (this) { + checkPermission(ADMINISTER); + isQuietingDown = true; + } if (block) { - LOGGER.info("Entering the blocking quiet down mode"); - long start = System.currentTimeMillis(); - int cnt=0; - while (true) { - if (!isQuietingDown) { - LOGGER.info("Quiet mode cancelled"); - break; - } - if (overallLoad.computeTotalExecutors() <= overallLoad.computeIdleExecutors()) {// should be really == but be defensive - LOGGER.info("System became fully quiet"); - break; - } - if (timeout>0 && start+timeout<=System.currentTimeMillis()) { - LOGGER.info("Quiet mode time out after "+timeout+"ms"); - break; - } - + if (timeout > 0) timeout += System.currentTimeMillis(); + while (isQuietingDown + && (overallLoad.computeTotalExecutors() > overallLoad.computeIdleExecutors()) + && (timeout <= 0 || System.currentTimeMillis() < timeout)) { Thread.sleep(1000); - if (((cnt++)%60)==0) - LOGGER.info("Waiting for all the jobs to finish. Total="+overallLoad.computeTotalExecutors()+" idle="+overallLoad.computeIdleExecutors()); } } return new HttpRedirect("."); -- GitLab From 45721b0e994b1812a11e5b8772c2cfc8818fff3e Mon Sep 17 00:00:00 2001 From: kohsuke Date: Mon, 12 Jul 2010 23:50:27 +0000 Subject: [PATCH 015/336] Remember the current CLICommand that's being executed. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@32817 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/cli/CLICommand.java | 15 +++++++++++++++ core/src/main/java/hudson/cli/CliManagerImpl.java | 8 ++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/hudson/cli/CLICommand.java b/core/src/main/java/hudson/cli/CLICommand.java index b24d783b7a..a0ea2fbde5 100644 --- a/core/src/main/java/hudson/cli/CLICommand.java +++ b/core/src/main/java/hudson/cli/CLICommand.java @@ -334,4 +334,19 @@ public abstract class CLICommand implements ExtensionPoint, Cloneable { * which captures the identity of the client given by the transport layer. */ public static final ChannelProperty TRANSPORT_AUTHENTICATION = new ChannelProperty(Authentication.class,"transportAuthentication"); + + private static final ThreadLocal CURRENT_COMMAND = new ThreadLocal(); + + /*package*/ static CLICommand setCurrent(CLICommand cmd) { + CLICommand old = getCurrent(); + CURRENT_COMMAND.set(cmd); + return old; + } + + /** + * If the calling thread is in the middle of executing a CLI command, return it. Otherwise null. + */ + public static CLICommand getCurrent() { + return CURRENT_COMMAND.get(); + } } diff --git a/core/src/main/java/hudson/cli/CliManagerImpl.java b/core/src/main/java/hudson/cli/CliManagerImpl.java index 17f2d73fd4..f9b4fdcdad 100644 --- a/core/src/main/java/hudson/cli/CliManagerImpl.java +++ b/core/src/main/java/hudson/cli/CliManagerImpl.java @@ -63,8 +63,12 @@ public class CliManagerImpl implements CliEntryPoint, Serializable { String subCmd = args.get(0); CLICommand cmd = CLICommand.clone(subCmd); if(cmd!=null) { - // execute the command, do so with the originator of the request as the principal - return cmd.main(args.subList(1,args.size()),locale, stdin, out, err); + final CLICommand old = CLICommand.setCurrent(cmd); + try { + return cmd.main(args.subList(1,args.size()),locale, stdin, out, err); + } finally { + CLICommand.setCurrent(old); + } } err.println("No such command: "+subCmd); -- GitLab From 8320dbd2a8c06e84c0b1e0d15e0c7b376d73586b Mon Sep 17 00:00:00 2001 From: kohsuke Date: Tue, 13 Jul 2010 00:04:24 +0000 Subject: [PATCH 016/336] Merged revisions 32677,32679,32683 via svnmerge from https://svn.dev.java.net/svn/hudson/branches/rc ........ r32677 | kohsuke | 2010-07-09 19:11:20 -0700 (Fri, 09 Jul 2010) | 1 line [maven-release-plugin] prepare release hudson-1_366 ........ r32679 | kohsuke | 2010-07-09 19:11:35 -0700 (Fri, 09 Jul 2010) | 1 line [maven-release-plugin] prepare for next development iteration ........ r32683 | kohsuke | 2010-07-09 20:07:10 -0700 (Fri, 09 Jul 2010) | 1 line updated changelog as a part of the release ........ git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@32821 71c3de6d-444a-0410-be80-ed276b4c234a --- cli/pom.xml | 2 +- core/pom.xml | 2 +- debian/debian/changelog | 6 ++++++ maven-agent/pom.xml | 2 +- maven-interceptor/pom.xml | 2 +- maven-plugin/pom.xml | 2 +- pom.xml | 2 +- remoting/pom.xml | 2 +- test/pom.xml | 2 +- ui-samples-plugin/pom.xml | 2 +- war/pom.xml | 2 +- 11 files changed, 16 insertions(+), 10 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index 9cffa646c4..2576355b17 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -4,7 +4,7 @@ pom org.jvnet.hudson.main - 1.366-SNAPSHOT + 1.367-SNAPSHOT cli Hudson CLI diff --git a/core/pom.xml b/core/pom.xml index 3c2414b9e6..a413aa47c0 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.366-SNAPSHOT + 1.367-SNAPSHOT ../pom.xml diff --git a/debian/debian/changelog b/debian/debian/changelog index 527c5e7991..4ff355c45c 100644 --- a/debian/debian/changelog +++ b/debian/debian/changelog @@ -1,3 +1,9 @@ +hudson (1.366) unstable; urgency=low + + * See http://hudson.dev.java.net/changelog.html for more details. + + -- Kohsuke Kawaguchi Fri, 09 Jul 2010 20:04:07 -0700 + hudson (1.365) unstable; urgency=low * See http://hudson.dev.java.net/changelog.html for more details. diff --git a/maven-agent/pom.xml b/maven-agent/pom.xml index 99e90e6f5d..f4b15dd1f2 100644 --- a/maven-agent/pom.xml +++ b/maven-agent/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.366-SNAPSHOT + 1.367-SNAPSHOT ../pom.xml diff --git a/maven-interceptor/pom.xml b/maven-interceptor/pom.xml index 680bb9aae2..abee1d6b99 100644 --- a/maven-interceptor/pom.xml +++ b/maven-interceptor/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.366-SNAPSHOT + 1.367-SNAPSHOT ../pom.xml diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 49ac886873..88aff653c7 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.366-SNAPSHOT + 1.367-SNAPSHOT maven-plugin diff --git a/pom.xml b/pom.xml index c8622ce661..b9a2992a3d 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.366-SNAPSHOT + 1.367-SNAPSHOT pom Hudson main module diff --git a/remoting/pom.xml b/remoting/pom.xml index ba8f5b1821..279e07a168 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.366-SNAPSHOT + 1.367-SNAPSHOT ../pom.xml diff --git a/test/pom.xml b/test/pom.xml index e4be5d724b..d3808f341f 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. pom org.jvnet.hudson.main - 1.366-SNAPSHOT + 1.367-SNAPSHOT 4.0.0 org.jvnet.hudson.main diff --git a/ui-samples-plugin/pom.xml b/ui-samples-plugin/pom.xml index b03e64e7d2..3039240f3b 100644 --- a/ui-samples-plugin/pom.xml +++ b/ui-samples-plugin/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.366-SNAPSHOT + 1.367-SNAPSHOT ui-samples-plugin diff --git a/war/pom.xml b/war/pom.xml index 598e4309e0..612902798e 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.366-SNAPSHOT + 1.367-SNAPSHOT ../pom.xml -- GitLab From 10db7d103a136d6a7c3785e5cbc6b735dfe6238d Mon Sep 17 00:00:00 2001 From: kohsuke Date: Tue, 13 Jul 2010 01:27:28 +0000 Subject: [PATCH 017/336] improving the error diagnostics. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@32826 71c3de6d-444a-0410-be80-ed276b4c234a --- cli/src/main/java/hudson/cli/CLI.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cli/src/main/java/hudson/cli/CLI.java b/cli/src/main/java/hudson/cli/CLI.java index d74c9c5d62..fa62fa5520 100644 --- a/cli/src/main/java/hudson/cli/CLI.java +++ b/cli/src/main/java/hudson/cli/CLI.java @@ -110,7 +110,11 @@ public class CLI { */ private int getCliTcpPort(String url) throws IOException { URLConnection head = new URL(url).openConnection(); - head.connect(); + try { + head.connect(); + } catch (IOException e) { + throw (IOException)new IOException("Failed to connect to "+url).initCause(e); + } String p = head.getHeaderField("X-Hudson-CLI-Port"); if(p==null) return -1; return Integer.parseInt(p); -- GitLab From dca3317d86c1567a0603b7fd6efbed7207f3b03f Mon Sep 17 00:00:00 2001 From: kohsuke Date: Tue, 13 Jul 2010 01:29:15 +0000 Subject: [PATCH 018/336] Added a mechanism to register CLI option handler as an extension point. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@32827 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/cli/CLICommand.java | 22 ++++++++- .../hudson/cli/declarative/CLIRegisterer.java | 3 +- .../declarative/OptionHandlerExtension.java | 47 +++++++++++++++++++ core/src/main/java/hudson/model/Result.java | 43 ++++++++++++++++- 4 files changed, 112 insertions(+), 3 deletions(-) create mode 100644 core/src/main/java/hudson/cli/declarative/OptionHandlerExtension.java diff --git a/core/src/main/java/hudson/cli/CLICommand.java b/core/src/main/java/hudson/cli/CLICommand.java index a0ea2fbde5..46a16da2e9 100644 --- a/core/src/main/java/hudson/cli/CLICommand.java +++ b/core/src/main/java/hudson/cli/CLICommand.java @@ -29,6 +29,7 @@ import hudson.ExtensionList; import hudson.ExtensionPoint; import hudson.cli.declarative.CLIMethod; import hudson.ExtensionPoint.LegacyInstancesAreScopedToHudson; +import hudson.cli.declarative.OptionHandlerExtension; import hudson.model.Hudson; import hudson.remoting.Callable; import hudson.remoting.Channel; @@ -38,14 +39,20 @@ import hudson.security.SecurityRealm; import org.acegisecurity.Authentication; import org.acegisecurity.context.SecurityContext; import org.acegisecurity.context.SecurityContextHolder; +import org.jvnet.hudson.annotation_indexer.Index; +import org.jvnet.hudson.annotation_indexer.Indexed; +import org.jvnet.tiger_types.Types; import org.kohsuke.args4j.ClassParser; import org.kohsuke.args4j.CmdLineException; import org.kohsuke.args4j.CmdLineParser; +import org.kohsuke.args4j.spi.OptionHandler; import java.io.BufferedInputStream; +import java.io.IOError; import java.io.IOException; import java.io.InputStream; import java.io.PrintStream; +import java.lang.reflect.Type; import java.util.List; import java.util.Locale; import java.util.logging.Logger; @@ -158,6 +165,7 @@ public abstract class CLICommand implements ExtensionPoint, Cloneable { this.stderr = stderr; this.locale = locale; this.channel = Channel.current(); + registerOptionHandlers(); CmdLineParser p = new CmdLineParser(this); // add options from the authenticator @@ -308,7 +316,19 @@ public abstract class CLICommand implements ExtensionPoint, Cloneable { } } - + /** + * Auto-discovers {@link OptionHandler}s and add them to the given command line parser. + */ + protected void registerOptionHandlers() { + try { + for (Class c : Index.list(OptionHandlerExtension.class,Hudson.getInstance().pluginManager.uberClassLoader,Class.class)) { + Type t = Types.getBaseClass(c, OptionHandler.class); + CmdLineParser.registerHandler(Types.erasure(Types.getTypeArgument(t,0)), c); + } + } catch (IOException e) { + throw new Error(e); + } + } /** * Returns all the registered {@link CLICommand}s. diff --git a/core/src/main/java/hudson/cli/declarative/CLIRegisterer.java b/core/src/main/java/hudson/cli/declarative/CLIRegisterer.java index 495d31c801..67e3397645 100644 --- a/core/src/main/java/hudson/cli/declarative/CLIRegisterer.java +++ b/core/src/main/java/hudson/cli/declarative/CLIRegisterer.java @@ -112,7 +112,8 @@ public class CLIRegisterer extends ExtensionFinder { this.stderr = stderr; this.locale = locale; this.channel = Channel.current(); - + + registerOptionHandlers(); CmdLineParser parser = new CmdLineParser(null); try { SecurityContext sc = SecurityContextHolder.getContext(); diff --git a/core/src/main/java/hudson/cli/declarative/OptionHandlerExtension.java b/core/src/main/java/hudson/cli/declarative/OptionHandlerExtension.java new file mode 100644 index 0000000000..b7a18e305b --- /dev/null +++ b/core/src/main/java/hudson/cli/declarative/OptionHandlerExtension.java @@ -0,0 +1,47 @@ +/* + * The MIT License + * + * Copyright (c) 2010, InfraDNA, Inc. + * + * 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. + */ + +package hudson.cli.declarative; + +import org.jvnet.hudson.annotation_indexer.Indexed; +import org.kohsuke.args4j.spi.OptionHandler; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +/** + * {@link OptionHandler}s that should be auto-discovered. + * + * @author Kohsuke Kawaguchi + */ +@Indexed +@Retention(RUNTIME) +@Target({TYPE}) +@Documented +public @interface OptionHandlerExtension { +} diff --git a/core/src/main/java/hudson/model/Result.java b/core/src/main/java/hudson/model/Result.java index 81a8bf2513..9349114b02 100644 --- a/core/src/main/java/hudson/model/Result.java +++ b/core/src/main/java/hudson/model/Result.java @@ -25,9 +25,20 @@ package hudson.model; import com.thoughtworks.xstream.converters.SingleValueConverter; import com.thoughtworks.xstream.converters.basic.AbstractSingleValueConverter; +import hudson.Extension; +import hudson.cli.declarative.OptionHandlerExtension; +import hudson.util.EditDistance; +import org.kohsuke.args4j.CmdLineException; +import org.kohsuke.args4j.CmdLineParser; +import org.kohsuke.args4j.OptionDef; +import org.kohsuke.args4j.spi.*; import org.kohsuke.stapler.export.CustomExportedBean; import java.io.Serializable; +import java.net.URI; +import java.net.URISyntaxException; +import java.util.ArrayList; +import java.util.List; /** * The build outcome. @@ -116,11 +127,18 @@ public final class Result implements Serializable, CustomExportedBean { public static Result fromString(String s) { for (Result r : all) - if (s.equals(r.name)) + if (s.equalsIgnoreCase(r.name)) return r; return FAILURE; } + private static List getNames() { + List l = new ArrayList(); + for (Result r : all) + l.add(r.name); + return l; + } + // Maintain each Result as a singleton deserialized (like build result from a slave node) private Object readResolve() { for (Result r : all) @@ -142,4 +160,27 @@ public final class Result implements Serializable, CustomExportedBean { return Result.fromString(s); } }; + + @OptionHandlerExtension + public static final class OptionHandlerImpl extends OptionHandler { + public OptionHandlerImpl(CmdLineParser parser, OptionDef option, Setter setter) { + super(parser, option, setter); + } + + @Override + public int parseArguments(Parameters params) throws CmdLineException { + String param = params.getParameter(0); + Result v = fromString(param.replace('-', '_')); + if (v==null) + throw new CmdLineException(owner,"No such status '"+param+"'. Did you mean "+ + EditDistance.findNearest(param.replace('-', '_').toUpperCase(), getNames())); + setter.addValue(v); + return 1; + } + + @Override + public String getDefaultMetaVariable() { + return "STATUS"; + } + } } -- GitLab From 54f73722793dfa7df200aaad515c305d1eb9cd1c Mon Sep 17 00:00:00 2001 From: kohsuke Date: Tue, 13 Jul 2010 01:30:45 +0000 Subject: [PATCH 019/336] Added a CLI command that can be used from inside a build to set the build status. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@32828 71c3de6d-444a-0410-be80-ed276b4c234a --- .../java/hudson/cli/CommandDuringBuild.java | 82 +++++++++++++++++++ .../hudson/cli/SetBuildResultCommand.java | 51 ++++++++++++ 2 files changed, 133 insertions(+) create mode 100644 core/src/main/java/hudson/cli/CommandDuringBuild.java create mode 100644 core/src/main/java/hudson/cli/SetBuildResultCommand.java diff --git a/core/src/main/java/hudson/cli/CommandDuringBuild.java b/core/src/main/java/hudson/cli/CommandDuringBuild.java new file mode 100644 index 0000000000..75542aeacd --- /dev/null +++ b/core/src/main/java/hudson/cli/CommandDuringBuild.java @@ -0,0 +1,82 @@ +/* + * The MIT License + * + * Copyright (c) 2010, InfraDNA, Inc. + * + * 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. + */ + +package hudson.cli; + +import hudson.model.Hudson; +import hudson.model.Job; +import hudson.model.Run; +import hudson.remoting.Callable; +import org.kohsuke.args4j.CmdLineException; + +import java.io.IOException; + +/** + * Base class for those commands that are valid only during a build. + * + * @author Kohsuke Kawaguchi + */ +public abstract class CommandDuringBuild extends CLICommand { + /** + * This method makes sense only when called from within the build kicked by Hudson. + * We use the environment variables that Hudson sets to determine the build that is being run. + */ + protected Run getCurrentlyBuilding() throws CmdLineException { + try { + CLICommand c = CLICommand.getCurrent(); + if (c==null) throw new IllegalStateException("Not executing a CLI command"); + String[] envs = c.channel.call(new GetCharacteristicEnvironmentVariables()); + + if (envs[0]==null || envs[1]==null) + throw new CmdLineException("This CLI command works only when invoked from inside a build"); + + Job j = Hudson.getInstance().getItemByFullName(envs[0],Job.class); + if (j==null) throw new CmdLineException("No such job: "+envs[0]); + + try { + Run r = j.getBuildByNumber(Integer.parseInt(envs[1])); + if (r==null) throw new CmdLineException("No such build #"+envs[1]+" in "+envs[0]); + return r; + } catch (NumberFormatException e) { + throw new CmdLineException("Invalid build number: "+envs[1]); + } + } catch (IOException e) { + throw new CmdLineException("Failed to identify the build being executed",e); + } catch (InterruptedException e) { + throw new CmdLineException("Failed to identify the build being executed",e); + } + } + + /** + * Gets the environment variables that points to the build being executed. + */ + private static final class GetCharacteristicEnvironmentVariables implements Callable { + public String[] call() throws IOException { + return new String[] { + System.getenv("JOB_NAME"), + System.getenv("BUILD_NUMBER") + }; + } + } +} diff --git a/core/src/main/java/hudson/cli/SetBuildResultCommand.java b/core/src/main/java/hudson/cli/SetBuildResultCommand.java new file mode 100644 index 0000000000..ac3d024976 --- /dev/null +++ b/core/src/main/java/hudson/cli/SetBuildResultCommand.java @@ -0,0 +1,51 @@ +/* + * The MIT License + * + * Copyright (c) 2010, InfraDNA, Inc. + * + * 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. + */ + +package hudson.cli; + +import hudson.Extension; +import hudson.model.Result; +import org.kohsuke.args4j.Argument; + +/** + * Sets the result of the current build. Works only if invoked from within a build. + * + * @author Kohsuke Kawaguchi + */ +@Extension +public class SetBuildResultCommand extends CommandDuringBuild { + @Argument(metaVar="RESULT",required=true) + public Result result; + + @Override + public String getShortDescription() { + return "Sets the result of the current build. Works only if invoked from within a build."; + } + + @Override + protected int run() throws Exception { + getCurrentlyBuilding().setResult(result); + return 0; + } +} -- GitLab From faeaf6cb552358b326db14ecb3450edc4e9fd0ec Mon Sep 17 00:00:00 2001 From: mindless Date: Tue, 13 Jul 2010 15:42:31 +0000 Subject: [PATCH 020/336] remove float:right for Manage/Dismiss buttons. sometimes people were not finding the Manage button if the page was wider than the browser window, so the button was not visible w/o scrolling. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@32837 71c3de6d-444a-0410-be80-ed276b4c234a --- .../hudson/diagnosis/OldDataMonitor/message.jelly | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/src/main/resources/hudson/diagnosis/OldDataMonitor/message.jelly b/core/src/main/resources/hudson/diagnosis/OldDataMonitor/message.jelly index 84bc14f6f1..82608a7191 100644 --- a/core/src/main/resources/hudson/diagnosis/OldDataMonitor/message.jelly +++ b/core/src/main/resources/hudson/diagnosis/OldDataMonitor/message.jelly @@ -25,11 +25,11 @@ THE SOFTWARE.
-
- - -
${%You have data stored in an older format and/or unreadable data.} + + + +
-- GitLab From 31fdc8e6d49c3e4b3c59965909b539cb071a5d02 Mon Sep 17 00:00:00 2001 From: jglick Date: Tue, 13 Jul 2010 22:18:53 +0000 Subject: [PATCH 021/336] [HUDSON-5940] Documenting. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@32846 71c3de6d-444a-0410-be80-ed276b4c234a --- .../main/resources/hudson/model/Api/index.jelly | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/core/src/main/resources/hudson/model/Api/index.jelly b/core/src/main/resources/hudson/model/Api/index.jelly index 57214b29ec..23a5bff928 100644 --- a/core/src/main/resources/hudson/model/Api/index.jelly +++ b/core/src/main/resources/hudson/model/Api/index.jelly @@ -40,7 +40,7 @@ THE SOFTWARE. Schema is also available.

- You can also specify optional XPath to control the fragment you'd like to obtain. + You can also specify optional XPath to control the fragment you'd like to obtain (but see tree below). For example, ../api/xml?xpath=/*/*[0]. If the XPath only matches a text node, the result will be sent with text/plain MIME type to simplify further processing. @@ -51,7 +51,7 @@ THE SOFTWARE.

Similarly exclude query parameter can be used to exclude nodes that match the given XPath from the result. This is useful for - trimming down the amount of data fetch. This query parameter can be specified + trimming down the amount of data you fetch (but see tree below). This query parameter can be specified multiple times.

@@ -81,13 +81,23 @@ THE SOFTWARE.

Controlling the amount of data you fetch

- In both formats, the depth query parameter can be used to control the amount of data + In all formats, the depth query parameter can be used to control the amount of data you'll receive. The default is depth=0, but by increasing this value you can get a lot of data by single remote API invocation (the downside is bigger bandwidth requirement.) Compare depth=0 and depth=1 and see what the difference is for yourself. Also note that data created by a smaller depth value is always a subset of the data created by a bigger depth value.

+

+ A newer alternative is the tree query parameter. This works with any format, e.g. JSON; + is more efficient than using depth with exclude (since information + does not need to be generated on the server and then discarded); and may be easier to use, + since you need only know what elements you are looking for, rather than what you are not looking + for (which is anyway an open-ended list when plugins can contribute API elements). + The value should be a list of element + Try tree=jobs[name],views[name,jobs[name]] + to see just a list of jobs (only giving the name) and views (giving the name and jobs they contain). +

-- GitLab From bb55503f819c8ab15b0d38c4b40406d3d0aa4086 Mon Sep 17 00:00:00 2001 From: jglick Date: Tue, 13 Jul 2010 22:39:26 +0000 Subject: [PATCH 022/336] [HUDSON-5940] Documenting further. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@32847 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/resources/hudson/model/Api/index.jelly | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/core/src/main/resources/hudson/model/Api/index.jelly b/core/src/main/resources/hudson/model/Api/index.jelly index 23a5bff928..c574ec87ab 100644 --- a/core/src/main/resources/hudson/model/Api/index.jelly +++ b/core/src/main/resources/hudson/model/Api/index.jelly @@ -40,7 +40,7 @@ THE SOFTWARE. Schema is also available.

- You can also specify optional XPath to control the fragment you'd like to obtain (but see tree below). + You can also specify optional XPath to control the fragment you'd like to obtain (but see below). For example, ../api/xml?xpath=/*/*[0]. If the XPath only matches a text node, the result will be sent with text/plain MIME type to simplify further processing. @@ -51,7 +51,7 @@ THE SOFTWARE.

Similarly exclude query parameter can be used to exclude nodes that match the given XPath from the result. This is useful for - trimming down the amount of data you fetch (but see tree below). This query parameter can be specified + trimming down the amount of data you fetch (but again see below). This query parameter can be specified multiple times.

@@ -89,14 +89,18 @@ THE SOFTWARE. the data created by a bigger depth value.

- A newer alternative is the tree query parameter. This works with any format, e.g. JSON; + A newer alternative is the tree query parameter. This works with any format, e.g. JSON; is more efficient than using depth with exclude (since information does not need to be generated on the server and then discarded); and may be easier to use, since you need only know what elements you are looking for, rather than what you are not looking for (which is anyway an open-ended list when plugins can contribute API elements). - The value should be a list of element + The value should be a list of property names to include, with subproperties inside square braces. Try tree=jobs[name],views[name,jobs[name]] to see just a list of jobs (only giving the name) and views (giving the name and jobs they contain). + Note: for array-type properties (such as jobs in this example), + the name must be given in the original plural, not in the singular as the element would appear in XML (&lt;job&gt;). + This will be more natural for e.g. json?tree=jobs[name] anyway: + the JSON writer does not do plural-to-singular mangling because arrays are represented explicitly.

-- GitLab From ad1c0a0b1be29c6c2931cfdf2cd0faa357733461 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Wed, 14 Jul 2010 00:52:58 +0000 Subject: [PATCH 023/336] field shouldn't be getting the plain text password value. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@32853 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/Functions.java | 10 ++++ .../main/resources/lib/form/password.jelly | 2 +- test/src/test/java/lib/form/PasswordTest.java | 58 +++++++++++++++++++ .../lib/form/PasswordTest/test1.jelly | 40 +++++++++++++ 4 files changed, 109 insertions(+), 1 deletion(-) create mode 100644 test/src/test/java/lib/form/PasswordTest.java create mode 100644 test/src/test/resources/lib/form/PasswordTest/test1.jelly diff --git a/core/src/main/java/hudson/Functions.java b/core/src/main/java/hudson/Functions.java index b60c16a809..649365a5f1 100644 --- a/core/src/main/java/hudson/Functions.java +++ b/core/src/main/java/hudson/Functions.java @@ -66,6 +66,7 @@ import hudson.util.Area; import hudson.util.Iterators; import hudson.scm.SCM; import hudson.scm.SCMDescriptor; +import hudson.util.Secret; import org.acegisecurity.providers.anonymous.AnonymousAuthenticationToken; import org.apache.commons.jelly.JellyContext; import org.apache.commons.jelly.JellyTagException; @@ -1234,6 +1235,15 @@ public class Functions { } } } + + /** + * Used by <f:password/> so that we send an encrypted value to the client. + */ + public String getPasswordValue(Object o) { + if (o==null) return null; + if (o instanceof Secret) return ((Secret)o).getEncryptedValue(); + return o.toString(); + } private static final Pattern SCHEME = Pattern.compile("[a-z]+://.+"); diff --git a/core/src/main/resources/lib/form/password.jelly b/core/src/main/resources/lib/form/password.jelly index fd2a7803f6..b0f71fde18 100644 --- a/core/src/main/resources/lib/form/password.jelly +++ b/core/src/main/resources/lib/form/password.jelly @@ -55,7 +55,7 @@ THE SOFTWARE. diff --git a/test/src/test/java/lib/form/PasswordTest.java b/test/src/test/java/lib/form/PasswordTest.java new file mode 100644 index 0000000000..522f66c8c3 --- /dev/null +++ b/test/src/test/java/lib/form/PasswordTest.java @@ -0,0 +1,58 @@ +/* + * The MIT License + * + * Copyright (c) 2004-2010, InfraDNA, Inc. + * + * 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. + */ +package lib.form; + +import com.gargoylesoftware.htmlunit.html.HtmlInput; +import com.gargoylesoftware.htmlunit.html.HtmlPage; +import hudson.Extension; +import hudson.model.Describable; +import hudson.model.Descriptor; +import hudson.util.Secret; +import org.jvnet.hudson.test.HudsonTestCase; + +/** + * @author Kohsuke Kawaguchi + */ +public class PasswordTest extends HudsonTestCase implements Describable { + public Secret secret; + + public void test1() throws Exception { + secret = Secret.fromString("secret"); + HtmlPage p = createWebClient().goTo("self/test1"); + String value = ((HtmlInput)p.getElementById("password")).getValueAttribute(); + assertFalse("password shouldn't be plain text",value.equals("secret")); + assertEquals("secret",Secret.fromString(value).getPlainText()); + } + + public DescriptorImpl getDescriptor() { + return hudson.getDescriptorByType(DescriptorImpl.class); + } + + @Extension + public static final class DescriptorImpl extends Descriptor { + public String getDisplayName() { + return null; + } + } +} diff --git a/test/src/test/resources/lib/form/PasswordTest/test1.jelly b/test/src/test/resources/lib/form/PasswordTest/test1.jelly new file mode 100644 index 0000000000..bdd2cc0ca4 --- /dev/null +++ b/test/src/test/resources/lib/form/PasswordTest/test1.jelly @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + -- GitLab From 3c4dd890e1de06941940af1171dfe254f4e79797 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Wed, 14 Jul 2010 01:06:59 +0000 Subject: [PATCH 024/336] Remote API now supports the 'tree' filter query parameter which is more efficient and easier to use. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@32854 71c3de6d-444a-0410-be80-ed276b4c234a --- core/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/pom.xml b/core/pom.xml index a413aa47c0..5c42ad2418 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -356,7 +356,7 @@ THE SOFTWARE. org.kohsuke.stapler stapler-jelly - 1.145 + 1.146 commons-jelly -- GitLab From 81b3603c131de432f7f95ede654bda2dd44bcca8 Mon Sep 17 00:00:00 2001 From: mindless Date: Wed, 14 Jul 2010 16:32:26 +0000 Subject: [PATCH 025/336] [FIXED HUDSON-6966] Plugins with dependencies show wrong description on installed plugins page. DependencyClassLoader checks dependencies before this plugin, so wrong index.jelly is found for plugins with dependencies. Added implementation of findResources in DependencyClassLoader, and use getResources to find the right index.jelly in PluginWrapper.getIndexPage(). git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@32876 71c3de6d-444a-0410-be80-ed276b4c234a --- .../java/hudson/ClassicPluginStrategy.java | 20 ++++- core/src/main/java/hudson/PluginWrapper.java | 11 ++- .../hudson/ClassicPluginStrategyTest.java | 73 ++++++++++++++++++ .../testDependencyClassLoader.zip | Bin 0 -> 4601 bytes 4 files changed, 101 insertions(+), 3 deletions(-) create mode 100644 test/src/test/java/hudson/ClassicPluginStrategyTest.java create mode 100644 test/src/test/resources/hudson/ClassicPluginStrategyTest/testDependencyClassLoader.zip diff --git a/core/src/main/java/hudson/ClassicPluginStrategy.java b/core/src/main/java/hudson/ClassicPluginStrategy.java index 7772ca4487..8df5bab1a4 100644 --- a/core/src/main/java/hudson/ClassicPluginStrategy.java +++ b/core/src/main/java/hudson/ClassicPluginStrategy.java @@ -39,9 +39,12 @@ import java.io.Closeable; import java.net.URL; import java.net.URLClassLoader; import java.util.ArrayList; -import java.util.List; import java.util.Arrays; import java.util.Collection; +import java.util.Collections; +import java.util.Enumeration; +import java.util.HashSet; +import java.util.List; import java.util.jar.Manifest; import java.util.jar.Attributes; import java.util.logging.Logger; @@ -380,7 +383,20 @@ public class ClassicPluginStrategy implements PluginStrategy { throw new ClassNotFoundException(name); } - // TODO: delegate resources? watch out for diamond dependencies + @Override + protected Enumeration findResources(String name) throws IOException { + HashSet result = new HashSet(); + for (Dependency dep : dependencies) { + PluginWrapper p = pluginManager.getPlugin(dep.shortName); + if (p!=null) { + Enumeration urls = p.classLoader.getResources(name); + while (urls != null && urls.hasMoreElements()) + result.add(urls.nextElement()); + } + } + + return Collections.enumeration(result); + } @Override protected URL findResource(String name) { diff --git a/core/src/main/java/hudson/PluginWrapper.java b/core/src/main/java/hudson/PluginWrapper.java index b637c3720f..2c0a516414 100644 --- a/core/src/main/java/hudson/PluginWrapper.java +++ b/core/src/main/java/hudson/PluginWrapper.java @@ -37,6 +37,7 @@ import java.io.OutputStream; import java.io.Closeable; import java.net.URL; import java.util.ArrayList; +import java.util.Enumeration; import java.util.List; import java.util.jar.Manifest; import java.util.logging.Logger; @@ -192,7 +193,15 @@ public final class PluginWrapper implements Comparable { * Returns the URL of the index page jelly script. */ public URL getIndexPage() { - return classLoader.getResource("index.jelly"); + // In the current impl dependencies are checked first, so the plugin itself + // will add the last entry in the getResources result. + URL idx = null; + try { + Enumeration en = classLoader.getResources("index.jelly"); + while (en.hasMoreElements()) + idx = en.nextElement(); + } catch (IOException ignore) { } + return idx; } private String computeShortName(Manifest manifest, File archive) { diff --git a/test/src/test/java/hudson/ClassicPluginStrategyTest.java b/test/src/test/java/hudson/ClassicPluginStrategyTest.java new file mode 100644 index 0000000000..8af56a2a99 --- /dev/null +++ b/test/src/test/java/hudson/ClassicPluginStrategyTest.java @@ -0,0 +1,73 @@ +/* + * The MIT License + * + * Copyright (c) 2004-2010, Sun Microsystems, Inc., Kohsuke Kawaguchi, + * Alan Harder + * + * 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. + */ +package hudson; + +import hudson.PluginWrapper; +import org.jvnet.hudson.test.HudsonTestCase; +import org.jvnet.hudson.test.recipes.LocalData; + +import java.io.File; +import java.net.URL; +import java.util.Enumeration; + +/** + * @author Alan Harder + */ +public class ClassicPluginStrategyTest extends HudsonTestCase { + + @Override + protected void setUp() throws Exception { + useLocalPluginManager = true; + super.setUp(); + } + + /** + * Test finding resources via DependencyClassLoader. + */ + @LocalData + public void testDependencyClassLoader() throws Exception { + // Test data has: foo3 depends on foo2,foo1; foo2 depends on foo1 + // (thus findResources from foo3 can find foo1 resources via 2 dependency paths) + PluginWrapper p = hudson.getPluginManager().getPlugin("foo3"); + String res = p.getIndexPage().toString(); + assertTrue(res + "should be foo3", res.contains("/foo3/")); + + // In the current impl, the dependencies are the parent ClassLoader so resources + // are found there before checking the plugin itself. Adjust the expected results + // below if this is ever changed to check the plugin first. + Enumeration en = p.classLoader.getResources("index.jelly"); + for (int i = 0; en.hasMoreElements(); i++) { + res = en.nextElement().toString(); + if (i < 2) + assertTrue("In current impl, " + res + "should be foo1 or foo2", + res.contains("/foo1/") || res.contains("/foo2/")); + else + assertTrue("In current impl, " + res + "should be foo3", res.contains("/foo3/")); + } + res = p.classLoader.getResource("index.jelly").toString(); + assertTrue("In current impl, " + res + " should be foo1 or foo2", + res.contains("/foo1/") || res.contains("/foo2/")); + } +} diff --git a/test/src/test/resources/hudson/ClassicPluginStrategyTest/testDependencyClassLoader.zip b/test/src/test/resources/hudson/ClassicPluginStrategyTest/testDependencyClassLoader.zip new file mode 100644 index 0000000000000000000000000000000000000000..63ebd2dc442beae0df1cea754e95e77f73ea00ee GIT binary patch literal 4601 zcma)<2{hE}ABQJhi0OZ_Vl;>R1D>z3(d1C+o zSoU>=xVv8vcYr$niNN6HwT3r-AP%oUAQRSra8+%0SB^x0APcGXzT8~Ex0+e{E2$pm zMQKE^O3PoOqOO2t_^9tOR7zT2SJIIk{KTSQiR?S*M}BgI))a@?;U&e+Zj24kmo1+* zsOJ*c7U~&DMh^vG7hG?8?T|vbEZ`qvH#rMQ`NEiLZ@DiwBs)HH+Yb@S)KmQ`1%W%4 z@1W~PU2GbfJ8q@*&{|x_vMK_D9@kE!8J$-Z6scLc`(;YFRDU!`wfgON3U2jtF>r+kwuDauYv#yz(nc zk*9^i_HKSN9lgwr1zRQiZCBiwf=kC(R<0w-&0l9X z5WN+pQw#ZKE&??{!+n-p%EG=X8m5gs7Jw&?R_3+l4GJTqgSnBmgA?%+I&2M-rs9`u z(l_oT3E=o-Gs-ROmGptxB>}nB)5GOko9BF*s+h$C#cC!rG?yQX^{i$dapWJ3Da^2T zO_1-HeY$DCv)GY^W=0`~?YqfXAj#D;xbMDWMqEQ$R;Vz@(mSJbTP$RQovPG-(HLGA za22BOmrHEoLFy}3@KW&{Psib}iM3O&X@m`hFEmOBbxPb26Y0Lu)n#BuP7}$_`{B{M)VSU9{(D$-x5V%tvZ+eMmlE?=%QCgc9 zqfEe$Wljnl??(42PLn58lb)}Wx?>PK;<8{99=MN?+l)rw&WBRO8x@@{)b1P(U7@Mi zn31F&!RZ%H-}Th}G^cK?(i52l+A~K)9Sz#_PVt(>mDXLk?ShIn5BM~|AC?0QKWgT9 z7Ycf{Ml&&|C|aAO!5;KSYrRu z(wM*1AvN!o_ulo2?8#ivU^*~ZbmAhbDmgzR9$CM7WJ|DcoFlJ#HMZ0PhRby3#0r)? zcYs&4T7ZC+P_qPgnZUN4gf^xnVrUCkS7261o^N)(lTS?|t-`IYwIs3OTV{WW4uS2& z&DYZQ_}oB{!a{(sWiy^VZP8HarH3Wzgh_n7o(|}2+vEU=!76bmU zJduln6|d#0IfT2Fi!DZ5cB83bIafsERec~}4W~%3k<-naGqY0Tna&c=HZBEv+C{fH zlC$q(aA=+j7e2j$^IT-|V(q#`T#++m*Y^m~s|6dGfSqE%YK|HnA(>!xCyyAg@=eD8 z2>1ebZrlx!h?o+NLD;-648Lg5;mkl^puz*8qtmSH2DW4RU$moV885*HUCz8DAfC4Z zKP<2&L{gCooQfb~tB258Lryza&P8DZnu?7{>C3eLHgZaxLrJe9=Z^--g?}Qk1@7Tv!H?WW@Cd2vBrlp!%4usHb1_~ z5?M2TB?dI#m?GD>OXz@N)Q18aj%OkC@XOV;cqe>UoPBWtYD3)n5=S<#elf03%GNPW|St?1QtZ4@>yxe!kcu|{_of;jF|+g#%(m+8a88L*h;VP6gD5Xq0rrN9dJl0 zD4dQywAwVSh-2P6_;t&6)Vhwa&LlgLbGgPO6BEpN6fWn?RBrmU8Y9&|Fjj&v^|v8a z+6b2*+=Cie5Y~{EKH12W`Q>hxoeqvq==O6>ac}A(?C{8kN1o>kYMtCzW2H-zE}jz7 zUNz|sx30L%=Lx%K_89P>%v{Z7hPkPKNaIYz3wxX1cmwVUFFK_MQeY`-;b^GyfNHPk zyKA2BBCrm8$8%HEL0qP~XQ^1s^dcD=(YEQ#Vz1v%9aKm-TcU3JhkP5YKcX^RYl`YB zB>Vc8+sg9$;t6zbQ9kJ%^|B)+o{WBtC#iqpY3BFwbl?LXDRbmT7;AK}g~}-(1@h<@ z>g-NA4y~|G$z_Px&XH+th^-ZivJrm%Ghr6bbt;E2Z^Q*1S$-MbnE6>}L+Qz7#d0|x zD5=W#eq&_t{8m4zX$ap z;k(jqgsIpQwU}gaafd$twWoE1PYZndsQUcUV_(&qA)ZKC8b7cgF2toQ_iU#Ly`OJr znC;ClW@3zWek&HubR%E~=}2^yianx+>EeEsq`G@J;c<26Gr5p%va!=FscE<5LjO0t znsCuUTtodzN1ukFQ*T5f4DY2dlP1%;7|2OLdx|LZ_FVGY(%+@G*VG7Iyku$sY=egyZdbsq?p!?ZC<*Wnfjeo&j}w z;!{Tdk#X$HG7+<`I&b$Im?{2D=VnO>*BCa}>5!uLv+qED!{azLW%G;t32|#7JN0CV z>t78L<0h*8F6%6ef|NjWRYkn>BL}8#ZSa8kz~3VO>MOLjV00cx|a9fPjX zciDTui-0rQhVVG?_PWeEl%0iJ;#zV(n_$8Vj?=*$dj57z=4TCKSwjoD`@Cyyt2G5g zUbwtdL#XDLYJSw*tgrQcqi_fKn6NA>UySK{q>3w*D{RT0?tJ2Fs+X+VCP|zeC12LA zc1qt|9Xu#R{){FI)G0yNM3L#jo38E>1hI!2Uvu6cI}KfM8)in{l9_P|mvF(#R6Y-} zE|Od6qf?Fvr}JSKw+Yi>LWIfT}36IGp+Aq~Y8#tX27oh;qRml|#3}u{}%O3ngh~ zX8kSpFK=>LfpW(1&A-bmZ{Zmy{y6ZB=({fttKpR7^Yg#D8_9f<>*R{2LuLb1ox9(C`M z>Gq`eyDta+dmtc<>lod=H+t7 z*X}pOJtN<1KZpmY*r|WdWB@S!CH5?U4&}YaA97FoUG5G20hBGWhxjk8{~G}SgoR(; zhxj4+6x5#N|BU*zbl;E4q1>2%kA{N!tB|Ll_6qr*QNLcZ`%%gV|AqSN(xssGF5RC| zzn+5cD9WJ# Date: Wed, 14 Jul 2010 16:48:05 +0000 Subject: [PATCH 026/336] [FIXED HUDSON-6975] change hh:mm to HH:mm in timestamps as suggested by jan ruzicka. Also copied RC build versioning logic from core/pom.xml into remoting/pom.xml. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@32879 71c3de6d-444a-0410-be80-ed276b4c234a --- core/pom.xml | 2 +- remoting/pom.xml | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 5c42ad2418..eee3f2e285 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -124,7 +124,7 @@ THE SOFTWARE. - + diff --git a/remoting/pom.xml b/remoting/pom.xml index 279e07a168..6397f7cfc5 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -101,9 +101,17 @@ THE SOFTWARE. - + - + + + + + + + + + -- GitLab From 982f02a4b14579cc696a9886900a991917d63844 Mon Sep 17 00:00:00 2001 From: mindless Date: Wed, 14 Jul 2010 17:45:57 +0000 Subject: [PATCH 027/336] [FIXED HUDSON-6960] Encode from parameter in login link, to fix redirect after login when return URL has characters that need encoding. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@32884 71c3de6d-444a-0410-be80-ed276b4c234a --- .../hudson/security/SecurityRealm/loginLink.jelly | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/core/src/main/resources/hudson/security/SecurityRealm/loginLink.jelly b/core/src/main/resources/hudson/security/SecurityRealm/loginLink.jelly index 6993346b98..3c18e5e61c 100644 --- a/core/src/main/resources/hudson/security/SecurityRealm/loginLink.jelly +++ b/core/src/main/resources/hudson/security/SecurityRealm/loginLink.jelly @@ -1,7 +1,8 @@ -${%login} \ No newline at end of file + + + + + + ${%login} + -- GitLab From 7476f29c6da9b1f093dda06456566ddfb439576f Mon Sep 17 00:00:00 2001 From: mindless Date: Wed, 14 Jul 2010 19:07:55 +0000 Subject: [PATCH 028/336] Use fullDisplayName instead of displayName, for better display of maven/matrix jobs. http://hudson.361315.n4.nabble.com/Computer-build-history-mostly-useless-when-using-Matrix-builds-td2288127.html git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@32895 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/resources/lib/hudson/buildListTable.jelly | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/resources/lib/hudson/buildListTable.jelly b/core/src/main/resources/lib/hudson/buildListTable.jelly index f039bf9b4b..d4c0e0067c 100644 --- a/core/src/main/resources/lib/hudson/buildListTable.jelly +++ b/core/src/main/resources/lib/hudson/buildListTable.jelly @@ -52,7 +52,7 @@ THE SOFTWARE. - ${b.parent.displayName} + ${b.parent.fullDisplayName} #${b.number} -- GitLab From 1c93fdd3ddf1eb4a2ccccd459a1eb3d7ddee10c6 Mon Sep 17 00:00:00 2001 From: bagrehc Date: Thu, 15 Jul 2010 13:20:29 +0000 Subject: [PATCH 029/336] Translated to Brazilian Portuguese. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@32925 71c3de6d-444a-0410-be80-ed276b4c234a --- .../hudson/cli/Messages_pt_BR.properties | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/cli/src/main/resources/hudson/cli/Messages_pt_BR.properties b/cli/src/main/resources/hudson/cli/Messages_pt_BR.properties index 71030315c4..7152ef0f18 100644 --- a/cli/src/main/resources/hudson/cli/Messages_pt_BR.properties +++ b/cli/src/main/resources/hudson/cli/Messages_pt_BR.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Reginaldo L. Russinholi # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -21,7 +21,7 @@ # THE SOFTWARE. # Version mismatch. This CLI cannot work with this Hudson server -CLI.VersionMismatch= +CLI.VersionMismatch=A verso no coincide. Esta CLI no pode funcionar com este servidor Hudson # Hudson CLI\n\ # Usage: java -jar hudson-cli.jar [-s URL] command [opts...] args...\n\ # Options:\n\ @@ -29,6 +29,13 @@ CLI.VersionMismatch= # \n\ # The available commands depend on the server. Run the 'help' command to\n\ # see the list. -CLI.Usage= +CLI.Usage=Hudson CLI\n\ + Uso: java -jar hudson-cli.jar [-s URL] comando [opes...] parmetros...\n\ + Opes:\n\ + \ -s URL : a URL do servidor (por padro a varivel de ambiente HUDSON_URL usada)\n\ + \n\ + Os comandos disponveis dependem do servidor. Execute o comando 'help' para\n\ + ver a lista. + # Neither -s nor the HUDSON_URL env var is specified. -CLI.NoURL= +CLI.NoURL=No foi especificado nem '-s' e nem a varivel de ambiente HUDSON_URL -- GitLab From 7377dbe6d7d3fdc66897e74d96f18a03b95a4604 Mon Sep 17 00:00:00 2001 From: mindless Date: Thu, 15 Jul 2010 14:30:51 +0000 Subject: [PATCH 030/336] [FIXED HUDSON-5662] use fullDisplayName for project on People page. same change for Build History already done in r32895 git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@32926 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/resources/hudson/model/View/People/index.jelly | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/resources/hudson/model/View/People/index.jelly b/core/src/main/resources/hudson/model/View/People/index.jelly index 1bafe82314..05e40b72dc 100644 --- a/core/src/main/resources/hudson/model/View/People/index.jelly +++ b/core/src/main/resources/hudson/model/View/People/index.jelly @@ -47,7 +47,7 @@ THE SOFTWARE. alt=""/> ${p.user} ${p.lastChangeTimeString} - ${p.project.name} + ${p.project.fullDisplayName} -- GitLab From 0996511058460cf61288724f8d5fa661aa683ef0 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Thu, 15 Jul 2010 17:27:25 +0000 Subject: [PATCH 031/336] Initialized merge tracking via "svnmerge" with revisions "1-32931" from https://www.dev.java.net/svn/hudson/branches/rc git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@32933 71c3de6d-444a-0410-be80-ed276b4c234a -- GitLab From f2248620af2f15149b535c7555a12f27146ce193 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Thu, 15 Jul 2010 21:03:44 +0000 Subject: [PATCH 032/336] Reduced the time it takes to provision a new node if the # of existing slaves is small. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@32935 71c3de6d-444a-0410-be80-ed276b4c234a --- .../java/hudson/slaves/NodeProvisioner.java | 67 +++++++++++++++++-- 1 file changed, 63 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/hudson/slaves/NodeProvisioner.java b/core/src/main/java/hudson/slaves/NodeProvisioner.java index 1f7c05e383..8935ec03ff 100644 --- a/core/src/main/java/hudson/slaves/NodeProvisioner.java +++ b/core/src/main/java/hudson/slaves/NodeProvisioner.java @@ -174,8 +174,9 @@ public class NodeProvisioner { plannedCapacity = Math.max(plannedCapacitiesEMA.getLatest(TIME_SCALE),plannedCapacity); float excessWorkload = qlen - plannedCapacity; - if(excessWorkload>1-MARGIN) {// and there's more work to do... - LOGGER.fine("Excess workload "+excessWorkload+" detected. (planned capacity="+plannedCapacity+",Qlen="+qlen+",idle="+idle+"&"+idleSnapshot+",total="+totalSnapshot+")"); + float m = calcThresholdMargin(totalSnapshot); + if(excessWorkload>1-m) {// and there's more work to do... + LOGGER.fine("Excess workload "+excessWorkload+" detected. (planned capacity="+plannedCapacity+",Qlen="+qlen+",idle="+idle+"&"+idleSnapshot+",total="+totalSnapshot+"m,="+m+")"); for( Cloud c : hudson.clouds ) { if(excessWorkload<0) break; // enough slaves allocated @@ -185,7 +186,7 @@ public class NodeProvisioner { // something like 0.95, in which case we want to allocate one node. // so the threshold here is 1-MARGIN, and hence floor(excessWorkload+MARGIN) is needed to handle this. - Collection additionalCapacities = c.provision(label, (int)Math.round(Math.floor(excessWorkload+MARGIN))); + Collection additionalCapacities = c.provision(label, (int)Math.round(Math.floor(excessWorkload+m))); for (PlannedNode ac : additionalCapacities) { excessWorkload -= ac.numExecutors; LOGGER.info("Started provisioning "+ac.displayName+" from "+c.name+" with "+ac.numExecutors+" executors. Remaining excess workload:"+excessWorkload); @@ -196,6 +197,51 @@ public class NodeProvisioner { } } + /** + * Computes the threshold for triggering an allocation. + * + *

+ * Because the excessive workload value is EMA, even when the snapshot value of the excessive + * workload is 1, the value never really gets to 1. So we need to introduce a notion of the margin M, + * where we provision a new node if the EMA of the excessive workload goes beyond 1-M (where M is a small value + * in the (0,1) range.) + * + *

+ * M effectively controls how long Hudson waits until allocating a new node, in the face of workload. + * This delay is justified for absorbing temporary ups and downs, and can be interpreted as Hudson + * holding off provisioning in the hope that one of the existing nodes will become available. + * + *

+ * M can be a constant value, but there's a benefit in adjusting M based on the total current capacity, + * based on the above justification; that is, if there's no existing capacity at all, holding off + * an allocation doesn't make much sense, as there won't be any executors available no matter how long we wait. + * On the other hand, if we have a large number of existing executors, chances are good that some + * of them become available — the chance gets better and better as the number of current total + * capacity increases. + * + *

+ * Therefore, we compute the threshold margin as follows: + * + * 

+     *   M(t) = M* + (M0 - M*) alpha ^ t
+     *
+ * + * ... where: + * + *
    + *
  • M* is the ultimate margin value that M(t) converges to with t->inf, + *
  • M0 is the value of M(0), the initial value. + *
  • alpha is the decay factor in (0,1). M(t) converges to M* faster if alpha is smaller. + *
+ */ + private float calcThresholdMargin(int totalSnapshot) { + float f = (float) (MARGIN + (MARGIN0 - MARGIN) * Math.pow(MARGIN_DECAY, totalSnapshot)); + // defensively ensure that the threshold margin is in (0,1) + f = Math.max(f,0); + f = Math.min(f,1); + return f; + } + /** * Periodically invoke NodeProvisioners */ @@ -226,9 +272,22 @@ public class NodeProvisioner { } } - private static final float MARGIN = Integer.getInteger(NodeProvisioner.class.getName()+".MARGIN",10)/100f; private static final Logger LOGGER = Logger.getLogger(NodeProvisioner.class.getName()); + private static final float MARGIN = Integer.getInteger(NodeProvisioner.class.getName()+".MARGIN",10)/100f; + private static final float MARGIN0 = Math.max(MARGIN, getFloatSystemProperty(NodeProvisioner.class.getName()+".MARGIN0",0.5f)); + private static final float MARGIN_DECAY = getFloatSystemProperty(NodeProvisioner.class.getName()+".MARGIN_DECAY",0.5f); // TODO: picker should be selectable private static final TimeScale TIME_SCALE = TimeScale.SEC10; + + private static float getFloatSystemProperty(String propName, float defaultValue) { + String v = System.getProperty(propName); + if (v!=null) + try { + return Float.parseFloat(v); + } catch (NumberFormatException e) { + LOGGER.warning("Failed to parse a float value from system property "+propName+". value was "+v); + } + return defaultValue; + } } -- GitLab From 239f9f6c9a5d037c1c68ce027f42330f2c753025 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Fri, 16 Jul 2010 18:36:33 +0000 Subject: [PATCH 033/336] @title in a wrong place. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@32970 71c3de6d-444a-0410-be80-ed276b4c234a --- .../main/resources/hudson/util/HudsonIsLoading/index.jelly | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/main/resources/hudson/util/HudsonIsLoading/index.jelly b/core/src/main/resources/hudson/util/HudsonIsLoading/index.jelly index 2213fa1dfe..65c55de1a3 100644 --- a/core/src/main/resources/hudson/util/HudsonIsLoading/index.jelly +++ b/core/src/main/resources/hudson/util/HudsonIsLoading/index.jelly @@ -24,8 +24,8 @@ THE SOFTWARE. - - + + @@ -33,7 +33,7 @@ THE SOFTWARE.

${%Please wait while Hudson is getting ready to work}...

-

+

${%Your browser will reload automatically when Hudson is ready.}

-- GitLab From 89c437c8777262eff74f3cecd00bdaed1df4443c Mon Sep 17 00:00:00 2001 From: kohsuke Date: Fri, 16 Jul 2010 23:17:09 +0000 Subject: [PATCH 034/336] allowing PluginStrategy to create subtypes. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@32980 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/PluginWrapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/java/hudson/PluginWrapper.java b/core/src/main/java/hudson/PluginWrapper.java index 2c0a516414..02dfc378fd 100644 --- a/core/src/main/java/hudson/PluginWrapper.java +++ b/core/src/main/java/hudson/PluginWrapper.java @@ -69,7 +69,7 @@ import org.kohsuke.stapler.HttpResponses; * * @author Kohsuke Kawaguchi */ -public final class PluginWrapper implements Comparable { +public class PluginWrapper implements Comparable { /** * {@link PluginManager} to which this belongs to. */ -- GitLab From 37e9b61ab55f14cab44401bf65f666069ac63842 Mon Sep 17 00:00:00 2001 From: mindless Date: Sun, 18 Jul 2010 15:46:55 +0000 Subject: [PATCH 035/336] [FIXED HUDSON-7004] Make /buildWithParameters support remote cause and user supplied cause text for build via authentication token, just as /build does. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33032 71c3de6d-444a-0410-be80-ed276b4c234a --- .../java/hudson/model/AbstractProject.java | 18 ++++++++++++------ .../model/ParametersDefinitionProperty.java | 5 +++-- .../model/BuildAuthorizationToken/config.jelly | 8 ++++++-- 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/core/src/main/java/hudson/model/AbstractProject.java b/core/src/main/java/hudson/model/AbstractProject.java index a47b470a88..d4aba9b1fe 100644 --- a/core/src/main/java/hudson/model/AbstractProject.java +++ b/core/src/main/java/hudson/model/AbstractProject.java @@ -1393,6 +1393,17 @@ public abstract class AbstractProject

,R extends A return; } + if (!isBuildable()) + throw HttpResponses.error(SC_INTERNAL_SERVER_ERROR,new IOException(getFullName()+" is not buildable")); + + Hudson.getInstance().getQueue().schedule(this, getDelay(req), getBuildCause(req)); + rsp.forwardToPreviousPage(req); + } + + /** + * Computes the build cause, using RemoteCause or UserCause as appropriate. + */ + /*package*/ CauseAction getBuildCause(StaplerRequest req) { Cause cause; if (authToken != null && authToken.getToken() != null && req.getParameter("token") != null) { // Optional additional cause text when starting via token @@ -1401,12 +1412,7 @@ public abstract class AbstractProject

,R extends A } else { cause = new UserCause(); } - - if (!isBuildable()) - throw HttpResponses.error(SC_INTERNAL_SERVER_ERROR,new IOException(getFullName()+" is not buildable")); - - Hudson.getInstance().getQueue().schedule(this, getDelay(req), new CauseAction(cause)); - rsp.forwardToPreviousPage(req); + return new CauseAction(cause); } /** diff --git a/core/src/main/java/hudson/model/ParametersDefinitionProperty.java b/core/src/main/java/hudson/model/ParametersDefinitionProperty.java index 212bc941ed..616ac436f7 100644 --- a/core/src/main/java/hudson/model/ParametersDefinitionProperty.java +++ b/core/src/main/java/hudson/model/ParametersDefinitionProperty.java @@ -1,7 +1,8 @@ /* * The MIT License * - * Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Jean-Baptiste Quenot, Seiji Sogabe, Tom Huybrechts + * Copyright (c) 2004-2010, Sun Microsystems, Inc., Kohsuke Kawaguchi, + * Jean-Baptiste Quenot, Seiji Sogabe, Tom Huybrechts * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -145,7 +146,7 @@ public class ParametersDefinitionProperty extends JobProperty ${%Use the following URL to trigger build remotely:} HUDSON_URL/${it.url}build?token=TOKEN_NAME -
${%Optionally append <tt>&cause=Cause+Text</tt> to provide text that will be included in the recorded build cause.}
+ ${%or} + /buildWithParameters?token=TOKEN_NAME +
+ ${%Optionally append <tt>&cause=Cause+Text</tt> to provide text that will be included in the recorded build cause.} -- GitLab From d75b759320510939d380c8fdf8b77863320337bf Mon Sep 17 00:00:00 2001 From: kohsuke Date: Mon, 19 Jul 2010 19:42:55 +0000 Subject: [PATCH 036/336] added @default git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33061 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/resources/lib/form/textarea.jelly | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/core/src/main/resources/lib/form/textarea.jelly b/core/src/main/resources/lib/form/textarea.jelly index 175035790f..ef11b86f8e 100644 --- a/core/src/main/resources/lib/form/textarea.jelly +++ b/core/src/main/resources/lib/form/textarea.jelly @@ -40,6 +40,9 @@ THE SOFTWARE. will be set as the initial value automatically, which is the recommended approach. + + The default value of the text box, in case both @value is and 'instance[field]' is null. + If specified, the value entered in this input field will be checked (via AJAX) against this URL, and errors will be rendered under the text field. @@ -55,7 +58,7 @@ THE SOFTWARE. class="setting-input ${attrs.checkUrl!=null?'validated':''} ${attrs.class}" checkUrl="${attrs.checkUrl}" rows="${h.determineRows(attrs.value)}"> - +

-- GitLab From 0e3a9559cfff1f338561b0f0eb994407bd69d4f2 Mon Sep 17 00:00:00 2001 From: bagrehc Date: Tue, 20 Jul 2010 13:07:43 +0000 Subject: [PATCH 037/336] Translated to Brazilian Portuguese. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33078 71c3de6d-444a-0410-be80-ed276b4c234a --- .../index_pt_BR.properties | 18 +++++++++++------- .../Fingerprinter/config_pt_BR.properties | 8 ++++---- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/core/src/main/resources/hudson/diagnosis/HudsonHomeDiskUsageMonitor/index_pt_BR.properties b/core/src/main/resources/hudson/diagnosis/HudsonHomeDiskUsageMonitor/index_pt_BR.properties index 40d4d5b901..943dfa815b 100644 --- a/core/src/main/resources/hudson/diagnosis/HudsonHomeDiskUsageMonitor/index_pt_BR.properties +++ b/core/src/main/resources/hudson/diagnosis/HudsonHomeDiskUsageMonitor/index_pt_BR.properties @@ -21,18 +21,22 @@ # THE SOFTWARE. # To prevent that problem, you should act now. -description.2= +description.2=Para prevenir este problema, voc deveria agir agora. # \ # Your HUDSON_HOME ({0}) is almost full. \ # When this directory completely fills up, it\'ll wreak havoc because Hudson can\'t store any more data. -description.1= +description.1=Seu diretrio HUDSON_HOME ({0}) est quase cheio. \ + Quando este diretrio ficar completamente cheio, ocorrer problemas porque o Hudson no pode mais armazenar dados. # \ # Move HUDSON_HOME to a bigger partition. \ # See our Wiki for how to do this. -solution.2= -HUDSON_HOME\ is\ almost\ full= +solution.2=\ + Mova o diretrio HUDSON_HOME para uma partio maior. \ + Veja nosso Wiki para saber como fazer isto. + +HUDSON_HOME\ is\ almost\ full=HUDSON_HOME est quase cheio # HUDSON_HOME is almost full -blurb=\ -# Estes usu\u00E1rios podem se logar no Hudson. Este \u00E9 um super conjunto desta lista, \ +blurb=O diretrio HUDSON_HOME est quase cheio + # Clean up some files from this partition to make more room. -solution.1= +solution.1=Limpe alguns arquivos desta partio para liberar espao. diff --git a/core/src/main/resources/hudson/tasks/Fingerprinter/config_pt_BR.properties b/core/src/main/resources/hudson/tasks/Fingerprinter/config_pt_BR.properties index 67080125a5..5da68bc776 100644 --- a/core/src/main/resources/hudson/tasks/Fingerprinter/config_pt_BR.properties +++ b/core/src/main/resources/hudson/tasks/Fingerprinter/config_pt_BR.properties @@ -22,7 +22,7 @@ description=Pode usar caracteres coringas como em ''module/dist/**/*.zip''. \ Veja o Fileset @includes do Ant para o formato exato. \ - O diret\u00F3rio base \u00E9 o workspace. -Keep\ the\ build\ logs\ of\ dependencies= -Files\ to\ fingerprint= -Fingerprint\ all\ archived\ artifacts= + O diret\u00F3rio base \u00E9 o workspace. +Keep\ the\ build\ logs\ of\ dependencies=Manter os 'logs' de construo das dependncias +Files\ to\ fingerprint=Arquivos para gerar assinatura +Fingerprint\ all\ archived\ artifacts=Criar assinatura para todos os artefatos arquivados -- GitLab From 1b8a8dada3f09f3aa934f1da6c9cdb7fc0ea8954 Mon Sep 17 00:00:00 2001 From: olamy Date: Tue, 20 Jul 2010 21:58:02 +0000 Subject: [PATCH 038/336] remove unused import git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33083 71c3de6d-444a-0410-be80-ed276b4c234a --- .../main/java/hudson/maven/MavenBuilder.java | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/maven-plugin/src/main/java/hudson/maven/MavenBuilder.java b/maven-plugin/src/main/java/hudson/maven/MavenBuilder.java index 98515bdc4e..958ed55b86 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenBuilder.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenBuilder.java @@ -32,35 +32,35 @@ import hudson.model.BuildListener; import hudson.model.Hudson; import hudson.model.Result; import hudson.remoting.Callable; -import hudson.remoting.DelegatingCallable; import hudson.remoting.Channel; +import hudson.remoting.DelegatingCallable; import hudson.remoting.Future; import hudson.util.IOException2; + +import java.io.IOException; +import java.io.PrintStream; +import java.lang.reflect.InvocationTargetException; +import java.text.NumberFormat; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ExecutionException; + import org.apache.maven.BuildFailureException; -import org.apache.maven.reporting.MavenReport; import org.apache.maven.execution.MavenSession; import org.apache.maven.execution.ReactorManager; import org.apache.maven.lifecycle.LifecycleExecutionException; import org.apache.maven.lifecycle.LifecycleExecutorInterceptor; import org.apache.maven.lifecycle.LifecycleExecutorListener; import org.apache.maven.monitor.event.EventDispatcher; -import org.apache.maven.plugin.MojoExecution; import org.apache.maven.plugin.Mojo; +import org.apache.maven.plugin.MojoExecution; import org.apache.maven.project.MavenProject; +import org.apache.maven.reporting.MavenReport; import org.codehaus.classworlds.NoSuchRealmException; import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator; import org.codehaus.plexus.configuration.PlexusConfiguration; -import java.io.IOException; -import java.io.PrintStream; -import java.lang.reflect.InvocationTargetException; -import java.util.Hashtable; -import java.util.List; -import java.util.Map; -import java.util.ArrayList; -import java.util.concurrent.ExecutionException; -import java.text.NumberFormat; - /** * {@link Callable} that invokes Maven CLI (in process) and drives a build. * -- GitLab From 7414c3ed2140055aa350f91c3254103f66282c9a Mon Sep 17 00:00:00 2001 From: mindless Date: Tue, 20 Jul 2010 22:04:01 +0000 Subject: [PATCH 039/336] [FIXED HUDSON-6348] avoid NPE in log from Functions.getCrumb when hudson start fails and error page is being shown. Also fix message on NoHomeDir error page to show dir instead of {0} git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33085 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/Functions.java | 23 +++++++------------ .../hudson/util/NoHomeDir/index.properties | 5 ++-- .../hudson/util/NoHomeDir/index_de.properties | 4 ++-- .../hudson/util/NoHomeDir/index_ja.properties | 4 ++-- .../util/NoHomeDir/index_pt_BR.properties | 6 ++--- 5 files changed, 17 insertions(+), 25 deletions(-) diff --git a/core/src/main/java/hudson/Functions.java b/core/src/main/java/hudson/Functions.java index 649365a5f1..0d804297b1 100644 --- a/core/src/main/java/hudson/Functions.java +++ b/core/src/main/java/hudson/Functions.java @@ -43,7 +43,6 @@ import hudson.model.ParameterDefinition.ParameterDescriptor; import hudson.model.Project; import hudson.model.Run; import hudson.model.TopLevelItem; -import hudson.model.User; import hudson.model.View; import hudson.model.JDK; import hudson.search.SearchableModelObject; @@ -1178,23 +1177,17 @@ public class Functions { public static List> getCrumbIssuerDescriptors() { return CrumbIssuer.all(); } - + public static String getCrumb(StaplerRequest req) { - CrumbIssuer issuer = Hudson.getInstance().getCrumbIssuer(); - if (issuer != null) { - return issuer.getCrumb(req); - } - - return ""; + Hudson h = Hudson.getInstance(); + CrumbIssuer issuer = h != null ? h.getCrumbIssuer() : null; + return issuer != null ? issuer.getCrumb(req) : ""; } - + public static String getCrumbRequestField() { - CrumbIssuer issuer = Hudson.getInstance().getCrumbIssuer(); - if (issuer != null) { - return issuer.getDescriptor().getCrumbRequestField(); - } - - return ""; + Hudson h = Hudson.getInstance(); + CrumbIssuer issuer = h != null ? h.getCrumbIssuer() : null; + return issuer != null ? issuer.getDescriptor().getCrumbRequestField() : ""; } public static Date getCurrentTime() { diff --git a/core/src/main/resources/hudson/util/NoHomeDir/index.properties b/core/src/main/resources/hudson/util/NoHomeDir/index.properties index 4cffc37a71..6c6fed57c6 100644 --- a/core/src/main/resources/hudson/util/NoHomeDir/index.properties +++ b/core/src/main/resources/hudson/util/NoHomeDir/index.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Seiji Sogabe +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Kohsuke Kawaguchi, Seiji Sogabe # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -21,11 +21,10 @@ # THE SOFTWARE. errorMessage.1=\ - Unable to create the home directory '{0}'. This is most likely a permission problem. + Unable to create the home directory ''{0}''. This is most likely a permission problem. errorMessage.2=\ To change the home directory, use HUDSON_HOME environment variable or set the \ HUDSON_HOME system property. \ See Container-specific documentation \ for more details of how to do this. - diff --git a/core/src/main/resources/hudson/util/NoHomeDir/index_de.properties b/core/src/main/resources/hudson/util/NoHomeDir/index_de.properties index 8c0e1dd920..d65dc61ea1 100644 --- a/core/src/main/resources/hudson/util/NoHomeDir/index_de.properties +++ b/core/src/main/resources/hudson/util/NoHomeDir/index_de.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Simon Wiest +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Kohsuke Kawaguchi, Simon Wiest # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ Error=Fehler errorMessage.1=\ - Das Stammverzeichnis '{0}' konnte nicht angelegt werden. In den meisten Fllen ist \ + Das Stammverzeichnis ''{0}'' konnte nicht angelegt werden. In den meisten Fllen ist \ dies ein Dateirechte-Problem. errorMessage.2=\ Um das Stammverzeichnis zu ndern, verwenden Sie die Umgebungsvariable HUDSON_HOME \ diff --git a/core/src/main/resources/hudson/util/NoHomeDir/index_ja.properties b/core/src/main/resources/hudson/util/NoHomeDir/index_ja.properties index 0e71d62ade..6059f07375 100644 --- a/core/src/main/resources/hudson/util/NoHomeDir/index_ja.properties +++ b/core/src/main/resources/hudson/util/NoHomeDir/index_ja.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Seiji Sogabe +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Kohsuke Kawaguchi, Seiji Sogabe # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ Error=\u30A8\u30E9\u30FC errorMessage.1=\ - \u30DB\u30FC\u30E0\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA '{0}' \u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002\u304A\u305D\u3089\u304F\u30D1\u30FC\u30DF\u30C3\u30B7\u30E7\u30F3\u306E\u554F\u984C\u3067\u3059\u3002 + \u30DB\u30FC\u30E0\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA ''{0}'' \u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002\u304A\u305D\u3089\u304F\u30D1\u30FC\u30DF\u30C3\u30B7\u30E7\u30F3\u306E\u554F\u984C\u3067\u3059\u3002 errorMessage.2=\ \u30DB\u30FC\u30E0\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u5909\u66F4\u3059\u308B\u306B\u306F\u3001\u74B0\u5883\u5909\u6570\u306EHUDSON_HOME\u304B\u3001\u30B7\u30B9\u30C6\u30E0\u30D7\u30ED\u30D1\u30C6\u30A3\u306E \ HUDSON_HOME\u3092\u8A2D\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002\ diff --git a/core/src/main/resources/hudson/util/NoHomeDir/index_pt_BR.properties b/core/src/main/resources/hudson/util/NoHomeDir/index_pt_BR.properties index b5eed24736..8c29ee8f13 100644 --- a/core/src/main/resources/hudson/util/NoHomeDir/index_pt_BR.properties +++ b/core/src/main/resources/hudson/util/NoHomeDir/index_pt_BR.properties @@ -21,12 +21,12 @@ # THE SOFTWARE. # \ -# Unable to create the home directory '{0}'. This is most likely a permission problem. -errorMessage.1= +# Unable to create the home directory ''{0}''. This is most likely a permission problem. +#errorMessage.1= Error=Erro # \ # To change the home directory, use HUDSON_HOME environment variable or set the \ # HUDSON_HOME system property. \ # See Container-specific documentation \ # for more details of how to do this. -errorMessage.2= +#errorMessage.2= -- GitLab From 8b2617b6e6a31d5aade99bccb03f4760400ce203 Mon Sep 17 00:00:00 2001 From: mindless Date: Wed, 21 Jul 2010 01:34:23 +0000 Subject: [PATCH 040/336] [FIXED HUDSON-6394] use EnvVars to expand parameters in recipient list (not just ParametersAction), don't overwrite the field in this object (!) when parameters are expanded, and note that parameters are supported in the help text. Also correct the help text that mentions when email is sent. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33098 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/tasks/Mailer.java | 23 +++++++++---------- .../hudson/tasks/Mailer/config.properties | 6 +++-- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/core/src/main/java/hudson/tasks/Mailer.java b/core/src/main/java/hudson/tasks/Mailer.java index ca337edd61..516f968d81 100644 --- a/core/src/main/java/hudson/tasks/Mailer.java +++ b/core/src/main/java/hudson/tasks/Mailer.java @@ -1,7 +1,8 @@ /* * The MIT License * - * Copyright (c) 2004-2010, Sun Microsystems, Inc., Kohsuke Kawaguchi, Bruce Chapman, Erik Ramfelt, Jean-Baptiste Quenot, Luca Domenico Milanesio + * Copyright (c) 2004-2010, Sun Microsystems, Inc., Kohsuke Kawaguchi, + * Bruce Chapman, Erik Ramfelt, Jean-Baptiste Quenot, Luca Domenico Milanesio * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,9 +24,10 @@ */ package hudson.tasks; -import hudson.Launcher; -import hudson.Functions; +import hudson.EnvVars; import hudson.Extension; +import hudson.Functions; +import hudson.Launcher; import hudson.RestrictedSince; import hudson.Util; import hudson.diagnosis.OldDataMonitor; @@ -33,7 +35,6 @@ import static hudson.Util.fixEmptyAndTrim; import hudson.model.AbstractBuild; import hudson.model.AbstractProject; import hudson.model.BuildListener; -import hudson.model.ParametersAction; import hudson.model.User; import hudson.model.UserPropertyDescriptor; import hudson.model.Hudson; @@ -42,7 +43,6 @@ import hudson.util.Secret; import hudson.util.XStream2; import org.apache.tools.ant.types.selectors.SelectorUtils; import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.DoNotUse; import org.kohsuke.accmod.restrictions.NoExternalUse; import org.kohsuke.stapler.QueryParameter; import org.kohsuke.stapler.StaplerRequest; @@ -101,15 +101,14 @@ public class Mailer extends Notifier { private transient String charset; @Override - public boolean perform(AbstractBuild build, Launcher launcher, BuildListener listener) throws InterruptedException { + public boolean perform(AbstractBuild build, Launcher launcher, BuildListener listener) throws IOException, InterruptedException { if(debug) listener.getLogger().println("Running mailer"); - // substitute build parameters if available - ParametersAction parameters = build.getAction(ParametersAction.class); - if (parameters!=null) - recipients = parameters.substitute(build, recipients); - - return new MailSender(recipients,dontNotifyEveryUnstableBuild,sendToIndividuals, descriptor().getCharset()) { + // substitute build parameters + EnvVars env = build.getEnvironment(listener); + String recip = env.expand(recipients); + + return new MailSender(recip, dontNotifyEveryUnstableBuild, sendToIndividuals, descriptor().getCharset()) { /** Check whether a path (/-separated) will be archived. */ @Override public boolean artifactMatches(String path, AbstractBuild build) { diff --git a/core/src/main/resources/hudson/tasks/Mailer/config.properties b/core/src/main/resources/hudson/tasks/Mailer/config.properties index 54c9a05411..8abb553fa4 100644 --- a/core/src/main/resources/hudson/tasks/Mailer/config.properties +++ b/core/src/main/resources/hudson/tasks/Mailer/config.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Kohsuke Kawaguchi # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -20,4 +20,6 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -description=Whitespace-separated list of recipient addresses. E-mail will be sent when a build fails. +description=Whitespace-separated list of recipient addresses. May reference build \ + parameters like $PARAM. \ + E-mail will be sent when a build fails, becomes unstable or returns to stable. -- GitLab From 7b109f7892cc86c956cbc45dedcedf91863d28cb Mon Sep 17 00:00:00 2001 From: mindless Date: Wed, 21 Jul 2010 15:55:48 +0000 Subject: [PATCH 041/336] javadoc git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33116 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/tools/ToolInstaller.java | 3 ++- core/src/main/java/hudson/views/ViewJobFilter.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/hudson/tools/ToolInstaller.java b/core/src/main/java/hudson/tools/ToolInstaller.java index 3d5f56df0f..d59741b817 100644 --- a/core/src/main/java/hudson/tools/ToolInstaller.java +++ b/core/src/main/java/hudson/tools/ToolInstaller.java @@ -1,7 +1,7 @@ /* * The MIT License * - * Copyright (c) 2009, Sun Microsystems, Inc. + * Copyright (c) 2009-2010, Sun Microsystems, Inc. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -37,6 +37,7 @@ import org.kohsuke.stapler.DataBoundConstructor; /** * An object which can ensure that a generic {@link ToolInstallation} in fact exists on a node. + * * The subclass should have a {@link ToolInstallerDescriptor}. * A {@code config.jelly} should be provided to customize specific fields; * {@code } to customize {@code label}. diff --git a/core/src/main/java/hudson/views/ViewJobFilter.java b/core/src/main/java/hudson/views/ViewJobFilter.java index 3838dee54a..ab8ce34ba4 100644 --- a/core/src/main/java/hudson/views/ViewJobFilter.java +++ b/core/src/main/java/hudson/views/ViewJobFilter.java @@ -1,7 +1,7 @@ /* * The MIT License * - * Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Martin Eigenbrodt + * Copyright (c) 2004-2010, Sun Microsystems, Inc., Kohsuke Kawaguchi, Martin Eigenbrodt * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -35,6 +35,7 @@ import java.util.List; /** * Each ViewJobFilter contributes to or removes from the list of Jobs for a view. + * * @author Jacob Robertson */ public abstract class ViewJobFilter implements ExtensionPoint, Describable { -- GitLab From 8f4e38fd8d5c6acf13a6be9eb09564fff3bb48a3 Mon Sep 17 00:00:00 2001 From: mindless Date: Wed, 21 Jul 2010 17:03:04 +0000 Subject: [PATCH 042/336] use latest extension-point-lister git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33124 71c3de6d-444a-0410-be80-ed276b4c234a --- core/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/pom.xml b/core/pom.xml index eee3f2e285..49bfaa62d0 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -185,7 +185,7 @@ THE SOFTWARE. org.jvnet.hudson.tools extension-point-lister - 1.5 + 1.7 com.sun -- GitLab From 6999c607f86d91be5f7137de3214f83b6d6344eb Mon Sep 17 00:00:00 2001 From: mindless Date: Wed, 21 Jul 2010 22:41:15 +0000 Subject: [PATCH 043/336] [FIXED HUDSON-6880] patch from jeroen_muis to fix autoinstall of JDK with windows master and linux slave. I applied same change for reverse situation. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33136 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/tools/JDKInstaller.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/hudson/tools/JDKInstaller.java b/core/src/main/java/hudson/tools/JDKInstaller.java index c95035248c..596e0bcfc7 100644 --- a/core/src/main/java/hudson/tools/JDKInstaller.java +++ b/core/src/main/java/hudson/tools/JDKInstaller.java @@ -1,7 +1,7 @@ /* * The MIT License * - * Copyright (c) 2009, Sun Microsystems, Inc. + * Copyright (c) 2009-2010, Sun Microsystems, Inc. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -162,8 +162,9 @@ public class JDKInstaller extends ToolInstaller { case LINUX: case SOLARIS: fs.chmod(jdkBundle,0755); - if(launcher.launch().cmds(jdkBundle,"-noregister") - .stdin(new ByteArrayInputStream("yes".getBytes())).stdout(out).pwd(expectedLocation).join()!=0) + if (launcher.launch().cmds(jdkBundle, "-noregister") + .stdin(new ByteArrayInputStream("yes".getBytes())).stdout(out) + .pwd(new FilePath(launcher.getChannel(), expectedLocation)).join() != 0) throw new AbortException(Messages.JDKInstaller_FailedToInstallJDK()); // JDK creates its own sub-directory, so pull them up @@ -209,7 +210,8 @@ public class JDKInstaller extends ToolInstaller { // Oh Windows, oh windows, why do you have to be so difficult? args.add("/v/qn REBOOT=Suppress INSTALLDIR=\\\""+ expectedLocation +"\\\" /L \\\""+logFile+"\\\""); - if(launcher.launch().cmds(args).stdout(out).pwd(expectedLocation).join()!=0) { + if (launcher.launch().cmds(args).stdout(out) + .pwd(new FilePath(launcher.getChannel(), expectedLocation)).join() != 0) { out.println(Messages.JDKInstaller_FailedToInstallJDK()); // log file is in UTF-16 InputStreamReader in = new InputStreamReader(fs.read(logFile), "UTF-16"); -- GitLab From 8809bea8a524ed85932e350b589a52233989a46f Mon Sep 17 00:00:00 2001 From: kohsuke Date: Thu, 22 Jul 2010 03:01:05 +0000 Subject: [PATCH 044/336] report the exit code. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33148 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/tools/JDKInstaller.java | 7 ++++--- core/src/main/resources/hudson/tools/Messages.properties | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/hudson/tools/JDKInstaller.java b/core/src/main/java/hudson/tools/JDKInstaller.java index 596e0bcfc7..b874f89e50 100644 --- a/core/src/main/java/hudson/tools/JDKInstaller.java +++ b/core/src/main/java/hudson/tools/JDKInstaller.java @@ -210,9 +210,10 @@ public class JDKInstaller extends ToolInstaller { // Oh Windows, oh windows, why do you have to be so difficult? args.add("/v/qn REBOOT=Suppress INSTALLDIR=\\\""+ expectedLocation +"\\\" /L \\\""+logFile+"\\\""); - if (launcher.launch().cmds(args).stdout(out) - .pwd(new FilePath(launcher.getChannel(), expectedLocation)).join() != 0) { - out.println(Messages.JDKInstaller_FailedToInstallJDK()); + int r = launcher.launch().cmds(args).stdout(out) + .pwd(new FilePath(launcher.getChannel(), expectedLocation)).join(); + if (r != 0) { + out.println(Messages.JDKInstaller_FailedToInstallJDK(r)); // log file is in UTF-16 InputStreamReader in = new InputStreamReader(fs.read(logFile), "UTF-16"); try { diff --git a/core/src/main/resources/hudson/tools/Messages.properties b/core/src/main/resources/hudson/tools/Messages.properties index 84bff0a6ab..37d04da344 100644 --- a/core/src/main/resources/hudson/tools/Messages.properties +++ b/core/src/main/resources/hudson/tools/Messages.properties @@ -24,7 +24,7 @@ ToolLocationNodeProperty.displayName=Tool Locations CommandInstaller.DescriptorImpl.displayName=Run Command CommandInstaller.no_command=Must provide a command to run. CommandInstaller.no_toolHome=Must provide a tool home directory. -JDKInstaller.FailedToInstallJDK=Failed to install JDK +JDKInstaller.FailedToInstallJDK=Failed to install JDK. Exit code={0} JDKInstaller.UnableToInstallUntilLicenseAccepted=Unable to auto-install JDK until the license is accepted. ZipExtractionInstaller.DescriptorImpl.displayName=Extract *.zip/*.tar.gz ZipExtractionInstaller.bad_connection=Server rejected connection. -- GitLab From bfa2dad035cddde7fc55f19ba99a33cae10a9b61 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Thu, 22 Jul 2010 03:02:24 +0000 Subject: [PATCH 045/336] [FIXED HUDSON-6738] changed the servlet mapping to /* to make it work with Tomcat. My fingers are crossed that this doesn't cause regressions elsewhere. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33149 71c3de6d-444a-0410-be80-ed276b4c234a --- war/resources/WEB-INF/web.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/war/resources/WEB-INF/web.xml b/war/resources/WEB-INF/web.xml index 578d67c91b..9544ccd816 100644 --- a/war/resources/WEB-INF/web.xml +++ b/war/resources/WEB-INF/web.xml @@ -41,7 +41,7 @@ THE SOFTWARE. Stapler - / + /* -- GitLab From 7bee9394389de54ed402ddf0ccf1df14dbbeda8a Mon Sep 17 00:00:00 2001 From: kohsuke Date: Thu, 22 Jul 2010 17:25:24 +0000 Subject: [PATCH 046/336] indicates that this HTML uses the standard Hudson layout. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33160 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/resources/lib/layout/layout.jelly | 1 + 1 file changed, 1 insertion(+) diff --git a/core/src/main/resources/lib/layout/layout.jelly b/core/src/main/resources/lib/layout/layout.jelly index cf3cd04a75..b4b51ad409 100644 --- a/core/src/main/resources/lib/layout/layout.jelly +++ b/core/src/main/resources/lib/layout/layout.jelly @@ -53,6 +53,7 @@ THE SOFTWARE. + -- GitLab From e7c5dfcfdae70f97bd7f473ace0299a1a3e1653f Mon Sep 17 00:00:00 2001 From: kohsuke Date: Thu, 22 Jul 2010 17:27:34 +0000 Subject: [PATCH 047/336] Merged revisions 32983,32987,32989,32993 via svnmerge from https://www.dev.java.net/svn/hudson/branches/rc ........ r32983 | kohsuke | 2010-07-16 17:04:42 -0700 (Fri, 16 Jul 2010) | 1 line integrated a newer version with a bug fix ........ r32987 | kohsuke | 2010-07-16 21:41:53 -0700 (Fri, 16 Jul 2010) | 1 line [maven-release-plugin] prepare release hudson-1_367 ........ r32989 | kohsuke | 2010-07-16 21:42:09 -0700 (Fri, 16 Jul 2010) | 1 line [maven-release-plugin] prepare for next development iteration ........ r32993 | kohsuke | 2010-07-16 22:41:10 -0700 (Fri, 16 Jul 2010) | 1 line updated changelog as a part of the release ........ git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33161 71c3de6d-444a-0410-be80-ed276b4c234a --- cli/pom.xml | 2 +- core/pom.xml | 4 ++-- debian/debian/changelog | 6 ++++++ maven-agent/pom.xml | 2 +- maven-interceptor/pom.xml | 2 +- maven-plugin/pom.xml | 2 +- pom.xml | 2 +- remoting/pom.xml | 2 +- test/pom.xml | 2 +- ui-samples-plugin/pom.xml | 2 +- war/pom.xml | 2 +- 11 files changed, 17 insertions(+), 11 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index 2576355b17..dec4012c32 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -4,7 +4,7 @@ pom org.jvnet.hudson.main - 1.367-SNAPSHOT + 1.368-SNAPSHOT cli Hudson CLI diff --git a/core/pom.xml b/core/pom.xml index 49bfaa62d0..700367e5a9 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.367-SNAPSHOT + 1.368-SNAPSHOT ../pom.xml @@ -356,7 +356,7 @@ THE SOFTWARE. org.kohsuke.stapler stapler-jelly - 1.146 + 1.147 commons-jelly diff --git a/debian/debian/changelog b/debian/debian/changelog index 4ff355c45c..a3a4a20428 100644 --- a/debian/debian/changelog +++ b/debian/debian/changelog @@ -1,3 +1,9 @@ +hudson (1.367) unstable; urgency=low + + * See http://hudson.dev.java.net/changelog.html for more details. + + -- Kohsuke Kawaguchi Fri, 16 Jul 2010 22:38:44 -0700 + hudson (1.366) unstable; urgency=low * See http://hudson.dev.java.net/changelog.html for more details. diff --git a/maven-agent/pom.xml b/maven-agent/pom.xml index f4b15dd1f2..9b14fcd46a 100644 --- a/maven-agent/pom.xml +++ b/maven-agent/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.367-SNAPSHOT + 1.368-SNAPSHOT ../pom.xml diff --git a/maven-interceptor/pom.xml b/maven-interceptor/pom.xml index abee1d6b99..15b69b4a8f 100644 --- a/maven-interceptor/pom.xml +++ b/maven-interceptor/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.367-SNAPSHOT + 1.368-SNAPSHOT ../pom.xml diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 88aff653c7..efc05fba30 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.367-SNAPSHOT + 1.368-SNAPSHOT maven-plugin diff --git a/pom.xml b/pom.xml index b9a2992a3d..2ff8127aa7 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.367-SNAPSHOT + 1.368-SNAPSHOT pom Hudson main module diff --git a/remoting/pom.xml b/remoting/pom.xml index 6397f7cfc5..2d22bb49d7 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.367-SNAPSHOT + 1.368-SNAPSHOT ../pom.xml diff --git a/test/pom.xml b/test/pom.xml index d3808f341f..1d2686bf22 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. pom org.jvnet.hudson.main - 1.367-SNAPSHOT + 1.368-SNAPSHOT 4.0.0 org.jvnet.hudson.main diff --git a/ui-samples-plugin/pom.xml b/ui-samples-plugin/pom.xml index 3039240f3b..8cfbeadbf1 100644 --- a/ui-samples-plugin/pom.xml +++ b/ui-samples-plugin/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.367-SNAPSHOT + 1.368-SNAPSHOT ui-samples-plugin diff --git a/war/pom.xml b/war/pom.xml index 612902798e..67ecddcb0f 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.367-SNAPSHOT + 1.368-SNAPSHOT ../pom.xml -- GitLab From 26b1a1c77a1fa9b4579bdecbc62a18e74121ebfe Mon Sep 17 00:00:00 2001 From: kohsuke Date: Thu, 22 Jul 2010 17:28:26 +0000 Subject: [PATCH 048/336] Initialized merge tracking via "svnmerge" with revisions "1-33164" from https://www.dev.java.net/svn/hudson/branches/rc git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33166 71c3de6d-444a-0410-be80-ed276b4c234a -- GitLab From f1400695a991d5b45d832a39ad03b451c3a83394 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Thu, 22 Jul 2010 17:34:48 +0000 Subject: [PATCH 049/336] [FIXED HUDSON-3796] CLI can now work with a reverse proxy that requires BASIC auth. (issue 3796) git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33167 71c3de6d-444a-0410-be80-ed276b4c234a --- .../main/java/hudson/cli/FullDuplexHttpStream.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/cli/src/main/java/hudson/cli/FullDuplexHttpStream.java b/cli/src/main/java/hudson/cli/FullDuplexHttpStream.java index 92787ce09f..369448ec53 100644 --- a/cli/src/main/java/hudson/cli/FullDuplexHttpStream.java +++ b/cli/src/main/java/hudson/cli/FullDuplexHttpStream.java @@ -11,6 +11,8 @@ import java.util.UUID; import java.util.logging.Level; import java.util.logging.Logger; +import sun.misc.BASE64Encoder; + /** * Creates a capacity-unlimited bi-directional {@link InputStream}/{@link OutputStream} pair over * HTTP, which is a request/response protocol. @@ -34,6 +36,11 @@ public class FullDuplexHttpStream { public FullDuplexHttpStream(URL target) throws IOException { this.target = target; + String authorization = null; + if (target.getUserInfo() != null) { + authorization = new BASE64Encoder().encode(target.getUserInfo().getBytes()); + } + CrumbData crumbData = new CrumbData(); UUID uuid = UUID.randomUUID(); // so that the server can correlate those two connections @@ -44,6 +51,9 @@ public class FullDuplexHttpStream { con.setRequestMethod("POST"); con.addRequestProperty("Session", uuid.toString()); con.addRequestProperty("Side","download"); + if (authorization != null) { + con.addRequestProperty("Authorization", "Basic " + authorization); + } if(crumbData.isValid) { con.addRequestProperty(crumbData.crumbName, crumbData.crumb); } @@ -61,6 +71,10 @@ public class FullDuplexHttpStream { con.setRequestProperty("Content-type","application/octet-stream"); con.addRequestProperty("Session", uuid.toString()); con.addRequestProperty("Side","upload"); + if (authorization != null) { + con.addRequestProperty ("Authorization", "Basic " + authorization); + } + if(crumbData.isValid) { con.addRequestProperty(crumbData.crumbName, crumbData.crumb); } -- GitLab From c97593de6fe4f83b53f21cc0933cf34410b92daf Mon Sep 17 00:00:00 2001 From: kohsuke Date: Thu, 22 Jul 2010 17:46:55 +0000 Subject: [PATCH 050/336] Merged revisions 33168 via svnmerge from https://www.dev.java.net/svn/hudson/branches/rc ........ r33168 | kohsuke | 2010-07-22 10:42:12 -0700 (Thu, 22 Jul 2010) | 1 line fixed a silly compilation problem ........ git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33169 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/tools/JDKInstaller.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/hudson/tools/JDKInstaller.java b/core/src/main/java/hudson/tools/JDKInstaller.java index b874f89e50..0bf4445631 100644 --- a/core/src/main/java/hudson/tools/JDKInstaller.java +++ b/core/src/main/java/hudson/tools/JDKInstaller.java @@ -162,10 +162,11 @@ public class JDKInstaller extends ToolInstaller { case LINUX: case SOLARIS: fs.chmod(jdkBundle,0755); - if (launcher.launch().cmds(jdkBundle, "-noregister") - .stdin(new ByteArrayInputStream("yes".getBytes())).stdout(out) - .pwd(new FilePath(launcher.getChannel(), expectedLocation)).join() != 0) - throw new AbortException(Messages.JDKInstaller_FailedToInstallJDK()); + int exit = launcher.launch().cmds(jdkBundle, "-noregister") + .stdin(new ByteArrayInputStream("yes".getBytes())).stdout(out) + .pwd(new FilePath(launcher.getChannel(), expectedLocation)).join(); + if (exit != 0) + throw new AbortException(Messages.JDKInstaller_FailedToInstallJDK(exit)); // JDK creates its own sub-directory, so pull them up List paths = fs.listSubDirectories(expectedLocation); -- GitLab From 197ef8ce419d53e070548483b1da5b7104ac22da Mon Sep 17 00:00:00 2001 From: mindless Date: Thu, 22 Jul 2010 19:49:42 +0000 Subject: [PATCH 051/336] [HUDSON-7041] add anchor *after* copying e.innerHTML, so anchor isn't added in 2 places. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33171 71c3de6d-444a-0410-be80-ed276b4c234a --- .../main/resources/hudson/tasks/_ant/AntTargetNote/script.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/resources/hudson/tasks/_ant/AntTargetNote/script.js b/core/src/main/resources/hudson/tasks/_ant/AntTargetNote/script.js index 1ce492d2bf..df5964c874 100644 --- a/core/src/main/resources/hudson/tasks/_ant/AntTargetNote/script.js +++ b/core/src/main/resources/hudson/tasks/_ant/AntTargetNote/script.js @@ -27,11 +27,11 @@ queue.push(e); } else { var id = "ant-target-"+(iota++); + outline.appendChild(parseHtml("
  • "+e.innerHTML+"
    • ")) + var a = document.createElement("a"); a.setAttribute("name",id); e.appendChild(a); - - outline.appendChild(parseHtml("
  • "+e.innerHTML+"
    • ")) } } -- GitLab From e444f5bd8a376266c09871448b66b611e7f7070b Mon Sep 17 00:00:00 2001 From: mindless Date: Thu, 22 Jul 2010 22:12:21 +0000 Subject: [PATCH 052/336] [FIXED HUDSON-7041] workaround to make ant-target links work in IE8 git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33176 71c3de6d-444a-0410-be80-ed276b4c234a --- .../hudson/tasks/_ant/AntTargetNote/script.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/core/src/main/resources/hudson/tasks/_ant/AntTargetNote/script.js b/core/src/main/resources/hudson/tasks/_ant/AntTargetNote/script.js index df5964c874..3b6af7aa7c 100644 --- a/core/src/main/resources/hudson/tasks/_ant/AntTargetNote/script.js +++ b/core/src/main/resources/hudson/tasks/_ant/AntTargetNote/script.js @@ -29,9 +29,13 @@ var id = "ant-target-"+(iota++); outline.appendChild(parseHtml("
  • "+e.innerHTML+"
    • ")) - var a = document.createElement("a"); - a.setAttribute("name",id); - e.appendChild(a); + if (document.all) + e.innerHTML += ''; // IE8 loses "name" attr in appendChild + else { + var a = document.createElement("a"); + a.setAttribute("name",id); + e.appendChild(a); + } } } -- GitLab From c83e846fd01f25f2d8468ee0ad61942a4909cd58 Mon Sep 17 00:00:00 2001 From: mindless Date: Thu, 22 Jul 2010 22:44:35 +0000 Subject: [PATCH 053/336] [FIXED HUDSON-6925] Support LogRotator deletion of old artifacts in multiconfiguration(matrix) projects, based on patch from cjo9900. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33178 71c3de6d-444a-0410-be80-ed276b4c234a --- .../java/hudson/matrix/LinkedLogRotator.java | 16 +++++++++++++--- .../java/hudson/matrix/MatrixConfiguration.java | 6 ++++-- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/core/src/main/java/hudson/matrix/LinkedLogRotator.java b/core/src/main/java/hudson/matrix/LinkedLogRotator.java index 8aa421e9cb..4f3d62a5d5 100644 --- a/core/src/main/java/hudson/matrix/LinkedLogRotator.java +++ b/core/src/main/java/hudson/matrix/LinkedLogRotator.java @@ -1,7 +1,7 @@ /* * The MIT License * - * Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi + * Copyright (c) 2004-2010, Sun Microsystems, Inc., Kohsuke Kawaguchi * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -40,15 +40,25 @@ import java.io.IOException; * @author Kohsuke Kawaguchi */ final class LinkedLogRotator extends LogRotator { + LinkedLogRotator(int artifactDaysToKeep, int artifactNumToKeep) { + super(-1, -1, artifactDaysToKeep, artifactNumToKeep); + } + + /** + * @deprecated since 1.369 + * Use {@link #LinkedLogRotator(int, int)} + */ LinkedLogRotator() { - super(-1,-1); + super(-1, -1, -1, -1); } @Override public void perform(Job _job) throws IOException, InterruptedException { - // copy it to the array because we'll be deleting builds as we go. + // Let superclass handle clearing artifacts, if configured: + super.perform(_job); MatrixConfiguration job = (MatrixConfiguration) _job; + // copy it to the array because we'll be deleting builds as we go. for( MatrixRun r : job.getBuilds().toArray(new MatrixRun[0]) ) { if(job.getParent().getBuildByNumber(r.getNumber())==null) r.delete(); diff --git a/core/src/main/java/hudson/matrix/MatrixConfiguration.java b/core/src/main/java/hudson/matrix/MatrixConfiguration.java index a1fee12e50..8dff4f7e7d 100644 --- a/core/src/main/java/hudson/matrix/MatrixConfiguration.java +++ b/core/src/main/java/hudson/matrix/MatrixConfiguration.java @@ -1,7 +1,7 @@ /* * The MIT License * - * Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Tom Huybrechts + * Copyright (c) 2004-2010, Sun Microsystems, Inc., Kohsuke Kawaguchi, Tom Huybrechts * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -240,7 +240,9 @@ public class MatrixConfiguration extends Project @Override public LogRotator getLogRotator() { - return new LinkedLogRotator(); + LogRotator lr = getParent().getLogRotator(); + return new LinkedLogRotator(lr != null ? lr.getArtifactDaysToKeep() : -1, + lr != null ? lr.getArtifactNumToKeep() : -1); } @Override -- GitLab From 93eb8759027b08949f50db9878598ba16a4345ac Mon Sep 17 00:00:00 2001 From: mdillon Date: Fri, 23 Jul 2010 05:28:28 +0000 Subject: [PATCH 054/336] [FIXED HUDSON-7055] Add call to Behaviour.applySubtree() to each chunk of text added to the console through progressive rendering git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33181 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/resources/lib/hudson/progressiveText.jelly | 1 + 1 file changed, 1 insertion(+) diff --git a/core/src/main/resources/lib/hudson/progressiveText.jelly b/core/src/main/resources/lib/hudson/progressiveText.jelly index 0afd6467b8..1a9c1f7e64 100644 --- a/core/src/main/resources/lib/hudson/progressiveText.jelly +++ b/core/src/main/resources/lib/hudson/progressiveText.jelly @@ -68,6 +68,7 @@ THE SOFTWARE. // http://www.quirksmode.org/bugreports/archives/2004/11/innerhtml_and_t.html if (p.outerHTML) p.outerHTML = '
    '+text+'
    '; else p.innerHTML = text; + Behaviour.applySubtree(p); if(stickToBottom) scroller.scrollToBottom(); } -- GitLab From a59814e85ccba57c352b95b74128c96dbd723c24 Mon Sep 17 00:00:00 2001 From: mindless Date: Fri, 23 Jul 2010 18:57:24 +0000 Subject: [PATCH 055/336] [FIXED HUDSON-6804] call Hudson.cleanUp from lifecycle classes and in Hudson.doSafeExit so that safeRestart and safeExit propertly cleanup before terminating the process; in particular, so the contents of the build queue is saved so it can be restored after restart. Also increased delay before restart from 5 to 10 seconds, as I saw one build get interrupted at restart in my testing. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33184 71c3de6d-444a-0410-be80-ed276b4c234a --- .../src/main/java/hudson/lifecycle/SolarisSMFLifecycle.java | 6 +++++- core/src/main/java/hudson/lifecycle/UnixLifecycle.java | 4 ++++ core/src/main/java/hudson/model/Hudson.java | 5 +++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/hudson/lifecycle/SolarisSMFLifecycle.java b/core/src/main/java/hudson/lifecycle/SolarisSMFLifecycle.java index 8251f3a7f0..160d06d6c1 100644 --- a/core/src/main/java/hudson/lifecycle/SolarisSMFLifecycle.java +++ b/core/src/main/java/hudson/lifecycle/SolarisSMFLifecycle.java @@ -1,7 +1,7 @@ /* * The MIT License * - * Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi + * Copyright (c) 2004-2010, Sun Microsystems, Inc., Kohsuke Kawaguchi * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,6 +23,7 @@ */ package hudson.lifecycle; +import hudson.model.Hudson; import java.io.IOException; /** @@ -36,6 +37,9 @@ public class SolarisSMFLifecycle extends Lifecycle { */ @Override public void restart() throws IOException, InterruptedException { + Hudson h = Hudson.getInstance(); + if (h != null) + h.cleanUp(); System.exit(0); } } diff --git a/core/src/main/java/hudson/lifecycle/UnixLifecycle.java b/core/src/main/java/hudson/lifecycle/UnixLifecycle.java index 23125b5af7..0d67fc1b91 100644 --- a/core/src/main/java/hudson/lifecycle/UnixLifecycle.java +++ b/core/src/main/java/hudson/lifecycle/UnixLifecycle.java @@ -61,6 +61,10 @@ public class UnixLifecycle extends Lifecycle { @Override public void restart() throws IOException, InterruptedException { + Hudson h = Hudson.getInstance(); + if (h != null) + h.cleanUp(); + // close all files upon exec, except stdin, stdout, and stderr int sz = LIBC.getdtablesize(); for(int i=3; i, Stapl if (isQuietingDown) { servletContext.setAttribute("app",new HudsonIsRestarting()); // give some time for the browser to load the "reloading" page - LOGGER.info("Restart in 5 seconds"); - Thread.sleep(5000); + LOGGER.info("Restart in 10 seconds"); + Thread.sleep(10000); lifecycle.restart(); } else { LOGGER.info("Safe-restart mode cancelled"); @@ -3024,6 +3024,7 @@ public final class Hudson extends Node implements ItemGroup, Stapl } // Make sure isQuietingDown is still true. if (isQuietingDown) { + cleanUp(); System.exit(0); } } catch (InterruptedException e) { -- GitLab From 9977ccdaa6998a2af7d914e4743081bab1e463eb Mon Sep 17 00:00:00 2001 From: mindless Date: Fri, 23 Jul 2010 19:01:57 +0000 Subject: [PATCH 056/336] [FIXED HUDSON-7054] use Node.canTake(Task) in Queue._getBuildableItems so that Mode.EXCLUSIVE ("only for tied jobs") setting is respected. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33185 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/model/Queue.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/core/src/main/java/hudson/model/Queue.java b/core/src/main/java/hudson/model/Queue.java index 5bfb2f3ca4..fc6e08d991 100644 --- a/core/src/main/java/hudson/model/Queue.java +++ b/core/src/main/java/hudson/model/Queue.java @@ -593,14 +593,10 @@ public class Queue extends ResourceController implements Saveable { } private void _getBuildableItems(Computer c, ItemList col, List result) { + Node node = c.getNode(); for (BuildableItem p : col.values()) { - Label l = p.task.getAssignedLabel(); - if (l != null) { - // if a project has assigned label, it can be only built on it - if (!l.contains(c.getNode())) - continue; - } - result.add(p); + if (node.canTake(p.task) == null) + result.add(p); } } -- GitLab From fe60cc4ebb3941cbc4860afc313773faa6fb8aec Mon Sep 17 00:00:00 2001 From: kohsuke Date: Sat, 24 Jul 2010 00:09:32 +0000 Subject: [PATCH 057/336] [FIXED HUDSON-4044] added more logging git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33186 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/tasks/LogRotator.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/src/main/java/hudson/tasks/LogRotator.java b/core/src/main/java/hudson/tasks/LogRotator.java index 23b9796875..044cfb0528 100644 --- a/core/src/main/java/hudson/tasks/LogRotator.java +++ b/core/src/main/java/hudson/tasks/LogRotator.java @@ -127,6 +127,7 @@ public class LogRotator implements Describable { LOGGER.log(FINER,r.getFullDisplayName()+" is not GC-ed because it's the last stable build"); continue; } + LOGGER.log(FINER,r.getFullDisplayName()+" is to be removed"); r.delete(); } } @@ -152,6 +153,7 @@ public class LogRotator implements Describable { LOGGER.log(FINER,r.getFullDisplayName()+" is not GC-ed because it's still new"); continue; } + LOGGER.log(FINER,r.getFullDisplayName()+" is to be removed"); r.delete(); } } -- GitLab From 0646acb3895b90bbf284ed5c5ad6616a3b99e600 Mon Sep 17 00:00:00 2001 From: mindless Date: Sat, 24 Jul 2010 20:14:44 +0000 Subject: [PATCH 058/336] [FIXED HUDSON-4589] use latest stapler with xml schema fix git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33193 71c3de6d-444a-0410-be80-ed276b4c234a --- core/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/pom.xml b/core/pom.xml index 700367e5a9..3036e537c1 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -356,7 +356,7 @@ THE SOFTWARE. org.kohsuke.stapler stapler-jelly - 1.147 + 1.148 commons-jelly -- GitLab From 17b4a46f3d31a20bdc4ac8c6b61fe797f5d827ce Mon Sep 17 00:00:00 2001 From: mindless Date: Sun, 25 Jul 2010 00:15:26 +0000 Subject: [PATCH 059/336] [FIXED HUDSON-6938] Avoid infinite loop with invalid or null primary view, such as in upgrade from older Hudson. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33194 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/model/Hudson.java | 15 +++++++++------ test/src/test/java/hudson/model/HudsonTest.java | 17 +++++++++++++++++ 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/core/src/main/java/hudson/model/Hudson.java b/core/src/main/java/hudson/model/Hudson.java index a1fcbaf6b3..0ccf50c7e0 100644 --- a/core/src/main/java/hudson/model/Hudson.java +++ b/core/src/main/java/hudson/model/Hudson.java @@ -1,8 +1,9 @@ /* * The MIT License * - * Copyright (c) 2004-2010, Sun Microsystems, Inc., Kohsuke Kawaguchi, Erik Ramfelt, Koichi Fujikawa, Red Hat, Inc., - * Seiji Sogabe, Stephen Connolly, Tom Huybrechts, Yahoo! Inc., Alan Harder + * Copyright (c) 2004-2010, Sun Microsystems, Inc., Kohsuke Kawaguchi, + * Erik Ramfelt, Koichi Fujikawa, Red Hat, Inc., Seiji Sogabe, + * Stephen Connolly, Tom Huybrechts, Yahoo! Inc., Alan Harder * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -1257,10 +1258,12 @@ public final class Hudson extends Node implements ItemGroup, Stapl if(v.getViewName().equals(name)) return v; } - // Fallback to subview of primary view if it is a ViewGroup - View pv = getPrimaryView(); - if (pv instanceof ViewGroup) - return ((ViewGroup)pv).getView(name); + if (name != null && !name.equals(primaryView)) { + // Fallback to subview of primary view if it is a ViewGroup + View pv = getPrimaryView(); + if (pv instanceof ViewGroup) + return ((ViewGroup)pv).getView(name); + } return null; } diff --git a/test/src/test/java/hudson/model/HudsonTest.java b/test/src/test/java/hudson/model/HudsonTest.java index ddf1860c3e..b0f4eec4d2 100644 --- a/test/src/test/java/hudson/model/HudsonTest.java +++ b/test/src/test/java/hudson/model/HudsonTest.java @@ -38,11 +38,13 @@ import hudson.security.SecurityRealm; import hudson.tasks.Ant; import hudson.tasks.BuildStep; import hudson.tasks.Ant.AntInstallation; +import org.jvnet.hudson.test.Bug; import org.jvnet.hudson.test.Email; import org.jvnet.hudson.test.HudsonTestCase; import org.jvnet.hudson.test.recipes.LocalData; import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN; +import java.lang.reflect.Field; import java.net.URL; import java.util.List; @@ -170,4 +172,19 @@ public class HudsonTest extends HudsonTestCase { BuildStep.PUBLISHERS.remove(dummy); assertNull(hudson.getDescriptor(HudsonTest.class.getName())); } + + /** + * Verify null/invalid primaryView setting doesn't result in infinite loop. + */ + @Bug(6938) + public void testInvalidPrimaryView() throws Exception { + Field pv = Hudson.class.getDeclaredField("primaryView"); + pv.setAccessible(true); + String value = null; + pv.set(hudson, value); + assertNull("null primaryView", hudson.getView(value)); + value = "some bogus name"; + pv.set(hudson, value); + assertNull("invalid primaryView", hudson.getView(value)); + } } -- GitLab From e8ade4bdb6a1eff3a8f8c39e4c0f36db19f752d6 Mon Sep 17 00:00:00 2001 From: sogabe Date: Mon, 26 Jul 2010 13:09:43 +0000 Subject: [PATCH 060/336] Updated Japanese localization. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33209 71c3de6d-444a-0410-be80-ed276b4c234a --- .../PluginManager/advanced_ja.properties | 2 + .../ListView/configure-entries_ja.properties | 19 ++- .../hudson/tasks/Messages_ja.properties | 125 +++++++++--------- .../tasks/junit/History/index_ja.properties | 6 +- .../hudson/tools/Messages_ja.properties | 30 ++--- .../help/view-config/statusFilter_ja.html | 3 + 6 files changed, 100 insertions(+), 85 deletions(-) create mode 100644 war/resources/help/view-config/statusFilter_ja.html diff --git a/core/src/main/resources/hudson/PluginManager/advanced_ja.properties b/core/src/main/resources/hudson/PluginManager/advanced_ja.properties index 5c90599e5d..b8c0719bd6 100644 --- a/core/src/main/resources/hudson/PluginManager/advanced_ja.properties +++ b/core/src/main/resources/hudson/PluginManager/advanced_ja.properties @@ -34,3 +34,5 @@ uploadtext=\ .hpi\u30d5\u30a1\u30a4\u30eb\u3092\u30a2\u30c3\u30d7\u30ed\u30fc\u30c9\u3057\u3066\u3001\u30d7\u30e9\u30b0\u30a4\u30f3\u30ea\u30dd\u30b8\u30c8\u30ea\u4ee5\u5916\u304b\u3089\u30d7\u30e9\u30b0\u30a4\u30f3\u3092\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3067\u304d\u307e\u3059\u3002 Check\ now=\u66f4\u65b0 Update\ Site=\u30a2\u30c3\u30d7\u30c7\u30fc\u30c8\u30b5\u30a4\u30c8 +URL=URL + diff --git a/core/src/main/resources/hudson/model/ListView/configure-entries_ja.properties b/core/src/main/resources/hudson/model/ListView/configure-entries_ja.properties index 88b4c90740..7b9b712a9b 100644 --- a/core/src/main/resources/hudson/model/ListView/configure-entries_ja.properties +++ b/core/src/main/resources/hudson/model/ListView/configure-entries_ja.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Seiji Sogabe +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Kohsuke Kawaguchi, Seiji Sogabe # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -20,8 +20,15 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Jobs=\u30B8\u30E7\u30D6 -Use\ a\ regular\ expression\ to\ include\ jobs\ into\ the\ view=\u6B63\u898F\u8868\u73FE\u3067\u30B8\u30E7\u30D6\u3092\u6307\u5B9A -Regular\ expression=\u6B63\u898F\u8868\u73FE -Columns=\u30AB\u30E9\u30E0 -Add\ column=\u30AB\u30E9\u30E0\u8FFD\u52A0 +Jobs=\u30b8\u30e7\u30d6 +Use\ a\ regular\ expression\ to\ include\ jobs\ into\ the\ view=\u6b63\u898f\u8868\u73fe\u3067\u30b8\u30e7\u30d6\u3092\u6307\u5b9a +Regular\ expression=\u6b63\u898f\u8868\u73fe +Columns=\u30ab\u30e9\u30e0 +Add\ column=\u30ab\u30e9\u30e0\u8ffd\u52a0 +Job\ Filters=\u30b8\u30e7\u30d6\u30d5\u30a3\u30eb\u30bf\u30fc +Add\ Job\ Filter=\u30b8\u30e7\u30d6\u30d5\u30a3\u30eb\u30bf\u30fc\u306e\u8ffd\u52a0 +Status\ Filter=\u30b9\u30c6\u30fc\u30bf\u30b9\u30d5\u30a3\u30eb\u30bf\u30fc +All\ selected\ jobs=\u9078\u629e\u6e08\u307f\u30b8\u30e7\u30d6\u3092\u3059\u3079\u3066 +Enabled\ jobs\ only=\u6709\u52b9\u306a\u30b8\u30e7\u30d6\u306e\u307f +Disabled\ jobs\ only=\u7121\u52b9\u306a\u30b8\u30e7\u30d6\u306e\u307f + diff --git a/core/src/main/resources/hudson/tasks/Messages_ja.properties b/core/src/main/resources/hudson/tasks/Messages_ja.properties index 20652aa36d..b40bed4896 100644 --- a/core/src/main/resources/hudson/tasks/Messages_ja.properties +++ b/core/src/main/resources/hudson/tasks/Messages_ja.properties @@ -20,78 +20,79 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Ant.DisplayName=Ant\u306E\u547C\u3073\u51FA\u3057 -Ant.ExecFailed=\u30B3\u30DE\u30F3\u30C9\u306E\u5B9F\u884C\u306B\u5931\u6557\u3057\u307E\u3057\u305F -Ant.ExecutableNotFound=\u9078\u629E\u3057\u305FAnt "{0}"\u306B\u306F\u5B9F\u884C\u5F62\u5F0F\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093 -Ant.GlobalConfigNeeded=Ant\u306E\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3055\u308C\u305F\u4F4D\u7F6E\u3092\u8A2D\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308B\u306E\u3067\u306F\uFF1F -Ant.NotADirectory={0}\u306F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3067\u306F\u3042\u308A\u307E\u305B\u3093 -Ant.NotAntDirectory={0}\u306B\u306FAnt\u304C\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3055\u308C\u3066\u3044\u306A\u3044\u3088\u3046\u3067\u3059 -Ant.ProjectConfigNeeded=\u3069\u306EAnt\u3092\u4F7F\u3046\u304B\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3067\u8A2D\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308B\u306E\u3067\u306F\uFF1F +Ant.DisplayName=Ant\u306e\u547c\u3073\u51fa\u3057 +Ant.ExecFailed=\u30b3\u30de\u30f3\u30c9\u306e\u5b9f\u884c\u306b\u5931\u6557\u3057\u307e\u3057\u305f +Ant.ExecutableNotFound=\u9078\u629e\u3057\u305fAnt "{0}"\u306b\u306f\u5b9f\u884c\u5f62\u5f0f\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093 +Ant.GlobalConfigNeeded=Ant\u306e\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3055\u308c\u305f\u4f4d\u7f6e\u3092\u8a2d\u5b9a\u3059\u308b\u5fc5\u8981\u304c\u3042\u308b\u306e\u3067\u306f\uff1f +Ant.NotADirectory={0}\u306f\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3067\u306f\u3042\u308a\u307e\u305b\u3093 +Ant.NotAntDirectory={0}\u306b\u306fAnt\u304c\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3055\u308c\u3066\u3044\u306a\u3044\u3088\u3046\u3067\u3059 +Ant.ProjectConfigNeeded=\u3069\u306eAnt\u3092\u4f7f\u3046\u304b\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3067\u8a2d\u5b9a\u3059\u308b\u5fc5\u8981\u304c\u3042\u308b\u306e\u3067\u306f\uff1f -ArtifactArchiver.DeletingOld=\u53E4\u3044\u6210\u679C\u7269\u3092\u524A\u9664\u4E2D -ArtifactArchiver.DisplayName=\u6210\u679C\u7269\u3092\u4FDD\u5B58 -ArtifactArchiver.FailedToArchive=\u6210\u679C\u7269\u306E\u4FDD\u5B58\u306E\u5931\u6557\u3057\u307E\u3057\u305F -ArtifactArchiver.NoIncludes=\u4FDD\u5B58\u3059\u308B\u6210\u679C\u7269\u304C\u4F55\u3082\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\n\ -\u6050\u3089\u304F\u30D5\u30A1\u30A4\u30EB\u30D1\u30BF\u30FC\u30F3\u306E\u6307\u5B9A\u3092\u5FD8\u308C\u305F\u306E\u3067\u3057\u3087\u3046\u3002\u8A2D\u5B9A\u30DA\u30FC\u30B8\u306B\u623B\u3063\u3066\u30D1\u30BF\u30FC\u30F3\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\n\ -\u3082\u3057\u672C\u5F53\u306B\u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9\u306E\u5168\u3066\u306E\u30D5\u30A1\u30A4\u30EB\u3092\u4FDD\u5B58\u3059\u308B\u3064\u3082\u308A\u306A\u3089\u3001"**"\u3068\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002 -ArtifactArchiver.NoMatchFound=\u6307\u5B9A\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB\u30D1\u30BF\u30FC\u30F3\u300C{0}\u300D\u306B\u5408\u81F4\u3059\u308B\u30D5\u30A1\u30A4\u30EB\u304C\u3042\u308A\u307E\u305B\u3093\u3002\u8A2D\u5B9A\u30DF\u30B9\uFF1F +ArtifactArchiver.ARCHIVING_ARTIFACTS=\u6210\u679c\u7269\u3092\u4fdd\u5b58\u4e2d +ArtifactArchiver.DeletingOld=\u53e4\u3044\u6210\u679c\u7269\u3092\u524a\u9664\u4e2d +ArtifactArchiver.DisplayName=\u6210\u679c\u7269\u3092\u4fdd\u5b58 +ArtifactArchiver.FailedToArchive=\u6210\u679c\u7269\u306e\u4fdd\u5b58\u306e\u5931\u6557\u3057\u307e\u3057\u305f +ArtifactArchiver.NoIncludes=\u4fdd\u5b58\u3059\u308b\u6210\u679c\u7269\u304c\u4f55\u3082\u6307\u5b9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002\n\ +\u6050\u3089\u304f\u30d5\u30a1\u30a4\u30eb\u30d1\u30bf\u30fc\u30f3\u306e\u6307\u5b9a\u3092\u5fd8\u308c\u305f\u306e\u3067\u3057\u3087\u3046\u3002\u8a2d\u5b9a\u30da\u30fc\u30b8\u306b\u623b\u3063\u3066\u30d1\u30bf\u30fc\u30f3\u3092\u6307\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\n\ +\u3082\u3057\u672c\u5f53\u306b\u30ef\u30fc\u30af\u30b9\u30da\u30fc\u30b9\u306e\u5168\u3066\u306e\u30d5\u30a1\u30a4\u30eb\u3092\u4fdd\u5b58\u3059\u308b\u3064\u3082\u308a\u306a\u3089\u3001"**"\u3068\u6307\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +ArtifactArchiver.NoMatchFound=\u6307\u5b9a\u3055\u308c\u305f\u30d5\u30a1\u30a4\u30eb\u30d1\u30bf\u30fc\u30f3\u300c{0}\u300d\u306b\u5408\u81f4\u3059\u308b\u30d5\u30a1\u30a4\u30eb\u304c\u3042\u308a\u307e\u305b\u3093\u3002\u8a2d\u5b9a\u30df\u30b9\uff1f -BatchFile.DisplayName=Windows\u30D0\u30C3\u30C1\u30B3\u30DE\u30F3\u30C9\u306E\u5B9F\u884C +BatchFile.DisplayName=Windows\u30d0\u30c3\u30c1\u30b3\u30de\u30f3\u30c9\u306e\u5b9f\u884c -BuildTrigger.Disabled={0} \u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002\u30B9\u30AD\u30C3\u30D7\u3057\u307E\u3059\u3002 -BuildTrigger.DisplayName=\u4ED6\u306E\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306E\u30D3\u30EB\u30C9 -BuildTrigger.InQueue={0} \u306F\u65E2\u306B\u30D3\u30EB\u30C9\u30AD\u30E5\u30FC\u306B\u3042\u308A\u307E\u3059 -BuildTrigger.NoSuchProject=''{0}''\u3068\u3044\u3046\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306F\u3042\u308A\u307E\u305B\u3093\u3002''{1}''\u306E\u3053\u3068\u3067\u3059\u304B? -BuildTrigger.NotBuildable={0} \u306F\u30D3\u30EB\u30C9\u53EF\u80FD\u3067\u306F\u3042\u308A\u307E\u305B\u3093 -BuildTrigger.Triggering={0} \u306E\u65B0\u898F\u30D3\u30EB\u30C9\u3092\u5B9F\u884C\u3057\u307E\u3059 +BuildTrigger.Disabled={0} \u306f\u4f7f\u7528\u3067\u304d\u307e\u305b\u3093\u3002\u30b9\u30ad\u30c3\u30d7\u3057\u307e\u3059\u3002 +BuildTrigger.DisplayName=\u4ed6\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u30d3\u30eb\u30c9 +BuildTrigger.InQueue={0} \u306f\u65e2\u306b\u30d3\u30eb\u30c9\u30ad\u30e5\u30fc\u306b\u3042\u308a\u307e\u3059 +BuildTrigger.NoSuchProject=''{0}''\u3068\u3044\u3046\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306f\u3042\u308a\u307e\u305b\u3093\u3002''{1}''\u306e\u3053\u3068\u3067\u3059\u304b? +BuildTrigger.NotBuildable={0} \u306f\u30d3\u30eb\u30c9\u53ef\u80fd\u3067\u306f\u3042\u308a\u307e\u305b\u3093 +BuildTrigger.Triggering={0} \u306e\u65b0\u898f\u30d3\u30eb\u30c9\u3092\u5b9f\u884c\u3057\u307e\u3059 -CommandInterpreter.CommandFailed=\u30B3\u30DE\u30F3\u30C9\u306E\u5B9F\u884C\u306B\u5931\u6557\u3057\u307E\u3057\u305F -CommandInterpreter.UnableToDelete=\u30B9\u30AF\u30EA\u30D7\u30C8\u30D5\u30A1\u30A4\u30EB {0} \u3092\u524A\u9664\u3067\u304D\u307E\u305B\u3093 -CommandInterpreter.UnableToProduceScript=\u30B9\u30AF\u30EA\u30D7\u30C8\u30D5\u30A1\u30A4\u30EB\u3092\u751F\u6210\u3067\u304D\u307E\u305B\u3093 +CommandInterpreter.CommandFailed=\u30b3\u30de\u30f3\u30c9\u306e\u5b9f\u884c\u306b\u5931\u6557\u3057\u307e\u3057\u305f +CommandInterpreter.UnableToDelete=\u30b9\u30af\u30ea\u30d7\u30c8\u30d5\u30a1\u30a4\u30eb {0} \u3092\u524a\u9664\u3067\u304d\u307e\u305b\u3093 +CommandInterpreter.UnableToProduceScript=\u30b9\u30af\u30ea\u30d7\u30c8\u30d5\u30a1\u30a4\u30eb\u3092\u751f\u6210\u3067\u304d\u307e\u305b\u3093 -Fingerprinter.Aborted=\u4E2D\u6B62 -Fingerprinter.Action.DisplayName=\u6307\u7D0B\u3092\u898B\u308B -Fingerprinter.DigestFailed={0} \u306E\u30C0\u30A4\u30B8\u30A7\u30B9\u30C8\u3092\u8A08\u7B97\u3067\u304D\u307E\u305B\u3093 -Fingerprinter.DisplayName=\u30D5\u30A1\u30A4\u30EB\u6307\u7D0B\u3092\u8A18\u9332\u3057\u3066\u30D5\u30A1\u30A4\u30EB\u306E\u5229\u7528\u72B6\u6CC1\u3092\u8FFD\u8DE1 -Fingerprinter.Failed=\u30D5\u30A1\u30A4\u30EB\u6307\u7D0B\u306E\u8A18\u9332\u306B\u5931\u6557\u3057\u307E\u3057\u305F -Fingerprinter.FailedFor={0} \u306E\u30D5\u30A1\u30A4\u30EB\u6307\u7D0B\u306E\u8A18\u9332\u306B\u5931\u6557\u3057\u307E\u3057\u305F -Fingerprinter.NoArchiving=\u6210\u679C\u7269\u306E\u30D5\u30A1\u30A4\u30EB\u6307\u7D0B\u3092\u8A18\u9332\u3059\u308B\u3053\u3068\u306B\u306A\u3063\u3066\u3044\u307E\u3059\u304C\u3001\u6210\u679C\u7269\u306E\u4FDD\u5B58\u304C\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093 -Fingerprinter.NoWorkspace=\u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9\u304C\u306A\u3044\u306E\u3067\u3001\u30D5\u30A1\u30A4\u30EB\u6307\u7D0B\u3092\u8A18\u9332\u3067\u304D\u307E\u305B\u3093 -Fingerprinter.Recording=\u30D5\u30A1\u30A4\u30EB\u6307\u7D0B\u306E\u8A18\u9332 +Fingerprinter.Aborted=\u4e2d\u6b62 +Fingerprinter.Action.DisplayName=\u6307\u7d0b\u3092\u898b\u308b +Fingerprinter.DigestFailed={0} \u306e\u30c0\u30a4\u30b8\u30a7\u30b9\u30c8\u3092\u8a08\u7b97\u3067\u304d\u307e\u305b\u3093 +Fingerprinter.DisplayName=\u30d5\u30a1\u30a4\u30eb\u6307\u7d0b\u3092\u8a18\u9332\u3057\u3066\u30d5\u30a1\u30a4\u30eb\u306e\u5229\u7528\u72b6\u6cc1\u3092\u8ffd\u8de1 +Fingerprinter.Failed=\u30d5\u30a1\u30a4\u30eb\u6307\u7d0b\u306e\u8a18\u9332\u306b\u5931\u6557\u3057\u307e\u3057\u305f +Fingerprinter.FailedFor={0} \u306e\u30d5\u30a1\u30a4\u30eb\u6307\u7d0b\u306e\u8a18\u9332\u306b\u5931\u6557\u3057\u307e\u3057\u305f +Fingerprinter.NoArchiving=\u6210\u679c\u7269\u306e\u30d5\u30a1\u30a4\u30eb\u6307\u7d0b\u3092\u8a18\u9332\u3059\u308b\u3053\u3068\u306b\u306a\u3063\u3066\u3044\u307e\u3059\u304c\u3001\u6210\u679c\u7269\u306e\u4fdd\u5b58\u304c\u8a2d\u5b9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093 +Fingerprinter.NoWorkspace=\u30ef\u30fc\u30af\u30b9\u30da\u30fc\u30b9\u304c\u306a\u3044\u306e\u3067\u3001\u30d5\u30a1\u30a4\u30eb\u6307\u7d0b\u3092\u8a18\u9332\u3067\u304d\u307e\u305b\u3093 +Fingerprinter.Recording=\u30d5\u30a1\u30a4\u30eb\u6307\u7d0b\u306e\u8a18\u9332 -InstallFromApache=Apache\u304B\u3089\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB +InstallFromApache=Apache\u304b\u3089\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb -JavadocArchiver.DisplayName=Javadoc\u306E\u4FDD\u5B58 -JavadocArchiver.DisplayName.Generic=\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8 +JavadocArchiver.DisplayName=Javadoc\u306e\u4fdd\u5b58 +JavadocArchiver.DisplayName.Generic=\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8 JavadocArchiver.DisplayName.Javadoc=Javadoc -JavadocArchiver.NoMatchFound={0} \u306BJavadoc\u304C\u3042\u308A\u307E\u305B\u3093: {1} -JavadocArchiver.Publishing=Javadoc\u306E\u4FDD\u5B58 -JavadocArchiver.UnableToCopy=Javadoc\u3092{0}\u304B\u3089{1}\u306B\u30B3\u30D4\u30FC\u3067\u304D\u307E\u305B\u3093 +JavadocArchiver.NoMatchFound={0} \u306bJavadoc\u304c\u3042\u308a\u307e\u305b\u3093: {1} +JavadocArchiver.Publishing=Javadoc\u306e\u4fdd\u5b58 +JavadocArchiver.UnableToCopy=Javadoc\u3092{0}\u304b\u3089{1}\u306b\u30b3\u30d4\u30fc\u3067\u304d\u307e\u305b\u3093 -MailSender.ListEmpty=\u53D7\u4FE1\u8005\u3092\u6307\u5B9A\u305B\u305A\u306B\u30E1\u30FC\u30EB\u3092\u9001\u4FE1\u3057\u3088\u3046\u3068\u3057\u3066\u3044\u307E\u3059\u306E\u3067\u3001\u7121\u8996\u3057\u307E\u3059\u3002 -MailSender.NoAddress=\u30E1\u30FC\u30EB\u30A2\u30C9\u30EC\u30B9\u304C\u4E0D\u660E\u3067\u3001\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u30C9\u30E1\u30A4\u30F3\u3082\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u306A\u3044\u306E\u3067\u3001{0}\u5B9B\u306E\u30E1\u30FC\u30EB\u9001\u4FE1\u306B\u5931\u6557\u3057\u307E\u3057\u305F\u3002 -MailSender.BackToNormal.Normal=\u6B63\u5E38 -MailSender.BackToNormal.Stable=\u5B89\u5B9A -MailSender.BackToNormalMail.Subject=Hudson\u306E\u30D3\u30EB\u30C9\u304C{0}\u306B\u623B\u308A\u307E\u3057\u305F: -MailSender.UnstableMail.Subject=Hudson\u306E\u30D3\u30EB\u30C9\u304C\u4E0D\u5B89\u5B9A\u3067\u3059: -MailSender.UnstableMail.ToUnStable.Subject=Hudson\u306E\u30D3\u30EB\u30C9\u304C\u4E0D\u5B89\u5B9A\u306B\u306A\u308A\u307E\u3057\u305F: -MailSender.UnstableMail.StillUnstable.Subject=Hudson\u306E\u30D3\u30EB\u30C9\u306F\u307E\u3060\u4E0D\u5B89\u5B9A\u306E\u307E\u307E\u3067\u3059: -MailSender.FailureMail.Subject=Hudson\u306E\u30D3\u30EB\u30C9\u304C\u5931\u6557\u3057\u307E\u3057\u305F: -MailSender.FailureMail.Changes=\u5909\u66F4\u5C65\u6B74: -MailSender.FailureMail.FailedToAccessBuildLog=\u30D3\u30EB\u30C9\u30ED\u30B0\u306E\u53D6\u5F97\u306B\u5931\u6557\u3057\u307E\u3057\u305F\u3002 -MailSender.Link=<{0}{1}>\u3092\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002 +MailSender.ListEmpty=\u53d7\u4fe1\u8005\u3092\u6307\u5b9a\u305b\u305a\u306b\u30e1\u30fc\u30eb\u3092\u9001\u4fe1\u3057\u3088\u3046\u3068\u3057\u3066\u3044\u307e\u3059\u306e\u3067\u3001\u7121\u8996\u3057\u307e\u3059\u3002 +MailSender.NoAddress=\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u304c\u4e0d\u660e\u3067\u3001\u30c7\u30d5\u30a9\u30eb\u30c8\u306e\u30c9\u30e1\u30a4\u30f3\u3082\u8a2d\u5b9a\u3055\u308c\u3066\u3044\u306a\u3044\u306e\u3067\u3001{0}\u5b9b\u306e\u30e1\u30fc\u30eb\u9001\u4fe1\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 +MailSender.BackToNormal.Normal=\u6b63\u5e38 +MailSender.BackToNormal.Stable=\u5b89\u5b9a +MailSender.BackToNormalMail.Subject=Hudson\u306e\u30d3\u30eb\u30c9\u304c{0}\u306b\u623b\u308a\u307e\u3057\u305f: +MailSender.UnstableMail.Subject=Hudson\u306e\u30d3\u30eb\u30c9\u304c\u4e0d\u5b89\u5b9a\u3067\u3059: +MailSender.UnstableMail.ToUnStable.Subject=Hudson\u306e\u30d3\u30eb\u30c9\u304c\u4e0d\u5b89\u5b9a\u306b\u306a\u308a\u307e\u3057\u305f: +MailSender.UnstableMail.StillUnstable.Subject=Hudson\u306e\u30d3\u30eb\u30c9\u306f\u307e\u3060\u4e0d\u5b89\u5b9a\u306e\u307e\u307e\u3067\u3059: +MailSender.FailureMail.Subject=Hudson\u306e\u30d3\u30eb\u30c9\u304c\u5931\u6557\u3057\u307e\u3057\u305f: +MailSender.FailureMail.Changes=\u5909\u66f4\u5c65\u6b74: +MailSender.FailureMail.FailedToAccessBuildLog=\u30d3\u30eb\u30c9\u30ed\u30b0\u306e\u53d6\u5f97\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 +MailSender.Link=<{0}{1}>\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002 -Mailer.DisplayName=E-mail\u901A\u77E5 -Mailer.Unknown.Host.Name=\u4E0D\u660E\u306A\u30DB\u30B9\u30C8\u540D\u3067\u3059\u3002: -Mailer.Suffix.Error=\u3053\u306E\u30D5\u30A3\u30FC\u30EB\u30C9\u306B\u306F@\u306B\u3064\u3065\u3051\u3066\u30C9\u30E1\u30A4\u30F3\u540D\u3092\u8A2D\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002 -Mailer.Address.Not.Configured=\u307E\u3060\u30A2\u30C9\u30EC\u30B9\u304C\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002 -Mailer.Localhost.Error=localhost\u306E\u4EE3\u308F\u308A\u306B\u59A5\u5F53\u306A\u30DB\u30B9\u30C8\u540D\u3092\u8A2D\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002 +Mailer.DisplayName=E-mail\u901a\u77e5 +Mailer.Unknown.Host.Name=\u4e0d\u660e\u306a\u30db\u30b9\u30c8\u540d\u3067\u3059\u3002: +Mailer.Suffix.Error=\u3053\u306e\u30d5\u30a3\u30fc\u30eb\u30c9\u306b\u306f@\u306b\u3064\u3065\u3051\u3066\u30c9\u30e1\u30a4\u30f3\u540d\u3092\u8a2d\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +Mailer.Address.Not.Configured=\u307e\u3060\u30a2\u30c9\u30ec\u30b9\u304c\u8a2d\u5b9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002 +Mailer.Localhost.Error=localhost\u306e\u4ee3\u308f\u308a\u306b\u59a5\u5f53\u306a\u30db\u30b9\u30c8\u540d\u3092\u8a2d\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002 Mailer.UserProperty.DisplayName=E-mail -Maven.DisplayName=Maven\u306E\u547C\u3073\u51FA\u3057 -Maven.ExecFailed=\u30B3\u30DE\u30F3\u30C9\u306E\u5B9F\u884C\u306B\u5931\u6557\u3057\u307E\u3057\u305F -Maven.NotMavenDirectory={0}\u306B\u306FMaven\u304C\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3055\u308C\u3066\u3044\u306A\u3044\u3088\u3046\u3067\u3059 -Maven.NoExecutable={0} \u306B\u5B9F\u884C\u5F62\u5F0F\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093 -Maven.NotADirectory={0}\u306F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3067\u306F\u3042\u308A\u307E\u305B\u3093 +Maven.DisplayName=Maven\u306e\u547c\u3073\u51fa\u3057 +Maven.ExecFailed=\u30b3\u30de\u30f3\u30c9\u306e\u5b9f\u884c\u306b\u5931\u6557\u3057\u307e\u3057\u305f +Maven.NotMavenDirectory={0}\u306b\u306fMaven\u304c\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3055\u308c\u3066\u3044\u306a\u3044\u3088\u3046\u3067\u3059 +Maven.NoExecutable={0} \u306b\u5b9f\u884c\u5f62\u5f0f\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093 +Maven.NotADirectory={0}\u306f\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3067\u306f\u3042\u308a\u307e\u305b\u3093 -Shell.DisplayName=\u30B7\u30A7\u30EB\u306E\u5B9F\u884C +Shell.DisplayName=\u30b7\u30a7\u30eb\u306e\u5b9f\u884c diff --git a/core/src/main/resources/hudson/tasks/junit/History/index_ja.properties b/core/src/main/resources/hudson/tasks/junit/History/index_ja.properties index f505fb0385..aabcfd20c4 100644 --- a/core/src/main/resources/hudson/tasks/junit/History/index_ja.properties +++ b/core/src/main/resources/hudson/tasks/junit/History/index_ja.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Seiji Sogabe +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Seiji Sogabe # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -20,4 +20,6 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -title={0}\u306E\u5C65\u6B74 +title={0}\u306e\u5c65\u6b74 +More\ than\ 1\ builds\ are\ needed\ for\ the\ chart.=\ + \u30c1\u30e3\u30fc\u30c8\u3092\u8868\u793a\u3059\u308b\u306b\u306f\u30012\u500b\u4ee5\u4e0a\u306e\u30d3\u30eb\u30c9\u304c\u5fc5\u8981\u3067\u3059\u3002 \ No newline at end of file diff --git a/core/src/main/resources/hudson/tools/Messages_ja.properties b/core/src/main/resources/hudson/tools/Messages_ja.properties index 1dcbd0a1e1..1e06377963 100644 --- a/core/src/main/resources/hudson/tools/Messages_ja.properties +++ b/core/src/main/resources/hudson/tools/Messages_ja.properties @@ -1,6 +1,6 @@ # The MIT License # -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Seiji Sogabe +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Seiji Sogabe # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -20,17 +20,17 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -ToolLocationNodeProperty.displayName=\u30C4\u30FC\u30EB\u30D1\u30B9 -CommandInstaller.DescriptorImpl.displayName=\u30B3\u30DE\u30F3\u30C9\u5B9F\u884C -CommandInstaller.no_command=\u5B9F\u884C\u3059\u308B\u30B3\u30DE\u30F3\u30C9\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002 -CommandInstaller.no_toolHome=\u30C4\u30FC\u30EB\u306E\u30DB\u30FC\u30E0\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002 -JDKInstaller.FailedToInstallJDK=JDK\u306E\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u306B\u5931\u6557\u3057\u307E\u3057\u305F\u3002 -JDKInstaller.UnableToInstallUntilLicenseAccepted=\u4F7F\u7528\u8A31\u8AFE\u306B\u540C\u610F\u3057\u306A\u3044\u3068\u81EA\u52D5\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3067\u304D\u307E\u305B\u3093\u3002 -ZipExtractionInstaller.DescriptorImpl.displayName=*.zip/*.tar.gz\u5C55\u958B -ZipExtractionInstaller.bad_connection=\u30B5\u30FC\u30D0\u304C\u63A5\u7D9A\u3092\u62D2\u5426\u3057\u307E\u3057\u305F\u3002 -ZipExtractionInstaller.malformed_url=URL\u306E\u5F62\u5F0F\u304C\u8AA4\u3063\u3066\u3044\u307E\u3059\u3002 -ZipExtractionInstaller.could_not_connect=URL\u306B\u63A5\u7D9A\u3067\u304D\u307E\u305B\u3093\u3002 -InstallSourceProperty.DescriptorImpl.displayName=\u81EA\u52D5\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB -JDKInstaller.DescriptorImpl.displayName=java.sun.com\u304B\u3089\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB -JDKInstaller.DescriptorImpl.doCheckId=JDK\u306EID\u3092\u5B9A\u7FA9\u3057\u3066\u304F\u3060\u3055\u3044\u3002 -JDKInstaller.DescriptorImpl.doCheckAcceptLicense=JDK\u3092\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u3059\u308B\u306B\u306F\u4F7F\u7528\u8A31\u8AFE\u306B\u540C\u610F\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002 +ToolLocationNodeProperty.displayName=\u30c4\u30fc\u30eb\u30d1\u30b9 +CommandInstaller.DescriptorImpl.displayName=\u30b3\u30de\u30f3\u30c9\u5b9f\u884c +CommandInstaller.no_command=\u5b9f\u884c\u3059\u308b\u30b3\u30de\u30f3\u30c9\u3092\u6307\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +CommandInstaller.no_toolHome=\u30c4\u30fc\u30eb\u306e\u30db\u30fc\u30e0\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3092\u6307\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +JDKInstaller.FailedToInstallJDK=JDK\u306e\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002Exit code={0}s +JDKInstaller.UnableToInstallUntilLicenseAccepted=\u4f7f\u7528\u8a31\u8afe\u306b\u540c\u610f\u3057\u306a\u3044\u3068\u81ea\u52d5\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3067\u304d\u307e\u305b\u3093\u3002 +ZipExtractionInstaller.DescriptorImpl.displayName=*.zip/*.tar.gz\u5c55\u958b +ZipExtractionInstaller.bad_connection=\u30b5\u30fc\u30d0\u304c\u63a5\u7d9a\u3092\u62d2\u5426\u3057\u307e\u3057\u305f\u3002 +ZipExtractionInstaller.malformed_url=URL\u306e\u5f62\u5f0f\u304c\u8aa4\u3063\u3066\u3044\u307e\u3059\u3002 +ZipExtractionInstaller.could_not_connect=URL\u306b\u63a5\u7d9a\u3067\u304d\u307e\u305b\u3093\u3002 +InstallSourceProperty.DescriptorImpl.displayName=\u81ea\u52d5\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb +JDKInstaller.DescriptorImpl.displayName=java.sun.com\u304b\u3089\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb +JDKInstaller.DescriptorImpl.doCheckId=JDK\u306eID\u3092\u5b9a\u7fa9\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +JDKInstaller.DescriptorImpl.doCheckAcceptLicense=JDK\u3092\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u3059\u308b\u306b\u306f\u4f7f\u7528\u8a31\u8afe\u306b\u540c\u610f\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 diff --git a/war/resources/help/view-config/statusFilter_ja.html b/war/resources/help/view-config/statusFilter_ja.html new file mode 100644 index 0000000000..a56afd6d01 --- /dev/null +++ b/war/resources/help/view-config/statusFilter_ja.html @@ -0,0 +1,3 @@ +
    + 有効/無効によりジョブリストをフィルターします。 +
    -- GitLab From 76bffc7683dacdca52b58c2f0f3b8f921b41a06b Mon Sep 17 00:00:00 2001 From: kohsuke Date: Mon, 26 Jul 2010 18:38:31 +0000 Subject: [PATCH 061/336] wrong signature. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33219 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/util/jna/GNUCLibrary.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/java/hudson/util/jna/GNUCLibrary.java b/core/src/main/java/hudson/util/jna/GNUCLibrary.java index 844384f6da..19b2170674 100644 --- a/core/src/main/java/hudson/util/jna/GNUCLibrary.java +++ b/core/src/main/java/hudson/util/jna/GNUCLibrary.java @@ -54,7 +54,7 @@ public interface GNUCLibrary extends Library { int getdtablesize(); int execv(String file, StringArray args); - int setenv(String name, String value); + int setenv(String name, String value,int replace); int unsetenv(String name); void perror(String msg); String strerror(int errno); -- GitLab From b7f59a239df11701b8952ef130a6ced4bdcf4bab Mon Sep 17 00:00:00 2001 From: kohsuke Date: Mon, 26 Jul 2010 18:42:13 +0000 Subject: [PATCH 062/336] Merged revisions 33170,33214,33216 via svnmerge from https://www.dev.java.net/svn/hudson/branches/rc ........ r33170 | kohsuke | 2010-07-22 10:52:11 -0700 (Thu, 22 Jul 2010) | 2 lines Sending stats to a new location. ........ r33214 | kohsuke | 2010-07-26 10:50:43 -0700 (Mon, 26 Jul 2010) | 1 line [maven-release-plugin] prepare release hudson-1_368 ........ r33216 | kohsuke | 2010-07-26 10:51:04 -0700 (Mon, 26 Jul 2010) | 1 line [maven-release-plugin] prepare for next development iteration ........ git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33220 71c3de6d-444a-0410-be80-ed276b4c234a --- cli/pom.xml | 2 +- core/pom.xml | 2 +- .../main/resources/hudson/model/UsageStatistics/footer.jelly | 2 +- maven-agent/pom.xml | 2 +- maven-interceptor/pom.xml | 2 +- maven-plugin/pom.xml | 2 +- pom.xml | 2 +- remoting/pom.xml | 2 +- test/pom.xml | 2 +- ui-samples-plugin/pom.xml | 2 +- war/pom.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index dec4012c32..ba53d17478 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -4,7 +4,7 @@ pom org.jvnet.hudson.main - 1.368-SNAPSHOT + 1.369-SNAPSHOT cli Hudson CLI diff --git a/core/pom.xml b/core/pom.xml index 3036e537c1..2682724962 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.368-SNAPSHOT + 1.369-SNAPSHOT ../pom.xml diff --git a/core/src/main/resources/hudson/model/UsageStatistics/footer.jelly b/core/src/main/resources/hudson/model/UsageStatistics/footer.jelly index e8f2c3eeb1..341675b165 100644 --- a/core/src/main/resources/hudson/model/UsageStatistics/footer.jelly +++ b/core/src/main/resources/hudson/model/UsageStatistics/footer.jelly @@ -33,7 +33,7 @@ THE SOFTWARE. diff --git a/maven-agent/pom.xml b/maven-agent/pom.xml index 9b14fcd46a..6a50df2165 100644 --- a/maven-agent/pom.xml +++ b/maven-agent/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.368-SNAPSHOT + 1.369-SNAPSHOT ../pom.xml diff --git a/maven-interceptor/pom.xml b/maven-interceptor/pom.xml index 15b69b4a8f..e2eeed39a7 100644 --- a/maven-interceptor/pom.xml +++ b/maven-interceptor/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.368-SNAPSHOT + 1.369-SNAPSHOT ../pom.xml diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index efc05fba30..e659893fe7 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.368-SNAPSHOT + 1.369-SNAPSHOT maven-plugin diff --git a/pom.xml b/pom.xml index 2ff8127aa7..df2ce20b9a 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.368-SNAPSHOT + 1.369-SNAPSHOT pom Hudson main module diff --git a/remoting/pom.xml b/remoting/pom.xml index 2d22bb49d7..1befa4e9d0 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.368-SNAPSHOT + 1.369-SNAPSHOT ../pom.xml diff --git a/test/pom.xml b/test/pom.xml index 1d2686bf22..aa2184dd45 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. pom org.jvnet.hudson.main - 1.368-SNAPSHOT + 1.369-SNAPSHOT 4.0.0 org.jvnet.hudson.main diff --git a/ui-samples-plugin/pom.xml b/ui-samples-plugin/pom.xml index 8cfbeadbf1..87037ce991 100644 --- a/ui-samples-plugin/pom.xml +++ b/ui-samples-plugin/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.368-SNAPSHOT + 1.369-SNAPSHOT ui-samples-plugin diff --git a/war/pom.xml b/war/pom.xml index 67ecddcb0f..33b9c717ec 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.368-SNAPSHOT + 1.369-SNAPSHOT ../pom.xml -- GitLab From 98b2edad7dc6a1946480afe7585da09cf8ff29a8 Mon Sep 17 00:00:00 2001 From: kuuyee Date: Tue, 27 Jul 2010 09:23:19 +0000 Subject: [PATCH 063/336] fixed "#\ of\ executors" can not be displayed git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33237 71c3de6d-444a-0410-be80-ed276b4c234a --- .../hudson/model/Hudson/configure_zh_CN.properties | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/core/src/main/resources/hudson/model/Hudson/configure_zh_CN.properties b/core/src/main/resources/hudson/model/Hudson/configure_zh_CN.properties index 5f070a9c53..1a444d7b33 100644 --- a/core/src/main/resources/hudson/model/Hudson/configure_zh_CN.properties +++ b/core/src/main/resources/hudson/model/Hudson/configure_zh_CN.properties @@ -20,8 +20,8 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -#\ of\ executors=\u6267\u884C\u8005\u6570\u91CF -Home\ directory=\u4E3B\u76EE\u5F55 -Quiet\ period=\u751F\u6210\u524D\u7B49\u5F85\u65F6\u95F4 -SCM\ checkout\ retry\ count=SCM\u7B7E\u51FA\u91CD\u8BD5\u6B21\u6570 -System\ Message=\u7CFB\u7EDF\u6D88\u606F +\#\ of\ executors=\u6267\u884c\u8005\u6570\u91cf +Home\ directory=\u4e3b\u76ee\u5f55 +Quiet\ period=\u751f\u6210\u524d\u7b49\u5f85\u65f6\u95f4 +SCM\ checkout\ retry\ count=SCM\u7b7e\u51fa\u91cd\u8bd5\u6b21\u6570 +System\ Message=\u7cfb\u7edf\u6d88\u606f -- GitLab From ae354a961a7cb0016642e9fb9c9a9d5446efb887 Mon Sep 17 00:00:00 2001 From: abayer Date: Tue, 27 Jul 2010 16:32:30 +0000 Subject: [PATCH 064/336] [FIXED HUDSON-6429] Check for null results to handle aborted incremental Maven builds - thanks to kutzi for the patch git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33250 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/model/Run.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/hudson/model/Run.java b/core/src/main/java/hudson/model/Run.java index 2cf8f9692e..582d8b5526 100644 --- a/core/src/main/java/hudson/model/Run.java +++ b/core/src/main/java/hudson/model/Run.java @@ -654,7 +654,8 @@ public abstract class Run ,RunT extends Run Date: Tue, 27 Jul 2010 22:38:53 +0000 Subject: [PATCH 065/336] use last hpi plugin version git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33269 71c3de6d-444a-0410-be80-ed276b4c234a --- maven-plugin/pom.xml | 2 +- ui-samples-plugin/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index e659893fe7..99bc700bb1 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -129,7 +129,7 @@ THE SOFTWARE. org.jvnet.hudson.tools maven-hpi-plugin - 1.51 + 1.54 true true diff --git a/ui-samples-plugin/pom.xml b/ui-samples-plugin/pom.xml index 87037ce991..31debf3fba 100644 --- a/ui-samples-plugin/pom.xml +++ b/ui-samples-plugin/pom.xml @@ -82,7 +82,7 @@ THE SOFTWARE. org.jvnet.hudson.tools maven-hpi-plugin - 1.51 + 1.54 true true -- GitLab From 25618b8008dfc040344915467d2a7df921e7c698 Mon Sep 17 00:00:00 2001 From: kuuyee Date: Wed, 28 Jul 2010 09:33:56 +0000 Subject: [PATCH 066/336] Added first batch of Chinese localization of HTML help/properties files. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33290 71c3de6d-444a-0410-be80-ed276b4c234a --- .../help-user-group_zh_CN.html | 7 +++ .../help_zh_CN.html | 13 ++++ .../hudson/security/Messages_zh_CN.properties | 63 +++++++++++++++++++ .../help_zh_CN.html | 9 +++ .../project-config/quietPeriod_zh_CN.html | 16 +++++ .../scmCheckoutRetryCount_zh_CN.html | 3 + .../help/security/container-realm_zh_CN.html | 13 ++++ .../full-control-once-logged-in_zh_CN.html | 6 ++ .../help/security/no-authorization_zh_CN.html | 7 +++ .../private-realm/allow-signup_zh_CN.html | 7 +++ .../help/security/private-realm_zh_CN.html | 5 ++ .../system-config/enableSecurity_zh_CN.html | 14 +++++ .../system-config/homeDirectory_zh_CN.html | 14 +++++ .../master-slave/numExecutors_zh_CN.html | 11 ++++ .../master-slave/slave-agent-port_zh_CN.html | 5 ++ .../system-config/systemMessage_zh_CN.html | 5 ++ 16 files changed, 198 insertions(+) create mode 100644 core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help-user-group_zh_CN.html create mode 100644 core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help_zh_CN.html create mode 100644 core/src/main/resources/hudson/security/Messages_zh_CN.properties create mode 100644 core/src/main/resources/hudson/security/ProjectMatrixAuthorizationStrategy/help_zh_CN.html create mode 100644 war/resources/help/project-config/quietPeriod_zh_CN.html create mode 100644 war/resources/help/project-config/scmCheckoutRetryCount_zh_CN.html create mode 100644 war/resources/help/security/container-realm_zh_CN.html create mode 100644 war/resources/help/security/full-control-once-logged-in_zh_CN.html create mode 100644 war/resources/help/security/no-authorization_zh_CN.html create mode 100644 war/resources/help/security/private-realm/allow-signup_zh_CN.html create mode 100644 war/resources/help/security/private-realm_zh_CN.html create mode 100644 war/resources/help/system-config/enableSecurity_zh_CN.html create mode 100644 war/resources/help/system-config/homeDirectory_zh_CN.html create mode 100644 war/resources/help/system-config/master-slave/numExecutors_zh_CN.html create mode 100644 war/resources/help/system-config/master-slave/slave-agent-port_zh_CN.html create mode 100644 war/resources/help/system-config/systemMessage_zh_CN.html diff --git a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help-user-group_zh_CN.html b/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help-user-group_zh_CN.html new file mode 100644 index 0000000000..574be20a90 --- /dev/null +++ b/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help-user-group_zh_CN.html @@ -0,0 +1,7 @@ +
    + 注意在添加LDAP权限组的时候需要用特殊语法.默认配置中的所有LDAP组在这里输入的时候都要加上一个前缀"ROLE_"并全部转为大写. + 例如,一个被叫做"devs"的组在输入时应该是"ROLE_DEVS".要调整这个前缀策略你需要编辑WEB-INF/security/LDAPBindSecurityRealm.groovy,这个文件在你Hudson的部属目录下,然后需要重启Hudson. + +

    + 有一个特殊的组"authenticated"总是可用的,它代表所有已认证(已登录)用户. +

    diff --git a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help_zh_CN.html b/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help_zh_CN.html new file mode 100644 index 0000000000..94d325744d --- /dev/null +++ b/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help_zh_CN.html @@ -0,0 +1,13 @@ +
    + 在这种授权模型中,你可以通过一个大的表格来配置什么用户可以做什么事. + +

    + 每一列代表一个权限.把鼠标移动到权限名称上可以查看更详细的权限说明信息. + +

    + 每一行代表一个用户或组(通常称为'角色',取决于安全范围.),这其中包含特殊用户'anonymous',其代表未登录用户,同样还有'authenticated',其代表所有已认证的用户(也就是除了匿名用户的所有用户.) + 可以使用表格下方的输入框来添加新的用户/组/角色到表格中,并且可以点击[x]图标将其从表格中删除. + +

    + 权限是追加的,这说明如果一个用户X在A,B,C三个组中,那么X的权限是联合了X,A,B,C和匿名用户的所有权限. +

    diff --git a/core/src/main/resources/hudson/security/Messages_zh_CN.properties b/core/src/main/resources/hudson/security/Messages_zh_CN.properties new file mode 100644 index 0000000000..9cef51352a --- /dev/null +++ b/core/src/main/resources/hudson/security/Messages_zh_CN.properties @@ -0,0 +1,63 @@ +# The MIT License +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Eric Lefevre-Ardant, Seiji Sogabe +# +# 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. + +GlobalMatrixAuthorizationStrategy.DisplayName=\u5b89\u5168\u77e9\u9635 + +LegacyAuthorizationStrategy.DisplayName=\u9057\u7559\u6a21\u5f0f + +HudsonPrivateSecurityRealm.DisplayName=Hudson\u4e13\u6709\u7528\u6237\u6570\u636e\u5e93 +HudsonPrivateSecurityRealm.Details.DisplayName=\u5bc6\u7801 +HudsonPrivateSecurityRealm.Details.PasswordError=\ + \u786e\u8ba4\u5bc6\u7801\u4e0e\u7b2c\u4e00\u6b21\u8f93\u5165\u7684\u4e0d\u4e00\u81f4. \ + \u8bf7\u786e\u8ba4\u4e24\u6b21\u5bc6\u7801\u8f93\u5165\u76f8\u540c. +HudsonPrivateSecurityRealm.ManageUserLinks.DisplayName=\u7ba1\u7406\u7528\u6237 +HudsonPrivateSecurityRealm.ManageUserLinks.Description=\u521b\u5efa/\u5220\u9664/\u4fee\u6539Hudson\u7528\u6237 + +FullControlOnceLoggedInAuthorizationStrategy.DisplayName=\u767b\u5f55\u7528\u6237\u53ef\u4ee5\u505a\u4efb\u4f55\u4e8b + +AuthorizationStrategy.DisplayName=\u4efb\u4f55\u7528\u6237\u53ef\u4ee5\u505a\u4efb\u4f55\u4e8b(\u6ca1\u6709\u4efb\u4f55\u9650\u5236) + +LDAPSecurityRealm.DisplayName=LDAP +LDAPSecurityRealm.SyntaxOfServerField=Syntax of server field is SERVER or SERVER:PORT or ldaps://SERVER[:PORT] +LDAPSecurityRealm.UnknownHost=Unknown host: {0} +LDAPSecurityRealm.UnableToConnect=Unable to connect to {0} : {1} +LDAPSecurityRealm.InvalidPortNumber=Invalid port number + +LegacySecurityRealm.Displayname=Servlet\u5bb9\u5668\u4ee3\u7406 + +UserDetailsServiceProxy.UnableToQuery=\u6ca1\u6709\u68c0\u7d22\u5230\u8fd9\u4e2a\u7528\u6237\u4fe1\u606f: {0} + +ProjectMatrixAuthorizationStrategy.DisplayName=\u9879\u76ee\u77e9\u9635\u6388\u6743\u7b56\u7565 + +PAMSecurityRealm.DisplayName=Unix\u7528\u6237/\u7ec4\u6570\u636e\u5e93 +PAMSecurityRealm.ReadPermission=Hudson\u9700\u8981\u6709/etc/shadow\u8bfb\u7684\u6743\u9650 +PAMSecurityRealm.BelongToGroup={0}\u5fc5\u987b\u5c5e\u4e8e{1}\u7ec4\u6765\u8bfb\u53d6/etc/shadow +PAMSecurityRealm.RunAsUserOrBelongToGroupAndChmod=\ + Either Hudson needs to run as {0} or {1} needs to belong to group {2} and ''chmod g+r /etc/shadow'' needs to be done to enable Hudson to read /etc/shadow +PAMSecurityRealm.Success=\u6210\u529f +PAMSecurityRealm.User=\u7528\u6237 ''{0}'' +PAMSecurityRealm.CurrentUser=\u5f53\u524d\u7528\u6237 +PAMSecurityRealm.Uid=uid: {0} + +# not in use +Permission.Permissions.Title=N/A +AccessDeniedException2.MissingPermission={0}\u6ca1\u6709{1}\u6743\u9650 diff --git a/core/src/main/resources/hudson/security/ProjectMatrixAuthorizationStrategy/help_zh_CN.html b/core/src/main/resources/hudson/security/ProjectMatrixAuthorizationStrategy/help_zh_CN.html new file mode 100644 index 0000000000..5cdd5cdd10 --- /dev/null +++ b/core/src/main/resources/hudson/security/ProjectMatrixAuthorizationStrategy/help_zh_CN.html @@ -0,0 +1,9 @@ +
    + 这个授权模型扩展自"安全矩阵",允许把下面的ACL(访问控制列表)矩阵附加到每个项目定义中(在Job配置页面). + +

    + 这允许你宣布类似这样的声明"约翰能够访问A,B和C,但是不能访问D." 查看"安全矩阵"的帮助文档来了解安全矩阵. + +

    + ACL配置是追加的,就是说下面的访问控制会追加到所有的项目配置中。 +

    diff --git a/war/resources/help/project-config/quietPeriod_zh_CN.html b/war/resources/help/project-config/quietPeriod_zh_CN.html new file mode 100644 index 0000000000..7d56dc2971 --- /dev/null +++ b/war/resources/help/project-config/quietPeriod_zh_CN.html @@ -0,0 +1,16 @@ +
    + 如果设置此选项，一个计划中的构建在开始之前需要等待选项中设置的秒数。 + 这会对下面的情况非常有用： +
      +
    • + 合并多封CVS变更通知邮件为一封(当一次提交跨越多个目录时，一些CVS的变更日志邮件发生脚本会接二连三的生成多封通知邮件)。 +
      • +
    • + 如果你的编码风格导致你更改一个逻辑需要几次cvs/svn操作，那么设置一个较长时间的等待会防止Hudson过早的构建而失败。 +
      • +
    • + 节省构建。如果你的Hudson有太多并且高频率的构建，设置长时间的等待会舒缓这些构建。 +
      • +
    + 如果没有在项目级别设置此项，则会使用系统默认值。 +
    \ No newline at end of file diff --git a/war/resources/help/project-config/scmCheckoutRetryCount_zh_CN.html b/war/resources/help/project-config/scmCheckoutRetryCount_zh_CN.html new file mode 100644 index 0000000000..0355fc0a6b --- /dev/null +++ b/war/resources/help/project-config/scmCheckoutRetryCount_zh_CN.html @@ -0,0 +1,3 @@ +
    + 如果从版本库签出代码失败,Hudson会按照这个指定的次数进行重试之后再放弃. +
    \ No newline at end of file diff --git a/war/resources/help/security/container-realm_zh_CN.html b/war/resources/help/security/container-realm_zh_CN.html new file mode 100644 index 0000000000..fe986975b8 --- /dev/null +++ b/war/resources/help/security/container-realm_zh_CN.html @@ -0,0 +1,13 @@ +
    + 使用Servlet容器认证用户,按照Servlet规范. + 这是Hudson1.163版本遗留的历史.这主要对下列情况非常有用： + +
      +
    1. + 你使用1.164之前版本的Hudson并且愿意继续使用. +
      2. +
    2. + 你已经在你的容器上配置了很好的安全范围,并且宁愿Hudson使用它.(有些容器提供更好的文档或者能够定制实现用户的安全范围) +
      3. +
    +
    \ No newline at end of file diff --git a/war/resources/help/security/full-control-once-logged-in_zh_CN.html b/war/resources/help/security/full-control-once-logged-in_zh_CN.html new file mode 100644 index 0000000000..2d803ddee6 --- /dev/null +++ b/war/resources/help/security/full-control-once-logged-in_zh_CN.html @@ -0,0 +1,6 @@ +
    + 这种授权模式下,每个登录用户都持有对Hudson的全部控制权限.只有匿名用户没有全部控制权,匿名用户只有查看权限. + +

    + 这种授权模式的好处是强制用户登录后才能执行操作,这样你可以随时记录谁都做了什么操作.这种设置也适用于公共使用的Hudson,只有你信任的人才拥有账户. +

    \ No newline at end of file diff --git a/war/resources/help/security/no-authorization_zh_CN.html b/war/resources/help/security/no-authorization_zh_CN.html new file mode 100644 index 0000000000..d35c5479b1 --- /dev/null +++ b/war/resources/help/security/no-authorization_zh_CN.html @@ -0,0 +1,7 @@ +
    + 不执行任何授权,任何人都能完全控制Hudson,这包括没有登录的匿名用户. + +

    + 这种情况对于可信任的环境(比如公司内网)非常有用,或者你只是使用授权做一些个性化的支持.这样的话,如果某人想快速的更改Hudson,他就能够避免被强制登录. + +

    \ No newline at end of file diff --git a/war/resources/help/security/private-realm/allow-signup_zh_CN.html b/war/resources/help/security/private-realm/allow-signup_zh_CN.html new file mode 100644 index 0000000000..f042f1fa13 --- /dev/null +++ b/war/resources/help/security/private-realm/allow-signup_zh_CN.html @@ -0,0 +1,7 @@ +
    + Hudson默认允许用户自己注册一个新账号,通过点击页面右上角的"注册"链接进行操作. + 但是如果你想禁止任意注册新账号,而使用严格的方式控制账号创建,那么要取消这个选框。 + +

    + 当这个选框被取消,就必须使用系统管理员来创建账号. +

    \ No newline at end of file diff --git a/war/resources/help/security/private-realm_zh_CN.html b/war/resources/help/security/private-realm_zh_CN.html new file mode 100644 index 0000000000..abc1cb1347 --- /dev/null +++ b/war/resources/help/security/private-realm_zh_CN.html @@ -0,0 +1,5 @@ +
    + 使用Hudson自己的用户列表验证, + 而不是外部系统代理. + 这适用于没有用户数据库小范围的设定. +
    \ No newline at end of file diff --git a/war/resources/help/system-config/enableSecurity_zh_CN.html b/war/resources/help/system-config/enableSecurity_zh_CN.html new file mode 100644 index 0000000000..5e19664e7e --- /dev/null +++ b/war/resources/help/system-config/enableSecurity_zh_CN.html @@ -0,0 +1,14 @@ +
    + 如果启动此项,你必须使用用户名/密码登录才能配置和执行构建,并且用户要具有"admin"权限(在页面的右上角会看到"login"链接). + 配置用户账户取决于你使用哪种Web容器.(比如,在Tomcat中,默认在$TOMCAT_HOME/conf/tomcat-users.xml中配置) + +

    + 如果你的Hudson在内网环境(或者是一个"可信任"的环境),通常会禁用此项,以便项目开发人员能够配置他们自己的项目,而不用麻烦你. + +

    + 如果你的Hudson暴露在公网环境,你最好启用此项.Hudson如果在一个不安全的环境下必定会遭到黑客的攻击. + +

    + 更多Hudson安全相关信息,请看 + 这个文档. +

    \ No newline at end of file diff --git a/war/resources/help/system-config/homeDirectory_zh_CN.html b/war/resources/help/system-config/homeDirectory_zh_CN.html new file mode 100644 index 0000000000..3fd9d3a7a9 --- /dev/null +++ b/war/resources/help/system-config/homeDirectory_zh_CN.html @@ -0,0 +1,14 @@ +
    + Hudson储存所有的数据文件在这个目录下. + 你可以通过以下几种方式更改： +
      +
    1. + 使用你Web容器的管理工具设置HUDSON_HOME环境参数. +
    2. + 在启动Web容器之前设置HUDSON_HOME环境变量. +
    3. + (不推荐)更改hudson.war(或者在展开的Web容器)内的web.xml配置文件. +
    + 这个值在Hudson运行时是不能更改的. + 其通常用来确保你的配置是否生效. +
    \ No newline at end of file diff --git a/war/resources/help/system-config/master-slave/numExecutors_zh_CN.html b/war/resources/help/system-config/master-slave/numExecutors_zh_CN.html new file mode 100644 index 0000000000..5de041a841 --- /dev/null +++ b/war/resources/help/system-config/master-slave/numExecutors_zh_CN.html @@ -0,0 +1,11 @@ +
    + 这个值控制着Hudson并发构建的数量. + 因此这个值会影响Hudson系统的负载压力. + 使用处理器个数作为其值会是比较好的选择. + +

    + 增大这个值会使每个构建的运行时间更长,但是这能够增大整体的构建数量,因为当一个项目在等待I/O时它允许CPU去构建另一个项目. + +

    + 设置这个值为0对于从Hudson移除一个失效的从节点非常有用,并且不会丢失配置信息。 +

    \ No newline at end of file diff --git a/war/resources/help/system-config/master-slave/slave-agent-port_zh_CN.html b/war/resources/help/system-config/master-slave/slave-agent-port_zh_CN.html new file mode 100644 index 0000000000..a2597e260e --- /dev/null +++ b/war/resources/help/system-config/master-slave/slave-agent-port_zh_CN.html @@ -0,0 +1,5 @@ +
    + Hudson使用一个TCP端口和JNLP节点代理通讯. + 通常这个端口号是随机选取的,以避免冲突,但是这对于系统来说是不固定的.如果你不使用JNLP节点代理, + 推荐你禁用TCP端口.另一种选择就是指定一个不变的端口号,以便你的防火墙做对应的设置. +
    \ No newline at end of file diff --git a/war/resources/help/system-config/systemMessage_zh_CN.html b/war/resources/help/system-config/systemMessage_zh_CN.html new file mode 100644 index 0000000000..278ea01ec9 --- /dev/null +++ b/war/resources/help/system-config/systemMessage_zh_CN.html @@ -0,0 +1,5 @@ +
    + 这个信息会显示在首页顶部. + 用来向用户发布一些系统范围的通知或公告. + 兼容HTML标签格式. +
    \ No newline at end of file -- GitLab From 003b78e0209de76d21df591598c2438862de85b4 Mon Sep 17 00:00:00 2001 From: kuuyee Date: Wed, 28 Jul 2010 09:52:28 +0000 Subject: [PATCH 067/336] Amendment to "build" the present translation, change "shengcheng" to"goujian" git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33291 71c3de6d-444a-0410-be80-ed276b4c234a --- .../AbstractBuild/index_zh_CN.properties | 12 +++--- .../AbstractBuild/sidepanel_zh_CN.properties | 4 +- .../sidepanel_zh_CN.properties | 16 +++---- .../model/Computer/sidepanel_zh_CN.properties | 14 +++---- .../model/Hudson/manage_zh_CN.properties | 42 +++++++++---------- .../model/Job/buildTimeTrend_zh_CN.properties | 4 +- .../hudson/model/Run/delete_zh_CN.properties | 2 +- .../model/User/sidepanel_zh_CN.properties | 8 ++-- .../hudson/model/View/builds_zh_CN.properties | 2 +- .../model/View/sidepanel_zh_CN.properties | 6 +-- .../BuildButtonColumn/column_zh_CN.properties | 2 +- .../columnHeader_zh_CN.properties | 2 +- .../hudson/buildListTable_zh_CN.properties | 8 ++-- .../lib/hudson/executors_zh_CN.properties | 6 +-- .../lib/hudson/queue_zh_CN.properties | 8 ++-- 15 files changed, 68 insertions(+), 68 deletions(-) diff --git a/core/src/main/resources/hudson/model/AbstractBuild/index_zh_CN.properties b/core/src/main/resources/hudson/model/AbstractBuild/index_zh_CN.properties index 9105093327..a0bdbfe594 100644 --- a/core/src/main/resources/hudson/model/AbstractBuild/index_zh_CN.properties +++ b/core/src/main/resources/hudson/model/AbstractBuild/index_zh_CN.properties @@ -20,9 +20,9 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Build=\u751F\u6210 -Build\ Artifacts=\u751F\u6210Artifacts -Build\ number=\u751F\u6210\u53F7 -Permalinks=\u6C38\u4E45\u8FDE\u63A5 -Took=\u7528\u65F6 -startedAgo=\u5F00\u59CB\u4E8E{0}\u524D +Build=\u6784\u5efa +Build\ Artifacts=\u6784\u5efaArtifacts +Build\ number=\u6784\u5efa\u53f7 +Permalinks=\u6c38\u4e45\u8fde\u63a5 +Took=\u7528\u65f6 +startedAgo=\u5f00\u59cb\u4e8e{0}\u524d diff --git a/core/src/main/resources/hudson/model/AbstractBuild/sidepanel_zh_CN.properties b/core/src/main/resources/hudson/model/AbstractBuild/sidepanel_zh_CN.properties index caf79868f8..2e14edeac9 100644 --- a/core/src/main/resources/hudson/model/AbstractBuild/sidepanel_zh_CN.properties +++ b/core/src/main/resources/hudson/model/AbstractBuild/sidepanel_zh_CN.properties @@ -20,5 +20,5 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Next\ Build=\u540E\u4E00\u6B21\u751F\u6210 -Previous\ Build=\u524D\u4E00\u6B21\u751F\u6210 +Next\ Build=\u540e\u4e00\u6b21\u6784\u5efa +Previous\ Build=\u524d\u4e00\u6b21\u6784\u5efa diff --git a/core/src/main/resources/hudson/model/AbstractProject/sidepanel_zh_CN.properties b/core/src/main/resources/hudson/model/AbstractProject/sidepanel_zh_CN.properties index 13718b7d79..4bb9bfb060 100644 --- a/core/src/main/resources/hudson/model/AbstractProject/sidepanel_zh_CN.properties +++ b/core/src/main/resources/hudson/model/AbstractProject/sidepanel_zh_CN.properties @@ -20,12 +20,12 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Back\ to\ Dashboard=\u8FD4\u56DE -Build\ Now=\u7ACB\u5373\u751F\u6210 -Build\ scheduled=\u751F\u6210\u8BA1\u5212 -Changes=\u53D8\u66F4\u96C6 -Configure=\u8BBE\u7F6E -Status=\u72B6\u6001 -Wipe\ Out\ Workspace=\u6E05\u7A7A\u5DE5\u4F5C\u533A -Workspace=\u5DE5\u4F5C\u533A +Back\ to\ Dashboard=\u8fd4\u56de +Build\ Now=\u7acb\u5373\u6784\u5efa +Build\ scheduled=\u6784\u5efa\u8ba1\u5212 +Changes=\u53d8\u66f4\u96c6 +Configure=\u8bbe\u7f6e +Status=\u72b6\u6001 +Wipe\ Out\ Workspace=\u6e05\u7a7a\u5de5\u4f5c\u533a +Workspace=\u5de5\u4f5c\u533a delete=\u5220\u9664{0} diff --git a/core/src/main/resources/hudson/model/Computer/sidepanel_zh_CN.properties b/core/src/main/resources/hudson/model/Computer/sidepanel_zh_CN.properties index d5105a6829..d1d2b9b8a8 100644 --- a/core/src/main/resources/hudson/model/Computer/sidepanel_zh_CN.properties +++ b/core/src/main/resources/hudson/model/Computer/sidepanel_zh_CN.properties @@ -20,10 +20,10 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Back\ to\ List=\u8FD4\u56DE\u5217\u8868 -Build\ History=\u751F\u6210\u5386\u53F2 -Configure=\u8BBE\u7F6E -Delete\ Slave=\u5220\u9664\u5974\u96B6 -Load\ Statistics=\u8D1F\u8F7D\u7EDF\u8BA1 -Script\ Console=\u811A\u672C\u547D\u4EE4\u884C -Status=\u72B6\u6001 +Back\ to\ List=\u8fd4\u56de\u5217\u8868 +Build\ History=\u6784\u5efa\u5386\u53f2 +Configure=\u8bbe\u7f6e +Delete\ Slave=\u5220\u9664\u5974\u96b6 +Load\ Statistics=\u8d1f\u8f7d\u7edf\u8ba1 +Script\ Console=\u811a\u672c\u547d\u4ee4\u884c +Status=\u72b6\u6001 diff --git a/core/src/main/resources/hudson/model/Hudson/manage_zh_CN.properties b/core/src/main/resources/hudson/model/Hudson/manage_zh_CN.properties index 8957db3480..3d0bf62eed 100644 --- a/core/src/main/resources/hudson/model/Hudson/manage_zh_CN.properties +++ b/core/src/main/resources/hudson/model/Hudson/manage_zh_CN.properties @@ -20,25 +20,25 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Add,\ remove,\ control\ and\ monitor\ the\ various\ nodes\ that\ Hudson\ runs\ jobs\ on.=\u6DFB\u52A0\u3001\u5220\u9664\u3001\u63A7\u5236\u548C\u76D1\u89C6\u7CFB\u7EDF\u8FD0\u884C\u4EFB\u52A1\u7684\u8282\u70B9\u3002 -Add,\ remove,\ disable\ or\ enable\ plugins\ that\ can\ extend\ the\ functionality\ of\ Hudson.=\u6DFB\u52A0\u3001\u5220\u9664\u3001\u7981\u7528\u6216\u542F\u7528Hudson\u529F\u80FD\u6269\u5C55\u63D2\u4EF6\u3002 -Configure\ System=\u7CFB\u7EDF\u8BBE\u7F6E -Configure\ global\ settings\ and\ paths.=\u5168\u5C40\u8BBE\u7F6E&\u8DEF\u5F84 -Discard\ all\ the\ loaded\ data\ in\ memory\ and\ reload\ everything\ from\ file\ system.=\u653E\u5F03\u5F53\u524D\u5185\u5B58\u4E2D\u6240\u6709\u7684\u8BBE\u7F6E\u4FE1\u606F\u5E76\u4ECE\u914D\u7F6E\u6587\u4EF6\u4E2D\u91CD\u65B0\u8BFB\u53D6 -Displays\ various\ environmental\ information\ to\ assist\ trouble-shooting.=\u663E\u793A\u7CFB\u7EDF\u73AF\u5883\u4FE1\u606F\u4EE5\u5E2E\u52A9\u89E3\u51B3\u95EE\u9898\u3002 -Executes\ arbitrary\ script\ for\ administration/trouble-shooting/diagnostics.=\u6267\u884C\u7528\u4E8E\u7BA1\u7406\u6216\u6545\u969C\u63A2\u6D4B\u6216\u8BCA\u65AD\u7684\u4EFB\u610F\u811A\u672C\u547D\u4EE4\u3002 +Add,\ remove,\ control\ and\ monitor\ the\ various\ nodes\ that\ Hudson\ runs\ jobs\ on.=\u6dfb\u52a0\u3001\u5220\u9664\u3001\u63a7\u5236\u548c\u76d1\u89c6\u7cfb\u7edf\u8fd0\u884c\u4efb\u52a1\u7684\u8282\u70b9\u3002 +Add,\ remove,\ disable\ or\ enable\ plugins\ that\ can\ extend\ the\ functionality\ of\ Hudson.=\u6dfb\u52a0\u3001\u5220\u9664\u3001\u7981\u7528\u6216\u542f\u7528Hudson\u529f\u80fd\u6269\u5c55\u63d2\u4ef6\u3002 +Configure\ System=\u7cfb\u7edf\u8bbe\u7f6e +Configure\ global\ settings\ and\ paths.=\u5168\u5c40\u8bbe\u7f6e&\u8def\u5f84 +Discard\ all\ the\ loaded\ data\ in\ memory\ and\ reload\ everything\ from\ file\ system.=\u653e\u5f03\u5f53\u524d\u5185\u5b58\u4e2d\u6240\u6709\u7684\u8bbe\u7f6e\u4fe1\u606f\u5e76\u4ece\u914d\u7f6e\u6587\u4ef6\u4e2d\u91cd\u65b0\u8bfb\u53d6 +Displays\ various\ environmental\ information\ to\ assist\ trouble-shooting.=\u663e\u793a\u7cfb\u7edf\u73af\u5883\u4fe1\u606f\u4ee5\u5e2e\u52a9\u89e3\u51b3\u95ee\u9898\u3002 +Executes\ arbitrary\ script\ for\ administration/trouble-shooting/diagnostics.=\u6267\u884c\u7528\u4e8e\u7ba1\u7406\u6216\u6545\u969c\u63a2\u6d4b\u6216\u8bca\u65ad\u7684\u4efb\u610f\u811a\u672c\u547d\u4ee4\u3002 Hudson\ CLI=Hudson CLI -HudsonCliText=\u4ECE\u60A8\u547D\u4EE4\u884C\u6216\u811A\u672C\u8BBF\u95EE\u6216\u7BA1\u7406\u60A8\u7684Hudson\u3002 -Load\ Statistics=\u8D1F\u8F7D\u7EDF\u8BA1 -LoadStatisticsText=\u68C0\u67E5\u60A8\u7684\u8D44\u6E90\u5229\u7528\u60C5\u51B5\uFF0C\u770B\u770B\u662F\u5426\u9700\u8981\u66F4\u591A\u7684\u8BA1\u7B97\u673A\u6765\u5E2E\u52A9\u60A8\u751F\u6210\u3002 -Manage\ Hudson=\u7CFB\u7EDF\u7BA1\u7406 -Manage\ Nodes=\u7BA1\u7406\u8282\u70B9 -Manage\ Plugins=\u7BA1\u7406\u63D2\u4EF6 -Prepare\ for\ Shutdown=\u51C6\u5907\u5173\u673A -Reload\ Configuration\ from\ Disk=\u8BFB\u53D6\u8BBE\u7F6E -Script\ Console=\u811A\u672C\u547D\u4EE4\u884C -Stops\ executing\ new\ builds,\ so\ that\ the\ system\ can\ be\ eventually\ shut\ down\ safely.=\u505C\u6B62\u6267\u884C\u65B0\u7684\u751F\u6210\u4EFB\u52A1\u4EE5\u5B89\u5168\u5173\u95ED\u8BA1\u7B97\u673A\u3002 -System\ Information=\u7CFB\u7EDF\u4FE1\u606F -System\ Log=\u7CFB\u7EDF\u65E5\u5FD7 -SystemLogText=\u7CFB\u7EDF\u65E5\u5FD7\u4ECEjava.util.logging\u6355\u83B7Hudson\u76F8\u5173\u7684\u65E5\u5FD7\u4FE1\u606F\u3002 -Useful\ when\ you\ modified\ config\ files\ directly\ on\ disk.=\u4EC5\u7528\u4E8E\u5F53\u60A8\u624B\u52A8\u4FEE\u6539\u914D\u7F6E\u6587\u4EF6\u65F6\u91CD\u65B0\u8BFB\u53D6\u8BBE\u7F6E\u3002 +HudsonCliText=\u4ece\u60a8\u547d\u4ee4\u884c\u6216\u811a\u672c\u8bbf\u95ee\u6216\u7ba1\u7406\u60a8\u7684Hudson\u3002 +Load\ Statistics=\u8d1f\u8f7d\u7edf\u8ba1 +LoadStatisticsText=\u68c0\u67e5\u60a8\u7684\u8d44\u6e90\u5229\u7528\u60c5\u51b5\uff0c\u770b\u770b\u662f\u5426\u9700\u8981\u66f4\u591a\u7684\u8ba1\u7b97\u673a\u6765\u5e2e\u52a9\u60a8\u6784\u5efa\u3002 +Manage\ Hudson=\u7cfb\u7edf\u7ba1\u7406 +Manage\ Nodes=\u7ba1\u7406\u8282\u70b9 +Manage\ Plugins=\u7ba1\u7406\u63d2\u4ef6 +Prepare\ for\ Shutdown=\u51c6\u5907\u5173\u673a +Reload\ Configuration\ from\ Disk=\u8bfb\u53d6\u8bbe\u7f6e +Script\ Console=\u811a\u672c\u547d\u4ee4\u884c +Stops\ executing\ new\ builds,\ so\ that\ the\ system\ can\ be\ eventually\ shut\ down\ safely.=\u505c\u6b62\u6267\u884c\u65b0\u7684\u6784\u5efa\u4efb\u52a1\u4ee5\u5b89\u5168\u5173\u95ed\u8ba1\u7b97\u673a\u3002 +System\ Information=\u7cfb\u7edf\u4fe1\u606f +System\ Log=\u7cfb\u7edf\u65e5\u5fd7 +SystemLogText=\u7cfb\u7edf\u65e5\u5fd7\u4ecejava.util.logging\u6355\u83b7Hudson\u76f8\u5173\u7684\u65e5\u5fd7\u4fe1\u606f\u3002 +Useful\ when\ you\ modified\ config\ files\ directly\ on\ disk.=\u4ec5\u7528\u4e8e\u5f53\u60a8\u624b\u52a8\u4fee\u6539\u914d\u7f6e\u6587\u4ef6\u65f6\u91cd\u65b0\u8bfb\u53d6\u8bbe\u7f6e\u3002 diff --git a/core/src/main/resources/hudson/model/Job/buildTimeTrend_zh_CN.properties b/core/src/main/resources/hudson/model/Job/buildTimeTrend_zh_CN.properties index c547311566..5152e46224 100644 --- a/core/src/main/resources/hudson/model/Job/buildTimeTrend_zh_CN.properties +++ b/core/src/main/resources/hudson/model/Job/buildTimeTrend_zh_CN.properties @@ -20,5 +20,5 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Build=\u751F\u6210 -Duration=\u6301\u7EED\u65F6\u95F4 +Build=\u6784\u5efa +Duration=\u6301\u7eed\u65f6\u95f4 diff --git a/core/src/main/resources/hudson/model/Run/delete_zh_CN.properties b/core/src/main/resources/hudson/model/Run/delete_zh_CN.properties index be22c42d22..267eb056c4 100644 --- a/core/src/main/resources/hudson/model/Run/delete_zh_CN.properties +++ b/core/src/main/resources/hudson/model/Run/delete_zh_CN.properties @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Delete\ this\ build=\u5220\u9664\u672C\u6B21\u751F\u6210 +Delete\ this\ build=\u5220\u9664\u672c\u6b21\u6784\u5efa diff --git a/core/src/main/resources/hudson/model/User/sidepanel_zh_CN.properties b/core/src/main/resources/hudson/model/User/sidepanel_zh_CN.properties index 30feaeab31..9428d7ebf5 100644 --- a/core/src/main/resources/hudson/model/User/sidepanel_zh_CN.properties +++ b/core/src/main/resources/hudson/model/User/sidepanel_zh_CN.properties @@ -21,7 +21,7 @@ # THE SOFTWARE. People=\u7528\u6237 -Builds=\u751F\u6210 -Configure=\u8BBE\u7F6E -My\ Views=\u6211\u7684\u89C6\u56FE -Status=\u72B6\u6001 +Builds=\u6784\u5efa +Configure=\u8bbe\u7f6e +My\ Views=\u6211\u7684\u89c6\u56fe +Status=\u72b6\u6001 diff --git a/core/src/main/resources/hudson/model/View/builds_zh_CN.properties b/core/src/main/resources/hudson/model/View/builds_zh_CN.properties index 1a7b908bb4..d32afbb222 100644 --- a/core/src/main/resources/hudson/model/View/builds_zh_CN.properties +++ b/core/src/main/resources/hudson/model/View/builds_zh_CN.properties @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -buildHistory={0} \u7684\u751F\u6210\u5386\u53F2 +buildHistory={0} \u7684\u6784\u5efa\u5386\u53f2 diff --git a/core/src/main/resources/hudson/model/View/sidepanel_zh_CN.properties b/core/src/main/resources/hudson/model/View/sidepanel_zh_CN.properties index 3650f8abe0..27dd07e063 100644 --- a/core/src/main/resources/hudson/model/View/sidepanel_zh_CN.properties +++ b/core/src/main/resources/hudson/model/View/sidepanel_zh_CN.properties @@ -20,7 +20,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Build\ History=\u751F\u6210\u5386\u53F2 -Manage\ Hudson=\u7CFB\u7EDF\u7BA1\u7406 -New\ Job=\u65B0\u5EFA\u4EFB\u52A1 +Build\ History=\u6784\u5efa\u5386\u53f2 +Manage\ Hudson=\u7cfb\u7edf\u7ba1\u7406 +New\ Job=\u65b0\u5efa\u4efb\u52a1 People=\u7528\u6237 diff --git a/core/src/main/resources/hudson/views/BuildButtonColumn/column_zh_CN.properties b/core/src/main/resources/hudson/views/BuildButtonColumn/column_zh_CN.properties index 2acf9a92c4..1c676038a8 100644 --- a/core/src/main/resources/hudson/views/BuildButtonColumn/column_zh_CN.properties +++ b/core/src/main/resources/hudson/views/BuildButtonColumn/column_zh_CN.properties @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Schedule\ a\ build=\u8BA1\u5212\u4E00\u6B21\u751F\u6210 +Schedule\ a\ build=\u8ba1\u5212\u4e00\u6b21\u6784\u5efa diff --git a/core/src/main/resources/hudson/views/StatusColumn/columnHeader_zh_CN.properties b/core/src/main/resources/hudson/views/StatusColumn/columnHeader_zh_CN.properties index 5f06f53df9..2e377cd51b 100644 --- a/core/src/main/resources/hudson/views/StatusColumn/columnHeader_zh_CN.properties +++ b/core/src/main/resources/hudson/views/StatusColumn/columnHeader_zh_CN.properties @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Status\ of\ the\ last\ build=\u6700\u540E\u751F\u6210\u72B6\u6001 +Status\ of\ the\ last\ build=\u6700\u540e\u6784\u5efa\u72b6\u6001 diff --git a/core/src/main/resources/lib/hudson/buildListTable_zh_CN.properties b/core/src/main/resources/lib/hudson/buildListTable_zh_CN.properties index a83639a86f..c29c49ceb5 100644 --- a/core/src/main/resources/lib/hudson/buildListTable_zh_CN.properties +++ b/core/src/main/resources/lib/hudson/buildListTable_zh_CN.properties @@ -20,7 +20,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Build=\u751F\u6210 -Console\ output=\u547D\u4EE4\u884C\u8F93\u51FA -Date=\u65E5\u671F -Status=\u72B6\u6001 +Build=\u6784\u5efa +Console\ output=\u547d\u4ee4\u884c\u8f93\u51fa +Date=\u65e5\u671f +Status=\u72b6\u6001 diff --git a/core/src/main/resources/lib/hudson/executors_zh_CN.properties b/core/src/main/resources/lib/hudson/executors_zh_CN.properties index 229b369a65..1698afc168 100644 --- a/core/src/main/resources/lib/hudson/executors_zh_CN.properties +++ b/core/src/main/resources/lib/hudson/executors_zh_CN.properties @@ -20,6 +20,6 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Build\ Executor\ Status=\u751F\u6210\u72B6\u6001 -Idle=\u7A7A\u95F2 -Status=\u72B6\u6001 +Build\ Executor\ Status=\u6784\u5efa\u72b6\u6001 +Idle=\u7a7a\u95f2 +Status=\u72b6\u6001 diff --git a/core/src/main/resources/lib/hudson/queue_zh_CN.properties b/core/src/main/resources/lib/hudson/queue_zh_CN.properties index 471d1d63f0..a83b288e7e 100644 --- a/core/src/main/resources/lib/hudson/queue_zh_CN.properties +++ b/core/src/main/resources/lib/hudson/queue_zh_CN.properties @@ -20,7 +20,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Build\ Queue=\u751F\u6210\u961F\u5217 -Hudson\ is\ going\ to\ shut\ down.\ No\ further\ builds\ will\ be\ performed.=\u7CFB\u7EDF\u6B63\u5728\u5173\u95ED\u3002\u6CA1\u6709\u66F4\u591A\u7684\u751F\u6210\u4F1A\u88AB\u6267\u884C\u3002 -No\ builds\ in\ the\ queue.=\u5F53\u524D\u961F\u5217\u6CA1\u6709\u751F\u6210\u4EFB\u52A1 -cancel=\u53D6\u6D88 +Build\ Queue=\u6784\u5efa\u961f\u5217 +Hudson\ is\ going\ to\ shut\ down.\ No\ further\ builds\ will\ be\ performed.=\u7cfb\u7edf\u6b63\u5728\u5173\u95ed\u3002\u6ca1\u6709\u66f4\u591a\u7684\u6784\u5efa\u4f1a\u88ab\u6267\u884c\u3002 +No\ builds\ in\ the\ queue.=\u5f53\u524d\u961f\u5217\u6ca1\u6709\u6784\u5efa\u4efb\u52a1 +cancel=\u53d6\u6d88 -- GitLab From de0cd39fa6ee5be82d7e0fd3eac1eb78a2c4914d Mon Sep 17 00:00:00 2001 From: mindless Date: Wed, 28 Jul 2010 21:44:30 +0000 Subject: [PATCH 068/336] [FIXED HUDSON-6966] in getIndexPage(), check that result has this plugin's artifactId in it, in case plugin has dependencies but is missing its own index.jelly. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33311 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/PluginWrapper.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/hudson/PluginWrapper.java b/core/src/main/java/hudson/PluginWrapper.java index 02dfc378fd..e57ea496d3 100644 --- a/core/src/main/java/hudson/PluginWrapper.java +++ b/core/src/main/java/hudson/PluginWrapper.java @@ -174,7 +174,7 @@ public class PluginWrapper implements Comparable { * @param dependencies a list of mandatory dependencies * @param optionalDependencies a list of optional dependencies */ - public PluginWrapper(PluginManager parent, File archive, Manifest manifest, URL baseResourceURL, + public PluginWrapper(PluginManager parent, File archive, Manifest manifest, URL baseResourceURL, ClassLoader classLoader, File disableFile, List dependencies, List optionalDependencies) { this.parent = parent; @@ -187,7 +187,7 @@ public class PluginWrapper implements Comparable { this.active = !disableFile.exists(); this.dependencies = dependencies; this.optionalDependencies = optionalDependencies; - } + } /** * Returns the URL of the index page jelly script. @@ -201,7 +201,9 @@ public class PluginWrapper implements Comparable { while (en.hasMoreElements()) idx = en.nextElement(); } catch (IOException ignore) { } - return idx; + // In case plugin has dependencies but is missing its own index.jelly, + // check that result has this plugin's artifactId in it: + return idx != null && idx.toString().contains(shortName) ? idx : null; } private String computeShortName(Manifest manifest, File archive) { -- GitLab From 375c2aeea7c9ac264abcc394671e24d3b4e51ca3 Mon Sep 17 00:00:00 2001 From: kuuyee Date: Thu, 29 Jul 2010 10:09:59 +0000 Subject: [PATCH 069/336] Added second batch of Chinese localization of HTML help/properties files. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33324 71c3de6d-444a-0410-be80-ed276b4c234a --- .../hudson/model/Hudson/_cli_zh_CN.properties | 23 ++++++++++++++++ .../config_zh_CN.properties | 1 + .../config_zh_CN.properties | 23 ++++++++++++++++ .../help_zh_CN.html | 2 +- .../Details/config_zh_CN.properties | 24 +++++++++++++++++ .../_entryForm_zh_CN.properties | 27 +++++++++++++++++++ .../addUser_zh_CN.properties | 23 ++++++++++++++++ .../config_zh_CN.properties | 23 ++++++++++++++++ .../index_zh_CN.properties | 23 ++++++++++++++++ .../loginLink_zh_CN.properties | 23 ++++++++++++++++ .../sidepanel_zh_CN.properties | 23 ++++++++++++++++ .../signup_zh_CN.properties | 23 ++++++++++++++++ .../success_zh_CN.properties | 23 ++++++++++++++++ .../LDAPSecurityRealm/config_zh_CN.properties | 23 ++++++++++++++++ .../PAMSecurityRealm/config_zh_CN.properties | 23 ++++++++++++++++ .../SecurityRealm/loginLink_zh_CN.properties | 23 ++++++++++++++++ .../help/security/container-realm_zh_CN.html | 4 +-- .../security/legacy-auth-strategy_zh_CN.html | 4 +++ .../private-realm/allow-signup_zh_CN.html | 2 +- .../help/system-config/csrf_zh_CN.html | 7 +++++ 20 files changed, 343 insertions(+), 4 deletions(-) create mode 100644 core/src/main/resources/hudson/model/Hudson/_cli_zh_CN.properties create mode 100644 core/src/main/resources/hudson/security/AuthorizationMatrixProperty/config_zh_CN.properties create mode 100644 core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_zh_CN.properties create mode 100644 core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/Details/config_zh_CN.properties create mode 100644 core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_zh_CN.properties create mode 100644 core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/addUser_zh_CN.properties create mode 100644 core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/config_zh_CN.properties create mode 100644 core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_zh_CN.properties create mode 100644 core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/loginLink_zh_CN.properties create mode 100644 core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/sidepanel_zh_CN.properties create mode 100644 core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/signup_zh_CN.properties create mode 100644 core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/success_zh_CN.properties create mode 100644 core/src/main/resources/hudson/security/LDAPSecurityRealm/config_zh_CN.properties create mode 100644 core/src/main/resources/hudson/security/PAMSecurityRealm/config_zh_CN.properties create mode 100644 core/src/main/resources/hudson/security/SecurityRealm/loginLink_zh_CN.properties create mode 100644 war/resources/help/security/legacy-auth-strategy_zh_CN.html create mode 100644 war/resources/help/system-config/csrf_zh_CN.html diff --git a/core/src/main/resources/hudson/model/Hudson/_cli_zh_CN.properties b/core/src/main/resources/hudson/model/Hudson/_cli_zh_CN.properties new file mode 100644 index 0000000000..1d1e058c05 --- /dev/null +++ b/core/src/main/resources/hudson/model/Hudson/_cli_zh_CN.properties @@ -0,0 +1,23 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Hudson\ CLI=Hudson \u547d\u4ee4\u884c diff --git a/core/src/main/resources/hudson/security/AuthorizationMatrixProperty/config_zh_CN.properties b/core/src/main/resources/hudson/security/AuthorizationMatrixProperty/config_zh_CN.properties new file mode 100644 index 0000000000..d7d400a618 --- /dev/null +++ b/core/src/main/resources/hudson/security/AuthorizationMatrixProperty/config_zh_CN.properties @@ -0,0 +1 @@ +Enable\ project-based\ security=\u542f\u7528\u9879\u76ee\u5b89\u5168 diff --git a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_zh_CN.properties b/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_zh_CN.properties new file mode 100644 index 0000000000..7419152ab5 --- /dev/null +++ b/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config_zh_CN.properties @@ -0,0 +1,23 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Add=\u6dfb\u52a0 diff --git a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help_zh_CN.html b/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help_zh_CN.html index 94d325744d..72cdd35847 100644 --- a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help_zh_CN.html +++ b/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/help_zh_CN.html @@ -5,7 +5,7 @@ 每一列代表一个权限.把鼠标移动到权限名称上可以查看更详细的权限说明信息.

    - 每一行代表一个用户或组(通常称为'角色',取决于安全范围.),这其中包含特殊用户'anonymous',其代表未登录用户,同样还有'authenticated',其代表所有已认证的用户(也就是除了匿名用户的所有用户.) + 每一行代表一个用户或组(通常称为'角色',取决于安全域.),这其中包含特殊用户'anonymous',其代表未登录用户,同样还有'authenticated',其代表所有已认证的用户(也就是除了匿名用户的所有用户.) 可以使用表格下方的输入框来添加新的用户/组/角色到表格中,并且可以点击[x]图标将其从表格中删除.

    diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/Details/config_zh_CN.properties b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/Details/config_zh_CN.properties new file mode 100644 index 0000000000..02680d9dcd --- /dev/null +++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/Details/config_zh_CN.properties @@ -0,0 +1,24 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Confirm\ Password=\u786e\u8ba4\u5bc6\u7801 +Password=\u5bc6\u7801 diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_zh_CN.properties b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_zh_CN.properties new file mode 100644 index 0000000000..f4a55dc3c9 --- /dev/null +++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_zh_CN.properties @@ -0,0 +1,27 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Confirm\ password=\u786e\u8ba4\u5bc6\u7801 +E-mail\ address=\u7535\u5b50\u90ae\u4ef6\u5730\u5740 +Full\ name=\u5168\u540d +Password=\u5bc6\u7801 +Username=\u7528\u6237\u540d diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/addUser_zh_CN.properties b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/addUser_zh_CN.properties new file mode 100644 index 0000000000..dc51223a10 --- /dev/null +++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/addUser_zh_CN.properties @@ -0,0 +1,23 @@ +# The MIT License +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Simon Wiest +# +# 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. + +Create\ User=\u65b0\u5efa\u7528\u6237 diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/config_zh_CN.properties b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/config_zh_CN.properties new file mode 100644 index 0000000000..828426c243 --- /dev/null +++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/config_zh_CN.properties @@ -0,0 +1,23 @@ +# The MIT License +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Simon Wiest +# +# 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. + +Allow\ users\ to\ sign\ up=\u5141\u8bb8\u7528\u6237\u6ce8\u518c diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_zh_CN.properties b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_zh_CN.properties new file mode 100644 index 0000000000..522254bd0d --- /dev/null +++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_zh_CN.properties @@ -0,0 +1,23 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Name=\u540d\u79f0 diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/loginLink_zh_CN.properties b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/loginLink_zh_CN.properties new file mode 100644 index 0000000000..7b062cc601 --- /dev/null +++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/loginLink_zh_CN.properties @@ -0,0 +1,23 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +sign\ up=\u6ce8\u518c diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/sidepanel_zh_CN.properties b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/sidepanel_zh_CN.properties new file mode 100644 index 0000000000..22e5779372 --- /dev/null +++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/sidepanel_zh_CN.properties @@ -0,0 +1,23 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Create\ User=\u65b0\u5efa\u4f7f\u7528\u8005 diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/signup_zh_CN.properties b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/signup_zh_CN.properties new file mode 100644 index 0000000000..907d5faa39 --- /dev/null +++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/signup_zh_CN.properties @@ -0,0 +1,23 @@ +# The MIT License +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Simon Wiest +# +# 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. + +Sign\ up=\u6ce8\u518c diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/success_zh_CN.properties b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/success_zh_CN.properties new file mode 100644 index 0000000000..0602a18efa --- /dev/null +++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/success_zh_CN.properties @@ -0,0 +1,23 @@ +# The MIT License +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Seiji Sogabe +# +# 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. + +description=\u4f60\u73b0\u5728\u5df2\u7ecf\u767b\u5f55.\u8fd4\u56de\u9996\u9875. \ No newline at end of file diff --git a/core/src/main/resources/hudson/security/LDAPSecurityRealm/config_zh_CN.properties b/core/src/main/resources/hudson/security/LDAPSecurityRealm/config_zh_CN.properties new file mode 100644 index 0000000000..eb37688789 --- /dev/null +++ b/core/src/main/resources/hudson/security/LDAPSecurityRealm/config_zh_CN.properties @@ -0,0 +1,23 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Server=\u670d\u52a1\u5668 diff --git a/core/src/main/resources/hudson/security/PAMSecurityRealm/config_zh_CN.properties b/core/src/main/resources/hudson/security/PAMSecurityRealm/config_zh_CN.properties new file mode 100644 index 0000000000..17ab5fb904 --- /dev/null +++ b/core/src/main/resources/hudson/security/PAMSecurityRealm/config_zh_CN.properties @@ -0,0 +1,23 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +Test=\u6d4b\u8bd5 diff --git a/core/src/main/resources/hudson/security/SecurityRealm/loginLink_zh_CN.properties b/core/src/main/resources/hudson/security/SecurityRealm/loginLink_zh_CN.properties new file mode 100644 index 0000000000..b4a696d3ff --- /dev/null +++ b/core/src/main/resources/hudson/security/SecurityRealm/loginLink_zh_CN.properties @@ -0,0 +1,23 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# 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. + +login=\u767b\u5f55 diff --git a/war/resources/help/security/container-realm_zh_CN.html b/war/resources/help/security/container-realm_zh_CN.html index fe986975b8..3b386e40fc 100644 --- a/war/resources/help/security/container-realm_zh_CN.html +++ b/war/resources/help/security/container-realm_zh_CN.html @@ -1,5 +1,5 @@

    - 使用Servlet容器认证用户,按照Servlet规范. + 使用Servlet容器认证用户,遵循Servlet规范. 这是Hudson1.163版本遗留的历史.这主要对下列情况非常有用：
      @@ -7,7 +7,7 @@ 你使用1.164之前版本的Hudson并且愿意继续使用.
    1. - 你已经在你的容器上配置了很好的安全范围,并且宁愿Hudson使用它.(有些容器提供更好的文档或者能够定制实现用户的安全范围) + 你已经在你的容器上配置了很好的安全域,并且宁愿Hudson继续使用它.(有些容器提供更好的文档或者能够定制实现用户的安全域)
    \ No newline at end of file diff --git a/war/resources/help/security/legacy-auth-strategy_zh_CN.html b/war/resources/help/security/legacy-auth-strategy_zh_CN.html new file mode 100644 index 0000000000..640902a39a --- /dev/null +++ b/war/resources/help/security/legacy-auth-strategy_zh_CN.html @@ -0,0 +1,4 @@ +
    + 适用于Hudson1.164以前的版本.也就是说,如果你是"admin"角色,那么你将拥有Hudson的一切控制权,其它角色(包括匿名用户) + 只有查看权限. +
    \ No newline at end of file diff --git a/war/resources/help/security/private-realm/allow-signup_zh_CN.html b/war/resources/help/security/private-realm/allow-signup_zh_CN.html index f042f1fa13..564484d0f8 100644 --- a/war/resources/help/security/private-realm/allow-signup_zh_CN.html +++ b/war/resources/help/security/private-realm/allow-signup_zh_CN.html @@ -1,6 +1,6 @@
    Hudson默认允许用户自己注册一个新账号,通过点击页面右上角的"注册"链接进行操作. - 但是如果你想禁止任意注册新账号,而使用严格的方式控制账号创建,那么要取消这个选框。 + 但如果你想禁止任意注册新账号,而使用严格的方式控制账号创建,那么取消这个选框。

    当这个选框被取消,就必须使用系统管理员来创建账号. diff --git a/war/resources/help/system-config/csrf_zh_CN.html b/war/resources/help/system-config/csrf_zh_CN.html new file mode 100644 index 0000000000..9d824beac0 --- /dev/null +++ b/war/resources/help/system-config/csrf_zh_CN.html @@ -0,0 +1,7 @@ +

    + 跨站点请求伪造(或CSRF/XSRF)是一种利用你的身份通过未经授权的第三方手段在网站上执行操作.对于Hudson,这能够让某些人删除任务,构建或者更改配置. +

    + 当启用此项,Hudson会检查临时生成的值,以及任何导致Hudson服务器改变的请求.这包括任何形式的提交和远程API调用. +

    + CSRF的更多信息可以在这里找到. +

    -- GitLab From b8fd3873170a1107b4338374b8b56bd4fd86b712 Mon Sep 17 00:00:00 2001 From: mindless Date: Thu, 29 Jul 2010 22:10:09 +0000 Subject: [PATCH 070/336] add note about backslashes git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33346 71c3de6d-444a-0410-be80-ed276b4c234a --- war/resources/help/ant/ant-properties.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/war/resources/help/ant/ant-properties.html b/war/resources/help/ant/ant-properties.html index bbb043a762..45a88d4808 100644 --- a/war/resources/help/ant/ant-properties.html +++ b/war/resources/help/ant/ant-properties.html @@ -4,5 +4,6 @@ name1=value1 name2=value2 - These are passed to Ant like "-Dname1=value1 -Dname2=value2" + These are passed to Ant like "-Dname1=value1 -Dname2=value2". + Backslashes are used for escaping, so use "\\" for a single backslash.
    -- GitLab From 7aae4ec1bfee5b076eeb3a9f103825c18198176d Mon Sep 17 00:00:00 2001 From: mindless Date: Fri, 30 Jul 2010 00:00:00 +0000 Subject: [PATCH 071/336] javadoc git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33348 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/model/Items.java | 4 ++-- core/src/main/java/hudson/tasks/BuildTrigger.java | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/core/src/main/java/hudson/model/Items.java b/core/src/main/java/hudson/model/Items.java index d34d43d63f..38ca188145 100644 --- a/core/src/main/java/hudson/model/Items.java +++ b/core/src/main/java/hudson/model/Items.java @@ -67,7 +67,7 @@ public class Items { } /** - * Converts a list of items into a camma-separated full names. + * Converts a list of items into a comma-separated list of full names. */ public static String toNameList(Collection items) { StringBuilder buf = new StringBuilder(); @@ -82,7 +82,7 @@ public class Items { /** * Does the opposite of {@link #toNameList(Collection)}. */ - public static List fromNameList(String list,Class type) { + public static List fromNameList(String list, Class type) { Hudson hudson = Hudson.getInstance(); List r = new ArrayList(); diff --git a/core/src/main/java/hudson/tasks/BuildTrigger.java b/core/src/main/java/hudson/tasks/BuildTrigger.java index d226344b70..e09c2d5365 100644 --- a/core/src/main/java/hudson/tasks/BuildTrigger.java +++ b/core/src/main/java/hudson/tasks/BuildTrigger.java @@ -226,10 +226,9 @@ public class BuildTrigger extends Recorder implements DependecyDeclarer, MatrixA } /** - * Called from {@link Job#renameTo(String)} when a job is renamed. + * Called from {@link ItemListenerImpl} when a job is renamed. * - * @return true - * if this {@link BuildTrigger} is changed and needs to be saved. + * @return true if this {@link BuildTrigger} is changed and needs to be saved. */ public boolean onJobRenamed(String oldName, String newName) { // quick test -- GitLab From 9f531a9b412c304f74c9d8ce56c1d472c6d2a5a2 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Fri, 30 Jul 2010 01:23:23 +0000 Subject: [PATCH 072/336] Merged revisions 33223 via svnmerge from https://www.dev.java.net/svn/hudson/branches/rc ........ r33223 | kohsuke | 2010-07-26 12:20:26 -0700 (Mon, 26 Jul 2010) | 1 line updated changelog as a part of the release ........ git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33351 71c3de6d-444a-0410-be80-ed276b4c234a --- debian/debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/debian/changelog b/debian/debian/changelog index a3a4a20428..544cd6de96 100644 --- a/debian/debian/changelog +++ b/debian/debian/changelog @@ -1,3 +1,9 @@ +hudson (1.368) unstable; urgency=low + + * See http://hudson.dev.java.net/changelog.html for more details. + + -- Kohsuke Kawaguchi Mon, 26 Jul 2010 11:53:25 -0700 + hudson (1.367) unstable; urgency=low * See http://hudson.dev.java.net/changelog.html for more details. -- GitLab From c4fe1e66ce93837d808e1ae3f52cc2ce4510195e Mon Sep 17 00:00:00 2001 From: kohsuke Date: Fri, 30 Jul 2010 01:24:10 +0000 Subject: [PATCH 073/336] Initialized merge tracking via "svnmerge" with revisions "1-33354" from https://www.dev.java.net/svn/hudson/branches/rc git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33356 71c3de6d-444a-0410-be80-ed276b4c234a -- GitLab From 963621acda1b44ac5afb002e283448f7269debd0 Mon Sep 17 00:00:00 2001 From: jglick Date: Fri, 30 Jul 2010 14:43:20 +0000 Subject: [PATCH 074/336] [FIXED HUDSON-7100] X-Hudson header was not being sent after change of servlet mapping. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33379 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/resources/hudson/model/View/index.jelly | 2 +- test/src/test/java/hudson/model/ViewTest.java | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/core/src/main/resources/hudson/model/View/index.jelly b/core/src/main/resources/hudson/model/View/index.jelly index d6873e732a..4a7acc1269 100644 --- a/core/src/main/resources/hudson/model/View/index.jelly +++ b/core/src/main/resources/hudson/model/View/index.jelly @@ -23,7 +23,7 @@ THE SOFTWARE. --> - + diff --git a/test/src/test/java/hudson/model/ViewTest.java b/test/src/test/java/hudson/model/ViewTest.java index 11b1642d2b..d379362c6e 100644 --- a/test/src/test/java/hudson/model/ViewTest.java +++ b/test/src/test/java/hudson/model/ViewTest.java @@ -23,6 +23,7 @@ */ package hudson.model; +import org.jvnet.hudson.test.Bug; import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException; import com.gargoylesoftware.htmlunit.html.HtmlAnchor; import com.gargoylesoftware.htmlunit.html.HtmlForm; @@ -39,6 +40,11 @@ import static hudson.model.Messages.Hudson_ViewName; */ public class ViewTest extends HudsonTestCase { + @Bug(7100) + public void testXHudsonHeader() throws Exception { + assertNotNull(new WebClient().goTo("/").getWebResponse().getResponseHeaderValue("X-Hudson")); + } + /** * Creating two views with the same name. */ -- GitLab From ed6f3a366d8cb0c87720e6bc16257ae968c64cd3 Mon Sep 17 00:00:00 2001 From: jglick Date: Fri, 30 Jul 2010 20:23:44 +0000 Subject: [PATCH 075/336] Warnings and one error emitted by Maven 3.0 beta 1. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33417 71c3de6d-444a-0410-be80-ed276b4c234a --- core/pom.xml | 9 +++++---- maven-plugin/pom.xml | 2 +- pom.xml | 40 +++++++++++++++++++++++++++------------- remoting/pom.xml | 6 +++--- 4 files changed, 36 insertions(+), 21 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 2682724962..174ac927f4 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -57,7 +57,6 @@ THE SOFTWARE. org.kohsuke.stapler maven-stapler-plugin - 1.15 true @@ -128,13 +127,13 @@ THE SOFTWARE. - + - + @@ -213,7 +212,7 @@ THE SOFTWARE. release - ${version} + ${project.version} @@ -796,6 +795,7 @@ THE SOFTWARE. org.kohsuke.stapler maven-stapler-plugin + 1.15 /lib/.* @@ -804,6 +804,7 @@ THE SOFTWARE. maven-project-info-reports-plugin + 2.2 false diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 99bc700bb1..7f77b8b1fc 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -52,7 +52,7 @@ THE SOFTWARE. - ${groupId} + ${project.groupId} maven-agent ${project.version} diff --git a/pom.xml b/pom.xml index df2ce20b9a..0ca51e01fa 100644 --- a/pom.xml +++ b/pom.xml @@ -98,6 +98,26 @@ THE SOFTWARE. maven-javadoc-plugin 2.6.1 + + maven-jar-plugin + 2.3.1 + + + maven-surefire-plugin + 2.5 + + + maven-dependency-plugin + 2.1 + + + maven-assembly-plugin + 2.2-beta-5 + + + maven-resources-plugin + 2.4.3 + - - maven-resources-plugin - - - UTF-8 - - maven-remote-resources-plugin 1.0 @@ -177,9 +187,10 @@ THE SOFTWARE. - + maven-compiler-plugin - + 2.3.1 + 1.5 1.5 @@ -241,6 +252,9 @@ THE SOFTWARE. 2.0.9 2.0.4 + + UTF-8 @@ -323,7 +337,7 @@ THE SOFTWARE. package - hudson-${version} + hudson-${project.version} assembly-src.xml diff --git a/remoting/pom.xml b/remoting/pom.xml index 1befa4e9d0..4fcee5ec71 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -105,13 +105,13 @@ THE SOFTWARE. - + - + @@ -178,7 +178,7 @@ THE SOFTWARE. release - ${version} + ${project.version} -- GitLab From a23baa9b2290afd153c8762cd1f57f53d8923f97 Mon Sep 17 00:00:00 2001 From: StevenGBrown Date: Sun, 1 Aug 2010 07:31:14 +0000 Subject: [PATCH 076/336] Corrected the BuildWrapper.decorateLauncher method Javadoc. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33485 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/tasks/BuildWrapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/java/hudson/tasks/BuildWrapper.java b/core/src/main/java/hudson/tasks/BuildWrapper.java index 0b01c9cc9a..1b4f1aa698 100644 --- a/core/src/main/java/hudson/tasks/BuildWrapper.java +++ b/core/src/main/java/hudson/tasks/BuildWrapper.java @@ -149,7 +149,7 @@ public abstract class BuildWrapper extends AbstractDescribableImpl * such as the use of sudo/pfexec/chroot, or manipulating environment variables. * *

    - * The default implementation is no-op, which just returns the {@code listener} parameter as-is. + * The default implementation is no-op, which just returns the {@code launcher} parameter as-is. * * @param build * The build in progress for which this {@link BuildWrapper} is called. Never null. -- GitLab From 425ce1fb43f18e9ab8f0abe544a3ea41519508a2 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Mon, 2 Aug 2010 16:44:09 +0000 Subject: [PATCH 077/336] Merged revisions 33392,33438,33440,33444 via svnmerge from https://www.dev.java.net/svn/hudson/branches/rc ........ r33392 | mindless | 2010-07-30 08:50:29 -0700 (Fri, 30 Jul 2010) | 2 lines [HUDSON-7100] merge into rc branch for inclusion in 1.369 ........ r33438 | kohsuke | 2010-07-30 20:11:01 -0700 (Fri, 30 Jul 2010) | 1 line [maven-release-plugin] prepare release hudson-1_369 ........ r33440 | kohsuke | 2010-07-30 20:11:17 -0700 (Fri, 30 Jul 2010) | 1 line [maven-release-plugin] prepare for next development iteration ........ r33444 | kohsuke | 2010-07-30 21:07:15 -0700 (Fri, 30 Jul 2010) | 1 line updated changelog as a part of the release ........ git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33521 71c3de6d-444a-0410-be80-ed276b4c234a --- cli/pom.xml | 2 +- core/pom.xml | 2 +- debian/debian/changelog | 6 ++++++ maven-agent/pom.xml | 2 +- maven-interceptor/pom.xml | 2 +- maven-plugin/pom.xml | 2 +- pom.xml | 2 +- remoting/pom.xml | 2 +- test/pom.xml | 2 +- ui-samples-plugin/pom.xml | 2 +- war/pom.xml | 2 +- 11 files changed, 16 insertions(+), 10 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index ba53d17478..3d299d5708 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -4,7 +4,7 @@ pom org.jvnet.hudson.main - 1.369-SNAPSHOT + 1.370-SNAPSHOT cli Hudson CLI diff --git a/core/pom.xml b/core/pom.xml index 174ac927f4..8e6b0e65f2 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.369-SNAPSHOT + 1.370-SNAPSHOT ../pom.xml diff --git a/debian/debian/changelog b/debian/debian/changelog index 544cd6de96..bff19998f1 100644 --- a/debian/debian/changelog +++ b/debian/debian/changelog @@ -1,3 +1,9 @@ +hudson (1.369) unstable; urgency=low + + * See http://hudson.dev.java.net/changelog.html for more details. + + -- Kohsuke Kawaguchi Fri, 30 Jul 2010 21:05:12 -0700 + hudson (1.368) unstable; urgency=low * See http://hudson.dev.java.net/changelog.html for more details. diff --git a/maven-agent/pom.xml b/maven-agent/pom.xml index 6a50df2165..d3418c4ea1 100644 --- a/maven-agent/pom.xml +++ b/maven-agent/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.369-SNAPSHOT + 1.370-SNAPSHOT ../pom.xml diff --git a/maven-interceptor/pom.xml b/maven-interceptor/pom.xml index e2eeed39a7..e71b15d3b9 100644 --- a/maven-interceptor/pom.xml +++ b/maven-interceptor/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.369-SNAPSHOT + 1.370-SNAPSHOT ../pom.xml diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 7f77b8b1fc..1af741483f 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.369-SNAPSHOT + 1.370-SNAPSHOT maven-plugin diff --git a/pom.xml b/pom.xml index 0ca51e01fa..3d1148f8b4 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.369-SNAPSHOT + 1.370-SNAPSHOT pom Hudson main module diff --git a/remoting/pom.xml b/remoting/pom.xml index 4fcee5ec71..d19b53d2b0 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.369-SNAPSHOT + 1.370-SNAPSHOT ../pom.xml diff --git a/test/pom.xml b/test/pom.xml index aa2184dd45..7b3cb85093 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. pom org.jvnet.hudson.main - 1.369-SNAPSHOT + 1.370-SNAPSHOT 4.0.0 org.jvnet.hudson.main diff --git a/ui-samples-plugin/pom.xml b/ui-samples-plugin/pom.xml index 31debf3fba..514cb99cb0 100644 --- a/ui-samples-plugin/pom.xml +++ b/ui-samples-plugin/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.369-SNAPSHOT + 1.370-SNAPSHOT ui-samples-plugin diff --git a/war/pom.xml b/war/pom.xml index 33b9c717ec..792516ef76 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.369-SNAPSHOT + 1.370-SNAPSHOT ../pom.xml -- GitLab From 80f7a7ea6103de1a342ab49f6592121672c99690 Mon Sep 17 00:00:00 2001 From: mindless Date: Mon, 2 Aug 2010 17:51:23 +0000 Subject: [PATCH 078/336] [HUDSON-7108] add ArgumentListBuilder.toWindowsCommand() which wraps command in CMD.EXE /C (as Ant.perform() already did), but also does escaping of special characters to ensure argument as passed unaltered. Use this in Ant.perform() so build parameters with < or > characters don't cause I/O redirection, for example. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33530 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/tasks/Ant.java | 18 +----- .../java/hudson/util/ArgumentListBuilder.java | 63 +++++++++++++++++++ .../hudson/util/ArgumentListBuilderTest.java | 20 +++++- 3 files changed, 84 insertions(+), 17 deletions(-) diff --git a/core/src/main/java/hudson/tasks/Ant.java b/core/src/main/java/hudson/tasks/Ant.java index a06c5fd88b..c9e1054198 100644 --- a/core/src/main/java/hudson/tasks/Ant.java +++ b/core/src/main/java/hudson/tasks/Ant.java @@ -187,22 +187,8 @@ public class Ant extends Builder { if(antOpts!=null) env.put("ANT_OPTS",env.expand(antOpts)); - if(!launcher.isUnix()) { - // on Windows, executing batch file can't return the correct error code, - // so we need to wrap it into cmd.exe. - // double %% is needed because we want ERRORLEVEL to be expanded after - // batch file executed, not before. This alone shows how broken Windows is... - args.add("&&","exit","%%ERRORLEVEL%%"); - - // on Windows, proper double quote handling requires extra surrounding quote. - // so we need to convert the entire argument list once into a string, - // then build the new list so that by the time JVM invokes CreateProcess win32 API, - // it puts additional double-quote. See issue #1007 - // the 'addQuoted' is necessary because Process implementation for Windows (at least in Sun JVM) - // is too clever to avoid putting a quote around it if the argument begins with " - // see "cmd /?" for more about how cmd.exe handles quotation. - args = new ArgumentListBuilder().add("cmd.exe","/C").addQuoted(args.toStringWithQuote()); - } + if(!launcher.isUnix()) + args = args.toWindowsCommand(); long startTime = System.currentTimeMillis(); try { diff --git a/core/src/main/java/hudson/util/ArgumentListBuilder.java b/core/src/main/java/hudson/util/ArgumentListBuilder.java index 12bd9a18e6..9fd46247be 100644 --- a/core/src/main/java/hudson/util/ArgumentListBuilder.java +++ b/core/src/main/java/hudson/util/ArgumentListBuilder.java @@ -181,6 +181,10 @@ public class ArgumentListBuilder implements Serializable { return args; } + /** + * Just adds quotes around args containing spaces, but no other special characters, + * so this method should generally be used only for informational/logging purposes. + */ public String toStringWithQuote() { StringBuilder buf = new StringBuilder(); for (String arg : args) { @@ -194,6 +198,65 @@ public class ArgumentListBuilder implements Serializable { return buf.toString(); } + /** + * Wrap command in a CMD.EXE call so we can return the exit code (ERRORLEVEL). + * This method takes care of escaping special characters in the command, which + * is needed since the command is now passed as a string to the CMD.EXE shell. + * This is done as follows: + * Wrap arguments in double quotes if they contain any of: + * space *?;^&<>|" or % followed by a letter. + *
    These characters are also prepended with a ^ character: ^&<>| + *
    A " is prepended with another " character. + *
    A % followed by a letter has that letter wrapped in double quotes, + * to avoid possible variable expansion. ie, %foo% becomes "%"f"oo%". + * The second % does not need special handling because it is not followed + * by a letter.
    + * Example: "-Dfoo=*abc?def;ghi^^jkl^&mno^stu^|vwx""yz%"e"nd" + * @return + */ + public ArgumentListBuilder toWindowsCommand() { + StringBuilder quotedArgs = new StringBuilder(); + boolean quoted, percent; + for (String arg : args) { + quoted = percent = false; + for (int i = 0; i < arg.length(); i++) { + char c = arg.charAt(i); + if (!quoted && (c == ' ' || c == '*' || c == '?' || c == ';')) { + quoted = startQuoting(quotedArgs, arg, i); + } + else if (c == '^' || c == '&' || c == '<' || c == '>' || c == '|') { + if (!quoted) quoted = startQuoting(quotedArgs, arg, i); + quotedArgs.append('^'); + } + else if (c == '"') { + if (!quoted) quoted = startQuoting(quotedArgs, arg, i); + quotedArgs.append('"'); + } + else if (percent && ((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z'))) { + if (!quoted) quoted = startQuoting(quotedArgs, arg, i); + quotedArgs.append('"').append(c); + c = '"'; + } + percent = (c == '%'); + if (quoted) quotedArgs.append(c); + } + if (quoted) quotedArgs.append('"'); else quotedArgs.append(arg); + quotedArgs.append(' '); + } + // (comment copied from old code in hudson.tasks.Ant) + // on Windows, executing batch file can't return the correct error code, + // so we need to wrap it into cmd.exe. + // double %% is needed because we want ERRORLEVEL to be expanded after + // batch file executed, not before. This alone shows how broken Windows is... + quotedArgs.append("&& exit %%ERRORLEVEL%%"); + return new ArgumentListBuilder().add("cmd.exe", "/C").addQuoted(quotedArgs.toString()); + } + + private static boolean startQuoting(StringBuilder buf, String arg, int atIndex) { + buf.append('"').append(arg.substring(0, atIndex)); + return true; + } + /** * Returns true if there are any masked arguments. * @return true if there are any masked arguments; false otherwise diff --git a/core/src/test/java/hudson/util/ArgumentListBuilderTest.java b/core/src/test/java/hudson/util/ArgumentListBuilderTest.java index 7312ca1753..a9ef5e6d6b 100644 --- a/core/src/test/java/hudson/util/ArgumentListBuilderTest.java +++ b/core/src/test/java/hudson/util/ArgumentListBuilderTest.java @@ -1,7 +1,7 @@ /* * The MIT License * - * Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi + * Copyright (c) 2004-2010, Sun Microsystems, Inc., Kohsuke Kawaguchi * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -104,4 +104,22 @@ public class ArgumentListBuilderTest extends Assert { assertNotNull("The mask array should not be null", array); assertArrayEquals("The mask array was incorrect", new boolean[]{false,false,true,false}, array); } + + @Test + public void testToWindowsCommand() { + ArgumentListBuilder builder = new ArgumentListBuilder( + "ant.bat", "-Dfoo1=abc", // nothing special, no quotes + "-Dfoo2=foo bar", "-Dfoo3=/u*r", "-Dfoo4=/us?", // add quotes, no other escaping + "-Dfoo5=foo;bar^baz", "-Dfoo6=&here;", // add quotes and ^ escaping + "-Dfoo7=foo|bar\"baz", // add quotes, ^| for | and "" for " + "-Dfoo8=% %QED% %comspec% %-%(%.%", // add quotes, and extra quotes for %Q and %c + "-Dfoo9=%'''%%@%"); // no quotes as none of the % are followed by a letter + assertArrayEquals(new String[] { "cmd.exe", "/C", + "\"ant.bat -Dfoo1=abc \"-Dfoo2=foo bar\"" + + " \"-Dfoo3=/u*r\" \"-Dfoo4=/us?\" \"-Dfoo5=foo;bar^^baz\"" + + " \"-Dfoo6=^^&here;^\" \"-Dfoo7=foo^|bar\"\"baz\"" + + " \"-Dfoo8=% %\"Q\"ED% %\"c\"omspec% %-%(%.%\"" + + " -Dfoo9=%'''%%@% && exit %%ERRORLEVEL%%\"" }, + builder.toWindowsCommand().toCommandArray()); + } } -- GitLab From 632e33d2bf675f0a946fbb5cdd81eb0c18988d01 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Mon, 2 Aug 2010 18:21:34 +0000 Subject: [PATCH 079/336] cosmetic change. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33531 71c3de6d-444a-0410-be80-ed276b4c234a --- .../main/java/hudson/util/RobustReflectionConverter.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/hudson/util/RobustReflectionConverter.java b/core/src/main/java/hudson/util/RobustReflectionConverter.java index da1e756487..6f64a00d98 100644 --- a/core/src/main/java/hudson/util/RobustReflectionConverter.java +++ b/core/src/main/java/hudson/util/RobustReflectionConverter.java @@ -192,8 +192,9 @@ public class RobustReflectionConverter implements Converter { Class classDefiningField = determineWhichClassDefinesField(reader); boolean fieldExistsInClass = fieldDefinedInClass(result, attrName); if (fieldExistsInClass) { - SingleValueConverter converter = mapper.getConverterFromAttribute(attrName); - Class type = reflectionProvider.getFieldType(result, attrName, classDefiningField); + Field field = reflectionProvider.getField(result.getClass(), attrName); + SingleValueConverter converter = mapper.getConverterFromAttribute(field.getDeclaringClass(),attrName,field.getType()); + Class type = field.getType(); if (converter == null) { converter = mapper.getConverterFromItemType(type); } @@ -226,7 +227,7 @@ public class RobustReflectionConverter implements Converter { final Object value; if (fieldExistsInClass) { Field field = reflectionProvider.getField(result.getClass(),fieldName); - value = unmarshallField(context, result, type, field); + value = unmarshalField(context, result, type, field); // TODO the reflection provider should have returned the proper field in first place .... Class definedType = reflectionProvider.getFieldType(result, fieldName, classDefiningField); if (!definedType.isPrimitive()) { @@ -282,7 +283,7 @@ public class RobustReflectionConverter implements Converter { return reflectionProvider.getFieldOrNull(result.getClass(),attrName)!=null; } - protected Object unmarshallField(final UnmarshallingContext context, final Object result, Class type, Field field) { + protected Object unmarshalField(final UnmarshallingContext context, final Object result, Class type, Field field) { return context.convertAnother(result, type); } -- GitLab From dbd323f9dde710582f1a1f25bd4ac744951bd172 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Mon, 2 Aug 2010 18:22:06 +0000 Subject: [PATCH 080/336] added another convenience method. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33532 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/Util.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/core/src/main/java/hudson/Util.java b/core/src/main/java/hudson/Util.java index ac9df5b648..be353aa900 100644 --- a/core/src/main/java/hudson/Util.java +++ b/core/src/main/java/hudson/Util.java @@ -1139,6 +1139,13 @@ public class Util { else return new File(p.substring(0,pos)+ext); } + /** + * Null-safe String intern method. + */ + public static String intern(String s) { + return s==null ? s : s.intern(); + } + public static final FastDateFormat XS_DATETIME_FORMATTER = FastDateFormat.getInstance("yyyy-MM-dd'T'HH:mm:ss'Z'",new SimpleTimeZone(0,"GMT")); // Note: RFC822 dates must not be localized! -- GitLab From 9dd1e367682d8cb66bb9f44390d86cd065955a98 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Mon, 2 Aug 2010 18:22:57 +0000 Subject: [PATCH 081/336] [FIXED HUDSON-5119] integrated another Winstone that fixes session object leak. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33533 71c3de6d-444a-0410-be80-ed276b4c234a --- war/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/war/pom.xml b/war/pom.xml index 792516ef76..d3ccdbce6f 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -126,7 +126,7 @@ THE SOFTWARE. - + -- GitLab From d7b6eeae838da202d5140ab8a5344a3e9593be8f Mon Sep 17 00:00:00 2001 From: kohsuke Date: Mon, 2 Aug 2010 18:24:18 +0000 Subject: [PATCH 082/336] Have XStream intern strings upon resurrection to save memory consumption. Interning large strings is risky as it puts pressure on the permgen space, but these strings are always very terse and unlikely to have a large diversity. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33534 71c3de6d-444a-0410-be80-ed276b4c234a --- .../main/java/hudson/maven/ExecutedMojo.java | 25 +++++++++++++++++++ .../java/hudson/maven/ModuleDependency.java | 13 +++++++--- 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/maven-plugin/src/main/java/hudson/maven/ExecutedMojo.java b/maven-plugin/src/main/java/hudson/maven/ExecutedMojo.java index 6578471998..5b62c57146 100644 --- a/maven-plugin/src/main/java/hudson/maven/ExecutedMojo.java +++ b/maven-plugin/src/main/java/hudson/maven/ExecutedMojo.java @@ -38,6 +38,8 @@ import java.util.HashMap; import java.util.logging.Logger; import java.util.logging.Level; +import static hudson.Util.intern; + /** * Persisted record of mojo execution. * @@ -100,6 +102,29 @@ public final class ExecutedMojo implements Serializable { this.digest = digest; } + /** + * Copy constructor used for interning. + */ + private ExecutedMojo(String groupId, String artifactId, String version, String goal, String executionId, long duration, String digest) { + this.groupId = groupId; + this.artifactId = artifactId; + this.version = version; + this.goal = goal; + this.executionId = executionId; + this.duration = duration; + this.digest = digest; + } + + /** + * Lots of {@link ExecutedMojo}s tend to have the same groupId, artifactId, etc., so interning them help + * with memory consumption. + * + * TODO: better if XStream has a declarative way of marking fields as "target for intern". + */ + ExecutedMojo readResolve() { + return new ExecutedMojo(intern(groupId),intern(artifactId),intern(version),intern(goal),intern(executionId),duration,intern(digest)); + } + /** * Returns duration in a human readable text. */ diff --git a/maven-plugin/src/main/java/hudson/maven/ModuleDependency.java b/maven-plugin/src/main/java/hudson/maven/ModuleDependency.java index 29948f7224..3ae83388b6 100644 --- a/maven-plugin/src/main/java/hudson/maven/ModuleDependency.java +++ b/maven-plugin/src/main/java/hudson/maven/ModuleDependency.java @@ -44,10 +44,10 @@ public final class ModuleDependency implements Serializable { public final String version; public ModuleDependency(String groupId, String artifactId, String version) { - this.groupId = groupId; - this.artifactId = artifactId; + this.groupId = groupId.intern(); + this.artifactId = artifactId.intern(); if(version==null) version=UNKNOWN; - this.version = version; + this.version = version.intern(); } public ModuleDependency(ModuleName name, String version) { @@ -104,6 +104,13 @@ public final class ModuleDependency implements Serializable { return result; } + /** + * Upon reading from the disk, intern strings. + */ + public ModuleDependency readResolve() { + return new ModuleDependency(groupId,artifactId,version); + } + /** * For compatibility reason, this value may be used in the verion field * to indicate that the version is unknown. -- GitLab From 50c27e875b94f818fcac113463a1f9afcb12f4c5 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Mon, 2 Aug 2010 18:50:07 +0000 Subject: [PATCH 083/336] if we are initialing a restart, record that in the log. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33535 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/model/Hudson.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/hudson/model/Hudson.java b/core/src/main/java/hudson/model/Hudson.java index 0ccf50c7e0..59b89499cf 100644 --- a/core/src/main/java/hudson/model/Hudson.java +++ b/core/src/main/java/hudson/model/Hudson.java @@ -2925,6 +2925,7 @@ public final class Hudson extends Node implements ItemGroup, Stapl servletContext.setAttribute("app",new HudsonIsRestarting()); new Thread("restart thread") { + final String exitUser = getAuthentication().getName(); @Override public void run() { try { @@ -2932,6 +2933,7 @@ public final class Hudson extends Node implements ItemGroup, Stapl // give some time for the browser to load the "reloading" page Thread.sleep(5000); + LOGGER.severe(String.format("Restarting VM as requested by %s",exitUser)); lifecycle.restart(); } catch (InterruptedException e) { LOGGER.log(Level.WARNING, "Failed to restart Hudson",e); @@ -2954,6 +2956,7 @@ public final class Hudson extends Node implements ItemGroup, Stapl isQuietingDown = true; new Thread("safe-restart thread") { + final String exitUser = getAuthentication().getName(); @Override public void run() { try { @@ -2968,6 +2971,7 @@ public final class Hudson extends Node implements ItemGroup, Stapl // give some time for the browser to load the "reloading" page LOGGER.info("Restart in 10 seconds"); Thread.sleep(10000); + LOGGER.severe(String.format("Restarting VM as requested by %s",exitUser)); lifecycle.restart(); } else { LOGGER.info("Safe-restart mode cancelled"); @@ -2988,7 +2992,7 @@ public final class Hudson extends Node implements ItemGroup, Stapl public void doExit( StaplerRequest req, StaplerResponse rsp ) throws IOException { checkPermission(ADMINISTER); LOGGER.severe(String.format("Shutting down VM as requested by %s from %s", - getAuthentication(), req.getRemoteAddr())); + getAuthentication().getName(), req.getRemoteAddr())); rsp.setStatus(HttpServletResponse.SC_OK); rsp.setContentType("text/plain"); PrintWriter w = rsp.getWriter(); @@ -3011,7 +3015,7 @@ public final class Hudson extends Node implements ItemGroup, Stapl w.println("Shutting down as soon as all jobs are complete"); w.close(); isQuietingDown = true; - final String exitUser = getAuthentication().toString(); + final String exitUser = getAuthentication().getName(); final String exitAddr = req.getRemoteAddr().toString(); new Thread("safe-exit thread") { @Override -- GitLab From 80e96a102448615e56c7b2683d2327c271757cb9 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Mon, 2 Aug 2010 19:26:48 +0000 Subject: [PATCH 084/336] using a newer version that has a better error diagnostics git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33536 71c3de6d-444a-0410-be80-ed276b4c234a --- core/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/pom.xml b/core/pom.xml index 8e6b0e65f2..bc4b38d5a3 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -646,7 +646,7 @@ THE SOFTWARE. org.jvnet.hudson memory-monitor - 1.2 + 1.3 com.octo.captcha -- GitLab From 2f241a3f29b6a914efac3ba0df5ffe7abbad0c7f Mon Sep 17 00:00:00 2001 From: kohsuke Date: Mon, 2 Aug 2010 20:00:54 +0000 Subject: [PATCH 085/336] [HUDSON-5073 HUDSON-3412] improved the error diagnostics on ChannelClosedException by having it report who/how the connection was closed. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33537 71c3de6d-444a-0410-be80-ed276b4c234a --- .../main/java/hudson/remoting/Channel.java | 38 +++++++++++-------- .../remoting/ChannelClosedException.java | 9 +++++ 2 files changed, 31 insertions(+), 16 deletions(-) diff --git a/remoting/src/main/java/hudson/remoting/Channel.java b/remoting/src/main/java/hudson/remoting/Channel.java index 9baf4fd3d1..6973f8ceb5 100644 --- a/remoting/src/main/java/hudson/remoting/Channel.java +++ b/remoting/src/main/java/hudson/remoting/Channel.java @@ -110,15 +110,17 @@ public class Channel implements VirtualChannel, IChannel { /*package*/ final ExecutorService executor; /** - * If true, the incoming link is already shut down, - * and reader is already terminated. + * If non-null, the incoming link is already shut down, + * and reader is already terminated. The {@link Throwable} object indicates why the outgoing channel + * was closed. */ - private volatile boolean inClosed = false; + private volatile Throwable inClosed = null; /** - * If true, the outgoing link is already shut down, - * and no command can be sent. + * If non-null, the outgoing link is already shut down, + * and no command can be sent. The {@link Throwable} object indicates why the outgoing channel + * was closed. */ - private volatile boolean outClosed = false; + private volatile Throwable outClosed = null; /*package*/ final Map> pendingCalls = new Hashtable>(); @@ -397,7 +399,7 @@ public class Channel implements VirtualChannel, IChannel { } /*package*/ boolean isOutClosed() { - return outClosed; + return outClosed!=null; } /** @@ -408,8 +410,8 @@ public class Channel implements VirtualChannel, IChannel { * {@link Command}s are executed on a remote system in the order they are sent. */ /*package*/ synchronized void send(Command cmd) throws IOException { - if(outClosed) - throw new ChannelClosedException(); + if(outClosed!=null) + throw new ChannelClosedException(outClosed); if(logger.isLoggable(Level.FINE)) logger.fine("Send "+cmd); Channel old = Channel.setCurrent(this); @@ -593,9 +595,13 @@ public class Channel implements VirtualChannel, IChannel { /** * Aborts the connection in response to an error. + * + * @param e + * The error that caused the connection to be aborted. Never null. */ protected synchronized void terminate(IOException e) { - outClosed=inClosed=true; + if (e==null) throw new IllegalArgumentException(); + outClosed=inClosed=e; try { synchronized(pendingCalls) { for (Request req : pendingCalls.values()) @@ -646,7 +652,7 @@ public class Channel implements VirtualChannel, IChannel { * If the current thread is interrupted while waiting for the completion. */ public synchronized void join() throws InterruptedException { - while(!inClosed || !outClosed) + while(inClosed==null || outClosed==null) wait(); } @@ -655,7 +661,7 @@ public class Channel implements VirtualChannel, IChannel { * this method returns true. */ /*package*/ boolean isInClosed() { - return inClosed; + return inClosed!=null; } /** @@ -667,7 +673,7 @@ public class Channel implements VirtualChannel, IChannel { */ public synchronized void join(long timeout) throws InterruptedException { long start = System.currentTimeMillis(); - while(System.currentTimeMillis()-start Date: Tue, 3 Aug 2010 04:04:43 +0000 Subject: [PATCH 086/336] [FIXED HUDSON-7121] update to latest versions of ssh-slaves and cvs git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33542 71c3de6d-444a-0410-be80-ed276b4c234a --- war/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/war/pom.xml b/war/pom.xml index d3ccdbce6f..99bed486d1 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -130,9 +130,9 @@ THE SOFTWARE. - + - + -- GitLab From a30ee8291d2257ddf419af680c7adcee5b2cb58d Mon Sep 17 00:00:00 2001 From: kohsuke Date: Tue, 3 Aug 2010 14:28:09 +0000 Subject: [PATCH 087/336] Look out for a typical error a plugin developer makes. See http://hudson.361315.n4.nabble.com/Help-Hint-needed-Post-build-action-doesn-t-stay-activated-td2308833.html git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33544 71c3de6d-444a-0410-be80-ed276b4c234a --- .../src/main/java/hudson/model/Descriptor.java | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/hudson/model/Descriptor.java b/core/src/main/java/hudson/model/Descriptor.java index 6afed9cfce..02280fa93b 100644 --- a/core/src/main/java/hudson/model/Descriptor.java +++ b/core/src/main/java/hudson/model/Descriptor.java @@ -455,15 +455,15 @@ public abstract class Descriptor> implements Saveable { if(!Modifier.isAbstract(m.getDeclaringClass().getModifiers())) { // this class overrides newInstance(StaplerRequest). // maintain the backward compatible behavior - return newInstance(req); + return verifyNewInstance(newInstance(req)); } else { if (req==null) { // yes, req is supposed to be always non-null, but see the note above - return clazz.newInstance(); + return verifyNewInstance(clazz.newInstance()); } // new behavior as of 1.206 - return req.bindJSON(clazz,formData); + return verifyNewInstance(req.bindJSON(clazz,formData)); } } catch (NoSuchMethodException e) { throw new AssertionError(e); // impossible @@ -474,6 +474,18 @@ public abstract class Descriptor> implements Saveable { } } + /** + * Look out for a typical error a plugin developer makes. + * See http://hudson.361315.n4.nabble.com/Help-Hint-needed-Post-build-action-doesn-t-stay-activated-td2308833.html + */ + private T verifyNewInstance(T t) { + if (t!=null && t.getDescriptor()!=this) { + // TODO: should this be a fatal error? + LOGGER.warning("Father of "+ t+" and its getDescriptor() points to two different instances. Probably malplaced @Extension. See http://hudson.361315.n4.nabble.com/Help-Hint-needed-Post-build-action-doesn-t-stay-activated-td2308833.html"); + } + return t; + } + /** * Returns the resource path to the help screen HTML, if any. * -- GitLab From 36d4fa504bff23fb8f8e0a549c61b41fb5833a5d Mon Sep 17 00:00:00 2001 From: kohsuke Date: Tue, 3 Aug 2010 15:04:28 +0000 Subject: [PATCH 088/336] removed alpha designation git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33545 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/resources/hudson/matrix/Messages.properties | 2 +- core/src/main/resources/hudson/matrix/Messages_de.properties | 2 +- core/src/main/resources/hudson/matrix/Messages_es.properties | 2 +- core/src/main/resources/hudson/matrix/Messages_fr.properties | 4 ++-- core/src/main/resources/hudson/matrix/Messages_nl.properties | 2 +- .../main/resources/hudson/matrix/Messages_pt_BR.properties | 2 +- core/src/main/resources/hudson/matrix/Messages_ru.properties | 2 +- core/src/main/resources/hudson/matrix/Messages_tr.properties | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/core/src/main/resources/hudson/matrix/Messages.properties b/core/src/main/resources/hudson/matrix/Messages.properties index 23cf1d4e98..39eb321c71 100644 --- a/core/src/main/resources/hudson/matrix/Messages.properties +++ b/core/src/main/resources/hudson/matrix/Messages.properties @@ -20,7 +20,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -MatrixProject.DisplayName=Build multi-configuration project (alpha) +MatrixProject.DisplayName=Build multi-configuration project MatrixProject.DuplicateAxisName=Duplicate axis name MatrixBuild.Triggering=Triggering {0} diff --git a/core/src/main/resources/hudson/matrix/Messages_de.properties b/core/src/main/resources/hudson/matrix/Messages_de.properties index 296bcf45b5..a95a87232b 100644 --- a/core/src/main/resources/hudson/matrix/Messages_de.properties +++ b/core/src/main/resources/hudson/matrix/Messages_de.properties @@ -20,7 +20,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -MatrixProject.DisplayName=Multikonfigurationsprojekt bauen (alpha) +MatrixProject.DisplayName=Multikonfigurationsprojekt bauen MatrixProject.DuplicateAxisName=Name der Achse existiert bereits MatrixBuild.Triggering=Lse {0} aus diff --git a/core/src/main/resources/hudson/matrix/Messages_es.properties b/core/src/main/resources/hudson/matrix/Messages_es.properties index a0b2b3997a..1b9ae3e8e3 100644 --- a/core/src/main/resources/hudson/matrix/Messages_es.properties +++ b/core/src/main/resources/hudson/matrix/Messages_es.properties @@ -20,7 +20,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -MatrixProject.DisplayName=Crear un proyecto multi-configuracin (alpha) +MatrixProject.DisplayName=Crear un proyecto multi-configuracin MatrixProject.DuplicateAxisName=Duplicar el nombre comn MatrixBuild.Triggering=Lanzado {0} diff --git a/core/src/main/resources/hudson/matrix/Messages_fr.properties b/core/src/main/resources/hudson/matrix/Messages_fr.properties index 61d3e40cac..73ff67c358 100644 --- a/core/src/main/resources/hudson/matrix/Messages_fr.properties +++ b/core/src/main/resources/hudson/matrix/Messages_fr.properties @@ -20,11 +20,11 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -MatrixProject.DisplayName=Construire un projet multi-configuration (alpha) +MatrixProject.DisplayName=Construire un projet multi-configuration MatrixBuild.Triggering=Lancement de {0} MatrixBuild.AppearsCancelled={0} semble annul MatrixBuild.Cancelled={0} a t annul MatrixBuild.Interrupting={0} en cours d''interruption -MatrixConfiguration.Pronoun=Configuration \ No newline at end of file +MatrixConfiguration.Pronoun=Configuration diff --git a/core/src/main/resources/hudson/matrix/Messages_nl.properties b/core/src/main/resources/hudson/matrix/Messages_nl.properties index 4f91ee2e7f..6f2854cf47 100644 --- a/core/src/main/resources/hudson/matrix/Messages_nl.properties +++ b/core/src/main/resources/hudson/matrix/Messages_nl.properties @@ -20,7 +20,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -MatrixProject.DisplayName=Bouw een multi-configuratie project (alfa) +MatrixProject.DisplayName=Bouw een multi-configuratie project MatrixBuild.Triggering=Starten van {0} MatrixBuild.AppearsCancelled={0} blijkt geannuleerd diff --git a/core/src/main/resources/hudson/matrix/Messages_pt_BR.properties b/core/src/main/resources/hudson/matrix/Messages_pt_BR.properties index e69476244a..c24e302fee 100644 --- a/core/src/main/resources/hudson/matrix/Messages_pt_BR.properties +++ b/core/src/main/resources/hudson/matrix/Messages_pt_BR.properties @@ -20,7 +20,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -MatrixProject.DisplayName=Construir projeto de m\u00FAltiplas configura\u00E7\u00F5es (alpha) +MatrixProject.DisplayName=Construir projeto de m\u00FAltiplas configura\u00E7\u00F5es MatrixBuild.Triggering=Disparando {0} MatrixBuild.AppearsCancelled={0} parece estar cancelado diff --git a/core/src/main/resources/hudson/matrix/Messages_ru.properties b/core/src/main/resources/hudson/matrix/Messages_ru.properties index ede61212f8..54753e19a3 100644 --- a/core/src/main/resources/hudson/matrix/Messages_ru.properties +++ b/core/src/main/resources/hudson/matrix/Messages_ru.properties @@ -20,7 +20,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -MatrixProject.DisplayName=\u041c\u0443\u043b\u044c\u0442\u0438\u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u043e\u043d\u043d\u044b\u0439 \u043f\u0440\u043e\u0435\u043a\u0442 (\u0430\u043b\u044c\u0444\u0430) +MatrixProject.DisplayName=\u041c\u0443\u043b\u044c\u0442\u0438\u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u043e\u043d\u043d\u044b\u0439 \u043f\u0440\u043e\u0435\u043a\u0442 MatrixBuild.Triggering=\u0410\u043a\u0442\u0438\u0432\u0438\u0440\u0443\u044e {0} MatrixBuild.AppearsCancelled={0} \u043f\u043e \u0432\u0441\u0435\u0439 \u0432\u0438\u0434\u0438\u043c\u043e\u0441\u0442\u0438 \u043f\u0440\u0435\u0440\u0432\u0430\u043d\u0430 diff --git a/core/src/main/resources/hudson/matrix/Messages_tr.properties b/core/src/main/resources/hudson/matrix/Messages_tr.properties index a6c368bc62..a63c95565a 100644 --- a/core/src/main/resources/hudson/matrix/Messages_tr.properties +++ b/core/src/main/resources/hudson/matrix/Messages_tr.properties @@ -20,7 +20,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -MatrixProject.DisplayName=\u00c7oklu-konfig\u00fcrasyona sahip proje yap\u0131land\u0131r (alpha) +MatrixProject.DisplayName=\u00c7oklu-konfig\u00fcrasyona sahip proje yap\u0131land\u0131r MatrixBuild.Triggering={0} tetikleniyor MatrixBuild.AppearsCancelled={0} iptal edilmi\u015f gr\u00fcn\u00fcyor -- GitLab From c4dffa48bb59c2cdcc411a20b808579fa68a7057 Mon Sep 17 00:00:00 2001 From: mindless Date: Tue, 3 Aug 2010 16:54:57 +0000 Subject: [PATCH 089/336] [FIXED HUDSON-5141] workaround issue in IBM JVM causing intermittent ClassNotFoundException by using thread contextClassLoader in jellies instead of Class.forName(). Detailed description and patch suggestion from bartlejd in HUDSON-5141. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33546 71c3de6d-444a-0410-be80-ed276b4c234a --- .../hudson/model/ParametersAction/index.jelly | 22 ++++++++++--------- .../hudson/widgets/HistoryWidget/index.jelly | 10 +++++---- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/core/src/main/resources/hudson/model/ParametersAction/index.jelly b/core/src/main/resources/hudson/model/ParametersAction/index.jelly index 4726a748e5..007d6d12a2 100644 --- a/core/src/main/resources/hudson/model/ParametersAction/index.jelly +++ b/core/src/main/resources/hudson/model/ParametersAction/index.jelly @@ -1,7 +1,8 @@ - + - - - - - + xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" + xmlns:i="jelly:fmt" xmlns:p="/lib/hudson/project"> + + + + + +

    ${%Build} #${build.number}

    @@ -40,5 +42,5 @@ THE SOFTWARE. - + diff --git a/core/src/main/resources/hudson/widgets/HistoryWidget/index.jelly b/core/src/main/resources/hudson/widgets/HistoryWidget/index.jelly index 73a0144fab..78ca3aacd5 100644 --- a/core/src/main/resources/hudson/widgets/HistoryWidget/index.jelly +++ b/core/src/main/resources/hudson/widgets/HistoryWidget/index.jelly @@ -1,7 +1,8 @@ - + - + + - + -- GitLab From c9ba842419ff3f05b9956771f4b2145ac1622cc3 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Wed, 4 Aug 2010 06:35:41 +0000 Subject: [PATCH 090/336] report the entire call stack, not just the tip. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33557 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/model/Run.java | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/core/src/main/java/hudson/model/Run.java b/core/src/main/java/hudson/model/Run.java index 582d8b5526..6349f81209 100644 --- a/core/src/main/java/hudson/model/Run.java +++ b/core/src/main/java/hudson/model/Run.java @@ -100,6 +100,8 @@ import org.kohsuke.stapler.export.ExportedBean; import com.thoughtworks.xstream.XStream; +import static java.util.logging.Level.FINE; + /** * A particular execution of {@link Job}. * @@ -293,16 +295,13 @@ public abstract class Run ,RunT extends Run,RunT extends Run,RunT extends Run Date: Wed, 4 Aug 2010 12:10:26 +0000 Subject: [PATCH 091/336] Updated Japanese localization. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33558 71c3de6d-444a-0410-be80-ed276b4c234a --- .../hudson/matrix/Messages_ja.properties | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/core/src/main/resources/hudson/matrix/Messages_ja.properties b/core/src/main/resources/hudson/matrix/Messages_ja.properties index 10e527fcdf..a659e824e9 100644 --- a/core/src/main/resources/hudson/matrix/Messages_ja.properties +++ b/core/src/main/resources/hudson/matrix/Messages_ja.properties @@ -20,13 +20,13 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -MatrixProject.DisplayName=\u30DE\u30EB\u30C1\u69CB\u6210\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306E\u30D3\u30EB\u30C9\uFF08\u30A2\u30EB\u30D5\u30A1\uFF09 -MatrixProject.DuplicateAxisName=\u69CB\u6210\u8EF8\u540D\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059 +MatrixProject.DisplayName=\u30de\u30eb\u30c1\u69cb\u6210\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u30d3\u30eb\u30c9 +MatrixProject.DuplicateAxisName=\u69cb\u6210\u8ef8\u540d\u304c\u91cd\u8907\u3057\u3066\u3044\u307e\u3059 -MatrixBuild.Triggering={0}\u306E\u8D77\u52D5 -MatrixBuild.AppearsCancelled={0}\u306F\u4E2D\u6B62\u3055\u308C\u305F\u3088\u3046\u3067\u3059 -MatrixBuild.Cancelled={0}\u306E\u4E2D\u6B62 -MatrixBuild.Interrupting={0}\u3078\u306E\u5272\u308A\u8FBC\u307F +MatrixBuild.Triggering={0}\u306e\u8d77\u52d5 +MatrixBuild.AppearsCancelled={0}\u306f\u4e2d\u6b62\u3055\u308c\u305f\u3088\u3046\u3067\u3059 +MatrixBuild.Cancelled={0}\u306e\u4e2d\u6b62 +MatrixBuild.Interrupting={0}\u3078\u306e\u5272\u308a\u8fbc\u307f -MatrixConfiguration.Pronoun=\u8A2D\u5B9A -MatrixRun.KeptBecauseOfParent={0}\u304C\u4FDD\u7559\u4E2D\u306E\u305F\u3081\u4FDD\u7559\u3057\u307E\u3059 +MatrixConfiguration.Pronoun=\u8a2d\u5b9a +MatrixRun.KeptBecauseOfParent={0}\u304c\u4fdd\u7559\u4e2d\u306e\u305f\u3081\u4fdd\u7559\u3057\u307e\u3059 -- GitLab From b7fb15700eadfbffd5d92715141c3e55fbda3e8e Mon Sep 17 00:00:00 2001 From: mindless Date: Wed, 4 Aug 2010 16:28:52 +0000 Subject: [PATCH 092/336] [FIXED HUDSON-7115] add link to updateCenter in sidepanel of plugin manager pages once any install/upgrade job has been submitted. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33562 71c3de6d-444a-0410-be80-ed276b4c234a --- .../main/resources/hudson/PluginManager/sidepanel.jelly | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/core/src/main/resources/hudson/PluginManager/sidepanel.jelly b/core/src/main/resources/hudson/PluginManager/sidepanel.jelly index 5724c40127..5c7c4c80a7 100644 --- a/core/src/main/resources/hudson/PluginManager/sidepanel.jelly +++ b/core/src/main/resources/hudson/PluginManager/sidepanel.jelly @@ -1,7 +1,7 @@ @@ -61,4 +63,4 @@ THE SOFTWARE.
    -     \ No newline at end of file + -- GitLab From dd45fb64bf5eaa08dc40271dd28ffc368f83108e Mon Sep 17 00:00:00 2001 From: mindless Date: Wed, 4 Aug 2010 18:26:05 +0000 Subject: [PATCH 094/336] omit sidepanel on always-accessible pages if user doesn't have app.READ permission, as done for login page in r33566 git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33567 71c3de6d-444a-0410-be80-ed276b4c234a --- .../main/resources/hudson/model/Hudson/loginError.jelly | 8 +++++--- core/src/main/resources/hudson/model/Hudson/whoAmI.jelly | 8 +++++--- .../security/HudsonPrivateSecurityRealm/_entryForm.jelly | 8 +++++--- .../security/HudsonPrivateSecurityRealm/success.jelly | 8 +++++--- 4 files changed, 20 insertions(+), 12 deletions(-) diff --git a/core/src/main/resources/hudson/model/Hudson/loginError.jelly b/core/src/main/resources/hudson/model/Hudson/loginError.jelly index 577cbddfa7..2c84f19d07 100644 --- a/core/src/main/resources/hudson/model/Hudson/loginError.jelly +++ b/core/src/main/resources/hudson/model/Hudson/loginError.jelly @@ -1,7 +1,7 @@ - + + +
    ${%Invalid login information. Please try again.} @@ -52,4 +54,4 @@ THE SOFTWARE. - \ No newline at end of file + diff --git a/core/src/main/resources/hudson/model/Hudson/whoAmI.jelly b/core/src/main/resources/hudson/model/Hudson/whoAmI.jelly index 7e54fa03c0..4e2f7f55ef 100644 --- a/core/src/main/resources/hudson/model/Hudson/whoAmI.jelly +++ b/core/src/main/resources/hudson/model/Hudson/whoAmI.jelly @@ -1,7 +1,7 @@ - + + +

    Who Am I?

    @@ -68,4 +70,4 @@ THE SOFTWARE.     -     \ No newline at end of file + diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm.jelly b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm.jelly index 84722a8f14..13afd1d37b 100644 --- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm.jelly +++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm.jelly @@ -1,7 +1,7 @@ + com.infradna.tool + bridge-method-injector + 1.0 + true + + org.kohsuke.stapler json-lib diff --git a/core/src/main/java/hudson/model/AbstractProject.java b/core/src/main/java/hudson/model/AbstractProject.java index d4aba9b1fe..19c5bcf0b1 100644 --- a/core/src/main/java/hudson/model/AbstractProject.java +++ b/core/src/main/java/hudson/model/AbstractProject.java @@ -32,35 +32,31 @@ import hudson.Util; import hudson.cli.declarative.CLIMethod; import hudson.cli.declarative.CLIResolver; import hudson.diagnosis.OldDataMonitor; -import hudson.slaves.WorkspaceList; import hudson.model.Cause.LegacyCodeCause; -import hudson.model.Cause.UserCause; import hudson.model.Cause.RemoteCause; +import hudson.model.Cause.UserCause; import hudson.model.Descriptor.FormException; import hudson.model.Fingerprint.RangeSet; -import hudson.model.RunMap.Constructor; -import hudson.model.Queue.WaitingItem; import hudson.model.Queue.Executable; +import hudson.model.Queue.WaitingItem; +import hudson.model.RunMap.Constructor; import hudson.model.queue.CauseOfBlockage; import hudson.scm.ChangeLogSet; import hudson.scm.ChangeLogSet.Entry; import hudson.scm.NullSCM; -import hudson.scm.SCM; -import hudson.scm.SCMS; import hudson.scm.PollingResult; +import hudson.scm.SCM; import hudson.scm.SCMRevisionState; -import static hudson.scm.PollingResult.NO_CHANGES; -import static hudson.scm.PollingResult.BUILD_NOW; -import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; - +import hudson.scm.SCMS; import hudson.search.SearchIndexBuilder; import hudson.security.Permission; +import hudson.slaves.WorkspaceList; import hudson.tasks.BuildStep; +import hudson.tasks.BuildStepDescriptor; import hudson.tasks.BuildTrigger; +import hudson.tasks.BuildWrapperDescriptor; import hudson.tasks.Mailer; import hudson.tasks.Publisher; -import hudson.tasks.BuildStepDescriptor; -import hudson.tasks.BuildWrapperDescriptor; import hudson.triggers.SCMTrigger; import hudson.triggers.Trigger; import hudson.triggers.TriggerDescriptor; @@ -72,14 +68,14 @@ import hudson.widgets.HistoryWidget; import net.sf.json.JSONObject; import org.kohsuke.args4j.Argument; import org.kohsuke.args4j.CmdLineException; +import org.kohsuke.stapler.ForwardToView; +import org.kohsuke.stapler.HttpRedirect; +import org.kohsuke.stapler.HttpResponse; import org.kohsuke.stapler.HttpResponses; +import org.kohsuke.stapler.QueryParameter; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; import org.kohsuke.stapler.export.Exported; -import org.kohsuke.stapler.QueryParameter; -import org.kohsuke.stapler.HttpResponse; -import org.kohsuke.stapler.HttpRedirect; -import org.kohsuke.stapler.ForwardToView; import javax.servlet.ServletException; import java.io.File; @@ -102,6 +98,9 @@ import java.util.concurrent.Future; import java.util.logging.Level; import java.util.logging.Logger; +import static hudson.scm.PollingResult.*; +import static javax.servlet.http.HttpServletResponse.*; + /** * Base implementation of {@link Job}s that build software. * @@ -286,6 +285,14 @@ public abstract class AbstractProject

    ,R extends A return Hudson.getInstance().getLabel(assignedNode); } + /** + * Gets the textual representation of the assigned label as it was entered by the user. + */ + public String getAssignedLabelString() { + if (canRoam) return null; + return assignedNode; + } + /** * Sets the assigned label. */ @@ -1488,11 +1495,7 @@ public abstract class AbstractProject

    ,R extends A if(req.getParameter("hasSlaveAffinity")!=null) { canRoam = false; - assignedNode = req.getParameter("slave"); - if(assignedNode !=null) { - if(Hudson.getInstance().getLabel(assignedNode).isEmpty()) - assignedNode = null; // no such label - } + assignedNode = req.getParameter("_.assignedLabelString"); } else { canRoam = true; assignedNode = null; @@ -1673,6 +1676,13 @@ public abstract class AbstractProject

    ,R extends A public boolean isApplicable(Descriptor descriptor) { return true; } + + public FormValidation doCheckAssignedLabelString(@QueryParameter String value) { + // TODO: we can do a lot better than this + if (Hudson.getInstance().getLabel(value).isEmpty()) + return FormValidation.warning("There's no slave/cloud that matches this assignment"); + return FormValidation.ok(); + } } /** diff --git a/core/src/main/java/hudson/model/Hudson.java b/core/src/main/java/hudson/model/Hudson.java index 59b89499cf..c25c4d4643 100644 --- a/core/src/main/java/hudson/model/Hudson.java +++ b/core/src/main/java/hudson/model/Hudson.java @@ -66,6 +66,7 @@ import hudson.lifecycle.Lifecycle; import hudson.logging.LogRecorderManager; import hudson.lifecycle.RestartNotSupportedException; import hudson.model.Descriptor.FormException; +import hudson.model.label.LabelAtom; import hudson.model.listeners.ItemListener; import hudson.model.listeners.SCMListener; import hudson.model.listeners.SaveableListener; @@ -1357,24 +1358,36 @@ public final class Hudson extends Node implements ItemGroup, Stapl return new ComputerSet(); } + /** * Gets the label that exists on this system by the name. * - * @return null if no name is null. - * @see Label#parse(String) + * @return null if name is null. + * @see Label#parseExpression(String) (String) */ - public Label getLabel(String name) { - if(name==null) return null; + public Label getLabel(String expr) { + if(expr==null) return null; while(true) { - Label l = labels.get(name); + Label l = labels.get(expr); if(l!=null) return l; // non-existent - labels.putIfAbsent(name,new Label(name)); + labels.putIfAbsent(expr,Label.parseExpression(expr)); } } + /** + * Returns the label atom of the given name. + */ + public LabelAtom getLabelAtom(String name) { + if(name==null) return null; + Label l = getLabel(name); + if (l instanceof LabelAtom) + return (LabelAtom)l; + return null; + } + /** * Gets all the active labels in the current system. */ @@ -1387,6 +1400,15 @@ public final class Hudson extends Node implements ItemGroup, Stapl return r; } + public Set getLabelAtoms() { + Set r = new TreeSet(); + for (Label l : labels.values()) { + if(!l.isEmpty() && l instanceof LabelAtom) + r.add((LabelAtom)l); + } + return r; + } + public Queue getQueue() { return queue; } @@ -2087,8 +2109,8 @@ public final class Hudson extends Node implements ItemGroup, Stapl } @Override - public Label getSelfLabel() { - return getLabel("master"); + public LabelAtom getSelfLabel() { + return getLabelAtom("master"); } public Computer createComputer() { diff --git a/core/src/main/java/hudson/model/Label.java b/core/src/main/java/hudson/model/Label.java index c4a548cd2c..7029d953a8 100644 --- a/core/src/main/java/hudson/model/Label.java +++ b/core/src/main/java/hudson/model/Label.java @@ -25,8 +25,12 @@ package hudson.model; import hudson.Util; import static hudson.Util.fixNull; + +import hudson.model.label.LabelAtom; +import hudson.model.label.LabelExpression; import hudson.slaves.NodeProvisioner; import hudson.slaves.Cloud; +import hudson.util.VariableResolver; import org.kohsuke.stapler.export.Exported; import org.kohsuke.stapler.export.ExportedBean; @@ -52,8 +56,8 @@ import com.thoughtworks.xstream.io.HierarchicalStreamReader; * @see Hudson#getLabel(String) */ @ExportedBean -public class Label implements Comparable

    ,R extends A } public FormValidation doCheckAssignedLabelString(@QueryParameter String value) { - // TODO: we can do a lot better than this + try { + Label.parseExpression(value); + } catch (ANTLRException e) { + return FormValidation.error(e,"Invalid boolean expression"); + } + // TODO: if there's an atom in the expression that is empty, report it if (Hudson.getInstance().getLabel(value).isEmpty()) return FormValidation.warning("There's no slave/cloud that matches this assignment"); return FormValidation.ok(); diff --git a/core/src/main/java/hudson/model/Hudson.java b/core/src/main/java/hudson/model/Hudson.java index c25c4d4643..8b81ca4b4d 100644 --- a/core/src/main/java/hudson/model/Hudson.java +++ b/core/src/main/java/hudson/model/Hudson.java @@ -25,6 +25,7 @@ */ package hudson.model; +import antlr.ANTLRException; import com.thoughtworks.xstream.XStream; import hudson.BulkChange; import hudson.DNSMultiCast; @@ -1373,7 +1374,11 @@ public final class Hudson extends Node implements ItemGroup, Stapl return l; // non-existent - labels.putIfAbsent(expr,Label.parseExpression(expr)); + try { + labels.putIfAbsent(expr,Label.parseExpression(expr)); + } catch (ANTLRException e) { + throw new IllegalArgumentException("Invalid label expression: "+expr,e); + } } } @@ -1381,11 +1386,18 @@ public final class Hudson extends Node implements ItemGroup, Stapl * Returns the label atom of the given name. */ public LabelAtom getLabelAtom(String name) { - if(name==null) return null; - Label l = getLabel(name); - if (l instanceof LabelAtom) - return (LabelAtom)l; - return null; + if (name==null) return null; + if (!LabelAtom.isValidName(name)) + throw new IllegalArgumentException("Illegal character in a token: "+name); + + while(true) { + Label l = labels.get(name); + if(l!=null) + return (LabelAtom)l; + + // non-existent + labels.putIfAbsent(name,new LabelAtom(name)); + } } /** diff --git a/core/src/main/java/hudson/model/Label.java b/core/src/main/java/hudson/model/Label.java index 7029d953a8..e927fb52fb 100644 --- a/core/src/main/java/hudson/model/Label.java +++ b/core/src/main/java/hudson/model/Label.java @@ -23,17 +23,22 @@ */ package hudson.model; +import antlr.ANTLRException; import hudson.Util; import static hudson.Util.fixNull; import hudson.model.label.LabelAtom; import hudson.model.label.LabelExpression; +import hudson.model.label.LabelExpressionLexer; +import hudson.model.label.LabelExpressionParser; +import hudson.model.label.LabelOperatorPrecedence; import hudson.slaves.NodeProvisioner; import hudson.slaves.Cloud; import hudson.util.VariableResolver; import org.kohsuke.stapler.export.Exported; import org.kohsuke.stapler.export.ExportedBean; +import java.io.StringReader; import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; @@ -326,6 +331,56 @@ public abstract class Label implements Comparable

    ,R extends A blockBuildWhenUpstreamBuilding = req.getParameter("blockBuildWhenUpstreamBuilding")!=null; if(req.getParameter("hasSlaveAffinity")!=null) { - canRoam = false; - assignedNode = req.getParameter("_.assignedLabelString"); + assignedNode = Util.fixEmptyAndTrim(req.getParameter("_.assignedLabelString")); } else { - canRoam = true; assignedNode = null; } + canRoam = assignedNode==null; concurrentBuild = req.getSubmittedForm().has("concurrentBuild"); @@ -1679,10 +1678,12 @@ public abstract class AbstractProject

    ,R extends A } public FormValidation doCheckAssignedLabelString(@QueryParameter String value) { + if (Util.fixEmpty(value)==null) + return FormValidation.ok(); // nothing typed yet try { Label.parseExpression(value); } catch (ANTLRException e) { - return FormValidation.error(e,"Invalid boolean expression"); + return FormValidation.error(e,"Invalid boolean expression: "+e.getMessage()); } // TODO: if there's an atom in the expression that is empty, report it if (Hudson.getInstance().getLabel(value).isEmpty()) diff --git a/core/src/main/resources/hudson/model/AbstractItem/configure-common.jelly b/core/src/main/resources/hudson/model/AbstractItem/configure-common.jelly index 0d2e687511..af76eacce0 100644 --- a/core/src/main/resources/hudson/model/AbstractItem/configure-common.jelly +++ b/core/src/main/resources/hudson/model/AbstractItem/configure-common.jelly @@ -47,9 +47,9 @@ THE SOFTWARE. - - + diff --git a/core/src/main/resources/hudson/model/AbstractProject/help-assignedLabelString.html b/core/src/main/resources/hudson/model/AbstractProject/help-assignedLabelString.html new file mode 100644 index 0000000000..bb51707ed3 --- /dev/null +++ b/core/src/main/resources/hudson/model/AbstractProject/help-assignedLabelString.html @@ -0,0 +1,46 @@ +

    + If you want to always run this project on a specific node/slave, just specify its name. + This works well when you have a small number of nodes. + +

    + As the size of the cluster grows, it becomes useful not to tie projects to specific slaves, + as it hurts resource utilization when slaves may come and go. For such situation, assign labels + to slaves to classify their capabilities and characteristics, and specify a boolean expression + over those labels to decide where to run. + +

    Valid Operators

    +

    + The following operators are supported, in the order of precedence. + An expression can contain whitespace for better readability, and it'll be ignored. +

    +
    (expr)
    +
    parenthesis
    + +
    !expr
    +
    negation
    + +
    expr&expr
    +
    + and +
    + +
    expr|expr
    +
    + or +
    + +
    a -> b
    +
    + "implies" operator. Equivalent to !a|b. + For example, windows->x64 could be thought of as "if run on a Windows slave, + that slave must be 64bit." It still allows Hudson to run this build on linux. +
    + +
    a <-> b
    +
    + "if and only if" operator. Equivalent to a&b |!a&!b. + For example, windows->sfbay could be thought of as "if run on a Windows slave, + that slave must be in the SF bay area, but if not on Windows, it must not be in the bay area." +
    +
    +
    \ No newline at end of file -- GitLab From cb5ae8191c7b9d2140cc5e053aa0b34f29cf28ab Mon Sep 17 00:00:00 2001 From: kohsuke Date: Sat, 7 Aug 2010 23:04:06 +0000 Subject: [PATCH 107/336] tweaking the text. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33623 71c3de6d-444a-0410-be80-ed276b4c234a --- .../model/AbstractProject/help-assignedLabelString.html | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/core/src/main/resources/hudson/model/AbstractProject/help-assignedLabelString.html b/core/src/main/resources/hudson/model/AbstractProject/help-assignedLabelString.html index bb51707ed3..b213576d79 100644 --- a/core/src/main/resources/hudson/model/AbstractProject/help-assignedLabelString.html +++ b/core/src/main/resources/hudson/model/AbstractProject/help-assignedLabelString.html @@ -11,7 +11,6 @@

    Valid Operators

    The following operators are supported, in the order of precedence. - An expression can contain whitespace for better readability, and it'll be ignored.

    (expr)
    parenthesis
    @@ -19,7 +18,7 @@
    !expr
    negation
    -
    expr&expr
    +
    expr&expr
    and
    @@ -38,9 +37,12 @@
    a <-> b
    - "if and only if" operator. Equivalent to a&b |!a&!b. + "if and only if" operator. Equivalent to a&b |!a&!b. For example, windows->sfbay could be thought of as "if run on a Windows slave, that slave must be in the SF bay area, but if not on Windows, it must not be in the bay area."
    +

    + All operators are left-associative (i.e., a->b->c <-> (a->b)->c ) + An expression can contain whitespace for better readability, and it'll be ignored.

    \ No newline at end of file -- GitLab From 75cc09e966c1b0e216e1e5fe5bd5a28bbdf7d306 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Sun, 8 Aug 2010 02:05:46 +0000 Subject: [PATCH 108/336] Use a newer version that separates annotation from its processor, so that even if the downstream modules use APT and hit @WithBridgeMethods, it won't complain about the lack of declarations. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33625 71c3de6d-444a-0410-be80-ed276b4c234a --- core/pom.xml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 4d6edf7b31..2d3aadf6d3 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -57,7 +57,7 @@ THE SOFTWARE. com.infradna.tool bridge-method-injector - 1.0 + 1.2 @@ -403,11 +403,10 @@ THE SOFTWARE. test     - + com.infradna.tool - bridge-method-injector - 1.0 - true + bridge-method-annotation + 1.2 -- GitLab From d4c9e40b9116e5bc23d46806626a4f187f974f48 Mon Sep 17 00:00:00 2001 From: mindless Date: Sun, 8 Aug 2010 05:29:34 +0000 Subject: [PATCH 109/336] [SECURITY-5] Add several missing permission checks in CLI commands. Current CLI is always available and most commands can be run by anonymous users. Now only a short help message and the login command are available for anonymous in a Hudson without anonymous read permission, and each individual command also checks the appropriate permission for that command. Details: * Vulnerable CLI commands now fixed: build, clear-queue, copy-job, create-job, delete-builds, delete-job, disable-job, enable-job, install-plugin, install-tool, keep-build, mail, restart, safe-restart, set-build-result * Broken CLI commands now fixed: connect-node, delete-node, disconnect-node, offline-node, online-node * Other vulnerable command (not CLI) now fixed: /gc (JVM garbage collect) git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33626 71c3de6d-444a-0410-be80-ed276b4c234a --- .../main/java/hudson/cli/BuildCommand.java | 7 +++-- core/src/main/java/hudson/cli/CLICommand.java | 6 ++-- .../main/java/hudson/cli/CopyJobCommand.java | 7 +++-- .../java/hudson/cli/CreateJobCommand.java | 5 +++- .../java/hudson/cli/DeleteBuildsCommand.java | 5 +++- .../main/java/hudson/cli/GroovyshCommand.java | 5 ++-- .../src/main/java/hudson/cli/HelpCommand.java | 9 +++++- .../java/hudson/cli/InstallPluginCommand.java | 9 ++++-- .../java/hudson/cli/InstallToolCommand.java | 30 +++++++++++-------- .../java/hudson/cli/ListChangesCommand.java | 2 ++ .../src/main/java/hudson/cli/MailCommand.java | 5 +++- .../hudson/cli/SetBuildResultCommand.java | 6 +++- .../main/java/hudson/cli/VersionCommand.java | 3 +- .../hudson/cli/declarative/CLIRegisterer.java | 3 +- .../main/java/hudson/model/AbstractItem.java | 8 +++-- .../java/hudson/model/AbstractProject.java | 8 +++-- core/src/main/java/hudson/model/Computer.java | 7 ++++- core/src/main/java/hudson/model/Hudson.java | 20 ++++++++----- core/src/main/java/hudson/model/Queue.java | 1 + core/src/main/java/hudson/model/Run.java | 3 +- 20 files changed, 100 insertions(+), 49 deletions(-) diff --git a/core/src/main/java/hudson/cli/BuildCommand.java b/core/src/main/java/hudson/cli/BuildCommand.java index 6d508efbf1..a214dd6b3a 100644 --- a/core/src/main/java/hudson/cli/BuildCommand.java +++ b/core/src/main/java/hudson/cli/BuildCommand.java @@ -1,7 +1,7 @@ /* * The MIT License * - * Copyright (c) 2004-2009, Sun Microsystems, Inc. + * Copyright (c) 2004-2010, Sun Microsystems, Inc. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -32,6 +32,7 @@ import hudson.model.ParametersDefinitionProperty; import hudson.model.ParameterDefinition; import hudson.Extension; import hudson.AbortException; +import hudson.model.Item; import hudson.util.EditDistance; import org.kohsuke.args4j.Argument; import org.kohsuke.args4j.Option; @@ -66,8 +67,9 @@ public class BuildCommand extends CLICommand { public Map parameters = new HashMap(); protected int run() throws Exception { - ParametersAction a = null; + job.checkPermission(Item.BUILD); + ParametersAction a = null; if (!parameters.isEmpty()) { ParametersDefinitionProperty pdp = job.getProperty(ParametersDefinitionProperty.class); if (pdp==null) @@ -106,6 +108,7 @@ public class BuildCommand extends CLICommand { ); } + // TODO: CLI can authenticate as different users, so should record which user here.. public static class CLICause extends Cause { public String getShortDescription() { return "Started by command line"; diff --git a/core/src/main/java/hudson/cli/CLICommand.java b/core/src/main/java/hudson/cli/CLICommand.java index 46a16da2e9..56f44b474d 100644 --- a/core/src/main/java/hudson/cli/CLICommand.java +++ b/core/src/main/java/hudson/cli/CLICommand.java @@ -1,7 +1,7 @@ /* * The MIT License * - * Copyright (c) 2004-2009, Sun Microsystems, Inc. + * Copyright (c) 2004-2010, Sun Microsystems, Inc. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -40,7 +40,6 @@ import org.acegisecurity.Authentication; import org.acegisecurity.context.SecurityContext; import org.acegisecurity.context.SecurityContextHolder; import org.jvnet.hudson.annotation_indexer.Index; -import org.jvnet.hudson.annotation_indexer.Indexed; import org.jvnet.tiger_types.Types; import org.kohsuke.args4j.ClassParser; import org.kohsuke.args4j.CmdLineException; @@ -48,7 +47,6 @@ import org.kohsuke.args4j.CmdLineParser; import org.kohsuke.args4j.spi.OptionHandler; import java.io.BufferedInputStream; -import java.io.IOError; import java.io.IOException; import java.io.InputStream; import java.io.PrintStream; @@ -181,6 +179,8 @@ public abstract class CLICommand implements ExtensionPoint, Cloneable { if (auth==Hudson.ANONYMOUS) auth = loadStoredAuthentication(); sc.setAuthentication(auth); // run the CLI with the right credential + if (!(this instanceof LoginCommand || this instanceof HelpCommand)) + Hudson.getInstance().checkPermission(Hudson.READ); return run(); } catch (CmdLineException e) { stderr.println(e.getMessage()); diff --git a/core/src/main/java/hudson/cli/CopyJobCommand.java b/core/src/main/java/hudson/cli/CopyJobCommand.java index 371f138068..6564f9b07e 100644 --- a/core/src/main/java/hudson/cli/CopyJobCommand.java +++ b/core/src/main/java/hudson/cli/CopyJobCommand.java @@ -1,7 +1,7 @@ /* * The MIT License * - * Copyright (c) 2004-2009, Sun Microsystems, Inc. + * Copyright (c) 2004-2010, Sun Microsystems, Inc. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,13 +23,12 @@ */ package hudson.cli; -import hudson.model.AbstractProject; import hudson.model.Hudson; import hudson.model.TopLevelItem; import hudson.Extension; +import hudson.model.Item; import org.kohsuke.args4j.Argument; -import java.io.Serializable; /** * Copies a job from CLI. @@ -51,6 +50,8 @@ public class CopyJobCommand extends CLICommand { protected int run() throws Exception { Hudson h = Hudson.getInstance(); + h.checkPermission(Item.CREATE); + if (h.getItem(dst)!=null) { stderr.println("Job '"+dst+"' already exists"); return -1; diff --git a/core/src/main/java/hudson/cli/CreateJobCommand.java b/core/src/main/java/hudson/cli/CreateJobCommand.java index 189e6a4ede..3f0c522c02 100644 --- a/core/src/main/java/hudson/cli/CreateJobCommand.java +++ b/core/src/main/java/hudson/cli/CreateJobCommand.java @@ -1,7 +1,7 @@ /* * The MIT License * - * Copyright (c) 2004-2009, Sun Microsystems, Inc. + * Copyright (c) 2004-2010, Sun Microsystems, Inc. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -25,6 +25,7 @@ package hudson.cli; import hudson.model.Hudson; import hudson.Extension; +import hudson.model.Item; import org.kohsuke.args4j.Argument; /** @@ -44,6 +45,8 @@ public class CreateJobCommand extends CLICommand { protected int run() throws Exception { Hudson h = Hudson.getInstance(); + h.checkPermission(Item.CREATE); + if (h.getItem(name)!=null) { stderr.println("Job '"+name+"' already exists"); return -1; diff --git a/core/src/main/java/hudson/cli/DeleteBuildsCommand.java b/core/src/main/java/hudson/cli/DeleteBuildsCommand.java index b52eb2d541..eae61b4062 100644 --- a/core/src/main/java/hudson/cli/DeleteBuildsCommand.java +++ b/core/src/main/java/hudson/cli/DeleteBuildsCommand.java @@ -1,7 +1,7 @@ /* * The MIT License * - * Copyright (c) 2004-2009, Sun Microsystems, Inc. + * Copyright (c) 2004-2010, Sun Microsystems, Inc. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -25,6 +25,7 @@ package hudson.cli; import hudson.Extension; import hudson.model.AbstractBuild; +import hudson.model.Run; import java.io.IOException; import java.io.PrintStream; @@ -51,6 +52,8 @@ public class DeleteBuildsCommand extends AbstractBuildRangeCommand { @Override protected int act(List> builds) throws IOException { + job.checkPermission(Run.DELETE); + for (AbstractBuild build : builds) build.delete(); diff --git a/core/src/main/java/hudson/cli/GroovyshCommand.java b/core/src/main/java/hudson/cli/GroovyshCommand.java index fab488013b..a3703a8d8b 100644 --- a/core/src/main/java/hudson/cli/GroovyshCommand.java +++ b/core/src/main/java/hudson/cli/GroovyshCommand.java @@ -1,7 +1,7 @@ /* * The MIT License * - * Copyright (c) 2004-2009, Sun Microsystems, Inc. + * Copyright (c) 2004-2010, Sun Microsystems, Inc. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -28,7 +28,6 @@ import hudson.model.Hudson; import hudson.remoting.ChannelClosedException; import groovy.lang.Binding; import groovy.lang.Closure; -import org.acegisecurity.Authentication; import org.codehaus.groovy.tools.shell.Groovysh; import org.codehaus.groovy.tools.shell.IO; import org.codehaus.groovy.tools.shell.Shell; @@ -60,6 +59,8 @@ public class GroovyshCommand extends CLICommand { public int main(List args, Locale locale, InputStream stdin, PrintStream stdout, PrintStream stderr) { // this allows the caller to manipulate the JVM state, so require the admin privilege. Hudson.getInstance().checkPermission(Hudson.ADMINISTER); + // TODO: ^as this class overrides main() (which has authentication stuff), + // how to get ADMIN permission for this command? // this being remote means no jline capability is available System.setProperty("jline.terminal", UnsupportedTerminal.class.getName()); diff --git a/core/src/main/java/hudson/cli/HelpCommand.java b/core/src/main/java/hudson/cli/HelpCommand.java index 5f1f344e7b..8f87fafc9a 100644 --- a/core/src/main/java/hudson/cli/HelpCommand.java +++ b/core/src/main/java/hudson/cli/HelpCommand.java @@ -1,7 +1,7 @@ /* * The MIT License * - * Copyright (c) 2004-2009, Sun Microsystems, Inc. + * Copyright (c) 2004-2010, Sun Microsystems, Inc. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -24,6 +24,7 @@ package hudson.cli; import hudson.Extension; +import hudson.model.Hudson; import java.util.Map; import java.util.TreeMap; @@ -41,6 +42,12 @@ public class HelpCommand extends CLICommand { } protected int run() { + if (!Hudson.getInstance().hasPermission(Hudson.READ)) { + stderr.println("You must authenticate to access this Hudson.\n" + + "Use --username/--password/--password-file parameters or login command."); + return 0; + } + Map commands = new TreeMap(); for (CLICommand c : CLICommand.all()) commands.put(c.getName(),c); diff --git a/core/src/main/java/hudson/cli/InstallPluginCommand.java b/core/src/main/java/hudson/cli/InstallPluginCommand.java index 409c8914b2..fac26b5406 100644 --- a/core/src/main/java/hudson/cli/InstallPluginCommand.java +++ b/core/src/main/java/hudson/cli/InstallPluginCommand.java @@ -1,7 +1,7 @@ /* * The MIT License * - * Copyright (c) 2004-2009, Sun Microsystems, Inc. + * Copyright (c) 2004-2010, Sun Microsystems, Inc. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -61,6 +61,9 @@ public class InstallPluginCommand extends CLICommand { public boolean restart; protected int run() throws Exception { + Hudson h = Hudson.getInstance(); + h.checkPermission(Hudson.ADMINISTER); + for (String source : sources) { // is this a file? FilePath f = new FilePath(channel, source); @@ -90,7 +93,7 @@ public class InstallPluginCommand extends CLICommand { } // is this a plugin the update center? - UpdateSite.Plugin p = Hudson.getInstance().getUpdateCenter().getPlugin(source); + UpdateSite.Plugin p = h.getUpdateCenter().getPlugin(source); if (p!=null) { stdout.println("Installing "+source+" from update center"); p.deploy().get(); @@ -102,7 +105,7 @@ public class InstallPluginCommand extends CLICommand { } if (restart) - Hudson.getInstance().restart(); + h.restart(); return 0; // all success } diff --git a/core/src/main/java/hudson/cli/InstallToolCommand.java b/core/src/main/java/hudson/cli/InstallToolCommand.java index 0320cca86d..58693b84a9 100644 --- a/core/src/main/java/hudson/cli/InstallToolCommand.java +++ b/core/src/main/java/hudson/cli/InstallToolCommand.java @@ -1,7 +1,7 @@ /* * The MIT License * - * Copyright (c) 2004-2009, Sun Microsystems, Inc. + * Copyright (c) 2004-2010, Sun Microsystems, Inc. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -32,6 +32,7 @@ import hudson.model.Run; import hudson.model.Executor; import hudson.model.Node; import hudson.model.EnvironmentSpecific; +import hudson.model.Item; import hudson.remoting.Callable; import hudson.slaves.NodeSpecific; import hudson.util.EditDistance; @@ -63,6 +64,20 @@ public class InstallToolCommand extends CLICommand { } protected int run() throws Exception { + Hudson h = Hudson.getInstance(); + h.checkPermission(Hudson.READ); + + // where is this build running? + BuildIDs id = channel.call(new BuildIDs()); + + if (!id.isComplete()) + throw new AbortException("This command can be only invoked from a build executing inside Hudson"); + + AbstractProject p = Hudson.getInstance().getItemByFullName(id.job, AbstractProject.class); + if (p==null) + throw new AbortException("No such job found: "+id.job); + p.checkPermission(Item.CONFIGURE); + List toolTypes = new ArrayList(); for (ToolDescriptor d : ToolInstallation.all()) { toolTypes.add(d.getDisplayName()); @@ -71,7 +86,7 @@ public class InstallToolCommand extends CLICommand { for (ToolInstallation t : d.getInstallations()) { toolNames.add(t.getName()); if (t.getName().equals(toolName)) - return install(t); + return install(t, id, p); } // didn't find the right tool name @@ -96,16 +111,7 @@ public class InstallToolCommand extends CLICommand { /** * Performs an installation. */ - private int install(ToolInstallation t) throws IOException, InterruptedException { - // where is this build running? - BuildIDs id = channel.call(new BuildIDs()); - - if (!id.isComplete()) - throw new AbortException("This command can be only invoked from a build executing inside Hudson"); - - AbstractProject p = Hudson.getInstance().getItemByFullName(id.job, AbstractProject.class); - if (p==null) - throw new AbortException("No such job found: "+id.job); + private int install(ToolInstallation t, BuildIDs id, AbstractProject p) throws IOException, InterruptedException { Run b = p.getBuildByNumber(Integer.parseInt(id.number)); if (b==null) diff --git a/core/src/main/java/hudson/cli/ListChangesCommand.java b/core/src/main/java/hudson/cli/ListChangesCommand.java index e0b61ed205..93a286ae89 100644 --- a/core/src/main/java/hudson/cli/ListChangesCommand.java +++ b/core/src/main/java/hudson/cli/ListChangesCommand.java @@ -40,6 +40,8 @@ public class ListChangesCommand extends AbstractBuildRangeCommand { @Override protected int act(List> builds) throws IOException { + // Loading job for this CLI command requires Item.READ permission. + // No other permission check needed. switch (format) { case XML: PrintWriter w = new PrintWriter(stdout); diff --git a/core/src/main/java/hudson/cli/MailCommand.java b/core/src/main/java/hudson/cli/MailCommand.java index 0fa5d7e8ca..44a1b8fd1d 100644 --- a/core/src/main/java/hudson/cli/MailCommand.java +++ b/core/src/main/java/hudson/cli/MailCommand.java @@ -1,7 +1,7 @@ /* * The MIT License * - * Copyright (c) 2004-2009, Sun Microsystems, Inc. + * Copyright (c) 2004-2010, Sun Microsystems, Inc. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -25,6 +25,8 @@ package hudson.cli; import hudson.tasks.Mailer; import hudson.Extension; +import hudson.model.Hudson; +import hudson.model.Item; import javax.mail.internet.MimeMessage; import javax.mail.Transport; @@ -44,6 +46,7 @@ public class MailCommand extends CLICommand { } protected int run() throws Exception { + Hudson.getInstance().checkPermission(Item.CONFIGURE); Transport.send(new MimeMessage(Mailer.descriptor().createSession(),stdin)); return 0; } diff --git a/core/src/main/java/hudson/cli/SetBuildResultCommand.java b/core/src/main/java/hudson/cli/SetBuildResultCommand.java index ac3d024976..29aa4bf025 100644 --- a/core/src/main/java/hudson/cli/SetBuildResultCommand.java +++ b/core/src/main/java/hudson/cli/SetBuildResultCommand.java @@ -25,7 +25,9 @@ package hudson.cli; import hudson.Extension; +import hudson.model.Item; import hudson.model.Result; +import hudson.model.Run; import org.kohsuke.args4j.Argument; /** @@ -45,7 +47,9 @@ public class SetBuildResultCommand extends CommandDuringBuild { @Override protected int run() throws Exception { - getCurrentlyBuilding().setResult(result); + Run r = getCurrentlyBuilding(); + r.getParent().checkPermission(Item.BUILD); + r.setResult(result); return 0; } } diff --git a/core/src/main/java/hudson/cli/VersionCommand.java b/core/src/main/java/hudson/cli/VersionCommand.java index ce735a77f2..fe7aa96121 100644 --- a/core/src/main/java/hudson/cli/VersionCommand.java +++ b/core/src/main/java/hudson/cli/VersionCommand.java @@ -1,7 +1,7 @@ /* * The MIT License * - * Copyright (c) 2004-2009, Sun Microsystems, Inc. + * Copyright (c) 2004-2010, Sun Microsystems, Inc. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -39,6 +39,7 @@ public class VersionCommand extends CLICommand { } protected int run() { + // CLICommand.main checks Hudson.READ permission.. no other check needed. stdout.println(Hudson.VERSION); return 0; } diff --git a/core/src/main/java/hudson/cli/declarative/CLIRegisterer.java b/core/src/main/java/hudson/cli/declarative/CLIRegisterer.java index 67e3397645..4b84b5f7e0 100644 --- a/core/src/main/java/hudson/cli/declarative/CLIRegisterer.java +++ b/core/src/main/java/hudson/cli/declarative/CLIRegisterer.java @@ -1,7 +1,7 @@ /* * The MIT License * - * Copyright (c) 2004-2009, Sun Microsystems, Inc. + * Copyright (c) 2004-2010, Sun Microsystems, Inc. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -149,6 +149,7 @@ public class CLIRegisterer extends ExtensionFinder { parser.parseArgument(args); sc.setAuthentication(authenticator.authenticate()); // run the CLI with the right credential + hudson.checkPermission(Hudson.READ); // resolve them Object instance = null; diff --git a/core/src/main/java/hudson/model/AbstractItem.java b/core/src/main/java/hudson/model/AbstractItem.java index db40bd7b70..fcda31458e 100644 --- a/core/src/main/java/hudson/model/AbstractItem.java +++ b/core/src/main/java/hudson/model/AbstractItem.java @@ -1,7 +1,8 @@ /* * The MIT License * - * Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Daniel Dyer, Tom Huybrechts + * Copyright (c) 2004-2010, Sun Microsystems, Inc., Kohsuke Kawaguchi, + * Daniel Dyer, Tom Huybrechts * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -243,11 +244,13 @@ public abstract class AbstractItem extends Actionable implements Item, HttpDelet /** * Deletes this item. */ + @CLIMethod(name="delete-job") public void doDoDelete( StaplerRequest req, StaplerResponse rsp ) throws IOException, ServletException, InterruptedException { checkPermission(DELETE); requirePOST(); delete(); - rsp.sendRedirect2(req.getContextPath()+"/"+getParent().getUrl()); + if (rsp != null) // null for CLI + rsp.sendRedirect2(req.getContextPath()+"/"+getParent().getUrl()); } public void delete( StaplerRequest req, StaplerResponse rsp ) throws IOException, ServletException { @@ -262,7 +265,6 @@ public abstract class AbstractItem extends Actionable implements Item, HttpDelet /** * Deletes this item. */ - @CLIMethod(name="delete-job") public synchronized void delete() throws IOException, InterruptedException { performDelete(); diff --git a/core/src/main/java/hudson/model/AbstractProject.java b/core/src/main/java/hudson/model/AbstractProject.java index d1b14a23eb..a44ce04ef6 100644 --- a/core/src/main/java/hudson/model/AbstractProject.java +++ b/core/src/main/java/hudson/model/AbstractProject.java @@ -1,7 +1,9 @@ /* * The MIT License * - * Copyright (c) 2004-2010, Sun Microsystems, Inc., Kohsuke Kawaguchi, Brian Westrich, Erik Ramfelt, Ertan Deniz, Jean-Baptiste Quenot, Luca Domenico Milanesio, R. Tyler Ballance, Stephen Connolly, Tom Huybrechts, id:cactusman + * Copyright (c) 2004-2010, Sun Microsystems, Inc., Kohsuke Kawaguchi, + * Brian Westrich, Erik Ramfelt, Ertan Deniz, Jean-Baptiste Quenot, + * Luca Domenico Milanesio, R. Tyler Ballance, Stephen Connolly, Tom Huybrechts, id:cactusman * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -503,12 +505,10 @@ public abstract class AbstractProject

    ,R extends A save(); } - @CLIMethod(name="disable-job") public void disable() throws IOException { makeDisabled(true); } - @CLIMethod(name="enable-job") public void enable() throws IOException { makeDisabled(false); } @@ -1572,6 +1572,7 @@ public abstract class AbstractProject

    ,R extends A } } + @CLIMethod(name="disable-job") public HttpResponse doDisable() throws IOException, ServletException { requirePOST(); checkPermission(CONFIGURE); @@ -1579,6 +1580,7 @@ public abstract class AbstractProject

    ,R extends A return new HttpRedirect("."); } + @CLIMethod(name="enable-job") public HttpResponse doEnable() throws IOException, ServletException { requirePOST(); checkPermission(CONFIGURE); diff --git a/core/src/main/java/hudson/model/Computer.java b/core/src/main/java/hudson/model/Computer.java index a79cdbb6cb..0ffa44d153 100644 --- a/core/src/main/java/hudson/model/Computer.java +++ b/core/src/main/java/hudson/model/Computer.java @@ -1,7 +1,8 @@ /* * The MIT License * - * Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Red Hat, Inc., Seiji Sogabe, Stephen Connolly, Thomas J. Black, Tom Huybrechts + * Copyright (c) 2004-2010, Sun Microsystems, Inc., Kohsuke Kawaguchi, + * Red Hat, Inc., Seiji Sogabe, Stephen Connolly, Thomas J. Black, Tom Huybrechts * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -281,6 +282,7 @@ public /*transient*/ abstract class Computer extends Actionable implements Acces */ @CLIMethod(name="connect-node") public void cliConnect(@Option(name="-f",usage="Cancel any currently pending connect operation and retry from scratch") boolean force) throws ExecutionException, InterruptedException { + checkPermission(Hudson.ADMINISTER); connect(force).get(); } @@ -336,6 +338,7 @@ public /*transient*/ abstract class Computer extends Actionable implements Acces */ @CLIMethod(name="disconnect-node") public void cliDisconnect(@Option(name="-m",usage="Record the note about why you are disconnecting this node") String cause) throws ExecutionException, InterruptedException { + checkPermission(Hudson.ADMINISTER); disconnect(new ByCLI(cause)).get(); } @@ -344,11 +347,13 @@ public /*transient*/ abstract class Computer extends Actionable implements Acces */ @CLIMethod(name="offline-node") public void cliOffline(@Option(name="-m",usage="Record the note about why you are disconnecting this node") String cause) throws ExecutionException, InterruptedException { + checkPermission(Hudson.ADMINISTER); setTemporarilyOffline(true,new ByCLI(cause)); } @CLIMethod(name="online-node") public void cliOnline() throws ExecutionException, InterruptedException { + checkPermission(Hudson.ADMINISTER); setTemporarilyOffline(false,null); } diff --git a/core/src/main/java/hudson/model/Hudson.java b/core/src/main/java/hudson/model/Hudson.java index 8b81ca4b4d..5217a135de 100644 --- a/core/src/main/java/hudson/model/Hudson.java +++ b/core/src/main/java/hudson/model/Hudson.java @@ -152,6 +152,7 @@ import org.jvnet.hudson.reactor.Milestone; import org.jvnet.hudson.reactor.Reactor; import org.jvnet.hudson.reactor.ReactorListener; import org.jvnet.hudson.reactor.TaskGraphBuilder.Handle; +import org.kohsuke.args4j.Argument; import org.kohsuke.args4j.Option; import org.kohsuke.stapler.Ancestor; import org.kohsuke.stapler.HttpRedirect; @@ -1340,7 +1341,7 @@ public final class Hudson extends Node implements ItemGroup, Stapl } @CLIResolver - public Computer getComputer(String name) { + public Computer getComputer(@Argument(required=true,metaVar="NAME",usage="Node name") String name) { if(name.equals("(master)")) name = ""; @@ -2862,6 +2863,7 @@ public final class Hudson extends Node implements ItemGroup, Stapl * For debugging. Expose URL to perform GC. */ public void doGc(StaplerResponse rsp) throws IOException { + checkPermission(Hudson.ADMINISTER); System.gc(); rsp.setStatus(HttpServletResponse.SC_OK); rsp.setContentType("text/plain"); @@ -2874,7 +2876,7 @@ public final class Hudson extends Node implements ItemGroup, Stapl * Handles HTTP requests for duplex channels for CLI. */ public void doCli(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException, InterruptedException { - if(!"POST".equals(Stapler.getCurrentRequest().getMethod())) { + if (!"POST".equals(req.getMethod())) { // for GET request, serve _cli.jelly, assuming this is a browser checkPermission(READ); req.getView(this,"_cli.jelly").forward(req,rsp); @@ -2918,16 +2920,18 @@ public final class Hudson extends Node implements ItemGroup, Stapl * * This first replaces "app" to {@link HudsonIsRestarting} */ + @CLIMethod(name="restart") public void doRestart(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException, RestartNotSupportedException { checkPermission(ADMINISTER); - if(Stapler.getCurrentRequest().getMethod().equals("GET")) { + if (req != null && req.getMethod().equals("GET")) { req.getView(this,"_restart.jelly").forward(req,rsp); return; } restart(); - rsp.sendRedirect2("."); + if (rsp != null) // null for CLI + rsp.sendRedirect2("."); } /** @@ -2937,22 +2941,23 @@ public final class Hudson extends Node implements ItemGroup, Stapl * * @since 1.332 */ + @CLIMethod(name="safe-restart") public void doSafeRestart(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException, RestartNotSupportedException { checkPermission(ADMINISTER); - if(Stapler.getCurrentRequest().getMethod().equals("GET")) { + if (req != null && req.getMethod().equals("GET")) { req.getView(this,"_safeRestart.jelly").forward(req,rsp); return; } safeRestart(); - rsp.sendRedirect2("."); + if (rsp != null) // null for CLI + rsp.sendRedirect2("."); } /** * Performs a restart. */ - @CLIMethod(name="restart") public void restart() throws RestartNotSupportedException { final Lifecycle lifecycle = Lifecycle.get(); lifecycle.verifyRestartable(); // verify that Hudson is restartable @@ -2982,7 +2987,6 @@ public final class Hudson extends Node implements ItemGroup, Stapl * Queues up a restart to be performed once there are no builds currently running. * @since 1.332 */ - @CLIMethod(name="safe-restart") public void safeRestart() throws RestartNotSupportedException { final Lifecycle lifecycle = Lifecycle.get(); lifecycle.verifyRestartable(); // verify that Hudson is restartable diff --git a/core/src/main/java/hudson/model/Queue.java b/core/src/main/java/hudson/model/Queue.java index fc6e08d991..d392f28326 100644 --- a/core/src/main/java/hudson/model/Queue.java +++ b/core/src/main/java/hudson/model/Queue.java @@ -335,6 +335,7 @@ public class Queue extends ResourceController implements Saveable { */ @CLIMethod(name="clear-queue") public synchronized void clear() { + Hudson.getInstance().checkPermission(Hudson.ADMINISTER); for (WaitingItem i : waitingList) i.onCancelled(); waitingList.clear(); diff --git a/core/src/main/java/hudson/model/Run.java b/core/src/main/java/hudson/model/Run.java index 6349f81209..e9862a4c73 100644 --- a/core/src/main/java/hudson/model/Run.java +++ b/core/src/main/java/hudson/model/Run.java @@ -1553,8 +1553,6 @@ public abstract class Run ,RunT extends Run,RunT extends Run Date: Mon, 9 Aug 2010 22:19:47 +0000 Subject: [PATCH 110/336] Do not store SurefireArchiver (which brings in its testResult) to MavenBuild. This wastes a lot of disk and memory. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33653 71c3de6d-444a-0410-be80-ed276b4c234a --- .../main/java/hudson/maven/MavenBuild.java | 20 +++++++++- .../java/hudson/maven/MavenBuildProxy.java | 16 ++++++++ .../main/java/hudson/maven/MavenModule.java | 4 +- .../maven/MavenProjectActionBuilder.java | 37 ++++++++++++++++++ .../main/java/hudson/maven/MavenReporter.java | 2 +- .../maven/reporters/SurefireArchiver.java | 13 +++++-- .../maven/reporters/SurefireArchiverTest.java | 39 +++++++++++++++++++ 7 files changed, 122 insertions(+), 9 deletions(-) create mode 100644 maven-plugin/src/main/java/hudson/maven/MavenProjectActionBuilder.java create mode 100644 test/src/test/java/hudson/maven/reporters/SurefireArchiverTest.java diff --git a/maven-plugin/src/main/java/hudson/maven/MavenBuild.java b/maven-plugin/src/main/java/hudson/maven/MavenBuild.java index a4180ae1c7..2a4c652975 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenBuild.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenBuild.java @@ -73,7 +73,7 @@ public class MavenBuild extends AbstractMavenBuild { * {@link MavenReporter}s that will contribute project actions. * Can be null if there's none. */ - /*package*/ List projectActionReporters; + /*package*/ List projectActionReporters; /** * {@link ExecutedMojo}s that record what was run. @@ -184,10 +184,22 @@ public class MavenBuild extends AbstractMavenBuild { public void registerAsProjectAction(MavenReporter reporter) { if(projectActionReporters==null) - projectActionReporters = new ArrayList(); + projectActionReporters = new ArrayList(); projectActionReporters.add(reporter); } + public void registerAsProjectAction(MavenProjectActionBuilder builder) { + if(projectActionReporters==null) + projectActionReporters = new ArrayList(); + projectActionReporters.add(builder); + } + + public List getProjectActionBuilders() { + if(projectActionReporters==null) + return Collections.emptyList(); + return Collections.unmodifiableList(projectActionReporters); + } + public List getExecutedMojos() { if(executedMojos==null) return Collections.emptyList(); @@ -374,6 +386,10 @@ public class MavenBuild extends AbstractMavenBuild { MavenBuild.this.registerAsProjectAction(reporter); } + public void registerAsProjectAction(MavenProjectActionBuilder builder) { + MavenBuild.this.registerAsProjectAction(builder); + } + public void registerAsAggregatedProjectAction(MavenReporter reporter) { MavenModuleSetBuild pb = getParentBuild(); if(pb!=null) diff --git a/maven-plugin/src/main/java/hudson/maven/MavenBuildProxy.java b/maven-plugin/src/main/java/hudson/maven/MavenBuildProxy.java index 059f148590..8e89221f8a 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenBuildProxy.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenBuildProxy.java @@ -128,6 +128,18 @@ public interface MavenBuildProxy { */ void registerAsProjectAction(MavenReporter reporter); + /** + * Nominates that the reporter will contribute a project action + * for this build by using {@link MavenReporter#getProjectActions(MavenModule)}. + * + *

    + * The specified {@link MavenReporter} object will be transferred to the master + * and will become a persisted part of the {@link MavenBuild}. + * + * @since 1.372 + */ + void registerAsProjectAction(MavenProjectActionBuilder builder); + /** * Nominates that the reporter will contribute a project action * for this build by using {@link MavenReporter#getAggregatedProjectAction(MavenModuleSet)}. @@ -214,6 +226,10 @@ public interface MavenBuildProxy { core.registerAsProjectAction(reporter); } + public void registerAsProjectAction(MavenProjectActionBuilder builder) { + core.registerAsProjectAction(builder); + } + public void registerAsAggregatedProjectAction(MavenReporter reporter) { core.registerAsAggregatedProjectAction(reporter); } diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModule.java b/maven-plugin/src/main/java/hudson/maven/MavenModule.java index e4dd9142bb..25cd3e36fa 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenModule.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenModule.java @@ -412,10 +412,10 @@ public final class MavenModule extends AbstractMavenProject added) { if(build==null) return; - List list = build.projectActionReporters; + List list = build.projectActionReporters; if(list==null) return; - for (MavenReporter step : list) { + for (MavenProjectActionBuilder step : list) { if(!added.add(step.getClass())) continue; // already added try { transientActions.addAll(step.getProjectActions(this)); diff --git a/maven-plugin/src/main/java/hudson/maven/MavenProjectActionBuilder.java b/maven-plugin/src/main/java/hudson/maven/MavenProjectActionBuilder.java new file mode 100644 index 0000000000..711b1f3ef3 --- /dev/null +++ b/maven-plugin/src/main/java/hudson/maven/MavenProjectActionBuilder.java @@ -0,0 +1,37 @@ +package hudson.maven; + +import hudson.model.AbstractProject; +import hudson.model.Action; +import hudson.tasks.BuildStep; + +import java.util.Collection; + +/** + * Can contribute to project actions. + * + * + * @author Kohsuke Kawaguchi + * @see MavenBuildProxy#registerAsProjectAction(MavenProjectActionBuilder) + */ +public interface MavenProjectActionBuilder { + /** + * Equivalent of {@link BuildStep#getProjectActions(AbstractProject)}. + * + *

    + * Registers a transient action to {@link MavenModule} when it's rendered. + * This is useful if you'd like to display an action at the module level. + * + *

    + * Since this contributes a transient action, the returned {@link Action} + * will not be serialized. + * + *

    + * For this method to be invoked, call + * {@link MavenBuildProxy#registerAsProjectAction(MavenProjectActionBuilder)} during the build. + * + * @return + * can be empty but never null. + * @since 1.341 + */ + public Collection getProjectActions(MavenModule module); +} diff --git a/maven-plugin/src/main/java/hudson/maven/MavenReporter.java b/maven-plugin/src/main/java/hudson/maven/MavenReporter.java index 3fa17a12f7..68d0d685ee 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenReporter.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenReporter.java @@ -97,7 +97,7 @@ import java.util.Collections; * @author Kohsuke Kawaguchi * @see MavenReporters */ -public abstract class MavenReporter implements Describable, ExtensionPoint, Serializable { +public abstract class MavenReporter implements Describable, ExtensionPoint, Serializable, MavenProjectActionBuilder { /** * Called before the actual maven2 execution begins. * diff --git a/maven-plugin/src/main/java/hudson/maven/reporters/SurefireArchiver.java b/maven-plugin/src/main/java/hudson/maven/reporters/SurefireArchiver.java index 81ca20f8d7..0dff12bedf 100644 --- a/maven-plugin/src/main/java/hudson/maven/reporters/SurefireArchiver.java +++ b/maven-plugin/src/main/java/hudson/maven/reporters/SurefireArchiver.java @@ -30,6 +30,7 @@ import hudson.maven.MavenBuildProxy; import hudson.maven.MavenBuildProxy.BuildCallable; import hudson.maven.MavenBuilder; import hudson.maven.MavenModule; +import hudson.maven.MavenProjectActionBuilder; import hudson.maven.MavenReporter; import hudson.maven.MavenReporterDescriptor; import hudson.maven.MojoInfo; @@ -113,7 +114,7 @@ public class SurefireArchiver extends MavenReporter { sr.setResult(result,listener); if(result.getFailCount()>0) build.setResult(Result.UNSTABLE); - build.registerAsProjectAction(SurefireArchiver.this); + build.registerAsProjectAction(new FactoryImpl()); return result.getFailCount(); } }); @@ -128,9 +129,13 @@ public class SurefireArchiver extends MavenReporter { return true; } - - public Collection getProjectActions(MavenModule module) { - return Collections.singleton(new TestResultProjectAction(module)); + /** + * Part of the serialization data attached to {@link MavenBuild}. + */ + static final class FactoryImpl implements MavenProjectActionBuilder { + public Collection getProjectActions(MavenModule module) { + return Collections.singleton(new TestResultProjectAction(module)); + } } private boolean isSurefireTest(MojoInfo mojo) { diff --git a/test/src/test/java/hudson/maven/reporters/SurefireArchiverTest.java b/test/src/test/java/hudson/maven/reporters/SurefireArchiverTest.java new file mode 100644 index 0000000000..4d3f176e3a --- /dev/null +++ b/test/src/test/java/hudson/maven/reporters/SurefireArchiverTest.java @@ -0,0 +1,39 @@ +package hudson.maven.reporters; + +import hudson.maven.MavenBuild; +import hudson.maven.MavenModuleSet; +import hudson.maven.MavenModuleSetBuild; +import hudson.maven.MavenProjectActionBuilder; +import hudson.maven.reporters.SurefireArchiver.FactoryImpl; +import hudson.model.Result; +import org.jvnet.hudson.test.ExtractResourceSCM; +import org.jvnet.hudson.test.HudsonTestCase; + +/** + * @author Kohsuke Kawaguchi + */ +public class SurefireArchiverTest extends HudsonTestCase { + public void testSerialization() throws Exception { + configureDefaultMaven(); + MavenModuleSet m = createMavenProject(); + m.setScm(new ExtractResourceSCM(getClass().getResource("../maven-surefire-unstable.zip"))); + m.setGoals("install"); + + MavenModuleSetBuild b = m.scheduleBuild2(0).get(); + assertBuildStatus(Result.UNSTABLE, b); + + + MavenBuild mb = b.getModuleLastBuilds().values().iterator().next(); + boolean foundFactory=false,foundSurefire=false; + for (MavenProjectActionBuilder x : mb.getProjectActionBuilders()) { + if (x instanceof FactoryImpl) + foundFactory = true; + if (x instanceof SurefireArchiver) + foundSurefire = true; + } + + assertTrue(foundFactory); + assertFalse(foundSurefire); + } + +} -- GitLab From 7251863489eb1d3e61f7bd75ea5a587c92feac3e Mon Sep 17 00:00:00 2001 From: kohsuke Date: Mon, 9 Aug 2010 22:20:00 +0000 Subject: [PATCH 111/336] fix up the in-memory layout if we are loading SurefireArchiver as MavenProjectActionBuilder. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33654 71c3de6d-444a-0410-be80-ed276b4c234a --- .../main/java/hudson/maven/MavenBuild.java | 2 ++ .../maven/MavenProjectActionBuilder.java | 23 +++++++++++++++++++ .../maven/reporters/SurefireArchiver.java | 18 +++++++++++++++ .../maven/reporters/SurefireArchiverTest.java | 23 +++++++++++++++++++ 4 files changed, 66 insertions(+) diff --git a/maven-plugin/src/main/java/hudson/maven/MavenBuild.java b/maven-plugin/src/main/java/hudson/maven/MavenBuild.java index 2a4c652975..82f411f0a3 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenBuild.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenBuild.java @@ -25,6 +25,7 @@ package hudson.maven; import hudson.FilePath; import hudson.EnvVars; +import hudson.maven.reporters.SurefireArchiver; import hudson.slaves.WorkspaceList; import hudson.slaves.WorkspaceList.Lease; import hudson.maven.agent.AbortException; @@ -93,6 +94,7 @@ public class MavenBuild extends AbstractMavenBuild { public MavenBuild(MavenModule project, File buildDir) throws IOException { super(project, buildDir); + SurefireArchiver.fixUp(projectActionReporters); } @Override diff --git a/maven-plugin/src/main/java/hudson/maven/MavenProjectActionBuilder.java b/maven-plugin/src/main/java/hudson/maven/MavenProjectActionBuilder.java index 711b1f3ef3..72578d9fe3 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenProjectActionBuilder.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenProjectActionBuilder.java @@ -1,3 +1,26 @@ +/* + * The MIT License + * + * Copyright (c) 2010, InfraDNA, Inc. + * + * 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. + */ package hudson.maven; import hudson.model.AbstractProject; diff --git a/maven-plugin/src/main/java/hudson/maven/reporters/SurefireArchiver.java b/maven-plugin/src/main/java/hudson/maven/reporters/SurefireArchiver.java index 0dff12bedf..361a9f0712 100644 --- a/maven-plugin/src/main/java/hudson/maven/reporters/SurefireArchiver.java +++ b/maven-plugin/src/main/java/hudson/maven/reporters/SurefireArchiver.java @@ -50,6 +50,8 @@ import java.io.File; import java.io.IOException; import java.util.Collection; import java.util.Collections; +import java.util.List; +import java.util.ListIterator; /** * Records the surefire test result. @@ -129,6 +131,22 @@ public class SurefireArchiver extends MavenReporter { return true; } + /** + * Up to 1.372, there was a bug that causes Hudson to persist {@link SurefireArchiver} with the entire test result + * in it. If we are loading those, fix it up in memory to reduce the memory footprint. + * + * It'd be nice we can save the record to remove problematic portion, but that might have + * additional side effect. + */ + public static void fixUp(List builders) { + if (builders==null) return; + for (ListIterator itr = builders.listIterator(); itr.hasNext();) { + MavenProjectActionBuilder b = itr.next(); + if (b instanceof SurefireArchiver) + itr.set(new FactoryImpl()); + } + } + /** * Part of the serialization data attached to {@link MavenBuild}. */ diff --git a/test/src/test/java/hudson/maven/reporters/SurefireArchiverTest.java b/test/src/test/java/hudson/maven/reporters/SurefireArchiverTest.java index 4d3f176e3a..7e3ae538ee 100644 --- a/test/src/test/java/hudson/maven/reporters/SurefireArchiverTest.java +++ b/test/src/test/java/hudson/maven/reporters/SurefireArchiverTest.java @@ -1,3 +1,26 @@ +/* + * The MIT License + * + * Copyright (c) 2010, InfraDNA, Inc. + * + * 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. + */ package hudson.maven.reporters; import hudson.maven.MavenBuild; -- GitLab From eb51d46d56369915ae4031dc167322ad126f0be6 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Mon, 9 Aug 2010 22:20:11 +0000 Subject: [PATCH 112/336] ConcurrentHashMap should serialize like a map. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33655 71c3de6d-444a-0410-be80-ed276b4c234a --- .../util/ConcurrentHashMapConverter.java | 69 ++++++ core/src/main/java/hudson/util/XStream2.java | 1 + .../hudson/util/old-concurrentHashMap.xml | 225 ++++++++++++++++++ .../test/java/hudson/util/XStreamTest.java | 61 +++++ 4 files changed, 356 insertions(+) create mode 100644 core/src/main/java/hudson/util/ConcurrentHashMapConverter.java create mode 100644 core/src/main/resources/hudson/util/old-concurrentHashMap.xml create mode 100644 test/src/test/java/hudson/util/XStreamTest.java diff --git a/core/src/main/java/hudson/util/ConcurrentHashMapConverter.java b/core/src/main/java/hudson/util/ConcurrentHashMapConverter.java new file mode 100644 index 0000000000..ae917d4996 --- /dev/null +++ b/core/src/main/java/hudson/util/ConcurrentHashMapConverter.java @@ -0,0 +1,69 @@ +/* + * The MIT License + * + * Copyright (c) 2010, InfraDNA, Inc. + * + * 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. + */ +package hudson.util; + +import com.thoughtworks.xstream.XStream; +import com.thoughtworks.xstream.converters.UnmarshallingContext; +import com.thoughtworks.xstream.converters.collections.MapConverter; +import com.thoughtworks.xstream.converters.reflection.ReflectionProvider; +import com.thoughtworks.xstream.converters.reflection.SerializableConverter; +import com.thoughtworks.xstream.io.HierarchicalStreamReader; +import com.thoughtworks.xstream.mapper.Mapper; + +import java.util.concurrent.ConcurrentHashMap; + +/** + * {@link ConcurrentHashMap} should convert like a map, instead of via serialization. + * + * @author Kohsuke Kawaguchi + */ +public class ConcurrentHashMapConverter extends MapConverter { + private final SerializableConverter sc; + + public ConcurrentHashMapConverter(XStream xs) { + this(xs.getMapper(),xs.getReflectionProvider()); + } + + public ConcurrentHashMapConverter(Mapper mapper, ReflectionProvider reflectionProvider) { + super(mapper); + sc = new SerializableConverter(mapper,reflectionProvider); + } + + @Override + public boolean canConvert(Class type) { + return type==ConcurrentHashMap.class; + } + + @Override + public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext context) { + // ConcurrentHashMap used to serialize as custom serialization, + // so read it in a compatible fashion. + String s = reader.getAttribute("serialization"); + if(s!=null && s.equals("custom")) { + return sc.unmarshal(reader,context); + } else { + return super.unmarshal(reader, context); + } + } +} diff --git a/core/src/main/java/hudson/util/XStream2.java b/core/src/main/java/hudson/util/XStream2.java index 453c3d8777..8ce3daa625 100644 --- a/core/src/main/java/hudson/util/XStream2.java +++ b/core/src/main/java/hudson/util/XStream2.java @@ -93,6 +93,7 @@ public class XStream2 extends XStream { addImmutableType(Result.class); registerConverter(new RobustCollectionConverter(getMapper(),getReflectionProvider()),10); + registerConverter(new ConcurrentHashMapConverter(getMapper(),getReflectionProvider()),10); registerConverter(new CopyOnWriteMap.Tree.ConverterImpl(getMapper()),10); // needs to override MapConverter registerConverter(new DescribableList.ConverterImpl(getMapper()),10); // explicitly added to handle subtypes diff --git a/core/src/main/resources/hudson/util/old-concurrentHashMap.xml b/core/src/main/resources/hudson/util/old-concurrentHashMap.xml new file mode 100644 index 0000000000..bd0da6e955 --- /dev/null +++ b/core/src/main/resources/hudson/util/old-concurrentHashMap.xml @@ -0,0 +1,225 @@ + + + + + + 15 + 28 + + + + + + 0 + + + + + + + 0.75 + + + + + + 0 + + + + + + + 0.75 + + + + + + 0 + + + + + + + 0.75 + + + + + + 0 + + + + + + + 0.75 + + + + + + 0 + + + + + + + 0.75 + + + + + + 0 + + + + + + + 0.75 + + + + + + 0 + + + + + + + 0.75 + + + + + + 0 + + + + + + + 0.75 + + + + + + 0 + + + + + + + 0.75 + + + + + + 0 + + + + + + + 0.75 + + + + + + 0 + + + + + + + 0.75 + + + + + + 0 + + + + + + + 0.75 + + + + + + 0 + + + + + + + 0.75 + + + + + + 0 + + + + + + + 0.75 + + + + + + 0 + + + + + + + 0.75 + + + + + + 0 + + + + + + + 0.75 + + + + abc + def + + + + + \ No newline at end of file diff --git a/test/src/test/java/hudson/util/XStreamTest.java b/test/src/test/java/hudson/util/XStreamTest.java new file mode 100644 index 0000000000..be6c0465d6 --- /dev/null +++ b/test/src/test/java/hudson/util/XStreamTest.java @@ -0,0 +1,61 @@ +/* + * The MIT License + * + * Copyright (c) 2010, InfraDNA, Inc. + * + * 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. + */ +package hudson.util; + +import hudson.XmlFile; +import junit.framework.TestCase; +import org.apache.commons.io.FileUtils; + +import java.io.File; +import java.util.concurrent.ConcurrentHashMap; + +/** + * @author Kohsuke Kawaguchi + */ +public class XStreamTest extends TestCase { + public static class Foo { + ConcurrentHashMap m = new ConcurrentHashMap(); + } + + public void testConcurrentHashMapSerialization() throws Exception { + Foo foo = new Foo(); + foo.m.put("abc","def"); + foo.m.put("ghi","jkl"); + File v = File.createTempFile("hashmap", "xml"); + try { + new XmlFile(v).write(foo); + + // should serialize like map + String xml = FileUtils.readFileToString(v); + assertFalse(xml.contains("java.util.concurrent")); + System.out.println(xml); + } finally { + v.delete(); + } + + // should be able to read in old data just fine + Foo map = (Foo)new XStream2().fromXML(getClass().getResourceAsStream("old-concurrentHashMap.xml")); + assertEquals("def",map.m.get("abc")); + } +} -- GitLab From dc175212db1f7d7afb19fb65009cc03391204b6b Mon Sep 17 00:00:00 2001 From: kohsuke Date: Wed, 11 Aug 2010 22:34:16 +0000 Subject: [PATCH 113/336] changing my mind about the operator syntax. I think || and && are better than | and &. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33708 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/grammar/labelExpr.g | 4 ++-- .../main/java/hudson/model/label/LabelAtom.java | 2 +- .../java/hudson/model/label/LabelExpression.java | 2 +- .../model/label/LabelOperatorPrecedence.java | 4 ++-- .../help-assignedLabelString.html | 6 +++--- .../hudson/model/label/LabelExpressionTest.java | 16 ++++++++-------- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/core/src/main/grammar/labelExpr.g b/core/src/main/grammar/labelExpr.g index 31587ea0da..8f6ca96bf2 100644 --- a/core/src/main/grammar/labelExpr.g +++ b/core/src/main/grammar/labelExpr.g @@ -82,8 +82,8 @@ options { generateAmbigWarnings=false; } class LabelExpressionLexer extends Lexer; -AND: "&"; -OR: "|"; +AND: "&&"; +OR: "||"; NOT: "!"; IMPLIES:"->"; IFF: "<->"; diff --git a/core/src/main/java/hudson/model/label/LabelAtom.java b/core/src/main/java/hudson/model/label/LabelAtom.java index 8b478239f9..a58d19738a 100644 --- a/core/src/main/java/hudson/model/label/LabelAtom.java +++ b/core/src/main/java/hudson/model/label/LabelAtom.java @@ -31,7 +31,7 @@ import hudson.util.VariableResolver; * Atomic single token label, like "foo" or "bar". * * @author Kohsuke Kawaguchi - * @since 1.COMPOSITELABEL + * @since 1.372 */ public class LabelAtom extends Label { public LabelAtom(String name) { diff --git a/core/src/main/java/hudson/model/label/LabelExpression.java b/core/src/main/java/hudson/model/label/LabelExpression.java index e7a2ce1291..e92f1339a3 100644 --- a/core/src/main/java/hudson/model/label/LabelExpression.java +++ b/core/src/main/java/hudson/model/label/LabelExpression.java @@ -30,7 +30,7 @@ import hudson.util.VariableResolver; * Boolean expression of labels. * * @author Kohsuke Kawaguchi - * @since 1.COMPOSITELABEL + * @since 1.372 */ public abstract class LabelExpression extends Label { protected LabelExpression(String name) { diff --git a/core/src/main/java/hudson/model/label/LabelOperatorPrecedence.java b/core/src/main/java/hudson/model/label/LabelOperatorPrecedence.java index 18efab3e5d..552f7ca2ce 100644 --- a/core/src/main/java/hudson/model/label/LabelOperatorPrecedence.java +++ b/core/src/main/java/hudson/model/label/LabelOperatorPrecedence.java @@ -27,10 +27,10 @@ package hudson.model.label; * Precedence of the top most operator. * * @author Kohsuke Kawaguchi - * @since 1.COMPOSITELABEL + * @since 1.372 */ public enum LabelOperatorPrecedence { - ATOM(null), NOT("!"), AND("&"), OR("|"), IMPLIES("->"), IFF("<->"); + ATOM(null), NOT("!"), AND("&&"), OR("||"), IMPLIES("->"), IFF("<->"); /** * String representation of this operator. diff --git a/core/src/main/resources/hudson/model/AbstractProject/help-assignedLabelString.html b/core/src/main/resources/hudson/model/AbstractProject/help-assignedLabelString.html index b213576d79..01d10e77be 100644 --- a/core/src/main/resources/hudson/model/AbstractProject/help-assignedLabelString.html +++ b/core/src/main/resources/hudson/model/AbstractProject/help-assignedLabelString.html @@ -18,12 +18,12 @@

    !expr
    negation
    -
    expr&expr
    +
    expr&&expr
    and
    -
    expr|expr
    +
    expr||expr
    or
    @@ -37,7 +37,7 @@
    a <-> b
    - "if and only if" operator. Equivalent to a&b |!a&!b. + "if and only if" operator. Equivalent to a&&b || !a&&!b. For example, windows->sfbay could be thought of as "if run on a Windows slave, that slave must be in the SF bay area, but if not on Windows, it must not be in the bay area."
    diff --git a/test/src/test/java/hudson/model/label/LabelExpressionTest.java b/test/src/test/java/hudson/model/label/LabelExpressionTest.java index c8cb239276..38da87cb52 100644 --- a/test/src/test/java/hudson/model/label/LabelExpressionTest.java +++ b/test/src/test/java/hudson/model/label/LabelExpressionTest.java @@ -60,10 +60,10 @@ public class LabelExpressionTest extends HudsonTestCase { return true; } }); - p1.setAssignedLabel(hudson.getLabel("win & 32bit")); + p1.setAssignedLabel(hudson.getLabel("win && 32bit")); FreeStyleProject p2 = createFreeStyleProject(); - p2.setAssignedLabel(hudson.getLabel("win & 32bit")); + p2.setAssignedLabel(hudson.getLabel("win && 32bit")); FreeStyleProject p3 = createFreeStyleProject(); p3.setAssignedLabel(hudson.getLabel("win")); @@ -118,13 +118,13 @@ public class LabelExpressionTest extends HudsonTestCase { public void testParser() throws Exception { parseAndVerify("foo", "foo"); parseAndVerify("32bit.dot", "32bit.dot"); - parseAndVerify("foo|bar", "foo | bar"); + parseAndVerify("foo||bar", "foo || bar"); // user-given parenthesis is preserved - parseAndVerify("foo|bar&zot", "foo|bar&zot"); - parseAndVerify("foo|(bar&zot)", "foo|(bar&zot)"); + parseAndVerify("foo||bar&&zot", "foo||bar&&zot"); + parseAndVerify("foo||(bar&&zot)", "foo||(bar&&zot)"); - parseAndVerify("(foo|bar)&zot", "(foo|bar)&zot"); + parseAndVerify("(foo||bar)&&zot", "(foo||bar)&&zot"); parseAndVerify("foo->bar", "foo ->\tbar"); parseAndVerify("!foo<->bar", "!foo <-> bar"); } @@ -144,8 +144,8 @@ public class LabelExpressionTest extends HudsonTestCase { public void testComposite() { LabelAtom x = hudson.getLabelAtom("x"); assertEquals("!!x",x.not().not().getName()); - assertEquals("(x|x)&x",x.or(x).and(x).getName()); - assertEquals("x&x|x",x.and(x).or(x).getName()); + assertEquals("(x||x)&&x",x.or(x).and(x).getName()); + assertEquals("x&&x||x",x.and(x).or(x).getName()); } private void parseShouldFail(String expr) { -- GitLab From 8568692f3464a75f77d4958d2aa73bb1cc317833 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Wed, 11 Aug 2010 22:36:19 +0000 Subject: [PATCH 114/336] Merged revisions 33608,33610,33614,33646,33648,33652 via svnmerge from https://www.dev.java.net/svn/hudson/branches/rc ........ r33608 | kohsuke | 2010-08-07 08:30:19 -0700 (Sat, 07 Aug 2010) | 1 line [maven-release-plugin] prepare release hudson-1_370 ........ r33610 | kohsuke | 2010-08-07 08:30:31 -0700 (Sat, 07 Aug 2010) | 1 line [maven-release-plugin] prepare for next development iteration ........ r33614 | kohsuke | 2010-08-07 09:42:58 -0700 (Sat, 07 Aug 2010) | 1 line updated changelog as a part of the release ........ r33646 | kohsuke | 2010-08-09 13:50:36 -0700 (Mon, 09 Aug 2010) | 1 line [maven-release-plugin] prepare release hudson-1_371 ........ r33648 | kohsuke | 2010-08-09 13:51:26 -0700 (Mon, 09 Aug 2010) | 1 line [maven-release-plugin] prepare for next development iteration ........ r33652 | kohsuke | 2010-08-09 15:04:36 -0700 (Mon, 09 Aug 2010) | 1 line updated changelog as a part of the release ........ git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33709 71c3de6d-444a-0410-be80-ed276b4c234a --- cli/pom.xml | 2 +- core/pom.xml | 2 +- debian/debian/changelog | 12 ++++++++++++ maven-agent/pom.xml | 2 +- maven-interceptor/pom.xml | 2 +- maven-plugin/pom.xml | 2 +- pom.xml | 2 +- remoting/pom.xml | 2 +- test/pom.xml | 2 +- ui-samples-plugin/pom.xml | 2 +- war/pom.xml | 2 +- 11 files changed, 22 insertions(+), 10 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index 3d299d5708..67391466d0 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -4,7 +4,7 @@ pom org.jvnet.hudson.main - 1.370-SNAPSHOT + 1.372-SNAPSHOT cli Hudson CLI diff --git a/core/pom.xml b/core/pom.xml index 2d3aadf6d3..ca863fe0df 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.370-SNAPSHOT + 1.372-SNAPSHOT ../pom.xml diff --git a/debian/debian/changelog b/debian/debian/changelog index bff19998f1..ceb56893ec 100644 --- a/debian/debian/changelog +++ b/debian/debian/changelog @@ -1,3 +1,15 @@ +hudson (1.371) unstable; urgency=low + + * See http://hudson.dev.java.net/changelog.html for more details. + + -- Kohsuke Kawaguchi Mon, 09 Aug 2010 14:50:04 -0700 + +hudson (1.370) unstable; urgency=low + + * See http://hudson.dev.java.net/changelog.html for more details. + + -- Kohsuke Kawaguchi Sat, 07 Aug 2010 09:41:34 -0700 + hudson (1.369) unstable; urgency=low * See http://hudson.dev.java.net/changelog.html for more details. diff --git a/maven-agent/pom.xml b/maven-agent/pom.xml index d3418c4ea1..938c94240f 100644 --- a/maven-agent/pom.xml +++ b/maven-agent/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.370-SNAPSHOT + 1.372-SNAPSHOT ../pom.xml diff --git a/maven-interceptor/pom.xml b/maven-interceptor/pom.xml index e71b15d3b9..dc79fdf33a 100644 --- a/maven-interceptor/pom.xml +++ b/maven-interceptor/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.370-SNAPSHOT + 1.372-SNAPSHOT ../pom.xml diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 1af741483f..8b88f31b6f 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.370-SNAPSHOT + 1.372-SNAPSHOT maven-plugin diff --git a/pom.xml b/pom.xml index 3d1148f8b4..77cc9b292c 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.370-SNAPSHOT + 1.372-SNAPSHOT pom Hudson main module diff --git a/remoting/pom.xml b/remoting/pom.xml index d19b53d2b0..ef32fa65b7 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.370-SNAPSHOT + 1.372-SNAPSHOT ../pom.xml diff --git a/test/pom.xml b/test/pom.xml index 7b3cb85093..f45bfe2245 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. pom org.jvnet.hudson.main - 1.370-SNAPSHOT + 1.372-SNAPSHOT 4.0.0 org.jvnet.hudson.main diff --git a/ui-samples-plugin/pom.xml b/ui-samples-plugin/pom.xml index 514cb99cb0..26ac4f06af 100644 --- a/ui-samples-plugin/pom.xml +++ b/ui-samples-plugin/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.370-SNAPSHOT + 1.372-SNAPSHOT ui-samples-plugin diff --git a/war/pom.xml b/war/pom.xml index 99bed486d1..74602aec4a 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.370-SNAPSHOT + 1.372-SNAPSHOT ../pom.xml -- GitLab From 0e5b8c706fa204318c7d85de898def990aa0e802 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Thu, 12 Aug 2010 04:08:57 +0000 Subject: [PATCH 115/336] allow the @value to be used if present. This is useful when creating a list of check boxes and bind it to List git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33719 71c3de6d-444a-0410-be80-ed276b4c234a --- war/resources/scripts/hudson-behavior.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/war/resources/scripts/hudson-behavior.js b/war/resources/scripts/hudson-behavior.js index 110afdf534..d994685481 100644 --- a/war/resources/scripts/hudson-behavior.js +++ b/war/resources/scripts/hudson-behavior.js @@ -1683,9 +1683,15 @@ function buildFormTree(form) { case "checkbox": p = findParent(e); var checked = xor(e.checked,Element.hasClassName(e,"negative")); - if(!e.groupingNode) - addProperty(p, e.name, checked); - else { + if(!e.groupingNode) { + v = e.getAttribute("value"); + if (v) {// if the value is present, we'll either set the value or not. useful for an array of checkboxes + if (checked) + addProperty(p, e.name, v); + } else {// otherwise it'll bind to boolean + addProperty(p, e.name, checked); + } + } else { if(checked) addProperty(p, e.name, e.formDom = {}); } -- GitLab From 75b2b4d4a8f96f6f9e34efe3c1fe9099c4bfb306 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Thu, 12 Aug 2010 04:51:08 +0000 Subject: [PATCH 116/336] Initialized merge tracking via "svnmerge" with revisions "1-33730" from https://www.dev.java.net/svn/hudson/branches/rc git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33732 71c3de6d-444a-0410-be80-ed276b4c234a -- GitLab From a67ebeebc0f527974ebd9e71f80b3c7a7efe2a7b Mon Sep 17 00:00:00 2001 From: mindless Date: Thu, 12 Aug 2010 23:25:37 +0000 Subject: [PATCH 117/336] mention safeRestart too on api page, not just restart git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33767 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/resources/hudson/model/Hudson/_api.jelly | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/src/main/resources/hudson/model/Hudson/_api.jelly b/core/src/main/resources/hudson/model/Hudson/_api.jelly index 8ac0925ae5..ab4d435986 100644 --- a/core/src/main/resources/hudson/model/Hudson/_api.jelly +++ b/core/src/main/resources/hudson/model/Hudson/_api.jelly @@ -52,7 +52,8 @@ THE SOFTWARE. Hudson will enter into the "quiet down" mode by sending a request to this URL. You can cancel this mode by sending a request to this URL. On environments where Hudson can restart itself (such as when Hudson is installed as a Windows service), POSTing to - this URL will start the restart sequence. All these URLs need the admin privilege - to the system. + this URL will start the restart sequence, or + this URL to restart once no jobs are running. + All these URLs need the admin privilege to the system.

    -- GitLab From dc0e278dbf0517f8fe314ae6e0520d57d5e75316 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Fri, 13 Aug 2010 01:48:38 +0000 Subject: [PATCH 118/336] enabled the subtype to customize the name resolution behaviour. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33771 71c3de6d-444a-0410-be80-ed276b4c234a --- .../os/windows/ManagedWindowsServiceLauncher.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/hudson/os/windows/ManagedWindowsServiceLauncher.java b/core/src/main/java/hudson/os/windows/ManagedWindowsServiceLauncher.java index 7c939d80ee..7b9700eba5 100644 --- a/core/src/main/java/hudson/os/windows/ManagedWindowsServiceLauncher.java +++ b/core/src/main/java/hudson/os/windows/ManagedWindowsServiceLauncher.java @@ -25,6 +25,7 @@ package hudson.os.windows; import hudson.Extension; import hudson.lifecycle.WindowsSlaveInstaller; +import hudson.model.Computer; import hudson.model.Descriptor; import hudson.model.Hudson; import hudson.model.TaskListener; @@ -108,7 +109,7 @@ public class ManagedWindowsServiceLauncher extends ComputerLauncher { public void launch(final SlaveComputer computer, final TaskListener listener) throws IOException, InterruptedException { try { final PrintStream logger = listener.getLogger(); - final String name = computer.getName(); + final String name = determineHost(computer); logger.println(Messages.ManagedWindowsServiceLauncher_ConnectingTo(name)); @@ -279,6 +280,13 @@ public class ManagedWindowsServiceLauncher extends ComputerLauncher { } } + /** + * Determines the host name (or the IP address) to connect to. + */ + protected String determineHost(Computer c) throws IOException, InterruptedException { + return c.getName(); + } + private void copySlaveJar(PrintStream logger, SmbFile remoteRoot) throws IOException { // copy slave.jar logger.println("Copying slave.jar"); -- GitLab From ff47b97fd3bbdd86b71668b8f8d9a0c0c54dd4a1 Mon Sep 17 00:00:00 2001 From: mindless Date: Fri, 13 Aug 2010 04:14:22 +0000 Subject: [PATCH 119/336] [HUDSON-6628] change LDAPSecurityRealm to extend AbstractPasswordBasedAuthentication so it gets the createCliAuthenticator stuff, and CLI will accept --username, etc. In my tests this worked when passing credentials to run a command. Login seemed to work, but commands after that were still as anonymous, so something still missing. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33773 71c3de6d-444a-0410-be80-ed276b4c234a --- .../hudson/security/LDAPSecurityRealm.java | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/hudson/security/LDAPSecurityRealm.java b/core/src/main/java/hudson/security/LDAPSecurityRealm.java index d38bfeef80..2ec11beb45 100644 --- a/core/src/main/java/hudson/security/LDAPSecurityRealm.java +++ b/core/src/main/java/hudson/security/LDAPSecurityRealm.java @@ -38,11 +38,13 @@ import hudson.util.spring.BeanBuilder; import org.acegisecurity.AuthenticationManager; import org.acegisecurity.GrantedAuthority; import org.acegisecurity.AcegiSecurityException; +import org.acegisecurity.AuthenticationException; import org.acegisecurity.ldap.InitialDirContextFactory; import org.acegisecurity.ldap.LdapDataAccessException; import org.acegisecurity.ldap.LdapTemplate; import org.acegisecurity.ldap.LdapUserSearch; import org.acegisecurity.ldap.search.FilterBasedLdapUserSearch; +import org.acegisecurity.providers.UsernamePasswordAuthenticationToken; import org.acegisecurity.providers.ldap.LdapAuthoritiesPopulator; import org.acegisecurity.providers.ldap.populator.DefaultLdapAuthoritiesPopulator; import org.acegisecurity.userdetails.UserDetails; @@ -201,7 +203,7 @@ import java.util.regex.Pattern; * @author Kohsuke Kawaguchi * @since 1.166 */ -public class LDAPSecurityRealm extends SecurityRealm { +public class LDAPSecurityRealm extends AbstractPasswordBasedSecurityRealm { /** * LDAP server name, optionally with TCP port number, like "ldap.acme.org" * or "ldap.acme.org:389". @@ -346,6 +348,23 @@ public class LDAPSecurityRealm extends SecurityRealm { new LDAPUserDetailsService(appContext)); } + /** + * {@inheritDoc} + */ + @Override + protected UserDetails authenticate(String username, String password) throws AuthenticationException { + return (UserDetails) getSecurityComponents().manager.authenticate( + new UsernamePasswordAuthenticationToken(username, password)).getPrincipal(); + } + + /** + * {@inheritDoc} + */ + @Override + public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException, DataAccessException { + return getSecurityComponents().userDetails.loadUserByUsername(username); + } + /** * Lookup a group; given input must match the configured syntax for group names * in WEB-INF/security/LDAPBindSecurityRealm.groovy's authoritiesPopulator entry. -- GitLab From 37a4ec920d84214c4b3dd00a6c5fac702b224800 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Fri, 13 Aug 2010 22:19:51 +0000 Subject: [PATCH 120/336] Improved the layout algorithm of the matrix project visualization. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33802 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/matrix/Layouter.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/hudson/matrix/Layouter.java b/core/src/main/java/hudson/matrix/Layouter.java index f943e07f60..da01cd06c3 100644 --- a/core/src/main/java/hudson/matrix/Layouter.java +++ b/core/src/main/java/hudson/matrix/Layouter.java @@ -87,8 +87,11 @@ public abstract class Layouter { z.add(nonTrivialAxes.get(0)); break; case 2: - x.add(nonTrivialAxes.get(0)); - y.add(nonTrivialAxes.get(1)); + // use the longer axis in Y + Axis a = nonTrivialAxes.get(0); + Axis b = nonTrivialAxes.get(1); + x.add(a.size() > b.size() ? b : a); + y.add(a.size() > b.size() ? a : b); break; default: // for size > 3, use x and y, and try to pack y more -- GitLab From 3b8eea6ccc6a16caa7e901658f4798090d398c40 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Sat, 14 Aug 2010 00:35:37 +0000 Subject: [PATCH 121/336] Merged revisions 33801,33803,33805 via svnmerge from https://www.dev.java.net/svn/hudson/branches/rc ........ r33801 | kohsuke | 2010-08-13 15:14:41 -0700 (Fri, 13 Aug 2010) | 3 lines restrictions on label names should be consistent with other restrictions that we have. In particular, allow '-'. ........ r33803 | kohsuke | 2010-08-13 15:24:42 -0700 (Fri, 13 Aug 2010) | 1 line make sure '-' is allowed as label names ........ r33805 | kohsuke | 2010-08-13 16:53:49 -0700 (Fri, 13 Aug 2010) | 1 line fixed a regression in IE6. ........ git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33809 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/grammar/labelExpr.g | 2 +- core/src/main/java/hudson/model/label/LabelAtom.java | 12 +++++------- core/src/main/resources/lib/form/checkbox.jelly | 8 +++++++- .../java/hudson/model/label/LabelExpressionTest.java | 4 ++++ war/resources/scripts/hudson-behavior.js | 6 ++++-- 5 files changed, 21 insertions(+), 11 deletions(-) diff --git a/core/src/main/grammar/labelExpr.g b/core/src/main/grammar/labelExpr.g index 8f6ca96bf2..b1fc2d95c6 100644 --- a/core/src/main/grammar/labelExpr.g +++ b/core/src/main/grammar/labelExpr.g @@ -92,7 +92,7 @@ RPAREN: ")"; protected IDENTIFIER_PART - : ~( '&' | '|' | '!' | '-' | '<' | '>' | '(' | ')' | ' ' | '\t') + : ~( '&' | '|' | '!' | '<' | '>' | '(' | ')' | ' ' | '\t') ; ATOM diff --git a/core/src/main/java/hudson/model/label/LabelAtom.java b/core/src/main/java/hudson/model/label/LabelAtom.java index a58d19738a..dc699cc158 100644 --- a/core/src/main/java/hudson/model/label/LabelAtom.java +++ b/core/src/main/java/hudson/model/label/LabelAtom.java @@ -23,6 +23,7 @@ */ package hudson.model.label; +import hudson.model.Failure; import hudson.model.Hudson; import hudson.model.Label; import hudson.util.VariableResolver; @@ -56,14 +57,11 @@ public class LabelAtom extends Label { } public static boolean isValidName(String name) { - for (int i=name.length()-1; i>=0; i--) { - char ch = name.charAt(i); - if (Character.isJavaIdentifierPart(ch)) - continue; - if (ch=='.') - continue; + try { + Hudson.checkGoodName(name); + return true; + } catch (Failure failure) { return false; } - return true; } } diff --git a/core/src/main/resources/lib/form/checkbox.jelly b/core/src/main/resources/lib/form/checkbox.jelly index fb392b3115..5e9ba3894b 100644 --- a/core/src/main/resources/lib/form/checkbox.jelly +++ b/core/src/main/resources/lib/form/checkbox.jelly @@ -29,6 +29,12 @@ THE SOFTWARE. + + Normally, the submitted JSON will be boolean indicating whether the checkbox was checked or not. + This is sometimes inconvenient if you have a UI that lets user select a subset of a set. + If this attribute is present, the submitted JSON will have this as a string value if the checkbox is checked, + and none otherwise, making the subset selection easier. + The default value of the check box, in case both @checked and @instance are null. If this attribute is unspecified or null, it defaults to unchecked, otherwise checked. @@ -46,6 +52,6 @@ THE SOFTWARE. name="${attrs.name?:'_.'+attrs.field}" value="${attrs.value}" onclick="${attrs.onclick}" id="${attrs.id}" class="${attrs.negative!=null ? 'negative' : null} ${attrs.checkUrl!=null?'validated':''}" - checkUrl="${attrs.checkUrl}" + checkUrl="${attrs.checkUrl}" json="${attrs.json}" checked="${(attrs.checked ?: instance[attrs.field] ?: attrs.default) ? 'true' : null}"/> \ No newline at end of file diff --git a/test/src/test/java/hudson/model/label/LabelExpressionTest.java b/test/src/test/java/hudson/model/label/LabelExpressionTest.java index 38da87cb52..06b80472d7 100644 --- a/test/src/test/java/hudson/model/label/LabelExpressionTest.java +++ b/test/src/test/java/hudson/model/label/LabelExpressionTest.java @@ -148,6 +148,10 @@ public class LabelExpressionTest extends HudsonTestCase { assertEquals("x&&x||x",x.and(x).or(x).getName()); } + public void testDash() { + hudson.getLabelAtom("solaris-x86"); + } + private void parseShouldFail(String expr) { try { LabelExpression.parseExpression(expr); diff --git a/war/resources/scripts/hudson-behavior.js b/war/resources/scripts/hudson-behavior.js index d994685481..9bd5813101 100644 --- a/war/resources/scripts/hudson-behavior.js +++ b/war/resources/scripts/hudson-behavior.js @@ -1684,8 +1684,10 @@ function buildFormTree(form) { p = findParent(e); var checked = xor(e.checked,Element.hasClassName(e,"negative")); if(!e.groupingNode) { - v = e.getAttribute("value"); - if (v) {// if the value is present, we'll either set the value or not. useful for an array of checkboxes + v = e.getAttribute("json"); + if (v) { + // if the special attribute is present, we'll either set the value or not. useful for an array of checkboxes + // we can't use @value because IE6 sets the value to be "on" if it's left unspecified. if (checked) addProperty(p, e.name, v); } else {// otherwise it'll bind to boolean -- GitLab From b64ecce94b53401e3b212073bcf1ccae765d8385 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Sat, 14 Aug 2010 00:47:05 +0000 Subject: [PATCH 122/336] Merged revisions 33810-33811 via svnmerge from https://www.dev.java.net/svn/hudson/branches/rc ........ r33810 | kohsuke | 2010-08-13 17:43:28 -0700 (Fri, 13 Aug 2010) | 1 line bug in the test harness. ........ r33811 | kohsuke | 2010-08-13 17:44:11 -0700 (Fri, 13 Aug 2010) | 1 line bug in the test harness. ........ git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33812 71c3de6d-444a-0410-be80-ed276b4c234a --- test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java b/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java index 9192869248..876cd490ad 100644 --- a/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java +++ b/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java @@ -554,7 +554,7 @@ public abstract class HudsonTestCase extends TestCase implements RootAction { } public DumbSlave createSlave(Label l, EnvVars env) throws Exception { - return createSlave(l.getName(), null); + return createSlave(l==null ? null : l.getName(), env); } /** -- GitLab From 21482fca68d817125ec81bb227e8a5ddca883f0a Mon Sep 17 00:00:00 2001 From: sogabe Date: Sat, 14 Aug 2010 03:44:27 +0000 Subject: [PATCH 123/336] latest ssh slave plagin. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33822 71c3de6d-444a-0410-be80-ed276b4c234a --- war/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/war/pom.xml b/war/pom.xml index 74602aec4a..b8f6d6de83 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -130,7 +130,7 @@ THE SOFTWARE. - + -- GitLab From 8156b774a0feb7a53e5a4ab3fbb22cdda36bc035 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Sat, 14 Aug 2010 07:00:38 +0000 Subject: [PATCH 124/336] Initialized merge tracking via "svnmerge" with revisions "1-33830" from https://www.dev.java.net/svn/hudson/branches/extensible-axis/test git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33831 71c3de6d-444a-0410-be80-ed276b4c234a -- GitLab From c8355524693741f4b9c87a42ad26f74c8827dc2c Mon Sep 17 00:00:00 2001 From: kohsuke Date: Sat, 14 Aug 2010 07:04:02 +0000 Subject: [PATCH 125/336] wrong merge source git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33832 71c3de6d-444a-0410-be80-ed276b4c234a -- GitLab From 79bad4d7e1a1c90f745501de710e1767a46bc519 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Sat, 14 Aug 2010 07:08:33 +0000 Subject: [PATCH 126/336] Initialized merge tracking via "svnmerge" with revisions "1-33769" from https://www.dev.java.net/svn/hudson/branches/extensible-axis git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33833 71c3de6d-444a-0410-be80-ed276b4c234a -- GitLab From 18ed966772e896d7d57d78b0938d0cc2794da4fd Mon Sep 17 00:00:00 2001 From: kohsuke Date: Sat, 14 Aug 2010 07:23:08 +0000 Subject: [PATCH 127/336] Merged revisions 33770,33808,33830 via svnmerge from https://www.dev.java.net/svn/hudson/branches/extensible-axis ........ r33770 | kohsuke | 2010-08-12 17:48:02 -0700 (Thu, 12 Aug 2010) | 1 line the work in progress thus far. still has some test failures. ........ r33808 | kohsuke | 2010-08-13 17:17:44 -0700 (Fri, 13 Aug 2010) | 1 line JDKAxis always normalize its values in the order JDKs are defined. ........ r33830 | kohsuke | 2010-08-13 23:52:59 -0700 (Fri, 13 Aug 2010) | 1 line using the latest ........ git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33834 71c3de6d-444a-0410-be80-ed276b4c234a --- core/pom.xml | 2 +- core/src/main/java/hudson/matrix/Axis.java | 74 +++++++++-- .../java/hudson/matrix/AxisDescriptor.java | 67 ++++++++++ .../src/main/java/hudson/matrix/AxisList.java | 13 +- .../main/java/hudson/matrix/Combination.java | 31 +++-- .../hudson/matrix/DefaultAxisDescriptor.java | 48 +++++++ core/src/main/java/hudson/matrix/JDKAxis.java | 72 ++++++++++ .../main/java/hudson/matrix/LabelAxis.java | 64 +++++++++ .../hudson/matrix/MatrixConfiguration.java | 5 +- .../java/hudson/matrix/MatrixProject.java | 123 +++++++----------- .../src/main/java/hudson/matrix/TextAxis.java | 34 +++++ .../hudson/matrix/JDKAxis/config.jelly | 34 +++++ .../hudson/matrix/LabelAxis/config.jelly | 59 +++++++++ .../hudson/matrix/LabelAxis/help-labels.html | 0 .../matrix/LabelAxis/help-labels_de.html | 0 .../matrix/LabelAxis/help-labels_fr.html | 0 .../matrix/LabelAxis/help-labels_ja.html | 0 .../matrix/LabelAxis/help-labels_nl.html | 0 .../matrix/LabelAxis/help-labels_pt_BR.html | 0 .../matrix/LabelAxis/help-labels_ru.html | 0 .../matrix/LabelAxis/help-labels_tr.html | 0 .../MatrixProject/configure-entries.jelly | 40 +----- .../hudson/matrix/TextAxis/config.jelly | 32 +++++ .../matrix/TextAxis/help-valueString.html | 0 .../matrix/TextAxis/help-valueString_de.html | 0 .../matrix/TextAxis/help-valueString_fr.html | 0 .../matrix/TextAxis/help-valueString_ja.html | 0 .../matrix/TextAxis/help-valueString_nl.html | 0 .../TextAxis/help-valueString_pt_BR.html | 0 .../matrix/TextAxis/help-valueString_ru.html | 0 .../matrix/TextAxis/help-valueString_tr.html | 0 .../slaves/DumbSlave/configure-entries.jelly | 1 + .../main/resources/lib/form/hetero-list.jelly | 4 +- .../hudson/matrix/MatrixProjectTest.groovy | 62 +++++++-- 34 files changed, 625 insertions(+), 140 deletions(-) create mode 100644 core/src/main/java/hudson/matrix/AxisDescriptor.java create mode 100644 core/src/main/java/hudson/matrix/DefaultAxisDescriptor.java create mode 100644 core/src/main/java/hudson/matrix/JDKAxis.java create mode 100644 core/src/main/java/hudson/matrix/LabelAxis.java create mode 100644 core/src/main/java/hudson/matrix/TextAxis.java create mode 100644 core/src/main/resources/hudson/matrix/JDKAxis/config.jelly create mode 100644 core/src/main/resources/hudson/matrix/LabelAxis/config.jelly rename war/resources/help/matrix/label.html => core/src/main/resources/hudson/matrix/LabelAxis/help-labels.html (100%) rename war/resources/help/matrix/label_de.html => core/src/main/resources/hudson/matrix/LabelAxis/help-labels_de.html (100%) rename war/resources/help/matrix/label_fr.html => core/src/main/resources/hudson/matrix/LabelAxis/help-labels_fr.html (100%) rename war/resources/help/matrix/label_ja.html => core/src/main/resources/hudson/matrix/LabelAxis/help-labels_ja.html (100%) rename war/resources/help/matrix/label_nl.html => core/src/main/resources/hudson/matrix/LabelAxis/help-labels_nl.html (100%) rename war/resources/help/matrix/label_pt_BR.html => core/src/main/resources/hudson/matrix/LabelAxis/help-labels_pt_BR.html (100%) rename war/resources/help/matrix/label_ru.html => core/src/main/resources/hudson/matrix/LabelAxis/help-labels_ru.html (100%) rename war/resources/help/matrix/label_tr.html => core/src/main/resources/hudson/matrix/LabelAxis/help-labels_tr.html (100%) create mode 100644 core/src/main/resources/hudson/matrix/TextAxis/config.jelly rename war/resources/help/matrix/axis-value.html => core/src/main/resources/hudson/matrix/TextAxis/help-valueString.html (100%) rename war/resources/help/matrix/axis-value_de.html => core/src/main/resources/hudson/matrix/TextAxis/help-valueString_de.html (100%) rename war/resources/help/matrix/axis-value_fr.html => core/src/main/resources/hudson/matrix/TextAxis/help-valueString_fr.html (100%) rename war/resources/help/matrix/axis-value_ja.html => core/src/main/resources/hudson/matrix/TextAxis/help-valueString_ja.html (100%) rename war/resources/help/matrix/axis-value_nl.html => core/src/main/resources/hudson/matrix/TextAxis/help-valueString_nl.html (100%) rename war/resources/help/matrix/axis-value_pt_BR.html => core/src/main/resources/hudson/matrix/TextAxis/help-valueString_pt_BR.html (100%) rename war/resources/help/matrix/axis-value_ru.html => core/src/main/resources/hudson/matrix/TextAxis/help-valueString_ru.html (100%) rename war/resources/help/matrix/axis-value_tr.html => core/src/main/resources/hudson/matrix/TextAxis/help-valueString_tr.html (100%) diff --git a/core/pom.xml b/core/pom.xml index ca863fe0df..5167a9421f 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -378,7 +378,7 @@ THE SOFTWARE. org.kohsuke.stapler stapler-jelly - 1.148 + 1.150 commons-jelly diff --git a/core/src/main/java/hudson/matrix/Axis.java b/core/src/main/java/hudson/matrix/Axis.java index 17b6eecfca..f0130d8978 100644 --- a/core/src/main/java/hudson/matrix/Axis.java +++ b/core/src/main/java/hudson/matrix/Axis.java @@ -23,12 +23,18 @@ */ package hudson.matrix; +import hudson.DescriptorExtensionList; +import hudson.ExtensionPoint; import hudson.Util; +import hudson.model.AbstractDescribableImpl; +import hudson.model.Descriptor; +import hudson.model.Hudson; import hudson.util.QuotedStringTokenizer; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.DataBoundConstructor; import java.util.ArrayList; +import java.util.Collections; import java.util.Enumeration; import java.util.Iterator; import java.util.List; @@ -45,15 +51,21 @@ import java.util.Arrays; * * @author Kohsuke Kawaguchi */ -public final class Axis implements Comparable, Iterable { +public class Axis extends AbstractDescribableImpl implements Comparable, Iterable, ExtensionPoint { /** * Name of this axis. * Used as a variable name. + * + * @deprecated as of 1.373 + * Use {@link #getName()} */ public final String name; /** * Possible values for this axis. + * + * @deprecated as of 1.373 + * Use {@link #getValues()} */ public final List values; @@ -74,29 +86,32 @@ public final class Axis implements Comparable, Iterable { * Axis with empty values need to be removed later. */ @DataBoundConstructor - public Axis(String name, String value) { + public Axis(String name, String valueString) { this.name = name; - this.values = new ArrayList(Arrays.asList(Util.tokenize(value))); + this.values = new ArrayList(Arrays.asList(Util.tokenize(valueString))); } /** - * Returns ture if this axis is a system-reserved axis - * that has special treatment. + * Returns true if this axis is a system-reserved axis + * that has used to have af special treatment. + * + * @deprecated as of 1.373 + * System vs user difference are generalized into extension point. */ public boolean isSystem() { - return name.equals("jdk") || name.equals("label"); + return false; } public Iterator iterator() { - return values.iterator(); + return getValues().iterator(); } public int size() { - return values.size(); + return getValues().size(); } public String value(int index) { - return values.get(index); + return getValues().get(index); } /** @@ -114,6 +129,26 @@ public final class Axis implements Comparable, Iterable { return this.name.compareTo(that.name); } + /** + * Name of this axis. + * Used as a variable name. + */ + public String getName() { + return name; + } + + /** + * Possible values for this axis. + */ + public List getValues() { + return Collections.unmodifiableList(values); + } + + @Override + public AxisDescriptor getDescriptor() { + return (AxisDescriptor)super.getDescriptor(); + } + @Override public String toString() { return new StringBuilder().append(name).append("={").append(Util.join(values,",")).append('}').toString(); @@ -154,4 +189,25 @@ public final class Axis implements Comparable, Iterable { return null; return new Axis(name,values); } + + /** + * Previously we used to persist {@link Axis}, but now those are divided into subtypes. + * So upon deserialization, resolve to the proper type. + */ + public Object readResolve() { + if (getClass()!=Axis.class) return this; + + if (getName().equals("jdk")) + return new JDKAxis(getValues()); + if (getName().equals("label")) + return new LabelAxis(getName(),getValues()); + return new TextAxis(getName(),getValues()); + } + + /** + * Returns all the registered {@link AxisDescriptor}s. + */ + public static DescriptorExtensionList all() { + return Hudson.getInstance().getDescriptorList(Axis.class); + } } diff --git a/core/src/main/java/hudson/matrix/AxisDescriptor.java b/core/src/main/java/hudson/matrix/AxisDescriptor.java new file mode 100644 index 0000000000..04ae7728fb --- /dev/null +++ b/core/src/main/java/hudson/matrix/AxisDescriptor.java @@ -0,0 +1,67 @@ +/* + * The MIT License + * + * Copyright (c) 2010, InfraDNA, Inc. + * + * 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. + */ +package hudson.matrix; + +import hudson.Util; +import hudson.model.Descriptor; +import hudson.model.Failure; +import hudson.model.Hudson; +import hudson.util.FormValidation; +import org.kohsuke.stapler.QueryParameter; + +/** + * {@link Descriptor} for {@link Axis} + * + * @author Kohsuke Kawaguchi + */ +public abstract class AxisDescriptor extends Descriptor { + protected AxisDescriptor(Class clazz) { + super(clazz); + } + + protected AxisDescriptor() { + } + + /** + * Return false if the user shouldn't be able to create thie axis from the UI. + */ + public boolean isInstantiable() { + return true; + } + + /** + * Makes sure that the given name is good as a axis name. + */ + public FormValidation doCheckName(@QueryParameter String value) { + if(Util.fixEmpty(value)==null) + return FormValidation.ok(); + + try { + Hudson.checkGoodName(value); + return FormValidation.ok(); + } catch (Failure e) { + return FormValidation.error(e.getMessage()); + } + } +} diff --git a/core/src/main/java/hudson/matrix/AxisList.java b/core/src/main/java/hudson/matrix/AxisList.java index 0ee30d2ce0..9f926cf440 100644 --- a/core/src/main/java/hudson/matrix/AxisList.java +++ b/core/src/main/java/hudson/matrix/AxisList.java @@ -25,12 +25,16 @@ package hudson.matrix; import com.thoughtworks.xstream.XStream; import com.thoughtworks.xstream.converters.Converter; +import hudson.Util; +import hudson.model.Label; import hudson.util.RobustCollectionConverter; import java.util.ArrayList; import java.util.Collection; +import java.util.HashSet; import java.util.Iterator; import java.util.Arrays; +import java.util.Set; /** * List of {@link Axis}. @@ -41,7 +45,7 @@ public class AxisList extends ArrayList { public AxisList() { } - public AxisList(Collection c) { + public AxisList(Collection c) { super(c); } @@ -57,6 +61,13 @@ public class AxisList extends ArrayList { return null; } + /** + * Creates a subset of the list that only contains the type assignable to the specified type. + */ + public AxisList subList(Class subType) { + return new AxisList(Util.filter(this,subType)); + } + @Override public boolean add(Axis axis) { return axis!=null && super.add(axis); diff --git a/core/src/main/java/hudson/matrix/Combination.java b/core/src/main/java/hudson/matrix/Combination.java index 7ca23e27cc..6f4066e5b5 100644 --- a/core/src/main/java/hudson/matrix/Combination.java +++ b/core/src/main/java/hudson/matrix/Combination.java @@ -25,6 +25,7 @@ package hudson.matrix; import hudson.Util; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.Collections; @@ -53,7 +54,7 @@ public final class Combination extends TreeMap implements Compara public Combination(AxisList axisList, List values) { for(int i=0; i implements Compara super.put(e.getKey(),e.getValue()); } + public String get(Axis a) { + return get(a.getName()); + } + /** * Obtains the continuous unique index number of this {@link Combination} * in the given {@link AxisList}. @@ -73,7 +78,7 @@ public final class Combination extends TreeMap implements Compara int r = 0; for (Axis a : axis) { r *= a.size(); - r += a.indexOf(get(a.name)); + r += a.indexOf(get(a)); } return r; } @@ -92,7 +97,7 @@ public final class Combination extends TreeMap implements Compara private long toModuloIndex(AxisList axis) { long r = 0; for (Axis a : axis) { - r += a.indexOf(get(a.name)); + r += a.indexOf(get(a)); r *= 31; } return r; @@ -150,12 +155,22 @@ public final class Combination extends TreeMap implements Compara StringBuilder buf = new StringBuilder(); for (Axis a : subset) { if(buf.length()>0) buf.append(','); - buf.append(a.name).append('=').append(get(a.name)); + buf.append(a.getName()).append('=').append(get(a)); } if(buf.length()==0) buf.append("default"); // special case to avoid 0-length name. return buf.toString(); } - + + /** + * Gets the values that correspond to the specified axes, in their order. + */ + public List values(Collection axes) { + List r = new ArrayList(axes.size()); + for (Axis a : axes) + r.add(get(a)); + return r; + } + /** * Converts to the ID string representation: * axisName=value,axisName=value,... @@ -218,12 +233,12 @@ public final class Combination extends TreeMap implements Compara Map axisByValue = new HashMap(); for (Axis a : axes) { - for (String v : a.values) { + for (String v : a.getValues()) { Axis old = axisByValue.put(v,a); if(old!=null) { // these two axes have colliding values - nonUniqueAxes.add(old.name); - nonUniqueAxes.add(a.name); + nonUniqueAxes.add(old.getName()); + nonUniqueAxes.add(a.getName()); } } } diff --git a/core/src/main/java/hudson/matrix/DefaultAxisDescriptor.java b/core/src/main/java/hudson/matrix/DefaultAxisDescriptor.java new file mode 100644 index 0000000000..96fb461499 --- /dev/null +++ b/core/src/main/java/hudson/matrix/DefaultAxisDescriptor.java @@ -0,0 +1,48 @@ +/* + * The MIT License + * + * Copyright (c) 2010, InfraDNA, Inc. + * + * 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. + */ +package hudson.matrix; + +import hudson.Extension; + +/** + * {@link AxisDescriptor} for manually entered default axis. + * + * @author Kohsuke Kawaguchi + */ +@Extension +public class DefaultAxisDescriptor extends AxisDescriptor { + public DefaultAxisDescriptor() { + super(Axis.class); + } + + @Override + public String getDisplayName() { + return "Axis"; + } + + @Override + public boolean isInstantiable() { + return false; + } +} diff --git a/core/src/main/java/hudson/matrix/JDKAxis.java b/core/src/main/java/hudson/matrix/JDKAxis.java new file mode 100644 index 0000000000..b6834e4d87 --- /dev/null +++ b/core/src/main/java/hudson/matrix/JDKAxis.java @@ -0,0 +1,72 @@ +/* + * The MIT License + * + * Copyright (c) 2010, InfraDNA, Inc. + * + * 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. + */ +package hudson.matrix; + +import hudson.Extension; +import hudson.model.Hudson; +import org.kohsuke.stapler.DataBoundConstructor; + +import java.util.Arrays; +import java.util.List; + +/** + * {@link Axis} that selects available JDKs. + * + * @author Kohsuke Kawaguchi + */ +public class JDKAxis extends Axis { + /** + * JDK axis was used to be stored as a plain "Axis" with the name "jdk", + * so it cannot be configured by any other name. + */ + public JDKAxis(List values) { + super("jdk", values); + } + + @DataBoundConstructor + public JDKAxis(String[] values) { + super("jdk", Arrays.asList(values)); + } + + @Override + public boolean isSystem() { + return true; + } + + @Extension + public static class DescriptorImpl extends AxisDescriptor { + @Override + public String getDisplayName() { + return "JDK"; + } + + /** + * If there's no JDK configured, there's no point in this axis. + */ + @Override + public boolean isInstantiable() { + return !Hudson.getInstance().getJDKs().isEmpty(); + } + } +} diff --git a/core/src/main/java/hudson/matrix/LabelAxis.java b/core/src/main/java/hudson/matrix/LabelAxis.java new file mode 100644 index 0000000000..9f4a380b35 --- /dev/null +++ b/core/src/main/java/hudson/matrix/LabelAxis.java @@ -0,0 +1,64 @@ +/* + * The MIT License + * + * Copyright (c) 2010, InfraDNA, Inc. + * + * 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. + */ +package hudson.matrix; + +import hudson.Extension; +import hudson.model.Hudson; +import org.kohsuke.stapler.DataBoundConstructor; + +import java.util.List; + +/** + * {@link Axis} that selects label expressions. + * + * @author Kohsuke Kawaguchi + */ +public class LabelAxis extends Axis { + @DataBoundConstructor + public LabelAxis(String name, List values) { + super(name, values); + } + + @Override + public boolean isSystem() { + return true; + } + + @Extension + public static class DescriptorImpl extends AxisDescriptor { + @Override + public String getDisplayName() { + return "Slaves"; + } + + /** + * If there's no distributed build set up, it's pointless to provide this axis. + */ + @Override + public boolean isInstantiable() { + Hudson h = Hudson.getInstance(); + return !h.getNodes().isEmpty() || !h.clouds.isEmpty(); + } + } +} diff --git a/core/src/main/java/hudson/matrix/MatrixConfiguration.java b/core/src/main/java/hudson/matrix/MatrixConfiguration.java index 8dff4f7e7d..b52d6f942e 100644 --- a/core/src/main/java/hudson/matrix/MatrixConfiguration.java +++ b/core/src/main/java/hudson/matrix/MatrixConfiguration.java @@ -23,6 +23,7 @@ */ package hudson.matrix; +import hudson.Util; import hudson.util.DescribableList; import hudson.model.AbstractBuild; import hudson.model.Cause; @@ -192,7 +193,9 @@ public class MatrixConfiguration extends Project @Override public Label getAssignedLabel() { - return Hudson.getInstance().getLabel(combination.get("label")); + // combine all the label axes by &&. + String expr = Util.join(combination.values(getParent().getAxes().subList(LabelAxis.class)), "&&"); + return Hudson.getInstance().getLabel(Util.fixEmpty(expr)); } @Override diff --git a/core/src/main/java/hudson/matrix/MatrixProject.java b/core/src/main/java/hudson/matrix/MatrixProject.java index 8187608c12..1607c22695 100644 --- a/core/src/main/java/hudson/matrix/MatrixProject.java +++ b/core/src/main/java/hudson/matrix/MatrixProject.java @@ -24,13 +24,14 @@ package hudson.matrix; import hudson.CopyOnWrite; -import hudson.XmlFile; -import hudson.Util; import hudson.Extension; +import hudson.Util; +import hudson.XmlFile; import hudson.model.AbstractProject; +import hudson.model.BuildableItemWithBuildWrappers; import hudson.model.DependencyGraph; import hudson.model.Descriptor; -import hudson.model.Failure; +import hudson.model.Descriptor.FormException; import hudson.model.Hudson; import hudson.model.Item; import hudson.model.ItemGroup; @@ -38,14 +39,12 @@ import hudson.model.Items; import hudson.model.JDK; import hudson.model.Job; import hudson.model.Label; +import hudson.model.Queue.FlyweightTask; +import hudson.model.ResourceController; import hudson.model.Result; import hudson.model.SCMedItem; import hudson.model.Saveable; import hudson.model.TopLevelItem; -import hudson.model.ResourceController; -import hudson.model.BuildableItemWithBuildWrappers; -import hudson.model.Queue.FlyweightTask; -import hudson.model.Descriptor.FormException; import hudson.tasks.BuildStep; import hudson.tasks.BuildStepDescriptor; import hudson.tasks.BuildWrapper; @@ -55,8 +54,13 @@ import hudson.tasks.Publisher; import hudson.triggers.Trigger; import hudson.util.CopyOnWriteMap; import hudson.util.DescribableList; -import hudson.util.FormValidation; +import net.sf.json.JSONObject; +import org.kohsuke.stapler.HttpResponse; +import org.kohsuke.stapler.StaplerRequest; +import org.kohsuke.stapler.StaplerResponse; +import org.kohsuke.stapler.TokenList; +import javax.servlet.ServletException; import java.io.File; import java.io.FileFilter; import java.io.IOException; @@ -65,25 +69,14 @@ import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; -import java.util.Set; import java.util.Map.Entry; +import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; -import javax.servlet.ServletException; - -import net.sf.json.JSONObject; - -import org.kohsuke.stapler.StaplerRequest; -import org.kohsuke.stapler.StaplerResponse; -import org.kohsuke.stapler.TokenList; -import org.kohsuke.stapler.HttpResponse; -import org.kohsuke.stapler.QueryParameter; - /** * {@link Job} that allows you to run multiple different configurations * from a single setting. @@ -92,9 +85,7 @@ import org.kohsuke.stapler.QueryParameter; */ public class MatrixProject extends AbstractProject implements TopLevelItem, SCMedItem, ItemGroup, Saveable, FlyweightTask, BuildableItemWithBuildWrappers { /** - * Other configuration axes. - * - * This also includes special axis "label" and "jdk" if they are configured. + * Configuration axes. */ private volatile AxisList axes = new AxisList(); @@ -243,6 +234,9 @@ public class MatrixProject extends AbstractProject im /** * Gets the subset of {@link AxisList} that are not system axes. + * + * @deprecated as of 1.373 + * System vs user difference are generalized into extension point. */ public List getUserAxes() { List r = new ArrayList(); @@ -474,12 +468,9 @@ public class MatrixProject extends AbstractProject im * @return never null */ public Set