Merge pull request #2691 from daniel-beck/JENKINS-40750

[FIX JENKINS-40750] Remove cc.xml from core

core/src/main/java/hudson/Functions.java

@@ -1556,30 +1556,13 @@ public class Functions {
     /**
      * Converts the Hudson build status to CruiseControl build status,
      * which is either Success, Failure, Exception, or Unknown.
+     *
+     * @deprecated This functionality has been moved to ccxml plugin.
      */
+    @Deprecated
+    @Restricted(DoNotUse.class)
+    @RestrictedSince("since TODO")
     public static String toCCStatus(Item i) {
-        if (i instanceof Job) {
-            Job j = (Job) i;
-            switch (j.getIconColor()) {
-            case ABORTED:
-            case ABORTED_ANIME:
-            case RED:
-            case RED_ANIME:
-            case YELLOW:
-            case YELLOW_ANIME:
-                return "Failure";
-            case BLUE:
-            case BLUE_ANIME:
-                return "Success";
-            case DISABLED:
-            case DISABLED_ANIME:
-            case GREY:
-            case GREY_ANIME:
-            case NOTBUILT:
-            case NOTBUILT_ANIME:
-                return "Unknown";
-            }
-        }
         return "Unknown";
     }
 
@@ -2071,14 +2054,4 @@ public class Functions {
             return true;
         }
     }
-
-    @Restricted(NoExternalUse.class) // for cc.xml.jelly
-    public static Collection<TopLevelItem> getCCItems(View v) {
-        if (Stapler.getCurrentRequest().getParameter("recursive") != null) {
-            return v.getOwner().getItemGroup().getAllItems(TopLevelItem.class);
-        } else {
-            return v.getItems();
-        }
-    }
-
 }

core/src/main/resources/hudson/model/View/builds.jelly

@@ -38,9 +38,6 @@ THE SOFTWARE.
       </j:if>
       <div style="height:2em"/><!-- spacer -->
 
-      <div>
-          <a href="cc.xml">${%Export as plain XML}</a> (<a href="cc.xml?recursive">${%Recurse in subfolders}</a>)
-      </div>
       <t:buildListTable builds="${it.builds}"/>
     </l:main-panel>
   </l:layout>

core/src/main/resources/hudson/model/View/cc.xml.jelly

-<!--
-The MIT License
-
-Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
--->
-
-<!--
-  Generate status XML compatible with CruiseControl.
-  See http://confluence.public.thoughtworks.org/display/CI/Multiple+Project+Summary+Reporting+Standard
--->
-<?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
-  <st:contentType value="text/xml;charset=UTF-8" />
-  <j:new var="h" className="hudson.Functions" />
-
-  <Projects>
-    <j:forEach var="p" items="${h.getCCItems(it)}">
-      <j:set var="lb" value="${p.lastCompletedBuild}"/>
-      <j:if test="${lb!=null}">
-        <Project  name="${p.fullDisplayName}"
-                  activity="${p.isBuilding() ? 'Building' : 'Sleeping'}"
-                  lastBuildStatus="${h.toCCStatus(p)}"
-                  lastBuildLabel="${lb.number}"
-                  lastBuildTime="${lb.timestampString2}"
-                  webUrl="${app.rootUrl}${p.url}"
-          />
-      </j:if>
-    </j:forEach>
-  </Projects>
-</j:jelly>
\ No newline at end of file