Change format of response from BatchResourcesServlet

diff --git a/sonar-batch-bootstrapper/src/main/java/org/sonar/batch/bootstrapper/BatchDownloader.java b/sonar-batch-bootstrapper/src/main/java/org/sonar/batch/bootstrapper/BatchDownloader.java
index 250559a075239145f0a72955207dd53cf3f7545c..eead8dc6d5e5edb5450f6680b89a89efb1422410 100644 (file)
--- a/sonar-batch-bootstrapper/src/main/java/org/sonar/batch/bootstrapper/BatchDownloader.java
+++ b/sonar-batch-bootstrapper/src/main/java/org/sonar/batch/bootstrapper/BatchDownloader.java
@@ -76,12 +76,10 @@ public class BatchDownloader {
 
       String libs = remoteContent(BATCH_PATH);
 
-      for (String lib : libs.split("\n")) {
-        if (!"".equals(lib)) {
-          File file = new File(toDir, lib);
-          remoteContentToFile(BATCH_PATH + lib, file);
-          files.add(file);
-        }
+      for (String lib : libs.split(",")) {
+        File file = new File(toDir, lib);
+        remoteContentToFile(BATCH_PATH + lib, file);
+        files.add(file);
       }
 
       return files;

diff --git a/sonar-server/src/main/java/org/sonar/server/plugins/BatchResourcesServlet.java b/sonar-server/src/main/java/org/sonar/server/plugins/BatchResourcesServlet.java
index 2a569a0d075d9a257fd092665af9bf3863e97568..e8195a55ca41f9d3f55df90205385c213061891c 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/plugins/BatchResourcesServlet.java
+++ b/sonar-server/src/main/java/org/sonar/server/plugins/BatchResourcesServlet.java
@@ -53,9 +53,7 @@ public class BatchResourcesServlet extends HttpServlet {
       try {
         response.setContentType("text/html");
         writer = response.getWriter();
-        for (String lib : getLibs()) {
-          writer.println(lib);
-        }
+        writer.print(StringUtils.join(getLibs(), ','));
       } catch (IOException e) {
         LOG.error("Unable to provide list of batch resources", e);
         response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);