Remove remaining GoogleCharts code and update documentation

diff --git a/.classpath b/.classpath
index 5f3db2be8d69f5f5bc17a7df9369104df1a87dca..fd38d56a781102f0384492c3ea40b2b0ad341230 100644 (file)
--- a/.classpath
+++ b/.classpath
@@ -20,7 +20,6 @@
        <classpathentry kind="lib" path="ext/wicket-1.4.21.jar" sourcepath="ext/src/wicket-1.4.21.jar" />
        <classpathentry kind="lib" path="ext/wicket-auth-roles-1.4.21.jar" sourcepath="ext/src/wicket-auth-roles-1.4.21.jar" />
        <classpathentry kind="lib" path="ext/wicket-extensions-1.4.21.jar" sourcepath="ext/src/wicket-extensions-1.4.21.jar" />
-       <classpathentry kind="lib" path="ext/googlecharts-1.4.21.jar" sourcepath="ext/src/googlecharts-1.4.21.jar" />
        <classpathentry kind="lib" path="ext/lucene-core-4.6.0.jar" sourcepath="ext/src/lucene-core-4.6.0.jar" />
        <classpathentry kind="lib" path="ext/lucene-analyzers-common-4.6.0.jar" sourcepath="ext/src/lucene-analyzers-common-4.6.0.jar" />
        <classpathentry kind="lib" path="ext/lucene-highlighter-4.6.0.jar" sourcepath="ext/src/lucene-highlighter-4.6.0.jar" />

diff --git a/NOTICE b/NOTICE
index 359488f7d5383c562885f24bb60de262f2903555..27c01e0e043ee554bd51c8f9538a67ef4790bb62 100644 (file)
--- a/NOTICE
+++ b/NOTICE
@@ -47,14 +47,6 @@ Apache Wicket
 \r
    http://wicket.apache.org\r
    \r
----------------------------------------------------------------------------\r
-WicketStuff GoogleCharts\r
----------------------------------------------------------------------------\r
-   WicketStuff GoogleCharts, released under the\r
-   Apache Software License, Version 2.0.\r
-\r
-   https://github.com/wicketstuff/core/wiki/GoogleCharts   \r
-   \r
 ---------------------------------------------------------------------------\r
 Jetty\r
 ---------------------------------------------------------------------------\r
@@ -203,7 +195,7 @@ GLYHPICONS
 UnboundID\r
 ---------------------------------------------------------------------------\r
    UnboundID, released under the\r
-   GNU LESSER GENERAL PUBLIC LICENSE. (http://www.unboundid.com/products/ldap-sdk/docs/LICENSE-LGPLv2.1.txt)\r
+   GNU LESSER GENERAL PUBLIC LICENSE.\r
 \r
    http://www.unboundid.com\r
 \r
@@ -211,7 +203,7 @@ UnboundID
 JCalendar\r
 ---------------------------------------------------------------------------\r
    JCalendar, released under the\r
-   GNU LESSER GENERAL PUBLIC LICENSE. (http://www.unboundid.com/products/ldap-sdk/docs/LICENSE-LGPLv2.1.txt)\r
+   GNU LESSER GENERAL PUBLIC LICENSE.\r
 \r
    http://www.toedter.com/en/jcalendar\r
    \r
@@ -334,3 +326,20 @@ args4j
    Apache License 2.0\r
    \r
    http://args4j.kohsuke.org\r
+\r
+---------------------------------------------------------------------------\r
+jQuery\r
+---------------------------------------------------------------------------\r
+   jQuery, release under the\r
+   MIT License\r
+   \r
+   https://jquery.org\r
+\r
+---------------------------------------------------------------------------\r
+flotr2\r
+---------------------------------------------------------------------------\r
+   flotr2, release under the\r
+   BSD License\r
+   \r
+   http://humblesoftware.com/flotr2\r
+   
\ No newline at end of file

diff --git a/build.moxie b/build.moxie
index 0b8d71813cbefa253e8167bb4b6e31e8135a3c17..19a9027fb99711530f2227ebb45bf9404cd5aab0 100644 (file)
--- a/build.moxie
+++ b/build.moxie
@@ -138,7 +138,6 @@ dependencies:
 - compile 'org.apache.wicket:wicket:${wicket.version}' :war !org.mockito
 - compile 'org.apache.wicket:wicket-auth-roles:${wicket.version}' :war !org.mockito
 - compile 'org.apache.wicket:wicket-extensions:${wicket.version}' :war !org.mockito
-- compile 'org.wicketstuff:googlecharts:${wicket.version}' :war
 - compile 'org.apache.lucene:lucene-core:${lucene.version}' :war :fedclient
 - compile 'org.apache.lucene:lucene-analyzers-common:${lucene.version}' :war :fedclient
 - compile 'org.apache.lucene:lucene-highlighter:${lucene.version}' :war :fedclient

diff --git a/gitblit.iml b/gitblit.iml
index afbb2a3be4f40f94e8548959ac0f235a195b6d95..8e787cbaee3511c1706dc367dc354b010f6d4f9b 100644 (file)
--- a/gitblit.iml
+++ b/gitblit.iml
@@ -178,17 +178,6 @@
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library name="googlecharts-1.4.21.jar">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/ext/googlecharts-1.4.21.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/ext/src/googlecharts-1.4.21.jar!/" />
-        </SOURCES>
-      </library>
-    </orderEntry>
     <orderEntry type="module-library">
       <library name="lucene-core-4.6.0.jar">
         <CLASSES>

diff --git a/src/main/java/com/gitblit/wicket/WicketUtils.java b/src/main/java/com/gitblit/wicket/WicketUtils.java
index bba3f79afbfe933f95f350456a4d4fa53799d667..8598447e99dacc3f9d9f19a6559cb1706dc6e573 100644 (file)
--- a/src/main/java/com/gitblit/wicket/WicketUtils.java
+++ b/src/main/java/com/gitblit/wicket/WicketUtils.java
@@ -38,8 +38,6 @@ import org.apache.wicket.markup.html.image.ContextImage;
 import org.apache.wicket.protocol.http.WebRequest;\r
 import org.apache.wicket.resource.ContextRelativeResource;\r
 import org.eclipse.jgit.diff.DiffEntry.ChangeType;\r
-import org.wicketstuff.googlecharts.AbstractChartData;\r
-import org.wicketstuff.googlecharts.IChartData;\r
 \r
 import com.gitblit.Constants;\r
 import com.gitblit.Constants.AccessPermission;\r
@@ -632,32 +630,6 @@ public class WicketUtils {
                return label;\r
        }\r
 \r
-       public static IChartData getChartData(Collection<Metric> metrics) {\r
-               final double[] commits = new double[metrics.size()];\r
-               final double[] tags = new double[metrics.size()];\r
-               int i = 0;\r
-               double max = 0;\r
-               for (Metric m : metrics) {\r
-                       commits[i] = m.count;\r
-                       if (m.tag > 0) {\r
-                               tags[i] = m.count;\r
-                       } else {\r
-                               tags[i] = -1d;\r
-                       }\r
-                       max = Math.max(max, m.count);\r
-                       i++;\r
-               }\r
-               IChartData data = new AbstractChartData(max) {\r
-                       private static final long serialVersionUID = 1L;\r
-\r
-                       @Override\r
-                       public double[][] getData() {\r
-                               return new double[][] { commits, tags };\r
-                       }\r
-               };\r
-               return data;\r
-       }\r
-\r
        public static double maxValue(Collection<Metric> metrics) {\r
                double max = Double.MIN_VALUE;\r
                for (Metric m : metrics) {\r
@@ -667,31 +639,4 @@ public class WicketUtils {
                }\r
                return max;\r
        }\r
-\r
-       public static IChartData getScatterData(Collection<Metric> metrics) {\r
-               final double[] y = new double[metrics.size()];\r
-               final double[] x = new double[metrics.size()];\r
-               int i = 0;\r
-               double max = 0;\r
-               for (Metric m : metrics) {\r
-                       y[i] = m.count;\r
-                       if (m.duration > 0) {\r
-                               x[i] = m.duration;\r
-                       } else {\r
-                               x[i] = -1d;\r
-                       }\r
-                       max = Math.max(max, m.count);\r
-                       i++;\r
-               }\r
-               IChartData data = new AbstractChartData(max) {\r
-                       private static final long serialVersionUID = 1L;\r
-\r
-                       @Override\r
-                       public double[][] getData() {\r
-                               return new double[][] { x, y };\r
-                       }\r
-               };\r
-               return data;\r
-       }\r
-\r
 }\r

diff --git a/src/site/design.mkd b/src/site/design.mkd
index 8351dd9c594e126c7bda29bcdf88910f5d21d573..6d4b29cacde35e6a64610d354b212eaf3e674a32 100644 (file)
--- a/src/site/design.mkd
+++ b/src/site/design.mkd
@@ -17,6 +17,8 @@ The following dependencies are bundled with Gitblit.
 - [Clippy](https://github.com/mojombo/clippy) (MIT)\r
 - [google-code-prettify](http://code.google.com/p/google-code-prettify) (Apache 2.0)\r
 - [Commons Daemon](http://commons.apache.org/daemon) (Apache 2.0)\r
+- [jQuery](https://jquery.org) (MIT)\r
+- [flotr2](http://humblesoftware.com/flotr2) (BSD)\r
 - magnifying glass search icon courtesy of [Gnome](http://gnome.org) (Creative Commons CC-BY)\r
 - Git logo originally designed by [Jason Long](http://git-scm.com/downloads/logos)\r
 - modified Git logo originally designed by [Henrik Nyh](http://henrik.nyh.se/2007/06/alternative-git-logo-and-favicon)\r
@@ -28,7 +30,6 @@ The following dependencies are automatically downloaded by Gitblit GO (or alread
 \r
 - [JGit][jgit] (EDL 1.0)\r
 - [Wicket](http://wicket.apache.org) (Apache 2.0)\r
-- [WicketStuff GoogleCharts](https://github.com/wicketstuff/core/wiki/GoogleCharts) (Apache 2.0)\r
 - [Jetty](http://eclipse.org/jetty) (Apache 2.0, EPL 1.0)\r
 - [SLF4J](http://www.slf4j.org) (MIT/X11)\r
 - [Log4j](http://logging.apache.org/log4j) (Apache 2.0)\r