From 09c04e3b666ef0832201d4433326b35b4bf84991 Mon Sep 17 00:00:00 2001 From: Ryan Campbell Date: Wed, 4 Feb 2015 09:05:03 -0600 Subject: [PATCH 01/21] Resolve feedback on SECURITY-165 --- core/src/main/java/hudson/model/User.java | 2 +- .../HudsonPrivateSecurityRealm2Test.java | 23 +++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/hudson/model/User.java b/core/src/main/java/hudson/model/User.java index b09cf7ea49..e61c3b76bf 100644 --- a/core/src/main/java/hudson/model/User.java +++ b/core/src/main/java/hudson/model/User.java @@ -110,7 +110,7 @@ public class User extends AbstractModelObject implements AccessControlled, Descr * These usernames should not be used by real users logging into Jenkins. Therefore, we prevent * users with these names from being saved. */ - public static final String[] ILLEGAL_PERSISTED_USERNAMES = new String[]{"anonymous", "system", "unknown"}; + private static final String[] ILLEGAL_PERSISTED_USERNAMES = new String[]{"anonymous", "system", "unknown"}; private transient final String id; private volatile String fullName; diff --git a/test/src/test/java/hudson/security/HudsonPrivateSecurityRealm2Test.java b/test/src/test/java/hudson/security/HudsonPrivateSecurityRealm2Test.java index 0d87c08f45..887626f321 100644 --- a/test/src/test/java/hudson/security/HudsonPrivateSecurityRealm2Test.java +++ b/test/src/test/java/hudson/security/HudsonPrivateSecurityRealm2Test.java @@ -1,3 +1,26 @@ +/* + * The MIT License + * + * Copyright (c) 2015, CloudBees, 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.security; import com.gargoylesoftware.htmlunit.html.HtmlPage; From 71f9d5ebf4a46ceb5c906df3bf693cc5cc05f1c7 Mon Sep 17 00:00:00 2001 From: Ryan Campbell Date: Wed, 4 Feb 2015 10:24:17 -0600 Subject: [PATCH 02/21] [SECURITY-165] Add constants for system-wide usernames --- core/src/main/java/hudson/model/User.java | 10 ++++++++-- core/src/main/java/hudson/security/ACL.java | 17 +++++++++++++++-- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/hudson/model/User.java b/core/src/main/java/hudson/model/User.java index e61c3b76bf..9367181741 100644 --- a/core/src/main/java/hudson/model/User.java +++ b/core/src/main/java/hudson/model/User.java @@ -106,11 +106,17 @@ import javax.annotation.Nonnull; @ExportedBean public class User extends AbstractModelObject implements AccessControlled, DescriptorByNameOwner, Saveable, Comparable, ModelObjectWithContextMenu { + /** + * The username of the 'unknown' user used to avoid null user references. + */ + private static final String UKNOWN_USERNAME = "unknown"; + /** * These usernames should not be used by real users logging into Jenkins. Therefore, we prevent * users with these names from being saved. */ - private static final String[] ILLEGAL_PERSISTED_USERNAMES = new String[]{"anonymous", "system", "unknown"}; + private static final String[] ILLEGAL_PERSISTED_USERNAMES = new String[]{ACL.ANONYMOUS_USERNAME, + ACL.SYSTEM_USERNAME, UKNOWN_USERNAME}; private transient final String id; private volatile String fullName; @@ -291,7 +297,7 @@ public class User extends AbstractModelObject implements AccessControlled, Descr * This is used to avoid null {@link User} instance. */ public static @Nonnull User getUnknown() { - return get("unknown"); + return get(UKNOWN_USERNAME); } /** diff --git a/core/src/main/java/hudson/security/ACL.java b/core/src/main/java/hudson/security/ACL.java index 132344fc52..1ad915a456 100644 --- a/core/src/main/java/hudson/security/ACL.java +++ b/core/src/main/java/hudson/security/ACL.java @@ -32,6 +32,8 @@ import org.acegisecurity.context.SecurityContextHolder; import org.acegisecurity.providers.UsernamePasswordAuthenticationToken; import org.acegisecurity.acls.sid.PrincipalSid; import org.acegisecurity.acls.sid.Sid; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; /** * Gate-keeper that controls access to Hudson's model objects. @@ -92,23 +94,34 @@ public abstract class ACL { } }; + /** + * The username for the anonymous user + */ + @Restricted(NoExternalUse.class) + public static final String ANONYMOUS_USERNAME = "anonymous"; /** * {@link Sid} that represents the anonymous unauthenticated users. *

* {@link HudsonFilter} sets this up, so this sid remains the same * regardless of the current {@link SecurityRealm} in use. */ - public static final Sid ANONYMOUS = new PrincipalSid("anonymous"); + public static final Sid ANONYMOUS = new PrincipalSid(ANONYMOUS_USERNAME); protected static final Sid[] AUTOMATIC_SIDS = new Sid[]{EVERYONE,ANONYMOUS}; + /** + * The username for the system user + */ + @Restricted(NoExternalUse.class) + public static final String SYSTEM_USERNAME = "SYSTEM"; + /** * {@link Sid} that represents the Hudson itself. *

* This is used when Hudson is performing computation for itself, instead * of acting on behalf of an user, such as doing builds. */ - public static final Authentication SYSTEM = new UsernamePasswordAuthenticationToken("SYSTEM","SYSTEM"); + public static final Authentication SYSTEM = new UsernamePasswordAuthenticationToken(SYSTEM_USERNAME,"SYSTEM"); /** * Changes the {@link Authentication} associated with the current thread From 7d926f720ea2d86ad60556a56ae1c7241b5392b7 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 14 Apr 2014 19:03:29 -0400 Subject: [PATCH 03/21] Removing hudson.matrix classes and associated resources as a first pass. (cherry picked from commit 4aad749cbe282ef33134ea924a4e547c4767ca07) Conflicts: core/src/main/java/hudson/matrix/MatrixBuild.java core/src/main/java/hudson/matrix/MatrixConfiguration.java core/src/main/java/hudson/matrix/MatrixProject.java core/src/main/resources/hudson/matrix/MatrixProject/configure-entries.jelly --- core/src/main/java/hudson/matrix/Axis.java | 265 ----- .../java/hudson/matrix/AxisDescriptor.java | 67 -- .../src/main/java/hudson/matrix/AxisList.java | 108 -- .../main/java/hudson/matrix/Combination.java | 265 ----- .../hudson/matrix/DefaultAxisDescriptor.java | 48 - .../DefaultMatrixExecutionStrategyImpl.java | 300 ------ .../main/java/hudson/matrix/FilterScript.java | 136 --- core/src/main/java/hudson/matrix/JDKAxis.java | 72 -- .../main/java/hudson/matrix/LabelAxis.java | 85 -- .../main/java/hudson/matrix/LabelExpAxis.java | 97 -- .../src/main/java/hudson/matrix/Layouter.java | 225 ----- .../java/hudson/matrix/LinkedLogRotator.java | 77 -- .../hudson/matrix/MatrixAggregatable.java | 69 -- .../java/hudson/matrix/MatrixAggregator.java | 105 -- .../main/java/hudson/matrix/MatrixBuild.java | 406 -------- .../java/hudson/matrix/MatrixChildAction.java | 39 - .../hudson/matrix/MatrixConfiguration.java | 432 -------- .../matrix/MatrixConfigurationSorter.java | 36 - .../MatrixConfigurationSorterDescriptor.java | 27 - .../matrix/MatrixExecutionStrategy.java | 60 -- .../MatrixExecutionStrategyDescriptor.java | 48 - .../java/hudson/matrix/MatrixProject.java | 951 ------------------ .../main/java/hudson/matrix/MatrixRun.java | 186 ---- .../matrix/NoopMatrixConfigurationSorter.java | 33 - .../src/main/java/hudson/matrix/TextAxis.java | 34 - .../matrix/listeners/MatrixBuildListener.java | 84 -- core/src/main/java/hudson/matrix/package.html | 27 - .../config.groovy | 28 - .../config.properties | 24 - .../config_da.properties | 29 - .../config_de.properties | 30 - .../config_ja.properties | 31 - .../config_pt_BR.properties | 29 - .../config_zh_TW.properties | 31 - .../help-hasTouchStoneCombinationFilter.html | 5 - ...elp-hasTouchStoneCombinationFilter_de.html | 10 - ...elp-hasTouchStoneCombinationFilter_ja.html | 5 - ...-hasTouchStoneCombinationFilter_zh_TW.html | 5 - .../help-runSequentially.html | 5 - .../help-runSequentially_de.html | 6 - .../help-runSequentially_ja.html | 4 - .../help-runSequentially_zh_TW.html | 4 - .../hudson/matrix/JDKAxis/config.jelly | 33 - .../hudson/matrix/LabelAxis/config.jelly | 66 -- .../matrix/LabelAxis/config_da.properties | 26 - .../matrix/LabelAxis/config_de.properties | 26 - .../matrix/LabelAxis/config_es.properties | 26 - .../matrix/LabelAxis/config_ja.properties | 26 - .../matrix/LabelAxis/config_pt.properties | 27 - .../matrix/LabelAxis/config_zh_TW.properties | 26 - .../hudson/matrix/LabelAxis/help-labels.html | 27 - .../matrix/LabelAxis/help-labels_de.html | 30 - .../matrix/LabelAxis/help-labels_fr.html | 34 - .../matrix/LabelAxis/help-labels_ja.html | 23 - .../matrix/LabelAxis/help-labels_nl.html | 15 - .../matrix/LabelAxis/help-labels_pt_BR.html | 27 - .../matrix/LabelAxis/help-labels_ru.html | 28 - .../matrix/LabelAxis/help-labels_tr.html | 26 - .../matrix/LabelAxis/help-labels_zh_TW.html | 21 - .../hudson/matrix/LabelAxis/help.html | 5 - .../hudson/matrix/LabelAxis/help_zh_TW.html | 4 - .../hudson/matrix/LabelExpAxis/config.jelly | 32 - .../matrix/LabelExpAxis/config_es.properties | 24 - .../matrix/LabelExpAxis/config_ja.properties | 25 - .../matrix/LabelExpAxis/config_pt.properties | 25 - .../LabelExpAxis/config_zh_TW.properties | 24 - .../matrix/LabelExpAxis/help-labelExpr.html | 4 - .../LabelExpAxis/help-labelExpr_ja.html | 4 - .../LabelExpAxis/help-labelExpr_zh_TW.html | 4 - .../hudson/matrix/LabelExpAxis/help.html | 4 - .../hudson/matrix/LabelExpAxis/help_ja.html | 4 - .../matrix/LabelExpAxis/help_zh_TW.html | 4 - .../matrix/MatrixBuild/ajaxMatrix.jelly | 48 - .../MatrixBuild/ajaxMatrix_da.properties | 23 - .../MatrixBuild/ajaxMatrix_de.properties | 1 - .../MatrixBuild/ajaxMatrix_es.properties | 23 - .../MatrixBuild/ajaxMatrix_fr.properties | 23 - .../MatrixBuild/ajaxMatrix_it.properties | 23 - .../MatrixBuild/ajaxMatrix_ja.properties | 23 - .../MatrixBuild/ajaxMatrix_nl.properties | 3 - .../MatrixBuild/ajaxMatrix_pt.properties | 23 - .../MatrixBuild/ajaxMatrix_pt_BR.properties | 23 - .../MatrixBuild/ajaxMatrix_ru.properties | 4 - .../MatrixBuild/ajaxMatrix_zh_TW.properties | 23 - .../matrix/MatrixBuild/confirmDeleteAll.jelly | 43 - .../MatrixBuild/confirmDeleteAll.properties | 23 - .../confirmDeleteAll_de.properties | 25 - .../confirmDeleteAll_es.properties | 26 - .../confirmDeleteAll_ja.properties | 27 - .../confirmDeleteAll_pt.properties | 27 - .../confirmDeleteAll_ru.properties | 4 - .../confirmDeleteAll_zh_TW.properties | 25 - .../hudson/matrix/MatrixBuild/delete.jelly | 34 - .../matrix/MatrixBuild/delete_ca.properties | 3 - .../matrix/MatrixBuild/delete_cs.properties | 4 - .../matrix/MatrixBuild/delete_de.properties | 24 - .../matrix/MatrixBuild/delete_es.properties | 24 - .../matrix/MatrixBuild/delete_ja.properties | 25 - .../matrix/MatrixBuild/delete_ko.properties | 4 - .../matrix/MatrixBuild/delete_pl.properties | 4 - .../matrix/MatrixBuild/delete_pt.properties | 25 - .../MatrixBuild/delete_pt_BR.properties | 5 - .../matrix/MatrixBuild/delete_ru.properties | 4 - .../MatrixBuild/delete_zh_CN.properties | 4 - .../MatrixBuild/delete_zh_TW.properties | 24 - .../hudson/matrix/MatrixBuild/main.jelly | 28 - .../MatrixConfigurationSorter/config.groovy | 1 - .../matrix/MatrixProject/ajaxMatrix.jelly | 47 - .../MatrixProject/ajaxMatrix_da.properties | 23 - .../MatrixProject/ajaxMatrix_de.properties | 1 - .../MatrixProject/ajaxMatrix_es.properties | 23 - .../MatrixProject/ajaxMatrix_fi.properties | 23 - .../MatrixProject/ajaxMatrix_fr.properties | 23 - .../MatrixProject/ajaxMatrix_it.properties | 23 - .../MatrixProject/ajaxMatrix_ja.properties | 23 - .../MatrixProject/ajaxMatrix_pl.properties | 23 - .../MatrixProject/ajaxMatrix_pt.properties | 24 - .../MatrixProject/ajaxMatrix_pt_BR.properties | 23 - .../MatrixProject/ajaxMatrix_ro.properties | 3 - .../MatrixProject/ajaxMatrix_ru.properties | 3 - .../MatrixProject/ajaxMatrix_sv_SE.properties | 3 - .../MatrixProject/ajaxMatrix_zh_CN.properties | 23 - .../MatrixProject/ajaxMatrix_zh_TW.properties | 23 - .../MatrixProject/configure-entries.jelly | 99 -- .../configure-entries_da.properties | 27 - .../configure-entries_de.properties | 30 - .../configure-entries_es.properties | 32 - .../configure-entries_fr.properties | 35 - .../configure-entries_ja.properties | 33 - .../configure-entries_ko.properties | 6 - .../configure-entries_nl.properties | 31 - .../configure-entries_pt.properties | 33 - .../configure-entries_pt_BR.properties | 38 - .../configure-entries_ru.properties | 33 - .../configure-entries_sk.properties | 5 - .../configure-entries_sv_SE.properties | 5 - .../configure-entries_tr.properties | 35 - .../configure-entries_zh_TW.properties | 32 - .../help-childCustomWorkspace.html | 28 - .../help-childCustomWorkspace_zh_TW.html | 24 - .../MatrixProject/help-slaveAffinity.html | 9 - .../hudson/matrix/MatrixProject/index.jelly | 62 -- .../matrix/MatrixProject/index_ar.properties | 3 - .../matrix/MatrixProject/index_cs.properties | 23 - .../matrix/MatrixProject/index_da.properties | 23 - .../matrix/MatrixProject/index_de.properties | 24 - .../matrix/MatrixProject/index_es.properties | 25 - .../matrix/MatrixProject/index_fi.properties | 23 - .../matrix/MatrixProject/index_fr.properties | 24 - .../matrix/MatrixProject/index_he.properties | 4 - .../matrix/MatrixProject/index_hu.properties | 3 - .../matrix/MatrixProject/index_it.properties | 23 - .../matrix/MatrixProject/index_ja.properties | 25 - .../matrix/MatrixProject/index_ko.properties | 4 - .../matrix/MatrixProject/index_nl.properties | 23 - .../matrix/MatrixProject/index_pl.properties | 23 - .../matrix/MatrixProject/index_pt.properties | 26 - .../MatrixProject/index_pt_BR.properties | 25 - .../matrix/MatrixProject/index_ro.properties | 4 - .../matrix/MatrixProject/index_ru.properties | 24 - .../MatrixProject/index_sv_SE.properties | 4 - .../matrix/MatrixProject/index_tr.properties | 23 - .../matrix/MatrixProject/index_uk.properties | 4 - .../MatrixProject/index_zh_CN.properties | 23 - .../MatrixProject/index_zh_TW.properties | 26 - .../matrix/MatrixProject/newJobDetail.jelly | 28 - .../MatrixProject/newJobDetail.properties | 25 - .../MatrixProject/newJobDetail_ar.properties | 3 - .../MatrixProject/newJobDetail_da.properties | 23 - .../MatrixProject/newJobDetail_de.properties | 27 - .../MatrixProject/newJobDetail_es.properties | 26 - .../MatrixProject/newJobDetail_et.properties | 3 - .../MatrixProject/newJobDetail_fi.properties | 3 - .../MatrixProject/newJobDetail_fr.properties | 26 - .../newJobDetail_hi_IN.properties | 3 - .../MatrixProject/newJobDetail_it.properties | 23 - .../MatrixProject/newJobDetail_ja.properties | 24 - .../MatrixProject/newJobDetail_ko.properties | 23 - .../newJobDetail_nb_NO.properties | 23 - .../MatrixProject/newJobDetail_nl.properties | 23 - .../MatrixProject/newJobDetail_pl.properties | 23 - .../MatrixProject/newJobDetail_pt.properties | 26 - .../newJobDetail_pt_BR.properties | 23 - .../MatrixProject/newJobDetail_ru.properties | 23 - .../newJobDetail_sv_SE.properties | 23 - .../MatrixProject/newJobDetail_tr.properties | 23 - .../MatrixProject/newJobDetail_uk.properties | 3 - .../newJobDetail_zh_CN.properties | 23 - .../newJobDetail_zh_TW.properties | 24 - .../hudson/matrix/Messages.properties | 41 - .../hudson/matrix/Messages_da.properties | 33 - .../hudson/matrix/Messages_de.properties | 40 - .../hudson/matrix/Messages_es.properties | 39 - .../hudson/matrix/Messages_fr.properties | 30 - .../hudson/matrix/Messages_ja.properties | 40 - .../hudson/matrix/Messages_nl.properties | 31 - .../hudson/matrix/Messages_pt.properties | 40 - .../hudson/matrix/Messages_pt_BR.properties | 42 - .../hudson/matrix/Messages_ru.properties | 30 - .../hudson/matrix/Messages_tr.properties | 31 - .../hudson/matrix/Messages_zh_CN.properties | 37 - .../hudson/matrix/Messages_zh_TW.properties | 39 - .../hudson/matrix/TextAxis/config.jelly | 32 - .../matrix/TextAxis/config_da.properties | 24 - .../matrix/TextAxis/config_de.properties | 24 - .../matrix/TextAxis/config_es.properties | 24 - .../matrix/TextAxis/config_ja.properties | 24 - .../matrix/TextAxis/config_pt.properties | 24 - .../matrix/TextAxis/config_zh_TW.properties | 24 - .../matrix/TextAxis/help-valueString.html | 4 - .../matrix/TextAxis/help-valueString_de.html | 5 - .../matrix/TextAxis/help-valueString_fr.html | 4 - .../matrix/TextAxis/help-valueString_ja.html | 4 - .../matrix/TextAxis/help-valueString_nl.html | 3 - .../TextAxis/help-valueString_pt_BR.html | 3 - .../matrix/TextAxis/help-valueString_ru.html | 3 - .../matrix/TextAxis/help-valueString_tr.html | 3 - .../TextAxis/help-valueString_zh_TW.html | 4 - .../resources/lib/hudson/project/matrix.jelly | 103 -- .../lib/hudson/project/matrix_ar.properties | 3 - .../lib/hudson/project/matrix_cs.properties | 23 - .../lib/hudson/project/matrix_da.properties | 24 - .../lib/hudson/project/matrix_de.properties | 24 - .../lib/hudson/project/matrix_es.properties | 24 - .../lib/hudson/project/matrix_fi.properties | 23 - .../lib/hudson/project/matrix_fr.properties | 24 - .../lib/hudson/project/matrix_he.properties | 3 - .../lib/hudson/project/matrix_it.properties | 23 - .../lib/hudson/project/matrix_ja.properties | 24 - .../lib/hudson/project/matrix_ko.properties | 3 - .../lib/hudson/project/matrix_nl.properties | 24 - .../lib/hudson/project/matrix_pl.properties | 24 - .../hudson/project/matrix_pt_BR.properties | 24 - .../hudson/project/matrix_pt_PT.properties | 23 - .../lib/hudson/project/matrix_ro.properties | 3 - .../lib/hudson/project/matrix_ru.properties | 24 - .../hudson/project/matrix_sv_SE.properties | 4 - .../lib/hudson/project/matrix_tr.properties | 24 - .../lib/hudson/project/matrix_uk.properties | 3 - .../hudson/project/matrix_zh_CN.properties | 23 - .../hudson/project/matrix_zh_TW.properties | 24 - ...CombinationFilterUsingBuildParamsTest.java | 304 ------ .../java/hudson/matrix/CombinationTest.java | 62 -- .../MatrixProjectCustomWorkspaceTest.groovy | 147 --- .../hudson/matrix/MatrixProjectTest.groovy | 522 ---------- .../matrix/MatrixConfigurationSorterTest.java | 48 - .../matrix/MatrixProjectDependencyTest.java | 41 - .../test/java/hudson/matrix/MatrixTest.java | 76 -- .../MatrixProjectTest/testUpgrade/config.xml | 1 - .../testUpgrade/jobs/x/config.xml | 19 - .../resources/hudson/matrix/echo-property.pom | 70 -- war/src/main/webapp/help/matrix/axes.html | 22 - war/src/main/webapp/help/matrix/axes_de.html | 24 - war/src/main/webapp/help/matrix/axes_fr.html | 30 - war/src/main/webapp/help/matrix/axes_ja.html | 21 - war/src/main/webapp/help/matrix/axes_nl.html | 15 - .../main/webapp/help/matrix/axes_pt_BR.html | 22 - war/src/main/webapp/help/matrix/axes_ru.html | 24 - war/src/main/webapp/help/matrix/axes_tr.html | 20 - .../main/webapp/help/matrix/axes_zh_TW.html | 21 - .../webapp/help/matrix/combinationfilter.html | 54 - .../help/matrix/combinationfilter_de.html | 55 - .../help/matrix/combinationfilter_fr.html | 54 - .../help/matrix/combinationfilter_ja.html | 49 - .../help/matrix/combinationfilter_zh_TW.html | 47 - war/src/main/webapp/help/matrix/jdk.html | 12 - war/src/main/webapp/help/matrix/jdk_de.html | 15 - war/src/main/webapp/help/matrix/jdk_fr.html | 15 - war/src/main/webapp/help/matrix/jdk_ja.html | 10 - war/src/main/webapp/help/matrix/jdk_nl.html | 8 - .../main/webapp/help/matrix/jdk_pt_BR.html | 12 - war/src/main/webapp/help/matrix/jdk_ru.html | 13 - war/src/main/webapp/help/matrix/jdk_tr.html | 11 - .../main/webapp/help/matrix/jdk_zh_TW.html | 10 - 274 files changed, 10659 deletions(-) delete mode 100644 core/src/main/java/hudson/matrix/Axis.java delete mode 100644 core/src/main/java/hudson/matrix/AxisDescriptor.java delete mode 100644 core/src/main/java/hudson/matrix/AxisList.java delete mode 100644 core/src/main/java/hudson/matrix/Combination.java delete mode 100644 core/src/main/java/hudson/matrix/DefaultAxisDescriptor.java delete mode 100644 core/src/main/java/hudson/matrix/DefaultMatrixExecutionStrategyImpl.java delete mode 100644 core/src/main/java/hudson/matrix/FilterScript.java delete mode 100644 core/src/main/java/hudson/matrix/JDKAxis.java delete mode 100644 core/src/main/java/hudson/matrix/LabelAxis.java delete mode 100644 core/src/main/java/hudson/matrix/LabelExpAxis.java delete mode 100644 core/src/main/java/hudson/matrix/Layouter.java delete mode 100644 core/src/main/java/hudson/matrix/LinkedLogRotator.java delete mode 100644 core/src/main/java/hudson/matrix/MatrixAggregatable.java delete mode 100644 core/src/main/java/hudson/matrix/MatrixAggregator.java delete mode 100644 core/src/main/java/hudson/matrix/MatrixBuild.java delete mode 100644 core/src/main/java/hudson/matrix/MatrixChildAction.java delete mode 100644 core/src/main/java/hudson/matrix/MatrixConfiguration.java delete mode 100644 core/src/main/java/hudson/matrix/MatrixConfigurationSorter.java delete mode 100644 core/src/main/java/hudson/matrix/MatrixConfigurationSorterDescriptor.java delete mode 100644 core/src/main/java/hudson/matrix/MatrixExecutionStrategy.java delete mode 100644 core/src/main/java/hudson/matrix/MatrixExecutionStrategyDescriptor.java delete mode 100644 core/src/main/java/hudson/matrix/MatrixProject.java delete mode 100644 core/src/main/java/hudson/matrix/MatrixRun.java delete mode 100644 core/src/main/java/hudson/matrix/NoopMatrixConfigurationSorter.java delete mode 100644 core/src/main/java/hudson/matrix/TextAxis.java delete mode 100644 core/src/main/java/hudson/matrix/listeners/MatrixBuildListener.java delete mode 100644 core/src/main/java/hudson/matrix/package.html delete mode 100644 core/src/main/resources/hudson/matrix/DefaultMatrixExecutionStrategyImpl/config.groovy delete mode 100644 core/src/main/resources/hudson/matrix/DefaultMatrixExecutionStrategyImpl/config.properties delete mode 100644 core/src/main/resources/hudson/matrix/DefaultMatrixExecutionStrategyImpl/config_da.properties delete mode 100644 core/src/main/resources/hudson/matrix/DefaultMatrixExecutionStrategyImpl/config_de.properties delete mode 100644 core/src/main/resources/hudson/matrix/DefaultMatrixExecutionStrategyImpl/config_ja.properties delete mode 100644 core/src/main/resources/hudson/matrix/DefaultMatrixExecutionStrategyImpl/config_pt_BR.properties delete mode 100644 core/src/main/resources/hudson/matrix/DefaultMatrixExecutionStrategyImpl/config_zh_TW.properties delete mode 100644 core/src/main/resources/hudson/matrix/DefaultMatrixExecutionStrategyImpl/help-hasTouchStoneCombinationFilter.html delete mode 100644 core/src/main/resources/hudson/matrix/DefaultMatrixExecutionStrategyImpl/help-hasTouchStoneCombinationFilter_de.html delete mode 100644 core/src/main/resources/hudson/matrix/DefaultMatrixExecutionStrategyImpl/help-hasTouchStoneCombinationFilter_ja.html delete mode 100644 core/src/main/resources/hudson/matrix/DefaultMatrixExecutionStrategyImpl/help-hasTouchStoneCombinationFilter_zh_TW.html delete mode 100644 core/src/main/resources/hudson/matrix/DefaultMatrixExecutionStrategyImpl/help-runSequentially.html delete mode 100644 core/src/main/resources/hudson/matrix/DefaultMatrixExecutionStrategyImpl/help-runSequentially_de.html delete mode 100644 core/src/main/resources/hudson/matrix/DefaultMatrixExecutionStrategyImpl/help-runSequentially_ja.html delete mode 100644 core/src/main/resources/hudson/matrix/DefaultMatrixExecutionStrategyImpl/help-runSequentially_zh_TW.html delete mode 100644 core/src/main/resources/hudson/matrix/JDKAxis/config.jelly delete mode 100644 core/src/main/resources/hudson/matrix/LabelAxis/config.jelly delete mode 100644 core/src/main/resources/hudson/matrix/LabelAxis/config_da.properties delete mode 100644 core/src/main/resources/hudson/matrix/LabelAxis/config_de.properties delete mode 100644 core/src/main/resources/hudson/matrix/LabelAxis/config_es.properties delete mode 100644 core/src/main/resources/hudson/matrix/LabelAxis/config_ja.properties delete mode 100644 core/src/main/resources/hudson/matrix/LabelAxis/config_pt.properties delete mode 100644 core/src/main/resources/hudson/matrix/LabelAxis/config_zh_TW.properties delete mode 100644 core/src/main/resources/hudson/matrix/LabelAxis/help-labels.html delete mode 100644 core/src/main/resources/hudson/matrix/LabelAxis/help-labels_de.html delete mode 100644 core/src/main/resources/hudson/matrix/LabelAxis/help-labels_fr.html delete mode 100644 core/src/main/resources/hudson/matrix/LabelAxis/help-labels_ja.html delete mode 100644 core/src/main/resources/hudson/matrix/LabelAxis/help-labels_nl.html delete mode 100644 core/src/main/resources/hudson/matrix/LabelAxis/help-labels_pt_BR.html delete mode 100644 core/src/main/resources/hudson/matrix/LabelAxis/help-labels_ru.html delete mode 100644 core/src/main/resources/hudson/matrix/LabelAxis/help-labels_tr.html delete mode 100644 core/src/main/resources/hudson/matrix/LabelAxis/help-labels_zh_TW.html delete mode 100644 core/src/main/resources/hudson/matrix/LabelAxis/help.html delete mode 100644 core/src/main/resources/hudson/matrix/LabelAxis/help_zh_TW.html delete mode 100644 core/src/main/resources/hudson/matrix/LabelExpAxis/config.jelly delete mode 100644 core/src/main/resources/hudson/matrix/LabelExpAxis/config_es.properties delete mode 100644 core/src/main/resources/hudson/matrix/LabelExpAxis/config_ja.properties delete mode 100644 core/src/main/resources/hudson/matrix/LabelExpAxis/config_pt.properties delete mode 100644 core/src/main/resources/hudson/matrix/LabelExpAxis/config_zh_TW.properties delete mode 100644 core/src/main/resources/hudson/matrix/LabelExpAxis/help-labelExpr.html delete mode 100644 core/src/main/resources/hudson/matrix/LabelExpAxis/help-labelExpr_ja.html delete mode 100644 core/src/main/resources/hudson/matrix/LabelExpAxis/help-labelExpr_zh_TW.html delete mode 100644 core/src/main/resources/hudson/matrix/LabelExpAxis/help.html delete mode 100644 core/src/main/resources/hudson/matrix/LabelExpAxis/help_ja.html delete mode 100644 core/src/main/resources/hudson/matrix/LabelExpAxis/help_zh_TW.html delete mode 100644 core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix.jelly delete mode 100644 core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix_da.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix_de.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix_es.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix_fr.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix_it.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix_ja.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix_nl.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix_pt.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix_pt_BR.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix_ru.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix_zh_TW.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixBuild/confirmDeleteAll.jelly delete mode 100644 core/src/main/resources/hudson/matrix/MatrixBuild/confirmDeleteAll.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixBuild/confirmDeleteAll_de.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixBuild/confirmDeleteAll_es.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixBuild/confirmDeleteAll_ja.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixBuild/confirmDeleteAll_pt.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixBuild/confirmDeleteAll_ru.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixBuild/confirmDeleteAll_zh_TW.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixBuild/delete.jelly delete mode 100644 core/src/main/resources/hudson/matrix/MatrixBuild/delete_ca.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixBuild/delete_cs.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixBuild/delete_de.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixBuild/delete_es.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixBuild/delete_ja.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixBuild/delete_ko.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixBuild/delete_pl.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixBuild/delete_pt.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixBuild/delete_pt_BR.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixBuild/delete_ru.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixBuild/delete_zh_CN.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixBuild/delete_zh_TW.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixBuild/main.jelly delete mode 100644 core/src/main/resources/hudson/matrix/MatrixConfigurationSorter/config.groovy delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix.jelly delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_da.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_de.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_es.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_fi.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_fr.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_it.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_ja.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_pl.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_pt.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_pt_BR.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_ro.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_ru.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_sv_SE.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_zh_CN.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_zh_TW.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/configure-entries.jelly delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/configure-entries_da.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/configure-entries_de.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/configure-entries_es.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/configure-entries_fr.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/configure-entries_ja.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/configure-entries_ko.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/configure-entries_nl.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/configure-entries_pt.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/configure-entries_pt_BR.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/configure-entries_ru.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/configure-entries_sk.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/configure-entries_sv_SE.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/configure-entries_tr.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/configure-entries_zh_TW.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/help-childCustomWorkspace.html delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/help-childCustomWorkspace_zh_TW.html delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/help-slaveAffinity.html delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/index.jelly delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/index_ar.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/index_cs.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/index_da.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/index_de.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/index_es.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/index_fi.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/index_fr.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/index_he.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/index_hu.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/index_it.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/index_ja.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/index_ko.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/index_nl.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/index_pl.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/index_pt.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/index_pt_BR.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/index_ro.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/index_ru.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/index_sv_SE.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/index_tr.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/index_uk.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/index_zh_CN.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/index_zh_TW.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail.jelly delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_ar.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_da.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_de.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_es.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_et.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_fi.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_fr.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_hi_IN.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_it.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_ja.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_ko.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_nb_NO.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_nl.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_pl.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_pt.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_pt_BR.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_ru.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_sv_SE.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_tr.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_uk.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_zh_CN.properties delete mode 100644 core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_zh_TW.properties delete mode 100644 core/src/main/resources/hudson/matrix/Messages.properties delete mode 100644 core/src/main/resources/hudson/matrix/Messages_da.properties delete mode 100644 core/src/main/resources/hudson/matrix/Messages_de.properties delete mode 100644 core/src/main/resources/hudson/matrix/Messages_es.properties delete mode 100644 core/src/main/resources/hudson/matrix/Messages_fr.properties delete mode 100644 core/src/main/resources/hudson/matrix/Messages_ja.properties delete mode 100644 core/src/main/resources/hudson/matrix/Messages_nl.properties delete mode 100644 core/src/main/resources/hudson/matrix/Messages_pt.properties delete mode 100644 core/src/main/resources/hudson/matrix/Messages_pt_BR.properties delete mode 100644 core/src/main/resources/hudson/matrix/Messages_ru.properties delete mode 100644 core/src/main/resources/hudson/matrix/Messages_tr.properties delete mode 100644 core/src/main/resources/hudson/matrix/Messages_zh_CN.properties delete mode 100644 core/src/main/resources/hudson/matrix/Messages_zh_TW.properties delete mode 100644 core/src/main/resources/hudson/matrix/TextAxis/config.jelly delete mode 100644 core/src/main/resources/hudson/matrix/TextAxis/config_da.properties delete mode 100644 core/src/main/resources/hudson/matrix/TextAxis/config_de.properties delete mode 100644 core/src/main/resources/hudson/matrix/TextAxis/config_es.properties delete mode 100644 core/src/main/resources/hudson/matrix/TextAxis/config_ja.properties delete mode 100644 core/src/main/resources/hudson/matrix/TextAxis/config_pt.properties delete mode 100644 core/src/main/resources/hudson/matrix/TextAxis/config_zh_TW.properties delete mode 100644 core/src/main/resources/hudson/matrix/TextAxis/help-valueString.html delete mode 100644 core/src/main/resources/hudson/matrix/TextAxis/help-valueString_de.html delete mode 100644 core/src/main/resources/hudson/matrix/TextAxis/help-valueString_fr.html delete mode 100644 core/src/main/resources/hudson/matrix/TextAxis/help-valueString_ja.html delete mode 100644 core/src/main/resources/hudson/matrix/TextAxis/help-valueString_nl.html delete mode 100644 core/src/main/resources/hudson/matrix/TextAxis/help-valueString_pt_BR.html delete mode 100644 core/src/main/resources/hudson/matrix/TextAxis/help-valueString_ru.html delete mode 100644 core/src/main/resources/hudson/matrix/TextAxis/help-valueString_tr.html delete mode 100644 core/src/main/resources/hudson/matrix/TextAxis/help-valueString_zh_TW.html delete mode 100644 core/src/main/resources/lib/hudson/project/matrix.jelly delete mode 100644 core/src/main/resources/lib/hudson/project/matrix_ar.properties delete mode 100644 core/src/main/resources/lib/hudson/project/matrix_cs.properties delete mode 100644 core/src/main/resources/lib/hudson/project/matrix_da.properties delete mode 100644 core/src/main/resources/lib/hudson/project/matrix_de.properties delete mode 100644 core/src/main/resources/lib/hudson/project/matrix_es.properties delete mode 100644 core/src/main/resources/lib/hudson/project/matrix_fi.properties delete mode 100644 core/src/main/resources/lib/hudson/project/matrix_fr.properties delete mode 100644 core/src/main/resources/lib/hudson/project/matrix_he.properties delete mode 100644 core/src/main/resources/lib/hudson/project/matrix_it.properties delete mode 100644 core/src/main/resources/lib/hudson/project/matrix_ja.properties delete mode 100644 core/src/main/resources/lib/hudson/project/matrix_ko.properties delete mode 100644 core/src/main/resources/lib/hudson/project/matrix_nl.properties delete mode 100644 core/src/main/resources/lib/hudson/project/matrix_pl.properties delete mode 100644 core/src/main/resources/lib/hudson/project/matrix_pt_BR.properties delete mode 100644 core/src/main/resources/lib/hudson/project/matrix_pt_PT.properties delete mode 100644 core/src/main/resources/lib/hudson/project/matrix_ro.properties delete mode 100644 core/src/main/resources/lib/hudson/project/matrix_ru.properties delete mode 100644 core/src/main/resources/lib/hudson/project/matrix_sv_SE.properties delete mode 100644 core/src/main/resources/lib/hudson/project/matrix_tr.properties delete mode 100644 core/src/main/resources/lib/hudson/project/matrix_uk.properties delete mode 100644 core/src/main/resources/lib/hudson/project/matrix_zh_CN.properties delete mode 100644 core/src/main/resources/lib/hudson/project/matrix_zh_TW.properties delete mode 100644 core/src/test/java/hudson/matrix/CombinationFilterUsingBuildParamsTest.java delete mode 100644 core/src/test/java/hudson/matrix/CombinationTest.java delete mode 100644 test/src/test/groovy/hudson/matrix/MatrixProjectCustomWorkspaceTest.groovy delete mode 100644 test/src/test/groovy/hudson/matrix/MatrixProjectTest.groovy delete mode 100644 test/src/test/java/hudson/matrix/MatrixConfigurationSorterTest.java delete mode 100644 test/src/test/java/hudson/matrix/MatrixProjectDependencyTest.java delete mode 100644 test/src/test/java/hudson/matrix/MatrixTest.java delete mode 100644 test/src/test/resources/hudson/matrix/MatrixProjectTest/testUpgrade/config.xml delete mode 100644 test/src/test/resources/hudson/matrix/MatrixProjectTest/testUpgrade/jobs/x/config.xml delete mode 100644 test/src/test/resources/hudson/matrix/echo-property.pom delete mode 100644 war/src/main/webapp/help/matrix/axes.html delete mode 100644 war/src/main/webapp/help/matrix/axes_de.html delete mode 100644 war/src/main/webapp/help/matrix/axes_fr.html delete mode 100644 war/src/main/webapp/help/matrix/axes_ja.html delete mode 100644 war/src/main/webapp/help/matrix/axes_nl.html delete mode 100644 war/src/main/webapp/help/matrix/axes_pt_BR.html delete mode 100644 war/src/main/webapp/help/matrix/axes_ru.html delete mode 100644 war/src/main/webapp/help/matrix/axes_tr.html delete mode 100644 war/src/main/webapp/help/matrix/axes_zh_TW.html delete mode 100644 war/src/main/webapp/help/matrix/combinationfilter.html delete mode 100644 war/src/main/webapp/help/matrix/combinationfilter_de.html delete mode 100644 war/src/main/webapp/help/matrix/combinationfilter_fr.html delete mode 100644 war/src/main/webapp/help/matrix/combinationfilter_ja.html delete mode 100644 war/src/main/webapp/help/matrix/combinationfilter_zh_TW.html delete mode 100644 war/src/main/webapp/help/matrix/jdk.html delete mode 100644 war/src/main/webapp/help/matrix/jdk_de.html delete mode 100644 war/src/main/webapp/help/matrix/jdk_fr.html delete mode 100644 war/src/main/webapp/help/matrix/jdk_ja.html delete mode 100644 war/src/main/webapp/help/matrix/jdk_nl.html delete mode 100644 war/src/main/webapp/help/matrix/jdk_pt_BR.html delete mode 100644 war/src/main/webapp/help/matrix/jdk_ru.html delete mode 100644 war/src/main/webapp/help/matrix/jdk_tr.html delete mode 100644 war/src/main/webapp/help/matrix/jdk_zh_TW.html diff --git a/core/src/main/java/hudson/matrix/Axis.java b/core/src/main/java/hudson/matrix/Axis.java deleted file mode 100644 index faec4501e1..0000000000 --- a/core/src/main/java/hudson/matrix/Axis.java +++ /dev/null @@ -1,265 +0,0 @@ -/* - * The MIT License - * - * Copyright (c) 2004-2009, 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 - * 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.DescriptorExtensionList; -import hudson.ExtensionPoint; -import hudson.RestrictedSince; -import hudson.Util; -import hudson.matrix.MatrixBuild.MatrixBuildExecution; -import hudson.model.AbstractDescribableImpl; -import jenkins.model.Jenkins; -import hudson.util.QuotedStringTokenizer; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.NoExternalUse; -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; -import java.util.Arrays; -import java.util.Map; - -/** - * Configuration axis. - * - *

- * This class represents a single dimension of the configuration matrix. - * For example, the JAX-WS RI test configuration might include - * one axis "container={glassfish,tomcat,jetty}" and another axis - * "stax={sjsxp,woodstox}", and so on. - * - * @author Kohsuke Kawaguchi - */ -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()} - */ - @Restricted(NoExternalUse.class) - @RestrictedSince("1.463") - public final List values; - - public Axis(String name, List values) { - if (values == null || values.isEmpty()) { - values = Collections.emptyList(); - } - this.name = name; - this.values = new ArrayList(values); - } - - public Axis(String name, String... values) { - this(name,Arrays.asList(values)); - } - - /** - * Used to build {@link Axis} from form. - * - * Axis with empty values need to be removed later. - */ - @DataBoundConstructor - public Axis(String name, String valueString) { - this.name = name; - this.values = new ArrayList(Arrays.asList(Util.tokenize(valueString))); - } - - /** - * 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 false; - } - - public Iterator iterator() { - return getValues().iterator(); - } - - public int size() { - return getValues().size(); - } - - public String value(int index) { - return getValues().get(index); - } - - /** - * The inverse of {@link #value(int)}. - */ - public int indexOf(String value) { - return values.indexOf(value); - } - - /** - * Axis is fully ordered so that we can convert between a list of axis - * and a string unambiguously. - */ - public int compareTo(Axis that) { - 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); - } - - /** - * Called right at the beginning of {@link MatrixBuild} execution to allow {@link Axis} to update {@link #values} - * based on the current build. - * - *

- * Historically, axes values are considered static. They were assumed to reflect what the user has typed in, - * and their values are changed only when the project is reconfigured. So abstractions are built around this - * notion, and so for example {@link MatrixProject} has the current axes and their values, which it uses - * to render its UI. - * - *

- * So when the need was identified to change the values of axes per build, we decided that this be represented - * as a kind of project configuration update (where a project gets reconfigured every time a build runs), and - * this call back was added to allow {@link Axis} to update the next return value from the {@link #getValues()} - * (which is typically done by updating {@link #values}.) - * - *

- * While it is not strictly required, because of these historical reasons, UI will look better if - * Future calls to {@link Axis#getValues()} return the same values as what this method returns (until - * the next rebuild call). - * - * @param context - * The ongoing build. Never null. - * @return - * Never null. Returns the updated set of values. - * @since 1.471 - */ - public List rebuild(MatrixBuildExecution context) { - return getValues(); - } - - @Override - public AxisDescriptor getDescriptor() { - return (AxisDescriptor)super.getDescriptor(); - } - - @Override - public String toString() { - return new StringBuilder().append(name).append("={").append(Util.join(values,",")).append('}').toString(); - } - - /** - * Used for generating the config UI. - * If the axis is big and occupies a lot of space, use newline for separator - * to display multi-line text. - */ - public String getValueString() { - int len=0; - for (String value : values) - len += value.length(); - char delim = len>30 ? '\n' : ' '; - // Build string connected with delimiter, quoting as needed - StringBuilder buf = new StringBuilder(len+values.size()*3); - for (String value : values) - buf.append(delim).append(QuotedStringTokenizer.quote(value,"")); - return buf.substring(1); - } - - /** - * Parses the submitted form (where possible values are - * presented as a list of checkboxes) and creates an axis - */ - public static Axis parsePrefixed(StaplerRequest req, String name) { - List values = new ArrayList(); - String prefix = name+'.'; - - Enumeration e = req.getParameterNames(); - while (e.hasMoreElements()) { - String paramName = (String) e.nextElement(); - if(paramName.startsWith(prefix)) - values.add(paramName.substring(prefix.length())); - } - if(values.isEmpty()) - 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; - - /* - This method is necessary only because earlier versions of Jenkins treated - axis names "label" and "jdk" differently, - plus Axis was a concrete class, and we need to be able to read that back. - So this measure is not needed for newly added Axes. - */ - 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 Jenkins.getInstance().getDescriptorList(Axis.class); - } - - /** - * Converts the selected value (which is among {@link #values}) and adds that to the given map, - * which serves as the build variables. - */ - public void addBuildVariable(String value, Map map) { - map.put(name,value); - } -} diff --git a/core/src/main/java/hudson/matrix/AxisDescriptor.java b/core/src/main/java/hudson/matrix/AxisDescriptor.java deleted file mode 100644 index 7d93505e4e..0000000000 --- a/core/src/main/java/hudson/matrix/AxisDescriptor.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * 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 jenkins.model.Jenkins; -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 { - Jenkins.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 deleted file mode 100644 index a93a16746b..0000000000 --- a/core/src/main/java/hudson/matrix/AxisList.java +++ /dev/null @@ -1,108 +0,0 @@ -/* - * The MIT License - * - * 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 - * 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 com.google.common.base.Function; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; -import com.thoughtworks.xstream.XStream; -import hudson.Util; -import hudson.util.RobustCollectionConverter; - -import javax.annotation.Nullable; -import java.util.*; - -/** - * List of {@link Axis}. - * - * @author Kohsuke Kawaguchi - */ -public class AxisList extends ArrayList { - public AxisList() { - } - - public AxisList(Collection c) { - super(c); - } - - public AxisList(Axis... c) { - this(Arrays.asList(c)); - } - - public Axis find(String name) { - for (Axis a : this) { - if(a.name.equals(name)) - return a; - } - 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); - } - - /** - * List up all the possible combinations of this list. - */ - public Iterable list() { - List> axesList = Lists.newArrayList(); - for (Axis axis : this) - axesList.add(new LinkedHashSet(axis.getValues())); - - return Iterables.transform(Sets.cartesianProduct(axesList), new Function, Combination>() { - public Combination apply(@Nullable List strings) { - assert strings != null; - return new Combination(AxisList.this, (String[]) strings.toArray(new String[0])); - } - }); - } - - /** - * {@link com.thoughtworks.xstream.converters.Converter} implementation for XStream. - */ - public static final class ConverterImpl extends RobustCollectionConverter { - public ConverterImpl(XStream xs) { - super(xs); - } - - @Override - public boolean canConvert(Class type) { - return type==AxisList.class; - } - - @Override - protected Object createCollection(Class type) { - return new AxisList(); - } - } -} diff --git a/core/src/main/java/hudson/matrix/Combination.java b/core/src/main/java/hudson/matrix/Combination.java deleted file mode 100644 index 9ce0a4dd62..0000000000 --- a/core/src/main/java/hudson/matrix/Combination.java +++ /dev/null @@ -1,265 +0,0 @@ -/* - * The MIT License - * - * Copyright (c) 2004-2009, 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 - * 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 groovy.lang.Binding; -import hudson.Util; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.StringTokenizer; -import java.util.TreeMap; - -/** - * A particular combination of {@link Axis} values. - * - * For example, when axes are "x={1,2},y={3,4}", then - * [x=1,y=3] is a combination (out of 4 possible combinations) - * - * @author Kohsuke Kawaguchi - */ -public final class Combination extends TreeMap implements Comparable { - - public Combination(AxisList axisList, List values) { - for(int i=0; i keyValuePairs) { - for (Map.Entry e : keyValuePairs.entrySet()) - 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}. - */ - public int toIndex(AxisList axis) { - int r = 0; - for (Axis a : axis) { - r *= a.size(); - r += a.indexOf(get(a)); - } - return r; - } - - /** - * Evaluates the given Groovy expression with values bound from this combination. - * - *

- * For example, if this combination is a=X,b=Y, then expressions like a=="X" would evaluate to - * true. - */ - public boolean evalGroovyExpression(AxisList axes, String expression) { - return evalGroovyExpression(axes, expression, new Binding()); - } - - /** - * @see #evalGroovyExpression(AxisList, String) - * @since 1.515 - * @deprecated as of 1.528 - * Use {@link FilterScript#apply(hudson.matrix.MatrixBuild.MatrixBuildExecution, Combination)} - */ - public boolean evalGroovyExpression(AxisList axes, String expression, Binding binding) { - return FilterScript.parse(expression).apply(axes, this, binding); - } - - public int compareTo(Combination that) { - int d = this.size()-that.size(); - if(d!=0) return d; - - Iterator> itr = this.entrySet().iterator(); - Iterator> jtr = that.entrySet().iterator(); - while(itr.hasNext()) { - Map.Entry i = itr.next(); - Map.Entry j = jtr.next(); - - d = i.getKey().compareTo(j.getKey()); - if(d!=0) return d; - d = i.getValue().compareTo(j.getValue()); - if(d!=0) return d; - } - return 0; - } - - /** - * Works like {@link #toString()} but only include the given axes. - */ - public String toString(Collection subset) { - if(size()==1 && subset.size()==1) - return values().iterator().next(); - - StringBuilder buf = new StringBuilder(); - for (Axis a : subset) { - if(buf.length()>0) buf.append(','); - 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,... - * - * @param sep1 - * The separator between multiple axes. - * @param sep2 - * The separator between axis name and value. - */ - public String toString(char sep1, char sep2) { - StringBuilder buf = new StringBuilder(); - for (Map.Entry e : entrySet()) { - if(buf.length()>0) buf.append(sep1); - buf.append(e.getKey()).append(sep2).append(e.getValue()); - } - if(buf.length()==0) buf.append("default"); // special case to avoid 0-length name. - return buf.toString(); - } - - @Override - public String toString() { - return toString(',','='); - } - - /** - * Gets the 8 character-wide hash code for this combination - */ - public String digest() { - return Util.getDigestOf(toString()); - } - - /** - * Reverse operation of {@link #toString()}. - */ - public static Combination fromString(String id) { - if(id.equals("default")) - return new Combination(Collections.emptyMap()); - - Map m = new HashMap(); - StringTokenizer tokens = new StringTokenizer(id, ","); - while(tokens.hasMoreTokens()) { - String token = tokens.nextToken(); - int idx = token.indexOf('='); - if(idx<0) - throw new IllegalArgumentException("Can't parse "+id); - m.put(token.substring(0,idx),token.substring(idx+1)); - } - return new Combination(m); - } - - /** - * Creates compact string representation suitable for display purpose. - * - *

- * The string is made compact by looking for {@link Axis} whose values - * are unique, and omit the axis name. - */ - public String toCompactString(AxisList axes) { - Set nonUniqueAxes = new HashSet(); - Map axisByValue = new HashMap(); - - for (Axis a : axes) { - for (String v : a.getValues()) { - Axis old = axisByValue.put(v,a); - if(old!=null) { - // these two axes have colliding values - nonUniqueAxes.add(old.getName()); - nonUniqueAxes.add(a.getName()); - } - } - } - - StringBuilder buf = new StringBuilder(); - for (Map.Entry e : entrySet()) { - if(buf.length()>0) buf.append(','); - if(nonUniqueAxes.contains(e.getKey())) - buf.append(e.getKey()).append('='); - buf.append(e.getValue()); - } - if(buf.length()==0) buf.append("default"); // special case to avoid 0-length name. - return buf.toString(); - } - - // read-only - @Override - public void clear() { - throw new UnsupportedOperationException(); - } - - @Override - public void putAll(Map map) { - throw new UnsupportedOperationException(); - } - - @Override - public String put(String key, String value) { - throw new UnsupportedOperationException(); - } - - @Override - public String remove(Object key) { - throw new UnsupportedOperationException(); - } - - /** - * Duck-typing for boolean expressions. - * - * @see Combination#evalGroovyExpression(AxisList,String) - */ - public static final class BooleanCategory { - /** - * x -> y - */ - public static Boolean implies(Boolean lhs, Boolean rhs) { - return !lhs || rhs; - } - } -} diff --git a/core/src/main/java/hudson/matrix/DefaultAxisDescriptor.java b/core/src/main/java/hudson/matrix/DefaultAxisDescriptor.java deleted file mode 100644 index 96fb461499..0000000000 --- a/core/src/main/java/hudson/matrix/DefaultAxisDescriptor.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * 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/DefaultMatrixExecutionStrategyImpl.java b/core/src/main/java/hudson/matrix/DefaultMatrixExecutionStrategyImpl.java deleted file mode 100644 index c874a35963..0000000000 --- a/core/src/main/java/hudson/matrix/DefaultMatrixExecutionStrategyImpl.java +++ /dev/null @@ -1,300 +0,0 @@ -package hudson.matrix; - -import groovy.lang.GroovyRuntimeException; -import hudson.AbortException; -import hudson.Extension; -import hudson.console.ModelHyperlinkNote; -import hudson.matrix.MatrixBuild.MatrixBuildExecution; -import hudson.matrix.listeners.MatrixBuildListener; -import hudson.model.BuildListener; -import hudson.model.Cause.UpstreamCause; -import hudson.model.Queue; -import hudson.model.ResourceController; -import hudson.model.Result; -import hudson.model.Run; -import org.kohsuke.stapler.DataBoundConstructor; - -import javax.annotation.Nullable; -import java.io.IOException; -import java.io.PrintStream; -import java.util.Collection; -import java.util.Comparator; -import java.util.HashSet; -import java.util.List; -import java.util.TreeSet; - -/** - * {@link MatrixExecutionStrategy} that captures historical behavior. - * - *

- * This class is somewhat complex because historically this wasn't an extension point and so - * people tried to put various logics that cover different use cases into one place. - * Going forward, people are encouraged to create subtypes to implement a custom logic that suits their needs. - * - * @author Kohsuke Kawaguchi - * @since 1.456 - */ -public class DefaultMatrixExecutionStrategyImpl extends MatrixExecutionStrategy { - private volatile boolean runSequentially; - - /** - * Filter to select a number of combinations to build first - */ - private volatile String touchStoneCombinationFilter; - - /** - * Required result on the touchstone combinations, in order to - * continue with the rest - */ - private volatile Result touchStoneResultCondition; - - private volatile MatrixConfigurationSorter sorter; - - @DataBoundConstructor - public DefaultMatrixExecutionStrategyImpl(Boolean runSequentially, boolean hasTouchStoneCombinationFilter, String touchStoneCombinationFilter, Result touchStoneResultCondition, MatrixConfigurationSorter sorter) { - this(runSequentially!=null ? runSequentially : false, - hasTouchStoneCombinationFilter ? touchStoneCombinationFilter : null, - hasTouchStoneCombinationFilter ? touchStoneResultCondition : null, - sorter); - } - - public DefaultMatrixExecutionStrategyImpl(boolean runSequentially, String touchStoneCombinationFilter, Result touchStoneResultCondition, MatrixConfigurationSorter sorter) { - this.runSequentially = runSequentially; - this.touchStoneCombinationFilter = touchStoneCombinationFilter; - this.touchStoneResultCondition = touchStoneResultCondition; - this.sorter = sorter; - } - - public DefaultMatrixExecutionStrategyImpl() { - this(false,false,null,null,null); - } - - public boolean getHasTouchStoneCombinationFilter() { - return touchStoneCombinationFilter!=null; - } - - /** - * If true, {@link MatrixRun}s are run sequentially, instead of running in parallel. - * - * TODO: this should be subsumed by {@link ResourceController}. - */ - public boolean isRunSequentially() { - return runSequentially; - } - - public void setRunSequentially(boolean runSequentially) { - this.runSequentially = runSequentially; - } - - public String getTouchStoneCombinationFilter() { - return touchStoneCombinationFilter; - } - - public void setTouchStoneCombinationFilter(String touchStoneCombinationFilter) { - this.touchStoneCombinationFilter = touchStoneCombinationFilter; - } - - public Result getTouchStoneResultCondition() { - return touchStoneResultCondition; - } - - public void setTouchStoneResultCondition(Result touchStoneResultCondition) { - this.touchStoneResultCondition = touchStoneResultCondition; - } - - public MatrixConfigurationSorter getSorter() { - return sorter; - } - - public void setSorter(MatrixConfigurationSorter sorter) { - this.sorter = sorter; - } - - @Override - public Result run(MatrixBuildExecution execution) throws InterruptedException, IOException { - - Collection touchStoneConfigurations = new HashSet(); - Collection delayedConfigurations = new HashSet(); - - filterConfigurations( - execution, - touchStoneConfigurations, - delayedConfigurations - ); - - if (notifyStartBuild(execution.getAggregators())) return Result.FAILURE; - - if (sorter != null) { - touchStoneConfigurations = createTreeSet(touchStoneConfigurations, sorter); - delayedConfigurations = createTreeSet(delayedConfigurations, sorter); - } - - if(!runSequentially) - for(MatrixConfiguration c : touchStoneConfigurations) - scheduleConfigurationBuild(execution, c); - - Result r = Result.SUCCESS; - for (MatrixConfiguration c : touchStoneConfigurations) { - if(runSequentially) - scheduleConfigurationBuild(execution, c); - MatrixRun run = waitForCompletion(execution, c); - notifyEndBuild(run,execution.getAggregators()); - r = r.combine(getResult(run)); - } - - PrintStream logger = execution.getListener().getLogger(); - - if (touchStoneResultCondition != null && r.isWorseThan(touchStoneResultCondition)) { - logger.printf("Touchstone configurations resulted in %s, so aborting...%n", r); - return r; - } - - if(!runSequentially) - for(MatrixConfiguration c : delayedConfigurations) - scheduleConfigurationBuild(execution, c); - - for (MatrixConfiguration c : delayedConfigurations) { - if(runSequentially) - scheduleConfigurationBuild(execution, c); - MatrixRun run = waitForCompletion(execution, c); - notifyEndBuild(run,execution.getAggregators()); - logger.println(Messages.MatrixBuild_Completed(ModelHyperlinkNote.encodeTo(c), getResult(run))); - r = r.combine(getResult(run)); - } - - return r; - } - - private void filterConfigurations( - final MatrixBuildExecution execution, - final Collection touchStoneConfigurations, - final Collection delayedConfigurations - ) throws AbortException { - - final MatrixBuild build = execution.getBuild(); - - final FilterScript combinationFilter = FilterScript.parse(execution.getProject().getCombinationFilter(), FilterScript.ACCEPT_ALL); - final FilterScript touchStoneFilter = FilterScript.parse(getTouchStoneCombinationFilter(), FilterScript.REJECT_ALL); - - try { - - for (MatrixConfiguration c: execution.getActiveConfigurations()) { - - if (!MatrixBuildListener.buildConfiguration(build, c)) continue; // skip rebuild - - final Combination combination = c.getCombination(); - - if (touchStoneFilter != null && touchStoneFilter.apply(execution, combination)) { - touchStoneConfigurations.add(c); - } else if (combinationFilter.apply(execution, combination)) { - delayedConfigurations.add(c); - } - } - } catch (GroovyRuntimeException ex) { - - PrintStream logger = execution.getListener().getLogger(); - logger.println(ex.getMessage()); - ex.printStackTrace(logger); - throw new AbortException("Failed executing combination filter"); - } - } - - private Result getResult(@Nullable MatrixRun run) { - // null indicates that the run was cancelled before it even gets going - return run!=null ? run.getResult() : Result.ABORTED; - } - - private boolean notifyStartBuild(List aggregators) throws InterruptedException, IOException { - for (MatrixAggregator a : aggregators) - if(!a.startBuild()) - return true; - return false; - } - - private void notifyEndBuild(MatrixRun b, List aggregators) throws InterruptedException, IOException { - if (b==null) return; // can happen if the configuration run gets cancelled before it gets started. - for (MatrixAggregator a : aggregators) - if(!a.endRun(b)) - throw new AbortException(); - } - - private TreeSet createTreeSet(Collection items, Comparator sorter) { - TreeSet r = new TreeSet(sorter); - r.addAll(items); - return r; - } - - /** Function to start schedule a single configuration - * - * This function schedule a build of a configuration passing all of the Matrixchild actions - * that are present in the parent build. - * - * @param exec Matrix build that is the parent of the configuration - * @param c Configuration to schedule - */ - private void scheduleConfigurationBuild(MatrixBuildExecution exec, MatrixConfiguration c) { - MatrixBuild build = exec.getBuild(); - exec.getListener().getLogger().println(Messages.MatrixBuild_Triggering(ModelHyperlinkNote.encodeTo(c))); - - // filter the parent actions for those that can be passed to the individual jobs. - List childActions = build.getActions(MatrixChildAction.class); - c.scheduleBuild(childActions, new UpstreamCause((Run)build)); - } - - private MatrixRun waitForCompletion(MatrixBuildExecution exec, MatrixConfiguration c) throws InterruptedException, IOException { - BuildListener listener = exec.getListener(); - String whyInQueue = ""; - long startTime = System.currentTimeMillis(); - - // wait for the completion - int appearsCancelledCount = 0; - while(true) { - MatrixRun b = c.getBuildByNumber(exec.getBuild().getNumber()); - - // two ways to get beyond this. one is that the build starts and gets done, - // or the build gets cancelled before it even started. - if(b!=null && !b.isBuilding()) { - Result buildResult = b.getResult(); - if(buildResult!=null) - return b; - } - Queue.Item qi = c.getQueueItem(); - if(b==null && qi==null) - appearsCancelledCount++; - else - appearsCancelledCount = 0; - - if(appearsCancelledCount>=5) { - // there's conceivably a race condition in computating b and qi, as their computation - // are not synchronized. There are indeed several reports of Hudson incorrectly assuming - // builds being cancelled. See - // http://www.nabble.com/Master-slave-problem-tt14710987.html and also - // http://www.nabble.com/Anyone-using-AccuRev-plugin--tt21634577.html#a21671389 - // because of this, we really make sure that the build is cancelled by doing this 5 - // times over 5 seconds - listener.getLogger().println(Messages.MatrixBuild_AppearsCancelled(ModelHyperlinkNote.encodeTo(c))); - return null; - } - - if(qi!=null) { - // if the build seems to be stuck in the queue, display why - String why = qi.getWhy(); - if(why != null && !why.equals(whyInQueue) && System.currentTimeMillis()-startTime>5000) { - listener.getLogger().print("Configuration " + ModelHyperlinkNote.encodeTo(c)+" is still in the queue: "); - qi.getCauseOfBlockage().print(listener); //this is still shown on the same line - whyInQueue = why; - } - } - - Thread.sleep(1000); - } - } - - @Extension - public static class DescriptorImpl extends MatrixExecutionStrategyDescriptor { - @Override - public String getDisplayName() { - return "Classic"; - } - } -} diff --git a/core/src/main/java/hudson/matrix/FilterScript.java b/core/src/main/java/hudson/matrix/FilterScript.java deleted file mode 100644 index 875a06ddd7..0000000000 --- a/core/src/main/java/hudson/matrix/FilterScript.java +++ /dev/null @@ -1,136 +0,0 @@ -package hudson.matrix; - -import groovy.lang.Binding; -import groovy.lang.GroovyShell; -import groovy.lang.Script; -import hudson.Util; -import hudson.matrix.Combination.BooleanCategory; -import hudson.matrix.MatrixBuild.MatrixBuildExecution; -import hudson.model.ParameterValue; -import hudson.model.ParametersAction; - -import java.util.Map; - -import static java.lang.Boolean.*; - -/** - * Groovy filter script that accepts or rejects matrix {@link Combination}. - * - * Instances of this class is thread unsafe. - * - * @author Kohsuke Kawaguchi - */ -class FilterScript { - private final Script script; - - FilterScript(Script script) { - this.script = script; - } - - /** - * @param context - * Variables the script will see. - */ - boolean evaluate(Binding context) { - script.setBinding(context); - return TRUE.equals(script.run()); - } - - /** - * Obtains a number N such that "N%M==0" would create - * a reasonable sparse matrix for integer M. - * - *

- * This is bit like {@link Combination#toIndex(AxisList)}, but instead - * of creating a continuous number (which often maps different - * values of the same axis to the same index in modulo N residue ring, - * we use a prime number P as the base. I think this guarantees the uniform - * distribution in any N smaller than 2P (but proof, anyone?) - */ - private long toModuloIndex(AxisList axis, Combination c) { - long r = 0; - for (Axis a : axis) { - r += a.indexOf(c.get(a)); - r *= 31; - } - return r; - } - - /** - * Applies the filter to the specified combination in the context of {@code context}. - */ - public boolean apply(MatrixBuildExecution context, Combination combination) { - return apply(context.getProject().getAxes(), combination, getConfiguredBinding(context)); - } - - /*package*/ boolean apply(AxisList axes, Combination c, Binding binding) { - for (Map.Entry e : c.entrySet()) - binding.setVariable(e.getKey(),e.getValue()); - - binding.setVariable("index",toModuloIndex(axes,c)); - binding.setVariable("uniqueId", c.toIndex(axes)); - - return evaluate(binding); - } - - private Binding getConfiguredBinding(final MatrixBuildExecution execution) { - final Binding binding = new Binding(); - final ParametersAction parameters = execution.getBuild().getAction(ParametersAction.class); - - if (parameters == null) return binding; - - for (final ParameterValue pv: parameters) { - if (pv == null) continue; - final String name = pv.getName(); - final String value = pv.createVariableResolver(null).resolve(name); - binding.setVariable(name, value); - } - - return binding; - } - - public static FilterScript parse(String expression) { - return parse(expression, ACCEPT_ALL); - } - - /** - * @since 1.541 - */ - public static FilterScript parse(String expression, FilterScript defaultScript) { - if (Util.fixEmptyAndTrim(expression)==null) - return defaultScript; - - GroovyShell shell = new GroovyShell(); - - return new FilterScript(shell.parse("use("+BooleanCategory.class.getName().replace('$','.')+") {"+expression+"}")); - } - - private static final Script EMPTY = new Script() { - @Override - public Object run() { - return true; - } - }; - - /** - * Constant that always applies to any combination. - * @since 1.541 - */ - /*package*/ static final FilterScript ACCEPT_ALL = new FilterScript(EMPTY) { - @Override - public boolean apply(MatrixBuildExecution context, Combination combination) { - return true; - } - }; - - /** - * Constant that does not apply to any combination. - * @since 1.541 - */ - /*package*/ static final FilterScript REJECT_ALL = new FilterScript(EMPTY) { - @Override - public boolean apply(MatrixBuildExecution context, Combination combination) { - return false; - } - }; -} diff --git a/core/src/main/java/hudson/matrix/JDKAxis.java b/core/src/main/java/hudson/matrix/JDKAxis.java deleted file mode 100644 index fecd908dee..0000000000 --- a/core/src/main/java/hudson/matrix/JDKAxis.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * 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 jenkins.model.Jenkins; -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 Messages.JDKAxis_DisplayName(); - } - - /** - * If there's no JDK configured, there's no point in this axis. - */ - @Override - public boolean isInstantiable() { - return !Jenkins.getInstance().getJDKs().isEmpty(); - } - } -} diff --git a/core/src/main/java/hudson/matrix/LabelAxis.java b/core/src/main/java/hudson/matrix/LabelAxis.java deleted file mode 100644 index bd32df0037..0000000000 --- a/core/src/main/java/hudson/matrix/LabelAxis.java +++ /dev/null @@ -1,85 +0,0 @@ -/* - * 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.Functions; -import hudson.Util; -import jenkins.model.Jenkins; -import hudson.model.labels.LabelAtom; -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; - } - - @Override - public String getValueString() { - return Util.join(getValues(),"/"); - } - - @Extension - public static class DescriptorImpl extends AxisDescriptor { - @Override - public String getDisplayName() { - return Messages.LabelAxis_DisplayName(); - } - - /** - * If there's no distributed build set up, it's pointless to provide this axis. - */ - @Override - public boolean isInstantiable() { - Jenkins h = Jenkins.getInstance(); - return !h.getNodes().isEmpty() || !h.clouds.isEmpty(); - } - - private String jsstr(String body, Object... args) { - return '\"'+Functions.jsStringEscape(String.format(body,args))+'\"'; - } - - public String buildLabelCheckBox(LabelAtom la, LabelAxis instance) { - return jsstr("", - la.getName(),la.getDescription()); - // '${h.jsStringEscape('')}' - } - } -} diff --git a/core/src/main/java/hudson/matrix/LabelExpAxis.java b/core/src/main/java/hudson/matrix/LabelExpAxis.java deleted file mode 100644 index 281438d838..0000000000 --- a/core/src/main/java/hudson/matrix/LabelExpAxis.java +++ /dev/null @@ -1,97 +0,0 @@ -/* - * 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.Util; -import jenkins.model.Jenkins; - -import java.util.LinkedList; -import java.util.List; - -import org.kohsuke.stapler.DataBoundConstructor; - -/** - * {@link Axis} that selects label expressions. - * - * @since 1.403 - */ -public class LabelExpAxis extends Axis { - - @DataBoundConstructor - public LabelExpAxis(String name, String values) { - super(name, getExprValues(values)); - } - - public LabelExpAxis(String name, List values) { - super(name, values); - } - - @Override - public boolean isSystem() { - return true; - } - - @Override - public DescriptorImpl getDescriptor() { - return (DescriptorImpl) Jenkins.getInstance().getDescriptorOrDie(getClass()); - } - - public String getValuesString(){ - StringBuffer sb = new StringBuffer(); - for(String item: this.getValues()){ - sb.append(item); - sb.append("\n"); - } - return sb.toString(); - } - - @Extension - public static class DescriptorImpl extends AxisDescriptor { - @Override - public String getDisplayName() { - return Messages.LabelExpAxis_DisplayName(); - } - - /** - * If there's no distributed build set up, it's pointless to provide this axis. - */ - @Override - public boolean isInstantiable() { - Jenkins h = Jenkins.getInstance(); - return !h.getNodes().isEmpty() || !h.clouds.isEmpty(); - } - } - - public static List getExprValues(String valuesString){ - List expressions = new LinkedList(); - String[] exprs = valuesString.split("\n"); - for(String expr: exprs){ - expressions.add(Util.fixEmptyAndTrim(expr)); - } - return expressions; - } - -} - diff --git a/core/src/main/java/hudson/matrix/Layouter.java b/core/src/main/java/hudson/matrix/Layouter.java deleted file mode 100644 index 051b8f6239..0000000000 --- a/core/src/main/java/hudson/matrix/Layouter.java +++ /dev/null @@ -1,225 +0,0 @@ -/* - * The MIT License - * - * Copyright (c) 2004-2009, 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 - * 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 java.util.List; -import java.util.ArrayList; -import java.util.AbstractList; -import java.util.Map; -import java.util.HashMap; - -/** - * Used to assist thegeneration of config table. - * - *

- * {@link Axis Axes} are split into four groups. - * {@link #x Ones that are displayed as columns}, - * {@link #y Ones that are displayed as rows}, - * {@link #z Ones that are listed as bullet items inside table cell}, - * and those which only have one value, and therefore doesn't show up - * in the table. - * - *

- * Because of object reuse inside {@link Layouter}, this class is not thread-safe. - * - * @author Kohsuke Kawaguchi - */ -public abstract class Layouter { - public final List x,y,z; - /** - * Axes that only have one value. - */ - private final List trivial = new ArrayList(); - /** - * Number of data columns and rows. - */ - private int xSize, ySize, zSize; - - - public Layouter(List x, List y, List z) { - this.x = x; - this.y = y; - this.z = z; - init(); - } - - /** - * Automatically split axes to x,y, and z. - */ - public Layouter(AxisList axisList) { - x = new ArrayList(); - y = new ArrayList(); - z = new ArrayList(); - - List nonTrivialAxes = new ArrayList(); - for (Axis a : axisList) { - if(a.size()>1) - nonTrivialAxes.add(a); - else - trivial.add(a); - } - - switch(nonTrivialAxes.size()) { - case 0: - break; - case 1: - z.add(nonTrivialAxes.get(0)); - break; - case 2: - // 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 - for( int i=0; i=0; n-- ) - w *= x.get(n).size(); - return w; - } - - /** - * Computes the width of n-th Y-axis. - */ - public int height(int n) { - return calc(y,n); - } - - private int calc(List l, int n) { - int w = 1; - for( n++ ; n getRows() { - return new AbstractList() { - final Row row = new Row(); - public Row get(int index) { - row.index = index; - return row; - } - - public int size() { - return ySize; - } - }; - } - - /** - * Represents a row, which is a collection of {@link Column}s. - */ - public final class Row extends AbstractList { - private int index; - final Column col = new Column(); - - @Override - public Column get(int index) { - col.xp = index; - col.yp = Row.this.index; - return col; - } - - @Override - public int size() { - return xSize; - } - - public String drawYHeader(int n) { - int base = calc(y,n); - if(index/base==(index-1)/base && index!=0) return null; // no need to draw a new value - - Axis axis = y.get(n); - return axis.value((index/base)%axis.getValues().size()); - } - } - - protected abstract T getT(Combination c); - - public final class Column extends AbstractList { - /** - * Cell position. - */ - private int xp,yp; - - private final Map m = new HashMap(); - - public T get(int zp) { - m.clear(); - buildMap(xp,x); - buildMap(yp,y); - buildMap(zp,z); - for (Axis a : trivial) { - if (a.size() > 0) { - m.put(a.name, a.value(0)); - } - } - return getT(new Combination(m)); - } - - private void buildMap(int p, List axes) { - int n = p; - for( int i= axes.size()-1; i>=0; i-- ) { - Axis a = axes.get(i); - m.put(a.name, a.value(n%a.size())); - n /= a.size(); - } - } - - public int size() { - return zSize; - } - } -} diff --git a/core/src/main/java/hudson/matrix/LinkedLogRotator.java b/core/src/main/java/hudson/matrix/LinkedLogRotator.java deleted file mode 100644 index c46870318e..0000000000 --- a/core/src/main/java/hudson/matrix/LinkedLogRotator.java +++ /dev/null @@ -1,77 +0,0 @@ -/* - * The MIT License - * - * 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 - * 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.model.Job; -import hudson.tasks.LogRotator; - -import java.io.IOException; -import java.util.logging.Logger; - -/** - * {@link LogRotator} for {@link MatrixConfiguration}, - * which discards the builds if and only if it's discarded - * in the parent. - * - *

- * Because of the serialization compatibility, we can't easily - * refactor {@link LogRotator} into a contract and an implementation. - * - * @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, -1, -1); - } - - @Override - public void perform(Job _job) throws IOException, InterruptedException { - // 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) { - LOGGER.fine("Deleting "+r.getFullDisplayName()); - r.delete(); - } - } - - if(!job.isActiveConfiguration() && job.getLastBuild()==null) { - LOGGER.fine("Deleting "+job.getFullDisplayName()+" because the configuration is inactive and there's no builds"); - job.delete(); - } - } - - private static final Logger LOGGER = Logger.getLogger(LinkedLogRotator.class.getName()); -} diff --git a/core/src/main/java/hudson/matrix/MatrixAggregatable.java b/core/src/main/java/hudson/matrix/MatrixAggregatable.java deleted file mode 100644 index 5074988d83..0000000000 --- a/core/src/main/java/hudson/matrix/MatrixAggregatable.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * The MIT License - * - * Copyright (c) 2004-2009, 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 - * 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.model.JobProperty; -import hudson.tasks.BuildWrapper; -import hudson.tasks.Publisher; -import hudson.ExtensionPoint; -import hudson.Launcher; -import hudson.model.BuildListener; - -/** - * {@link Publisher}, {@link JobProperty}, {@link BuildWrapper} can optionally implement this interface - * to perform result aggregation across {@link MatrixRun}. - * - *

- * This is useful for example to aggregate all the test results - * in {@link MatrixRun} into a single table/graph. - * - * @author Kohsuke Kawaguchi - * @since 1.115 - */ -public interface MatrixAggregatable extends ExtensionPoint { - /** - * Creates a new instance of the aggregator. - * - *

- * This method is called during the build of - * {@link MatrixBuild} and the created aggregator - * will perform the aggregation. - * - * @param build - * The build for which the aggregation shall happen. Never null. - * @param launcher - * Can be used to launch processes during the build. - * @param listener - * Progress report and errors during the aggregation should - * be sent to this object. Never null. - * - * @return - * null if the implementation is not willing to contribute - * an aggregator. - * - * @see MatrixAggregator#build - * @see MatrixAggregator#listener - */ - MatrixAggregator createAggregator(MatrixBuild build, Launcher launcher, BuildListener listener); -} diff --git a/core/src/main/java/hudson/matrix/MatrixAggregator.java b/core/src/main/java/hudson/matrix/MatrixAggregator.java deleted file mode 100644 index dbdfcaffa7..0000000000 --- a/core/src/main/java/hudson/matrix/MatrixAggregator.java +++ /dev/null @@ -1,105 +0,0 @@ -/* - * The MIT License - * - * Copyright (c) 2004-2009, 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 - * 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.ExtensionPoint; -import hudson.Launcher; -import hudson.model.BuildListener; -import hudson.tasks.BuildStep; -import hudson.tasks.Publisher; - -import java.io.IOException; - -/** - * Performs the aggregation of {@link MatrixRun} results - * into {@link MatrixBuild}. - * - *

- * {@link MatrixAggregator} is a transitive stateful mutable object. - * Unlike {@link Publisher}, it is not persisted. Instead, a fresh - * instance is created for each {@link MatrixBuild}, and various - * methods on this class are invoked in the event callback style - * as the build progresses. - * - *

- * The end result of the aggregation should be - * {@link MatrixBuild#addAction(Action) contributed as actions}. - * - * @author Kohsuke Kawaguchi - * @since 1.115 - * @see MatrixAggregatable - */ -public abstract class MatrixAggregator implements ExtensionPoint { - /** - * The build in progress. Never null. - */ - protected final MatrixBuild build; - - protected final Launcher launcher; - /** - * The listener to send the output to. Never null. - */ - protected final BuildListener listener; - - protected MatrixAggregator(MatrixBuild build, Launcher launcher, BuildListener listener) { - this.build = build; - this.launcher = launcher; - this.listener = listener; - } - - /** - * Called before the build starts. - * - * @return - * true if the build can continue, false if there was an error - * and the build needs to be aborted. - * @see BuildStep#prebuild(AbstractBuild,BuildListener) - */ - public boolean startBuild() throws InterruptedException, IOException { - return true; - } - - /** - * Called whenever one run is completed. - * - * @param run - * The completed {@link MatrixRun} object. Always non-null. - * @return - * See {@link #startBuild()} for the return value semantics. - */ - public boolean endRun(MatrixRun run) throws InterruptedException, IOException { - return true; - } - - /** - * Called after all the {@link MatrixRun}s have been completed - * to indicate that the build is about to finish. - * - * @return - * See {@link #startBuild()} for the return value semantics. - */ - public boolean endBuild() throws InterruptedException, IOException { - return true; - } -} diff --git a/core/src/main/java/hudson/matrix/MatrixBuild.java b/core/src/main/java/hudson/matrix/MatrixBuild.java deleted file mode 100644 index 5675842311..0000000000 --- a/core/src/main/java/hudson/matrix/MatrixBuild.java +++ /dev/null @@ -1,406 +0,0 @@ -/* - * The MIT License - * - * Copyright (c) 2004-2011, Sun Microsystems, Inc., Kohsuke Kawaguchi, - * Red Hat, Inc., 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 - * 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.AbortException; -import hudson.Functions; -import hudson.Util; -import hudson.console.ModelHyperlinkNote; -import hudson.matrix.MatrixConfiguration.ParentBuildAction; -import hudson.model.AbstractBuild; -import hudson.model.AbstractProject; -import hudson.model.BuildListener; -import hudson.model.Executor; -import hudson.model.Fingerprint; -import hudson.model.Queue; -import hudson.model.Queue.Item; -import hudson.model.Result; -import hudson.util.HttpResponses; -import jenkins.model.Jenkins; -import org.kohsuke.stapler.Stapler; -import org.kohsuke.stapler.StaplerRequest; -import org.kohsuke.stapler.StaplerResponse; -import org.kohsuke.stapler.export.Exported; -import org.kohsuke.stapler.interceptor.RequirePOST; - -import java.io.File; -import java.io.IOException; -import java.io.PrintStream; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Collection; -import java.util.List; -import java.util.Set; - -import javax.servlet.ServletException; - -/** - * Build of {@link MatrixProject}. - * - * @author Kohsuke Kawaguchi - */ -public class MatrixBuild extends AbstractBuild { - private AxisList axes; - - /** - * If non-null, the {@link MatrixBuild} originates from the given build number. - */ - private Integer baseBuild; - - public MatrixBuild(MatrixProject job) throws IOException { - super(job); - } - - public MatrixBuild(MatrixProject job, Calendar timestamp) { - super(job, timestamp); - } - - public MatrixBuild(MatrixProject project, File buildDir) throws IOException { - super(project, buildDir); - } - - public Object readResolve() { - // MatrixBuild.axes added in 1.285; default to parent axes for old data - if (axes==null) - axes = getParent().getAxes(); - return this; - } - - /** - * Deletes the build and all matrix configurations in this build when the button is pressed. - */ - @RequirePOST - public void doDoDeleteAll( StaplerRequest req, StaplerResponse rsp ) throws IOException, ServletException { - checkPermission(DELETE); - - // We should not simply delete the build if it has been explicitly - // marked to be preserved, or if the build should not be deleted - // due to dependencies! - String why = getWhyKeepLog(); - if (why!=null) { - sendError(hudson.model.Messages.Run_UnableToDelete(toString(),why),req,rsp); - return; - } - - List runs = getExactRuns(); - for(MatrixRun run : runs){ - why = run.getWhyKeepLog(); - if (why!=null) { - sendError(hudson.model.Messages.Run_UnableToDelete(toString(),why),req,rsp); - return; - } - run.delete(); - } - delete(); - rsp.sendRedirect2(req.getContextPath()+'/' + getParent().getUrl()); - } - - - /** - * Used by view to render a ball for {@link MatrixRun}. - */ - public final class RunPtr { - public final Combination combination; - private RunPtr(Combination c) { this.combination=c; } - - public MatrixRun getRun() { - return MatrixBuild.this.getRun(combination); - } - - /** - * Return the URL to the run that this pointer references. - * - * In the typical case, this creates {@linkplain #getShortUrl() a very short relative url}. - * If the referenced run is a nearest previous build, this method returns a longer URL to that exact build. - * {@link MatrixRun} which belongs to a given build {@link MatrixBuild}. - * If there is no run which belongs to the build, return url of run, which belongs to the nearest previous build. - */ - public String getNearestRunUrl() { - MatrixRun r = getRun(); - if (r==null) return null; - if (getNumber()==r.getNumber()) - return getShortUrl()+'/'; - else - return Stapler.getCurrentRequest().getContextPath()+'/'+r.getUrl(); - } - - public String getShortUrl() { - return Util.rawEncode(combination.toString()); - } - - public String getTooltip() { - MatrixRun r = getRun(); - if(r!=null) return r.getIconColor().getDescription(); - Queue.Item item = Jenkins.getInstance().getQueue().getItem(getParent().getItem(combination)); - if(item!=null) - return item.getWhy(); - return null; // fall back - } - } - - public Layouter getLayouter() { - // axes can be null if build page is access right when build starts - return axes == null ? null : new Layouter(axes) { - protected RunPtr getT(Combination c) { - return new RunPtr(c); - } - }; - } - - /** - * Sets the base build from which this build is derived. - * @since 1.416 - */ - public void setBaseBuild(MatrixBuild baseBuild) { - this.baseBuild = (baseBuild==null || baseBuild==getPreviousBuild()) ? null : baseBuild.getNumber(); - } - - /** - * Returns the base {@link MatrixBuild} that this build originates from. - *

- * If this build is a partial build, unexecuted {@link MatrixRun}s are delegated to this build number. - */ - public MatrixBuild getBaseBuild() { - return baseBuild==null ? getPreviousBuild() : getParent().getBuildByNumber(baseBuild); - } - - /** - * Gets the {@link MatrixRun} in this build that corresponds - * to the given combination. - */ - public MatrixRun getRun(Combination c) { - MatrixConfiguration config = getParent().getItem(c); - if(config==null) return null; - return getRunForConfiguration(config); - } - - /** - * Like {@link #getRun(Combination)}, but do not approximate the result by earlier execution - * of the given combination (which is done for partial rebuild of the matrix.) - */ - public MatrixRun getExactRun(Combination c) { - MatrixConfiguration config = getParent().getItem(c); - if(config==null) return null; - return config.getBuildByNumber(getNumber()); - } - - /** - * Returns all {@link MatrixRun}s for this {@link MatrixBuild}. - */ - @Exported - public List getRuns() { - List r = new ArrayList(); - for(MatrixConfiguration c : getParent().getItems()) { - MatrixRun b = getRunForConfiguration(c); - if (b != null) r.add(b); - } - return r; - } - - private MatrixRun getRunForConfiguration(MatrixConfiguration c) { - for (MatrixBuild b=this; b!=null; b=b.getBaseBuild()) { - MatrixRun r = c.getBuildByNumber(b.getNumber()); - if (r!=null) return r; - } - return null; - } - - /** - * Returns all {@link MatrixRun}s for exactly this {@link MatrixBuild}. - *

- * Unlike {@link #getRuns()}, this method excludes those runs - * that didn't run and got inherited. - * @since 1.413 - */ - public List getExactRuns() { - List r = new ArrayList(); - for(MatrixConfiguration c : getParent().getItems()) { - MatrixRun b = c.getBuildByNumber(getNumber()); - if (b != null) r.add(b); - } - return r; - } - - @Override - public String getWhyKeepLog() { - MatrixBuild b = getNextBuild(); - if (isLinkedBy(b)) - return Messages.MatrixBuild_depends_on_this(b.getDisplayName()); - return super.getWhyKeepLog(); - } - - /** - * @return True if another {@link MatrixBuild} build (passed as a parameter) depends on this build. - * @since 1.481 - */ - public boolean isLinkedBy(MatrixBuild b) { - if(null == b) - return false; - for(MatrixConfiguration c : b.getParent().getActiveConfigurations()) { - MatrixRun r = c.getNearestOldBuild(b.getNumber()); - if (r != null && r.getNumber()==getNumber()) - return true; - } - return false; - } - - /** - * True if this build didn't do a full build and it is depending on the result of the previous build. - */ - public boolean isPartial() { - for(MatrixConfiguration c : getParent().getActiveConfigurations()) { - MatrixRun b = c.getNearestOldBuild(getNumber()); - if (b != null && b.getNumber()!=getNumber()) - return true; - } - return false; - } - - @Override - public Object getDynamic(String token, StaplerRequest req, StaplerResponse rsp) { - try { - MatrixRun item = getRun(Combination.fromString(token)); - if(item!=null) { - if (item.getNumber()==this.getNumber()) - return item; - else { - // redirect the user to the correct URL - String url = Functions.joinPath(item.getUrl(), req.getRestOfPath()); - String qs = req.getQueryString(); - if (qs!=null) url+='?'+qs; - throw HttpResponses.redirectViaContextPath(url); - } - } - } catch (IllegalArgumentException _) { - // failed to parse the token as Combination. Must be something else - } - return super.getDynamic(token,req,rsp); - } - - @Override - public void run() { - execute(new MatrixBuildExecution()); - } - - @Override - public Fingerprint.RangeSet getDownstreamRelationship(AbstractProject that) { - Fingerprint.RangeSet rs = super.getDownstreamRelationship(that); - for(MatrixRun run : getRuns()) - rs.add(run.getDownstreamRelationship(that)); - return rs; - } - - /** - * Object that lives from the start of {@link MatrixBuild} execution to its end. - * - * Used to keep track of things that are needed only during the build. - */ - public class MatrixBuildExecution extends AbstractBuildExecution { - private final List aggregators = new ArrayList(); - private Set activeConfigurations; - - /** - * Snapshot of {@link MatrixProject#getActiveConfigurations()} to ensure - * that the build will use a consistent view of it. - */ - public Set getActiveConfigurations() { - return activeConfigurations; - } - - /** - * Aggregators attached to this build execution, that are notified - * of every start/end of {@link MatrixRun}. - */ - public List getAggregators() { - return aggregators; - } - - protected Result doRun(BuildListener listener) throws Exception { - MatrixProject p = getProject(); - PrintStream logger = listener.getLogger(); - - // give axes a chance to rebuild themselves - activeConfigurations = p.rebuildConfigurations(this); - - // list up aggregators - listUpAggregators(p.getPublishers().values()); - listUpAggregators(p.getProperties().values()); - listUpAggregators(p.getBuildWrappers().values()); - - axes = p.getAxes(); - - try { - return p.getExecutionStrategy().run(this); - } catch( InterruptedException e ) { - logger.println("Aborted"); - Executor x = Executor.currentExecutor(); - x.recordCauseOfInterruption(MatrixBuild.this, listener); - return x.abortResult(); - } catch (AbortException e) { - logger.println(e.getMessage()); - return Result.FAILURE; - } finally { - // if the build was aborted in the middle. Cancel all the configuration builds. - Queue q = Jenkins.getInstance().getQueue(); - synchronized(q) {// avoid micro-locking in q.cancel. - final int n = getNumber(); - for (MatrixConfiguration c : activeConfigurations) { - for (Item i : q.getItems(c)) { - ParentBuildAction a = i.getAction(ParentBuildAction.class); - if (a!=null && a.parent==getBuild()) { - q.cancel(i); - logger.println(Messages.MatrixBuild_Cancelled(ModelHyperlinkNote.encodeTo(c))); - } - } - MatrixRun b = c.getBuildByNumber(n); - if(b!=null && b.isBuilding()) {// executor can spend some time in post production state, so only cancel in-progress builds. - Executor exe = b.getExecutor(); - if(exe!=null) { - logger.println(Messages.MatrixBuild_Interrupting(ModelHyperlinkNote.encodeTo(b))); - exe.interrupt(); - } - } - } - } - } - } - - private void listUpAggregators(Collection values) { - for (Object v : values) { - if (v instanceof MatrixAggregatable) { - MatrixAggregatable ma = (MatrixAggregatable) v; - MatrixAggregator a = ma.createAggregator(MatrixBuild.this, launcher, listener); - if(a!=null) - aggregators.add(a); - } - } - } - - public void post2(BuildListener listener) throws Exception { - for (MatrixAggregator a : aggregators) - a.endBuild(); - } - } -} diff --git a/core/src/main/java/hudson/matrix/MatrixChildAction.java b/core/src/main/java/hudson/matrix/MatrixChildAction.java deleted file mode 100644 index a43e59d932..0000000000 --- a/core/src/main/java/hudson/matrix/MatrixChildAction.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * The MIT License - * - * Copyright (c) 2012, Chris Johnson - * - * 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.model.Action; -import hudson.model.Queue; -import hudson.model.Queue.Task; - -/** - * Optional interface for {@link Action}s that are used as parameters - * to {@link Queue#schedule(Task, int, Action...)} to indicate that they - * want to be also passed to the {@link MatrixRun}s from its parent {@link MatrixBuild}. - * - * @author Chris Johnson - * @since 1.481 - */ -public interface MatrixChildAction extends Action { -} diff --git a/core/src/main/java/hudson/matrix/MatrixConfiguration.java b/core/src/main/java/hudson/matrix/MatrixConfiguration.java deleted file mode 100644 index f57fff9682..0000000000 --- a/core/src/main/java/hudson/matrix/MatrixConfiguration.java +++ /dev/null @@ -1,432 +0,0 @@ -/* - * The MIT License - * - * 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 - * 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.EnvVars; -import hudson.Util; -import hudson.model.Action; -import hudson.model.Executor; -import hudson.model.InvisibleAction; -import hudson.model.Node; -import hudson.model.Queue.QueueAction; -import hudson.model.TaskListener; -import hudson.util.AlternativeUiTextProvider; -import hudson.util.DescribableList; -import hudson.model.AbstractBuild; -import hudson.model.Cause; -import hudson.model.CauseAction; -import hudson.model.DependencyGraph; -import hudson.model.Descriptor; -import jenkins.model.BuildDiscarder; -import jenkins.model.Jenkins; -import hudson.model.Item; -import hudson.model.ItemGroup; -import hudson.model.JDK; -import hudson.model.Label; -import hudson.model.ParametersAction; -import hudson.model.Project; -import hudson.model.SCMedItem; -import hudson.model.Queue.NonBlockingTask; -import hudson.model.Cause.LegacyCodeCause; -import hudson.scm.SCM; -import jenkins.scm.SCMCheckoutStrategy; -import hudson.tasks.BuildWrapper; -import hudson.tasks.Builder; -import hudson.tasks.LogRotator; -import hudson.tasks.Publisher; - -import java.io.IOException; -import java.util.Collections; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -/** - * One configuration of {@link MatrixProject}. - * - * @author Kohsuke Kawaguchi - */ -public class MatrixConfiguration extends Project implements SCMedItem, NonBlockingTask { - /** - * The actual value combination. - */ - private transient /*final*/ Combination combination; - - /** - * Hash value of {@link #combination}. Cached for efficiency. - */ - private transient String digestName; - - public MatrixConfiguration(MatrixProject parent, Combination c) { - super(parent,c.toString()); - setCombination(c); - } - - @Override - public void onLoad(ItemGroup parent, String name) throws IOException { - // directory name is not a name for us --- it's taken from the combination name - super.onLoad(parent, combination.toString()); - } - - @Override - public EnvVars getEnvironment(Node node, TaskListener listener) throws IOException, InterruptedException { - EnvVars env = super.getEnvironment(node, listener); - - AxisList axes = getParent().getAxes(); - for (Map.Entry e : getCombination().entrySet()) { - Axis a = axes.find(e.getKey()); - if (a!=null) - a.addBuildVariable(e.getValue(),env); // TODO: hijacking addBuildVariable but perhaps we need addEnvVar? - else - env.put(e.getKey(), e.getValue()); - } - - return env; - } - - @Override - protected void updateTransientActions(){ - // This method is exactly the same as in {@link #AbstractProject}. - // Enabling to call this method from MatrixProject is the only reason for overriding. - super.updateTransientActions(); - } - - @Override - public boolean isConcurrentBuild() { - return getParent().isConcurrentBuild(); - } - - @Override - public void setConcurrentBuild(boolean b) throws IOException { - throw new UnsupportedOperationException("The setting can be only changed at MatrixProject"); - } - - /** - * Used during loading to set the combination back. - */ - /*package*/ void setCombination(Combination c) { - this.combination = c; - this.digestName = c.digest().substring(0,8); - } - - /** - * Build numbers are always synchronized with the parent. - * - *

- * Computing this is bit tricky. Several considerations: - * - *

    - *
  1. A new configuration build #N is started while the parent build #N is building, - * and when that happens we want to return N. - *
  2. But the configuration build #N is done before the parent build #N finishes, - * and when that happens we want to return N+1 because that's going to be the next one. - *
  3. Configuration builds might skip some numbers if the parent build is aborted - * before this configuration is built. - *
  4. If nothing is building right now and the last build of the parent is #N, - * then we want to return N+1. - *
- */ - @Override - public int getNextBuildNumber() { - AbstractBuild lb = getParent().getLastBuild(); - - while (lb!=null && lb.isBuilding()) { - lb = lb.getPreviousBuild(); - } - if(lb==null) return 0; - - int n=lb.getNumber()+1; - - lb = getLastBuild(); - if(lb!=null) - n = Math.max(n,lb.getNumber()+1); - - return n; - } - - @Override - public int assignBuildNumber() throws IOException { - int nb = getNextBuildNumber(); - MatrixRun r = getLastBuild(); - if(r!=null && r.getNumber()>=nb) // make sure we don't schedule the same build twice - throw new IllegalStateException("Build #"+nb+" is already completed"); - return nb; - } - - @Override - public String getDisplayName() { - return combination.toCompactString(getParent().getAxes()); - } - - @Override - public MatrixProject getParent() { - return (MatrixProject)super.getParent(); - } - - /** - * Get the actual combination of the axes values for this {@link MatrixConfiguration} - */ - public Combination getCombination() { - return combination; - } - - /** - * Since {@link MatrixConfiguration} is always invoked from {@link MatrixRun} - * once and just once, there's no point in having a quiet period. - */ - @Override - public int getQuietPeriod() { - return 0; - } - - /** - * Inherit the value from the parent. - */ - @Override - public int getScmCheckoutRetryCount() { - return getParent().getScmCheckoutRetryCount(); - } - - /** - * Inherit the value from the parent. - */ - @Override - public SCMCheckoutStrategy getScmCheckoutStrategy() { - return getParent().getScmCheckoutStrategy(); - } - - @Override - public boolean isConfigurable() { - return false; - } - - @Override - protected Class getBuildClass() { - return MatrixRun.class; - } - - @Override - protected MatrixRun newBuild() throws IOException { - List actions = Executor.currentExecutor().getCurrentWorkUnit().context.actions; - MatrixBuild lb = getParent().getLastBuild(); - for (Action a : actions) { - if (a instanceof ParentBuildAction) { - MatrixBuild _lb = ((ParentBuildAction) a).parent; - if (_lb != null) { - lb = _lb; - } - } - } - - if (lb == null) { - throw new IOException("cannot start a build of " + getFullName() + " since its parent has no builds at all"); - } - - // for every MatrixRun there should be a parent MatrixBuild - MatrixRun lastBuild = new MatrixRun(this, lb.getTimestamp()); - - lastBuild.number = lb.getNumber(); - - builds.put(lastBuild); - return lastBuild; - } - - @Override - protected void buildDependencyGraph(DependencyGraph graph) { - } - - @Override - public MatrixConfiguration asProject() { - return this; - } - - @Override - public Label getAssignedLabel() { - // combine all the label axes by &&. - String expr; - String exprSlave = Util.join(combination.values(getParent().getAxes().subList(LabelAxis.class)), "&&"); - String exprLabel = Util.join(combination.values(getParent().getAxes().subList(LabelExpAxis.class)), "&&"); - if(!exprSlave.equals("") && !exprLabel.equals("")){ - expr = exprSlave + "&&" + exprLabel; - } else{ - expr = (exprSlave.equals("")) ? exprLabel : exprSlave; - } - return Jenkins.getInstance().getLabel(Util.fixEmpty(expr)); - } - - @Override - public String getPronoun() { - return AlternativeUiTextProvider.get(PRONOUN, this, Messages.MatrixConfiguration_Pronoun()); - } - - @Override - public JDK getJDK() { - return Jenkins.getInstance().getJDK(combination.get("jdk")); - } - -// -// inherit build setting from the parent project -// - @Override - public List getBuilders() { - return getParent().getBuilders(); - } - - @Override - public Map, Publisher> getPublishers() { - return getParent().getPublishers(); - } - - @Override - public DescribableList> getBuildersList() { - return getParent().getBuildersList(); - } - - @Override - public DescribableList> getPublishersList() { - return getParent().getPublishersList(); - } - - @Override - public Map, BuildWrapper> getBuildWrappers() { - return getParent().getBuildWrappers(); - } - - @Override - public DescribableList> getBuildWrappersList() { - return getParent().getBuildWrappersList(); - } - - @Override - public Publisher getPublisher(Descriptor descriptor) { - return getParent().getPublisher(descriptor); - } - - @Override - public BuildDiscarder getBuildDiscarder() { - // TODO: LinkedLogRotator doesn't work very well in the face of pluggable BuildDiscarder but I don't know what to do - BuildDiscarder bd = getParent().getBuildDiscarder(); - if (bd instanceof LogRotator) { - LogRotator lr = (LogRotator) bd; - return new LinkedLogRotator(lr.getArtifactDaysToKeep(),lr.getArtifactNumToKeep()); - } - return new LinkedLogRotator(); - } - - @Override - public SCM getScm() { - return getParent().getScm(); - } - - /*package*/ String getDigestName() { - return digestName; - } - - /** - * JDK cannot be set on {@link MatrixConfiguration} because - * it's controlled by {@link MatrixProject}. - * @deprecated - * Not supported. - */ - @Override - public void setJDK(JDK jdk) throws IOException { - throw new UnsupportedOperationException(); - } - - /** - * @deprecated - * Value is controlled by {@link MatrixProject}. - */ - @Override - public void setBuildDiscarder(BuildDiscarder logRotator) { - throw new UnsupportedOperationException(); - } - - /** - * Returns true if this configuration is a configuration - * currently in use today (as opposed to the ones that are - * there only to keep the past record.) - * - * @see MatrixProject#getActiveConfigurations() - */ - public boolean isActiveConfiguration() { - return getParent().getActiveConfigurations().contains(this); - } - - /** - * On Cygwin, path names cannot be longer than 256 chars. - * See http://cygwin.com/ml/cygwin/2005-04/msg00395.html and - * http://www.nabble.com/Windows-Filename-too-long-errors-t3161089.html for - * the background of this issue. Setting this flag to true would - * cause Jenkins to use cryptic but short path name, giving more room for - * jobs to use longer path names. - */ - public static boolean useShortWorkspaceName = Boolean.getBoolean(MatrixConfiguration.class.getName()+".useShortWorkspaceName"); - - /** - * @deprecated - * Use {@link #scheduleBuild(ParametersAction, Cause)}. Since 1.283 - */ - public boolean scheduleBuild(ParametersAction parameters) { - return scheduleBuild(parameters, new LegacyCodeCause()); - } - - /** Starts the build with the ParametersAction that are passed in. - * - * @param parameters - * Can be null. - * @deprecated - * Use {@link #scheduleBuild(List, Cause)}. Since 1.480 - */ - public boolean scheduleBuild(ParametersAction parameters, Cause c) { - return scheduleBuild(Collections.singletonList(parameters), c); - } - /** - * Starts the build with the actions that are passed in. - * - * @param actions Can be null. - * @param c Reason for starting the build - */ - public boolean scheduleBuild(List actions, Cause c) { - List allActions = new ArrayList(); - - if(actions != null) - allActions.addAll(actions); - - allActions.add(new ParentBuildAction()); - allActions.add(new CauseAction(c)); - - return Jenkins.getInstance().getQueue().schedule2(this, getQuietPeriod(), allActions ).isAccepted(); - } - - /** - * - */ - public static class ParentBuildAction extends InvisibleAction implements QueueAction { - public transient MatrixBuild parent = (MatrixBuild)Executor.currentExecutor().getCurrentExecutable(); - public boolean shouldSchedule(List actions) { - return true; - } - } -} diff --git a/core/src/main/java/hudson/matrix/MatrixConfigurationSorter.java b/core/src/main/java/hudson/matrix/MatrixConfigurationSorter.java deleted file mode 100644 index 5066b711e6..0000000000 --- a/core/src/main/java/hudson/matrix/MatrixConfigurationSorter.java +++ /dev/null @@ -1,36 +0,0 @@ -package hudson.matrix; - -import hudson.ExtensionPoint; -import hudson.model.AbstractDescribableImpl; -import hudson.util.FormValidation; - -import java.util.Comparator; - -/** - * Add sorting for configurations {@link MatrixConfiguration}s of matrix job {@link MatrixProject} - * - * @since 1.439 - * @author Lucie Votypkova - * @see MatrixConfigurationSorterDescriptor - */ -public abstract class MatrixConfigurationSorter extends AbstractDescribableImpl implements ExtensionPoint, Comparator { - - /** - * Checks if this sorter is properly configured and applicable for the given project. - * - *

- * This method is invoked when the configuration is submitted to ensure that the sorter is compatible - * with the current project configuration (most probably with its {@link Axis}.) - * - * @param p - * Project for which this sorter is being used for. - * @throws FormValidation - * If you need to report an error to the user and reject the form submission. - */ - public abstract void validate(MatrixProject p) throws FormValidation; - - @Override - public MatrixConfigurationSorterDescriptor getDescriptor() { - return (MatrixConfigurationSorterDescriptor)super.getDescriptor(); - } -} diff --git a/core/src/main/java/hudson/matrix/MatrixConfigurationSorterDescriptor.java b/core/src/main/java/hudson/matrix/MatrixConfigurationSorterDescriptor.java deleted file mode 100644 index e4c4726222..0000000000 --- a/core/src/main/java/hudson/matrix/MatrixConfigurationSorterDescriptor.java +++ /dev/null @@ -1,27 +0,0 @@ -package hudson.matrix; - -import hudson.DescriptorExtensionList; -import hudson.model.Descriptor; -import jenkins.model.Jenkins; - -/** - * Descriptor for {@link MatrixConfigurationSorter}. - * - * @author Kohsuke Kawaguchi - * @since 1.439 - */ -public abstract class MatrixConfigurationSorterDescriptor extends Descriptor { - protected MatrixConfigurationSorterDescriptor(Class clazz) { - super(clazz); - } - - protected MatrixConfigurationSorterDescriptor() { - } - - /** - * Returns all the registered {@link MatrixConfigurationSorterDescriptor}s. - */ - public static DescriptorExtensionList all() { - return Jenkins.getInstance().getDescriptorList(MatrixConfigurationSorter.class); - } -} diff --git a/core/src/main/java/hudson/matrix/MatrixExecutionStrategy.java b/core/src/main/java/hudson/matrix/MatrixExecutionStrategy.java deleted file mode 100644 index 33948422d7..0000000000 --- a/core/src/main/java/hudson/matrix/MatrixExecutionStrategy.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * The MIT License - * - * Copyright (c) 2012, CloudBees, 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.ExtensionPoint; -import hudson.matrix.MatrixBuild.MatrixBuildExecution; -import hudson.model.AbstractDescribableImpl; -import hudson.model.BuildListener; -import hudson.model.Result; - -import java.io.IOException; -import java.util.List; - -/** - * Controls the execution sequence of {@link MatrixConfiguration} when {@link MatrixProject} builds, - * including what degree it gets serialized/parallelled, how the whole build is abandoned when - * some fails, etc. - * - * @author Kohsuke Kawaguchi - * @since 1.456 - */ -public abstract class MatrixExecutionStrategy extends AbstractDescribableImpl implements ExtensionPoint { - public Result run(MatrixBuildExecution execution) throws InterruptedException, IOException { - return run(execution.getBuild(), execution.getAggregators(), execution.getListener()); - } - - /** - * @deprecated - * Override {@link #run(MatrixBuild.MatrixBuildExecution)} - */ - public Result run(MatrixBuild build, List aggregators, BuildListener listener) throws InterruptedException, IOException { - throw new UnsupportedOperationException(getClass()+" needs to override run(MatrixBuildExecution)"); - } - - @Override - public MatrixExecutionStrategyDescriptor getDescriptor() { - return (MatrixExecutionStrategyDescriptor)super.getDescriptor(); - } -} diff --git a/core/src/main/java/hudson/matrix/MatrixExecutionStrategyDescriptor.java b/core/src/main/java/hudson/matrix/MatrixExecutionStrategyDescriptor.java deleted file mode 100644 index b554e5df96..0000000000 --- a/core/src/main/java/hudson/matrix/MatrixExecutionStrategyDescriptor.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * The MIT License - * - * Copyright (c) 2012, CloudBees, 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.DescriptorExtensionList; -import hudson.model.Descriptor; -import jenkins.model.Jenkins; - -/** - * @author Kohsuke Kawaguchi - * @since 1.456 - */ -public abstract class MatrixExecutionStrategyDescriptor extends Descriptor { - protected MatrixExecutionStrategyDescriptor(Class clazz) { - super(clazz); - } - - protected MatrixExecutionStrategyDescriptor() { - } - - /** - * Returns all the registered {@link MatrixExecutionStrategyDescriptor}s. - */ - public static DescriptorExtensionList all() { - return Jenkins.getInstance().getDescriptorList(MatrixExecutionStrategy.class); - } -} diff --git a/core/src/main/java/hudson/matrix/MatrixProject.java b/core/src/main/java/hudson/matrix/MatrixProject.java deleted file mode 100644 index 6390db6839..0000000000 --- a/core/src/main/java/hudson/matrix/MatrixProject.java +++ /dev/null @@ -1,951 +0,0 @@ -/* - * The MIT License - * - * Copyright (c) 2004-2011, Sun Microsystems, Inc., Kohsuke Kawaguchi, - * Jorg Heymans, Red Hat, Inc., 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 - * 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 com.google.common.base.Function; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; -import hudson.CopyOnWrite; -import hudson.Extension; -import hudson.Util; -import hudson.XmlFile; -import hudson.matrix.MatrixBuild.MatrixBuildExecution; -import hudson.model.AbstractProject; -import hudson.model.Action; -import hudson.model.BuildableItemWithBuildWrappers; -import hudson.model.DependencyGraph; -import hudson.model.Descriptor; -import hudson.model.Descriptor.FormException; -import hudson.model.Node; -import hudson.slaves.WorkspaceList; -import hudson.util.AlternativeUiTextProvider; -import jenkins.model.Jenkins; -import hudson.model.Item; -import hudson.model.ItemGroup; -import hudson.model.Items; -import hudson.model.JDK; -import hudson.model.Job; -import hudson.model.Label; -import hudson.model.ParameterDefinition; -import hudson.model.ParametersDefinitionProperty; -import hudson.model.Queue.FlyweightTask; -import hudson.model.Result; -import hudson.model.SCMedItem; -import hudson.model.Saveable; -import hudson.model.TopLevelItem; -import hudson.tasks.BuildStep; -import hudson.tasks.BuildWrapper; -import hudson.tasks.BuildWrappers; -import hudson.tasks.Builder; -import hudson.tasks.Publisher; -import hudson.triggers.Trigger; -import hudson.util.CopyOnWriteMap; -import hudson.util.DescribableList; -import hudson.util.FormValidation; -import hudson.util.FormValidation.Kind; -import jenkins.scm.SCMCheckoutStrategyDescriptor; -import net.sf.json.JSONObject; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.NoExternalUse; -import org.kohsuke.stapler.HttpResponse; -import org.kohsuke.stapler.StaplerRequest; -import org.kohsuke.stapler.StaplerResponse; -import org.kohsuke.stapler.TokenList; -import org.kohsuke.stapler.export.Exported; - -import javax.annotation.Nullable; -import javax.servlet.ServletException; -import java.io.File; -import java.io.FileFilter; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; -import java.util.logging.Level; -import java.util.logging.Logger; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -/** - * {@link Job} that allows you to run multiple different configurations - * from a single setting. - * - * @author Kohsuke Kawaguchi - */ -public class MatrixProject extends AbstractProject implements TopLevelItem, SCMedItem, ItemGroup, Saveable, FlyweightTask, BuildableItemWithBuildWrappers { - /** - * Configuration axes. - */ - private volatile AxisList axes = new AxisList(); - - /** - * The filter that is applied to combinations. It is a Groovy if condition. - * This can be null, which means "true". - * - * @see #getCombinationFilter() - */ - private volatile String combinationFilter; - - /** - * List of active {@link Builder}s configured for this project. - */ - private DescribableList> builders = - new DescribableList>(this); - - /** - * List of active {@link Publisher}s configured for this project. - */ - private DescribableList> publishers = - new DescribableList>(this); - - /** - * List of active {@link BuildWrapper}s configured for this project. - */ - private DescribableList> buildWrappers = - new DescribableList>(this); - - /** - * All {@link MatrixConfiguration}s, keyed by their {@link MatrixConfiguration#getName() names}. - */ - private transient /*final*/ Map configurations = new CopyOnWriteMap.Tree(); - - /** - * @see #getActiveConfigurations() - */ - @CopyOnWrite - private transient /*final*/ Set activeConfigurations = new LinkedHashSet(); - - /** - * @deprecated as of 1.456 - * Moved to {@link DefaultMatrixExecutionStrategyImpl} - */ - private transient Boolean runSequentially; - - /** - * Filter to select a number of combinations to build first - * @deprecated as of 1.456 - * Moved to {@link DefaultMatrixExecutionStrategyImpl} - */ - private transient String touchStoneCombinationFilter; - - /** - * Required result on the touchstone combinations, in order to - * continue with the rest - * @deprecated as of 1.456 - * Moved to {@link DefaultMatrixExecutionStrategyImpl} - */ - private transient Result touchStoneResultCondition; - - /** - * @deprecated as of 1.456 - * Moved to {@link DefaultMatrixExecutionStrategyImpl} - */ - private transient MatrixConfigurationSorter sorter; - - private MatrixExecutionStrategy executionStrategy; - - /** - * Custom workspace location for {@link MatrixConfiguration}s. - * - *

- * (Historically, we used {@link AbstractProject#customWorkspace} + some unique suffix (see {@link MatrixConfiguration#useShortWorkspaceName}) - * for custom workspace, but we now separated that so that the user has more control. - * - *

- * If null, the historical semantics is assumed. - * - * @since 1.466 - */ - private String childCustomWorkspace; - - public MatrixProject(String name) { - this(Jenkins.getInstance(), name); - } - - public MatrixProject(ItemGroup parent, String name) { - super(parent, name); - } - - @Override - public String getPronoun() { - return AlternativeUiTextProvider.get(PRONOUN, this, Messages.MatrixProject_Pronoun()); - } - - /** - * Gets the workspace location that {@link MatrixConfiguration} uses. - * - * @see MatrixRun.MatrixRunExecution#decideWorkspace(Node, WorkspaceList) - * - * @return never null - * even when {@link MatrixProject} uses no custom workspace, this method still - * returns something like "${PARENT_WORKSPACE}/${COMBINATION}" that controls - * how the workspace should be laid out. - * - * The return value can be absolute or relative. If relative, it is resolved - * against the working directory of the overarching {@link MatrixBuild}. - */ - public String getChildCustomWorkspace() { - String ws = childCustomWorkspace; - if (ws==null) { - ws = MatrixConfiguration.useShortWorkspaceName?"${SHORT_COMBINATION}":"${COMBINATION}"; - } - return ws; - } - - /** - * Do we have an explicit child custom workspace setting (true)? Or just using the default value (false)? - */ - public boolean hasChildCustomWorkspace() { - return childCustomWorkspace!=null; - } - - public void setChildCustomWorkspace(String childCustomWorkspace) throws IOException { - this.childCustomWorkspace = Util.fixEmptyAndTrim(childCustomWorkspace); - save(); - } - - /** - * {@link MatrixProject} is relevant with all the labels its configurations are relevant. - */ - @Override - public Set

- * By default, a {@link MatrixConfiguration} is created for every possible combination of axes exhaustively. - * But by specifying a Groovy expression as a combination filter, one can trim down the # of combinations built. - * - *

- * Namely, this expression is evaluated for each axis value combination, and only when it evaluates to true, - * a corresponding {@link MatrixConfiguration} will be created and built. - * - * @return can be null. - * @since 1.279 - */ - public String getCombinationFilter() { - return combinationFilter; - } - - /** - * @return can be null (to indicate that the configurations should be left to their natural order.) - * @deprecated as of 1.456 - * Use {@link DefaultMatrixExecutionStrategyImpl#getTouchStoneCombinationFilter()}. - * This method tries to emulate the previous behavior the best it can, but will return null - * if the current {@link MatrixExecutionStrategy} is not the default one. - */ - public String getTouchStoneCombinationFilter() { - MatrixExecutionStrategy e = executionStrategy; - if (e instanceof DefaultMatrixExecutionStrategyImpl) { - DefaultMatrixExecutionStrategyImpl dm = (DefaultMatrixExecutionStrategyImpl) e; - return dm.getTouchStoneCombinationFilter(); - } - return null; - } - - /** - * @deprecated as of 1.456 - * Use {@link DefaultMatrixExecutionStrategyImpl#setTouchStoneCombinationFilter(String)}. - * This method tries to emulate the previous behavior the best it can, but will fall back - * to no-op if the current {@link MatrixExecutionStrategy} is not the default one. - */ - public void setTouchStoneCombinationFilter(String touchStoneCombinationFilter) throws IOException { - MatrixExecutionStrategy e = executionStrategy; - if (e instanceof DefaultMatrixExecutionStrategyImpl) { - DefaultMatrixExecutionStrategyImpl dm = (DefaultMatrixExecutionStrategyImpl) e; - dm.setTouchStoneCombinationFilter(touchStoneCombinationFilter); - save(); - } - } - - /** - * @return can be null (to indicate that the configurations should be left to their natural order.) - * @deprecated as of 1.456 - * Use {@link DefaultMatrixExecutionStrategyImpl#getTouchStoneResultCondition()}. - * This method tries to emulate the previous behavior the best it can, but will return null - * if the current {@link MatrixExecutionStrategy} is not the default one. - */ - public Result getTouchStoneResultCondition() { - MatrixExecutionStrategy e = executionStrategy; - if (e instanceof DefaultMatrixExecutionStrategyImpl) { - DefaultMatrixExecutionStrategyImpl dm = (DefaultMatrixExecutionStrategyImpl) e; - return dm.getTouchStoneResultCondition(); - } - return null; - } - - /** - * @deprecated as of 1.456 - * Use {@link DefaultMatrixExecutionStrategyImpl#setTouchStoneResultCondition(Result)}. - * This method tries to emulate the previous behavior the best it can, but will fall back - * to no-op if the current {@link MatrixExecutionStrategy} is not the default one. - */ - public void setTouchStoneResultCondition(Result touchStoneResultCondition) throws IOException { - MatrixExecutionStrategy e = executionStrategy; - if (e instanceof DefaultMatrixExecutionStrategyImpl) { - DefaultMatrixExecutionStrategyImpl dm = (DefaultMatrixExecutionStrategyImpl) e; - dm.setTouchStoneResultCondition(touchStoneResultCondition); - save(); - } - } - - @Override - protected List createTransientActions() { - List r = super.createTransientActions(); - - for (BuildStep step : builders) - r.addAll(step.getProjectActions(this)); - for (BuildStep step : publishers) - r.addAll(step.getProjectActions(this)); - for (BuildWrapper step : buildWrappers) - r.addAll(step.getProjectActions(this)); - for (Trigger trigger : triggers()) - r.addAll(trigger.getProjectActions()); - - return r; - } - - @Override - protected void updateTransientActions(){ - super.updateTransientActions(); - if(getActiveConfigurations() !=null){ - // update all transient actions in configurations too. - for(MatrixConfiguration configuration: getActiveConfigurations()){ - configuration.updateTransientActions(); - } - } - } - - /** - * 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(); - for (Axis a : axes) - if(!a.isSystem()) - r.add(a); - return r; - } - - public Layouter getLayouter() { - return new Layouter(axes) { - protected MatrixConfiguration getT(Combination c) { - return getItem(c); - } - }; - } - - @Override - public void onCreatedFromScratch() { - executionStrategy = new DefaultMatrixExecutionStrategyImpl(); - super.onCreatedFromScratch(); - } - - @Override - public void onLoad(ItemGroup parent, String name) throws IOException { - super.onLoad(parent,name); - builders.setOwner(this); - publishers.setOwner(this); - buildWrappers.setOwner(this); - - if (executionStrategy ==null) - executionStrategy = new DefaultMatrixExecutionStrategyImpl(runSequentially != null ? runSequentially : false, touchStoneCombinationFilter, touchStoneResultCondition, sorter); - - rebuildConfigurations(null); - } - - @Override - public void logRotate() throws IOException, InterruptedException { - super.logRotate(); - // perform the log rotation of inactive configurations to make sure - // their logs get eventually discarded - for (MatrixConfiguration config : configurations.values()) { - if(!config.isActiveConfiguration()) - config.logRotate(); - } - } - - /** - * Recursively search for configuration and put them to the map - * - *

- * The directory structure would be axis-a/b/axis-c/d/axis-e/f for - * combination [a=b,c=d,e=f]. Note that two combinations [a=b,c=d] and [a=b,c=d,e=f] - * can both co-exist (where one is an archived record and the other is live, for example) - * so search needs to be thorough. - * - * @param dir - * Directory to be searched. - * @param result - * Receives the loaded {@link MatrixConfiguration}s. - * @param combination - * Combination of key/values discovered so far while traversing the directories. - * Read-only. - */ - private void loadConfigurations( File dir, CopyOnWriteMap.Tree result, Map combination ) { - File[] axisDirs = dir.listFiles(new FileFilter() { - public boolean accept(File child) { - return child.isDirectory() && child.getName().startsWith("axis-"); - } - }); - if(axisDirs==null) return; - - for (File subdir : axisDirs) { - String axis = subdir.getName().substring(5); // axis name - - File[] valuesDir = subdir.listFiles(new FileFilter() { - public boolean accept(File child) { - return child.isDirectory(); - } - }); - if(valuesDir==null) continue; // no values here - - for (File v : valuesDir) { - Map c = new HashMap(combination); - c.put(axis,TokenList.decode(v.getName())); - - try { - XmlFile config = Items.getConfigFile(v); - if(config.exists()) { - Combination comb = new Combination(c); - // if we already have this in memory, just use it. - // otherwise load it - MatrixConfiguration item=null; - if(this.configurations!=null) - item = this.configurations.get(comb); - if(item==null) { - item = (MatrixConfiguration) config.read(); - item.setCombination(comb); - item.onLoad(this, v.getName()); - } - result.put(item.getCombination(), item); - } - } catch (IOException e) { - LOGGER.log(Level.WARNING, "Failed to load matrix configuration "+v,e); - } - loadConfigurations(v,result,c); - } - } - } - - /** - * Rebuilds the {@link #configurations} list and {@link #activeConfigurations}. - * - * @param context - * We rebuild configurations right before a build, to allow configurations to be adjusted for the build. - * (think of it as reconfiguring a project right before a build.) And when that happens, this value is the - * build in progress. Otherwise this value is null (for example, when Jenkins is booting up.) - */ - /*package*/ Set rebuildConfigurations(MatrixBuildExecution context) throws IOException { - { - // backward compatibility check to see if there's any data in the old structure - // if so, bring them to the newer structure. - File[] oldDirs = getConfigurationsDir().listFiles(new FileFilter() { - public boolean accept(File child) { - return child.isDirectory() && !child.getName().startsWith("axis-"); - } - }); - if(oldDirs!=null) { - // rename the old directory to the new one - for (File dir : oldDirs) { - try { - Combination c = Combination.fromString(dir.getName()); - dir.renameTo(getRootDirFor(c)); - } catch (IllegalArgumentException e) { - // it's not a configuration dir. Just ignore. - } - } - } - } - - CopyOnWriteMap.Tree configurations = - new CopyOnWriteMap.Tree(); - loadConfigurations(getConfigurationsDir(),configurations,Collections.emptyMap()); - this.configurations = configurations; - - Iterable activeCombinations; - if (context!=null) { - List> axesList = Lists.newArrayList(); - for (Axis axis : axes) - axesList.add(Sets.newLinkedHashSet(axis.rebuild(context))); - - activeCombinations = Iterables.transform(Sets.cartesianProduct(axesList), new Function, Combination>() { - public Combination apply(@Nullable List strings) { - assert strings != null; - return new Combination(axes, (String[]) strings.toArray(new String[0])); - } - }); - } else { - activeCombinations = axes.list(); - } - - // find all active configurations - final Set active = new LinkedHashSet(); - final boolean isDynamicFilter = isDynamicFilter(getCombinationFilter()); - - for (Combination c : activeCombinations) { - if(isDynamicFilter || c.evalGroovyExpression(axes,getCombinationFilter())) { - LOGGER.fine("Adding configuration: " + c); - MatrixConfiguration config = configurations.get(c); - if(config==null) { - config = new MatrixConfiguration(this,c); - config.onCreatedFromScratch(); - config.save(); - configurations.put(config.getCombination(), config); - } - active.add(config); - } - } - this.activeConfigurations = active; - - return active; - } - - private boolean isDynamicFilter(final String filter) { - - if (!isParameterized() || filter == null) return false; - - final ParametersDefinitionProperty paramDefProp = getProperty(ParametersDefinitionProperty.class); - - for (final ParameterDefinition definition : paramDefProp.getParameterDefinitions()) { - - final String name = definition.getName(); - - final Matcher matcher = Pattern - .compile("\\b" + name + "\\b") - .matcher(filter) - ; - - if (matcher.find()) return true; - } - - return false; - } - - private File getConfigurationsDir() { - return new File(getRootDir(),"configurations"); - } - - /** - * Gets all active configurations. - * - *

- * In contract, inactive configurations are those that are left for archival purpose - * and no longer built when a new {@link MatrixBuild} is executed. - * - *

- * During a build, {@link MatrixBuildExecution#getActiveConfigurations()} should be used - * to make sure that a build is using the consistent set of active configurations from - * the start to the end. - */ - @Exported - public Collection getActiveConfigurations() { - return activeConfigurations; - } - - public Collection getItems() { - return configurations.values(); - } - - @Override - public Collection getAllJobs() { - Set jobs = new HashSet(getItems()); - jobs.add(this); - return jobs; - } - - public String getUrlChildPrefix() { - return "."; - } - - public MatrixConfiguration getItem(String name) { - try { - return getItem(Combination.fromString(name)); - } catch (IllegalArgumentException e) { - return null; - } - } - - public MatrixConfiguration getItem(Combination c) { - if (configurations == null) { - return null; - } - return configurations.get(c); - } - - public File getRootDirFor(MatrixConfiguration child) { - return getRootDirFor(child.getCombination()); - } - - public void onRenamed(MatrixConfiguration item, String oldName, String newName) throws IOException { - throw new UnsupportedOperationException(); - } - - public void onDeleted(MatrixConfiguration item) throws IOException { - // noop - } - - public File getRootDirFor(Combination combination) { - File f = getConfigurationsDir(); - for (Entry e : combination.entrySet()) - f = new File(f,"axis-"+e.getKey()+'/'+Util.rawEncode(e.getValue())); - f.getParentFile().mkdirs(); - return f; - } - - /** - * @see #getJDKs() - */ - @Override @Deprecated - public JDK getJDK() { - return super.getJDK(); - } - - /** - * Gets the {@link JDK}s where the builds will be run. - * @return never null but can be empty - */ - public Set getJDKs() { - Axis a = axes.find("jdk"); - if(a==null) return Collections.emptySet(); - Set r = new HashSet(); - for (String j : a) { - JDK jdk = Jenkins.getInstance().getJDK(j); - if(jdk!=null) - r.add(jdk); - } - return r; - } - - /** - * Gets the {@link Label}s where the builds will be run. - * @return never null - */ - public Set

- * Plugins can implement this extension point to filter out the subset of matrix project to build. - * Most typically, such a plugin would add a custom {@link Action} to a build when it goes to the queue - * ({@link Queue#schedule2(Task, int, List)}, then access this from {@link MatrixBuild} to drive - * the filtering logic. - * - *

- * See the matrix reloaded plugin for an example. - * - * @author Christian Wolfgang - * @since 1.413 - */ -public abstract class MatrixBuildListener implements ExtensionPoint { - /** - * Determine whether to build a given configuration or not - * - * @param b - * Never null. The umbrella build. - * @param c - * The configuration whose build is being considered. If any of the {@link MatrixBuildListener} - * returns false, then the build for this configuration is skipped, and the previous build - * of this configuration will be taken as the default result. - * @return - * True to let the build happen, false to skip it. - */ - public abstract boolean doBuildConfiguration(MatrixBuild b, MatrixConfiguration c); - - public static boolean buildConfiguration(MatrixBuild b, MatrixConfiguration c) { - for (MatrixBuildListener l : all()) { - if(!l.doBuildConfiguration(b, c)) { - return false; - } - } - - return true; - } - - /** - * Returns all the registered {@link MatrixBuildListener} descriptors. - */ - public static ExtensionList all() { - return Jenkins.getInstance().getExtensionList(MatrixBuildListener.class); - } -} diff --git a/core/src/main/java/hudson/matrix/package.html b/core/src/main/java/hudson/matrix/package.html deleted file mode 100644 index 72e14d2dcb..0000000000 --- a/core/src/main/java/hudson/matrix/package.html +++ /dev/null @@ -1,27 +0,0 @@ - - - -Matrix project - \ No newline at end of file diff --git a/core/src/main/resources/hudson/matrix/DefaultMatrixExecutionStrategyImpl/config.groovy b/core/src/main/resources/hudson/matrix/DefaultMatrixExecutionStrategyImpl/config.groovy deleted file mode 100644 index fa6f924c5b..0000000000 --- a/core/src/main/resources/hudson/matrix/DefaultMatrixExecutionStrategyImpl/config.groovy +++ /dev/null @@ -1,28 +0,0 @@ -package hudson.matrix.DefaultMatrixExecutionStrategyImpl; - -import hudson.matrix.MatrixConfigurationSorterDescriptor -import hudson.model.Result; - -def f = namespace(lib.FormTagLib) - -f.optionalBlock (field:"runSequentially", title:_("Run each configuration sequentially"), inline:true) { - if (MatrixConfigurationSorterDescriptor.all().size()>1) { - f.dropdownDescriptorSelector(title:_("Execution order of builds"), field:"sorter") - } -} - -f.optionalBlock (field:"hasTouchStoneCombinationFilter", title:_("Execute touchstone builds first"), inline:true) { - // TODO: help="/help/matrix/touchstone.html"> - // TODO: move l10n from MatrixProject/configEntries.jelly - - f.entry(title:_("Filter"), field:"touchStoneCombinationFilter") { - f.textbox() - } - - f.entry(title:_("Required result"), field:"touchStoneResultCondition", description:_("required.result.description")) { - select(name:"touchStoneResultCondition") { - f.option(value:"SUCCESS", selected:my.touchStoneResultCondition==Result.SUCCESS, _("Stable")) - f.option(value:"UNSTABLE", selected:my.touchStoneResultCondition==Result.UNSTABLE, _("Unstable")) - } - } -} diff --git a/core/src/main/resources/hudson/matrix/DefaultMatrixExecutionStrategyImpl/config.properties b/core/src/main/resources/hudson/matrix/DefaultMatrixExecutionStrategyImpl/config.properties deleted file mode 100644 index 20f08d5509..0000000000 --- a/core/src/main/resources/hudson/matrix/DefaultMatrixExecutionStrategyImpl/config.properties +++ /dev/null @@ -1,24 +0,0 @@ -# The MIT License -# -# 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 -# 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. - -required.result.description=\ - Execute the rest of the combinations only if the touchstone builds has (at least) the selected result. diff --git a/core/src/main/resources/hudson/matrix/DefaultMatrixExecutionStrategyImpl/config_da.properties b/core/src/main/resources/hudson/matrix/DefaultMatrixExecutionStrategyImpl/config_da.properties deleted file mode 100644 index 35e0cfe69d..0000000000 --- a/core/src/main/resources/hudson/matrix/DefaultMatrixExecutionStrategyImpl/config_da.properties +++ /dev/null @@ -1,29 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2010, Sun Microsystems, Inc. Kohsuke Kawaguchi. Knud Poulsen. -# -# 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. - -Execute\ touchstone\ builds\ first=K\u00f8r touchstone byg f\u00f8rst -Filter=Filter -Required\ result=N\u00f8dvendigt resultat -Run\ each\ configuration\ sequentially=K\u00f8r hver konfiguration sekventielt -Stable=Stabil -Unstable=Ustabil -required.result.description=Afvikl kun resten af kombinationerne hvis touchstone byggene har mindst det \u00f8nskede resultat. diff --git a/core/src/main/resources/hudson/matrix/DefaultMatrixExecutionStrategyImpl/config_de.properties b/core/src/main/resources/hudson/matrix/DefaultMatrixExecutionStrategyImpl/config_de.properties deleted file mode 100644 index ab5dd1d45a..0000000000 --- a/core/src/main/resources/hudson/matrix/DefaultMatrixExecutionStrategyImpl/config_de.properties +++ /dev/null @@ -1,30 +0,0 @@ -# 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. - -Required\ result=Mindest-Resultat -Stable=Stabil -Unstable=Instabil -required.result.description=F\u00fchre verbleibende Kombinationen nur aus, wenn \ - die Touchstone-Builds mindestens das gew\u00e4hlte Resultat lieferten. -Execute\ touchstone\ builds\ first=Touchstone-Builds zuerst ausf\u00fchren -Run\ each\ configuration\ sequentially=Konfigurationen sequentiell ausf\u00fchren -Filter=Filter diff --git a/core/src/main/resources/hudson/matrix/DefaultMatrixExecutionStrategyImpl/config_ja.properties b/core/src/main/resources/hudson/matrix/DefaultMatrixExecutionStrategyImpl/config_ja.properties deleted file mode 100644 index 7ee8a79bde..0000000000 --- a/core/src/main/resources/hudson/matrix/DefaultMatrixExecutionStrategyImpl/config_ja.properties +++ /dev/null @@ -1,31 +0,0 @@ -# The MIT License -# -# Copyright 2012 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. - -Run\ each\ configuration\ sequentially=\u5404\u8a2d\u5b9a\u3092\u9806\u6b21\u8d77\u52d5 -Execution\ order\ of\ builds=\u30d3\u30eb\u30c9\u306e\u5b9f\u884c\u9806\u5e8f -Execute\ touchstone\ builds\ first=\u6700\u521d\u306b\u7279\u5b9a\u306e\u30d3\u30eb\u30c9\u3092\u5b9f\u884c -Filter=\u30d5\u30a3\u30eb\u30bf\u30fc -Required\ result=\u30d3\u30eb\u30c9\u7d50\u679c -required.result.description=\ - \u6700\u521d\u306b\u5b9f\u884c\u3057\u305f\u30d3\u30eb\u30c9\u304c(\u5c11\u306a\u304f\u3068\u3082)\u9078\u629e\u3057\u305f\u7d50\u679c\u3067\u3042\u308b\u5834\u5408\u306e\u307f\u3001\u6b8b\u308a\u306e\u7d44\u307f\u5408\u308f\u305b\u3092\u5b9f\u884c\u3057\u307e\u3059\u3002 -Stable=\u5b89\u5b9a -Unstable=\u4e0d\u5b89\u5b9a \ No newline at end of file diff --git a/core/src/main/resources/hudson/matrix/DefaultMatrixExecutionStrategyImpl/config_pt_BR.properties b/core/src/main/resources/hudson/matrix/DefaultMatrixExecutionStrategyImpl/config_pt_BR.properties deleted file mode 100644 index 7e421cf1c7..0000000000 --- a/core/src/main/resources/hudson/matrix/DefaultMatrixExecutionStrategyImpl/config_pt_BR.properties +++ /dev/null @@ -1,29 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio -# -# 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. - -Execute\ touchstone\ builds\ first= Ordenar por builds -Unstable= Inst\u00e1vel -Run\ each\ configuration\ sequentially= Rodar cada configura\u00e7\u00e3o em sequ\u00eancia -Stable= Est\u00e1vel -Required\ result= Resultado -Filter= Filtro -required.result.description=Executar as demais combina\u00e7\u00f5es somente se os crit\u00e9rios de builds tiver (pelo menos) o resultado selecionado. diff --git a/core/src/main/resources/hudson/matrix/DefaultMatrixExecutionStrategyImpl/config_zh_TW.properties b/core/src/main/resources/hudson/matrix/DefaultMatrixExecutionStrategyImpl/config_zh_TW.properties deleted file mode 100644 index 76828773b5..0000000000 --- a/core/src/main/resources/hudson/matrix/DefaultMatrixExecutionStrategyImpl/config_zh_TW.properties +++ /dev/null @@ -1,31 +0,0 @@ -# The MIT License -# -# Copyright (c) 2013, Chunghwa Telecom Co., Ltd., Pei-Tang Huang -# -# 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. - -Run\ each\ configuration\ sequentially=\u5faa\u5e8f\u57f7\u884c\u5404\u9805\u8a2d\u5b9a -Execution\ order\ of\ builds=\u5efa\u7f6e\u57f7\u884c\u9806\u5e8f -Execute\ touchstone\ builds\ first=\u512a\u5148\u5efa\u7f6e\u300c\u8a66\u91d1\u77f3\u300d -Filter=\u7be9\u9078\u689d\u4ef6 -Required\ result=\u5fc5\u8981\u7d50\u679c -required.result.description=\ - \u53ea\u6709\u5728\u300c\u8a66\u91d1\u77f3\u300d\u5efa\u7f6e\u7d50\u679c\u7b26\u5408\u9810\u671f\u6642\u624d\u57f7\u884c\u5176\u4ed6\u7d44\u5408\u3002 -Stable=\u7a69\u5b9a -Unstable=\u4e0d\u7a69\u5b9a \ No newline at end of file diff --git a/core/src/main/resources/hudson/matrix/DefaultMatrixExecutionStrategyImpl/help-hasTouchStoneCombinationFilter.html b/core/src/main/resources/hudson/matrix/DefaultMatrixExecutionStrategyImpl/help-hasTouchStoneCombinationFilter.html deleted file mode 100644 index 012833aacf..0000000000 --- a/core/src/main/resources/hudson/matrix/DefaultMatrixExecutionStrategyImpl/help-hasTouchStoneCombinationFilter.html +++ /dev/null @@ -1,5 +0,0 @@ -

- Use a touchstone build if you want to run a sanity check before building all the combinations. - You can select a number of combinations using a combination filter. These will be built first. - If the result satisfies the result condition, the rest of the combinations will be built. -
\ No newline at end of file diff --git a/core/src/main/resources/hudson/matrix/DefaultMatrixExecutionStrategyImpl/help-hasTouchStoneCombinationFilter_de.html b/core/src/main/resources/hudson/matrix/DefaultMatrixExecutionStrategyImpl/help-hasTouchStoneCombinationFilter_de.html deleted file mode 100644 index 419847dc31..0000000000 --- a/core/src/main/resources/hudson/matrix/DefaultMatrixExecutionStrategyImpl/help-hasTouchStoneCombinationFilter_de.html +++ /dev/null @@ -1,10 +0,0 @@ -
- Ein "Touchstone"-Build ist ein besonderer Build, der Sie besonders frühzeitig auf Probleme - in Ihrem Code hinweist, z.B. durch Ausführung essentieller Plausibilitätstests. - -

- Wenn angewählt, führt Jenkins zunächst die Touchstone-Builds aus, bevor dann alle weiteren - Kombinationen gebaut werden. Sie können über einen Kombinationsfilter auch mehrere Builds - als Touchstone-Build kennzeichnen. Nur wenn das Ergebnis der Touchstone-Builds die - Ergebnisbedingung erfüllt, werden alle weiteren Kombinationen gebaut. -

\ No newline at end of file diff --git a/core/src/main/resources/hudson/matrix/DefaultMatrixExecutionStrategyImpl/help-hasTouchStoneCombinationFilter_ja.html b/core/src/main/resources/hudson/matrix/DefaultMatrixExecutionStrategyImpl/help-hasTouchStoneCombinationFilter_ja.html deleted file mode 100644 index 620ec2a4f3..0000000000 --- a/core/src/main/resources/hudson/matrix/DefaultMatrixExecutionStrategyImpl/help-hasTouchStoneCombinationFilter_ja.html +++ /dev/null @@ -1,5 +0,0 @@ -
- すべての組み合わせをビルドする前に、正常かどうかチェックしたい場合に使用します。 - フィルターを使用して、最初に実行するビルドの組み合わせを選択できます。 - 結果が"ビルド結果"の条件を満たした場合、残りの組み合わせがビルドされます。 -
\ No newline at end of file diff --git a/core/src/main/resources/hudson/matrix/DefaultMatrixExecutionStrategyImpl/help-hasTouchStoneCombinationFilter_zh_TW.html b/core/src/main/resources/hudson/matrix/DefaultMatrixExecutionStrategyImpl/help-hasTouchStoneCombinationFilter_zh_TW.html deleted file mode 100644 index 9aa296d5cf..0000000000 --- a/core/src/main/resources/hudson/matrix/DefaultMatrixExecutionStrategyImpl/help-hasTouchStoneCombinationFilter_zh_TW.html +++ /dev/null @@ -1,5 +0,0 @@ -
- 如果您想在建置所有組合前先做些例行檢查，就可以使用「試金石」建置。 - 可以透過組合篩選條件選出一些組合，並優先建置它們。 - 只有在結果符合預期條件時，才會建置其他組合。 -
\ No newline at end of file diff --git a/core/src/main/resources/hudson/matrix/DefaultMatrixExecutionStrategyImpl/help-runSequentially.html b/core/src/main/resources/hudson/matrix/DefaultMatrixExecutionStrategyImpl/help-runSequentially.html deleted file mode 100644 index a6a92881cf..0000000000 --- a/core/src/main/resources/hudson/matrix/DefaultMatrixExecutionStrategyImpl/help-runSequentially.html +++ /dev/null @@ -1,5 +0,0 @@ -
- With this option checked, Jenkins builds each configuration in a sequence. - This can be useful if your configuration needs to access the shared resource - like database, as well as to avoid crowding out other jobs. -
diff --git a/core/src/main/resources/hudson/matrix/DefaultMatrixExecutionStrategyImpl/help-runSequentially_de.html b/core/src/main/resources/hudson/matrix/DefaultMatrixExecutionStrategyImpl/help-runSequentially_de.html deleted file mode 100644 index e0636e22cb..0000000000 --- a/core/src/main/resources/hudson/matrix/DefaultMatrixExecutionStrategyImpl/help-runSequentially_de.html +++ /dev/null @@ -1,6 +0,0 @@ -
- Wenn angewählt, baut Jenkins alle Konfigurationen sequentiell nacheinander. - Dies kann zum einen nützlich sein, wenn Konfigurationen eine gemeinsame Ressource - benötigen, z.B. eine Datenbank. Zum anderen vermeidet es die Verdrängung - anderer Jobs in der Build-Warteschlange. -
diff --git a/core/src/main/resources/hudson/matrix/DefaultMatrixExecutionStrategyImpl/help-runSequentially_ja.html b/core/src/main/resources/hudson/matrix/DefaultMatrixExecutionStrategyImpl/help-runSequentially_ja.html deleted file mode 100644 index 9304375819..0000000000 --- a/core/src/main/resources/hudson/matrix/DefaultMatrixExecutionStrategyImpl/help-runSequentially_ja.html +++ /dev/null @@ -1,4 +0,0 @@ -
- 各設定を順番にビルドします。これは、(複数ジョブが同時にビルドされることにより)他のジョブがビルドされないことを防ぐとともに、 - データベースのような共有リソースへのアクセスを必要とする場合に役に立ちます。 -
\ No newline at end of file diff --git a/core/src/main/resources/hudson/matrix/DefaultMatrixExecutionStrategyImpl/help-runSequentially_zh_TW.html b/core/src/main/resources/hudson/matrix/DefaultMatrixExecutionStrategyImpl/help-runSequentially_zh_TW.html deleted file mode 100644 index 3e92ef1b47..0000000000 --- a/core/src/main/resources/hudson/matrix/DefaultMatrixExecutionStrategyImpl/help-runSequentially_zh_TW.html +++ /dev/null @@ -1,4 +0,0 @@ -
- 選用本功能時，Jenkins 會依序建置各種不同的設定。 - 如果您的設定需要存取資料庫這類共用資料時就很好用，此外，也能避免排擠掉其他作業。 -
diff --git a/core/src/main/resources/hudson/matrix/JDKAxis/config.jelly b/core/src/main/resources/hudson/matrix/JDKAxis/config.jelly deleted file mode 100644 index 767862c290..0000000000 --- a/core/src/main/resources/hudson/matrix/JDKAxis/config.jelly +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - diff --git a/core/src/main/resources/hudson/matrix/LabelAxis/config.jelly b/core/src/main/resources/hudson/matrix/LabelAxis/config.jelly deleted file mode 100644 index 28804d7f79..0000000000 --- a/core/src/main/resources/hudson/matrix/LabelAxis/config.jelly +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - -
- - - diff --git a/core/src/main/resources/hudson/matrix/LabelAxis/config_da.properties b/core/src/main/resources/hudson/matrix/LabelAxis/config_da.properties deleted file mode 100644 index bf0e83943c..0000000000 --- a/core/src/main/resources/hudson/matrix/LabelAxis/config_da.properties +++ /dev/null @@ -1,26 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2010, Sun Microsystems, Inc. Kohsuke Kawaguchi. Knud Poulsen. -# -# 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/Label=Node/Etiket -Labels=Etiketter -Individual\ nodes=Individuelle noder -Name=Navn diff --git a/core/src/main/resources/hudson/matrix/LabelAxis/config_de.properties b/core/src/main/resources/hudson/matrix/LabelAxis/config_de.properties deleted file mode 100644 index 4536049968..0000000000 --- a/core/src/main/resources/hudson/matrix/LabelAxis/config_de.properties +++ /dev/null @@ -1,26 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers -# -# 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/Label=Knoten/Label -Labels=Labels -Individual\ nodes=Einzelne Knoten -Name=Name diff --git a/core/src/main/resources/hudson/matrix/LabelAxis/config_es.properties b/core/src/main/resources/hudson/matrix/LabelAxis/config_es.properties deleted file mode 100644 index e12d7ab16f..0000000000 --- a/core/src/main/resources/hudson/matrix/LabelAxis/config_es.properties +++ /dev/null @@ -1,26 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers -# -# 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/Label=Nodo/Etiqueta -Labels=Etiquetas -Individual\ nodes=Nodos individuales -Name=Nombre diff --git a/core/src/main/resources/hudson/matrix/LabelAxis/config_ja.properties b/core/src/main/resources/hudson/matrix/LabelAxis/config_ja.properties deleted file mode 100644 index 7d3dc298e0..0000000000 --- a/core/src/main/resources/hudson/matrix/LabelAxis/config_ja.properties +++ /dev/null @@ -1,26 +0,0 @@ -# The MIT License -# -# 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 -# 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\u524d -Node/Label=\u30ce\u30fc\u30c9/\u30e9\u30d9\u30eb -Labels=\u30e9\u30d9\u30eb -Individual\ nodes=\u500b\u5225\u306e\u30ce\u30fc\u30c9 \ No newline at end of file diff --git a/core/src/main/resources/hudson/matrix/LabelAxis/config_pt.properties b/core/src/main/resources/hudson/matrix/LabelAxis/config_pt.properties deleted file mode 100644 index 2f8a88768e..0000000000 --- a/core/src/main/resources/hudson/matrix/LabelAxis/config_pt.properties +++ /dev/null @@ -1,27 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers -# -# 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/Label=N\u00f3 -Labels=Label -Individual\ nodes=N\u00f3s individuais -Name=Nome - diff --git a/core/src/main/resources/hudson/matrix/LabelAxis/config_zh_TW.properties b/core/src/main/resources/hudson/matrix/LabelAxis/config_zh_TW.properties deleted file mode 100644 index 074c7b5e0a..0000000000 --- a/core/src/main/resources/hudson/matrix/LabelAxis/config_zh_TW.properties +++ /dev/null @@ -1,26 +0,0 @@ -# The MIT License -# -# Copyright (c) 2013, Chunghwa Telecom Co., Ltd., Pei-Tang Huang -# -# 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\u7a31 -Node/Label=\u7bc0\u9ede/\u6a19\u7c64 -Labels=\u6a19\u7c64 -Individual\ nodes=\u7368\u7acb\u7bc0\u9ede diff --git a/core/src/main/resources/hudson/matrix/LabelAxis/help-labels.html b/core/src/main/resources/hudson/matrix/LabelAxis/help-labels.html deleted file mode 100644 index 48c43aaa2d..0000000000 --- a/core/src/main/resources/hudson/matrix/LabelAxis/help-labels.html +++ /dev/null @@ -1,27 +0,0 @@ -
- Specify nodes where builds are performed. - -
    -
  • - If none is selected, Jenkins will choose - an available node to perform a build (this is the same behavior as the free-style - project when "tie this project to node" is not selected). This is useful - when the project doesn't have a dependency on any particular node, as - it allows Jenkins to utilize nodes in an optimal fashion. -
  • - If one is selected, Jenkins will always run the build on the specified node - (if you select one from "individual nodes") - or one of the nodes that belongs to the label (if you select one from "labels"). - This is useful when the build is required to run on a specific computer, - or a subset of computers. For example, maybe your build requires MacOS X. -
  • - If multiple values are selected, the configuration matrix will be expanded to include - all of them, and builds will be performed on all of the selected nodes/labels. - This is useful, for example, when you'd like to run tests on Windows, Linux, - and Solaris. -
- -
- During a build, the selected node name / label name for the given run is available as the "label" axis. - See the help of "axes" below for more information about how to access the axis value. -
diff --git a/core/src/main/resources/hudson/matrix/LabelAxis/help-labels_de.html b/core/src/main/resources/hudson/matrix/LabelAxis/help-labels_de.html deleted file mode 100644 index be40b813e0..0000000000 --- a/core/src/main/resources/hudson/matrix/LabelAxis/help-labels_de.html +++ /dev/null @@ -1,30 +0,0 @@ -
- Geben Sie die Knoten an, auf denen Ihre Builds ausgeführt werden sollen. -
    -
  • - Ist kein Knoten ausgewählt, wird Jenkins einen verfügbaren Knoten auswählen, - um den Build durchzuführen (dies ist das gleiche Verhalten wie beim - "Free-Style-Projekt", wenn "Projekt an Knoten binden" abgewählt ist). - Dies ist sinnvoll, wenn das Projekt keine Abhängigkeiten zu einem bestimmten - Knoten aufweist, da es Jenkins erlaubt, die Knoten optimal einzusetzen. -
  • - Ist ein Knoten ausgewählt, wird Jenkins den Build immer auf dem gewählten Knoten - (wenn ein Knoten unter "Bestimmte Knoten" ausgewählt wurde) oder auf einem Knoten, - der zum gewählten Label gehört (wenn ein Knoten unter "Labels" ausgewählt wurde), ausführen. - Dies ist sinnvoll, wenn der Build auf einem bestimmten Rechner oder - Rechnergruppe ausgeführt werden soll. Beispielsweise könnte der Build ein - bestimmtes Betriebssystem wie MacOS X voraussetzen. -
  • - Sind mehrere Knoten ausgewählt, wird die Konfigurationsmatrix so erweitert, - dass sie alle Werte beinhaltet. Builds werden dann auf allen gewählten Knoten/Labels - ausgeführt. - Dies ist sinnvoll, wenn Sie beispielsweise Tests unter Windows, Linux und - Solaris ausführen möchten. -
- -
- Während eines Builds ist der aktuelle Name des Knotens bzw. des Labels als Achse - label sichtbar. - Im Hilfetext zu "Achsen" finden Sie weitere Informationen, wie Sie auf die - Werte der Achsenvariablen zugreifen können. -
diff --git a/core/src/main/resources/hudson/matrix/LabelAxis/help-labels_fr.html b/core/src/main/resources/hudson/matrix/LabelAxis/help-labels_fr.html deleted file mode 100644 index c984516190..0000000000 --- a/core/src/main/resources/hudson/matrix/LabelAxis/help-labels_fr.html +++ /dev/null @@ -1,34 +0,0 @@ -
- Spécifiez ici les machines (noeuds) sur lesquelles les builds sont - exécutés. - -
    -
  • - Si aucune n'est sélectionnée, Jenkins choisira une des machines - disponibles pour l'exécution du build (ce comportement est le même - pour les projets free-style quand l'option "attacher ce projet au - noeud" n'est pas sélectionnée). C'est utile quand le projet n'a - pas de dépendance avec une machine particulière; Jenkins peut en effet - ainsi utiliser les noeuds de façon optimale. -
  • - Si une machine est sélectionnée, Jenkins lancera toujours le build - dessus (si vous en sélectionnez une parmi les "noeuds spécifiques") - ou sur une des machines qui appartiennent à un libellé (si vous - en choisissez une dans "libellé"). - C'est pratique quand le build doit tourner sur un ordinateur - particulier ou sur un sous-ensemble d'ordinateurs. Par exemple, - si votre build nécessite MacOS X. -
  • - Si de multiples valeurs sont sélectionnées, la matrice de - configuration sera étendue de façon à les inclure toutes et les - builds seront exécutés sur tous les noeuds ou libellés. - Cela est utile, par exemple, quand vous souhaitez lancer des tests - sur Windows, Linux et Solaris. -
- -
- Au cours d'un build, le nom du noeud ou du libellé sélectionné pour un - lancement donné est visible sous l'axe "libellé". - Référez-vous à l'aide sur les "axes" ci-dessous pour plus d'informations - sur l'accès à la valeur de l'axe. -
diff --git a/core/src/main/resources/hudson/matrix/LabelAxis/help-labels_ja.html b/core/src/main/resources/hudson/matrix/LabelAxis/help-labels_ja.html deleted file mode 100644 index 0c06b8a835..0000000000 --- a/core/src/main/resources/hudson/matrix/LabelAxis/help-labels_ja.html +++ /dev/null @@ -1,23 +0,0 @@ -
- ビルドを実行するノードを選択します。 - -
    -
  • - ノードを選択すると、Jenkinsはビルドを実行可能なノードを選択します(この動作は、 - "このビルドは指定のノード上でのみ実行"を選択していない場合のフリースタイルと同じです)。 - プロジェクトが特定のノードに依存していないとき、Jenkinsはノードを最適な方法で利用できるので、 - 便利です。 -
  • - １つだけ選択すると、Jenkinsはビルドを、指定されたノード("個別のノード"から1つ選択)か、 - ラベルに属する複数ノードのうちの1つのノード("ラベル"から1つ選択)で実行します。 - これは、ビルドを特定のコンピューターやコンピューターのセットで動かす必要がある場合に便利です。 - 例えば、ビルドにMacOS Xが必要な場合など。 -
  • - 複数の値を選択すると、構成マトリックスはそれらを含むように拡張され、 - ビルドは選択したノードもしくはラベルで実行されます。例えば、Windows、LinuxおよびSolarisでテストをしたい場合に便利です。 -
- -
- 選択したノード名やラベル名は、ビルド実行中には、"label"という軸として利用可能です。 - 軸の値のアクセス方法の詳細については、"構成軸"のヘルプを参照してください。 -
diff --git a/core/src/main/resources/hudson/matrix/LabelAxis/help-labels_nl.html b/core/src/main/resources/hudson/matrix/LabelAxis/help-labels_nl.html deleted file mode 100644 index 72c5676226..0000000000 --- a/core/src/main/resources/hudson/matrix/LabelAxis/help-labels_nl.html +++ /dev/null @@ -1,15 +0,0 @@ -
- Geef de nodes, waar uw bouwpoging uitgevoerd wordt, op. -
    -
  • - Indien niet opgegeven, zal Jenkins een beschikbare node kiezen voor het uitvoeren van uw bouwpoging.(Dit is hetzelfde gedrag als voor een project vrije stijl, indien niet vast aan een welbepaalde node voor uitvoering toegewezen.) Dit is handig indien uw projecten geen specifieke afhankelijkheden naar een welbepaalde node hebben. Het stelt Jenkins in staat om zijn nodes op een optimale manier te benutten. -
  • - Indien U wel een node selecteert, zal Jenkins uw bouwpogingen altijd op de opgegeven node uitvoeren. Op eenzelfde manier zal Jenkins ervoor zorgen dat uw pogingen altijd op ��n node van een groep nodes zal uitgevoerd worden, indien u een groepslabel gekozen hebt. Dit is natuurlijk hoogst nuttig indien bepaalde van uw projecten op een welbepaalde node of soort node uitgevoerd dienen te worden. Bvb. indien sommige van uw projecten op windows, Mac Os, linux,.... uitgevoerd moeten worden. -
  • - Indien U meerdere waarden selecteert, wordt de configuratiematrix zo opgesteld, dat uw bouwpogingen op alle geselecteerde nodes en/of groepen uitgevoerd wordt. Dit is handig indien je projecten hebt die op meerdere platformen gebouwd moeten worden. Denk maar aan applicaties die ontwikkeld worden voor zowel Linux, Mac OS, Solaris als Windows. -
- -
- Tijdens een bouwpoging, is de naam van de node of nodegroep, waarop de bouwpoging plaatsvindt, beschikbaar onder de "label" dimensie. - Zie de beschikbare hulppaginas over dimensies indien U meer te weten wenst te komen over de dimensies van een matrixproject. -
diff --git a/core/src/main/resources/hudson/matrix/LabelAxis/help-labels_pt_BR.html b/core/src/main/resources/hudson/matrix/LabelAxis/help-labels_pt_BR.html deleted file mode 100644 index 148a6aa1ea..0000000000 --- a/core/src/main/resources/hudson/matrix/LabelAxis/help-labels_pt_BR.html +++ /dev/null @@ -1,27 +0,0 @@ -
- Especifica os nós onde as construções serão executadas. - -
    -
  • - Se nenhum for selecionado, Jenkins escolherá - um nó disponível para executar uma construção (este é o mesmo comportamento do projeto - estilo-livre quando "amarrar este projeto ao nó" não estiver selecionado). Isto é útil - quando o projeto não tem dependência em nenhum nó particular, assim - ele permite ao Jenkins utilizar nós em uma forma ótima. -
  • - Se um for selecionado, Jenkins sempre executará a construção no nó especificado - (se você selecionar um de "nós específicos") - ou um dos nós que pertencem ao label (se você selecionar um de "label"). - Isto é útil quando for necessário que a construção execute em um computador específico, - ou em um subconjunto de computadores. Por exemplo, talvez sua construção necessite de um MacOS X. -
  • - Se valores múltiplos forem selecionados, a matriz de configuração será expandida para incluir - todos eles, e as construçõs serão executadas em todos os nós/labels selecionandos. - Isto é últi, por exemplo, quando você quiser executar testes em Windows, Linux, - e Solaris. -
- -
- Durante uma construção, o nome do nó/label selecionado está disponível como o eixo "label". - Veja a ajuda de "eixos" abaixo para mais informações sobre como acessar o valor do eixo. -
diff --git a/core/src/main/resources/hudson/matrix/LabelAxis/help-labels_ru.html b/core/src/main/resources/hudson/matrix/LabelAxis/help-labels_ru.html deleted file mode 100644 index 7ff0fb70e4..0000000000 --- a/core/src/main/resources/hudson/matrix/LabelAxis/help-labels_ru.html +++ /dev/null @@ -1,28 +0,0 @@ -
- Выберите узлы, на которых будет производиться сборка. - -
    -
  • - Если ничего не выбрано, Jenkins сам выберет доступный узел для выполнения сборки - (такое же поведение как и в случае проекта в свободной форме (free-style), когда - опция "Привязать проект к узлу" не включена). Это полезно когда проект не имеет - зависимости от конкретного узла и позволяет системе использовать узлы оптимальным - образом. -
  • - Если выбран один узел, то Jenkins всегда будет выполнять сборку только на указанном - узле (если вы выбрали один из конкретных узлов), либо один из узлов с указанной меткой - (если вы выбрали одну из "Меток"). - Это может быть полезно в случае, если сборка должна быть запущена на конкретном - узле или наборе узлов. Например, возможно, ваша сборка требует MacOS X. -
  • - Если выбрано несколько значений, конфигурационная матрица будет расширена для - включения их всех и сборки будут производиться на всех выбранных узлах/метках. - Это может быть удобно, если ваш проект собирается либо тестируется на Windows, - Linux и Solaris. -
- -
- В процессе сборки выбранное имя узла/метки доступно как ось "labels". - Смотрите в подсказку к опции "Оси (axes)" ниже для получения более подробной информации о том как - получить значения по осям. -
diff --git a/core/src/main/resources/hudson/matrix/LabelAxis/help-labels_tr.html b/core/src/main/resources/hudson/matrix/LabelAxis/help-labels_tr.html deleted file mode 100644 index 67350cb5b9..0000000000 --- a/core/src/main/resources/hudson/matrix/LabelAxis/help-labels_tr.html +++ /dev/null @@ -1,26 +0,0 @@ -
- Yapılandırmaların çalıştırılacağı nodları belirleyiniz. - -
    -
  • - Herhangi bir seçim yapılmaz ise, Jenkins yapılandırma için uygun bir nod seçecektir - (Aynı serbest-stil projede "bu projeyi bir noda bağla" seçeneğinin seçilmediği durumdaki gibi) - Eğer projenizin herhangi bir noda bağımlılığı yoksa Jenkins - nodları uygun biçimde değerlendirerek size en uygun durumu sağlayacaktır. -
  • - Eğer bir tane seçilirse, Jenkins yapılandırmayı daima seçilen nodda - ("belirli nodlar"dan birisi seçilirse) - veya etikete dahil olan nodlardan bir tanesinde (eğer "etiket"ten bir tane seçilirse) çalıştıracaktır. - Bu seçenek, yapılandırma eğer belli bir bilgisayar veya bilgisayarlar kümesinde çalıştırılacak ise - faydalı olacaktır. Mesela, yapılandırmanızın MacOS X üzerinde çalışması gerekebilir. -
  • - Eğer birden fazla değer seçilirse, konfigürasyon matrisi hepsini kapsayacak şekilde genişletilir, - ve yapılandırmalar seçilen tüm nodlar/etiketler üzerinde çalıştırılır. - Bu seçenek, mesela testlerinizi Windows, Linux ve Solaris üzerinde çalıştırmak istediğinizde - faydalı olacaktır. -
- -
- Yapılandırma esnasında, seçilen nod adı / etiket adı "etiket" ekseninde görüntülenecektir. - Eksen değerlerine nasıl erişileceğine dair daha fazla bilgi için, aşağıda "eksenler" ile ilgili yardım kısmına bakınız. -
diff --git a/core/src/main/resources/hudson/matrix/LabelAxis/help-labels_zh_TW.html b/core/src/main/resources/hudson/matrix/LabelAxis/help-labels_zh_TW.html deleted file mode 100644 index 0c8bcc3ccd..0000000000 --- a/core/src/main/resources/hudson/matrix/LabelAxis/help-labels_zh_TW.html +++ /dev/null @@ -1,21 +0,0 @@ -
- 指定建置用的節點。 - -
    -
  • - 如果沒有選取任何節點，Jenkins 會自動挑一個節點來建置 - (行為模式就像是沒有使用「限定建置節點」的 Free-Style 專案)。 - 如果專案不一定要在哪些節點上才能建置，使用這個方式可以讓 Jenkins 充分利用每個節點。 -
  • - 如果選定某個節點，Jenkins 就只會在那個節點上建置 (假設您是在「獨立節點」中挑出來的)， - 或是在指定標籤中的任何一個節點上建置 (假如您是由「標籤」中選的)。 - 這種設定方式很適合只能在特定電腦上執行的建置作業。例如，一定要 MacOS X 才能建置的東西。 -
  • - 如果選取了一個以上的值，設定矩陣會將所有指定的項目納入展開，所有牽涉到的節點或標籤都會建置。 - 舉例來說，如果您想在 Windows, Linux 及 Solaris 上面都執行測試的話，這一招就很有用。 -
- -
- 建置時的節點或標籤名稱會顯示在「標籤」軸線上。 - 參考下方「座標軸」的說明，可以知道怎麼看座標值。 -
diff --git a/core/src/main/resources/hudson/matrix/LabelAxis/help.html b/core/src/main/resources/hudson/matrix/LabelAxis/help.html deleted file mode 100644 index ae767d7634..0000000000 --- a/core/src/main/resources/hudson/matrix/LabelAxis/help.html +++ /dev/null @@ -1,5 +0,0 @@ -
- This axis lets you run the same build on multiple slaves (by specifying those slaves either by their labels - or their individual names.) This is useful for example to cross-compile your C projects on multiple platforms, - testing your Java projects on different OSes, and so on. -
\ No newline at end of file diff --git a/core/src/main/resources/hudson/matrix/LabelAxis/help_zh_TW.html b/core/src/main/resources/hudson/matrix/LabelAxis/help_zh_TW.html deleted file mode 100644 index 0dfdde3c0d..0000000000 --- a/core/src/main/resources/hudson/matrix/LabelAxis/help_zh_TW.html +++ /dev/null @@ -1,4 +0,0 @@ -
- 可以在不同 Slave 上建置作業的軸線 (可以依照標籤或是獨立名稱指定 Slave)。 - 舉例來說，可以很方便的讓您在不同平台上編譯 C 專案，也可以在不同作業系統上測試 Java 專案。 -
\ No newline at end of file diff --git a/core/src/main/resources/hudson/matrix/LabelExpAxis/config.jelly b/core/src/main/resources/hudson/matrix/LabelExpAxis/config.jelly deleted file mode 100644 index 0d927b4300..0000000000 --- a/core/src/main/resources/hudson/matrix/LabelExpAxis/config.jelly +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - diff --git a/core/src/main/resources/hudson/matrix/LabelExpAxis/config_es.properties b/core/src/main/resources/hudson/matrix/LabelExpAxis/config_es.properties deleted file mode 100644 index 7331faddf9..0000000000 --- a/core/src/main/resources/hudson/matrix/LabelExpAxis/config_es.properties +++ /dev/null @@ -1,24 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers -# -# 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. - -Label\ Expressions=Expresiones -Name=Nombre diff --git a/core/src/main/resources/hudson/matrix/LabelExpAxis/config_ja.properties b/core/src/main/resources/hudson/matrix/LabelExpAxis/config_ja.properties deleted file mode 100644 index c4c53cd39c..0000000000 --- a/core/src/main/resources/hudson/matrix/LabelExpAxis/config_ja.properties +++ /dev/null @@ -1,25 +0,0 @@ -# The MIT License -# -# Copyright (c) 2011, 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. - -Name=\u540d\u524d -Label\ Expressions=\u30e9\u30d9\u30eb\u5f0f - diff --git a/core/src/main/resources/hudson/matrix/LabelExpAxis/config_pt.properties b/core/src/main/resources/hudson/matrix/LabelExpAxis/config_pt.properties deleted file mode 100644 index f29f1d0e15..0000000000 --- a/core/src/main/resources/hudson/matrix/LabelExpAxis/config_pt.properties +++ /dev/null @@ -1,25 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers -# -# 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. - -Label\ Expressions=Express\u00f5es -Name=Nome - diff --git a/core/src/main/resources/hudson/matrix/LabelExpAxis/config_zh_TW.properties b/core/src/main/resources/hudson/matrix/LabelExpAxis/config_zh_TW.properties deleted file mode 100644 index b4a9ecc9a0..0000000000 --- a/core/src/main/resources/hudson/matrix/LabelExpAxis/config_zh_TW.properties +++ /dev/null @@ -1,24 +0,0 @@ -# The MIT License -# -# Copyright (c) 2013, Chunghwa Telecom Co., Ltd., Pei-Tang Huang -# -# 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\u7a31 -Label\ Expressions=\u6a19\u7c64\u8868\u793a\u5f0f diff --git a/core/src/main/resources/hudson/matrix/LabelExpAxis/help-labelExpr.html b/core/src/main/resources/hudson/matrix/LabelExpAxis/help-labelExpr.html deleted file mode 100644 index 140931ba74..0000000000 --- a/core/src/main/resources/hudson/matrix/LabelExpAxis/help-labelExpr.html +++ /dev/null @@ -1,4 +0,0 @@ -
-This is similar to "Slave" axis, but you can use label expressions, not just plain label names. -Each line represents one label expression (i.e. one value of this axis). -
\ No newline at end of file diff --git a/core/src/main/resources/hudson/matrix/LabelExpAxis/help-labelExpr_ja.html b/core/src/main/resources/hudson/matrix/LabelExpAxis/help-labelExpr_ja.html deleted file mode 100644 index fb599d39ad..0000000000 --- a/core/src/main/resources/hudson/matrix/LabelExpAxis/help-labelExpr_ja.html +++ /dev/null @@ -1,4 +0,0 @@ -
- "スレーブ"の軸と同様ですが、単なるラベル名だけでなくラベル式を使用することができます。 - 1行が1つのラベル式を表します(この軸の値)。 -
\ No newline at end of file diff --git a/core/src/main/resources/hudson/matrix/LabelExpAxis/help-labelExpr_zh_TW.html b/core/src/main/resources/hudson/matrix/LabelExpAxis/help-labelExpr_zh_TW.html deleted file mode 100644 index ae6aebdfde..0000000000 --- a/core/src/main/resources/hudson/matrix/LabelExpAxis/help-labelExpr_zh_TW.html +++ /dev/null @@ -1,4 +0,0 @@ -
-很像「Slave」軸，不過除了使用標籤名稱之外，您還可以用標籤表示式。 -一行代表一個表示式 (同時也是對應到軸線上的一個值)。 -
\ No newline at end of file diff --git a/core/src/main/resources/hudson/matrix/LabelExpAxis/help.html b/core/src/main/resources/hudson/matrix/LabelExpAxis/help.html deleted file mode 100644 index 3c6f14ff94..0000000000 --- a/core/src/main/resources/hudson/matrix/LabelExpAxis/help.html +++ /dev/null @@ -1,4 +0,0 @@ -
- This axis lets you run the same build on multiple slaves (much like the "slaves" axis), - but this is more advanced in that it lets you use boolean expressions (such as foo&&bar) -
\ No newline at end of file diff --git a/core/src/main/resources/hudson/matrix/LabelExpAxis/help_ja.html b/core/src/main/resources/hudson/matrix/LabelExpAxis/help_ja.html deleted file mode 100644 index 22bd530299..0000000000 --- a/core/src/main/resources/hudson/matrix/LabelExpAxis/help_ja.html +++ /dev/null @@ -1,4 +0,0 @@ -
- この軸は、同一のビルドを複数のスレーブで実行することができます("スレーブ"の軸と同様に)。 - しかし、論理式(例 foo&&bar)を使用できる点でより便利になっています。　 -
\ No newline at end of file diff --git a/core/src/main/resources/hudson/matrix/LabelExpAxis/help_zh_TW.html b/core/src/main/resources/hudson/matrix/LabelExpAxis/help_zh_TW.html deleted file mode 100644 index fa2d523e59..0000000000 --- a/core/src/main/resources/hudson/matrix/LabelExpAxis/help_zh_TW.html +++ /dev/null @@ -1,4 +0,0 @@ -
- 可以在多個節點上面執行相同建置的軸線。 - 很像「Slave」軸，但更進階。您可以用布林表示式 (例如 foo&&bar)。 -
\ No newline at end of file diff --git a/core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix.jelly b/core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix.jelly deleted file mode 100644 index 42cb3e534d..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix.jelly +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - ${%Not run} - - - - ${p.tooltip} - - ${p.combination.toString(o.z)} - - - - - - - diff --git a/core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix_da.properties b/core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix_da.properties deleted file mode 100644 index 9d5c0d78b2..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix_da.properties +++ /dev/null @@ -1,23 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2010, Sun Microsystems, Inc. Kohsuke Kawaguchi. Knud Poulsen. -# -# 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=Ikke k\u00f8rt diff --git a/core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix_de.properties b/core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix_de.properties deleted file mode 100644 index 0b34ad1f34..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix_de.properties +++ /dev/null @@ -1 +0,0 @@ -Not\ run=Nicht gelaufen diff --git a/core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix_es.properties b/core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix_es.properties deleted file mode 100644 index 5796368ce8..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix_es.properties +++ /dev/null @@ -1,23 +0,0 @@ -# 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=No ejecutar diff --git a/core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix_fr.properties b/core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix_fr.properties deleted file mode 100644 index c69d14d921..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix_fr.properties +++ /dev/null @@ -1,23 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Eric Lefevre-Ardant -# -# 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=Non lanc\u00e9 diff --git a/core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix_it.properties b/core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix_it.properties deleted file mode 100644 index 6e9c3ea6d9..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix_it.properties +++ /dev/null @@ -1,23 +0,0 @@ -# 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=Non eseguito diff --git a/core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix_ja.properties b/core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix_ja.properties deleted file mode 100644 index 78f16d75f9..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix_ja.properties +++ /dev/null @@ -1,23 +0,0 @@ -# The MIT License -# -# 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 -# 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=\u672A\u5B9F\u884C diff --git a/core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix_nl.properties b/core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix_nl.properties deleted file mode 100644 index b9da819d2a..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix_nl.properties +++ /dev/null @@ -1,3 +0,0 @@ -# This file is under the MIT License by authors - -Not\ run=Niet uitgevoerd diff --git a/core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix_pt.properties b/core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix_pt.properties deleted file mode 100644 index e55fc626b1..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix_pt.properties +++ /dev/null @@ -1,23 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers -# -# 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=N\u00e3o executado 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 deleted file mode 100644 index 31b504904a..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix_pt_BR.properties +++ /dev/null @@ -1,23 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio -# -# 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= N\u00e3o executar diff --git a/core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix_ru.properties b/core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix_ru.properties deleted file mode 100644 index 7115bf1701..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix_ru.properties +++ /dev/null @@ -1,4 +0,0 @@ -# This file is under the MIT License by authors - -Not\ run=\u0417\u0430\u0434\u0430\u0447\u0430 \u043d\u0435 \u0438\u0441\u043f\u043e\u043b\u043d\u044f\u043b\u0430\u0441\u044c - diff --git a/core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix_zh_TW.properties b/core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix_zh_TW.properties deleted file mode 100644 index 27e2b2f8a1..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix_zh_TW.properties +++ /dev/null @@ -1,23 +0,0 @@ -# The MIT License -# -# Copyright (c) 2013, Chunghwa Telecom Co., Ltd., Pei-Tang Huang -# -# 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=\u672a\u57f7\u884c diff --git a/core/src/main/resources/hudson/matrix/MatrixBuild/confirmDeleteAll.jelly b/core/src/main/resources/hudson/matrix/MatrixBuild/confirmDeleteAll.jelly deleted file mode 100644 index 3ec6f07388..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixBuild/confirmDeleteAll.jelly +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - ${%Warning}: ${%cannotMsg(msg)} - - -
- ${%Are you sure about deleting the build and all configurations in this build?} - - -
- - - diff --git a/core/src/main/resources/hudson/matrix/MatrixBuild/confirmDeleteAll.properties b/core/src/main/resources/hudson/matrix/MatrixBuild/confirmDeleteAll.properties deleted file mode 100644 index 3b9ef2f58b..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixBuild/confirmDeleteAll.properties +++ /dev/null @@ -1,23 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2009, 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 -# 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. - -cannotMsg=Cannot delete this build: {0} diff --git a/core/src/main/resources/hudson/matrix/MatrixBuild/confirmDeleteAll_de.properties b/core/src/main/resources/hudson/matrix/MatrixBuild/confirmDeleteAll_de.properties deleted file mode 100644 index c5c0c8d516..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixBuild/confirmDeleteAll_de.properties +++ /dev/null @@ -1,25 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2012, Frederic Gurr -# -# 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=Warnung -Are\ you\ sure\ about\ deleting\ the\ build\ and\ all\ configurations\ in\ this\ build?=Sollen dieses Build und alle Konfigurationen dieses Builds wirklich gelscht werden? -Yes=Ja diff --git a/core/src/main/resources/hudson/matrix/MatrixBuild/confirmDeleteAll_es.properties b/core/src/main/resources/hudson/matrix/MatrixBuild/confirmDeleteAll_es.properties deleted file mode 100644 index fc5e5e1e2e..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixBuild/confirmDeleteAll_es.properties +++ /dev/null @@ -1,26 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers -# -# 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=S -cannotMsg=No se puede -Warning=Atencin -Are\ you\ sure\ about\ deleting\ the\ build\ and\ all\ configurations\ in\ this\ build?=Ests seguro de querer borrar esta ejecucin y toda su configuracin? diff --git a/core/src/main/resources/hudson/matrix/MatrixBuild/confirmDeleteAll_ja.properties b/core/src/main/resources/hudson/matrix/MatrixBuild/confirmDeleteAll_ja.properties deleted file mode 100644 index d529392c2b..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixBuild/confirmDeleteAll_ja.properties +++ /dev/null @@ -1,27 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2013, 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. - -Warning=\u8b66\u544a -Are\ you\ sure\ about\ deleting\ the\ build\ and\ all\ configurations\ in\ this\ build?=\ - \u30d3\u30eb\u30c9\u3068\u3059\u3079\u3066\u306e\u8a2d\u5b9a\u3092\u524a\u9664\u3057\u3066\u3082\u3088\u308d\u3057\u3044\u3067\u3059\u304b? -Yes=\u306f\u3044 -cannotMsg=\u3053\u306e\u30d3\u30eb\u30c9: {0} \u306f\u524a\u9664\u3067\u304d\u307e\u305b\u3093\u3002 \ No newline at end of file diff --git a/core/src/main/resources/hudson/matrix/MatrixBuild/confirmDeleteAll_pt.properties b/core/src/main/resources/hudson/matrix/MatrixBuild/confirmDeleteAll_pt.properties deleted file mode 100644 index b9c7673ac8..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixBuild/confirmDeleteAll_pt.properties +++ /dev/null @@ -1,27 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers -# -# 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. - -cannotMsg=N\u00e3o foi poss\u00edvel remover esse build: {0} -Are\ you\ sure\ about\ deleting\ the\ build\ and\ all\ configurations\ in\ this\ build?=Tem certeza que deseja remover esse build e todas suas configura\u00e7\u00f5es ? -Yes=Sim -Warning=Aviso - diff --git a/core/src/main/resources/hudson/matrix/MatrixBuild/confirmDeleteAll_ru.properties b/core/src/main/resources/hudson/matrix/MatrixBuild/confirmDeleteAll_ru.properties deleted file mode 100644 index 6d3fcfc888..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixBuild/confirmDeleteAll_ru.properties +++ /dev/null @@ -1,4 +0,0 @@ -# This file is under the MIT License by authors - -Are\ you\ sure\ about\ deleting\ the\ build\ and\ all\ configurations\ in\ this\ build?=\u0412\u044B \u0443\u0432\u0435\u0440\u0435\u043D\u044B, \u0447\u0442\u043E \u0445\u043E\u0442\u0438\u0442\u0435 \u0443\u0434\u0430\u043B\u0438\u0442\u044C \u0441\u0431\u043E\u0440\u043A\u0443 \u0438 \u0432\u0441\u0435 \u043A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0438? -Yes=\u0414\u0430 diff --git a/core/src/main/resources/hudson/matrix/MatrixBuild/confirmDeleteAll_zh_TW.properties b/core/src/main/resources/hudson/matrix/MatrixBuild/confirmDeleteAll_zh_TW.properties deleted file mode 100644 index 3eab311eb3..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixBuild/confirmDeleteAll_zh_TW.properties +++ /dev/null @@ -1,25 +0,0 @@ -# The MIT License -# -# Copyright (c) 2013, Chunghwa Telecom Co., Ltd., Pei-Tang Huang -# -# 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=\u8b66\u544a -Are\ you\ sure\ about\ deleting\ the\ build\ and\ all\ configurations\ in\ this\ build?=\u60a8\u78ba\u5b9a\u8981\u522a\u9664\u5efa\u7f6e\u8ddf\u5b83\u6240\u6709\u7684\u8a2d\u5b9a\u55ce? -Yes=\u662f diff --git a/core/src/main/resources/hudson/matrix/MatrixBuild/delete.jelly b/core/src/main/resources/hudson/matrix/MatrixBuild/delete.jelly deleted file mode 100644 index 6d51d1fe1b..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixBuild/delete.jelly +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/core/src/main/resources/hudson/matrix/MatrixBuild/delete_ca.properties b/core/src/main/resources/hudson/matrix/MatrixBuild/delete_ca.properties deleted file mode 100644 index 0428685234..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixBuild/delete_ca.properties +++ /dev/null @@ -1,3 +0,0 @@ -# This file is under the MIT License by authors - -Delete\ Build=Eliminar Build diff --git a/core/src/main/resources/hudson/matrix/MatrixBuild/delete_cs.properties b/core/src/main/resources/hudson/matrix/MatrixBuild/delete_cs.properties deleted file mode 100644 index e90bb13cbc..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixBuild/delete_cs.properties +++ /dev/null @@ -1,4 +0,0 @@ -# This file is under the MIT License by authors - -Delete\ Build=Smazat sestaven\u00ED -Delete\ this\ build\ and\ all\ configurations\ in\ this\ build=Smazat sestaven\u00ED a v\u0161echna jeho nastaven\u00ED diff --git a/core/src/main/resources/hudson/matrix/MatrixBuild/delete_de.properties b/core/src/main/resources/hudson/matrix/MatrixBuild/delete_de.properties deleted file mode 100644 index d1a6bbe1bc..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixBuild/delete_de.properties +++ /dev/null @@ -1,24 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2012, Frederic Gurr -# -# 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. - -Delete\ Build=Build lschen -Delete\ this\ build\ and\ all\ configurations\ in\ this\ build=Build und alle Konfigurationen dieses Builds lschen diff --git a/core/src/main/resources/hudson/matrix/MatrixBuild/delete_es.properties b/core/src/main/resources/hudson/matrix/MatrixBuild/delete_es.properties deleted file mode 100644 index c200f138e9..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixBuild/delete_es.properties +++ /dev/null @@ -1,24 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers -# -# 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. - -Delete\ Build=Borrar esta ejecucin -Delete\ this\ build\ and\ all\ configurations\ in\ this\ build=Borrar esta ejecucin y todas sus configuraciones diff --git a/core/src/main/resources/hudson/matrix/MatrixBuild/delete_ja.properties b/core/src/main/resources/hudson/matrix/MatrixBuild/delete_ja.properties deleted file mode 100644 index 10fefb6fc2..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixBuild/delete_ja.properties +++ /dev/null @@ -1,25 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2012, 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. - -Delete\ Build=\u30d3\u30eb\u30c9\u3092\u524a\u9664 -Delete\ this\ build\ and\ all\ configurations\ in\ this\ build=\ - \u30d3\u30eb\u30c9\u3068\u8a2d\u5b9a\u3092\u524a\u9664 diff --git a/core/src/main/resources/hudson/matrix/MatrixBuild/delete_ko.properties b/core/src/main/resources/hudson/matrix/MatrixBuild/delete_ko.properties deleted file mode 100644 index 3d074ebceb..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixBuild/delete_ko.properties +++ /dev/null @@ -1,4 +0,0 @@ -# This file is under the MIT License by authors - -Delete\ Build=\uBE4C\uB4DC \uC0AD\uC81C -Delete\ this\ build\ and\ all\ configurations\ in\ this\ build=\uC774 \uBE4C\uB4DC\uC640 \uBAA8\uB4E0 \uAD6C\uC131\uC758 \uBE4C\uB4DC\uB4E4\uC744 \uC0AD\uC81C diff --git a/core/src/main/resources/hudson/matrix/MatrixBuild/delete_pl.properties b/core/src/main/resources/hudson/matrix/MatrixBuild/delete_pl.properties deleted file mode 100644 index 61901505f9..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixBuild/delete_pl.properties +++ /dev/null @@ -1,4 +0,0 @@ -# This file is under the MIT License by authors - -Delete\ Build=Usu\u0144 build -Delete\ this\ build\ and\ all\ configurations\ in\ this\ build=Usu\u0144 ten build i wszystkie konfiguracje w nim diff --git a/core/src/main/resources/hudson/matrix/MatrixBuild/delete_pt.properties b/core/src/main/resources/hudson/matrix/MatrixBuild/delete_pt.properties deleted file mode 100644 index 82b53cf884..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixBuild/delete_pt.properties +++ /dev/null @@ -1,25 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers -# -# 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. - -Delete\ Build=Remover build -Delete\ this\ build\ and\ all\ configurations\ in\ this\ build=Remover esse build e todas suas configura\u00e7\u00f5es - diff --git a/core/src/main/resources/hudson/matrix/MatrixBuild/delete_pt_BR.properties b/core/src/main/resources/hudson/matrix/MatrixBuild/delete_pt_BR.properties deleted file mode 100644 index 8bf572dc91..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixBuild/delete_pt_BR.properties +++ /dev/null @@ -1,5 +0,0 @@ -# This file is under the MIT License by authors -# Translated by: Fernando Boaglio - -Delete\ Build=Remover este build -Delete\ this\ build\ and\ all\ configurations\ in\ this\ build=Remover este build e todas as suas configura\u00E7\u00F5es diff --git a/core/src/main/resources/hudson/matrix/MatrixBuild/delete_ru.properties b/core/src/main/resources/hudson/matrix/MatrixBuild/delete_ru.properties deleted file mode 100644 index 3e59e453d2..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixBuild/delete_ru.properties +++ /dev/null @@ -1,4 +0,0 @@ -# This file is under the MIT License by authors - -Delete\ Build=\u0423\u0434\u0430\u043B\u0438\u0442\u044C \u0441\u0431\u043E\u0440\u043A\u0443 -Delete\ this\ build\ and\ all\ configurations\ in\ this\ build=\u0423\u0434\u0430\u043B\u0438\u0442\u044C \u044D\u0442\u0443 \u0441\u0431\u043E\u0440\u043A\u0443 \u0432\u043C\u0435\u0441\u0442\u0435 \u0441\u043E \u0432\u0441\u0435\u043C\u0438 \u0435\u0435 \u043A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044F\u043C\u0438 diff --git a/core/src/main/resources/hudson/matrix/MatrixBuild/delete_zh_CN.properties b/core/src/main/resources/hudson/matrix/MatrixBuild/delete_zh_CN.properties deleted file mode 100644 index d34035439c..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixBuild/delete_zh_CN.properties +++ /dev/null @@ -1,4 +0,0 @@ -# This file is under the MIT License by authors - -Delete\ Build=\u5220\u9664\u6784\u5EFA -Delete\ this\ build\ and\ all\ configurations\ in\ this\ build=\u5220\u9664\u6784\u5EFA\u53CA\u5176\u914D\u7F6E diff --git a/core/src/main/resources/hudson/matrix/MatrixBuild/delete_zh_TW.properties b/core/src/main/resources/hudson/matrix/MatrixBuild/delete_zh_TW.properties deleted file mode 100644 index 9bdbfba97f..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixBuild/delete_zh_TW.properties +++ /dev/null @@ -1,24 +0,0 @@ -# The MIT License -# -# Copyright (c) 2013, Chunghwa Telecom Co., Ltd., Pei-Tang Huang -# -# 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. - -Delete\ Build=\u522a\u9664\u5efa\u7f6e -Delete\ this\ build\ and\ all\ configurations\ in\ this\ build=\u522a\u9664\u5efa\u7f6e\u8ddf\u5b83\u6240\u6709\u7684\u8a2d\u5b9a diff --git a/core/src/main/resources/hudson/matrix/MatrixBuild/main.jelly b/core/src/main/resources/hudson/matrix/MatrixBuild/main.jelly deleted file mode 100644 index 1701ef174d..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixBuild/main.jelly +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/core/src/main/resources/hudson/matrix/MatrixConfigurationSorter/config.groovy b/core/src/main/resources/hudson/matrix/MatrixConfigurationSorter/config.groovy deleted file mode 100644 index 39b2321cea..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixConfigurationSorter/config.groovy +++ /dev/null @@ -1 +0,0 @@ -// default is empty \ No newline at end of file diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix.jelly b/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix.jelly deleted file mode 100644 index d2cfaf607a..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix.jelly +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - ${%Not configured} - - - - ${p.iconColor.description} - - ${p.combination.toString(o.z)} - - - - - - - diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_da.properties b/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_da.properties deleted file mode 100644 index 9a6b92b5ae..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_da.properties +++ /dev/null @@ -1,23 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2010, Sun Microsystems, Inc. Kohsuke Kawaguchi. Knud Poulsen. -# -# 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=Ikke konfigureret diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_de.properties b/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_de.properties deleted file mode 100644 index 0b7f459d48..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_de.properties +++ /dev/null @@ -1 +0,0 @@ -Not\ configured=Nicht konfiguriert diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_es.properties b/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_es.properties deleted file mode 100644 index f8e08a24a2..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_es.properties +++ /dev/null @@ -1,23 +0,0 @@ -# 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=Sin configurar diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_fi.properties b/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_fi.properties deleted file mode 100644 index 7c70b59bdd..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_fi.properties +++ /dev/null @@ -1,23 +0,0 @@ -# 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=Ei konfiguroitu diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_fr.properties b/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_fr.properties deleted file mode 100644 index d973d5dab9..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_fr.properties +++ /dev/null @@ -1,23 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Eric Lefevre-Ardant -# -# 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=Non configur\u00E9e diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_it.properties b/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_it.properties deleted file mode 100644 index 68bbeb093f..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_it.properties +++ /dev/null @@ -1,23 +0,0 @@ -# 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=Non configurato diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_ja.properties b/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_ja.properties deleted file mode 100644 index 0ec0e07631..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_ja.properties +++ /dev/null @@ -1,23 +0,0 @@ -# The MIT License -# -# 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 -# 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=\u672A\u8A2D\u5B9A diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_pl.properties b/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_pl.properties deleted file mode 100644 index bf6ce23fbc..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_pl.properties +++ /dev/null @@ -1,23 +0,0 @@ -# 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=Nie skonfigurowane diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_pt.properties b/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_pt.properties deleted file mode 100644 index 46252b1ab6..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_pt.properties +++ /dev/null @@ -1,24 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers -# -# 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=N\u00e3o configurado - 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 deleted file mode 100644 index ceb7af3ea3..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_pt_BR.properties +++ /dev/null @@ -1,23 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva -# -# 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= N\u00e3o configurado diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_ro.properties b/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_ro.properties deleted file mode 100644 index bcdb4dc200..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_ro.properties +++ /dev/null @@ -1,3 +0,0 @@ -# This file is under the MIT License by authors - -Not\ configured=Neconfigurat diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_ru.properties b/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_ru.properties deleted file mode 100644 index 8d06417a17..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_ru.properties +++ /dev/null @@ -1,3 +0,0 @@ -# This file is under the MIT License by authors - -Not\ configured=\u041D\u0435 \u0441\u043A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0438\u0440\u043E\u0432\u0430\u043D\u043E diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_sv_SE.properties b/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_sv_SE.properties deleted file mode 100644 index 4ad86bb7c0..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_sv_SE.properties +++ /dev/null @@ -1,3 +0,0 @@ -# This file is under the MIT License by authors - -Not\ configured=Ej konfigurerad diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_zh_CN.properties b/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_zh_CN.properties deleted file mode 100644 index 67b0344fa3..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_zh_CN.properties +++ /dev/null @@ -1,23 +0,0 @@ -# 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=\u5C1A\u672A\u914D\u7F6E diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_zh_TW.properties b/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_zh_TW.properties deleted file mode 100644 index 7e5038dde9..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix_zh_TW.properties +++ /dev/null @@ -1,23 +0,0 @@ -# The MIT License -# -# Copyright (c) 2013, Chunghwa Telecom Co., Ltd., Pei-Tang Huang -# -# 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=\u672a\u8a2d\u5b9a diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries.jelly b/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries.jelly deleted file mode 100644 index 1c3d07b2b4..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries.jelly +++ /dev/null @@ -1,99 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries_da.properties b/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries_da.properties deleted file mode 100644 index 0c7cc664ff..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries_da.properties +++ /dev/null @@ -1,27 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2010, Sun Microsystems, Inc. Kohsuke Kawaguchi. Knud Poulsen. -# -# 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. - -Combination\ Filter=Kombinationsfilter -Advanced\ Project\ Options=Avancerede Indstillinger -Configuration\ Matrix=\ -Afvikl kun resten af byggene hvis touchstone byggene har mindst det \u00f8nskede resultat. -Add\ axis=Tilf\u00f8j Akse diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries_de.properties b/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries_de.properties deleted file mode 100644 index b5740753ea..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries_de.properties +++ /dev/null @@ -1,30 +0,0 @@ -# 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. - -Advanced\ Project\ Options=Erweiterte Projekteinstellungen -Configuration\ Matrix=Konfigurationsmatrix -Combination\ Filter=Kombinationsfilter -Add\ axis=Achse hinzufgen -Directory=Verzeichnis -Directory\ for\ sub-builds=Verzeichnis f\u00FCr sub-builds -Display\ Name=Anzeigename -Use\ custom\ workspace=Eigenen Arbeitsbereich benutzen diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries_es.properties b/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries_es.properties deleted file mode 100644 index 636b97fdd4..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries_es.properties +++ /dev/null @@ -1,32 +0,0 @@ -# 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. - -Advanced\ Project\ Options=Opciones avanzadas del proyecto -Configuration\ Matrix=Matriz de configuracin -Combination\ Filter=Filtro de combinacin -Filter=Filtro -Add\ axis=Aadir eje -Display\ Name=Nombre a mostrar -Execution\ Strategy=Estrategia de ejecucin -Use\ custom\ workspace=Utilizar un directorio de trabajo personalizado -Directory=Directorio -Directory\ for\ sub-builds=Directorio para sub-tareas diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries_fr.properties b/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries_fr.properties deleted file mode 100644 index 96ec555a7e..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries_fr.properties +++ /dev/null @@ -1,35 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Eric Lefevre-Ardant -# -# 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. - -Advanced\ Project\ Options=Options Avances du projet -Configuration\ Matrix=Matrice de configuration -Build\ on\ multiple\ nodes=Lancer les builds sur plusieurs noeuds -Node=Noeud -Name=Nom -Values=Valeurs -Add\ more\ axis=Ajouter des axes -Delete=Supprimer -Individual\ nodes=Les noeuds -Labels=Etiquettes -Axes= -Combination\ Filter=Filtre sur les combinaisons -Filter=Filtre diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries_ja.properties b/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries_ja.properties deleted file mode 100644 index 1a3ef8d914..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries_ja.properties +++ /dev/null @@ -1,33 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2012, Sun Microsystems, Inc., Kohsuke Kawaguchi, Seiji Sogabe, -# Stephen Connolly, 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 -# 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. - -Advanced\ Project\ Options=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u9ad8\u5ea6\u306a\u8a2d\u5b9a -Configuration\ Matrix=\u30de\u30c8\u30ea\u30c3\u30af\u30b9\u306e\u8a2d\u5b9a -Add\ axis=\u8ef8\u306e\u8ffd\u52a0 -Combination\ Filter=\u7d44\u307f\u5408\u308f\u305b\u30d5\u30a3\u30eb\u30bf\u30fc -Filter=\u30d5\u30a3\u30eb\u30bf\u30fc -Display\ Name=\u8868\u793a\u7528\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u540d -Execution\ Strategy=\u5b9f\u884c\u65b9\u6cd5 -Directory=\u30c7\u30a3\u30ec\u30af\u30c8\u30ea -Directory\ for\ sub-builds=\u5b50\u30d3\u30eb\u30c9\u306e\u30c7\u30a3\u30ec\u30af\u30c8\u30ea -Use\ custom\ workspace=\u30ab\u30b9\u30bf\u30e0\u30ef\u30fc\u30af\u30b9\u30da\u30fc\u30b9\u3092\u4f7f\u7528 \ No newline at end of file diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries_ko.properties b/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries_ko.properties deleted file mode 100644 index 99575b6f77..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries_ko.properties +++ /dev/null @@ -1,6 +0,0 @@ -# This file is under the MIT License by authors - -Advanced\ Project\ Options=\uACE0\uAE09 \uD504\uB85C\uC81D\uD2B8 \uC635\uC158 -Directory=\uB514\uB809\uD130\uB9AC -Directory\ for\ sub-builds=\uC11C\uBE0C \uBE4C\uB4DC \uB514\uB809\uD130\uB9AC -Display\ Name=\uD45C\uC2DC \uC774\uB984 diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries_nl.properties b/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries_nl.properties deleted file mode 100644 index 014476cf27..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries_nl.properties +++ /dev/null @@ -1,31 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, id:sorokh -# -# 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. - -Advanced\ Project\ Options=Geavanceerde projectopties -Configuration\ Matrix=Configuratiematrix -Build\ on\ multiple\ nodes=Start een bouwpoging op meerder nodes. -Node=Node -Display\ Name=Weergegeven naam -Name=Naam -Values=Waarden -Add\ more\ axis=Voeg assen toe -Delete=Verwijder diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries_pt.properties b/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries_pt.properties deleted file mode 100644 index 7b8c986cb5..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries_pt.properties +++ /dev/null @@ -1,33 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers -# -# 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. - -Advanced\ Project\ Options=Op\u00e7\u00f5es avan\u00e7adas de projeto -Directory=Diret\u00f3rio -Filter=Filtro -Directory\ for\ sub-builds=Diret\u00f3rio dos sub-builds -Display\ Name=Nome de exibi\u00e7\u00e3o -Use\ custom\ workspace=Usar workspace customizado -Combination\ Filter=Filtro combinado -Execution\ Strategy=Estrat\u00e9gia de execu\u00e7\u00e3o -Configuration\ Matrix=Configura\u00e7\u00e3o da matriz -Add\ axis=Adicionar eixo - 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 deleted file mode 100644 index 440b136168..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries_pt_BR.properties +++ /dev/null @@ -1,38 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio -# -# 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. - -Advanced\ Project\ Options=Op\u00E7\u00F5es avan\u00E7adas de projeto -Configuration\ Matrix=Matriz de configura\u00E7\u00E3o -Build\ on\ multiple\ nodes=Construir em m\u00FAltiplos n\u00f3s -Node=N\u00f3 -Name=Nome -Use\ custom\ workspace=Usar workspace customizado -Values=Valor -Add\ more\ axis=Adicionar mais eixos -Delete=ApagarAxes= Remover eixos -Labels= R\u00f3tulo -Directory=Pasta -Directory\ for\ sub-builds=Pasta para sub-builds -Display\ Name=Nome a ser mostrado -Individual\ nodes= N\u00f3s individuais -Combination\ Filter= Filtro combinado -Axes= Eixos diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries_ru.properties b/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries_ru.properties deleted file mode 100644 index 5cb73d38bf..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries_ru.properties +++ /dev/null @@ -1,33 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Mike Salnikov -# -# 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. - -Advanced\ Project\ Options=\u0420\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u043d\u044b\u0435 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u043f\u0440\u043e\u0435\u043a\u0442\u0430 -Configuration\ Matrix=\u041c\u0430\u0442\u0440\u0438\u0446\u0430 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0439 -Build\ on\ multiple\ nodes=\u0421\u043e\u0431\u0438\u0440\u0430\u0442\u044c \u043d\u0430 \u043d\u0435\u0441\u043a\u043e\u043b\u044c\u043a\u0438\u0445 \u0443\u0437\u043b\u0430\u0445 -Node=\u0423\u0437\u0435\u043b -Name=\u0418\u043c\u044f -Values=\u0417\u043d\u0430\u0447\u0435\u043d\u0438\u044f -Add\ more\ axis=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0441\u0442\u0435\u043f\u0435\u043d\u0438 \u0441\u0432\u043e\u0431\u043e\u0434\u044b -Delete=\u0423\u0434\u0430\u043b\u0438\u0442\u044c -Individual\ nodes=\u041a\u043e\u043d\u043a\u0440\u0435\u0442\u043d\u044b\u0435 \u0443\u0437\u043b\u044b -Labels=\u041c\u0435\u0442\u043a\u0438 -Axes=\u041e\u0441\u0438 diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries_sk.properties b/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries_sk.properties deleted file mode 100644 index 2ce2359996..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries_sk.properties +++ /dev/null @@ -1,5 +0,0 @@ -# This file is under the MIT License by authors - -Advanced\ Project\ Options=Pokro\u010Dil\u00E9 nastavenia projektu -Directory=Adres\u00E1r -Use\ custom\ workspace=Pou\u017Ei vlastn\u00FD pracovn\u00FD priestor diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries_sv_SE.properties b/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries_sv_SE.properties deleted file mode 100644 index a1494c0e2c..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries_sv_SE.properties +++ /dev/null @@ -1,5 +0,0 @@ -# This file is under the MIT License by authors - -Advanced\ Project\ Options=Avancerade projektinst\u00E4llningar -Directory=Katalog -Display\ Name=Visningsnamn diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries_tr.properties b/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries_tr.properties deleted file mode 100644 index 15c7ebab5e..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries_tr.properties +++ /dev/null @@ -1,35 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Oguz Dag -# -# 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. - -Advanced\ Project\ Options=Geli\u015fmi\u015f\ Proje\ Se\u00e7enekleri -Configuration\ Matrix=Konfig\u00fcrasyon\ Matrisi -Build\ on\ multiple\ nodes=\u00c7oklu nod \u00fczerinde yap\u0131land\u0131r -Node=Nod -Name=\u0130sim -Values=De\u011ferler -Add\ more\ axis=Eksen ekle -Delete=Sil -Individual\ nodes=Tek nodlar -Labels=Etiketler -Axes=Eksenler -Filter\ Combinations=Kombinasyonlari Filtrele -Filter=Filtre \ No newline at end of file diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries_zh_TW.properties b/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries_zh_TW.properties deleted file mode 100644 index bbb25b8fb8..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries_zh_TW.properties +++ /dev/null @@ -1,32 +0,0 @@ -# The MIT License -# -# Copyright (c) 2013, Chunghwa Telecom Co., Ltd., Pei-Tang Huang -# -# 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. - -Advanced\ Project\ Options=\u9032\u968e\u5c08\u6848\u9078\u9805 -Use\ custom\ workspace=\u4f7f\u7528\u81ea\u8a02\u5de5\u4f5c\u5340 -Directory=\u76ee\u9304 -Directory\ for\ sub-builds=\u5b50\u5efa\u7f6e\u76ee\u9304 -Display\ Name=\u986f\u793a\u540d\u7a31 -Configuration\ Matrix=\u8a2d\u5b9a\u77e9\u9663 -Add\ axis=\u589e\u52a0\u8ef8\u7dda -Combination\ Filter=\u7d44\u5408\u7be9\u9078\u689d\u4ef6 -Filter=\u7be9\u9078\u689d\u4ef6 -Execution\ Strategy=\u57f7\u884c\u7b56\u7565 diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/help-childCustomWorkspace.html b/core/src/main/resources/hudson/matrix/MatrixProject/help-childCustomWorkspace.html deleted file mode 100644 index 634d472c98..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/help-childCustomWorkspace.html +++ /dev/null @@ -1,28 +0,0 @@ -
- Override the workspace directory assigned to each configuration build. - -

- By default, Jenkins runs each configuration build in its own unique directory - (this happens by appending the name and the value of the axes to the workspace of the overall matrix execution, - for example, /path/to/slaveroot/job/someMatrixJob/axis1/value1/axis2/value2/). Specifying this value - allows you to override this behaviour. - -

- A common value used here is ".", indicating that all the configuration builds run on the same - directory as the overall matrix execution. - -

- The path specified here can be either absolute or relative. If relative, it is resolved against the workspace - of the overall matrix execution. The value can also contains environment variable references. Environment variables - include all the axis values, so for example if you specify $FOO when you define - two axes FOO=[a,b] and BAR=[x,y], then FOO=a,BAR=x and FOO=a,BAR=y will build in somewhere like - /slaveroot/job/someMatrixJob/a/ while FOO=b,BAR=x and FOO=b,BAR=y will build in - /slaveroot/job/someMatrixJob/b/. In this way, you can be selective about what subset - of configuration builds share the same workspace and what doesn't. - -

- Environment variables include special tokens - ${COMBINATION}, which expands to axis1/value1/axis2/value2/..., and - ${SHORT_COMBINATION}, which expands to 8 character string unique to each configuration. - -

\ No newline at end of file diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/help-childCustomWorkspace_zh_TW.html b/core/src/main/resources/hudson/matrix/MatrixProject/help-childCustomWorkspace_zh_TW.html deleted file mode 100644 index 7d946bbaa9..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/help-childCustomWorkspace_zh_TW.html +++ /dev/null @@ -1,24 +0,0 @@ -
- 重新指定每組設定的建置工作區目錄。 - -

- Jenkins 預設會給各種不同設定獨立的目錄 (在矩陣執行時將座標值加到工作區目錄中，例如 - /path/to/slaveroot/job/someMatrixJob/axis1/value1/axis2/value2/)。 - Specifying this value allows you to override this behaviour. - -

- 很多人會設定為 "."，讓矩陣裡的每一項設定都在同一個目錄裡建置。 - -

- 可以使用相對路徑或是絕對路徑。相對路徑是由整個矩陣的工作區起算。 - 環境變數包含所有軸線的值，假設您設定 FOO=[a,b] 跟 BAR=[x,y] 兩個軸，指定 $FOO 時， - FOO=a,BAR=x 及 FOO=a,BAR=y 會在 /slaveroot/job/someMatrixJob/a/ 這類的目錄中建置; - 而 FOO=b,BAR=x 及 FOO=b,BAR=y 則是在 /slaveroot/job/someMatrixJob/b/ 建置。 - 透過這個方式，您可以決定哪些設定要共用工作區，哪些設定又必需獨立開來。 - -

- 還有一些特殊環境變數可用，例如: - ${COMBINATION} 會被展開成 axis1/value1/axis2/value2/...， - 還有 ${SHORT_COMBINATION}，會被展開成每組設定都不同的 8 字元字串。 - -

\ No newline at end of file diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/help-slaveAffinity.html b/core/src/main/resources/hudson/matrix/MatrixProject/help-slaveAffinity.html deleted file mode 100644 index a3a25232ec..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/help-slaveAffinity.html +++ /dev/null @@ -1,9 +0,0 @@ -
- A matrix project needs to first execute what we call the "parent build", which checks out - a copy of the source tree and capture its state to ensure all the individual builds will - check out the same state. - -

- If you need to control where this parent build runs, please use this option to specify - its label/slave. -

\ No newline at end of file diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/index.jelly b/core/src/main/resources/hudson/matrix/MatrixProject/index.jelly deleted file mode 100644 index 10e44ced6c..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/index.jelly +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - -

${%Project}

- - ${%Project name}: ${it.fullName} - - - - - - - - - - - - - - ${%Latest Test Result} - - - -
- - - - - - - - - - - - diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/index_ar.properties b/core/src/main/resources/hudson/matrix/MatrixProject/index_ar.properties deleted file mode 100644 index e69ef43742..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/index_ar.properties +++ /dev/null @@ -1,3 +0,0 @@ -# This file is under the MIT License by authors - -Project=\u0627\u0644\u0645\u0634\u0631\u0648\u0639 diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/index_cs.properties b/core/src/main/resources/hudson/matrix/MatrixProject/index_cs.properties deleted file mode 100644 index 4573f3b5cb..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/index_cs.properties +++ /dev/null @@ -1,23 +0,0 @@ -# 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=Projekt diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/index_da.properties b/core/src/main/resources/hudson/matrix/MatrixProject/index_da.properties deleted file mode 100644 index 9bfa608f1a..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/index_da.properties +++ /dev/null @@ -1,23 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2010, Sun Microsystems, Inc. Kohsuke Kawaguchi. Knud Poulsen. -# -# 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=Projekt diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/index_de.properties b/core/src/main/resources/hudson/matrix/MatrixProject/index_de.properties deleted file mode 100644 index 73239c6e6c..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/index_de.properties +++ /dev/null @@ -1,24 +0,0 @@ -# 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. - -Latest\ Test\ Result=Aktuelle Testergebnisse -Project=Projekt diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/index_es.properties b/core/src/main/resources/hudson/matrix/MatrixProject/index_es.properties deleted file mode 100644 index 4d9b48e1ca..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/index_es.properties +++ /dev/null @@ -1,25 +0,0 @@ -# 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=Proyecto -Latest\ Test\ Result=Ultimo resultado de pruebas -Project\ name=Nombre de proyecto diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/index_fi.properties b/core/src/main/resources/hudson/matrix/MatrixProject/index_fi.properties deleted file mode 100644 index 51ce9039c3..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/index_fi.properties +++ /dev/null @@ -1,23 +0,0 @@ -# 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=Projekti diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/index_fr.properties b/core/src/main/resources/hudson/matrix/MatrixProject/index_fr.properties deleted file mode 100644 index d15386b6e4..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/index_fr.properties +++ /dev/null @@ -1,24 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Eric Lefevre-Ardant -# -# 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. - -Latest\ Test\ Result=Derniers r\u00e9sultats de test -Project=projet diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/index_he.properties b/core/src/main/resources/hudson/matrix/MatrixProject/index_he.properties deleted file mode 100644 index e8760f2f5c..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/index_he.properties +++ /dev/null @@ -1,4 +0,0 @@ -# This file is under the MIT License by authors - -Disable\ Project=\u05D7\u05E1\u05D5\u05DD \u05E4\u05E8\u05D5\u05D9\u05D9\u05E7\u05D8 -Project=\u05E4\u05E8\u05D5\u05D9\u05D9\u05E7\u05D8 diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/index_hu.properties b/core/src/main/resources/hudson/matrix/MatrixProject/index_hu.properties deleted file mode 100644 index 80775e5f46..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/index_hu.properties +++ /dev/null @@ -1,3 +0,0 @@ -# This file is under the MIT License by authors - -Latest\ Test\ Result=Legut\u00F3bbi teszteredm\u00E9nyek diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/index_it.properties b/core/src/main/resources/hudson/matrix/MatrixProject/index_it.properties deleted file mode 100644 index 56dfbc4328..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/index_it.properties +++ /dev/null @@ -1,23 +0,0 @@ -# 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=Progetto diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/index_ja.properties b/core/src/main/resources/hudson/matrix/MatrixProject/index_ja.properties deleted file mode 100644 index abeaad85da..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/index_ja.properties +++ /dev/null @@ -1,25 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2012, Sun Microsystems, Inc., Kohsuke Kawaguchi, id:cactusman, 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. - -Project=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8 -Project\ name=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u540d -Latest\ Test\ Result=\u6700\u65b0\u306e\u30c6\u30b9\u30c8\u7d50\u679c \ No newline at end of file diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/index_ko.properties b/core/src/main/resources/hudson/matrix/MatrixProject/index_ko.properties deleted file mode 100644 index 1bd658bb25..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/index_ko.properties +++ /dev/null @@ -1,4 +0,0 @@ -# This file is under the MIT License by authors - -Disable\ Project=\uD504\uB85C\uC81D\uD2B8 \uBE44\uD65C\uC131\uD654 -Project=\uD504\uB85C\uC81D\uD2B8 diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/index_nl.properties b/core/src/main/resources/hudson/matrix/MatrixProject/index_nl.properties deleted file mode 100644 index df583eb768..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/index_nl.properties +++ /dev/null @@ -1,23 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, id:sorokh -# -# 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=Project diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/index_pl.properties b/core/src/main/resources/hudson/matrix/MatrixProject/index_pl.properties deleted file mode 100644 index 4573f3b5cb..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/index_pl.properties +++ /dev/null @@ -1,23 +0,0 @@ -# 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=Projekt diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/index_pt.properties b/core/src/main/resources/hudson/matrix/MatrixProject/index_pt.properties deleted file mode 100644 index 16e21312ed..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/index_pt.properties +++ /dev/null @@ -1,26 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers -# -# 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\ name=Nome do projeto -Latest\ Test\ Result=\u00daltimo resultado de teste -Project=Projeto - diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/index_pt_BR.properties b/core/src/main/resources/hudson/matrix/MatrixProject/index_pt_BR.properties deleted file mode 100644 index 6c29f4ca51..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/index_pt_BR.properties +++ /dev/null @@ -1,25 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio -# -# 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. - -Disable\ Project=Desabilitar projeto -Latest\ Test\ Result=\u00DAltimo resultado do teste -Project=Projeto diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/index_ro.properties b/core/src/main/resources/hudson/matrix/MatrixProject/index_ro.properties deleted file mode 100644 index f6b94da0e3..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/index_ro.properties +++ /dev/null @@ -1,4 +0,0 @@ -# This file is under the MIT License by authors - -Disable\ Project=Dezactiveaza Proiect -Project=Proiect diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/index_ru.properties b/core/src/main/resources/hudson/matrix/MatrixProject/index_ru.properties deleted file mode 100644 index 408dd42d2c..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/index_ru.properties +++ /dev/null @@ -1,24 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Mike Salnikov -# -# 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=\u041f\u0440\u043e\u0435\u043a\u0442 -Project\ name=\u0418\u043c\u044f \u043f\u0440\u043e\u0435\u043a\u0442\u0430 diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/index_sv_SE.properties b/core/src/main/resources/hudson/matrix/MatrixProject/index_sv_SE.properties deleted file mode 100644 index 95a1459625..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/index_sv_SE.properties +++ /dev/null @@ -1,4 +0,0 @@ -# This file is under the MIT License by authors - -Disable\ Project=Deaktivera projekt -Project=Projekt diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/index_tr.properties b/core/src/main/resources/hudson/matrix/MatrixProject/index_tr.properties deleted file mode 100644 index a5c94785d7..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/index_tr.properties +++ /dev/null @@ -1,23 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Oguz Dag -# -# 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=Proje diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/index_uk.properties b/core/src/main/resources/hudson/matrix/MatrixProject/index_uk.properties deleted file mode 100644 index d53fd7d9c5..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/index_uk.properties +++ /dev/null @@ -1,4 +0,0 @@ -# This file is under the MIT License by authors - -Project=\u041F\u0440\u043E\u0435\u043A\u0442 -Project\ name=\u041D\u0430\u0437\u0432\u0430 \u043F\u0440\u043E\u0435\u043A\u0442\u0443 diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/index_zh_CN.properties b/core/src/main/resources/hudson/matrix/MatrixProject/index_zh_CN.properties deleted file mode 100644 index bf6222e3ba..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/index_zh_CN.properties +++ /dev/null @@ -1,23 +0,0 @@ -# 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=\u9879\u76ee diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/index_zh_TW.properties b/core/src/main/resources/hudson/matrix/MatrixProject/index_zh_TW.properties deleted file mode 100644 index 121a2226ef..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/index_zh_TW.properties +++ /dev/null @@ -1,26 +0,0 @@ -# The MIT License -# -# Copyright (c) 2013, Chunghwa Telecom Co., Ltd., Pei-Tang Huang -# -# 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=\u5C08\u6848 -Project\ name=\u5c08\u6848\u540d\u7a31 -Disable\ Project=\u505C\u7528\u5C08\u6848 -Latest\ Test\ Result=\u6700\u65b0\u6e2c\u8a66\u7d50\u679c diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail.jelly b/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail.jelly deleted file mode 100644 index 583f693ef4..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail.jelly +++ /dev/null @@ -1,28 +0,0 @@ - - - -
- ${%body} -
\ No newline at end of file diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail.properties b/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail.properties deleted file mode 100644 index 57b4bab41a..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail.properties +++ /dev/null @@ -1,25 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, 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 -# 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. - -body=\ - Suitable for projects that need a large number of different configurations, \ - such as testing on multiple environments, platform-specific builds, etc. diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_ar.properties b/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_ar.properties deleted file mode 100644 index 64bed35af6..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_ar.properties +++ /dev/null @@ -1,3 +0,0 @@ -# This file is under the MIT License by authors - -body=\u0645\u0646\u0627\u0633\u0628\u0629 \u0644\u0644\u0645\u0634\u0627\u0631\u064A\u0639 \u0627\u0644\u062A\u064A \u062A\u062D\u062A\u0627\u062C \u0643\u0645\u064A\u0629 \u0643\u0628\u064A\u0631\u0629 \u0645\u0646 \u0625\u0639\u062F\u0627\u062F\u0627\u062A \u0645\u062E\u062A\u0644\u0641\u0629\u060C \u0645\u062B\u0644 \u0627\u062E\u062A\u0628\u0627\u0631 \u0645\u0634\u0631\u0648\u0639 \u0641\u064A \u0639\u062F\u0629 \u0628\u064A\u0626\u0627\u062A\u060C \u0645\u0634\u0627\u0631\u064A\u0639 \u0645\u062E\u0635\u0635\u0629 \u0644\u0645\u0646\u0635\u0627\u062A \u0645\u0639\u064A\u0646\u0629\u060C \u0625\u0644\u062E. diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_da.properties b/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_da.properties deleted file mode 100644 index 31cd9aa20c..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_da.properties +++ /dev/null @@ -1,23 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2010, Sun Microsystems, Inc. Kohsuke Kawaguchi. Knud Poulsen. -# -# 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. - -body=Velegnet til projekter, der har behov for mange forskellige konfigurationer, s\u00E5som test p\u00E5 flere omgivelser, operativsystemer, platformspecifikke byg, osv. diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_de.properties b/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_de.properties deleted file mode 100644 index 7063a7e238..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_de.properties +++ /dev/null @@ -1,27 +0,0 @@ -# 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. - -body=\ - Dieses Profil eignet sich sehr gut fr Projekte mit zahlreichen \ - Konfigurationen, die etwa in unterschiedlichen Umgebungen getestet oder \ - plattformspezifisch gebaut werden mssen. - diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_es.properties b/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_es.properties deleted file mode 100644 index 9b336d0754..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_es.properties +++ /dev/null @@ -1,26 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, 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 -# 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. - -body=\ - Adecuado para proyectos que requieran un gran nmero de configuraciones diferentes, \ - como testear en multiples entornos, ejecutar sobre plataformas concretas, etc. - diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_et.properties b/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_et.properties deleted file mode 100644 index 943a5be456..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_et.properties +++ /dev/null @@ -1,3 +0,0 @@ -# This file is under the MIT License by authors - -body=Sobib projektidele, mis n\u00F5uavad suurt hulka erinevaid konfiguratsioone. N\u00E4iteks paljudes platvormides testimine v\u00F5i platvormide jaoks ehitamine. diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_fi.properties b/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_fi.properties deleted file mode 100644 index 4074cd6f5c..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_fi.properties +++ /dev/null @@ -1,3 +0,0 @@ -# This file is under the MIT License by authors - -body=Sopii projekteille, joissa on paljon erilaisia konfiguraatioita, kuten k\u00E4\u00E4nnt\u00E4mist\u00E4 tai testaamista useilla alustoilla. diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_fr.properties b/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_fr.properties deleted file mode 100644 index f30acb34b7..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_fr.properties +++ /dev/null @@ -1,26 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Eric Lefevre-Ardant -# -# 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. - -body=\ - Adapt aux projets qui ncessitent un grand nombre de configurations diffrentes, \ - comme des environnements de test multiples, des binaires spcifiques une plateforme, etc. - diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_hi_IN.properties b/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_hi_IN.properties deleted file mode 100644 index a9b8946026..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_hi_IN.properties +++ /dev/null @@ -1,3 +0,0 @@ -# This file is under the MIT License by authors - -body=\u0905\u0928\u0947\u0915 \u0935\u093F\u092D\u093F\u0928\u094D\u0928 \u0935\u093F\u0928\u094D\u092F\u093E\u0938\u094B\u0902 \u0915\u0940 \u092C\u0921\u093C\u0940 \u092A\u0930\u093F\u092F\u094B\u091C\u0928\u093E\u0913\u0902 \u0915\u0947 \u0932\u093F\u090F \u0909\u092A\u092F\u0941\u0915\u094D\u0924 - \u091C\u0948\u0938\u0947 \u0915\u093F \u090F\u0915\u093E\u0927\u093F\u0915 \u0935\u093E\u0924\u093E\u0935\u0930\u0923 \u092A\u0930 \u092A\u0930\u093F\u0915\u094D\u0937\u0923, \u092E\u0902\u091A - \u0935\u093F\u0936\u093F\u0937\u094D\u091F \u0928\u093F\u0930\u094D\u092E\u093E\u0923 \u0906\u0926\u093F diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_it.properties b/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_it.properties deleted file mode 100644 index d0caf427e6..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_it.properties +++ /dev/null @@ -1,23 +0,0 @@ -# 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. - -body=Adatto a progetto che necessitano di un ampio numero di configurazioni diverse, come test su pi\u00F9 ambienti, build specifiche per piattaforma, ecc. diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_ja.properties b/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_ja.properties deleted file mode 100644 index e017c51a4a..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_ja.properties +++ /dev/null @@ -1,24 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, 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 -# 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. - -body=\ - \u8907\u6570\u306e\u74b0\u5883\u3067\u306e\u30c6\u30b9\u30c8\u3084\u3001\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u3054\u3068\u306e\u30d3\u30eb\u30c9\u306a\u3069\u3068\u3044\u3063\u305f\u3001\u591a\u6570\u306e\u7570\u306a\u308b\u69cb\u6210\u304c\u5fc5\u8981\u306a\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306b\u9069\u3057\u3066\u3044\u307e\u3059\u3002 \ No newline at end of file diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_ko.properties b/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_ko.properties deleted file mode 100644 index 95b265ca54..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_ko.properties +++ /dev/null @@ -1,23 +0,0 @@ -# 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. - -body=\uB2E4\uC591\uD55C \uD658\uACBD\uC5D0\uC11C\uC758 \uD14C\uC2A4\uD2B8, \uD50C\uB798\uD3FC \uD2B9\uC131 \uBE4C\uB4DC, \uAE30\uD0C0 \uB4F1\uB4F1 \uCC98\uB7FC \uB2E4\uC218\uC758 \uC11C\uB85C\uB2E4\uB978 \uD658\uACBD\uC124\uC815\uC774 \uD544\uC694\uD55C \uD504\uB85C\uC81D\uD2B8\uC5D0 \uC801\uD569\uD568. diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_nb_NO.properties b/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_nb_NO.properties deleted file mode 100644 index c85c562933..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_nb_NO.properties +++ /dev/null @@ -1,23 +0,0 @@ -# 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. - -body=Egner seg for prosjekter som trenger et stort antall forskjellige konfigurasjoner, som testing i forskjellige milj\u00F8er, plattformspesifikke bygg osv. diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_nl.properties b/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_nl.properties deleted file mode 100644 index bf3d392da6..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_nl.properties +++ /dev/null @@ -1,23 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, id:sorokh -# -# 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. - -body=Geschikt voor projecten die een groot aantal verschillende configuraties nodig hebben,zoals testen op meerdere omgevingen, platformspecifieke bouwpogingen, etc. diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_pl.properties b/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_pl.properties deleted file mode 100644 index 805f1cc328..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_pl.properties +++ /dev/null @@ -1,23 +0,0 @@ -# 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. - -body=Przeznaczone dla projekt\u00F3w, kt\u00F3re potrzebuj\u0105 du\u017Cej liczby r\u00F3\u017Cnych konfiguracji, np. testuj\u0105cych na wielu \u015Brodowiskach, buduj\u0105cych oprogramowanie dla wybranych platform, itp. diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_pt.properties b/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_pt.properties deleted file mode 100644 index 554f6047b6..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_pt.properties +++ /dev/null @@ -1,26 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers -# -# 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. - -# \ -# Suitable for projects that need a large number of different configurations, \ -# such as testing on multiple environments, platform-specific builds, etc. -body= diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_pt_BR.properties b/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_pt_BR.properties deleted file mode 100644 index cb3bfd5bc9..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_pt_BR.properties +++ /dev/null @@ -1,23 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio -# -# 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. - -body=Apropriado para projetos que necessitam de grande n\u00famero de diferentes configura\u00e7\u00f5es, como teste em m\u00faltiplos ambientes, builds para plataformas espec\u00edficas, etc. diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_ru.properties b/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_ru.properties deleted file mode 100644 index 79615eaca9..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_ru.properties +++ /dev/null @@ -1,23 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Mike Salnikov -# -# 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. - -body=\u041F\u043E\u0434\u0445\u043E\u0434\u0438\u0442 \u0434\u043B\u044F \u043F\u0440\u043E\u0435\u043A\u0442\u043E\u0432, \u0442\u0440\u0435\u0431\u0443\u044E\u0449\u0438\u0445 \u0431\u043E\u043B\u044C\u0448\u043E\u0435 \u043A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u0440\u0430\u0437\u043B\u0438\u0447\u043D\u044B\u0445 \u043A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0439, \u0442\u0430\u043A\u0438\u0445 \u043A\u0430\u043A \u0442\u0435\u0441\u0442\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u0435 \u0432 \u0440\u0430\u0437\u043D\u043E\u043E\u0431\u0440\u0430\u0437\u043D\u044B\u0445 \u0441\u0440\u0435\u0434\u0430\u0445, \u043F\u043B\u0430\u0442\u0444\u043E\u0440\u043C\u043E\u0437\u0430\u0432\u0438\u0441\u0438\u043C\u044B\u0435 \u0441\u0431\u043E\u0440\u043A\u0438 \u0438 \u0442.\u0434. diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_sv_SE.properties b/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_sv_SE.properties deleted file mode 100644 index d1b17ee8a2..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_sv_SE.properties +++ /dev/null @@ -1,23 +0,0 @@ -# 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. - -body=L\u00E4mplig f\u00F6r projekt som beh\u00F6ver ett stort antal olika konfigurationer, s\u00E5som testning p\u00E5 flera milj\u00F6er, plattformsneutrala byggen, etc. diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_tr.properties b/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_tr.properties deleted file mode 100644 index 35ff8806ec..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_tr.properties +++ /dev/null @@ -1,23 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Oguz Dag -# -# 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. - -body=Platforma \u00d6zg\u00fc yap\u0131land\u0131rmalara sahip veya \u00e7e\u015fitli ortamlarda test i\u015flemi yapan projeler gibi \u00e7ok fazla say\u0131da konfig\u00fcrasyona ihtiya\u00e7 duyan projeler i\u00e7in uygundur. diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_uk.properties b/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_uk.properties deleted file mode 100644 index e6237b8360..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_uk.properties +++ /dev/null @@ -1,3 +0,0 @@ -# This file is under the MIT License by authors - -body=\u041F\u0456\u0434\u0445\u043E\u0434\u0438\u0442\u044C \u0434\u043B\u044F \u043F\u0440\u043E\u0435\u043A\u0442\u0456\u0432, \u044F\u043A\u0456 \u043F\u043E\u0442\u0440\u0435\u0431\u0443\u044E\u0442\u044C \u0432\u0435\u043B\u0438\u043A\u0443 \u043A\u0456\u043B\u044C\u043A\u0456\u0441\u0442\u044C \u0440\u0456\u0437\u043D\u043E\u043C\u0430\u043D\u0456\u0442\u043D\u0438\u0445 \u043A\u043E\u043D\u0444\u0456\u0433\u0443\u0440\u0430\u0446\u0456\u0439, \u0442\u0430\u043A\u0438\u0445 \u044F\u043A \u0442\u0435\u0441\u0442\u0443\u0432\u0430\u043D\u043D\u044F \u0443 \u0440\u0456\u0437\u043D\u0438\u0445 \u0441\u0435\u0440\u0435\u0434\u043E\u0432\u0438\u0449\u0430\u0445, \u043F\u043B\u0430\u0442\u0444\u043E\u0440\u043C\u043E\u0437\u0430\u043B\u0435\u0436\u043D\u0456 \u0437\u0431\u0456\u0440\u043A\u0438 \u0442\u0430 \u0456\u043D. diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_zh_CN.properties b/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_zh_CN.properties deleted file mode 100644 index 7540ad5f3c..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_zh_CN.properties +++ /dev/null @@ -1,23 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, 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 -# 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. - -body=\u9002\u7528\u4e8e\u591a\u914d\u7f6e\u9879\u76ee,\u4f8b\u5982\u591a\u73af\u5883\u6d4b\u8bd5,\u5e73\u53f0\u6307\u5b9a\u6784\u5efa,\u7b49\u7b49. diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_zh_TW.properties b/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_zh_TW.properties deleted file mode 100644 index df7bf0e261..0000000000 --- a/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail_zh_TW.properties +++ /dev/null @@ -1,24 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2013, Sun Microsystems, Inc., Chunghwa Telecom Co., Ltd., -# and Pei-Tang Huang -# -# 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. - -body=\u9069\u5408\u9700\u8981\u6709\u5927\u91cf\u4e0d\u540c\u8a2d\u5b9a\u7684\u5c08\u6848\uff0c\u4f8b\u5982\u5728\u5404\u5f0f\u74b0\u5883\u4e0a\u9032\u884c\u6e2c\u8a66\u3001\u5e73\u53f0\u76f8\u4f9d\u7684\u5efa\u7f6e...\u7b49\u4f5c\u696d\u3002 diff --git a/core/src/main/resources/hudson/matrix/Messages.properties b/core/src/main/resources/hudson/matrix/Messages.properties deleted file mode 100644 index 325ece3185..0000000000 --- a/core/src/main/resources/hudson/matrix/Messages.properties +++ /dev/null @@ -1,41 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, 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 -# 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. - -MatrixBuild.depends_on_this={0} depends on this. -MatrixProject.DisplayName=Build multi-configuration project -MatrixProject.Pronoun=Multi-configuration project -MatrixProject.DuplicateAxisName=Duplicate axis name - -MatrixBuild.Triggering=Triggering {0} -MatrixBuild.AppearsCancelled={0} appears to be cancelled -MatrixBuild.Cancelled=Cancelled {0} -MatrixBuild.Interrupting=Interrupting {0} -MatrixBuild.Completed={0} completed with result {1} - -MatrixConfiguration.Pronoun=Configuration - -MatrixRun.KeptBecauseOfParent=Kept because {0} is kept - -JDKAxis.DisplayName=JDK -LabelAxis.DisplayName=Slaves -LabelExpAxis.DisplayName=Label expression -TextArea.DisplayName=User-defined Axis diff --git a/core/src/main/resources/hudson/matrix/Messages_da.properties b/core/src/main/resources/hudson/matrix/Messages_da.properties deleted file mode 100644 index 3bda032a68..0000000000 --- a/core/src/main/resources/hudson/matrix/Messages_da.properties +++ /dev/null @@ -1,33 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2010, Sun Microsystems, Inc. Kohsuke Kawaguchi. Knud Poulsen. -# -# 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. - -MatrixRun.KeptBecauseOfParent=Gemt da {0} er gemt -TextArea.DisplayName=Brugerdefineret akse -MatrixProject.DuplicateAxisName=Dupliker akse navn -MatrixBuild.Triggering=Starter {0} -LabelAxis.DisplayName=Slaver -JDKAxis.DisplayName=JDK -MatrixBuild.AppearsCancelled={0} ser ud til at v\u00e6re aflyst -MatrixConfiguration.Pronoun=Konfiguration -MatrixProject.DisplayName=Byg multi-konfigurationsprojekt -MatrixBuild.Cancelled=Aflyst {0} -MatrixBuild.Interrupting=Afbryder {0} diff --git a/core/src/main/resources/hudson/matrix/Messages_de.properties b/core/src/main/resources/hudson/matrix/Messages_de.properties deleted file mode 100644 index d0bc67c412..0000000000 --- a/core/src/main/resources/hudson/matrix/Messages_de.properties +++ /dev/null @@ -1,40 +0,0 @@ -# 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. - -MatrixProject.DisplayName=Multikonfigurationsprojekt bauen -MatrixProject.Pronoun=Multikonfigurationsprojekt -MatrixProject.DuplicateAxisName=Name der Achse existiert bereits - -MatrixBuild.Triggering=Lse {0} aus -MatrixBuild.AppearsCancelled={0} scheint abgebrochen worden zu sein -MatrixBuild.Cancelled={0} abgebrochen -MatrixBuild.Interrupting=Unterbreche {0} -MatrixBuild.Completed={0} beendet mit Ergebnis {1} - -MatrixConfiguration.Pronoun=Einstellungen - -MatrixRun.KeptBecauseOfParent=Zurckbehalten, weil {0} zurckbehalten wurde. - - - -LabelExpAxis.DisplayName=Labelausdruck -TextArea.DisplayName=Benutzerdefinierte Achse diff --git a/core/src/main/resources/hudson/matrix/Messages_es.properties b/core/src/main/resources/hudson/matrix/Messages_es.properties deleted file mode 100644 index b3d3958a2f..0000000000 --- a/core/src/main/resources/hudson/matrix/Messages_es.properties +++ /dev/null @@ -1,39 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, 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 -# 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. - -MatrixProject.DisplayName=Crear un proyecto multi-configuracin -MatrixProject.DuplicateAxisName=Duplicar el nombre comn - -MatrixBuild.Triggering=Lanzado {0} -MatrixBuild.AppearsCancelled={0} parece haber sido cancelado -MatrixBuild.Cancelled=Cancelado {0} -MatrixBuild.Interrupting=Abortando {0} - -MatrixConfiguration.Pronoun=Configuracin - -MatrixRun.KeptBecauseOfParent=Guardado porque {0} est guardado -TextArea.DisplayName=Ejes definidos por el usuario -LabelAxis.DisplayName=Esclavos -JDKAxis.DisplayName= Jdk -# Label expression -LabelExpAxis.DisplayName=Etiqueta -MatrixBuild.Completed={0} se ha ejecutado con el resultado {1} diff --git a/core/src/main/resources/hudson/matrix/Messages_fr.properties b/core/src/main/resources/hudson/matrix/Messages_fr.properties deleted file mode 100644 index 73ff67c358..0000000000 --- a/core/src/main/resources/hudson/matrix/Messages_fr.properties +++ /dev/null @@ -1,30 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Eric Lefevre-Ardant -# -# 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. - -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 diff --git a/core/src/main/resources/hudson/matrix/Messages_ja.properties b/core/src/main/resources/hudson/matrix/Messages_ja.properties deleted file mode 100644 index 3dfe39be4b..0000000000 --- a/core/src/main/resources/hudson/matrix/Messages_ja.properties +++ /dev/null @@ -1,40 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2013, Sun Microsystems, Inc., Kohsuke Kawaguchi, Seiji Sogabe, 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 -# 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. - -MatrixBuild.depends_on_this={0} depends on this. -MatrixProject.DisplayName=\u30de\u30eb\u30c1\u69cb\u6210\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u30d3\u30eb\u30c9 -MatrixProject.Pronoun=\u30de\u30eb\u30c1\u69cb\u6210\u30d7\u30ed\u30b8\u30a7\u30af\u30c8 -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.Completed={0} \u304c\u5b8c\u4e86\u3057\u307e\u3057\u305f\u3002\u7d50\u679c: {1} - -MatrixConfiguration.Pronoun=\u8a2d\u5b9a -MatrixRun.KeptBecauseOfParent={0}\u304c\u4fdd\u7559\u4e2d\u306e\u305f\u3081\u4fdd\u7559\u3057\u307e\u3059 - -JDKAxis.DisplayName=JDK -LabelAxis.DisplayName=\u30b9\u30ec\u30fc\u30d6 -LabelExpAxis.DisplayName=\u30e9\u30d9\u30eb\u5f0f -TextArea.DisplayName=\u30e6\u30fc\u30b6\u5b9a\u7fa9 diff --git a/core/src/main/resources/hudson/matrix/Messages_nl.properties b/core/src/main/resources/hudson/matrix/Messages_nl.properties deleted file mode 100644 index 6f2854cf47..0000000000 --- a/core/src/main/resources/hudson/matrix/Messages_nl.properties +++ /dev/null @@ -1,31 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, id:sorokh -# -# 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. - -MatrixProject.DisplayName=Bouw een multi-configuratie project - -MatrixBuild.Triggering=Starten van {0} -MatrixBuild.AppearsCancelled={0} blijkt geannuleerd -MatrixBuild.Cancelled= {0} werd geannuleerd -MatrixBuild.Interrupting= {0} wordt onderbroken - -MatrixConfiguration.Pronoun=Configuratie -MatrixRun.KeptBecauseOfParent=Bijgehouden omdat {0} werd bijgehouden diff --git a/core/src/main/resources/hudson/matrix/Messages_pt.properties b/core/src/main/resources/hudson/matrix/Messages_pt.properties deleted file mode 100644 index a1b2e13cbb..0000000000 --- a/core/src/main/resources/hudson/matrix/Messages_pt.properties +++ /dev/null @@ -1,40 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers -# -# 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. - - -MatrixBuild.Completed={0} completado com resultado {1} -MatrixRun.KeptBecauseOfParent=Mantido porque {0} ser\u00e1 mantido -TextArea.DisplayName=Eixo definido pelo usu\u00e1rio -MatrixProject.DuplicateAxisName=Nome do eixo duplicado -MatrixBuild.Triggering=Disparando {0} -LabelAxis.DisplayName=Slaves -JDKAxis.DisplayName=JDK -MatrixBuild.Interrupting=Interrompendo {0} -MatrixBuild.depends_on_this={0} depended disso. -LabelExpAxis.DisplayName=Label -MatrixBuild.AppearsCancelled= {0} parece estar cancelado -MatrixConfiguration.Pronoun=Configura\u00e7\u00e3o -MatrixProject.Pronoun=Projeto com multi-configura\u00e7\u00f5es -MatrixProject.DisplayName=Construir Build projeto com multi-configura\u00e7\u00f5es -MatrixBuild.Cancelled={0} cancelado - - diff --git a/core/src/main/resources/hudson/matrix/Messages_pt_BR.properties b/core/src/main/resources/hudson/matrix/Messages_pt_BR.properties deleted file mode 100644 index 6cdf9d82b5..0000000000 --- a/core/src/main/resources/hudson/matrix/Messages_pt_BR.properties +++ /dev/null @@ -1,42 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, -# Bruno Meneguello -# -# 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. - -MatrixBuild.depends_on_this={0} depende deste. -MatrixProject.DisplayName=Construir projeto de m\u00faltiplas configura\u00e7\u00f5es -MatrixProject.Pronoun=Projeto de M\u00faltiplas Configura\u00e7\u00f5es - -MatrixBuild.Triggering=Disparando {0} -MatrixBuild.AppearsCancelled={0} parece estar cancelado -MatrixBuild.Cancelled=Cancelado {0} -MatrixBuild.Interrupting=Interrompendo {0} -MatrixBuild.Completed={0} completado com o resultado {1} - -MatrixConfiguration.Pronoun=Configura\u00e7\u00e3o -MatrixRun.KeptBecauseOfParent=Mantido porque {0} est\u00e1 mantido - -MatrixProject.DuplicateAxisName=Duplicar nome do eixo - -JDKAxis.DisplayName=JDK -LabelAxis.DisplayName=Slaves -LabelExpAxis.DisplayName=Express\u00e7o de R\u00f3tulo -TextArea.DisplayName=Eixo Definido pelo Usu\u00e1rio diff --git a/core/src/main/resources/hudson/matrix/Messages_ru.properties b/core/src/main/resources/hudson/matrix/Messages_ru.properties deleted file mode 100644 index 54753e19a3..0000000000 --- a/core/src/main/resources/hudson/matrix/Messages_ru.properties +++ /dev/null @@ -1,30 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Mike Salnikov -# -# 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. - -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 -MatrixBuild.Cancelled=\u041f\u0440\u0435\u0440\u0432\u0430\u043d\u0430 {0} -MatrixBuild.Interrupting=\u041f\u0440\u0435\u0440\u044b\u0432\u0430\u044e {0} - -MatrixConfiguration.Pronoun=\u041a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f \ No newline at end of file diff --git a/core/src/main/resources/hudson/matrix/Messages_tr.properties b/core/src/main/resources/hudson/matrix/Messages_tr.properties deleted file mode 100644 index a63c95565a..0000000000 --- a/core/src/main/resources/hudson/matrix/Messages_tr.properties +++ /dev/null @@ -1,31 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Oguz Dag -# -# 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. - -MatrixProject.DisplayName=\u00c7oklu-konfig\u00fcrasyona sahip proje yap\u0131land\u0131r - -MatrixBuild.Triggering={0} tetikleniyor -MatrixBuild.AppearsCancelled={0} iptal edilmi\u015f gr\u00fcn\u00fcyor -MatrixBuild.Cancelled={0} iptal edildi -MatrixBuild.Interrupting={0} i\u015flemi kesiliyor - -MatrixConfiguration.Pronoun=Konfig\u00fcrasyon -MatrixRun.KeptBecauseOfParent={0} tutuldu\u011fu i\u00e7in tutulmu\u015ftur diff --git a/core/src/main/resources/hudson/matrix/Messages_zh_CN.properties b/core/src/main/resources/hudson/matrix/Messages_zh_CN.properties deleted file mode 100644 index 5af13aa446..0000000000 --- a/core/src/main/resources/hudson/matrix/Messages_zh_CN.properties +++ /dev/null @@ -1,37 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, 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 -# 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. - -MatrixProject.DisplayName=\u6784\u5efa\u4e00\u4e2a\u591a\u914d\u7f6e\u9879\u76ee -MatrixProject.DuplicateAxisName=Duplicate axis name - -MatrixBuild.Triggering=Triggering {0} -MatrixBuild.AppearsCancelled={0} appears to be cancelled -MatrixBuild.Cancelled=Cancelled {0} -MatrixBuild.Interrupting=Interrupting {0} - -MatrixConfiguration.Pronoun=Configuration - -MatrixRun.KeptBecauseOfParent=Kept because {0} is kept - -JDKAxis.DisplayName=JDK -LabelAxis.DisplayName=Slaves -TextArea.DisplayName=User-defined Axis \ No newline at end of file diff --git a/core/src/main/resources/hudson/matrix/Messages_zh_TW.properties b/core/src/main/resources/hudson/matrix/Messages_zh_TW.properties deleted file mode 100644 index 6e20bba76c..0000000000 --- a/core/src/main/resources/hudson/matrix/Messages_zh_TW.properties +++ /dev/null @@ -1,39 +0,0 @@ -# The MIT License -# -# Copyright (c) 2013, Chunghwa Telecom Co., Ltd., Pei-Tang Huang -# -# 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. - -MatrixProject.DisplayName=\u5efa\u7acb\u591a\u91cd\u8a2d\u5b9a\u5c08\u6848 -MatrixProject.DuplicateAxisName=\u8ef8\u7dda\u540d\u7a31\u91cd\u8907 - -MatrixBuild.Triggering=\u89f8\u767c {0} \u4e2d -MatrixBuild.AppearsCancelled={0} \u6b63\u88ab\u53d6\u6d88 -MatrixBuild.Cancelled={0} \u5df2\u53d6\u6d88 -MatrixBuild.Interrupting=\u4e2d\u65b7 {0} \u4e2d -MatrixBuild.Completed={0} \u5df2\u5b8c\u6210\uff0c\u7d50\u679c\u70ba {1} - -MatrixConfiguration.Pronoun=\u8a2d\u5b9a - -MatrixRun.KeptBecauseOfParent=\u70ba\u4e86 {0} \u800c\u4fdd\u7559 - -JDKAxis.DisplayName=JDK -LabelAxis.DisplayName=Slave -LabelExpAxis.DisplayName=\u6a19\u7c64\u8868\u793a\u5f0f -TextArea.DisplayName=\u4f7f\u7528\u8005\u81ea\u8a02\u8ef8 diff --git a/core/src/main/resources/hudson/matrix/TextAxis/config.jelly b/core/src/main/resources/hudson/matrix/TextAxis/config.jelly deleted file mode 100644 index 14128b88e5..0000000000 --- a/core/src/main/resources/hudson/matrix/TextAxis/config.jelly +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - diff --git a/core/src/main/resources/hudson/matrix/TextAxis/config_da.properties b/core/src/main/resources/hudson/matrix/TextAxis/config_da.properties deleted file mode 100644 index 402f2e9f65..0000000000 --- a/core/src/main/resources/hudson/matrix/TextAxis/config_da.properties +++ /dev/null @@ -1,24 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2010, Sun Microsystems, Inc. Kohsuke Kawaguchi. Knud Poulsen. -# -# 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. - -Values=V\u00e6rdier -Name=Navn diff --git a/core/src/main/resources/hudson/matrix/TextAxis/config_de.properties b/core/src/main/resources/hudson/matrix/TextAxis/config_de.properties deleted file mode 100644 index 52b1fb37d7..0000000000 --- a/core/src/main/resources/hudson/matrix/TextAxis/config_de.properties +++ /dev/null @@ -1,24 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers -# -# 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. - -Values=Werte -Name=Name diff --git a/core/src/main/resources/hudson/matrix/TextAxis/config_es.properties b/core/src/main/resources/hudson/matrix/TextAxis/config_es.properties deleted file mode 100644 index 5bcf3f473e..0000000000 --- a/core/src/main/resources/hudson/matrix/TextAxis/config_es.properties +++ /dev/null @@ -1,24 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers -# -# 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. - -Values=Valores -Name=Nombre diff --git a/core/src/main/resources/hudson/matrix/TextAxis/config_ja.properties b/core/src/main/resources/hudson/matrix/TextAxis/config_ja.properties deleted file mode 100644 index 27fe8f674a..0000000000 --- a/core/src/main/resources/hudson/matrix/TextAxis/config_ja.properties +++ /dev/null @@ -1,24 +0,0 @@ -# The MIT License -# -# 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 -# 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\u524d -Values=\u5024 \ No newline at end of file diff --git a/core/src/main/resources/hudson/matrix/TextAxis/config_pt.properties b/core/src/main/resources/hudson/matrix/TextAxis/config_pt.properties deleted file mode 100644 index 5c750ded20..0000000000 --- a/core/src/main/resources/hudson/matrix/TextAxis/config_pt.properties +++ /dev/null @@ -1,24 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers -# -# 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. - -Values=Valores -Name=Nome diff --git a/core/src/main/resources/hudson/matrix/TextAxis/config_zh_TW.properties b/core/src/main/resources/hudson/matrix/TextAxis/config_zh_TW.properties deleted file mode 100644 index 38266d9a05..0000000000 --- a/core/src/main/resources/hudson/matrix/TextAxis/config_zh_TW.properties +++ /dev/null @@ -1,24 +0,0 @@ -# The MIT License -# -# Copyright (c) 2013, Chunghwa Telecom Co., Ltd., Pei-Tang Huang -# -# 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\u7a31 -Values=\u503c diff --git a/core/src/main/resources/hudson/matrix/TextAxis/help-valueString.html b/core/src/main/resources/hudson/matrix/TextAxis/help-valueString.html deleted file mode 100644 index ab60f50853..0000000000 --- a/core/src/main/resources/hudson/matrix/TextAxis/help-valueString.html +++ /dev/null @@ -1,4 +0,0 @@ -
- Values assigned to variables. Multiple values are separated by whitespace or newlines. - Use shell quoting syntax for a value that contains whitespace. -
diff --git a/core/src/main/resources/hudson/matrix/TextAxis/help-valueString_de.html b/core/src/main/resources/hudson/matrix/TextAxis/help-valueString_de.html deleted file mode 100644 index b874856d76..0000000000 --- a/core/src/main/resources/hudson/matrix/TextAxis/help-valueString_de.html +++ /dev/null @@ -1,5 +0,0 @@ -
- Geben Sie hier die Werte an, welche die Variable annehmen kann. - Mehrere Werte werden durch Leerraum oder Zeilenumbrüche getrennt. - Verwenden Sie die Shell-Notation, um Werte mit Leerräumen anzugeben. -
\ No newline at end of file diff --git a/core/src/main/resources/hudson/matrix/TextAxis/help-valueString_fr.html b/core/src/main/resources/hudson/matrix/TextAxis/help-valueString_fr.html deleted file mode 100644 index 3bf5521714..0000000000 --- a/core/src/main/resources/hudson/matrix/TextAxis/help-valueString_fr.html +++ /dev/null @@ -1,4 +0,0 @@ -
- Valeurs à assigner aux variables. Les valeurs multiples sont - séparées par des espaces ou des retours à la ligne. -
diff --git a/core/src/main/resources/hudson/matrix/TextAxis/help-valueString_ja.html b/core/src/main/resources/hudson/matrix/TextAxis/help-valueString_ja.html deleted file mode 100644 index e399128d56..0000000000 --- a/core/src/main/resources/hudson/matrix/TextAxis/help-valueString_ja.html +++ /dev/null @@ -1,4 +0,0 @@ -
- 変数に割り当てる値です。複数の値を設定する場合は、スペースか改行で区切ります。 - 値がスペースを含む場合は、Shellと同様に引用符を使用してください。 -
\ No newline at end of file diff --git a/core/src/main/resources/hudson/matrix/TextAxis/help-valueString_nl.html b/core/src/main/resources/hudson/matrix/TextAxis/help-valueString_nl.html deleted file mode 100644 index f3447bd99b..0000000000 --- a/core/src/main/resources/hudson/matrix/TextAxis/help-valueString_nl.html +++ /dev/null @@ -1,3 +0,0 @@ -
- Waardenreeks voor uw dimensie. Waarden dienen gescheiden te worden door spaties of een nieuwe lijn character. -
\ No newline at end of file diff --git a/core/src/main/resources/hudson/matrix/TextAxis/help-valueString_pt_BR.html b/core/src/main/resources/hudson/matrix/TextAxis/help-valueString_pt_BR.html deleted file mode 100644 index 40cdeebf8f..0000000000 --- a/core/src/main/resources/hudson/matrix/TextAxis/help-valueString_pt_BR.html +++ /dev/null @@ -1,3 +0,0 @@ -
- Valores associados a variáveis. Valores múltiplos estão separados por espaço em branco ou nova linha. -
diff --git a/core/src/main/resources/hudson/matrix/TextAxis/help-valueString_ru.html b/core/src/main/resources/hudson/matrix/TextAxis/help-valueString_ru.html deleted file mode 100644 index 43fae7007a..0000000000 --- a/core/src/main/resources/hudson/matrix/TextAxis/help-valueString_ru.html +++ /dev/null @@ -1,3 +0,0 @@ -
- Значения присваиваются переменным. Множественные значения разделяются пробелами или переводами строк. -
\ No newline at end of file diff --git a/core/src/main/resources/hudson/matrix/TextAxis/help-valueString_tr.html b/core/src/main/resources/hudson/matrix/TextAxis/help-valueString_tr.html deleted file mode 100644 index 480593f92b..0000000000 --- a/core/src/main/resources/hudson/matrix/TextAxis/help-valueString_tr.html +++ /dev/null @@ -1,3 +0,0 @@ -
- Değerler, değişkenlere atanır. Birden fazla değer boşluk karakteri veya yeni satır seçeneği ile ayrılmalıdır. -
\ No newline at end of file diff --git a/core/src/main/resources/hudson/matrix/TextAxis/help-valueString_zh_TW.html b/core/src/main/resources/hudson/matrix/TextAxis/help-valueString_zh_TW.html deleted file mode 100644 index c2c36061a2..0000000000 --- a/core/src/main/resources/hudson/matrix/TextAxis/help-valueString_zh_TW.html +++ /dev/null @@ -1,4 +0,0 @@ -
- 指定給變數的值。不同值之間請用空白或是換行來隔開。 - 如果值當中有空白字元，請使用 Shell 的引號語法來處理。 -
diff --git a/core/src/main/resources/lib/hudson/project/matrix.jelly b/core/src/main/resources/lib/hudson/project/matrix.jelly deleted file mode 100644 index 720e6fab6b..0000000000 --- a/core/src/main/resources/lib/hudson/project/matrix.jelly +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - Generate configuration matrix and invoke body with 'p' as the instance of T - (of Layouter<T>) - - - If specified, the content of the matrix will be automatically updated via AJAX. - (This happens by requesting URL "./ajaxMatrix", so the caller needs "ajaxMatrix.jelly" - to serve this request.) - - - - -
- - - -

${%Configurations}

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
${%Configuration Matrix}${v}
${r.drawYHeader(loop.index)} - - -
- -
- - -
- - - - - -
- diff --git a/core/src/main/resources/lib/hudson/project/matrix_ar.properties b/core/src/main/resources/lib/hudson/project/matrix_ar.properties deleted file mode 100644 index 196c18b892..0000000000 --- a/core/src/main/resources/lib/hudson/project/matrix_ar.properties +++ /dev/null @@ -1,3 +0,0 @@ -# This file is under the MIT License by authors - -Configurations=\u0627\u0639\u062F\u0627\u062F\u0627\u062A diff --git a/core/src/main/resources/lib/hudson/project/matrix_cs.properties b/core/src/main/resources/lib/hudson/project/matrix_cs.properties deleted file mode 100644 index 04ad3a2878..0000000000 --- a/core/src/main/resources/lib/hudson/project/matrix_cs.properties +++ /dev/null @@ -1,23 +0,0 @@ -# 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. - -Configurations=Konfigurace diff --git a/core/src/main/resources/lib/hudson/project/matrix_da.properties b/core/src/main/resources/lib/hudson/project/matrix_da.properties deleted file mode 100644 index 4309fde13f..0000000000 --- a/core/src/main/resources/lib/hudson/project/matrix_da.properties +++ /dev/null @@ -1,24 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2010, Sun Microsystems, Inc. Kohsuke Kawaguchi. Knud Poulsen. -# -# 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. - -Configurations=Konfigurationer -Configuration\ Matrix=Konfigurationsmatrice diff --git a/core/src/main/resources/lib/hudson/project/matrix_de.properties b/core/src/main/resources/lib/hudson/project/matrix_de.properties deleted file mode 100644 index e3aa83e6ce..0000000000 --- a/core/src/main/resources/lib/hudson/project/matrix_de.properties +++ /dev/null @@ -1,24 +0,0 @@ -# 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. - -Configurations=Konfigurationen -Configuration\ Matrix=Konfigurationsmatrix diff --git a/core/src/main/resources/lib/hudson/project/matrix_es.properties b/core/src/main/resources/lib/hudson/project/matrix_es.properties deleted file mode 100644 index e532e7283e..0000000000 --- a/core/src/main/resources/lib/hudson/project/matrix_es.properties +++ /dev/null @@ -1,24 +0,0 @@ -# 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. - -Configurations=Configuraciones -Configuration\ Matrix=Matriz de configuracin diff --git a/core/src/main/resources/lib/hudson/project/matrix_fi.properties b/core/src/main/resources/lib/hudson/project/matrix_fi.properties deleted file mode 100644 index 42c66e45f6..0000000000 --- a/core/src/main/resources/lib/hudson/project/matrix_fi.properties +++ /dev/null @@ -1,23 +0,0 @@ -# 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. - -Configurations=Konfiguraatiot diff --git a/core/src/main/resources/lib/hudson/project/matrix_fr.properties b/core/src/main/resources/lib/hudson/project/matrix_fr.properties deleted file mode 100644 index 953560a2a5..0000000000 --- a/core/src/main/resources/lib/hudson/project/matrix_fr.properties +++ /dev/null @@ -1,24 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Eric Lefevre-Ardant -# -# 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. - -Configurations=Configurations -Configuration\ Matrix=Matrice de Configuration diff --git a/core/src/main/resources/lib/hudson/project/matrix_he.properties b/core/src/main/resources/lib/hudson/project/matrix_he.properties deleted file mode 100644 index 6bbb569345..0000000000 --- a/core/src/main/resources/lib/hudson/project/matrix_he.properties +++ /dev/null @@ -1,3 +0,0 @@ -# This file is under the MIT License by authors - -Configuration\ Matrix=\u05DE\u05D8\u05E8\u05D9\u05E6\u05EA \u05D4\u05D2\u05D3\u05E8\u05D5\u05EA diff --git a/core/src/main/resources/lib/hudson/project/matrix_it.properties b/core/src/main/resources/lib/hudson/project/matrix_it.properties deleted file mode 100644 index 94f696cd95..0000000000 --- a/core/src/main/resources/lib/hudson/project/matrix_it.properties +++ /dev/null @@ -1,23 +0,0 @@ -# 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. - -Configurations=Configurazioni diff --git a/core/src/main/resources/lib/hudson/project/matrix_ja.properties b/core/src/main/resources/lib/hudson/project/matrix_ja.properties deleted file mode 100644 index a13672471f..0000000000 --- a/core/src/main/resources/lib/hudson/project/matrix_ja.properties +++ /dev/null @@ -1,24 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2009, 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 -# 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. - -Configurations=\u69cb\u6210 -Configuration\ Matrix=\u69cb\u6210\u30de\u30c8\u30ea\u30c3\u30af\u30b9 diff --git a/core/src/main/resources/lib/hudson/project/matrix_ko.properties b/core/src/main/resources/lib/hudson/project/matrix_ko.properties deleted file mode 100644 index 5c19c1c25c..0000000000 --- a/core/src/main/resources/lib/hudson/project/matrix_ko.properties +++ /dev/null @@ -1,3 +0,0 @@ -# This file is under the MIT License by authors - -Configurations=\uC124\uC815 diff --git a/core/src/main/resources/lib/hudson/project/matrix_nl.properties b/core/src/main/resources/lib/hudson/project/matrix_nl.properties deleted file mode 100644 index a1fea7e1c0..0000000000 --- a/core/src/main/resources/lib/hudson/project/matrix_nl.properties +++ /dev/null @@ -1,24 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, id:sorokh -# -# 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. - -Configurations=Configuraties -Configuration\ Matrix=Configuratiematix diff --git a/core/src/main/resources/lib/hudson/project/matrix_pl.properties b/core/src/main/resources/lib/hudson/project/matrix_pl.properties deleted file mode 100644 index 5290fbdd4e..0000000000 --- a/core/src/main/resources/lib/hudson/project/matrix_pl.properties +++ /dev/null @@ -1,24 +0,0 @@ -# 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. - -Configuration\ Matrix=Macierz konfiguracji -Configurations=Konfiguracje diff --git a/core/src/main/resources/lib/hudson/project/matrix_pt_BR.properties b/core/src/main/resources/lib/hudson/project/matrix_pt_BR.properties deleted file mode 100644 index 30bce8c3f3..0000000000 --- a/core/src/main/resources/lib/hudson/project/matrix_pt_BR.properties +++ /dev/null @@ -1,24 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva, Fernando Boaglio -# -# 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. - -Configurations=Configura\u00e7\u00f5es -Configuration\ Matrix=Matriz de configura\u00e7\u00e3o diff --git a/core/src/main/resources/lib/hudson/project/matrix_pt_PT.properties b/core/src/main/resources/lib/hudson/project/matrix_pt_PT.properties deleted file mode 100644 index 47da6b2726..0000000000 --- a/core/src/main/resources/lib/hudson/project/matrix_pt_PT.properties +++ /dev/null @@ -1,23 +0,0 @@ -# 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. - -Configuration\ Matrix=Matrix de Configura\u00E7\u00F5es diff --git a/core/src/main/resources/lib/hudson/project/matrix_ro.properties b/core/src/main/resources/lib/hudson/project/matrix_ro.properties deleted file mode 100644 index ca9f67dae8..0000000000 --- a/core/src/main/resources/lib/hudson/project/matrix_ro.properties +++ /dev/null @@ -1,3 +0,0 @@ -# This file is under the MIT License by authors - -Configuration\ Matrix=Matricea de configurare diff --git a/core/src/main/resources/lib/hudson/project/matrix_ru.properties b/core/src/main/resources/lib/hudson/project/matrix_ru.properties deleted file mode 100644 index 5491cf120a..0000000000 --- a/core/src/main/resources/lib/hudson/project/matrix_ru.properties +++ /dev/null @@ -1,24 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Mike Salnikov -# -# 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. - -Configurations=\u041a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0438 -Configuration\ Matrix=\u041c\u0430\u0442\u0440\u0438\u0446\u0430 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0439 diff --git a/core/src/main/resources/lib/hudson/project/matrix_sv_SE.properties b/core/src/main/resources/lib/hudson/project/matrix_sv_SE.properties deleted file mode 100644 index 55f4c32249..0000000000 --- a/core/src/main/resources/lib/hudson/project/matrix_sv_SE.properties +++ /dev/null @@ -1,4 +0,0 @@ -# This file is under the MIT License by authors - -Configuration\ Matrix=Konfigurationsmatris -Configurations=Inst\u00E4llningar diff --git a/core/src/main/resources/lib/hudson/project/matrix_tr.properties b/core/src/main/resources/lib/hudson/project/matrix_tr.properties deleted file mode 100644 index 93237e6308..0000000000 --- a/core/src/main/resources/lib/hudson/project/matrix_tr.properties +++ /dev/null @@ -1,24 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Oguz Dag -# -# 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. - -Configurations=Konfig\u00fcrasyonlar -Configuration\ Matrix=Konfig\u00fcrasyon Matrisi diff --git a/core/src/main/resources/lib/hudson/project/matrix_uk.properties b/core/src/main/resources/lib/hudson/project/matrix_uk.properties deleted file mode 100644 index 0367c63349..0000000000 --- a/core/src/main/resources/lib/hudson/project/matrix_uk.properties +++ /dev/null @@ -1,3 +0,0 @@ -# This file is under the MIT License by authors - -Configurations=\u041D\u0430\u043B\u0430\u0448\u0442\u0443\u0432\u0430\u043D\u043D\u044F diff --git a/core/src/main/resources/lib/hudson/project/matrix_zh_CN.properties b/core/src/main/resources/lib/hudson/project/matrix_zh_CN.properties deleted file mode 100644 index 000c9a45af..0000000000 --- a/core/src/main/resources/lib/hudson/project/matrix_zh_CN.properties +++ /dev/null @@ -1,23 +0,0 @@ -# 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. - -Configurations=\u914D\u7F6E diff --git a/core/src/main/resources/lib/hudson/project/matrix_zh_TW.properties b/core/src/main/resources/lib/hudson/project/matrix_zh_TW.properties deleted file mode 100644 index ffeb753191..0000000000 --- a/core/src/main/resources/lib/hudson/project/matrix_zh_TW.properties +++ /dev/null @@ -1,24 +0,0 @@ -# The MIT License -# -# Copyright (c) 2013, Chunghwa Telecom Co., Ltd., Pei-Tang Huang -# -# 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. - -Configurations=\u914D\u7F6E -Configuration\ Matrix=\u8a2d\u5b9a\u77e9\u9663 diff --git a/core/src/test/java/hudson/matrix/CombinationFilterUsingBuildParamsTest.java b/core/src/test/java/hudson/matrix/CombinationFilterUsingBuildParamsTest.java deleted file mode 100644 index a302c7e715..0000000000 --- a/core/src/test/java/hudson/matrix/CombinationFilterUsingBuildParamsTest.java +++ /dev/null @@ -1,304 +0,0 @@ -/* - * The MIT License - * - * Copyright (c) 2012, RedHat 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 static org.mockito.Matchers.anyInt; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; -import hudson.ExtensionList; -import hudson.matrix.MatrixBuild.MatrixBuildExecution; -import hudson.matrix.listeners.MatrixBuildListener; -import hudson.model.AbstractItem; -import hudson.model.BuildListener; -import hudson.model.Cause; -import hudson.model.Node; -import hudson.model.ParametersAction; -import hudson.model.Result; -import hudson.model.Run; -import hudson.model.StringParameterValue; - -import java.io.IOException; -import java.io.PrintStream; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; - -import jenkins.model.Jenkins; - -import org.apache.commons.io.output.ByteArrayOutputStream; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.jvnet.hudson.test.Bug; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; -import org.mockito.verification.VerificationMode; -import org.powermock.api.mockito.PowerMockito; -import org.powermock.core.classloader.annotations.PrepareForTest; -import org.powermock.modules.junit4.PowerMockRunner; - -/** - * Make sure that the combination filter schedules correct builds in correct order - * - * @author ogondza - */ -@RunWith(PowerMockRunner.class) -@PrepareForTest( {Jenkins.class, MatrixBuildListener.class, MatrixProject.class, AbstractItem.class}) -public class CombinationFilterUsingBuildParamsTest { - - /** - * Execute releases: experimental, stable, beta, devel - * - * x s b d - * 0.1 - * 0.9 * * * * - * 1 * * * - * 2 * * - * 3 * - */ - private static final String filter = - String.format( - "(%s) || (%s) || (%s)", - "RELEASE == 'stable' && VERSION == '1'", - "RELEASE == 'beta' && VERSION >= '1' && VERSION <= '2'", - "RELEASE == 'devel' && VERSION >= '1' && VERSION <= '3'" - ); - - private static final String touchstoneFilter = "VERSION == '0.9'"; - - private static final List releases = Arrays.asList( - "stable", "beta", "devel", "experimental" - ); - - private final Map confs = new HashMap(); - private final MatrixExecutionStrategy strategy = new DefaultMatrixExecutionStrategyImpl ( - true, touchstoneFilter, Result.SUCCESS, new NoopMatrixConfigurationSorter() - ); - - private MatrixProject project; - @Mock private MatrixBuildExecution execution; - @Mock private MatrixBuild build; - @Mock private MatrixRun run; - @Mock private BuildListener listener; - - @Mock private Jenkins jenkins; - @Mock private ExtensionList extensions; - - @Before - public void setUp() throws Exception { - - MockitoAnnotations.initMocks(this); - - usingDummyJenkins(); - usingNoListeners(); - usingDummyProject(); - usingDummyExecution(); - withReleaseAxis(releases); - } - - @Test - public void testCombinationFilterV01() throws InterruptedException, IOException { - - givenTheVersionIs("0.1"); - - strategy.run(execution); - - wasNotBuilt(confs.get("devel")); - wasNotBuilt(confs.get("beta")); - wasNotBuilt(confs.get("stable")); - wasNotBuilt(confs.get("experimental")); - } - - @Test - public void testCombinationFilterV09() throws InterruptedException, IOException { - - givenTheVersionIs("0.9"); - - strategy.run(execution); - - wasBuilt(confs.get("devel")); - wasBuilt(confs.get("beta")); - wasBuilt(confs.get("stable")); - wasBuilt(confs.get("experimental")); - } - - @Test - public void testCombinationFilterV1() throws InterruptedException, IOException { - - givenTheVersionIs("1"); - - strategy.run(execution); - - wasBuilt(confs.get("devel")); - wasBuilt(confs.get("beta")); - wasBuilt(confs.get("stable")); - wasNotBuilt(confs.get("experimental")); - } - - @Test - public void testCombinationFilterV2() throws InterruptedException, IOException { - - givenTheVersionIs("2"); - - strategy.run(execution); - - wasBuilt(confs.get("devel")); - wasBuilt(confs.get("beta")); - wasNotBuilt(confs.get("stable")); - wasNotBuilt(confs.get("experimental")); - } - - @Test - public void testCombinationFilterV3() throws InterruptedException, IOException { - - givenTheVersionIs("3"); - - strategy.run(execution); - - wasBuilt(confs.get("devel")); - wasNotBuilt(confs.get("beta")); - wasNotBuilt(confs.get("stable")); - wasNotBuilt(confs.get("experimental")); - } - - @Test - @Bug(7285) - public void reproduceTouchstoneRegression () throws InterruptedException, IOException { - - givenTheVersionIs("3"); - - // No touchstone - MatrixExecutionStrategy myStrategy = new DefaultMatrixExecutionStrategyImpl ( - true, null, Result.SUCCESS, new NoopMatrixConfigurationSorter() - ); - - myStrategy.run(execution); - - wasBuilt(confs.get("devel")); - wasNotBuilt(confs.get("beta")); - wasNotBuilt(confs.get("stable")); - wasNotBuilt(confs.get("experimental")); - } - - private void usingDummyProject() { - - project = PowerMockito.mock(MatrixProject.class); - - PowerMockito.when(build.getParent()).thenReturn(project); - PowerMockito.when(project.getUrl()).thenReturn("/my/project/"); - - when(project.getAxes()).thenReturn(new AxisList(new Axis("RELEASE", releases))); - when(project.getCombinationFilter()).thenReturn(filter); - } - - private void usingDummyExecution() { - - when(execution.getProject()).thenReturn(project); - when(execution.getBuild()).thenReturn(build); - when(execution.getListener()).thenReturn(listener); - - // throw away logs - when(listener.getLogger()).thenReturn(new PrintStream( - new ByteArrayOutputStream() - )); - - // Succeed immediately - when(run.isBuilding()).thenReturn(false); - when(run.getResult()).thenReturn(Result.SUCCESS); - } - - private void usingDummyJenkins() { - - PowerMockito.mockStatic(Jenkins.class); - when(Jenkins.getInstance()).thenReturn(jenkins); - when(jenkins.getNodes()).thenReturn(new ArrayList()); - } - - private void usingNoListeners() { - - when(extensions.iterator()).thenReturn(new ArrayList().iterator()); - when(MatrixBuildListener.all()).thenReturn(extensions); - } - - private void withReleaseAxis(final List releases) { - - for(final String release: releases) { - - confs.put(release, getConfiguration("RELEASE=" + release)); - } - - when(execution.getActiveConfigurations()).thenReturn( - new HashSet(confs.values()) - ); - } - - private MatrixConfiguration getConfiguration (final String axis) { - - final MatrixConfiguration conf = mock(MatrixConfiguration.class); - when(conf.getParent()).thenReturn(project); - when(conf.getCombination()).thenReturn(Combination.fromString(axis)); - when(conf.getDisplayName()).thenReturn(axis); - when(conf.getUrl()).thenReturn(axis); - when(conf.getBuildByNumber(anyInt())).thenReturn(run); - - return conf; - } - - private void givenTheVersionIs(final String version) { - - final ParametersAction parametersAction = new ParametersAction( - new StringParameterValue("VERSION", version) - ); - - when(build.getAction(ParametersAction.class)) - .thenReturn(parametersAction) - ; - } - - private void wasBuilt(final MatrixConfiguration conf) { - - wasBuildTimes(conf, times(1)); - } - - private void wasNotBuilt(final MatrixConfiguration conf) { - - wasBuildTimes(conf, never()); - } - - private void wasBuildTimes( - final MatrixConfiguration conf, final VerificationMode mode - ) { - - verify(conf, mode).scheduleBuild( - new ArrayList(), - new Cause.UpstreamCause((Run) build) - ); - } -} diff --git a/core/src/test/java/hudson/matrix/CombinationTest.java b/core/src/test/java/hudson/matrix/CombinationTest.java deleted file mode 100644 index 9ee7c601fb..0000000000 --- a/core/src/test/java/hudson/matrix/CombinationTest.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * The MIT License - * - * Copyright (c) 2004-2009, 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 - * 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 junit.framework.TestCase; - -import java.util.Map; -import java.util.HashMap; - -/** - * @author Kohsuke Kawaguchi - */ -public class CombinationTest extends TestCase { - AxisList axes = new AxisList( - new Axis("a","X","x"), - new Axis("b","Y","y")); - - @SuppressWarnings({"RedundantStringConstructorCall"}) - public void testEval() { - Map r = new HashMap(); - r.put("a","X"); - r.put("b",new String("Y")); // make sure this 'Y' is not the same object as literal "Y". - Combination c = new Combination(r); - - r.put("a","x"); - Combination d = new Combination(r); - - assertTrue(eval(c, null)); - assertTrue(eval(c," ")); - assertTrue(eval(c,"true")); - assertTrue(eval(c,"a=='X'")); - assertTrue(eval(c,"b=='Y'")); - assertTrue(eval(c,"(a=='something').implies(b=='other')")); - assertTrue(eval(c,"index%2==0")^eval(d,"index%2==0")); - assertTrue(eval(c,"index%2==1")^eval(d,"index%2==1")); - } - - private boolean eval(Combination c, String exp) { - return c.evalGroovyExpression(axes, exp); - } -} diff --git a/test/src/test/groovy/hudson/matrix/MatrixProjectCustomWorkspaceTest.groovy b/test/src/test/groovy/hudson/matrix/MatrixProjectCustomWorkspaceTest.groovy deleted file mode 100644 index 436a0c0210..0000000000 --- a/test/src/test/groovy/hudson/matrix/MatrixProjectCustomWorkspaceTest.groovy +++ /dev/null @@ -1,147 +0,0 @@ -package hudson.matrix - -import java.util.concurrent.CountDownLatch -import org.jvnet.hudson.test.TestBuilder -import hudson.model.AbstractBuild -import hudson.Launcher -import hudson.model.BuildListener -import org.jvnet.hudson.test.HudsonTestCase - -/** - * Tests the custom workspace support in {@link MatrixProject}. - * - * To validate the lease behaviour, use concurrent builds to run two builds and make sure they get - * same/different workspaces. - * - * @author Kohsuke Kawaguchi - */ -class MatrixProjectCustomWorkspaceTest extends HudsonTestCase { - /** - * Test the case where both the parent and the child has custom workspace specified. - */ - void testCustomWorkspace1() { - def p = createMatrixProject() - def dir = env.temporaryDirectoryAllocator.allocate() - p.customWorkspace = dir - p.childCustomWorkspace = "xyz" - - configRoundtrip(p) - configureCustomWorkspaceConcurrentBuild(p) - - // all concurrent builds should build on the same one workspace - runTwoConcurrentBuilds(p).each { b -> - assertEquals(dir.path, b.workspace.getRemote()) - b.runs.each { r -> assertEquals(new File(dir,"xyz").path, r.workspace.getRemote()) } - } - } - - /** - * Test the case where only the parent has a custom workspace. - */ - void testCustomWorkspace2() { - def p = createMatrixProject() - def dir = env.temporaryDirectoryAllocator.allocate() - p.customWorkspace = dir - p.childCustomWorkspace = null - - configRoundtrip(p) - configureCustomWorkspaceConcurrentBuild(p) - - def bs = runTwoConcurrentBuilds(p) - - // all parent builds share the same workspace - bs.each { b -> - assertEquals(dir.path, b.workspace.getRemote()) - } - // foo=1 #1 and foo=1 #2 shares the same workspace, - (0..<2).each { i -> - assertTrue bs[0].runs[i].workspace == bs[1].runs[i].workspace - } - // but foo=1 #1 and foo=2 #1 shouldn't. - (0..<2).each { i -> - assertTrue bs[i].runs[0].workspace != bs[i].runs[1].workspace - } - } - - /** - * Test the case where only the child has a custom workspace. - */ - void testCustomWorkspace3() { - def p = createMatrixProject() - p.customWorkspace = null - p.childCustomWorkspace = "." - - configRoundtrip(p) - configureCustomWorkspaceConcurrentBuild(p) - - def bs = runTwoConcurrentBuilds(p) - - // each parent gets different directory - assertTrue bs[0].workspace != bs[1].workspace - // but all #1 builds should get the same workspace - bs.each { b -> - (0..<2).each { i-> assertTrue b.workspace == b.runs[i].workspace } - } - } - - /** - * Test the case where neither has custom workspace - */ - void testCustomWorkspace4() { - def p = createMatrixProject() - p.customWorkspace = null - p.childCustomWorkspace = null - - configRoundtrip(p) - configureCustomWorkspaceConcurrentBuild(p) - - def bs = runTwoConcurrentBuilds(p) - - // each parent gets different directory - assertTrue bs[0].workspace != bs[1].workspace - // and every sub-build gets a different directory - bs.each { b -> - def x = b.runs[0].workspace - def y = b.runs[1].workspace - def z = b.workspace - - assertTrue x!=y - assertTrue y!=z - assertTrue z!=x - } - } - - /** - * Configures MatrixProject such that two builds run concurrently. - */ - def configureCustomWorkspaceConcurrentBuild(MatrixProject p) { - // needs sufficient parallel execution capability - jenkins.numExecutors = 10 - jenkins.updateComputerList() - - p.axes = new AxisList(new TextAxis("foo", "1", "2")) - p.concurrentBuild = true; - def latch = new CountDownLatch(4) - - p.buildersList.add(new TestBuilder() { - boolean perform(AbstractBuild build, Launcher launcher, BuildListener listener) { - latch.countDown() - latch.await() - return true - } - }) - } - - /** - * Runs two concurrent builds and return their results. - */ - List runTwoConcurrentBuilds(MatrixProject p) { - def f1 = p.scheduleBuild2(0) - // get one going - f1.waitForStart() - def f2 = p.scheduleBuild2(0) - - def bs = [f1, f2]*.get().each { assertBuildStatusSuccess(it) } - return bs - } -} diff --git a/test/src/test/groovy/hudson/matrix/MatrixProjectTest.groovy b/test/src/test/groovy/hudson/matrix/MatrixProjectTest.groovy deleted file mode 100644 index 118f0bbe33..0000000000 --- a/test/src/test/groovy/hudson/matrix/MatrixProjectTest.groovy +++ /dev/null @@ -1,522 +0,0 @@ -/* - * The MIT License - * - * Copyright (c) 2004-2011, Sun Microsystems, Inc., CloudBees, 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.model.Cause -import hudson.model.Result -import hudson.slaves.DumbSlave -import hudson.slaves.RetentionStrategy -import hudson.tasks.Ant -import hudson.tasks.ArtifactArchiver -import hudson.tasks.Fingerprinter -import hudson.tasks.Maven -import hudson.tasks.Shell -import hudson.tasks.BatchFile -import org.jvnet.hudson.test.Email -import org.jvnet.hudson.test.SingleFileSCM -import org.jvnet.hudson.test.UnstableBuilder -import org.jvnet.hudson.test.recipes.LocalData; -import com.gargoylesoftware.htmlunit.html.HtmlTable -import org.jvnet.hudson.test.Bug -import org.jvnet.hudson.test.TestBuilder -import hudson.model.AbstractBuild -import hudson.Launcher -import hudson.model.BuildListener -import hudson.util.OneShotEvent -import java.util.concurrent.Future -import java.util.concurrent.TimeUnit -import java.util.concurrent.TimeoutException -import hudson.model.JDK -import hudson.model.Slave -import hudson.Functions -import hudson.model.ParametersDefinitionProperty -import hudson.model.FileParameterDefinition -import hudson.model.Cause.LegacyCodeCause -import hudson.model.ParametersAction -import hudson.model.FileParameterValue -import hudson.model.StringParameterDefinition -import hudson.model.StringParameterValue -import hudson.scm.SubversionSCM.SvnInfo; -import hudson.scm.RevisionParameterAction; -import java.util.List; -import java.util.ArrayList; -import hudson.model.Action; - -import java.util.concurrent.CountDownLatch - -import static hudson.model.Node.Mode.EXCLUSIVE -import static org.junit.Assert.* -import org.junit.Rule -import org.junit.Test -import org.jvnet.hudson.test.JenkinsRule -import org.jvnet.hudson.test.RandomlyFails -import org.junit.rules.TemporaryFolder - -/** - * - * - * @author Kohsuke Kawaguchi - */ -public class MatrixProjectTest { - - @Rule public JenkinsRule j = new JenkinsRule(); - @Rule public TemporaryFolder tmp = new TemporaryFolder(); - - /** - * Tests that axes are available as build variables in the Ant builds. - */ - @Test - public void testBuildAxisInAnt() throws Exception { - MatrixProject p = createMatrixProject(); - Ant.AntInstallation ant = j.configureDefaultAnt(); - p.getBuildersList().add(new Ant('-Dprop=${db} test',ant.getName(),null,null,null)); - - // we need a dummy build script that echos back our property - p.setScm(new SingleFileSCM("build.xml",'assertion ${prop}=${db}')); - - MatrixBuild build = p.scheduleBuild2(0, new Cause.UserCause()).get(); - List runs = build.getRuns(); - assertEquals(4,runs.size()); - for (MatrixRun run : runs) { - j.assertBuildStatus(Result.SUCCESS, run); - String expectedDb = run.getParent().getCombination().get("db"); - j.assertLogContains("assertion "+expectedDb+"="+expectedDb, run); - } - } - - /** - * Tests that axes are available as build variables in the Maven builds. - */ - @RandomlyFails("Not a v4.0.0 POM. for project org.jvnet.maven-antrun-extended-plugin:maven-antrun-extended-plugin at /home/jenkins/.m2/repository/org/jvnet/maven-antrun-extended-plugin/maven-antrun-extended-plugin/1.40/maven-antrun-extended-plugin-1.40.pom") - @Test - public void testBuildAxisInMaven() throws Exception { - MatrixProject p = createMatrixProject(); - Maven.MavenInstallation maven = j.configureDefaultMaven(); - p.getBuildersList().add(new Maven('-Dprop=${db} validate',maven.getName())); - - // we need a dummy build script that echos back our property - p.setScm(new SingleFileSCM("pom.xml",getClass().getResource("echo-property.pom"))); - - MatrixBuild build = p.scheduleBuild2(0).get(); - List runs = build.getRuns(); - assertEquals(4,runs.size()); - for (MatrixRun run : runs) { - j.assertBuildStatus(Result.SUCCESS, run); - String expectedDb = run.getParent().getCombination().get("db"); - System.out.println(run.getLog()); - j.assertLogContains("assertion "+expectedDb+"="+expectedDb, run); - // also make sure that the variables are expanded at the command line level. - assertFalse(run.getLog().contains('-Dprop=${db}')); - } - } - - /** - * Test that configuration filters work - */ - @Test - public void testConfigurationFilter() throws Exception { - MatrixProject p = createMatrixProject(); - p.setCombinationFilter("db==\"mysql\""); - MatrixBuild build = p.scheduleBuild2(0).get(); - assertEquals(2, build.getRuns().size()); - } - - /** - * Test that touch stone builds work - */ - @Test - public void testTouchStone() throws Exception { - MatrixProject p = createMatrixProject(); - p.setTouchStoneCombinationFilter("db==\"mysql\""); - p.setTouchStoneResultCondition(Result.SUCCESS); - MatrixBuild build = p.scheduleBuild2(0).get(); - assertEquals(4, build.getRuns().size()); - - p.getBuildersList().add(new UnstableBuilder()); - build = p.scheduleBuild2(0).get(); - assertEquals(2, build.exactRuns.size()); - } - - protected MatrixProject createMatrixProject() throws IOException { - MatrixProject p = j.createMatrixProject(); - - // set up 2x2 matrix - AxisList axes = new AxisList(); - axes.add(new TextAxis("db","mysql","oracle")); - axes.add(new TextAxis("direction","north","south")); - p.setAxes(axes); - - return p; - } - - /** - * Fingerprinter failed to work on the matrix project. - */ - @Email("http://www.nabble.com/1.286-version-and-fingerprints-option-broken-.-td22236618.html") - @Test - public void testFingerprinting() throws Exception { - MatrixProject p = createMatrixProject(); - if (Functions.isWindows()) - p.getBuildersList().add(new BatchFile("echo \"\" > p")); - else - p.getBuildersList().add(new Shell("touch p")); - - p.getPublishersList().add(new ArtifactArchiver("p",null,false, false)); - p.getPublishersList().add(new Fingerprinter("",true)); - j.buildAndAssertSuccess(p); - } - - void assertRectangleTable(MatrixProject p) { - def html = j.createWebClient().getPage(p); - HtmlTable table = html.selectSingleNode("id('matrix')/table") - - // remember cells that are extended from rows above. - def rowSpans = [:]; - def masterWidth = null - for (r in table.rows) { - int width = r.cells*.columnSpan.sum() + rowSpans.values().sum(0); - if (masterWidth==null) - masterWidth = width; - else - assertEquals(masterWidth,width); - - for (c in r.cells) - rowSpans[c.rowSpan] = (rowSpans[c.rowSpan]?:0)+c.columnSpan - // shift rowSpans by one - def nrs =[:] - rowSpans.each { k,v -> if(k>1) nrs[k-1]=v } - rowSpans = nrs - } - } - - @Bug(4245) - @Test - void testLayout1() { - // 5*5*5*5*5 matrix - def p = createMatrixProject(); - p.axes = new AxisList( - ['a','b','c','d','e'].collect { name -> new TextAxis(name, (1..4)*.toString() ) } - ); - assertRectangleTable(p) - } - - @Bug(4245) - @Test - void testLayout2() { - // 2*3*4*5*6 matrix - def p = createMatrixProject(); - p.axes = new AxisList( - (2..6).collect { n -> new TextAxis("axis${n}", (1..n)*.toString() ) } - ); - assertRectangleTable(p) - } - - /** - * Makes sure that the configuration correctly roundtrips. - */ - @Test - public void testConfigRoundtrip() { - j.jenkins.getJDKs().addAll([ - new JDK("jdk1.7","somewhere"), - new JDK("jdk1.6","here"), - new JDK("jdk1.5","there")]); - - List slaves = (0..2).collect { j.createSlave() } - - def p = createMatrixProject(); - p.axes.add(new JDKAxis(["jdk1.6","jdk1.5"])); - p.axes.add(new LabelAxis("label1",[slaves[0].nodeName, slaves[1].nodeName])); - p.axes.add(new LabelAxis("label2",[slaves[2].nodeName])); // make sure single value handling works OK - def o = new AxisList(p.axes); - j.configRoundtrip(p); - def n = p.axes; - - assertEquals(o.size(),n.size()); - (0 ..< (o.size())).each { i -> - def oi = o[i]; - def ni = n[i]; - assertSame(oi.class,ni.class); - assertEquals(oi.name,ni.name); - assertEquals(oi.values,ni.values); - } - - - def before = new DefaultMatrixExecutionStrategyImpl(true, "foo", Result.UNSTABLE, null) - p.executionStrategy = before; - j.configRoundtrip(p); - j.assertEqualDataBoundBeans(p.executionStrategy,before); - - before = new DefaultMatrixExecutionStrategyImpl(false, null, null, null) - p.executionStrategy = before; - j.configRoundtrip(p); - j.assertEqualDataBoundBeans(p.executionStrategy,before); - } - - @Test - public void testLabelAxes() { - def p = createMatrixProject(); - - List slaves = (0..<4).collect { j.createSlave() } - - p.axes.add(new LabelAxis("label1",[slaves[0].nodeName, slaves[1].nodeName])); - p.axes.add(new LabelAxis("label2",[slaves[2].nodeName, slaves[3].nodeName])); - - System.out.println(p.labels); - assertEquals(4,p.labels.size()); - assertTrue(p.labels.contains(j.jenkins.getLabel("slave0&&slave2"))); - assertTrue(p.labels.contains(j.jenkins.getLabel("slave1&&slave2"))); - assertTrue(p.labels.contains(j.jenkins.getLabel("slave0&&slave3"))); - assertTrue(p.labels.contains(j.jenkins.getLabel("slave1&&slave3"))); - } - - /** - * Quiettng down Hudson causes a dead lock if the parent is running but children is in the queue - */ - @Bug(4873) - @Test - void testQuietDownDeadlock() { - def p = createMatrixProject(); - p.axes = new AxisList(new TextAxis("foo","1","2")); - p.runSequentially = true; // so that we can put the 2nd one in the queue - - OneShotEvent firstStarted = new OneShotEvent(); - OneShotEvent buildCanProceed = new OneShotEvent(); - - p.getBuildersList().add( [perform:{ AbstractBuild build, Launcher launcher, BuildListener listener -> - firstStarted.signal(); - buildCanProceed.block(); - return true; - }] as TestBuilder ); - Future f = p.scheduleBuild2(0) - - // have foo=1 block to make sure the 2nd configuration is in the queue - firstStarted.block(); - // enter into the quiet down while foo=2 is still in the queue - j.jenkins.doQuietDown(); - buildCanProceed.signal(); - - // make sure foo=2 still completes. use time out to avoid hang - j.assertBuildStatusSuccess(f.get(10,TimeUnit.SECONDS)); - - // MatrixProject scheduled after the quiet down shouldn't start - try { - Future g = p.scheduleBuild2(0) - g.get(3,TimeUnit.SECONDS) - fail() - } catch (TimeoutException e) { - // expected - } - } - - @Bug(9009) - @Test - void testTrickyNodeName() { - def names = [ j.createSlave("Sean's Workstation",null), j.createSlave("John\"s Workstation",null) ]*.nodeName; - def p = createMatrixProject(); - p.setAxes(new AxisList([new LabelAxis("label",names)])); - j.configRoundtrip(p); - - LabelAxis a = p.axes.find("label"); - assertEquals(a.values as Set,names as Set); - } - - @Bug(10108) - @Test - void testTwoFileParams() { - def p = createMatrixProject(); - p.axes = new AxisList(new TextAxis("foo","1","2","3","4")); - p.addProperty(new ParametersDefinitionProperty( - new FileParameterDefinition("a.txt",""), - new FileParameterDefinition("b.txt",""), - )); - - def dir = tmp.getRoot() - def f = p.scheduleBuild2(0,new LegacyCodeCause(),new ParametersAction( - ["aaa","bbb"].collect { it -> - def v = new FileParameterValue(it+".txt",File.createTempFile(it,"", dir),it) - v.setLocation(it) - return v; - } - )) - - j.assertBuildStatusSuccess(f.get(10,TimeUnit.SECONDS)); - } - - /** - * Verifies that the concurrent build feature works, and makes sure - * that each gets its own unique workspace. - */ - @Test - void testConcurrentBuild() { - j.jenkins.numExecutors = 10 - j.jenkins.updateComputerList() - - def p = createMatrixProject() - p.axes = new AxisList(new TextAxis("foo","1","2")) - p.concurrentBuild = true; - def latch = new CountDownLatch(4) - def dirs = Collections.synchronizedSet(new HashSet()) - - p.buildersList.add(new TestBuilder() { - boolean perform(AbstractBuild build, Launcher launcher, BuildListener listener) { - dirs << build.workspace.getRemote() - def marker = build.workspace.child("file") - def name = build.fullDisplayName - marker.write(name,"UTF-8") - latch.countDown() - latch.await() - assertEquals(name,marker.readToString()) - return true - } - }) - - // should have gotten all unique names - def f1 = p.scheduleBuild2(0) - // get one going - f1.waitForStart() - def f2 = p.scheduleBuild2(0) - [f1,f2]*.get().each{ j.assertBuildStatusSuccess(it)} - - assertEquals 4, dirs.size() - } - - - /** - * Test that Actions are passed to configurations - */ - @Test - public void testParameterActions() throws Exception { - MatrixProject p = createMatrixProject(); - - ParametersDefinitionProperty pdp = new ParametersDefinitionProperty( - new StringParameterDefinition("PARAM_A","default_a"), - new StringParameterDefinition("PARAM_B","default_b"), - ); - - p.addProperty(pdp); - ParametersAction pa = new ParametersAction( pdp.getParameterDefinitions().collect { return it.getDefaultParameterValue() } ) - - MatrixBuild build = p.scheduleBuild2(0,new LegacyCodeCause(), pa).get(); - - assertEquals(4, build.getRuns().size()); - - for(MatrixRun run : build.getRuns()) { - ParametersAction pa1 = run.getAction(ParametersAction.class); - assertNotNull(pa1); - ["PARAM_A","PARAM_B"].each{ assertNotNull(pa1.getParameter(it)) } - } - } - - /** - * Test that other Actions are passed to configurations - * requires supported version of subversion plugin 1.43+ - */ - - //~ public void testMatrixChildActions() throws Exception { - //~ MatrixProject p = createMatrixProject(); - - //~ ParametersDefinitionProperty pdp = new ParametersDefinitionProperty( - //~ new StringParameterDefinition("PARAM_A","default_a"), - //~ new StringParameterDefinition("PARAM_B","default_b"), - //~ ); - - //~ p.addProperty(pdp); - - //~ List actions = new ArrayList(); - //~ actions.add(new RevisionParameterAction(new SvnInfo("http://example.com/svn/repo/",1234))); - //~ actions.add(new ParametersAction( pdp.getParameterDefinitions().collect { return it.getDefaultParameterValue() } )); - - //~ MatrixBuild build = p.scheduleBuild2(0,new LegacyCodeCause(), actions).get(); - - //~ assertEquals(4, build.getRuns().size()); - - //~ for(MatrixRun run : build.getRuns()) { - //~ ParametersAction pa1 = run.getAction(ParametersAction.class); - //~ assertNotNull(pa1); - //~ ["PARAM_A","PARAM_B"].each{ assertNotNull(pa1.getParameter(it)) }; - - //~ assertNotNull(run.getAction(RevisionParameterAction.class)); - //~ } - //~ } - - @Bug(15271) - @LocalData - @Test - public void testUpgrade() throws Exception { - MatrixProject p = j.jenkins.getItemByFullName("x", MatrixProject.class); - assertNotNull(p); - MatrixExecutionStrategy executionStrategy = p.getExecutionStrategy(); - assertEquals(DefaultMatrixExecutionStrategyImpl.class, executionStrategy.getClass()); - DefaultMatrixExecutionStrategyImpl defaultExecutionStrategy = (DefaultMatrixExecutionStrategyImpl) executionStrategy; - assertFalse(defaultExecutionStrategy.isRunSequentially()); - assertNull(defaultExecutionStrategy.getTouchStoneCombinationFilter()); - assertNull(defaultExecutionStrategy.getTouchStoneResultCondition()); - assertNull(defaultExecutionStrategy.getSorter()); - } - - @Bug(17337) - @Test public void reload() throws Exception { - MatrixProject p = j.createMatrixProject(); - AxisList axes = new AxisList(); - axes.add(new TextAxis("p", "only")); - p.setAxes(axes); - String n = p.getFullName(); - j.buildAndAssertSuccess(p); - j.jenkins.reload(); - p = j.jenkins.getItemByFullName(n, MatrixProject.class); - assertNotNull(p); - MatrixConfiguration c = p.getItem("p=only"); - assertNotNull(c); - assertNotNull(c.getBuildByNumber(1)); - } - - /** - * Given a small master and a big exclusive slave, the fair scheduling would prefer running the flyweight job - * in the slave. But if the scheduler honors the EXCLUSIVE flag, then we should see it built on the master. - * - * Since there's a chance that the fair scheduling just so happens to pick up the master by chance, - * we try multiple jobs to reduce the chance of that happening. - */ - @Bug(5076) - @Test - public void dontRunOnExclusiveSlave() { - def projects = (0..10).collect { - def m = j.createMatrixProject() - def axes = new AxisList(); - axes.add(new TextAxis("p", "only")); - m.axes = axes - return m; - } - - def s = new DumbSlave("big", "this is a big slave", j.createTmpDir().path, "20", EXCLUSIVE, "", j.createComputerLauncher(null), RetentionStrategy.NOOP); - j.jenkins.addNode(s); - - s.toComputer().connect(false).get(); // connect this guy - - projects.each { p -> - def b = j.assertBuildStatusSuccess(p.scheduleBuild2(2)) - assertSame(b.builtOn, j.jenkins) - } - } -} diff --git a/test/src/test/java/hudson/matrix/MatrixConfigurationSorterTest.java b/test/src/test/java/hudson/matrix/MatrixConfigurationSorterTest.java deleted file mode 100644 index ef78a581a1..0000000000 --- a/test/src/test/java/hudson/matrix/MatrixConfigurationSorterTest.java +++ /dev/null @@ -1,48 +0,0 @@ -package hudson.matrix; - -import hudson.model.Item; -import hudson.util.FormValidation; - -import org.jvnet.hudson.test.HudsonTestCase; -import org.jvnet.hudson.test.TestExtension; -import org.kohsuke.stapler.DataBoundConstructor; - -/** - * @author Kohsuke Kawaguchi - */ -public class MatrixConfigurationSorterTest extends HudsonTestCase { - public void testConfigRoundtrip() throws Exception { - MatrixProject p = createMatrixProject(); - configRoundtrip((Item)p); - assertEqualDataBoundBeans(new NoopMatrixConfigurationSorter(),p.getSorter()); - - SorterImpl before = new SorterImpl(); - p.setSorter(before); - p.setRunSequentially(true); - configRoundtrip((Item)p); - Object after = p.getSorter(); - assertNotSame(before,after); - assertSame(before.getClass(),after.getClass()); - } - - public static class SorterImpl extends MatrixConfigurationSorter { - @DataBoundConstructor - public SorterImpl() {} - - @Override - public void validate(MatrixProject p) throws FormValidation { - } - - public int compare(MatrixConfiguration o1, MatrixConfiguration o2) { - return o1.getDisplayName().compareTo(o2.getDisplayName()); - } - - @TestExtension - public static class DescriptorImpl extends MatrixConfigurationSorterDescriptor { - @Override - public String getDisplayName() { - return "Test Sorter"; - } - } - } -} diff --git a/test/src/test/java/hudson/matrix/MatrixProjectDependencyTest.java b/test/src/test/java/hudson/matrix/MatrixProjectDependencyTest.java deleted file mode 100644 index 750cff724e..0000000000 --- a/test/src/test/java/hudson/matrix/MatrixProjectDependencyTest.java +++ /dev/null @@ -1,41 +0,0 @@ -package hudson.matrix; - -import java.util.List; - -import org.jvnet.hudson.test.HudsonTestCase; - -import hudson.model.AbstractProject; -import hudson.model.FreeStyleBuild; -import hudson.model.FreeStyleProject; -import hudson.model.Result; -import hudson.tasks.BuildTrigger; -import hudson.util.RunList; - -/** - * @author Stefan Wolf - */ -public class MatrixProjectDependencyTest extends HudsonTestCase { - - /** - * Checks if the MatrixProject adds and Triggers downstream Projects via - * the DependencyGraph - */ - public void testMatrixProjectTriggersDependencies() throws Exception { - MatrixProject matrixProject = createMatrixProject(); - FreeStyleProject freestyleProject = createFreeStyleProject(); - matrixProject.getPublishersList().add(new BuildTrigger(freestyleProject.getName(), false)); - - jenkins.rebuildDependencyGraph(); - - buildAndAssertSuccess(matrixProject); - waitUntilNoActivity(); - - RunList builds = freestyleProject.getBuilds(); - assertEquals("There should only be one FreestyleBuild", 1, builds.size()); - FreeStyleBuild build = builds.iterator().next(); - assertEquals(Result.SUCCESS, build.getResult()); - List downstream = jenkins.getDependencyGraph().getDownstream(matrixProject); - assertTrue(downstream.contains(freestyleProject)); - } - -} diff --git a/test/src/test/java/hudson/matrix/MatrixTest.java b/test/src/test/java/hudson/matrix/MatrixTest.java deleted file mode 100644 index 369898c2c1..0000000000 --- a/test/src/test/java/hudson/matrix/MatrixTest.java +++ /dev/null @@ -1,76 +0,0 @@ -/* - * The MIT License - * - * Copyright (c) 2010-2011, 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.matrix; - -import hudson.model.Item; -import hudson.security.AuthorizationMatrixProperty; -import hudson.security.ProjectMatrixAuthorizationStrategy; -import java.util.Collections; -import org.acegisecurity.context.SecurityContextHolder; -import com.gargoylesoftware.htmlunit.xml.XmlPage; -import org.jvnet.hudson.test.HudsonTestCase; -import org.jvnet.hudson.test.Bug; - -/** - * @author Alan Harder - */ -public class MatrixTest extends HudsonTestCase { - - /** - * Test that spaces are encoded as %20 for project name, axis name and axis value. - */ - public void testSpaceInUrl() { - MatrixProject mp = new MatrixProject("matrix test"); - MatrixConfiguration mc = new MatrixConfiguration(mp, Combination.fromString("foo bar=baz bat")); - assertEquals("job/matrix%20test/", mp.getUrl()); - assertEquals("job/matrix%20test/foo%20bar=baz%20bat/", mc.getUrl()); - } - - /** - * Test that project level permissions apply to child configurations as well. - */ - @Bug(9293) - public void testConfigurationACL() throws Exception { - jenkins.setAuthorizationStrategy(new ProjectMatrixAuthorizationStrategy()); - MatrixProject mp = createMatrixProject(); - mp.setAxes(new AxisList(new Axis("foo", "a", "b"))); - MatrixConfiguration mc = mp.getItem("foo=a"); - assertNotNull(mc); - SecurityContextHolder.clearContext(); - assertFalse(mc.getACL().hasPermission(Item.READ)); - mp.addProperty(new AuthorizationMatrixProperty( - Collections.singletonMap(Item.READ, Collections.singleton("anonymous")))); - // Project-level permission should apply to single configuration too: - assertTrue(mc.getACL().hasPermission(Item.READ)); - } - - public void testApi() throws Exception { - MatrixProject project = createMatrixProject(); - project.setAxes(new AxisList( - new Axis("FOO", "abc", "def"), - new Axis("BAR", "uvw", "xyz"))); - XmlPage xml = new WebClient().goToXml(project.getUrl() + "api/xml"); - assertEquals(4, xml.getByXPath("//matrixProject/activeConfiguration").size()); - } -} diff --git a/test/src/test/resources/hudson/matrix/MatrixProjectTest/testUpgrade/config.xml b/test/src/test/resources/hudson/matrix/MatrixProjectTest/testUpgrade/config.xml deleted file mode 100644 index 5b53ede393..0000000000 --- a/test/src/test/resources/hudson/matrix/MatrixProjectTest/testUpgrade/config.xml +++ /dev/null @@ -1 +0,0 @@ - diff --git a/test/src/test/resources/hudson/matrix/MatrixProjectTest/testUpgrade/jobs/x/config.xml b/test/src/test/resources/hudson/matrix/MatrixProjectTest/testUpgrade/jobs/x/config.xml deleted file mode 100644 index 5a6966de9e..0000000000 --- a/test/src/test/resources/hudson/matrix/MatrixProjectTest/testUpgrade/jobs/x/config.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - false - - - true - false - false - false - - false - - - - - - \ No newline at end of file diff --git a/test/src/test/resources/hudson/matrix/echo-property.pom b/test/src/test/resources/hudson/matrix/echo-property.pom deleted file mode 100644 index a189489092..0000000000 --- a/test/src/test/resources/hudson/matrix/echo-property.pom +++ /dev/null @@ -1,70 +0,0 @@ - - - - - 4.0.0 - test - test - 0.1-SNAPSHOT - - - - - org.jvnet.maven-antrun-extended-plugin - maven-antrun-extended-plugin - 1.40 - - - validate - - - assertion ${prop}=${db} - - - - run - - - - - - - - - - m.g.o-public - http://maven.glassfish.org/content/groups/public/ - - true - - - false - - - - - \ No newline at end of file diff --git a/war/src/main/webapp/help/matrix/axes.html b/war/src/main/webapp/help/matrix/axes.html deleted file mode 100644 index 1cab051895..0000000000 --- a/war/src/main/webapp/help/matrix/axes.html +++ /dev/null @@ -1,22 +0,0 @@ -
- If your configuration matrix needs additional axes, you can specify them here. -

- For example, let's say you are trying to run a test for your database application, - and you need to test it with three databases: MySQL, PostgreSQL, and Oracle. Your - build script is designed so that you can test with a particular database by doing - ant -Ddatabase=mysql. -

- This is the concept of an axis. You can have a variable called "database", - which takes three values. When you configure it, Jenkins will run 3 builds, each with - different values assigned to the "database" variable to exhaustively cover - the configuration matrix. -

- Variables specified here are made available to the build as environment variables. - In addition, for Ant and Maven, variables are also exposed as properties, as if - -DvariableName=value are specified on the command line. -

- When multiple axes are specified, all of the possible combinations of axes are built - exhaustively. Multiple values in labels and JDKs are treated in the same way. So - if you specify jdk=[JDK5,JDK6], database=[mysql,postgresql,oracle], container=[jetty,tomcat], - then each build will consists of 2x3x2=12 different sub-builds. -

\ No newline at end of file diff --git a/war/src/main/webapp/help/matrix/axes_de.html b/war/src/main/webapp/help/matrix/axes_de.html deleted file mode 100644 index e2fb6448b6..0000000000 --- a/war/src/main/webapp/help/matrix/axes_de.html +++ /dev/null @@ -1,24 +0,0 @@ -
- Hier können Sie die Achsen Ihrer Konfigurationsmatrix angeben. -

- Beispiel: Sie haben eine Datenbankanwendung geschrieben und möchten diese mit - den drei Datenbanksystemen MySQL, PostgreSQL und Oracle testen. Ihr Build-Skript - ist so gestaltet, dass Sie ein bestimmtes Datenbanksystem testen können, indem - Sie Ant etwa folgendermaßen aufrufen: ant -Ddatabase=mysql. -

- Dies ist das Konzept einer "Achse". Sie definieren dazu eine Variable namens "database", - welche unterschiedliche Werte annehmen kann. Wenn Sie für diese Variable 3 Werte - konfigurieren, wird Jenkins 3 Unter-Builds ausführen - jeder mit einem anderen Wert - für die Variable "database", um die Konfigurationsmatrix erschöpfend abzudecken. -

- Variablen, die hier als Achse spezifiziert werden, stehen dem Build als Umgebungsvariablen - zur Verfügung. Für Ant und Maven sind die Variablen zusätzlich auch als Eigenschaften - (properties) sichtbar - genau so, als ob -DvariableName=value - in der Kommandozeile angegeben worden wäre. -

- Sind mehrere Achsen eingerichtet, so werden alle möglichen Kombinationen - erschöpfend in Unter-Builds ausgeführt. Mehrfache Auswahlen in Labels und JDKs - werden auf dieselbe Weise behandelt. Geben Sie beispielsweise - jdk=[JDK5,JDK6], database=[mysql,postgresql,oracle], container=[jetty,tomcat] - an, so besteht ein Build aus 2x3x2=12 unterschiedlichen Unter-Builds. -

\ No newline at end of file diff --git a/war/src/main/webapp/help/matrix/axes_fr.html b/war/src/main/webapp/help/matrix/axes_fr.html deleted file mode 100644 index f371aed1c6..0000000000 --- a/war/src/main/webapp/help/matrix/axes_fr.html +++ /dev/null @@ -1,30 +0,0 @@ -
- Si votre matrice de configuration a besoin d'axes supplémentaires, - vous pouvez les spécifiez ici. -

- Par exemple, supposons que vous voulez lancer un test pour une - application de base de données et que vous devez la tester avec trois - bases : MySQL, PostgreSQL et Oracle. - Votre script de build est conçu de façon à spécifier la base à tester - ainsi : - ant -Ddatabase=mysql. -

- Un axe, c'est ça. Vous pouvez avoir une variable "database", - qui prend trois valeurs possibles. Quand vous configurez l'axe, Jenkins - lancera 3 builds, avec les 3 valeurs possibles assignées à la variable - "database" afin de couvrir toutes combinaisons de configurations - possibles (la matrice des configurations). -

- Les variables spécifiées ici sont disponibles pour le build comme - variables d'environnement. - De plus, pour Ant et Maven, les variables sont également exposées en - tant que propriétés, comme si elles étaient passées avec - -DnomVariable=valeur en ligne de commande. -

- Quand plusieurs axes sont spécifiés, toutes les combinaisons d'axe - possibles sont construites de façon exhaustive. Les valeurs multiples - pour les labels et les JDKs sont traitées de la même façon. Par exemple, - si vous spécifiez jdk=[JDK5,JDK6], database=[mysql,postgresql,oracle], - container=[jetty,tomcat], alors chaque build exhaustif consistera en - 2x3x2=12 sous-builds différents. -

\ No newline at end of file diff --git a/war/src/main/webapp/help/matrix/axes_ja.html b/war/src/main/webapp/help/matrix/axes_ja.html deleted file mode 100644 index 99f2630700..0000000000 --- a/war/src/main/webapp/help/matrix/axes_ja.html +++ /dev/null @@ -1,21 +0,0 @@ -
- 構成軸を追加する必要があれば、ここで指定します。 -

- 例えば、データベースアプリケーションのテストを実行し、 - MySQL、PostgreSQLおよびOracleの3つのデータベースでテストする必要があるとしましょう。 - ant -Ddatabase=mysqlを実行して特定のデータベースでテストできるように、 - ビルドスクリプトがデザインされています。 -

- これが、構成軸のコンセプトです。"database"という変数を使用し、その変数は3つの値をとります。 - 構成軸を設定すると、Jenkinsは3つのビルドを起動します。それぞれのビルドは、構成マトリックスを全てカバーするように、 - "database"変数に異なる値が割り当てられます。 -

- ここで指定した変数は、環境変数としてビルドで利用できます。さらに、 - コマンドラインで-DvariableName=valueと指定したのと同様に、 - AntやMavenでプロパティでも利用できます。 -

- 複数の軸が指定されている場合、軸の取り得る全ての組み合わせが組み立てられます。 - ラベルやJDKに複数の値を設定した場合も同様に扱われます。つまり、jdk=[JDK5,JDK6]、 - database=[mysql,postgresql,oracle]およびcontainer=[jetty,tomcat]と指定した場合、 - 各ビルドは、2x3x2=12個の異なるサブビルドで構成されます。 -

\ No newline at end of file diff --git a/war/src/main/webapp/help/matrix/axes_nl.html b/war/src/main/webapp/help/matrix/axes_nl.html deleted file mode 100644 index fa3ad8516f..0000000000 --- a/war/src/main/webapp/help/matrix/axes_nl.html +++ /dev/null @@ -1,15 +0,0 @@ -
- Indien uw configuratiematrix extra dimensies benodigd, kunt U die hier opgeven. -

- Stel dat U uw databankapplicatie wenst te testen t.o.v. 3 databanken : MySQL, PostgreSQL, en Oracle. - U hebt uw bouwspecifcatie zo ontworpen dat U, door het opgeven van een optie, kunt kiezen t.o.v. welk systeem U wenst te testen, bvb. - ant -Ddatabank=mysql. -

- Dit is het concept van een matrixdimensie. U kunt een variabele "databank" hebben, met drie waarden. Zo geconfigureerd, zal Jenkins 3 bouwpogingen lanceren, elk met een andere waarde voor die parameter. Op die manier worden alle mogelijkheden in de matrix afgetoetst. -

-De hier gedefinieerde variabelen worden als omgevingsparameters beschikbaar gesteld aan uw bouwpogingen. - Meer nog, in het geval U Ant of Maven gebruikt, zullen de variabelen ook als parameters beschikbaar gesteld worden, alsof - -DparameterNaam=waarde op de commandolijn meegegeven werd. -

- Indien U meerdere dimensies opgeeft, zullen alle mogelijke combinaties afgetoetst worden. Meerdere waarden in labels en JDKs worden op dezelfde manier behandeld. Indien U dus jdk=[JDK5,JDK6], database=[mysql,postgresql,oracle], container=[jetty,tomcat] opgeeft, zal een bouwpoging feitelijk 2x3x2=12 verschillende bouwpogingen omvatten. -

\ No newline at end of file diff --git a/war/src/main/webapp/help/matrix/axes_pt_BR.html b/war/src/main/webapp/help/matrix/axes_pt_BR.html deleted file mode 100644 index 8a8e33793f..0000000000 --- a/war/src/main/webapp/help/matrix/axes_pt_BR.html +++ /dev/null @@ -1,22 +0,0 @@ -
- Se sua matriz de configuração precisa de eixos adicionais, você pode especificá-los aqui. -

- Por exemplo, vamos dizer que você está tentando executar um teste para sua aplicação de banco de dados, - e você precisa testá-la com três bancos de dados: MySQL, PostgreSQL, e Oracle. Seu - script de construção está projetado tal que você possa testar com um banco de dados particular usando - ant -Ddatabase=mysql. -

- Este é o conceito de um eixo. Você pode ter uma variável chamada "database", - que recebe três valores. Quando você configurá-la, Jenkins executará 3 construções, cada uma com - valores diferentes para a variável "database" para exaustivamente cobrir - a matriz de configuração. -

- Variáveis especificadas aqui se tornam disponíveis para a construção como variáveis de ambiente. - Em adição, para Ant e Maven, as variáveis também são expostas como propriedades, como se - -DnomeDaVariavel=valor fossem especificadas na linha de comando. -

- Quando múltiplos eixos são especificados, todas as possíveis combinações dos eixos são construídas - exaustivamente. Valores múltiplos em labels e JDKs são tratados da mesma maneira. Assim - se você especificar jdk=[JDK5,JDK6], database=[mysql,postgresql,oracle], container=[jetty,tomcat], - então cada construção consistirá de 2x3x2=12 diferentes sub-construções. -

diff --git a/war/src/main/webapp/help/matrix/axes_ru.html b/war/src/main/webapp/help/matrix/axes_ru.html deleted file mode 100644 index a2eee1a7a9..0000000000 --- a/war/src/main/webapp/help/matrix/axes_ru.html +++ /dev/null @@ -1,24 +0,0 @@ -
- Если ваша конфигурационная матрица нуждается в дополнительных осях (размерностях, степенях свободы), - вы можете настроить их здесь. -

- Например, скажем вы собираетесь запускать тесты для вашего приложения использующего СУБД - и вам необходимо проверить его с тремя СУБД: MySQL, PostgreSQL и Oracle. Ваш сборочный - скрипт разработан таким образом, что вы можете протестировать работу приложения с конкретной - СУБД с помощью команды ant -Ddatabase=mysql. -

- Это и есть концепция осей. Вы можете создать переменную с именем "database", которая - может принимать 3 значения. Когда вы её настроите, Jenkins будет запускать 3 сборки, каждую с - одним элементом из области значений переменной "database", чтобы полностью покрыть - конфигурационную матрицу. -

- Переменные, описанные здесь, доступны сборке как переменные окружения. Вдобавок, - для Ant и Maven, переменные также предоставляются как свойства, как будто - в командной строке было указано -DИмяПеременной=Значение. -

- В случае, когда определено несколько осей, все возможные комбинации будут использованы - при сборке. Множественные значения в метках и JDK интерпретируются таким же образом. - Так что если вы укажете jdk=[JDK5,JDK6], database=[mysql,postgresql,oracle], - container=[jetty,tomcat], тогда каждая сборка будет содержать 2x3x2=12 различных - подсборок. -

\ No newline at end of file diff --git a/war/src/main/webapp/help/matrix/axes_tr.html b/war/src/main/webapp/help/matrix/axes_tr.html deleted file mode 100644 index 0094c8a57e..0000000000 --- a/war/src/main/webapp/help/matrix/axes_tr.html +++ /dev/null @@ -1,20 +0,0 @@ -
- Konfigürasyon matrisinizin daha fazla eksene ihtiyacı varsa, burada belirleyebilirsiniz. -

- Diyelim ki veritabanı uygulamanız ile ilgili bir test çalıştırmanız gerekiyor ve - bunu da üç ayrı veritabanı ile yapmak istiyorsunuz: MySQL, PostgreSQL, ve Oracle. - Yapılandırma dosyalarınızı, ant -Ddatabase=mysql şeklinde çalışabilecek bir biçimde tasarlayabilirsiniz. -

- Eksenin devreye girdiği kısım burasıdır. "database" isimli bir değişkeniniz vardır ve üç değer alır. - Konfigürasyonu yaptığınızda, Jenkins konfigürasyon matrisini tamamlamak adına "database" - değişkenine atanan üç ayrı değişkenle yapılandırmayı 3 kere çalıştıracaktır. -

- Burada belirlenen değişkenler, yapılandırmaya ortam değişkeni olarak aktarılabilirler. - Ant ve Maven için buna ek olarak, değişkenler, komut satırında -DvariableName=value - şeklindeki gibi özellik olarak bulunabilirler. -

- Birden fazla eksen tanımı yapıldığında, eksenlerin mümkün tüm kombinasyonları ayrıntılı bir şekilde - yapılandırılır. Etiketlerde veya JDK'larda tanımlanan çoklu-değerler de aynı şekilde işlenir. - Yani, eğer jdk=[JDK5,JDK6],database=[mysql,postgresql,oracle] ve container=[jetty,tomcat] şeklinde - bir tanım yaparsanız, her yapılandırma için 2x3x2=12 adet alt-yapılandırma çalıştırılacaktır. -

\ No newline at end of file diff --git a/war/src/main/webapp/help/matrix/axes_zh_TW.html b/war/src/main/webapp/help/matrix/axes_zh_TW.html deleted file mode 100644 index e85e23fb9f..0000000000 --- a/war/src/main/webapp/help/matrix/axes_zh_TW.html +++ /dev/null @@ -1,21 +0,0 @@ -
- 您可以在這裡新增設定矩陣的軸線。 - -

- 假如想要在 MySQL, PostgreSQL 及 Oracle 上測試開發的資料庫應用程式， - 您的建置 Script 應該就要能指定要測試的資料庫，例如 ant -Ddatabase=mysql。 - -

- 這就是軸線的概念，您可以設計出帶三種值的 "database" 變數。 - 設定好後，Jenkins 會執行三次建置，每一次都套不同的 "database" 變數值，完整涵蓋整個設定矩陣。 - -

- 這裡定義的變數會變成建置過程中可以看到的環境變數。 - 對 Ant 及 Maven 而言，變數同時會以屬性方式帶入，就等同在命令列加上 - -DvariableName=value。 - -

- 如果設定多個軸線，軸線所有的排列組合都會被建置一次，標籤及 JDK 軸也一樣。 - 所以如果您設定 jdk=[JDK5,JDK6], database=[mysql,postgresql,oracle], container=[jetty,tomcat]， - 那麼每次建置都會有 2 × 3 × 2 = 12 種不同的子建置。 -

\ No newline at end of file diff --git a/war/src/main/webapp/help/matrix/combinationfilter.html b/war/src/main/webapp/help/matrix/combinationfilter.html deleted file mode 100644 index 4449b3966b..0000000000 --- a/war/src/main/webapp/help/matrix/combinationfilter.html +++ /dev/null @@ -1,54 +0,0 @@ -
- By default, Jenkins builds all the possible combinations of axes exhaustively. But sometimes this is too many, - or may contain combinations that don't make sense. - In such a situation, you can make the matrix sparse by filtering out combinations that you don't want through - a Groovy expression that returns true or false. - -

- When you specify a Groovy expression here, only the combinations that result in true - will be built. In evaluating the expression, axes are exposed as variables (with their values set - to the current combination evaluated). - -

Filtering based on values

-

- For example, let's say you are building on different operating systems for - different compilers. Assume that your slave labels are label=[linux,solaris] and you have - created an axis as compiler=[gcc,cc]. - - Any of the following expressions will filter out cc builds on linux. Depending on - how you think about this constraint, you'll probably find some more intuitive than others. - -

- - - - - - - - - - - - - -
Read "if both linux and cc, it's invalid" - 
!(label=="linux" && compiler=="cc")
-
Read "for a combination to be valid, it has to be either on solaris or on gcc." - 
label=="solaris" || compiler=="gcc"
-
Read "if on Solaris, just do cc" - 
(label=="solaris").implies(compiler=="cc")
-
-
- -

Sparsening of the matrix

-

- In addition to the specific filtering rules based on values, one can also use a special - variable "index", which can be used to sparsen the matrix. - -

- For example, index%2==0 would cut the matrix size in half by removing one - combination per every 2 combinations, in such a way that the coverage is still reasonable. - Similarly, index%3!=0 would cut the matrix size into 66% by throwing - away every 1 out of 3 combinations. -

\ No newline at end of file diff --git a/war/src/main/webapp/help/matrix/combinationfilter_de.html b/war/src/main/webapp/help/matrix/combinationfilter_de.html deleted file mode 100644 index 93bc8f07b9..0000000000 --- a/war/src/main/webapp/help/matrix/combinationfilter_de.html +++ /dev/null @@ -1,55 +0,0 @@ -
- Jenkins baut standardmäßig alle möglichen Kombinationen aller Achsen auf erschöpfende Weise. - Manchmal sind dies jedoch einfach zu viele Kombinationen oder es gibt Kombinationen, die - aus fachlicher Sicht nicht erwünscht sind. - - In diesen Situationen können Sie die Matrix ausdünnen, indem Sie über einen Groovy-Ausdruck - unerwünschte Kombinationen herausfiltern. - -

- Geben Sie hier einen Groovy-Ausdruck an, so werden nur diejenigen Kombinationen gebaut, für - die der Ausdruck true ergibt. Die momentanen Werte der Achsen stehen dem Ausdruck - dabei als initialisierte Variablen zur Verfügung. - -

Werte-basiertes Filtern

-

- Beispiel: Sie bauen auf unterschiedlichen Betriebssystemen mit unterschiedlichen Compilern. - Ihre Slave-Knoten sind mit den Labels label=[linux,solaris] gekennzeichnet und Sie haben - eine Achse compiler=[gcc,cc] angelegt. - - Jeder der folgenden Ausdrücke wird Builds mit cc auf linux herausfiltern. Je nach - persönlicher Herangehensweise werden Sie die Ausdrücke unterschiedlich intuitiv finden. - -

- - - - - - - - - - - - - -
Ansatz: "Wenn linux und cc gleichzeitig zutrifft, ist die Kombination ungültig." - 
!(label=="linux" && compiler=="cc")
-
Ansatz: "Eine gültige Kombination verwendet entweder solaris oder gcc." - 
label=="solaris" || compiler=="gcc"
-
Ansatz: "Wenn auf solaris, dann nur cc erlauben." - 
(label=="solaris").implies(compiler=="cc")
-
-
- -

Ausdünnen der Matrix

-

- Zusätzlich zu den werte-basierten Filterregeln, können Sie die Variable "index" verwenden, - um die Matrix auszudünnen. - -

- Beispiel: index%2==0 halbiert die Größe der Matrix, in dem nur noch jede zweite Kombination - gebaut wird. Analog drittelt index%3!=0 die Größe der Matrix, in dem nur noch jede dritte - Kombination gebaut wird, usw. -

\ No newline at end of file diff --git a/war/src/main/webapp/help/matrix/combinationfilter_fr.html b/war/src/main/webapp/help/matrix/combinationfilter_fr.html deleted file mode 100644 index d89741b26a..0000000000 --- a/war/src/main/webapp/help/matrix/combinationfilter_fr.html +++ /dev/null @@ -1,54 +0,0 @@ -
- Par défaut, Jenkins builde toutes les combinaisons possibles de tous les axes, de façon exhaustive. Parfois, - cela fait trop de combinaisons ou certaines combinaisons n'ont pas de sens. - Dans ce cas, vous pouvez réduire la matrice en filtrant les combinaisons que vous ne voulez pas à l'aide - d'une expression Groovy qui retourne vrai ou faux. - -

- Quand vous spécifiez une expression Groovy ici, seules les combinaisons qui retournent true - seront construites. Lors de l'évaluation de l'expression, les axes sont exposés comme des variables - (avec leurs valeurs positionnées sur la combinaison courante). - -

Filtre basé sur les valeurs

-

- Par exemple, disons que vous buildez sur des systèmes d'exploitation différents, pour des compilateurs - différents. Supposons que les libellés de vos esclaves sont label=[linux,solaris] et que vous - avez un axe compiler=[gcc,cc]. - - Chacune des expressions suivantes filtreront (c-à-d retireront) les builds cc sur linux. - Selon la façon dont vous envisagez cette contrainte, vous trouverez certaines expressions plus claires - que d'autres. - -

- - - - - - - - - - - - - -
Lire "si simultanément linux et cc, alors c'est invalide" - 
!(label=="linux" && compiler=="cc")
-
Lire "pour qu'une combinaison soit valide, elle doit être soit sur solaris, soit utiliser gcc." - 
label=="solaris" || compiler=="gcc"
-
Lire "quand on est sur solaris, n'utiliser que cc" - 
(label=="solaris").implies(compiler=="cc")
-
-
- -

Limitation de la matrice

-

- En plus des règles de filtrage basées sur les valeurs, on peut également utiliser une - variable spéciale "index" qui peut être utilisée pour diminuer la matrice. - -

- Par exemple, index%2==0 diminuerait la matrice de moitié en retirant 1 combinaison sur 2, - de façon à ce que la couverture reste raisonnable. - De même, index%3!=0 réduirait la matrice à 66% en supprimant 1 combinaison sur 3. -

\ No newline at end of file diff --git a/war/src/main/webapp/help/matrix/combinationfilter_ja.html b/war/src/main/webapp/help/matrix/combinationfilter_ja.html deleted file mode 100644 index 81d8a04b1e..0000000000 --- a/war/src/main/webapp/help/matrix/combinationfilter_ja.html +++ /dev/null @@ -1,49 +0,0 @@ -
- デフォルトで、Jenkinsは構成軸のすべての組み合わせをビルドします。しかし、場合によってはこれでは組み合わせが多すぎるか、 - 望ましくない組み合わせができてしまうことがあります。 - そのような場合、真偽値を返すGroovyの式で必要のない組み合わせをフィルタリングする事で、構成マトリックスをまばらにすることができます。 - -

- Groovyの式をここで指定すると、式の結果がtrueになる組み合わせのみビルドされます。 - 式の評価では、軸は変数として扱われます(評価中の組み合わせに値をセットします)。 - -

値によるフィルタリング

-

- 例えば、異なるOS上で複数のコンパイラを使用してビルドすることを考えてみましょう。 - スレーブのラベルはlabel=[linux,solaris]とし、compiler=[gcc,cc]という構成軸を作成したとします。 - - 次の式は、どれもlinux上でのccによるビルドを除去します。 - この制約をどう考えるかにもよって、どの式が望ましいと思うかは個人差があるでしょう。 - -

- - - - - - - - - - - - - -
"linuxとccの場合は無効" - 
!(label=="linux" && compiler=="cc")
-
"solarisかgccの場合は有効" - 
label=="solaris" || compiler=="gcc"
-
"solarisであればccのみ使用する" - 
(label=="solaris").implies(compiler=="cc")
-
-
- -

まばらな行列を作る

-

- 特定の値の組み合わせの除去に加えて、予約されたindex変数を使って行列を一様にまばらにすることができます。 - -

- 例えば、index%2==0とすると、２つに１つの組み合わせを除去することで、ビルドする組み合わせのサイズを半分に - することができます。同様に、index%3!=0とすると、３つに１つの組み合わせが除去されサイズは66%になります。 - indexの値は、剰余計算においてビルドが特定の値に偏らないように計算されます。 -

diff --git a/war/src/main/webapp/help/matrix/combinationfilter_zh_TW.html b/war/src/main/webapp/help/matrix/combinationfilter_zh_TW.html deleted file mode 100644 index de9dd19301..0000000000 --- a/war/src/main/webapp/help/matrix/combinationfilter_zh_TW.html +++ /dev/null @@ -1,47 +0,0 @@ -
- Jenkins 預設會建置所有軸線可能的排列組合。不過有時候組合會過多，或是有些組合根本就不合理。 - 這種情況下，您可以使用 Groovy 表示式回傳值過濾掉不要的組合，讓矩陣稀疏點。 - -

- 設定了 Groovy 表示式後，只有回傳結果是 true 的組合才會建置。 - 表示式執行時，軸線值會被當做變數傳入 (變數值設成當下要判斷的組合)。 - -

依變數值篩選

-

- 假設您要在不同作業系統的不同編譯器上建置。 - 而您的 Slave 標籤有 label=[linux,solaris]，並建了 compiler=[gcc,cc] 這個軸線。 - - 下列的每一個表式示都會過濾掉在 linux 上的 cc 建置。 - 差別在您怎麼看待這個限制，您可能會覺得某些方式就是比較直觀。 - -

- - - - - - - - - - - - - -
讀作「同時是 Linux 跟 cc 時，就不要做」。 - 
!(label=="linux" && compiler=="cc")
-
讀作「一定要在 Solaris 上或是用 gcc 才算是有效的組合」。 - 
label=="solaris" || compiler=="gcc"
-
讀作「在 Solaris 上，只用 cc」。 - 
(label=="solaris").implies(compiler=="cc")
-
-
- -

矩陣稀疏化

-

- 除了設定變數值篩選規則外，您也可以使用 "index" 特別變數，將矩陣稀疏化。 - -

- 例如 index%2==0 可以跳過一種組合後再挑一種，讓矩陣大小減半，這種涵蓋率也很合常理。 - 同樣的，index%3!=0 會每三種組合就挑一個掉，讓矩陣縮小三分之一。 -

\ No newline at end of file diff --git a/war/src/main/webapp/help/matrix/jdk.html b/war/src/main/webapp/help/matrix/jdk.html deleted file mode 100644 index 398c3418ec..0000000000 --- a/war/src/main/webapp/help/matrix/jdk.html +++ /dev/null @@ -1,12 +0,0 @@ -
- Specify the JDK(s) with which builds are performed. If none is selected, - the default JDK is used (no explicit JAVA_HOME, and java command - is assumed to be in PATH.) If multiple JDKs are selected, - the configuration matrix will include all of the specified JDKs. -
- Selecting multiple values is typically useful when this job is running tests, - and you need to run tests on multiple different versions of JDKs. -
- During a build, the selected JDK value for the given run is available as the "jdk" axis. - See the help of "axes" below for more information about how to access the axis value. -
\ No newline at end of file diff --git a/war/src/main/webapp/help/matrix/jdk_de.html b/war/src/main/webapp/help/matrix/jdk_de.html deleted file mode 100644 index 9f2d94d4b2..0000000000 --- a/war/src/main/webapp/help/matrix/jdk_de.html +++ /dev/null @@ -1,15 +0,0 @@ -
- Geben Sie die JDK(s) an, mit denen die Unter-Builds durchgeführt werden sollen. - Wenn kein JDK ausgewählt ist, wird das Default-JDK verwendet (kein explizites - Setzen der Umgebungsvariable JAVA_HOME; es wird erwartet, dass die - Kommandozeilenanwendung java im Suchpfad PATH enthalten ist). - Wenn mehrere JDKs ausgewählt sind, deckt die Konfigurationsmatrix alle diese - JDKs ab. -

- Eine Mehrfachauswahl ist typischerweise dann nützlich, wenn dieser Job Tests - beinhaltet und Sie diese Tests mit unterschiedlichen JDKs ausführen möchten. -

- Während eines Builds ist das aktuelle JDK als Achse jdk sichtbar. - Im Hilfetext zu "Achsen" finden Sie weitere Informationen, wie Sie auf die - Werte der Achsenvariablen zugreifen können. -

\ No newline at end of file diff --git a/war/src/main/webapp/help/matrix/jdk_fr.html b/war/src/main/webapp/help/matrix/jdk_fr.html deleted file mode 100644 index 2073b49b0a..0000000000 --- a/war/src/main/webapp/help/matrix/jdk_fr.html +++ /dev/null @@ -1,15 +0,0 @@ -
- Spécifie le(s) JDK avec le(s)quel(s) les builds seront exécutés. Si aucun - n'est donné, le JDK par défaut est utilisé (pas de variable - JAVA_HOME explicite; on suppose que la commande java - est dans le PATH). Si de multiples JDK sont précisés, la - matrice de configuration incluera tous ces JDK. -
- Avoir de multiples valeurs est utile typiquement quand le job exécute des - tests et que vous devez les lancer sur plusieurs versions différentes - du JDK. -
- Au cours d'un build, le JDK sélectionné est visible dans l'axe 'jdk'. - Référez-vous à l'aide sur les 'axes' ci-dessous pour plus d'information - sur l'accès à la valeur d'un axe. -
\ No newline at end of file diff --git a/war/src/main/webapp/help/matrix/jdk_ja.html b/war/src/main/webapp/help/matrix/jdk_ja.html deleted file mode 100644 index cd0f1be3fa..0000000000 --- a/war/src/main/webapp/help/matrix/jdk_ja.html +++ /dev/null @@ -1,10 +0,0 @@ -
- ビルドを実行するJDKを指定します。指定しなければ、 - デフォルトのJDKを使用します(明示的にJAVA_HOMEはしませんし、javaコマンドはパスに設定されていると想定します)。 - 複数のJDKを指定した場合、構成軸は指定した全てのJDKを含みます。 -
- ジョブがテストを実行する場合や、異なるバージョンのJDKでテストする必要がある場合に、複数の値の選択は便利です。 -
- 指定されたJDKの値は、ビルド中は"jdk"という軸として利用可能です。 - 軸の値のアクセス方法の詳細については、"構成軸"のヘルプを参照してください。 -
\ No newline at end of file diff --git a/war/src/main/webapp/help/matrix/jdk_nl.html b/war/src/main/webapp/help/matrix/jdk_nl.html deleted file mode 100644 index 35f52cc4d8..0000000000 --- a/war/src/main/webapp/help/matrix/jdk_nl.html +++ /dev/null @@ -1,8 +0,0 @@ -
- Geef uw JDK(s) op waarmee U uw bouwpoging wenst te lanceren. Indien U ervoor kiest geen specifieke JDK(s) op te geven, zal de standaard JDK gebruikt worden. Hierbij wordt er vanuit gegaan dat er geen JAVA_HOME gedefinieerd werd en dat het java commando niet op uw PATH aanwezig is. Indien U meerdere JDKs selecteert, zal uw matrixconfiguratie al deze omvatten. -
- Meerdere waarden zijn typisch nuttig wanneer een job onder meerdere JDKs getest dient te worden. -
- Gedurende uw bouwpoging is de gekozen versie van de JDK beschikbaar als de "jdk"-dimensie. - Zie de hulpagina over dimensies voor meer informatie over het gebruik van dimensies. -
\ No newline at end of file diff --git a/war/src/main/webapp/help/matrix/jdk_pt_BR.html b/war/src/main/webapp/help/matrix/jdk_pt_BR.html deleted file mode 100644 index e4bea2f6c1..0000000000 --- a/war/src/main/webapp/help/matrix/jdk_pt_BR.html +++ /dev/null @@ -1,12 +0,0 @@ -
- Especifica a(s) JDK(s) com as quais as construções são executadas. Se nenhuma for selecionada, - a JDK padrão é usada (sem JAVA_HOME explícito, e o comando java - é assumido que está no PATH.) Se múltiploas JDKs forem selecionadas, - a matriz de configuração incluirá todos as JDKs especificadas. -
- Selecionar valores múltiplos é tipicamente útil quando a tarefa for executar teste, - e você precisar executar testes em múltiplas versões diferentes de JDKs. -
- Durante uma construção, o valor de JDK selecionado para a execução está disponível como o eixo "jdK". - Veja a ajuda de "eixos" abaixo para mais informações sobre como acessar o valor do eixo. -
diff --git a/war/src/main/webapp/help/matrix/jdk_ru.html b/war/src/main/webapp/help/matrix/jdk_ru.html deleted file mode 100644 index 35cbfcf51c..0000000000 --- a/war/src/main/webapp/help/matrix/jdk_ru.html +++ /dev/null @@ -1,13 +0,0 @@ -
- Выберите JDK с которым(и) будет выполняться сборка. Если ни одного не выбрано, - будет использован JDK по-умолчанию (без явного JAVA_HOME, и команды java - не будет указано в PATH). Если несколько JDK выбрано, - конфигурационная матрица будет содержать все выбранные JDK. -
- Выбор нескольких значений обычно полезен в случаях когда проект тестируется и вам нужно - запускать тесты на нескольких разных версиях JDK. -
- Во время сборки выбранное значение JDK доступно как ось "jdk". - Смотрите в подсказку к опции "Оси (axes)" ниже для получения более подробной информации о том как - получить значения по осям. -
\ No newline at end of file diff --git a/war/src/main/webapp/help/matrix/jdk_tr.html b/war/src/main/webapp/help/matrix/jdk_tr.html deleted file mode 100644 index d7aaa75537..0000000000 --- a/war/src/main/webapp/help/matrix/jdk_tr.html +++ /dev/null @@ -1,11 +0,0 @@ -
- Yapılandırmaların çalıştırılacağı JDK(ları) belirleyiniz. Eğer, herhangi biri seçilmez ise - varsayılan JDK kullanılacaktır (JAVA_HOME'un olmadığı, ve java komutunun - PATH içerisinde olduğu varsayılmaktadır.). Eğer birden fazla JDK seçilirse, konfigürasyon matrisi belirtilen - tüm JDK'ları içerecektir. -
- Eğer yapılmak istenen testin, farklı JDK'lar üzerinde çalıştırılması isteniyorsa, birden fazla değer seçmek kullanışlı olacaktır, -
- Yapılandırma esnasında, seçilen JDK değeri "jdK" ekseni olarak görülecektir. - Eksen değerlerine nasıl erişileceğine dair daha fazla bilgi için, aşağıda "eksenler" ile ilgili yardım kısmına bakınız. -
\ No newline at end of file diff --git a/war/src/main/webapp/help/matrix/jdk_zh_TW.html b/war/src/main/webapp/help/matrix/jdk_zh_TW.html deleted file mode 100644 index 66fe048d44..0000000000 --- a/war/src/main/webapp/help/matrix/jdk_zh_TW.html +++ /dev/null @@ -1,10 +0,0 @@ -
- 指定要用來執行建置的 JDK。如果沒有選取任何項目，會使用預設 JDK (如果沒有明確的 - JAVA_HOME 設定，會使用在 PATH 路徑裡的 java 指令)。 - 如果選了超過一個 JDK，設定陣矩會將它們全部納進來。 -
- 如果您的作業會執行測試，而且需要在不同版本的 JDK 上都跑過一次，您就可以將這些 JDK 都選進來。 -
- 建置時，選取的 JDK 值會在 "jdk" 軸上出現。 - 請參考下方的「軸線」，了解如何存取座標值的相關資料。 -
\ No newline at end of file From 17ba1dad1f8229b7650e8cbb6cc91ddf89aebe10 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 14 Apr 2014 19:05:55 -0400 Subject: [PATCH 04/21] Comment, but not critical for separation. (cherry picked from commit e405078e093dac71daeff8576ebccdcf27b718ba) --- core/src/main/resources/hudson/model/Job/index.jelly | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/resources/hudson/model/Job/index.jelly b/core/src/main/resources/hudson/model/Job/index.jelly index b272840da2..d538942b4f 100644 --- a/core/src/main/resources/hudson/model/Job/index.jelly +++ b/core/src/main/resources/hudson/model/Job/index.jelly @@ -28,7 +28,7 @@ THE SOFTWARE.

${it.pronoun}

- + ${%Project name}: ${it.fullName} From bf2cd1a689e7e0e451fdaf17a217dcc6a1369f28 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 14 Apr 2014 19:08:43 -0400 Subject: [PATCH 05/21] isMatrixProject appears unused, but keep for compatibility. (cherry picked from commit d72fda46a6a5f521a986dc770afffc89e862c52b) --- core/src/main/java/hudson/Functions.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/core/src/main/java/hudson/Functions.java b/core/src/main/java/hudson/Functions.java index 4899606ae4..f6f9979afd 100644 --- a/core/src/main/java/hudson/Functions.java +++ b/core/src/main/java/hudson/Functions.java @@ -28,7 +28,6 @@ package hudson; import hudson.cli.CLICommand; import hudson.console.ConsoleAnnotationDescriptor; import hudson.console.ConsoleAnnotatorFactory; -import hudson.matrix.MatrixProject; import hudson.model.AbstractProject; import hudson.model.Action; import hudson.model.Describable; @@ -190,11 +189,9 @@ public class Functions { return o instanceof ModelObjectWithChildren; } - /** - * @since 1.524 - */ + @Deprecated public static boolean isMatrixProject(Object o) { - return o instanceof MatrixProject; + return o.getClass().getName().equals("hudson.matrix.MatrixProject"); } public static String xsDate(Calendar cal) { From 5a9b69d2fca6457b301d631744026659b70e782a Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 14 Apr 2014 19:10:20 -0400 Subject: [PATCH 06/21] XStream initializations moved to MatrixProject. (cherry picked from commit dbed3044070cb95fc3e7b5cabaddcf88cf65aaf2) Conflicts: core/src/main/java/hudson/model/Run.java --- core/src/main/java/hudson/model/Items.java | 6 ------ core/src/main/java/hudson/model/Run.java | 4 ---- 2 files changed, 10 deletions(-) diff --git a/core/src/main/java/hudson/model/Items.java b/core/src/main/java/hudson/model/Items.java index 9b0993dfb2..91e03b809f 100644 --- a/core/src/main/java/hudson/model/Items.java +++ b/core/src/main/java/hudson/model/Items.java @@ -26,10 +26,7 @@ package hudson.model; import com.thoughtworks.xstream.XStream; import hudson.DescriptorExtensionList; import hudson.Extension; -import hudson.matrix.MatrixProject; -import hudson.matrix.MatrixConfiguration; import hudson.XmlFile; -import hudson.matrix.Axis; import hudson.model.listeners.ItemListener; import hudson.remoting.Callable; import hudson.triggers.Trigger; @@ -404,8 +401,5 @@ public class Items { static { XSTREAM.alias("project",FreeStyleProject.class); - XSTREAM.alias("matrix-project",MatrixProject.class); - XSTREAM.alias("axis", Axis.class); - XSTREAM.alias("matrix-config",MatrixConfiguration.class); } } diff --git a/core/src/main/java/hudson/model/Run.java b/core/src/main/java/hudson/model/Run.java index b8540ebfea..8708fbdf25 100644 --- a/core/src/main/java/hudson/model/Run.java +++ b/core/src/main/java/hudson/model/Run.java @@ -39,8 +39,6 @@ import hudson.XmlFile; import hudson.cli.declarative.CLIMethod; import hudson.console.AnnotatedLargeText; import hudson.console.ConsoleNote; -import hudson.matrix.MatrixBuild; -import hudson.matrix.MatrixRun; import hudson.model.Descriptor.FormException; import hudson.model.listeners.RunListener; import hudson.model.listeners.SaveableListener; @@ -2263,8 +2261,6 @@ public abstract class Run ,RunT extends Run Date: Mon, 14 Apr 2014 19:13:24 -0400 Subject: [PATCH 07/21] Removing MatrixChildAction dependency. (cherry picked from commit 42195d83c44da53303d27b0759346747e4ac0857) --- core/src/main/java/hudson/model/ParametersAction.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/core/src/main/java/hudson/model/ParametersAction.java b/core/src/main/java/hudson/model/ParametersAction.java index 09aebf7ebf..41172acaab 100644 --- a/core/src/main/java/hudson/model/ParametersAction.java +++ b/core/src/main/java/hudson/model/ParametersAction.java @@ -26,7 +26,6 @@ package hudson.model; import hudson.Util; import hudson.EnvVars; import hudson.diagnosis.OldDataMonitor; -import hudson.matrix.MatrixChildAction; import hudson.model.Queue.QueueAction; import hudson.model.labels.LabelAssignmentAction; import hudson.model.queue.SubTask; @@ -56,7 +55,7 @@ import static com.google.common.collect.Sets.newHashSet; * that were specified when scheduling. */ @ExportedBean -public class ParametersAction implements Action, Iterable, QueueAction, EnvironmentContributingAction, LabelAssignmentAction, MatrixChildAction { +public class ParametersAction implements Action, Iterable, QueueAction, EnvironmentContributingAction, LabelAssignmentAction { private final List parameters; From 3ca23a111170ead21d61738130c518074bbb7390 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 14 Apr 2014 19:21:12 -0400 Subject: [PATCH 08/21] Unclear status of MatrixConfiguration when enableFingerprintsInDependencyGraph mode selected. (cherry picked from commit b9d8f554c6407da14ac3af68e1fa0ceb9af333fb) --- core/src/main/java/hudson/tasks/Fingerprinter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/hudson/tasks/Fingerprinter.java b/core/src/main/java/hudson/tasks/Fingerprinter.java index ef01582c48..4c31ac750f 100644 --- a/core/src/main/java/hudson/tasks/Fingerprinter.java +++ b/core/src/main/java/hudson/tasks/Fingerprinter.java @@ -30,7 +30,6 @@ import hudson.FilePath; import hudson.FilePath.FileCallable; import hudson.Launcher; import hudson.Util; -import hudson.matrix.MatrixConfiguration; import hudson.model.AbstractBuild; import hudson.model.AbstractProject; import hudson.model.Action; @@ -169,7 +168,8 @@ public class Fingerprinter extends Recorder implements Serializable, DependencyD } AbstractProject p = key; - if (key instanceof MatrixConfiguration) { + // TODO is this harmful to call unconditionally, so it would apply also to MavenModule for example? + if (key.getClass().getName().equals("hudson.matrix.MatrixConfiguration")) { p = key.getRootProject(); } From 5361065437e8027f633bf70fa96899e7e62231e0 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 14 Apr 2014 19:26:47 -0400 Subject: [PATCH 09/21] Extracting MatrixAggregatable dependency. (cherry picked from commit 5d9e4d7b073c48bffc5c6179e375660c3ad0ad0a) --- .../tasks/junit/JUnitResultArchiver.java | 11 +-- .../hudson/tasks/test/MatrixTestResult.java | 69 ------------------- .../tasks/test/TestResultAggregator.java | 60 ---------------- 3 files changed, 1 insertion(+), 139 deletions(-) delete mode 100644 core/src/main/java/hudson/tasks/test/MatrixTestResult.java delete mode 100644 core/src/main/java/hudson/tasks/test/TestResultAggregator.java diff --git a/core/src/main/java/hudson/tasks/junit/JUnitResultArchiver.java b/core/src/main/java/hudson/tasks/junit/JUnitResultArchiver.java index 6dea15b9ed..d3804a9bdb 100644 --- a/core/src/main/java/hudson/tasks/junit/JUnitResultArchiver.java +++ b/core/src/main/java/hudson/tasks/junit/JUnitResultArchiver.java @@ -28,9 +28,6 @@ import hudson.AbortException; import hudson.Extension; import hudson.FilePath; import hudson.Launcher; -import hudson.matrix.MatrixAggregatable; -import hudson.matrix.MatrixAggregator; -import hudson.matrix.MatrixBuild; import hudson.model.AbstractBuild; import hudson.model.AbstractProject; import hudson.model.Action; @@ -44,7 +41,6 @@ import hudson.tasks.BuildStepMonitor; import hudson.tasks.Publisher; import hudson.tasks.Recorder; import hudson.tasks.junit.TestResultAction.Data; -import hudson.tasks.test.TestResultAggregator; import hudson.tasks.test.TestResultProjectAction; import hudson.util.DescribableList; import hudson.util.FormValidation; @@ -67,7 +63,7 @@ import java.util.List; * * @author Kohsuke Kawaguchi */ -public class JUnitResultArchiver extends Recorder implements MatrixAggregatable { +public class JUnitResultArchiver extends Recorder { /** * {@link FileSet} "includes" string, like "foo/bar/*.xml" @@ -213,11 +209,6 @@ public class JUnitResultArchiver extends Recorder implements MatrixAggregatable return Collections.singleton(new TestResultProjectAction(project)); } - public MatrixAggregator createAggregator(MatrixBuild build, - Launcher launcher, BuildListener listener) { - return new TestResultAggregator(build, launcher, listener); - } - /** * @return the keepLongStdio */ diff --git a/core/src/main/java/hudson/tasks/test/MatrixTestResult.java b/core/src/main/java/hudson/tasks/test/MatrixTestResult.java deleted file mode 100644 index 6d2122a3cd..0000000000 --- a/core/src/main/java/hudson/tasks/test/MatrixTestResult.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * The MIT License - * - * Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Yahoo!, 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.tasks.test; - -import hudson.matrix.Combination; -import hudson.matrix.MatrixBuild; -import hudson.matrix.MatrixRun; -import hudson.model.AbstractBuild; -import hudson.model.Action; - -/** - * {@link Action} that aggregates all the test results from {@link MatrixRun}s. - * - *

- * This object is attached to {@link MatrixBuild}. - * - * @author Kohsuke Kawaguchi - */ -public class MatrixTestResult extends AggregatedTestResultAction { - - @Deprecated - public MatrixTestResult(MatrixBuild owner) { - super(owner); - } - - /** @since 1.545 */ - public MatrixTestResult() {} - - /** - * Use the configuration name. - */ - @Override - protected String getChildName(AbstractTestResultAction tr) { - return tr.owner.getProject().getName(); - } - - @Override - public AbstractBuild resolveChild(Child child) { - MatrixBuild b = (MatrixBuild)owner; - return b.getProject().getItem(Combination.fromString(child.name)).getBuildByNumber(child.build); - } - - @Override - public String getTestResultPath(TestResult it) { - // Prepend Configuration path - return it.getOwner().getParent().getShortUrl() + super.getTestResultPath(it); - } -} diff --git a/core/src/main/java/hudson/tasks/test/TestResultAggregator.java b/core/src/main/java/hudson/tasks/test/TestResultAggregator.java deleted file mode 100644 index 72b76fd708..0000000000 --- a/core/src/main/java/hudson/tasks/test/TestResultAggregator.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * The MIT License - * - * Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Yahoo!, 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.tasks.test; - -import hudson.Launcher; -import hudson.matrix.MatrixAggregator; -import hudson.matrix.MatrixBuild; -import hudson.matrix.MatrixRun; -import hudson.model.BuildListener; - -import java.io.IOException; - -/** - * Aggregates {@link AbstractTestResultAction}s of {@link MatrixRun}s - * into {@link MatrixBuild}. - * - * @author Kohsuke Kawaguchi - */ -public class TestResultAggregator extends MatrixAggregator { - private MatrixTestResult result; - - public TestResultAggregator(MatrixBuild build, Launcher launcher, BuildListener listener) { - super(build, launcher, listener); - } - - @Override - public boolean startBuild() throws InterruptedException, IOException { - result = new MatrixTestResult(); - build.addAction(result); - return true; - } - - @Override - public boolean endRun(MatrixRun run) throws InterruptedException, IOException { - AbstractTestResultAction atr = run.getAction(AbstractTestResultAction.class); - if(atr!=null) result.add(atr); - return true; - } -} From a236b34364853ea1c69cbf190a6e362874730bf3 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 14 Apr 2014 19:28:55 -0400 Subject: [PATCH 10/21] DetachedPlugin entry. (cherry picked from commit e4ba41d5394e7c936a2b720e6b672da4f82af354) --- core/src/main/java/hudson/ClassicPluginStrategy.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/hudson/ClassicPluginStrategy.java b/core/src/main/java/hudson/ClassicPluginStrategy.java index 8279fb8ca1..a632983fc5 100644 --- a/core/src/main/java/hudson/ClassicPluginStrategy.java +++ b/core/src/main/java/hudson/ClassicPluginStrategy.java @@ -272,7 +272,8 @@ public class ClassicPluginStrategy implements PluginStrategy { new DetachedPlugin("mailer","1.493.*","1.2"), new DetachedPlugin("matrix-auth","1.535.*","1.0.2"), new DetachedPlugin("windows-slaves","1.547.*","1.0"), - new DetachedPlugin("antisamy-markup-formatter","1.553.*","1.0") + new DetachedPlugin("antisamy-markup-formatter","1.553.*","1.0"), + new DetachedPlugin("matrix-project","1.561.*","1.0") ); /** From 04681f6b843d7c1a6e4c4ccd30e652f408a3fd3f Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 14 Apr 2014 19:47:20 -0400 Subject: [PATCH 11/21] Extracting some miscellaneous usages from core/src. (cherry picked from commit 04aace98d196f6d6f5c1b9fcb5a356c46ed8d765) --- .../java/hudson/FileSystemProvisioner.java | 4 +- .../main/java/hudson/model/AbstractBuild.java | 3 +- .../main/java/hudson/model/TopLevelItem.java | 3 +- .../java/jenkins/scm/SCMCheckoutStrategy.java | 8 ++-- .../java/hudson/cli/ListJobsCommandTest.java | 16 +------- .../test/java/hudson/util/XStream2Test.java | 22 ----------- .../test/resources/hudson/util/runMatrix.xml | 39 ------------------- 7 files changed, 8 insertions(+), 87 deletions(-) delete mode 100644 core/src/test/resources/hudson/util/runMatrix.xml diff --git a/core/src/main/java/hudson/FileSystemProvisioner.java b/core/src/main/java/hudson/FileSystemProvisioner.java index 0ab7e44a1e..58680eb888 100644 --- a/core/src/main/java/hudson/FileSystemProvisioner.java +++ b/core/src/main/java/hudson/FileSystemProvisioner.java @@ -24,14 +24,12 @@ package hudson; import hudson.FilePath.TarCompression; -import hudson.matrix.MatrixBuild; import hudson.model.AbstractBuild; import hudson.model.AbstractProject; import hudson.model.Computer; import hudson.model.Describable; import hudson.model.Job; import hudson.model.TaskListener; -import hudson.util.DirScanner.Glob; import hudson.util.io.ArchiverFactory; import jenkins.model.Jenkins; import hudson.model.listeners.RunListener; @@ -158,7 +156,7 @@ public abstract class FileSystemProvisioner implements ExtensionPoint, Describab *

* The state of the build when this method is invoked depends on * the project type. Most would call this at the end of the build, - * but for example {@link MatrixBuild} would call this after + * but for example {@code MatrixBuild} would call this after * SCM check out so that the state of the fresh workspace * can be then propagated to elsewhere. * diff --git a/core/src/main/java/hudson/model/AbstractBuild.java b/core/src/main/java/hudson/model/AbstractBuild.java index eeeaf4e927..2b6f8633f4 100644 --- a/core/src/main/java/hudson/model/AbstractBuild.java +++ b/core/src/main/java/hudson/model/AbstractBuild.java @@ -33,7 +33,6 @@ import hudson.Launcher; import hudson.console.AnnotatedLargeText; import hudson.console.ExpandableDetailsNote; import hudson.console.ModelHyperlinkNote; -import hudson.matrix.MatrixConfiguration; import hudson.model.Fingerprint.BuildPtr; import hudson.model.Fingerprint.RangeSet; import hudson.model.labels.LabelAtom; @@ -1014,7 +1013,7 @@ public abstract class AbstractBuild

,R extends Abs * Provides additional variables and their values to {@link Builder}s. * *

- * This mechanism is used by {@link MatrixConfiguration} to pass + * This mechanism is used by {@code MatrixConfiguration} to pass * the configuration values to the current build. It is up to * {@link Builder}s to decide whether they want to recognize the values * or how to use them. diff --git a/core/src/main/java/hudson/model/TopLevelItem.java b/core/src/main/java/hudson/model/TopLevelItem.java index 23343eb209..ce362a9b79 100644 --- a/core/src/main/java/hudson/model/TopLevelItem.java +++ b/core/src/main/java/hudson/model/TopLevelItem.java @@ -25,12 +25,11 @@ package hudson.model; import hudson.Extension; import hudson.ExtensionPoint; -import hudson.matrix.MatrixConfiguration; /** * {@link Item} that can be directly displayed under {@link jenkins.model.Jenkins} or other containers. * (A "container" would be any {@link ItemGroup}{@code }, such as a folder of projects.) - * Ones that don't need to be under specific parent (say, unlike {@link MatrixConfiguration}), + * Ones that don't need to be under specific parent (say, unlike {@code MatrixConfiguration}), * and thus can be freely moved, copied, etc. * *

diff --git a/core/src/main/java/jenkins/scm/SCMCheckoutStrategy.java b/core/src/main/java/jenkins/scm/SCMCheckoutStrategy.java index f90b61a6b0..7113084280 100644 --- a/core/src/main/java/jenkins/scm/SCMCheckoutStrategy.java +++ b/core/src/main/java/jenkins/scm/SCMCheckoutStrategy.java @@ -2,8 +2,6 @@ package jenkins.scm; import hudson.ExtensionPoint; import hudson.Launcher; -import hudson.matrix.MatrixBuild; -import hudson.matrix.MatrixRun; import hudson.model.AbstractBuild; import hudson.model.AbstractBuild.AbstractBuildExecution; import hudson.model.AbstractDescribableImpl; @@ -25,9 +23,9 @@ import java.io.IOException; * is to control the check out behaviour in matrix projects. The intended use cases include situations like: * *

    - *
  • Check out will only happen once in {@link MatrixBuild}, and its state will be then sent - * to {@link MatrixRun}s by other means such as rsync. - *
  • {@link MatrixBuild} does no check out of its own, and check out is only done on {@link MatrixRun}s + *
  • Check out will only happen once in {@code MatrixBuild}, and its state will be then sent + * to {@code MatrixRun}s by other means such as rsync. + *
  • {@code MatrixBuild} does no check out of its own, and check out is only done on {@code MatrixRun}s *
* *

Hook Semantics

diff --git a/core/src/test/java/hudson/cli/ListJobsCommandTest.java b/core/src/test/java/hudson/cli/ListJobsCommandTest.java index 9e636015d2..f9ec5795e3 100644 --- a/core/src/test/java/hudson/cli/ListJobsCommandTest.java +++ b/core/src/test/java/hudson/cli/ListJobsCommandTest.java @@ -3,34 +3,23 @@ package hudson.cli; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.containsString; -import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.MatcherAssert.assertThat; import static org.powermock.api.mockito.PowerMockito.mock; import static org.powermock.api.mockito.PowerMockito.mockStatic; import static org.powermock.api.mockito.PowerMockito.when; -import hudson.matrix.MatrixConfiguration; -import hudson.matrix.MatrixProject; -import hudson.model.AbstractProject; import hudson.model.Item; import hudson.model.ItemGroup; import hudson.model.TopLevelItem; -import hudson.model.TopLevelItemDescriptor; -import hudson.model.ViewGroup; import hudson.model.ViewTest.CompositeView; import hudson.model.View; import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; import java.io.PrintStream; import java.util.Arrays; import java.util.Collection; import java.util.HashSet; import java.util.List; -import javax.annotation.CheckForNull; -import javax.servlet.ServletException; import jenkins.model.Jenkins; import jenkins.model.ModifiableTopLevelItemGroup; @@ -40,9 +29,6 @@ import org.hamcrest.TypeSafeMatcher; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.jvnet.hudson.test.Bug; -import org.kohsuke.stapler.StaplerRequest; -import org.kohsuke.stapler.StaplerResponse; import org.mockito.Mockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.core.classloader.annotations.SuppressStaticInitializationFor; @@ -80,6 +66,7 @@ public class ListJobsCommandTest { assertThat(stderr.toString(), containsString("No view or item group with the given name found")); } + /* @Test @Bug(18393) public void failForMatrixProject() throws Exception { @@ -95,6 +82,7 @@ public class ListJobsCommandTest { assertThat(stdout, is(empty())); assertThat(stderr.toString(), containsString("No view or item group with the given name found")); } + */ @Test public void getAllJobsFromFolders() throws Exception { diff --git a/core/src/test/java/hudson/util/XStream2Test.java b/core/src/test/java/hudson/util/XStream2Test.java index 4f818442e3..711e623e28 100644 --- a/core/src/test/java/hudson/util/XStream2Test.java +++ b/core/src/test/java/hudson/util/XStream2Test.java @@ -27,18 +27,14 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.thoughtworks.xstream.XStreamException; import hudson.XmlFile; -import hudson.matrix.MatrixRun; import hudson.model.Result; import hudson.model.Run; import java.io.File; -import java.io.InputStream; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Level; import java.util.logging.Logger; -import jenkins.model.CauseOfInterruption; -import jenkins.model.InterruptedBuildAction; import junit.framework.TestCase; import org.apache.commons.io.FileUtils; import org.jvnet.hudson.test.Bug; @@ -261,24 +257,6 @@ public class XStream2Test extends TestCase { public int x,y; } - /** - * Unmarshall a matrix build.xml result. - */ - @Bug(10903) - public void testUnMarshalRunMatrix() { - InputStream is = XStream2Test.class.getResourceAsStream("runMatrix.xml"); - MatrixRun result = (MatrixRun) Run.XSTREAM.fromXML(is); - assertNotNull(result); - assertNotNull(result.getPersistentActions()); - assertEquals(2, result.getPersistentActions().size()); - InterruptedBuildAction action = (InterruptedBuildAction) result.getPersistentActions().get(1); - assertNotNull(action.getCauses()); - assertEquals(1, action.getCauses().size()); - CauseOfInterruption.UserInterruption cause = - (CauseOfInterruption.UserInterruption) action.getCauses().get(0); - assertNotNull(cause); - } - public static class Foo2 { ConcurrentHashMap m = new ConcurrentHashMap(); } diff --git a/core/src/test/resources/hudson/util/runMatrix.xml b/core/src/test/resources/hudson/util/runMatrix.xml deleted file mode 100644 index 37513c87b5..0000000000 --- a/core/src/test/resources/hudson/util/runMatrix.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - MatrixProject - job/MatrixProject/ - 8 - - - auser - - - - - - - - - - auser - - - - - - 8 - ABORTED - 3253844 - windows-1252 - false - amachine - C:\jenkins\slave\workspace\MatrixProject\blah\blah\blah - 1.427 - - auser - - \ No newline at end of file From 9069428f0b45c0595d13296084ed9aa0f9c38fa5 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 14 Apr 2014 20:35:28 -0400 Subject: [PATCH 12/21] Test harness must depend on matrix-project. (cherry picked from commit b628b47285a1ef9631760c84ded3097c457a0250) --- test/pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/test/pom.xml b/test/pom.xml index 345d20029b..2397bc72ab 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -92,6 +92,11 @@ THE SOFTWARE. antisamy-markup-formatter 1.0 + + org.jenkins-ci.plugins + matrix-project + 1.0-SNAPSHOT + org.mortbay.jetty jetty From 92ca85339fce8b3f382592dd70dddced1a7345d9 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 14 Apr 2014 21:10:17 -0400 Subject: [PATCH 13/21] Preparing to include transitional release. (cherry picked from commit 071951e65898a308d331a510dc5a46b3e10cf373) --- core/src/main/java/hudson/ClassicPluginStrategy.java | 2 +- test/pom.xml | 2 +- war/pom.xml | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/hudson/ClassicPluginStrategy.java b/core/src/main/java/hudson/ClassicPluginStrategy.java index a632983fc5..acf4f4a52a 100644 --- a/core/src/main/java/hudson/ClassicPluginStrategy.java +++ b/core/src/main/java/hudson/ClassicPluginStrategy.java @@ -273,7 +273,7 @@ public class ClassicPluginStrategy implements PluginStrategy { new DetachedPlugin("matrix-auth","1.535.*","1.0.2"), new DetachedPlugin("windows-slaves","1.547.*","1.0"), new DetachedPlugin("antisamy-markup-formatter","1.553.*","1.0"), - new DetachedPlugin("matrix-project","1.561.*","1.0") + new DetachedPlugin("matrix-project","1.561.*","1.0-beta-1") ); /** diff --git a/test/pom.xml b/test/pom.xml index 2397bc72ab..8462419701 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -95,7 +95,7 @@ THE SOFTWARE. org.jenkins-ci.plugins matrix-project - 1.0-SNAPSHOT + 1.0-beta-1-SNAPSHOT org.mortbay.jetty diff --git a/war/pom.xml b/war/pom.xml index 93aaa5b912..7df3440811 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -361,6 +361,12 @@ THE SOFTWARE. 1.0 hpi + + org.jenkins-ci.plugins + matrix-project + 1.0-beta-1-SNAPSHOT + hpi + ${project.build.directory}/${project.build.finalName}/WEB-INF/plugins true From 075bd9b5b3f5ba5470b79b5faed3ea9bf7b786e0 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 14 Apr 2014 21:51:12 -0400 Subject: [PATCH 14/21] matrix-project 1.0-beta-1 (cherry picked from commit 9259f8736ce9c022270eb44b4b318ee5c98f3601) --- test/pom.xml | 2 +- war/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/pom.xml b/test/pom.xml index 8462419701..679ad99c60 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -95,7 +95,7 @@ THE SOFTWARE. org.jenkins-ci.plugins matrix-project - 1.0-beta-1-SNAPSHOT + 1.0-beta-1 org.mortbay.jetty diff --git a/war/pom.xml b/war/pom.xml index 7df3440811..a44b97b7a2 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -364,7 +364,7 @@ THE SOFTWARE. org.jenkins-ci.plugins matrix-project - 1.0-beta-1-SNAPSHOT + 1.0-beta-1 hpi From da829b345df78c04384b2d373bb7b150a83dc2c2 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 14 Apr 2014 23:20:12 -0400 Subject: [PATCH 15/21] isMatrixProject ought to handle nulls, just in case. (cherry picked from commit 747d550c3caa3aa012f9906c22211cfe17114842) --- core/src/main/java/hudson/Functions.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/java/hudson/Functions.java b/core/src/main/java/hudson/Functions.java index f6f9979afd..b7a561aea2 100644 --- a/core/src/main/java/hudson/Functions.java +++ b/core/src/main/java/hudson/Functions.java @@ -191,7 +191,7 @@ public class Functions { @Deprecated public static boolean isMatrixProject(Object o) { - return o.getClass().getName().equals("hudson.matrix.MatrixProject"); + return o != null && o.getClass().getName().equals("hudson.matrix.MatrixProject"); } public static String xsDate(Calendar cal) { From 5d43fdf1e65a0589f728cdb022dce290246a18f6 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 28 Apr 2014 15:04:07 -0400 Subject: [PATCH 16/21] matrix-project 1.0 (cherry picked from commit 0bd831e2d9053b3e3cca2e711f77eb63815b1cb2) --- core/src/main/java/hudson/ClassicPluginStrategy.java | 2 +- war/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/hudson/ClassicPluginStrategy.java b/core/src/main/java/hudson/ClassicPluginStrategy.java index acf4f4a52a..a632983fc5 100644 --- a/core/src/main/java/hudson/ClassicPluginStrategy.java +++ b/core/src/main/java/hudson/ClassicPluginStrategy.java @@ -273,7 +273,7 @@ public class ClassicPluginStrategy implements PluginStrategy { new DetachedPlugin("matrix-auth","1.535.*","1.0.2"), new DetachedPlugin("windows-slaves","1.547.*","1.0"), new DetachedPlugin("antisamy-markup-formatter","1.553.*","1.0"), - new DetachedPlugin("matrix-project","1.561.*","1.0-beta-1") + new DetachedPlugin("matrix-project","1.561.*","1.0") ); /** diff --git a/war/pom.xml b/war/pom.xml index a44b97b7a2..af8291291a 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -364,7 +364,7 @@ THE SOFTWARE. org.jenkins-ci.plugins matrix-project - 1.0-beta-1 + 1.0 hpi From 5b93017568b7780ac7cee2ebb5968dfb6b24a256 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Wed, 4 Feb 2015 14:58:22 -0500 Subject: [PATCH 17/21] Integrating snapshot build of matrix-project. --- war/pom.xml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/war/pom.xml b/war/pom.xml index af8291291a..c0e22670e4 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -364,7 +364,13 @@ THE SOFTWARE. org.jenkins-ci.plugins matrix-project - 1.0 + 1.2.1-20150204.194845-1 + hpi + + + org.jenkins-ci.plugins + script-security + 1.13 hpi From f987f9ce89952c79e045f6125c08bfd7c6b9aa99 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Wed, 4 Feb 2015 15:52:56 -0500 Subject: [PATCH 18/21] Need to test against the same version of matrix-project we bundle. Otherwise FingerprinterTest.matrixDependency throws an AbstractMethodError. --- pom.xml | 1 + test/pom.xml | 2 +- war/pom.xml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 346ed3450b..80e273fe07 100644 --- a/pom.xml +++ b/pom.xml @@ -95,6 +95,7 @@ THE SOFTWARE. 1.7.4 2.1 + 1.2.1-20150204.194845-1 ${skipTests} 6 diff --git a/test/pom.xml b/test/pom.xml index 679ad99c60..bc1663d238 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -95,7 +95,7 @@ THE SOFTWARE. org.jenkins-ci.plugins matrix-project - 1.0-beta-1 + ${matrix-project.version} org.mortbay.jetty diff --git a/war/pom.xml b/war/pom.xml index c0e22670e4..9df8d74706 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -364,7 +364,7 @@ THE SOFTWARE. org.jenkins-ci.plugins matrix-project - 1.2.1-20150204.194845-1 + ${matrix-project.version} hpi From 41786ad0195cc1221172f47f82b8662040557ea4 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Wed, 4 Feb 2015 16:45:53 -0500 Subject: [PATCH 19/21] =?UTF-8?q?Preventing=20cyclic=20dependencies=20amon?= =?UTF-8?q?g=20bundled=20plugins.=20Reproducible=20for=20example=20via=20H?= =?UTF-8?q?elpLinkTest.testMatrixConfig.=20Otherwise=20have:=20matrix-proj?= =?UTF-8?q?ect=20=E2=86=92=20script-security=20=E2=86=92=20matrix-auth=20?= =?UTF-8?q?=E2=86=92=20windows-slaves=20=E2=86=92=20antisamy-markup-format?= =?UTF-8?q?ter=20=E2=86=92=20matrix-project=20Tried=20to=20come=20up=20wit?= =?UTF-8?q?h=20a=20generic=20way=20of=20doing=20this=20automatically,=20bu?= =?UTF-8?q?t=20failed.=20Just=20because=20we=20bundle=20a=20particular=20b?= =?UTF-8?q?uild=20of=20some=20plugin=20does=20not=20mean=20it=20was=20buil?= =?UTF-8?q?t=20against=20anything=20recent,=20and=20for=20use=20on=20older?= =?UTF-8?q?=20cores=20it=20may=20well=20need=20some=20of=20those=20implici?= =?UTF-8?q?t=20dependencies.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/hudson/ClassicPluginStrategy.java | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/hudson/ClassicPluginStrategy.java b/core/src/main/java/hudson/ClassicPluginStrategy.java index a632983fc5..cc2eda6a65 100644 --- a/core/src/main/java/hudson/ClassicPluginStrategy.java +++ b/core/src/main/java/hudson/ClassicPluginStrategy.java @@ -64,6 +64,7 @@ import java.util.Collections; import java.util.Enumeration; import java.util.HashSet; import java.util.List; +import java.util.Set; import java.util.Vector; import java.util.jar.Attributes; import java.util.jar.Manifest; @@ -250,13 +251,19 @@ public class ClassicPluginStrategy implements PluginStrategy { // don't fix the dependency for yourself, or else we'll have a cycle String yourName = atts.getValue("Short-Name"); if (shortName.equals(yourName)) return; + if (BREAK_CYCLES.contains(yourName + '/' + shortName)) { + LOGGER.log(Level.FINE, "skipping implicit dependency {0} → {1}", new Object[] {yourName, shortName}); + return; + } // some earlier versions of maven-hpi-plugin apparently puts "null" as a literal in Hudson-Version. watch out for them. String jenkinsVersion = atts.getValue("Jenkins-Version"); if (jenkinsVersion==null) jenkinsVersion = atts.getValue("Hudson-Version"); - if (jenkinsVersion == null || jenkinsVersion.equals("null") || new VersionNumber(jenkinsVersion).compareTo(splitWhen) <= 0) - optionalDependencies.add(new PluginWrapper.Dependency(shortName+':'+requireVersion)); + if (jenkinsVersion == null || jenkinsVersion.equals("null") || new VersionNumber(jenkinsVersion).compareTo(splitWhen) <= 0) { + optionalDependencies.add(new PluginWrapper.Dependency(shortName + ':' + requireVersion)); + LOGGER.log(Level.FINE, "adding implicit dependency {0} → {1} because of {2}", new Object[] {yourName, shortName, jenkinsVersion}); + } } } @@ -276,6 +283,14 @@ public class ClassicPluginStrategy implements PluginStrategy { new DetachedPlugin("matrix-project","1.561.*","1.0") ); + /** Implicit dependencies that are known to be unnecessary and which must be cut out to prevent a dependency cycle among bundled plugins. */ + private static final Set BREAK_CYCLES = new HashSet(Arrays.asList( + "script-security/matrix-auth", + "script-security/windows-slaves", + "script-security/antisamy-markup-formatter", + "script-security/matrix-project" + )); + /** * Computes the classloader that takes the class masking into account. * From 1786daa514465b54918d0719f7e338b1a2929080 Mon Sep 17 00:00:00 2001 From: James Nord Date: Thu, 5 Feb 2015 14:36:29 +0000 Subject: [PATCH 20/21] [SECURITY-167] Followup tweaks to address review comments. Addresses some comments received after the original fix was merged. --- .../util/xml/RestrictiveEntityResolver.java | 3 +++ .../main/java/jenkins/util/xml/XMLUtils.java | 4 ++++ .../model/AbstractItemSecurityTest.java | 20 ++----------------- 3 files changed, 9 insertions(+), 18 deletions(-) diff --git a/core/src/main/java/jenkins/util/xml/RestrictiveEntityResolver.java b/core/src/main/java/jenkins/util/xml/RestrictiveEntityResolver.java index 87079b551e..c4b231dd71 100644 --- a/core/src/main/java/jenkins/util/xml/RestrictiveEntityResolver.java +++ b/core/src/main/java/jenkins/util/xml/RestrictiveEntityResolver.java @@ -1,5 +1,7 @@ package jenkins.util.xml; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; import org.xml.sax.EntityResolver; import org.xml.sax.InputSource; import org.xml.sax.SAXException; @@ -12,6 +14,7 @@ import java.io.IOException; * * @since TODO */ +@Restricted(NoExternalUse.class) public final class RestrictiveEntityResolver implements EntityResolver { public final static RestrictiveEntityResolver INSTANCE = new RestrictiveEntityResolver(); diff --git a/core/src/main/java/jenkins/util/xml/XMLUtils.java b/core/src/main/java/jenkins/util/xml/XMLUtils.java index 5aab9b5567..5abe7ba6a5 100644 --- a/core/src/main/java/jenkins/util/xml/XMLUtils.java +++ b/core/src/main/java/jenkins/util/xml/XMLUtils.java @@ -1,5 +1,7 @@ package jenkins.util.xml; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; import org.xml.sax.InputSource; import org.xml.sax.SAXException; import org.xml.sax.XMLReader; @@ -20,7 +22,9 @@ import javax.xml.transform.sax.SAXTransformerFactory; /** * Utilities useful when working with various XML types. + * @since TODO */ +@Restricted(NoExternalUse.class) public final class XMLUtils { private final static Logger LOGGER = LogManager.getLogManager().getLogger(XMLUtils.class.getName()); diff --git a/test/src/test/java/hudson/model/AbstractItemSecurityTest.java b/test/src/test/java/hudson/model/AbstractItemSecurityTest.java index d9d26d363c..3054ad3b4f 100644 --- a/test/src/test/java/hudson/model/AbstractItemSecurityTest.java +++ b/test/src/test/java/hudson/model/AbstractItemSecurityTest.java @@ -56,22 +56,14 @@ public class AbstractItemSecurityTest { @Test() // SECURITY-167 - public void testUpdateByXmlIDoesNotProcessForeignResources() throws Exception { + public void testUpdateByXmlDoesNotProcessForeignResources() throws Exception { final String xml = "\n" + "\n" + "]>\n" + "\n" + - " \n" + " &foo;\n" + - " false\n" + - " \n" + " \n" + - " true\n" + - " \n" + - " \n" + - " \n" + - " \n" + ""; FreeStyleProject project = jenkinsRule.createFreeStyleProject("security-167"); @@ -90,19 +82,11 @@ public class AbstractItemSecurityTest { @Test() // SECURITY-167 - public void testhamyXmlIDoesNotFail() throws Exception { + public void testUpdateByXmlDoesNotFail() throws Exception { final String xml = "\n" + "\n" + - " \n" + " &\n" + - " false\n" + - " \n" + " \n" + - " true\n" + - " \n" + - " \n" + - " \n" + - " \n" + ""; FreeStyleProject project = jenkinsRule.createFreeStyleProject("security-167"); From fe5077e53418b9a195ff0fa06c8f8a414aac0726 Mon Sep 17 00:00:00 2001 From: James Nord Date: Thu, 5 Feb 2015 14:44:12 +0000 Subject: [PATCH 21/21] remove uneeded "@since TODO" --- .../main/java/jenkins/util/xml/RestrictiveEntityResolver.java | 2 -- core/src/main/java/jenkins/util/xml/XMLUtils.java | 1 - 2 files changed, 3 deletions(-) diff --git a/core/src/main/java/jenkins/util/xml/RestrictiveEntityResolver.java b/core/src/main/java/jenkins/util/xml/RestrictiveEntityResolver.java index c4b231dd71..1cf37c9bd5 100644 --- a/core/src/main/java/jenkins/util/xml/RestrictiveEntityResolver.java +++ b/core/src/main/java/jenkins/util/xml/RestrictiveEntityResolver.java @@ -11,8 +11,6 @@ import java.io.IOException; /** * An EntityResolver that will fail to resolve any entities. * Useful in preventing External XML Entity injection attacks. - * - * @since TODO */ @Restricted(NoExternalUse.class) public final class RestrictiveEntityResolver implements EntityResolver { diff --git a/core/src/main/java/jenkins/util/xml/XMLUtils.java b/core/src/main/java/jenkins/util/xml/XMLUtils.java index 5abe7ba6a5..84e6f6151b 100644 --- a/core/src/main/java/jenkins/util/xml/XMLUtils.java +++ b/core/src/main/java/jenkins/util/xml/XMLUtils.java @@ -22,7 +22,6 @@ import javax.xml.transform.sax.SAXTransformerFactory; /** * Utilities useful when working with various XML types. - * @since TODO */ @Restricted(NoExternalUse.class) public final class XMLUtils {