From 3aa7f4c5850ba5480ba647030bd1d2bf229f2e45 Mon Sep 17 00:00:00 2001 From: Daniel Beck Date: Thu, 21 Mar 2024 22:59:15 +0100 Subject: [PATCH 1/5] [JENKINS-18884] Remove 'People' view --- core/src/main/java/hudson/model/View.java | 266 ------------------ core/src/main/java/jenkins/model/Jenkins.java | 20 -- .../hudson/model/User/sidepanel.jelly | 1 - .../model/View/AsynchPeople/index.jelly | 72 ----- .../model/View/AsynchPeople/index.properties | 23 -- .../View/AsynchPeople/index_bg.properties | 37 --- .../View/AsynchPeople/index_ca.properties | 7 - .../View/AsynchPeople/index_cs.properties | 27 -- .../View/AsynchPeople/index_da.properties | 29 -- .../View/AsynchPeople/index_de.properties | 29 -- .../View/AsynchPeople/index_el.properties | 27 -- .../View/AsynchPeople/index_es.properties | 30 -- .../View/AsynchPeople/index_es_AR.properties | 6 - .../View/AsynchPeople/index_et.properties | 4 - .../View/AsynchPeople/index_fi.properties | 27 -- .../View/AsynchPeople/index_fr.properties | 29 -- .../View/AsynchPeople/index_hu.properties | 28 -- .../View/AsynchPeople/index_it.properties | 32 --- .../View/AsynchPeople/index_ja.properties | 28 -- .../View/AsynchPeople/index_ko.properties | 26 -- .../View/AsynchPeople/index_lt.properties | 27 -- .../View/AsynchPeople/index_lv.properties | 28 -- .../View/AsynchPeople/index_nb_NO.properties | 27 -- .../View/AsynchPeople/index_nl.properties | 29 -- .../View/AsynchPeople/index_pl.properties | 28 -- .../View/AsynchPeople/index_pt_BR.properties | 29 -- .../View/AsynchPeople/index_pt_PT.properties | 7 - .../View/AsynchPeople/index_ro.properties | 27 -- .../View/AsynchPeople/index_ru.properties | 29 -- .../View/AsynchPeople/index_sr.properties | 9 - .../View/AsynchPeople/index_sv_SE.properties | 29 -- .../View/AsynchPeople/index_tr.properties | 27 -- .../View/AsynchPeople/index_uk.properties | 7 - .../View/AsynchPeople/index_zh_TW.properties | 30 -- .../View/AsynchPeople/people-resources.js | 57 ---- .../hudson/model/View/People/index.jelly | 37 --- .../hudson/model/View/People/index.properties | 23 -- .../model/View/People/index_bg.properties | 28 -- .../model/View/People/index_ca.properties | 3 - .../model/View/People/index_cs.properties | 3 - .../model/View/People/index_de.properties | 4 - .../model/View/People/index_es.properties | 3 - .../model/View/People/index_es_AR.properties | 3 - .../model/View/People/index_et.properties | 3 - .../model/View/People/index_fr.properties | 3 - .../model/View/People/index_he.properties | 3 - .../model/View/People/index_hu.properties | 3 - .../model/View/People/index_it.properties | 26 -- .../model/View/People/index_ja.properties | 23 -- .../model/View/People/index_lt.properties | 3 - .../model/View/People/index_nb_NO.properties | 3 - .../model/View/People/index_nl.properties | 3 - .../model/View/People/index_pl.properties | 3 - .../model/View/People/index_pt_BR.properties | 25 -- .../model/View/People/index_pt_PT.properties | 3 - .../model/View/People/index_ro.properties | 3 - .../model/View/People/index_ru.properties | 3 - .../model/View/People/index_sl.properties | 3 - .../model/View/People/index_sr.properties | 4 - .../model/View/People/index_tr.properties | 3 - .../model/View/People/index_uk.properties | 3 - .../model/View/People/index_zh_TW.properties | 23 -- .../hudson/model/View/sidepanel.jelly | 8 - .../java/hudson/model/AsynchPeopleTest.java | 64 ----- .../stapler/GetterMethodFilterTest.java | 27 +- 65 files changed, 13 insertions(+), 1471 deletions(-) delete mode 100644 core/src/main/resources/hudson/model/View/AsynchPeople/index.jelly delete mode 100644 core/src/main/resources/hudson/model/View/AsynchPeople/index.properties delete mode 100644 core/src/main/resources/hudson/model/View/AsynchPeople/index_bg.properties delete mode 100644 core/src/main/resources/hudson/model/View/AsynchPeople/index_ca.properties delete mode 100644 core/src/main/resources/hudson/model/View/AsynchPeople/index_cs.properties delete mode 100644 core/src/main/resources/hudson/model/View/AsynchPeople/index_da.properties delete mode 100644 core/src/main/resources/hudson/model/View/AsynchPeople/index_de.properties delete mode 100644 core/src/main/resources/hudson/model/View/AsynchPeople/index_el.properties delete mode 100644 core/src/main/resources/hudson/model/View/AsynchPeople/index_es.properties delete mode 100644 core/src/main/resources/hudson/model/View/AsynchPeople/index_es_AR.properties delete mode 100644 core/src/main/resources/hudson/model/View/AsynchPeople/index_et.properties delete mode 100644 core/src/main/resources/hudson/model/View/AsynchPeople/index_fi.properties delete mode 100644 core/src/main/resources/hudson/model/View/AsynchPeople/index_fr.properties delete mode 100644 core/src/main/resources/hudson/model/View/AsynchPeople/index_hu.properties delete mode 100644 core/src/main/resources/hudson/model/View/AsynchPeople/index_it.properties delete mode 100644 core/src/main/resources/hudson/model/View/AsynchPeople/index_ja.properties delete mode 100644 core/src/main/resources/hudson/model/View/AsynchPeople/index_ko.properties delete mode 100644 core/src/main/resources/hudson/model/View/AsynchPeople/index_lt.properties delete mode 100644 core/src/main/resources/hudson/model/View/AsynchPeople/index_lv.properties delete mode 100644 core/src/main/resources/hudson/model/View/AsynchPeople/index_nb_NO.properties delete mode 100644 core/src/main/resources/hudson/model/View/AsynchPeople/index_nl.properties delete mode 100644 core/src/main/resources/hudson/model/View/AsynchPeople/index_pl.properties delete mode 100644 core/src/main/resources/hudson/model/View/AsynchPeople/index_pt_BR.properties delete mode 100644 core/src/main/resources/hudson/model/View/AsynchPeople/index_pt_PT.properties delete mode 100644 core/src/main/resources/hudson/model/View/AsynchPeople/index_ro.properties delete mode 100644 core/src/main/resources/hudson/model/View/AsynchPeople/index_ru.properties delete mode 100644 core/src/main/resources/hudson/model/View/AsynchPeople/index_sr.properties delete mode 100644 core/src/main/resources/hudson/model/View/AsynchPeople/index_sv_SE.properties delete mode 100644 core/src/main/resources/hudson/model/View/AsynchPeople/index_tr.properties delete mode 100644 core/src/main/resources/hudson/model/View/AsynchPeople/index_uk.properties delete mode 100644 core/src/main/resources/hudson/model/View/AsynchPeople/index_zh_TW.properties delete mode 100644 core/src/main/resources/hudson/model/View/AsynchPeople/people-resources.js delete mode 100644 core/src/main/resources/hudson/model/View/People/index.jelly delete mode 100644 core/src/main/resources/hudson/model/View/People/index.properties delete mode 100644 core/src/main/resources/hudson/model/View/People/index_bg.properties delete mode 100644 core/src/main/resources/hudson/model/View/People/index_ca.properties delete mode 100644 core/src/main/resources/hudson/model/View/People/index_cs.properties delete mode 100644 core/src/main/resources/hudson/model/View/People/index_de.properties delete mode 100644 core/src/main/resources/hudson/model/View/People/index_es.properties delete mode 100644 core/src/main/resources/hudson/model/View/People/index_es_AR.properties delete mode 100644 core/src/main/resources/hudson/model/View/People/index_et.properties delete mode 100644 core/src/main/resources/hudson/model/View/People/index_fr.properties delete mode 100644 core/src/main/resources/hudson/model/View/People/index_he.properties delete mode 100644 core/src/main/resources/hudson/model/View/People/index_hu.properties delete mode 100644 core/src/main/resources/hudson/model/View/People/index_it.properties delete mode 100644 core/src/main/resources/hudson/model/View/People/index_ja.properties delete mode 100644 core/src/main/resources/hudson/model/View/People/index_lt.properties delete mode 100644 core/src/main/resources/hudson/model/View/People/index_nb_NO.properties delete mode 100644 core/src/main/resources/hudson/model/View/People/index_nl.properties delete mode 100644 core/src/main/resources/hudson/model/View/People/index_pl.properties delete mode 100644 core/src/main/resources/hudson/model/View/People/index_pt_BR.properties delete mode 100644 core/src/main/resources/hudson/model/View/People/index_pt_PT.properties delete mode 100644 core/src/main/resources/hudson/model/View/People/index_ro.properties delete mode 100644 core/src/main/resources/hudson/model/View/People/index_ru.properties delete mode 100644 core/src/main/resources/hudson/model/View/People/index_sl.properties delete mode 100644 core/src/main/resources/hudson/model/View/People/index_sr.properties delete mode 100644 core/src/main/resources/hudson/model/View/People/index_tr.properties delete mode 100644 core/src/main/resources/hudson/model/View/People/index_uk.properties delete mode 100644 core/src/main/resources/hudson/model/View/People/index_zh_TW.properties delete mode 100644 test/src/test/java/hudson/model/AsynchPeopleTest.java diff --git a/core/src/main/java/hudson/model/View.java b/core/src/main/java/hudson/model/View.java index fb0d2b0b8c88..793b1ac37c44 100644 --- a/core/src/main/java/hudson/model/View.java +++ b/core/src/main/java/hudson/model/View.java @@ -41,7 +41,6 @@ import hudson.init.Initializer; import hudson.model.Descriptor.FormException; import hudson.model.listeners.ItemListener; -import hudson.scm.ChangeLogSet; import hudson.search.CollectionSearchIndex; import hudson.search.SearchIndexBuilder; import hudson.security.ACL; @@ -81,7 +80,6 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; import java.util.stream.Collectors; @@ -98,19 +96,13 @@ import jenkins.model.item_category.Categories; import jenkins.model.item_category.Category; import jenkins.model.item_category.ItemCategory; -import jenkins.scm.RunWithSCM; -import jenkins.security.stapler.StaplerAccessibleType; -import jenkins.util.ProgressiveRendering; import jenkins.util.xml.XMLUtils; import jenkins.widgets.HasWidgets; -import net.sf.json.JSON; -import net.sf.json.JSONArray; import net.sf.json.JSONObject; import org.jenkins.ui.icon.Icon; import org.jenkins.ui.icon.IconSet; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.DoNotUse; -import org.kohsuke.accmod.restrictions.NoExternalUse; import org.kohsuke.stapler.DataBoundSetter; import org.kohsuke.stapler.HttpResponse; import org.kohsuke.stapler.HttpResponses; @@ -703,264 +695,6 @@ private long ordinal() { } } - /** - * Does this {@link View} has any associated user information recorded? - * @deprecated Potentially very expensive call; do not use from Jelly views. - */ - @Deprecated - public boolean hasPeople() { - return People.isApplicable(getItems()); - } - - /** - * Gets the users that show up in the changelog of this job collection. - */ - public People getPeople() { - return new People(this); - } - - /** - * @since 1.484 - */ - public AsynchPeople getAsynchPeople() { - return new AsynchPeople(this); - } - - @ExportedBean - @StaplerAccessibleType - public static final class People { - @Exported - public final List users; - - public final ModelObject parent; - - public People(Jenkins parent) { - this.parent = parent; - // for Hudson, really load all users - Map users = getUserInfo(parent.getItems()); - User unknown = User.getUnknown(); - for (User u : User.getAll()) { - if (u == unknown) continue; // skip the special 'unknown' user - if (!users.containsKey(u)) - users.put(u, new UserInfo(u, null, null)); - } - this.users = toList(users); - } - - public People(View parent) { - this.parent = parent; - this.users = toList(getUserInfo(parent.getItems())); - } - - private Map getUserInfo(Collection items) { - Map users = new HashMap<>(); - for (Item item : items) { - for (Job job : item.getAllJobs()) { - RunList> runs = job.getBuilds(); - for (Run r : runs) { - if (r instanceof RunWithSCM) { - RunWithSCM runWithSCM = (RunWithSCM) r; - - for (ChangeLogSet c : runWithSCM.getChangeSets()) { - for (ChangeLogSet.Entry entry : c) { - User user = entry.getAuthor(); - - UserInfo info = users.get(user); - if (info == null) - users.put(user, new UserInfo(user, job, r.getTimestamp())); - else if (info.getLastChange().before(r.getTimestamp())) { - info.project = job; - info.lastChange = r.getTimestamp(); - } - } - } - } - } - } - } - return users; - } - - private List toList(Map users) { - ArrayList list = new ArrayList<>(users.values()); - Collections.sort(list); - return Collections.unmodifiableList(list); - } - - public Api getApi() { - return new Api(this); - } - - /** - * @deprecated Potentially very expensive call; do not use from Jelly views. - */ - @Deprecated - public static boolean isApplicable(Collection items) { - for (Item item : items) { - for (Job job : item.getAllJobs()) { - RunList> runs = job.getBuilds(); - - for (Run r : runs) { - if (r instanceof RunWithSCM) { - RunWithSCM runWithSCM = (RunWithSCM) r; - for (ChangeLogSet c : runWithSCM.getChangeSets()) { - for (ChangeLogSet.Entry entry : c) { - User user = entry.getAuthor(); - if (user != null) - return true; - } - } - } - } - } - } - return false; - } - } - - /** - * Variant of {@link People} which can be displayed progressively, since it may be slow. - * @since 1.484 - */ - public static final class AsynchPeople extends ProgressiveRendering { // JENKINS-15206 - - private final Collection items; - private final User unknown; - private final Map users = new HashMap<>(); - private final Set modified = new HashSet<>(); - private final String iconSize; - public final ModelObject parent; - - /** @see Jenkins#getAsynchPeople */ - public AsynchPeople(Jenkins parent) { - this.parent = parent; - items = parent.getItems(); - unknown = User.getUnknown(); - } - - /** @see View#getAsynchPeople */ - public AsynchPeople(View parent) { - this.parent = parent; - items = parent.getItems(); - unknown = null; - } - - { - StaplerRequest req = Stapler.getCurrentRequest(); - iconSize = req != null ? Functions.validateIconSize(Functions.getCookie(req, "iconSize", "32x32")) : "32x32"; - } - - @Override protected void compute() throws Exception { - int itemCount = 0; - for (Item item : items) { - for (Job job : item.getAllJobs()) { - RunList> builds = job.getBuilds(); - int buildCount = 0; - for (Run r : builds) { - if (canceled()) { - return; - } - if (!(r instanceof RunWithSCM)) { - continue; - } - - RunWithSCM runWithSCM = (RunWithSCM) r; - for (ChangeLogSet c : runWithSCM.getChangeSets()) { - for (ChangeLogSet.Entry entry : c) { - User user = entry.getAuthor(); - UserInfo info = users.get(user); - if (info == null) { - UserInfo userInfo = new UserInfo(user, job, r.getTimestamp()); - userInfo.avatar = UserAvatarResolver.resolveOrNull(user, iconSize); - synchronized (this) { - users.put(user, userInfo); - modified.add(user); - } - } else if (info.getLastChange().before(r.getTimestamp())) { - synchronized (this) { - info.project = job; - info.lastChange = r.getTimestamp(); - modified.add(user); - } - } - } - } - // TODO consider also adding the user of the UserCause when applicable - buildCount++; - // TODO this defeats lazy-loading. Should rather do a breadth-first search, as in hudson.plugins.view.dashboard.builds.LatestBuilds - // (though currently there is no quick implementation of RunMap.size() ~ idOnDisk.size(), which would be needed for proper progress) - progress((itemCount + 1.0 * buildCount / builds.size()) / (items.size() + 1)); - } - } - itemCount++; - progress(1.0 * itemCount / (items.size() + /* handling User.getAll */1)); - } - if (unknown != null) { - if (canceled()) { - return; - } - for (User u : User.getAll()) { // TODO nice to have a method to iterate these lazily - if (canceled()) { - return; - } - if (u == unknown) { - continue; - } - if (!users.containsKey(u)) { - UserInfo userInfo = new UserInfo(u, null, null); - userInfo.avatar = UserAvatarResolver.resolveOrNull(u, iconSize); - synchronized (this) { - users.put(u, userInfo); - modified.add(u); - } - } - } - } - } - - @NonNull - @Override protected synchronized JSON data() { - JSONArray r = new JSONArray(); - for (User u : modified) { - UserInfo i = users.get(u); - JSONObject entry = new JSONObject(). - accumulate("id", u.getId()). - accumulate("fullName", u.getFullName()). - accumulate("url", u.getUrl() + "/"). - accumulate("avatar", i.avatar != null ? i.avatar : Stapler.getCurrentRequest().getContextPath() + Functions.getResourcePath() + "/images/svgs/person.svg"). - accumulate("timeSortKey", i.getTimeSortKey()). - accumulate("lastChangeTimeString", i.getLastChangeTimeString()); - Job p = i.getJob(); - if (p != null) { - entry.accumulate("projectUrl", p.getUrl()).accumulate("projectFullDisplayName", p.getFullDisplayName()); - } - r.add(entry); - } - modified.clear(); - return r; - } - - public Api getApi() { - return new Api(new People()); - } - - /** JENKINS-16397 workaround */ - @Restricted(NoExternalUse.class) - @ExportedBean - public final class People { - - private View.People people; - - @Exported public synchronized List getUsers() { - if (people == null) { - people = parent instanceof Jenkins ? new View.People((Jenkins) parent) : new View.People((View) parent); - } - return people.users; - } - } - - } - void addDisplayNamesToSearchIndex(SearchIndexBuilder sib, Collection items) { for (TopLevelItem item : items) { diff --git a/core/src/main/java/jenkins/model/Jenkins.java b/core/src/main/java/jenkins/model/Jenkins.java index a35a3d486ed6..77e6f69ec875 100644 --- a/core/src/main/java/jenkins/model/Jenkins.java +++ b/core/src/main/java/jenkins/model/Jenkins.java @@ -1455,26 +1455,6 @@ public void setNoUsageStatistics(Boolean noUsageStatistics) throws IOException { save(); } - public View.People getPeople() { - return new View.People(this); - } - - /** - * @since 1.484 - */ - public View.AsynchPeople getAsynchPeople() { - return new View.AsynchPeople(this); - } - - /** - * Does this {@link View} has any associated user information recorded? - * @deprecated Potentially very expensive call; do not use from Jelly views. - */ - @Deprecated - public boolean hasPeople() { - return View.People.isApplicable(items.values()); - } - public Api getApi() { /* Do not show "REST API" link in footer when on 404 error page */ final StaplerRequest req = Stapler.getCurrentRequest(); diff --git a/core/src/main/resources/hudson/model/User/sidepanel.jelly b/core/src/main/resources/hudson/model/User/sidepanel.jelly index ecc6ff014cbe..834061995daf 100644 --- a/core/src/main/resources/hudson/model/User/sidepanel.jelly +++ b/core/src/main/resources/hudson/model/User/sidepanel.jelly @@ -31,7 +31,6 @@ THE SOFTWARE. - diff --git a/core/src/main/resources/hudson/model/View/AsynchPeople/index.jelly b/core/src/main/resources/hudson/model/View/AsynchPeople/index.jelly deleted file mode 100644 index 9775d4bba2f4..000000000000 --- a/core/src/main/resources/hudson/model/View/AsynchPeople/index.jelly +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - -
-
-

- ${%People} - - - - ${it.parent.displayName} -

-
-
-

${%blurb}

- - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
diff --git a/core/src/main/resources/hudson/model/View/AsynchPeople/index.properties b/core/src/main/resources/hudson/model/View/AsynchPeople/index.properties deleted file mode 100644 index d1ce57488d14..000000000000 --- a/core/src/main/resources/hudson/model/View/AsynchPeople/index.properties +++ /dev/null @@ -1,23 +0,0 @@ -# The MIT License -# -# Copyright 2013 Jesse Glick. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -blurb=Includes all known “users”, including login identities which the current security realm can enumerate, as well as people mentioned in commit messages in recorded changelogs. diff --git a/core/src/main/resources/hudson/model/View/AsynchPeople/index_bg.properties b/core/src/main/resources/hudson/model/View/AsynchPeople/index_bg.properties deleted file mode 100644 index 40bd48a94a9a..000000000000 --- a/core/src/main/resources/hudson/model/View/AsynchPeople/index_bg.properties +++ /dev/null @@ -1,37 +0,0 @@ -# The MIT License -# -# Bulgarian translation: Copyright (c) 2015, 2016, Alexander Shopov -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION 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=\ - Име -On=\ - На -People=\ - Потребители -All\ People=\ - Всички потребители -User\ ID=\ - Идентификатор на потребител -blurb=\ - Включва всички познати потребители, включително тези, които текущата област\ - може да изброи, както и всички потребители указани в съобщенията при подаване. -Last\ Commit\ Activity=\ - Последни подавания diff --git a/core/src/main/resources/hudson/model/View/AsynchPeople/index_ca.properties b/core/src/main/resources/hudson/model/View/AsynchPeople/index_ca.properties deleted file mode 100644 index 2c0a54936568..000000000000 --- a/core/src/main/resources/hudson/model/View/AsynchPeople/index_ca.properties +++ /dev/null @@ -1,7 +0,0 @@ -# This file is under the MIT License by authors - -Last\ Active=Darrer actiu -Name=Nom -On=Actiu -People=Persones -User\ ID=Identificador d''''usuari diff --git a/core/src/main/resources/hudson/model/View/AsynchPeople/index_cs.properties b/core/src/main/resources/hudson/model/View/AsynchPeople/index_cs.properties deleted file mode 100644 index 16b167061cfa..000000000000 --- a/core/src/main/resources/hudson/model/View/AsynchPeople/index_cs.properties +++ /dev/null @@ -1,27 +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. - -Last\ Active=Poslední aktivita -Name=Jméno -On=Na -People=Lidé -User\ ID=Uživatelské ID diff --git a/core/src/main/resources/hudson/model/View/AsynchPeople/index_da.properties b/core/src/main/resources/hudson/model/View/AsynchPeople/index_da.properties deleted file mode 100644 index ed6d847f0cb9..000000000000 --- a/core/src/main/resources/hudson/model/View/AsynchPeople/index_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. - -On=På -Last\ Active=Sidst aktiv -People=Personer -Name=Navn -All\ People=Alle Personer -User\ ID=Bruger-ID -blurb=Inkluderer alle kendte "brugere", inklusiv login-identiteter som kan findes ud fra nuværende sikkerhedsniveau samt personer nævnt i commit-beskeder i registrerede changelogs. diff --git a/core/src/main/resources/hudson/model/View/AsynchPeople/index_de.properties b/core/src/main/resources/hudson/model/View/AsynchPeople/index_de.properties deleted file mode 100644 index 8af7bba54f91..000000000000 --- a/core/src/main/resources/hudson/model/View/AsynchPeople/index_de.properties +++ /dev/null @@ -1,29 +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. - -Name=Name -On=Job -All\ People=Alle Benutzer -People=Benutzer -User\ ID=Jenkins Benutzer Id -blurb=Beinhaltet alle bekannten Benutzer, einschließlich der Login-Benutzer des aktuellen Sicherheitsbereichs, sowie Namen, die in Commit-Kommentaren von Changelogs erwähnt werden. -Last\ Commit\ Activity=Letzte SCM-Aktivität diff --git a/core/src/main/resources/hudson/model/View/AsynchPeople/index_el.properties b/core/src/main/resources/hudson/model/View/AsynchPeople/index_el.properties deleted file mode 100644 index 16a5bfc622cb..000000000000 --- a/core/src/main/resources/hudson/model/View/AsynchPeople/index_el.properties +++ /dev/null @@ -1,27 +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. - -Last\ Active=Τελευταία χρονική ενεργή αναφορά -Name=Όνομα -On=Τελευταία ενεργή αναφορά στο project -People=Άνθρωποι -User\ ID=Id χρήστη diff --git a/core/src/main/resources/hudson/model/View/AsynchPeople/index_es.properties b/core/src/main/resources/hudson/model/View/AsynchPeople/index_es.properties deleted file mode 100644 index 61545544d46f..000000000000 --- a/core/src/main/resources/hudson/model/View/AsynchPeople/index_es.properties +++ /dev/null @@ -1,30 +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. - -Name=Nombre -Last\ Active=Actividad Reciente -On=En -All\ People=Todos -People=Actividad - -User\ ID=Nombre de Usario -blurb=Incluye todos los "usuarios" conocidos, incluyendo las identidades de acceso que se pueden enumerar en el dominio de seguridad actual, así como las personas mencionadas en los mensajes de confirmación en los registros de cambios registrados. diff --git a/core/src/main/resources/hudson/model/View/AsynchPeople/index_es_AR.properties b/core/src/main/resources/hudson/model/View/AsynchPeople/index_es_AR.properties deleted file mode 100644 index db524a5562ab..000000000000 --- a/core/src/main/resources/hudson/model/View/AsynchPeople/index_es_AR.properties +++ /dev/null @@ -1,6 +0,0 @@ -# This file is under the MIT License by authors - -Last\ Active=último activo -Name=Nombre -People=Personas -User\ ID=ID del usuario diff --git a/core/src/main/resources/hudson/model/View/AsynchPeople/index_et.properties b/core/src/main/resources/hudson/model/View/AsynchPeople/index_et.properties deleted file mode 100644 index 1b693491bf55..000000000000 --- a/core/src/main/resources/hudson/model/View/AsynchPeople/index_et.properties +++ /dev/null @@ -1,4 +0,0 @@ -# This file is under the MIT License by authors - -Name=Nimi -People=Inimesed diff --git a/core/src/main/resources/hudson/model/View/AsynchPeople/index_fi.properties b/core/src/main/resources/hudson/model/View/AsynchPeople/index_fi.properties deleted file mode 100644 index c48ca62c18dd..000000000000 --- a/core/src/main/resources/hudson/model/View/AsynchPeople/index_fi.properties +++ /dev/null @@ -1,27 +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. - -Last\ Active=Viimeksi Aktiivisena -Name=Nimi -On=Viimeksi Aktiivinen Työ -People=Käyttäjät -User\ ID=Käyttäjätunnus diff --git a/core/src/main/resources/hudson/model/View/AsynchPeople/index_fr.properties b/core/src/main/resources/hudson/model/View/AsynchPeople/index_fr.properties deleted file mode 100644 index 3948f05845d8..000000000000 --- a/core/src/main/resources/hudson/model/View/AsynchPeople/index_fr.properties +++ /dev/null @@ -1,29 +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. - -Name=Nom complet -All\ People=Tout le monde -Last\ Commit\ Activity=Dernière activité de commit -On=Sur -People=Utilisateurs -User\ ID=Identifiant -blurb=Inclus tout les utilisateurs connus, ce qui comprend les login que le domaine de sécurité (security realm) actuel peut énumérer, ainsi que les personnes mentionné(e)s dans les message de commit reliés au changelogs. diff --git a/core/src/main/resources/hudson/model/View/AsynchPeople/index_hu.properties b/core/src/main/resources/hudson/model/View/AsynchPeople/index_hu.properties deleted file mode 100644 index 339ce0c362e1..000000000000 --- a/core/src/main/resources/hudson/model/View/AsynchPeople/index_hu.properties +++ /dev/null @@ -1,28 +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. - -All\ People=Minden Felhasználó -Last\ Active=Utolsó aktivitás -Name=Név -On=Ebben -People=Emberek -User\ ID=Felhasználó azonosító diff --git a/core/src/main/resources/hudson/model/View/AsynchPeople/index_it.properties b/core/src/main/resources/hudson/model/View/AsynchPeople/index_it.properties deleted file mode 100644 index 75fc5138b0b3..000000000000 --- a/core/src/main/resources/hudson/model/View/AsynchPeople/index_it.properties +++ /dev/null @@ -1,32 +0,0 @@ -# The MIT License -# -# Italian localization plugin for Jenkins -# Copyright © 2020 Alessandro Menti -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -All\ People=Tutte le persone -blurb=Include tutti gli "utenti" noti, incluse le identità di accesso \ - enumerabili dall''area di autenticazione corrente, così come le persone \ - menzionate nei messaggi di commit nei log delle modifiche registrati. -Last\ Commit\ Activity=Ultima attività di commit -Name=Nome -On=Il -People=Persone -User\ ID=ID utente diff --git a/core/src/main/resources/hudson/model/View/AsynchPeople/index_ja.properties b/core/src/main/resources/hudson/model/View/AsynchPeople/index_ja.properties deleted file mode 100644 index f1f1830da650..000000000000 --- a/core/src/main/resources/hudson/model/View/AsynchPeople/index_ja.properties +++ /dev/null @@ -1,28 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2010, 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. - -User\ ID=ユーザーID -Name=名前 -Last\ Active=最近の活動 -On=場所 -People=開発者 -All\ People=すべて diff --git a/core/src/main/resources/hudson/model/View/AsynchPeople/index_ko.properties b/core/src/main/resources/hudson/model/View/AsynchPeople/index_ko.properties deleted file mode 100644 index 7225f7473521..000000000000 --- a/core/src/main/resources/hudson/model/View/AsynchPeople/index_ko.properties +++ /dev/null @@ -1,26 +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. - -Last\ Active=마지막 활동사항 -Name=이름 -On=접속 중 -People=사용자 diff --git a/core/src/main/resources/hudson/model/View/AsynchPeople/index_lt.properties b/core/src/main/resources/hudson/model/View/AsynchPeople/index_lt.properties deleted file mode 100644 index e06e63585d95..000000000000 --- a/core/src/main/resources/hudson/model/View/AsynchPeople/index_lt.properties +++ /dev/null @@ -1,27 +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. - -All\ People=Visi vartotojai -Last\ Active=Paskutiniai Veiksmai -Name=Vardas -People=Vartotojai -User\ ID=Slapyvardis diff --git a/core/src/main/resources/hudson/model/View/AsynchPeople/index_lv.properties b/core/src/main/resources/hudson/model/View/AsynchPeople/index_lv.properties deleted file mode 100644 index 1536d568d459..000000000000 --- a/core/src/main/resources/hudson/model/View/AsynchPeople/index_lv.properties +++ /dev/null @@ -1,28 +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. - -All\ People=Visi cilvēki -Last\ Active=Pedējā aktivitāte -Name=Vārds -On=Uz -People=Cilvēki -User\ ID=Lietotāja identifikators diff --git a/core/src/main/resources/hudson/model/View/AsynchPeople/index_nb_NO.properties b/core/src/main/resources/hudson/model/View/AsynchPeople/index_nb_NO.properties deleted file mode 100644 index a7af7e75b9f6..000000000000 --- a/core/src/main/resources/hudson/model/View/AsynchPeople/index_nb_NO.properties +++ /dev/null @@ -1,27 +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. - -Last\ Active=Sist aktiv -Name=Navn -On=På -People=Folk -User\ ID=Bruker Id diff --git a/core/src/main/resources/hudson/model/View/AsynchPeople/index_nl.properties b/core/src/main/resources/hudson/model/View/AsynchPeople/index_nl.properties deleted file mode 100644 index 3c17f0fb77b9..000000000000 --- a/core/src/main/resources/hudson/model/View/AsynchPeople/index_nl.properties +++ /dev/null @@ -1,29 +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. - -Name=Naam -All\ People=Iedereen -Last\ Active=Laatst actief -On= -People=Mensen -User\ ID=Id gebruiker -blurb=Dit zijn alle bekende “gebruikers”, inclusief geregistreerde inloggers, plus alle mensen genoemd in wijzingings logboeken die wijzinging hebben gedaan. diff --git a/core/src/main/resources/hudson/model/View/AsynchPeople/index_pl.properties b/core/src/main/resources/hudson/model/View/AsynchPeople/index_pl.properties deleted file mode 100644 index 48e1674d41a8..000000000000 --- a/core/src/main/resources/hudson/model/View/AsynchPeople/index_pl.properties +++ /dev/null @@ -1,28 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2019, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributors -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -Name=Nazwa -On=Na -People=Użytkownicy -User\ ID=Identyfikator użytkownika -Last\ Commit\ Activity=Ostatnia zmiana -blurb=Prezentuje wszystkich uwierzytelnionych użytkowników włącznie z identyfikatorem oraz osoby wymienione w opisach zarejestrowanych zmian. diff --git a/core/src/main/resources/hudson/model/View/AsynchPeople/index_pt_BR.properties b/core/src/main/resources/hudson/model/View/AsynchPeople/index_pt_BR.properties deleted file mode 100644 index 98a0c2a55fe9..000000000000 --- a/core/src/main/resources/hudson/model/View/AsynchPeople/index_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. - -Name=Nome -On=Em -People=Pessoas -All\ People=Todas as pessoas -User\ ID=ID do usuário -blurb=Inclui todos os "usuários" conhecidos, incluindo identidades de usuários as quais o domínio de segurança consegue enumerar, assim como pessoas mencionadas nas mensagens de confirmação nos registros de mudanças gravados. -Last\ Commit\ Activity=Última\ atividade\ de\ confirmação diff --git a/core/src/main/resources/hudson/model/View/AsynchPeople/index_pt_PT.properties b/core/src/main/resources/hudson/model/View/AsynchPeople/index_pt_PT.properties deleted file mode 100644 index 6594baaf85c1..000000000000 --- a/core/src/main/resources/hudson/model/View/AsynchPeople/index_pt_PT.properties +++ /dev/null @@ -1,7 +0,0 @@ -# This file is under the MIT License by authors - -Last\ Active=Ultima Actividade -Name=Nome -On=Ligado -People=Pessoas -User\ ID=Id do Utilizado diff --git a/core/src/main/resources/hudson/model/View/AsynchPeople/index_ro.properties b/core/src/main/resources/hudson/model/View/AsynchPeople/index_ro.properties deleted file mode 100644 index ef46912cd104..000000000000 --- a/core/src/main/resources/hudson/model/View/AsynchPeople/index_ro.properties +++ /dev/null @@ -1,27 +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. - -Last\ Active=Activ ultima oară -Name=Nume -On=Pe -People=Contribuitori -User\ ID=Id utilizator diff --git a/core/src/main/resources/hudson/model/View/AsynchPeople/index_ru.properties b/core/src/main/resources/hudson/model/View/AsynchPeople/index_ru.properties deleted file mode 100644 index 260b37f026fe..000000000000 --- a/core/src/main/resources/hudson/model/View/AsynchPeople/index_ru.properties +++ /dev/null @@ -1,29 +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. - -Name=Имя -All\ People=Все пользователи -Last\ Commit\ Activity=Последняя активность -On=Проект -People=Пользователи -User\ Id=Пользователь -blurb=Таблица включает всех известных Jenkins пользователей, включая всех пользователей, которых текущая система аутентификации может перечислить, так же здесь присутствуют все пользователи, упомянутые в сообщениях коммитов в записанных логах изменений. diff --git a/core/src/main/resources/hudson/model/View/AsynchPeople/index_sr.properties b/core/src/main/resources/hudson/model/View/AsynchPeople/index_sr.properties deleted file mode 100644 index 3e082c61fb11..000000000000 --- a/core/src/main/resources/hudson/model/View/AsynchPeople/index_sr.properties +++ /dev/null @@ -1,9 +0,0 @@ -# This file is under the MIT License by authors - -People=Корисници -blurb=Табела свих Jenkins корисника, укључујући све кориснике којe систем аутентификације може навести, и корисници наведени у комит-порукама евидентирани у дневникама промена. -User\ ID=Идентификациони број -Name=Име -Last\ Commit\ Activity=Задње активан -On=на -All\ People=Сви корисници diff --git a/core/src/main/resources/hudson/model/View/AsynchPeople/index_sv_SE.properties b/core/src/main/resources/hudson/model/View/AsynchPeople/index_sv_SE.properties deleted file mode 100644 index dd77a89fa74f..000000000000 --- a/core/src/main/resources/hudson/model/View/AsynchPeople/index_sv_SE.properties +++ /dev/null @@ -1,29 +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. - -All\ People=Alla Personer -Last\ Active=Senast aktiv -Name=Namn -On=På -People=Personer -User\ ID=Användar-ID -blurb=Alla kända "användare", inklusive identiteter som det aktuella säkerhetsområdet kan numrera samt personer nämnda i kommit-meddelanden i sparade förändringsloggar. diff --git a/core/src/main/resources/hudson/model/View/AsynchPeople/index_tr.properties b/core/src/main/resources/hudson/model/View/AsynchPeople/index_tr.properties deleted file mode 100644 index df2c872bb3e0..000000000000 --- a/core/src/main/resources/hudson/model/View/AsynchPeople/index_tr.properties +++ /dev/null @@ -1,27 +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. - -Name=İsim -Last\ Active=Son Aktif -On=Açık -People=Kişiler -User\ ID=Kullanıcı adı diff --git a/core/src/main/resources/hudson/model/View/AsynchPeople/index_uk.properties b/core/src/main/resources/hudson/model/View/AsynchPeople/index_uk.properties deleted file mode 100644 index 64018f44ee7d..000000000000 --- a/core/src/main/resources/hudson/model/View/AsynchPeople/index_uk.properties +++ /dev/null @@ -1,7 +0,0 @@ -# This file is under the MIT License by authors - -Last\ Active=Час останньої активності -Name=Ім’я -On=Проект -People=Люди -User\ ID=Логін diff --git a/core/src/main/resources/hudson/model/View/AsynchPeople/index_zh_TW.properties b/core/src/main/resources/hudson/model/View/AsynchPeople/index_zh_TW.properties deleted file mode 100644 index 6e1cf02e4700..000000000000 --- a/core/src/main/resources/hudson/model/View/AsynchPeople/index_zh_TW.properties +++ /dev/null @@ -1,30 +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. -blurb=包含所有已知的「使用者」,涵蓋目前的安全領域可列舉的登入身份,以及變更記錄中提交訊息裡提到的人員。 -People=人員 -User\ ID=使用者 ID -Name=名稱 -Last\ Active=最近一次活動 -On=於 -All\ People=所有人員 -Last\ Commit\ Activity=最後提交動態 diff --git a/core/src/main/resources/hudson/model/View/AsynchPeople/people-resources.js b/core/src/main/resources/hudson/model/View/AsynchPeople/people-resources.js deleted file mode 100644 index 05a000cb037e..000000000000 --- a/core/src/main/resources/hudson/model/View/AsynchPeople/people-resources.js +++ /dev/null @@ -1,57 +0,0 @@ -window.display = function (data) { - var p = document.getElementById("people"); - p.style.display = ""; - var rootURL = document.head.getAttribute("data-rooturl"); - for (var x = 0; data.length > x; x++) { - var e = data[x]; - var id = "person-" + e.id; - var r = document.getElementById(id); - if (r == null) { - r = document.createElement("tr"); - r.id = id; - p.appendChild(r); - } else { - while (r.firstChild) { - r.removeChild(r.firstChild); - } - } - - var d = document.createElement("td"); - var wrapper = document.createElement("div"); - wrapper.className = "jenkins-table__cell__button-wrapper"; - d.className = "jenkins-table__cell--tight jenkins-table__icon"; - var icon = document.getElementById("person-circle"); - wrapper.innerHTML = icon.children[0].outerHTML; - d.appendChild(wrapper); - r.appendChild(d); - - d = document.createElement("td"); - var a = document.createElement("a"); - a.href = rootURL + "/" + e.url; - a.className = "jenkins-table__link"; - a.appendChild(document.createTextNode(e.id)); - d.appendChild(a); - r.appendChild(d); - - d = document.createElement("td"); - d.appendChild(document.createTextNode(e.fullName)); - r.appendChild(d); - - d = document.createElement("td"); - d.setAttribute("data", e.timeSortKey); - d.appendChild(document.createTextNode(e.lastChangeTimeString)); - r.appendChild(d); - - d = document.createElement("td"); - if (e.projectUrl != null) { - a = document.createElement("a"); - a.href = rootURL + "/" + e.projectUrl; - a.className = "jenkins-table__link model-link inside"; - a.appendChild(document.createTextNode(e.projectFullDisplayName)); - d.appendChild(a); - } - r.appendChild(d); - - ts_refresh(p); - } -}; diff --git a/core/src/main/resources/hudson/model/View/People/index.jelly b/core/src/main/resources/hudson/model/View/People/index.jelly deleted file mode 100644 index db37b2cf52c6..000000000000 --- a/core/src/main/resources/hudson/model/View/People/index.jelly +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - -

${%People}

-

- ${%Moved to asyncPeople} -

-
-
-
diff --git a/core/src/main/resources/hudson/model/View/People/index.properties b/core/src/main/resources/hudson/model/View/People/index.properties deleted file mode 100644 index be57243c9ea1..000000000000 --- a/core/src/main/resources/hudson/model/View/People/index.properties +++ /dev/null @@ -1,23 +0,0 @@ -# The MIT License -# -# Copyright 2014 Harald Albers -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -Moved\ to\ asyncPeople=Moved to asynchPeople for performance reasons. diff --git a/core/src/main/resources/hudson/model/View/People/index_bg.properties b/core/src/main/resources/hudson/model/View/People/index_bg.properties deleted file mode 100644 index fb5a0f32be4d..000000000000 --- a/core/src/main/resources/hudson/model/View/People/index_bg.properties +++ /dev/null @@ -1,28 +0,0 @@ -# The MIT License -# -# Bulgarian translation: Copyright (c) 2015, 2016, Alexander Shopov -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -People=\ - Потребители -# Moved to asynchPeople for performance reasons. -Moved\ to\ asyncPeople=\ - Преместено в Асинхронни операции върху\ - потребителите за по-добра производителност. diff --git a/core/src/main/resources/hudson/model/View/People/index_ca.properties b/core/src/main/resources/hudson/model/View/People/index_ca.properties deleted file mode 100644 index fda0793ae3e0..000000000000 --- a/core/src/main/resources/hudson/model/View/People/index_ca.properties +++ /dev/null @@ -1,3 +0,0 @@ -# This file is under the MIT License by authors - -People=Usuaris diff --git a/core/src/main/resources/hudson/model/View/People/index_cs.properties b/core/src/main/resources/hudson/model/View/People/index_cs.properties deleted file mode 100644 index 410915daefe0..000000000000 --- a/core/src/main/resources/hudson/model/View/People/index_cs.properties +++ /dev/null @@ -1,3 +0,0 @@ -# This file is under the MIT License by authors - -People=Lidé diff --git a/core/src/main/resources/hudson/model/View/People/index_de.properties b/core/src/main/resources/hudson/model/View/People/index_de.properties deleted file mode 100644 index 08d87a27d3d0..000000000000 --- a/core/src/main/resources/hudson/model/View/People/index_de.properties +++ /dev/null @@ -1,4 +0,0 @@ -# This file is under the MIT License by authors - -People=Benutzer -Moved\ to\ asyncPeople=Aus Performancegründen nach asynchPeople verlegt. diff --git a/core/src/main/resources/hudson/model/View/People/index_es.properties b/core/src/main/resources/hudson/model/View/People/index_es.properties deleted file mode 100644 index dea299d83f2b..000000000000 --- a/core/src/main/resources/hudson/model/View/People/index_es.properties +++ /dev/null @@ -1,3 +0,0 @@ -# This file is under the MIT License by authors - -People=Actividad diff --git a/core/src/main/resources/hudson/model/View/People/index_es_AR.properties b/core/src/main/resources/hudson/model/View/People/index_es_AR.properties deleted file mode 100644 index ffab08820462..000000000000 --- a/core/src/main/resources/hudson/model/View/People/index_es_AR.properties +++ /dev/null @@ -1,3 +0,0 @@ -# This file is under the MIT License by authors - -People=Personas diff --git a/core/src/main/resources/hudson/model/View/People/index_et.properties b/core/src/main/resources/hudson/model/View/People/index_et.properties deleted file mode 100644 index 4b75f2f79985..000000000000 --- a/core/src/main/resources/hudson/model/View/People/index_et.properties +++ /dev/null @@ -1,3 +0,0 @@ -# This file is under the MIT License by authors - -People=Inimesed diff --git a/core/src/main/resources/hudson/model/View/People/index_fr.properties b/core/src/main/resources/hudson/model/View/People/index_fr.properties deleted file mode 100644 index 04e0a5b83865..000000000000 --- a/core/src/main/resources/hudson/model/View/People/index_fr.properties +++ /dev/null @@ -1,3 +0,0 @@ -# This file is under the MIT License by authors - -People=Utilisateurs diff --git a/core/src/main/resources/hudson/model/View/People/index_he.properties b/core/src/main/resources/hudson/model/View/People/index_he.properties deleted file mode 100644 index d771d8a36762..000000000000 --- a/core/src/main/resources/hudson/model/View/People/index_he.properties +++ /dev/null @@ -1,3 +0,0 @@ -# This file is under the MIT License by authors - -People=אנשים diff --git a/core/src/main/resources/hudson/model/View/People/index_hu.properties b/core/src/main/resources/hudson/model/View/People/index_hu.properties deleted file mode 100644 index 1262a5138df3..000000000000 --- a/core/src/main/resources/hudson/model/View/People/index_hu.properties +++ /dev/null @@ -1,3 +0,0 @@ -# This file is under the MIT License by authors - -People=Emberek diff --git a/core/src/main/resources/hudson/model/View/People/index_it.properties b/core/src/main/resources/hudson/model/View/People/index_it.properties deleted file mode 100644 index 64e82f2fb4c2..000000000000 --- a/core/src/main/resources/hudson/model/View/People/index_it.properties +++ /dev/null @@ -1,26 +0,0 @@ -# The MIT License -# -# Italian localization plugin for Jenkins -# Copyright © 2020 Alessandro Menti -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -Moved\ to\ asyncPeople=Spostato in \ - asynchPeople per motivi prestazionali. -People=Persone diff --git a/core/src/main/resources/hudson/model/View/People/index_ja.properties b/core/src/main/resources/hudson/model/View/People/index_ja.properties deleted file mode 100644 index ad2ac98a0cff..000000000000 --- a/core/src/main/resources/hudson/model/View/People/index_ja.properties +++ /dev/null @@ -1,23 +0,0 @@ -# The MIT License -# -# Copyright (c) 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. - -People=開発者 diff --git a/core/src/main/resources/hudson/model/View/People/index_lt.properties b/core/src/main/resources/hudson/model/View/People/index_lt.properties deleted file mode 100644 index 4268d3548908..000000000000 --- a/core/src/main/resources/hudson/model/View/People/index_lt.properties +++ /dev/null @@ -1,3 +0,0 @@ -# This file is under the MIT License by authors - -People=Naudotojai diff --git a/core/src/main/resources/hudson/model/View/People/index_nb_NO.properties b/core/src/main/resources/hudson/model/View/People/index_nb_NO.properties deleted file mode 100644 index 9fe41a3b809b..000000000000 --- a/core/src/main/resources/hudson/model/View/People/index_nb_NO.properties +++ /dev/null @@ -1,3 +0,0 @@ -# This file is under the MIT License by authors - -People=Personer diff --git a/core/src/main/resources/hudson/model/View/People/index_nl.properties b/core/src/main/resources/hudson/model/View/People/index_nl.properties deleted file mode 100644 index f58df72c7de9..000000000000 --- a/core/src/main/resources/hudson/model/View/People/index_nl.properties +++ /dev/null @@ -1,3 +0,0 @@ -# This file is under the MIT License by authors - -People=Mensen diff --git a/core/src/main/resources/hudson/model/View/People/index_pl.properties b/core/src/main/resources/hudson/model/View/People/index_pl.properties deleted file mode 100644 index 241f5f38db0e..000000000000 --- a/core/src/main/resources/hudson/model/View/People/index_pl.properties +++ /dev/null @@ -1,3 +0,0 @@ -# This file is under the MIT License by authors - -People=Osoby diff --git a/core/src/main/resources/hudson/model/View/People/index_pt_BR.properties b/core/src/main/resources/hudson/model/View/People/index_pt_BR.properties deleted file mode 100644 index fa61837b3523..000000000000 --- a/core/src/main/resources/hudson/model/View/People/index_pt_BR.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. - -People=Pessoas -# Moved to asynchPeople for performance reasons. -Moved\ to\ asyncPeople=Movido para carregamento assíncrono por uma questão de performance. diff --git a/core/src/main/resources/hudson/model/View/People/index_pt_PT.properties b/core/src/main/resources/hudson/model/View/People/index_pt_PT.properties deleted file mode 100644 index 04b1e542184e..000000000000 --- a/core/src/main/resources/hudson/model/View/People/index_pt_PT.properties +++ /dev/null @@ -1,3 +0,0 @@ -# This file is under the MIT License by authors - -People=Pessoal diff --git a/core/src/main/resources/hudson/model/View/People/index_ro.properties b/core/src/main/resources/hudson/model/View/People/index_ro.properties deleted file mode 100644 index 27e3e78da891..000000000000 --- a/core/src/main/resources/hudson/model/View/People/index_ro.properties +++ /dev/null @@ -1,3 +0,0 @@ -# This file is under the MIT License by authors - -People=Contribuitori diff --git a/core/src/main/resources/hudson/model/View/People/index_ru.properties b/core/src/main/resources/hudson/model/View/People/index_ru.properties deleted file mode 100644 index b673262b975a..000000000000 --- a/core/src/main/resources/hudson/model/View/People/index_ru.properties +++ /dev/null @@ -1,3 +0,0 @@ -# This file is under the MIT License by authors - -People=Пользователи diff --git a/core/src/main/resources/hudson/model/View/People/index_sl.properties b/core/src/main/resources/hudson/model/View/People/index_sl.properties deleted file mode 100644 index 45a539b8189c..000000000000 --- a/core/src/main/resources/hudson/model/View/People/index_sl.properties +++ /dev/null @@ -1,3 +0,0 @@ -# This file is under the MIT License by authors - -People=Uporabniki diff --git a/core/src/main/resources/hudson/model/View/People/index_sr.properties b/core/src/main/resources/hudson/model/View/People/index_sr.properties deleted file mode 100644 index e2ebac6d4480..000000000000 --- a/core/src/main/resources/hudson/model/View/People/index_sr.properties +++ /dev/null @@ -1,4 +0,0 @@ -# This file is under the MIT License by authors - -People=Корисници -Moved\ to\ asyncPeople=Премешћено на asyncPeople diff --git a/core/src/main/resources/hudson/model/View/People/index_tr.properties b/core/src/main/resources/hudson/model/View/People/index_tr.properties deleted file mode 100644 index db234bdca408..000000000000 --- a/core/src/main/resources/hudson/model/View/People/index_tr.properties +++ /dev/null @@ -1,3 +0,0 @@ -# This file is under the MIT License by authors - -People=Kişiler diff --git a/core/src/main/resources/hudson/model/View/People/index_uk.properties b/core/src/main/resources/hudson/model/View/People/index_uk.properties deleted file mode 100644 index d9c0e5f762c6..000000000000 --- a/core/src/main/resources/hudson/model/View/People/index_uk.properties +++ /dev/null @@ -1,3 +0,0 @@ -# This file is under the MIT License by authors - -People=Люди diff --git a/core/src/main/resources/hudson/model/View/People/index_zh_TW.properties b/core/src/main/resources/hudson/model/View/People/index_zh_TW.properties deleted file mode 100644 index dd14872f2cf5..000000000000 --- a/core/src/main/resources/hudson/model/View/People/index_zh_TW.properties +++ /dev/null @@ -1,23 +0,0 @@ -# The MIT License -# -# Copyright 2014 Harald Albers -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. -Moved\ to\ asyncPeople=因為效能因素,已移動到 asynchPeople。 -People=人員 diff --git a/core/src/main/resources/hudson/model/View/sidepanel.jelly b/core/src/main/resources/hudson/model/View/sidepanel.jelly index 659af6e55a86..e174117add46 100644 --- a/core/src/main/resources/hudson/model/View/sidepanel.jelly +++ b/core/src/main/resources/hudson/model/View/sidepanel.jelly @@ -43,14 +43,6 @@ THE SOFTWARE. - - - - - - - - diff --git a/test/src/test/java/hudson/model/AsynchPeopleTest.java b/test/src/test/java/hudson/model/AsynchPeopleTest.java deleted file mode 100644 index ab0671e91667..000000000000 --- a/test/src/test/java/hudson/model/AsynchPeopleTest.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * The MIT License - * - * Copyright 2013 Jesse Glick. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION 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.model; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import org.htmlunit.html.DomElement; -import org.htmlunit.html.HtmlPage; -import org.junit.Rule; -import org.junit.Test; -import org.jvnet.hudson.test.For; -import org.jvnet.hudson.test.Issue; -import org.jvnet.hudson.test.JenkinsRule; - -@For(View.AsynchPeople.class) -public class AsynchPeopleTest { - - @Rule public JenkinsRule j = new JenkinsRule(); - - @Issue("JENKINS-18641") - @Test public void display() throws Exception { - User.getById("bob", true); - JenkinsRule.WebClient wc = j.createWebClient(); - - HtmlPage page = wc.goTo("asynchPeople"); - assertEquals(0, wc.waitForBackgroundJavaScript(120000)); - boolean found = false; - for (DomElement div : page.getElementsByTagName("div")) { - if (div.getAttribute("class").contains("app-progress-bar")) { - found = true; - assertEquals("display: none;", div.getAttribute("style")); - break; - } - } - assertTrue(found); - /* TODO this still fails occasionally, for reasons TBD (I think because User.getAll sometimes is empty): - assertNotNull(page.getElementById("person-bob")); - */ - } - -} diff --git a/test/src/test/java/jenkins/security/stapler/GetterMethodFilterTest.java b/test/src/test/java/jenkins/security/stapler/GetterMethodFilterTest.java index e5e227d74eb0..b6fe38153de7 100644 --- a/test/src/test/java/jenkins/security/stapler/GetterMethodFilterTest.java +++ b/test/src/test/java/jenkins/security/stapler/GetterMethodFilterTest.java @@ -28,7 +28,6 @@ import com.cloudbees.hudson.plugins.folder.Folder; import hudson.model.TopLevelItem; -import hudson.model.View; import java.awt.Point; import java.util.Arrays; import java.util.Collections; @@ -266,19 +265,19 @@ public void testWithReturnMultiple_map() throws Exception { assertNotReachable("testWithReturnMultiple/map/a/"); assertNotReachable("testWithReturnMultiple/map/b/"); } - - @TestExtension - public static class TestWithReturnCoreObject extends AbstractUnprotectedRootAction { - public View.People getPeople() { - // provide an index jelly view - return new View.People(Jenkins.get()); - } - } - - @Test - public void testWithReturnCoreObject_people() throws Exception { - assertReachableWithoutOk("testWithReturnCoreObject/people/"); - } +// +// @TestExtension +// public static class TestWithReturnCoreObject extends AbstractUnprotectedRootAction { +// public View.People getPeople() { +// // provide an index jelly view +// return new View.People(Jenkins.get()); +// } +// } +// +// @Test +// public void testWithReturnCoreObject_people() throws Exception { +// assertReachableWithoutOk("testWithReturnCoreObject/people/"); +// } @Test public void testTopLevelItemIsLegal() throws Exception { From 561c044776d36e33781d64c2f40f039e220e551a Mon Sep 17 00:00:00 2001 From: Daniel Beck Date: Fri, 22 Mar 2024 00:08:40 +0100 Subject: [PATCH 2/5] Add placeholder pages when someone tries to access removed URLs --- .../java/jenkins/model/PeopleRedirect.java | 78 +++++++++++++++++++ .../jenkins/model/PeopleRedirect/index.jelly | 21 +++++ .../model/PeopleRedirect/index.properties | 1 + 3 files changed, 100 insertions(+) create mode 100644 core/src/main/java/jenkins/model/PeopleRedirect.java create mode 100644 core/src/main/resources/jenkins/model/PeopleRedirect/index.jelly create mode 100644 core/src/main/resources/jenkins/model/PeopleRedirect/index.properties diff --git a/core/src/main/java/jenkins/model/PeopleRedirect.java b/core/src/main/java/jenkins/model/PeopleRedirect.java new file mode 100644 index 000000000000..cc42248b79d9 --- /dev/null +++ b/core/src/main/java/jenkins/model/PeopleRedirect.java @@ -0,0 +1,78 @@ +/* + * The MIT License + * + * Copyright (c) 2024 Daniel Beck + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION 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 jenkins.model; + +import hudson.Extension; +import hudson.model.Action; +import hudson.model.TransientViewActionFactory; +import hudson.model.View; +import java.io.IOException; +import java.util.List; +import javax.servlet.ServletException; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; +import org.kohsuke.stapler.StaplerRequest; +import org.kohsuke.stapler.StaplerResponse; + +@Restricted(NoExternalUse.class) +public abstract class PeopleRedirect implements Action { + /* Ensure all requests end in the index view */ + public void doDynamic(StaplerRequest req, StaplerResponse rsp) throws ServletException, IOException { + // TODO this has broken breadcrumbs -- also, do we even need this? + rsp.forward(this, "", req); + } + + @Override + public String getIconFileName() { + return null; + } + + @Override + public String getDisplayName() { + return null; + } + + public static class People extends PeopleRedirect { + @Override + public String getUrlName() { + return "people"; + } + } + + public static class AsynchPeople extends PeopleRedirect { + @Override + public String getUrlName() { + return "asynchPeople"; + } + } + + @Extension(ordinal = -10000) // Lower priority than the plugin's implementation + public static class TransientFactory extends TransientViewActionFactory { + @Override + public List createFor(View v) { + return List.of(new People(), new AsynchPeople()); + } + } +} diff --git a/core/src/main/resources/jenkins/model/PeopleRedirect/index.jelly b/core/src/main/resources/jenkins/model/PeopleRedirect/index.jelly new file mode 100644 index 000000000000..44b8289ce95d --- /dev/null +++ b/core/src/main/resources/jenkins/model/PeopleRedirect/index.jelly @@ -0,0 +1,21 @@ + + + + + + + +
+
+

+ ${%People} +

+
+
+ +
+ ${%blurb} +
+
+
+
diff --git a/core/src/main/resources/jenkins/model/PeopleRedirect/index.properties b/core/src/main/resources/jenkins/model/PeopleRedirect/index.properties new file mode 100644 index 000000000000..a707f09387cf --- /dev/null +++ b/core/src/main/resources/jenkins/model/PeopleRedirect/index.properties @@ -0,0 +1 @@ +blurb = The "People" view has been moved into the People View plugin. From 84bff44a4d88dfac04f9066b944379ce0c6920a8 Mon Sep 17 00:00:00 2001 From: Daniel Beck Date: Fri, 22 Mar 2024 18:09:13 +0100 Subject: [PATCH 3/5] Remove obsolete UserInfo class, inapplicable tests --- core/src/main/java/hudson/model/View.java | 71 ------------------- .../security/stapler/Security400Test.java | 12 ---- 2 files changed, 83 deletions(-) diff --git a/core/src/main/java/hudson/model/View.java b/core/src/main/java/hudson/model/View.java index 793b1ac37c44..0df916a19b5a 100644 --- a/core/src/main/java/hudson/model/View.java +++ b/core/src/main/java/hudson/model/View.java @@ -48,7 +48,6 @@ import hudson.security.Permission; import hudson.security.PermissionGroup; import hudson.security.PermissionScope; -import hudson.tasks.UserAvatarResolver; import hudson.util.AlternativeUiTextProvider; import hudson.util.AlternativeUiTextProvider.Message; import hudson.util.DescribableList; @@ -69,11 +68,9 @@ import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Arrays; -import java.util.Calendar; import java.util.Collection; import java.util.Collections; import java.util.Comparator; -import java.util.GregorianCalendar; import java.util.HashMap; import java.util.HashSet; import java.util.LinkedHashSet; @@ -627,74 +624,6 @@ public ACL getACL() { @Deprecated public void onJobRenamed(Item item, String oldName, String newName) {} - @ExportedBean(defaultVisibility = 2) - public static final class UserInfo implements Comparable { - private final User user; - /** - * When did this user made a last commit on any of our projects? Can be null. - */ - private Calendar lastChange; - /** - * Which project did this user commit? Can be null. - */ - private Job project; - - /** @see UserAvatarResolver */ - String avatar; - - UserInfo(User user, Job p, Calendar lastChange) { - this.user = user; - this.project = p; - this.lastChange = lastChange; - } - - @Exported - public User getUser() { - return user; - } - - @Exported - public Calendar getLastChange() { - return lastChange; - } - - @Deprecated - public AbstractProject getProject() { - return project instanceof AbstractProject ? (AbstractProject) project : null; - } - - @Exported(name = "project") - public Job getJob() { - return project; - } - - /** - * Returns a human-readable string representation of when this user was last active. - */ - public String getLastChangeTimeString() { - if (lastChange == null) return "N/A"; - long duration = new GregorianCalendar().getTimeInMillis() - ordinal(); - return Util.getTimeSpanString(duration); - } - - public String getTimeSortKey() { - if (lastChange == null) return "-"; - return Util.XS_DATETIME_FORMATTER.format(lastChange.getTime()); - } - - @Override - public int compareTo(UserInfo that) { - long rhs = that.ordinal(); - long lhs = this.ordinal(); - return Long.compare(rhs, lhs); - } - - private long ordinal() { - if (lastChange == null) return 0; - return lastChange.getTimeInMillis(); - } - } - void addDisplayNamesToSearchIndex(SearchIndexBuilder sib, Collection items) { for (TopLevelItem item : items) { diff --git a/test/src/test/java/jenkins/security/stapler/Security400Test.java b/test/src/test/java/jenkins/security/stapler/Security400Test.java index 2a26ceda1fdb..c2b64323c65e 100644 --- a/test/src/test/java/jenkins/security/stapler/Security400Test.java +++ b/test/src/test/java/jenkins/security/stapler/Security400Test.java @@ -647,12 +647,6 @@ public void anonCannotHaveTheListOfUsers() throws Exception { checkPageIsRedirectedToLogin(page); assertThat(page.getWebResponse().getContentAsString(), not(containsString("secretUser"))); assertRequestWasNotBlocked(); - - page = wc.goTo("asynchPeople/", null); - assertEquals(200, page.getWebResponse().getStatusCode()); - // javascript will load the user list asynch - assertThat(page.getWebResponse().getContentAsString(), containsString("Includes all known")); - assertRequestWasNotBlocked(); } authorizationStrategy.setAllowAnonymousRead(false); @@ -665,12 +659,6 @@ public void anonCannotHaveTheListOfUsers() throws Exception { checkPageIsRedirectedToLogin(page); assertThat(page.getWebResponse().getContentAsString(), not(containsString("secretUser"))); assertRequestWasNotBlocked(); - - // with the restriction we disallow the anon to even read the list of all users - page = wc.goTo("asynchPeople/", null); - checkPageIsRedirectedToLogin(page); - assertThat(page.getWebResponse().getContentAsString(), not(containsString("secretUser"))); - assertRequestWasNotBlocked(); } } From 6254bf344e22ce781bce03418171de6781524682 Mon Sep 17 00:00:00 2001 From: Daniel Beck Date: Fri, 22 Mar 2024 23:50:20 +0100 Subject: [PATCH 4/5] Restore test with a different core-contributed object It's not entirely clear what this test signifies, given the existence of `testTopLevelItemIsLegal`, but whatever. --- .../stapler/GetterMethodFilterTest.java | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/test/src/test/java/jenkins/security/stapler/GetterMethodFilterTest.java b/test/src/test/java/jenkins/security/stapler/GetterMethodFilterTest.java index b6fe38153de7..e02aa4e35a78 100644 --- a/test/src/test/java/jenkins/security/stapler/GetterMethodFilterTest.java +++ b/test/src/test/java/jenkins/security/stapler/GetterMethodFilterTest.java @@ -27,6 +27,7 @@ import static org.junit.Assert.assertFalse; import com.cloudbees.hudson.plugins.folder.Folder; +import hudson.AboutJenkins; import hudson.model.TopLevelItem; import java.awt.Point; import java.util.Arrays; @@ -265,19 +266,19 @@ public void testWithReturnMultiple_map() throws Exception { assertNotReachable("testWithReturnMultiple/map/a/"); assertNotReachable("testWithReturnMultiple/map/b/"); } -// -// @TestExtension -// public static class TestWithReturnCoreObject extends AbstractUnprotectedRootAction { -// public View.People getPeople() { -// // provide an index jelly view -// return new View.People(Jenkins.get()); -// } -// } -// -// @Test -// public void testWithReturnCoreObject_people() throws Exception { -// assertReachableWithoutOk("testWithReturnCoreObject/people/"); -// } + + @TestExtension + public static class TestWithReturnCoreObject extends AbstractUnprotectedRootAction { + public AboutJenkins getPeople() { + // provide an index jelly view + return new AboutJenkins(); + } + } + + @Test + public void testWithReturnCoreObject_people() throws Exception { + assertReachableWithoutOk("testWithReturnCoreObject/people/"); + } @Test public void testTopLevelItemIsLegal() throws Exception { From aaea7703da512565e19d62814f3161ac2c5237f0 Mon Sep 17 00:00:00 2001 From: Daniel Beck Date: Sat, 23 Mar 2024 00:15:17 +0100 Subject: [PATCH 5/5] Remove probably unnecessary code --- core/src/main/java/jenkins/model/PeopleRedirect.java | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/core/src/main/java/jenkins/model/PeopleRedirect.java b/core/src/main/java/jenkins/model/PeopleRedirect.java index cc42248b79d9..64196a9caa72 100644 --- a/core/src/main/java/jenkins/model/PeopleRedirect.java +++ b/core/src/main/java/jenkins/model/PeopleRedirect.java @@ -28,22 +28,12 @@ import hudson.model.Action; import hudson.model.TransientViewActionFactory; import hudson.model.View; -import java.io.IOException; import java.util.List; -import javax.servlet.ServletException; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; -import org.kohsuke.stapler.StaplerRequest; -import org.kohsuke.stapler.StaplerResponse; @Restricted(NoExternalUse.class) public abstract class PeopleRedirect implements Action { - /* Ensure all requests end in the index view */ - public void doDynamic(StaplerRequest req, StaplerResponse rsp) throws ServletException, IOException { - // TODO this has broken breadcrumbs -- also, do we even need this? - rsp.forward(this, "", req); - } - @Override public String getIconFileName() { return null;