You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@community.apache.org by hb...@apache.org on 2015/05/09 00:19:27 UTC
svn commit: r1678452 - in /comdev/projects.apache.org/site: js/projects.js
json/foundation/committees.json
Author: hboutemy
Date: Fri May 8 22:19:27 2015
New Revision: 1678452
URL: http://svn.apache.org/r1678452
Log:
added support for retired TLPs and restored retired TLPs from list
Modified:
comdev/projects.apache.org/site/js/projects.js
comdev/projects.apache.org/site/json/foundation/committees.json
Modified: comdev/projects.apache.org/site/js/projects.js
URL: http://svn.apache.org/viewvc/comdev/projects.apache.org/site/js/projects.js?rev=1678452&r1=1678451&r2=1678452&view=diff
==============================================================================
--- comdev/projects.apache.org/site/js/projects.js (original)
+++ comdev/projects.apache.org/site/js/projects.js Fri May 8 22:19:27 2015
@@ -900,19 +900,34 @@ function renderFrontPage() {
for (j in karr) {
var i = karr[j]
- cur += committees_raw[i].length;
- parr.push([i, committees_raw[i].length, cur, (committees_raw[i].length == 0) ? i + " (" + cur + "): No new Top Level Project" : i + " (" + cur + "): " + committees_raw[i].join(", ")]);
+ var changes = committees_raw[i]
+ var newTlps = []
+ var retiredTlps = []
+ for (k in changes) {
+ var change = changes[k]
+ if (change.match(/retired: /)) {
+ retiredTlps.push(change.substring(9))
+ } else {
+ newTlps.push(change)
+ }
+ }
+ cur += newTlps.length - retiredTlps.length
+ var evo = '' + i + " (" + cur + "): " + ((newTlps.length == 0) ? "No new Top Level Project" : newTlps.join(", "))
+ if (retiredTlps.length>0) {
+ evo += ", retired " + retiredTlps.join(", ")
+ }
+ parr.push([i, newTlps.length, retiredTlps.length, cur, evo]);
}
//narr.sort(function(a,b) { return (b[1] - a[1]) });
var data1 = new google.visualization.DataTable();
data1.addColumn('string', 'Month');
data1.addColumn('number', "New TLPs");
+ data1.addColumn('number', "Retired TLPs");
data1.addColumn('number', 'Current TLPs');
- // TODO: missing retired TLPs (moved to the Attic)
data1.addColumn({type: 'string', role: 'tooltip'});
-
+
data1.addRows(parr);
-
+
coptions = {
title: "Top Level Project evolution",
isStacked: true,
@@ -920,7 +935,7 @@ function renderFrontPage() {
width: 1160,
seriesType: "bars",
backgroundColor: 'transparent',
- series: {1: {type: "line", targetAxisIndex: 1}},
+ series: {2: {type: "line", targetAxisIndex: 1}},
vAxes:[
{title: 'Change in states'},
{title: 'Current number of TLPs'},
@@ -1242,9 +1257,14 @@ function weaveInCommitters(json) {
function setCommittees(json, state) {
committees_raw = json
- for (i in json) {
- for (j in json[i]) {
- committees[json[i][j]] = i;
+ for (established in json) {
+ for (j in json[established]) {
+ var name = json[established][j]
+ if (name.match(/retired: /i)) {
+ delete committees[name.substring(9)]
+ } else {
+ committees[name] = established;
+ }
}
}
if (state) {
Modified: comdev/projects.apache.org/site/json/foundation/committees.json
URL: http://svn.apache.org/viewvc/comdev/projects.apache.org/site/json/foundation/committees.json?rev=1678452&r1=1678451&r2=1678452&view=diff
==============================================================================
--- comdev/projects.apache.org/site/json/foundation/committees.json (original)
+++ comdev/projects.apache.org/site/json/foundation/committees.json Fri May 8 22:19:27 2015
@@ -57,7 +57,9 @@
"1999-06": [],
"1999-07": [],
"1999-08": [],
-"1999-09": [],
+"1999-09": [
+"Apache Jakarta"
+],
"1999-10": [],
"1999-11": [],
"1999-12": [],
@@ -106,7 +108,8 @@
"Apache Incubator"
],
"2002-11": [
-"Apache Ant"
+"Apache Ant",
+"Apache Avalon"
],
"2002-12": [],
"2003-01": [
@@ -139,11 +142,13 @@
],
"2004-04": [],
"2004-05": [
+"Apache Excalibur",
"Apache Forrest",
"Apache Geronimo"
],
"2004-06": [
-"Apache SpamAssassin"
+"Apache SpamAssassin",
+"Apache XML Beans"
],
"2004-07": [],
"2004-08": [],
@@ -155,7 +160,9 @@
"Apache XML Graphics"
],
"2004-11": [],
-"2004-12": [],
+"2004-12": [
+"Apache Avalon"
+],
"2005-01": [
"Apache Lucene"
],
@@ -167,10 +174,13 @@
"2005-03": [],
"2005-04": [],
"2005-05": [
-"Apache Tomcat"
+"Apache Tomcat",
+"Apache iBatis"
],
"2005-06": [],
-"2005-07": [],
+"2005-07": [
+"Apache Beehive"
+],
"2005-08": [],
"2005-09": [],
"2005-10": [],
@@ -183,15 +193,19 @@
"2006-03": [
"Apache Jackrabbit"
],
-"2006-04": [],
+"2006-04": [
+"Apache HiveMind"
+],
"2006-05": [],
"2006-06": [
-"Apache Santuario"
+"Apache Santuario",
+"Apache Shale"
],
"2006-07": [],
"2006-08": [],
"2006-09": [],
"2006-10": [
+"Apache Harmony",
"Apache MINA",
"Apache Velocity"
],
@@ -232,6 +246,7 @@
],
"2007-10": [],
"2007-11": [
+"Apache C++ Standard Library",
"Apache HttpComponents"
],
"2007-12": [
@@ -270,8 +285,12 @@
"2009-01": [],
"2009-02": [],
"2009-03": [],
-"2009-04": [],
-"2009-05": [],
+"2009-04": [
+"retired: Apache HiveMind"
+],
+"2009-05": [
+"retired: Apache Shale"
+],
"2009-06": [
"Apache Sling"
],
@@ -282,6 +301,7 @@
"Apache PDFBox"
],
"2009-11": [
+"Apache Click",
"Apache Community Development"
],
"2009-12": [
@@ -290,7 +310,8 @@
"Apache Pivot"
],
"2010-01": [
-"Apache Shindig"
+"Apache Shindig",
+"retired: Apache Beehive"
],
"2010-02": [
"Apache Cassandra",
@@ -309,7 +330,8 @@
],
"2010-05": [],
"2010-06": [
-"Apache Karaf"
+"Apache Karaf",
+"retired: Apache iBatis"
],
"2010-07": [],
"2010-08": [
@@ -328,7 +350,9 @@
"Apache ZooKeeper"
],
"2010-12": [
-"Apache Aries"
+"Apache Aries",
+"Apache ESME",
+"retired: Apache Excalibur"
],
"2011-01": [
"Apache River"
@@ -343,15 +367,20 @@
],
"2011-06": [],
"2011-07": [],
-"2011-08": [],
+"2011-08": [
+"Apache Whirr"
+],
"2011-09": [],
"2011-10": [
"Apache Deltacloud",
"Apache JMeter"
],
-"2011-11": [],
+"2011-11": [
+"retired: Apache Harmony"
+],
"2011-12": [
-"Apache ACE"
+"Apache ACE",
+"retired: Apache Jakarta"
],
"2012-01": [
"Apache Empire-db",
@@ -434,7 +463,10 @@
"Apache Mesos"
],
"2013-07": [
-"Apache JSPWiki"
+"Apache JSPWiki",
+"retired: Apache C++ Standard Library",
+"Apache ESME",
+"retired: Apache XML Beans"
],
"2013-08": [],
"2013-09": [
@@ -494,10 +526,13 @@
"2015-02": [],
"2015-03": [
"Apache Aurora",
-"Apache Zest"
+"Apache Zest",
+"retired: Apache Whirr"
],
"2015-04": [
"Apache Orc",
-"Apache Parquet"
+"Apache Parquet",
+"retired: Apache Click",
+"retired: Apache Lenya"
]
}
\ No newline at end of file