From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Mon, 8 Jun 2015 13:51:26 +0000 (+0200)
Subject: SONAR-6626 drop Google Chart API (emulated by JFreeChart Eastwood)
X-Git-Tag: 5.2-RC1~1572
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=9e731cf0334f13e7fb4d207cf8edcbcd774d687d;p=sonarqube.git

SONAR-6626 drop Google Chart API (emulated by JFreeChart Eastwood)
---

diff --git a/server/sonar-web/.gitignore b/server/sonar-web/.gitignore
index 704f5b5a922..e40465315da 100644
--- a/server/sonar-web/.gitignore
+++ b/server/sonar-web/.gitignore
@@ -9,7 +9,6 @@ build/
 src/main/webapp/js/
 src/main/webapp/css/
 src/main/webapp/WEB-INF/lib/*.jar
-!src/main/webapp/WEB-INF/lib/eastwood-1.1.0.jar
 
 # tests
 src/test/json/**/*.png
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/helpers/application_helper.rb b/server/sonar-web/src/main/webapp/WEB-INF/app/helpers/application_helper.rb
index 65a6c9900fc..4fc10646ce1 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/helpers/application_helper.rb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/helpers/application_helper.rb
@@ -355,16 +355,6 @@ module ApplicationHelper
   end
 
 
-  #
-  #
-  # JFree Eastwood is a partial implementation of Google Chart Api
-  #
-  #
-  def gchart(parameters, options={})
-    image_tag("#{ApplicationController.root_context}/gchart?#{parameters}", options)
-  end
-
-
   #
   #
   # Piechart for a distribution string or measure (foo=1;bar=2)
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/lib/eastwood-1.1.0.jar b/server/sonar-web/src/main/webapp/WEB-INF/lib/eastwood-1.1.0.jar
deleted file mode 100644
index f529db522d5..00000000000
Binary files a/server/sonar-web/src/main/webapp/WEB-INF/lib/eastwood-1.1.0.jar and /dev/null differ
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/web.xml b/server/sonar-web/src/main/webapp/WEB-INF/web.xml
index 741d4f39c80..bcc5d20daca 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/web.xml
+++ b/server/sonar-web/src/main/webapp/WEB-INF/web.xml
@@ -90,10 +90,6 @@
     <servlet-name>chart</servlet-name>
     <servlet-class>org.sonar.server.charts.ChartsServlet</servlet-class>
   </servlet>
-  <servlet>
-    <servlet-name>gchart</servlet-name>
-    <servlet-class>org.jfree.eastwood.ChartServlet</servlet-class>
-  </servlet>
   <servlet>
     <servlet-name>static</servlet-name>
     <servlet-class>org.sonar.server.plugins.StaticResourcesServlet</servlet-class>
@@ -103,10 +99,6 @@
     <servlet-name>chart</servlet-name>
     <url-pattern>/chart</url-pattern>
   </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>gchart</servlet-name>
-    <url-pattern>/gchart</url-pattern>
-  </servlet-mapping>
   <servlet-mapping>
     <servlet-name>static</servlet-name>
     <url-pattern>/static/*</url-pattern>