diff --git a/core/src/main/java/hudson/PluginWrapper.java b/core/src/main/java/hudson/PluginWrapper.java index 9ac22a3eab2792fb7afa6aaa7fcb30a7a61915cf..870930f7def60c0202d461eb4b42065b8a3de71a 100644 --- a/core/src/main/java/hudson/PluginWrapper.java +++ b/core/src/main/java/hudson/PluginWrapper.java @@ -45,6 +45,7 @@ import java.util.jar.Manifest; import java.util.logging.Logger; import static java.util.logging.Level.WARNING; +import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.LogFactory; import org.kohsuke.stapler.HttpResponse; import org.kohsuke.stapler.HttpResponses; @@ -213,7 +214,7 @@ public class PluginWrapper implements Comparable, ModelObject { } public String getDisplayName() { - return getLongName(); + return StringUtils.removeStart(getLongName(), "Jenkins "); } public Api getApi() { diff --git a/core/src/main/java/hudson/model/UpdateSite.java b/core/src/main/java/hudson/model/UpdateSite.java index 470ecaccabf633eca89a8393ee27b563b4f27e96..8966234e6c9641ac413129d24f887f7cde5e7f7d 100644 --- a/core/src/main/java/hudson/model/UpdateSite.java +++ b/core/src/main/java/hudson/model/UpdateSite.java @@ -40,6 +40,7 @@ import jenkins.model.Jenkins; import jenkins.util.JSONSignatureValidator; import net.sf.json.JSONException; import net.sf.json.JSONObject; +import org.apache.commons.lang.StringUtils; import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.HttpResponse; import org.kohsuke.stapler.StaplerRequest; @@ -637,8 +638,12 @@ public class UpdateSite { } public String getDisplayName() { - if(title!=null) return title; - return name; + String displayName; + if(title!=null) + displayName = title; + else + displayName = name; + return StringUtils.removeStart(displayName, "Jenkins "); } /** diff --git a/core/src/main/resources/hudson/PluginManager/installed.jelly b/core/src/main/resources/hudson/PluginManager/installed.jelly index 3900d7ed4253ed19a262a58edb8914a4b36e2837..8464c812b38514a93572b2ca5a1719a647e2d181 100644 --- a/core/src/main/resources/hudson/PluginManager/installed.jelly +++ b/core/src/main/resources/hudson/PluginManager/installed.jelly @@ -63,7 +63,7 @@ THE SOFTWARE.
- ${p.updateInfo.title?:p.longName} + ${p.updateInfo.displayName?:p.displayName}
diff --git a/test/src/main/resources/plugins/tasks-update-center.json b/test/src/main/resources/plugins/tasks-update-center.json index dd5468496ced52b7fc23f043bb9be0f10324fad8..092d90d382f6a3ef053695b62529e9a85f6c6689 100644 --- a/test/src/main/resources/plugins/tasks-update-center.json +++ b/test/src/main/resources/plugins/tasks-update-center.json @@ -16,7 +16,7 @@ updateCenter.post( "name": "tasks", "requiredCore": "1.264", "sha1": "wtzlciUKiMcg90H5CTYkGX6+r8Y=", - "title": "Hudson Task Scanner Plug-in", + "title": "Jenkins Task Scanner Plug-in", "url": "tasks.jpi", "version": "2.23" }, diff --git a/test/src/test/java/hudson/model/UpdateSiteTest.java b/test/src/test/java/hudson/model/UpdateSiteTest.java index b75d479eeb848a30ae868883bc9acfa326e5b77d..b609be6205ac8573b110f69e7bbf25d3b5e68e3c 100644 --- a/test/src/test/java/hudson/model/UpdateSiteTest.java +++ b/test/src/test/java/hudson/model/UpdateSiteTest.java @@ -116,6 +116,9 @@ public class UpdateSiteTest { assertEquals(new HashSet(Arrays.asList("tasks", "dummy")), data.plugins.keySet()); assertEquals(new URL(url, "tasks.jpi").toString(), data.plugins.get("tasks").url); assertEquals("http://nowhere.net/dummy.hpi", data.plugins.get("dummy").url); + + UpdateSite.Plugin tasksPlugin = data.plugins.get("tasks"); + assertEquals("Wrong name of plugin found", "Task Scanner Plug-in", tasksPlugin.getDisplayName()); } @Test public void updateDirectlyWithJson() throws Exception {