aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Brandhof <simon.brandhof@sonarsource.com>2015-06-08 15:51:26 +0200
committerSimon Brandhof <simon.brandhof@sonarsource.com>2015-06-08 15:51:26 +0200
commit9e731cf0334f13e7fb4d207cf8edcbcd774d687d (patch)
tree508ba7fd4784edad46f21ee2b8ec9fc3efe07053
parent1460b1ebdbbc550570a74c47d4415bce0b2941ed (diff)
downloadsonarqube-9e731cf0334f13e7fb4d207cf8edcbcd774d687d.tar.gz
sonarqube-9e731cf0334f13e7fb4d207cf8edcbcd774d687d.zip
SONAR-6626 drop Google Chart API (emulated by JFreeChart Eastwood)
-rw-r--r--server/sonar-web/.gitignore1
-rw-r--r--server/sonar-web/src/main/webapp/WEB-INF/app/helpers/application_helper.rb10
-rw-r--r--server/sonar-web/src/main/webapp/WEB-INF/lib/eastwood-1.1.0.jarbin46516 -> 0 bytes
-rw-r--r--server/sonar-web/src/main/webapp/WEB-INF/web.xml8
4 files changed, 0 insertions, 19 deletions
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
@@ -357,16 +357,6 @@ module ApplicationHelper
#
#
- # 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
--- a/server/sonar-web/src/main/webapp/WEB-INF/lib/eastwood-1.1.0.jar
+++ /dev/null
Binary files 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
@@ -91,10 +91,6 @@
<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>
</servlet>
@@ -104,10 +100,6 @@
<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>
</servlet-mapping>