Author: sebb
Date: Thu Apr 26 21:35:07 2018
New Revision: 1830268

URL: http://svn.apache.org/viewvc?rev=1830268&view=rev
Log:
Merge JIRA and Bugzilla

Modified:
    attic/site-jekyll/src/_data/project.txt
    attic/site-jekyll/src/_data/projects.json
    attic/site-jekyll/src/_plugins/generate_projects.rb

Modified: attic/site-jekyll/src/_data/project.txt
URL: 
http://svn.apache.org/viewvc/attic/site-jekyll/src/_data/project.txt?rev=1830268&r1=1830267&r2=1830268&view=diff
==============================================================================
--- attic/site-jekyll/src/_data/project.txt (original)
+++ attic/site-jekyll/src/_data/project.txt Thu Apr 26 21:35:07 2018
@@ -16,8 +16,7 @@ nokeys: suppress the KEYS entry in the d
    "retired":     "April 2018",
    "scm":         "svn|git-wip|URL",
    "nokeys":      true,
-   "bugzilla":    "object",
-   "jira":        "OBJECT",
+   "tracker":     ["JIRA|Bugzilla|...", "object"],
    "wiki":        "URL",
    "board":       "The Minutes file name stem | default: project",
    "mailnames":   ["dev","etc"],

Modified: attic/site-jekyll/src/_data/projects.json
URL: 
http://svn.apache.org/viewvc/attic/site-jekyll/src/_data/projects.json?rev=1830268&r1=1830267&r2=1830268&view=diff
==============================================================================
--- attic/site-jekyll/src/_data/projects.json (original)
+++ attic/site-jekyll/src/_data/projects.json Thu Apr 26 21:35:07 2018
@@ -4,7 +4,7 @@
    "project":     "abdera",
    "retired":     "March 2017",
    "scm":         "svn",
-   "jira":        "ABDERA",
+   "tracker":     ["JIRA", "ABDERA"],
    "wiki":        "https://cwiki.apache.org/confluence/display/abdera/";,
    "mailnames":   ["dev", "commits", "user"],
    "description": "Apache Abdera was a project to build a 
functionally-complete, high-performance implementation of the IETF Atom 
Syndication Format (RFC 4287) and Atom Publishing Protocol (RFC 5023) 
specifications.",
@@ -24,7 +24,7 @@
    "project":     "ace",
    "retired":     "December 2017",
    "scm":         "svn",
-   "jira":        "ACE",
+   "tracker":     ["JIRA", "ACE"],
    "wiki":        "https://cwiki.apache.org/confluence/display/ace/";,
    "mailnames":   ["dev", "commits", "users"],
    "description": "Apache ACE was a software distribution framework that 
allows you to centrally manage and distribute software components, 
configuration data and other artifacts to target systems. It is built using 
OSGi and can be deployed in different topologies. The target systems are 
usually also OSGi based, but don't have to be. "
@@ -34,7 +34,7 @@
    "project":     "avalon",
    "retired":     "June 2004",
    "scm":         "svn",
-   "jira":        "AVALON",
+   "tracker":     ["JIRA", "AVALON"],
    "wiki":        "http://wiki.apache.org/avalon/";,
    "mailnames":   ["dev"],
    "description": "Apache Avalon was closed long before the creation of the 
Apache Attic. It's mentioned here for completeness."
@@ -56,7 +56,7 @@
    "dist":        "ws/sandesha2/c",
    "retired":     "September 2014",
    "scm":         "svn",
-   "jira":        "SANDESHA2C",
+   "tracker":     ["JIRA", "SANDESHA2C"],
    "mailnames":   [],
    "description": "Sandesha2/C was a C implementation of the 
WS-ReliableMessaging specification. Sandesha2/C was built on top of Apache 
Axis2/C Web services engine, as a module. Therefore by using Sandesha2/C you 
could add reliable messaging capability to Web services hosted using Axis2/C. 
Sandesha2/C could also be used with Axis2/C client to interact with an already 
hosted Web services in a reliable manner."
 },
@@ -67,7 +67,7 @@
    "dist":        "ws/savan/c",
    "retired":     "September 2014",
    "scm":         "svn",
-   "jira":        "AXIS2C",
+   "tracker":     ["JIRA", "AXIS2C"],
    "mailnames":   [],
    "description": "Savan/C was a C implementation of WS-Eventing 
specification. Savan/C was built on top of Axis2/C. Therefore by using Savan/C 
you could add WS-Eventing capability to Web services hosted using Axis2/C. 
Savan/C was designed as a general publisher/subscriber tool. The arcitecture 
was designed to abstract the general publisher/subscriber features so that 
people could support more than one publisher/subscriber mechanisms within the 
same infrastructure."
 },
@@ -77,7 +77,7 @@
    "subproject":  "axis2/java/savan",
    "nodist":      true,
    "retired":     "September 2014",
-   "jira":        "SAVAN",
+   "tracker":     ["JIRA", "SAVAN"],
    "mailnames":   [],
    "description": "Savan/Java was a Java implementation of WS-Eventing 
specification. Savan/Java was built on top of Axis2/Java. Therefore by using 
Savan/Java you could add WS-Eventing capability to Web services hosted using 
Axis2/Java. Savan/Java was designed as a general publisher/subscriber tool. The 
arcitecture was designed to abstract the general publisher/subscriber features 
so that people could support more than one publisher/subscriber mechanisms 
within the same infrastructure."
 },
@@ -86,7 +86,7 @@
    "project":     "beehive",
    "retired":     "January 2010",
    "scm":         "svn",
-   "jira":        "BEEHIVE",
+   "tracker":     ["JIRA", "BEEHIVE"],
    "wiki":        "https://wiki.apache.org/beehive";,
    "mailnames":   ["dev", "commits", "user"],
    "description": "Apache Beehive was a simple object model built on J2EE and 
Struts that used annotations to reduce the amount of required code.",
@@ -102,7 +102,7 @@
    "project":     "click",
    "retired":     "May 2014",
    "scm":         "svn",
-   "jira":        "CLK",
+   "tracker":     ["JIRA", "CLK"],
    "wiki":        "https://cwiki.apache.org/confluence/display/click/";,
    "mailnames":   ["dev", "commits", "user"],
    "description": "    Apache Click was a JEE web application framework, 
providing a natural rich client style programming model.\n  "
@@ -122,7 +122,7 @@
    "project":     "continuum",
    "retired":     "May 2016",
    "scm":         "svn",
-   "jira":        "CONTINUUM",
+   "tracker":     ["JIRA", "CONTINUUM"],
    "wiki":        "https://cwiki.apache.org/confluence/display/continuum/";,
    "mailnames":   ["dev", "users",  "commits", "issues", "notifications"],
    "description": "     Continuum was an enterprise-ready continuous 
integration server with features such as automated builds, release management, 
role-based security, and integration with popular build tools and source 
control management systems. "
@@ -132,7 +132,7 @@
    "project":     "deltacloud",
    "retired":     "July 2015",
    "scm":         "git-wip",
-   "jira":        "DTACLOUD",
+   "tracker":     ["JIRA", "DTACLOUD"],
    "mailnames":   ["dev", "commits", "user"],
    "description": "  Deltacloud provided the API server and drivers necessary 
for connecting to cloud providers via \n  a cloud abstraction API. "
 },
@@ -141,7 +141,7 @@
    "project":     "devicemap",
    "retired":     "December 2016",
    "scm":         "svn",
-   "jira":        "DMAP",
+   "tracker":     ["JIRA", "DMAP"],
    "wiki":        "http://wiki.apache.org/devicemap/";,
    "mailnames":   ["dev", "commits"],
    "description": "     Apache DeviceMap was a project to create a data 
repository containing device information, images and other relevant information 
for all sorts of mobile devices. ",
@@ -161,7 +161,7 @@
    "project":     "directmemory",
    "retired":     "July 2015",
    "scm":         "svn",
-   "jira":        "DIRECTMEMORY",
+   "tracker":     ["JIRA", "DIRECTMEMORY"],
    "wiki":        "https://cwiki.apache.org/confluence/display/directmemory/";,
    "mailnames":   ["dev", "commits", "user"],
    "description": "  DirectMemory was an off-heap cache for the Java Virtual 
Machine. "
@@ -171,7 +171,7 @@
    "project":     "esme",
    "retired":     "July 2013",
    "scm":         "svn",
-   "jira":        "ESME",
+   "tracker":     ["JIRA", "ESME"],
    "wiki":        "https://cwiki.apache.org/confluence/display/esme/";,
    "mailnames":   ["dev", "commits"],
    "description": "    Apache ESME (Enterprise Social Messaging Environment) 
was a secure and highly scalable microsharing \n    and micromessaging platform 
that allows people to discover and meet one another and get controlled \n    
access to other sources of information. "
@@ -181,7 +181,7 @@
    "project":     "etch",
    "retired":     "June 2016",
    "scm":         "svn",
-   "jira":        "ETCH",
+   "tracker":     ["JIRA", "ETCH"],
    "mailnames":   ["dev", "user", "commits"],
    "description": "     Etch was a cross-platform, language- and 
transport-independent framework for building and consuming network services. "
 },
@@ -190,7 +190,7 @@
    "project":     "excalibur",
    "retired":     "December 2010",
    "scm":         "svn",
-   "jira":        "EXLBR",
+   "tracker":     ["JIRA", "EXLBR"],
    "wiki":        "https://wiki.apache.org/excalibur";,
    "mailnames":   ["dev", "scm", "user"],
    "description": "Apache Excalibur was a Java Inversion of Control container."
@@ -200,7 +200,7 @@
    "project":     "harmony",
    "retired":     "November 2011",
    "scm":         "svn",
-   "jira":        "HARMONY",
+   "tracker":     ["JIRA", "HARMONY"],
    "wiki":        "http://wiki.apache.org/harmony/";,
    "mailnames":   ["dev", "alerts", "commits"],
    "description": "Harmony software was a modular Java runtime with class 
libraries and associated tools."
@@ -210,7 +210,7 @@
    "project":     "hivemind",
    "retired":     "April 2009",
    "scm":         "svn",
-   "jira":        "HIVEMIND",
+   "tracker":     ["JIRA", "HIVEMIND"],
    "wiki":        "http://wiki.apache.org/hivemind/";,
    "mailnames":   ["dev", "commits", "user"],
    "description": "Apache HiveMind was a services and configuration 
microkernel. Its features are also referred to as Inversion of Control (IoC) 
Container or Lightweight Container. Closely linked to Tapestry 4, it lost 
activity when Tapestry 5 moved to a new IoC container.",
@@ -241,7 +241,7 @@
    "subproject":  "cactus",
    "retired":     "August 2011",
    "scm":         "svn",
-   "jira":        "CACTUS",
+   "tracker":     ["JIRA", "CACTUS"],
    "mailnames":   ["dev", "user"],
    "description": "Jakarta previously hosted Cactus, a simple test framework 
for unit testing server-side java code."
 },
@@ -251,7 +251,7 @@
    "subproject":  "ecs",
    "retired":     "September 2010",
    "scm":         "svn",
-   "jira":        "ECS",
+   "tracker":     ["JIRA", "ECS"],
    "mailnames":   ["dev", "user"],
    "description": "Jakarta previously hosted ECS (Element Construction Set), a 
Java API for generating elements for any of a variety of markup languages 
(examples included HTML 4.0 and XML)."
 },
@@ -261,7 +261,7 @@
    "subproject":  "oro",
    "retired":     "September 2010",
    "scm":         "svn",
-   "bugzilla":    "oro",
+   "tracker":     ["Bugzilla","oro"],
    "mailnames":   ["dev", "user"],
    "description": "Jakarta previously hosted ORO, a set of text-processing 
Java classes that provide Perl5 compatible regular expressions, AWK-like 
regular expressions, glob expressions, and utility classes for performing 
substitutions, splits, filtering filenames, etc.",
    "postlude":    ["<p>Jakarta ORO users are encouraged to use similar 
features in newer Java versions, such as <i>java.util.regexp</i></p>"]
@@ -272,7 +272,7 @@
    "subproject":  "regexp",
    "retired":     "April 2011",
    "scm":         "svn",
-   "bugzilla":    "regexp",
+   "tracker":     ["Bugzilla","regexp"],
    "mailnames":   ["dev", "user"],
    "description": "Jakarta previously hosted Regexp, a 100% Pure Java Regular 
Expression package.",
    "postlude":    ["<p>Jakarta Regexp users are encouraged to use similar 
features in newer Java versions, such as <i>java.util.regexp</i></p>"]
@@ -283,7 +283,7 @@
    "subproject":  "slide",
    "retired":     "November 2007",
    "scm":         "svn",
-   "bugzilla":    "slide",
+   "tracker":     ["Bugzilla","slide"],
    "wiki":        "https://wiki.apache.org/jakarta-slide";,
    "mailnames":   ["dev", "user"],
    "description": "Jakarta previously hosted Slide, a content repository which 
could serve as a basis for a content management system as well as other 
purposes. Among its features was full WebDAV support.",
@@ -297,7 +297,7 @@
    "website":     "",
    "retired":     "June 2008",
    "scm":         "svn",
-   "bugzilla":    "taglibs",
+   "tracker":     ["Bugzilla","taglibs"],
    "mailnames":   ["dev"],
    "description": "Jakarta hosted the Jakarta Taglibs project, a large 
collection of JSP Tag Libraries. They ranged from simple utility libraries and 
UI libraries, to Dreamweaver extensions and an implementation of the JSP 
Standard Tag Library (JSTL) specification.",
    "postlude":    ["<p>In 2008 and 2009, the majority of these libraries were 
deprecated and have now been retired. The remaining work has ",
@@ -359,7 +359,7 @@
    "project":     "mrunit",
    "retired":     "April 2016",
    "scm":         "svn",
-   "jira":        "MRUNIT",
+   "tracker":     ["JIRA", "MRUNIT"],
    "wiki":        "https://cwiki.apache.org/confluence/display/MRUNIT";,
    "mailnames":   ["dev", "user", "commits"],
    "description": "Apache MRUnit was a Java library that helped developers 
unit test Apache Hadoop map reduce jobs."
@@ -371,7 +371,7 @@
    "subproject":  "ojb",
    "retired":     "January 2011",
    "scm":         "svn",
-   "jira":        "OJB",
+   "tracker":     ["JIRA", "OJB"],
    "wiki":        "https://wiki.apache.org/db-ojb";,
    "mailnames":   ["dev", "user"],
    "description": "Apache OJB was an Object/Relational mapping tool that 
allowed transparent persistence for Java Objects against relational databases.",
@@ -392,7 +392,7 @@
    "project":     "oltu",
    "retired":     "April 2018",
    "scm":         "svn",
-   "jira":        "OLTU",
+   "tracker":     ["JIRA", "OLTU"],
    "wiki":        "https://cwiki.apache.org/confluence/display/oltu/";,
    "mailnames":   ["dev", "user", "commits"],
    "description": "Apache Oltu was an OAuth protocol implementation in Java. 
It also covers others OAuth family related implementations such as JWT, JWS and 
OpenID Connect"
@@ -402,7 +402,7 @@
    "project":     "onami",
    "retired":     "January 2016",
    "scm":         "svn",
-   "jira":        "ONAMI",
+   "tracker":     ["JIRA", "ONAMI"],
    "mailnames":   ["dev", "user", "commits"],
    "description": "    Apache Onami was a project focused on the development 
and maintenance of a set of Google Guice extensions not provided out of the box 
by the library itself.\n  "
 },
@@ -422,7 +422,7 @@
    "project":     "rave",
    "retired":     "January 2016",
    "scm":         "svn",
-   "jira":        "RAVE",
+   "tracker":     ["JIRA", "RAVE"],
    "wiki":        "http://wiki.apache.org/rave/";,
    "mailnames":   ["dev", "users", "commits"],
    "description": "Apache Rave was a web and social mashup engine that 
aggregated and served web widgets. It was targeted as an engine for internet 
and intranet portals."
@@ -432,7 +432,7 @@
    "project":     "shale",
    "retired":     "May 2009",
    "scm":         "svn",
-   "jira":        "SHALE",
+   "tracker":     ["JIRA", "SHALE"],
    "wiki":        "http://wiki.apache.org/shale/";,
    "mailnames":   ["dev", "user", "commits"],
    "description": "Shale was a web application framework, fundamentally based 
on JavaServer Faces.  This blog entry from Kito Mann is an excellent discussion 
of Shale's retirement: <a 
href=\"http://blogs.jsfcentral.com/editorsdesk/entry/shale_in_the_attic\";>http://blogs.jsfcentral.com/editorsdesk/entry/shale_in_the_attic</a>.",
@@ -447,7 +447,7 @@
    "project":     "shindig",
    "retired":     "November 2015",
    "scm":         "svn",
-   "jira":        "SHINDIG",
+   "tracker":     ["JIRA", "SHINDIG"],
    "wiki":        "https://cwiki.apache.org/confluence/display/shindig/";,
    "mailnames":   ["dev", "users", "commits"],
    "description": "Apache Shindig was an OpenSocial container to help you to 
start hosting OpenSocial apps quickly."
@@ -458,7 +458,7 @@
    "project":     "stdcxx",
    "retired":     "July 2013",
    "scm":         "svn",
-   "jira":        "STDCXX",
+   "tracker":     ["JIRA", "STDCXX"],
    "wiki":        "http://wiki.apache.org/stdcxx/";,
    "board":       "Cxx_Standard_Library",
    "mailnames":   ["dev", "commits", "user"],
@@ -469,7 +469,7 @@
    "project":     "stratos",
    "retired":     "January 2017",
    "scm":         "git-wip",
-   "jira":        "STRATOS",
+   "tracker":     ["JIRA", "STRATOS"],
    "wiki":        "https://cwiki.apache.org/confluence/display/stratos/";,
    "mailnames":   ["dev", "commits"],
    "description": "Stratos was a highly-extensible Platform-as-a-Service 
(PaaS) framework that helped run Apache Tomcat, PHP, and MySQL applications, 
and could be extended to support many more environments on all major cloud 
infrastructures."
@@ -479,7 +479,7 @@
    "project":     "tuscany",
    "retired":     "May 2016",
    "scm":         "svn",
-   "jira":        "TUSCANY",
+   "tracker":     ["JIRA", "TUSCANY"],
    "wiki":        "https://cwiki.apache.org/confluence/display/tuscany/";,
    "mailnames":   ["dev", "user", "commits"],
    "description": "Tuscany simplified the task of developing service-oriented 
architectured solutions by providing a comprehensive infrastructure for 
development and management, based on the Service Component Architecture 
standard."
@@ -489,7 +489,7 @@
    "project":     "whirr",
    "retired":     "March 2015",
    "scm":         "svn",
-   "jira":        "WHIRR",
+   "tracker":     ["JIRA", "WHIRR"],
    "wiki":        "https://cwiki.apache.org/confluence/display/whirr/";,
    "mailnames":   ["dev", "user", "commits"],
    "description": "Apache Whirr was a set of libraries for running cloud 
services and deploying clusters.",
@@ -500,7 +500,7 @@
    "project":     "wink",
    "retired":     "April 2017",
    "scm":         "svn",
-   "jira":        "WINK",
+   "tracker":     ["JIRA", "WINK"],
    "wiki":        "https://cwiki.apache.org/confluence/display/wink/";,
    "mailnames":   ["dev", "commits", "user"],
    "description": "Apache Wink was a simple yet solid framework for building 
RESTful Web services. It is comprised of a Server module and a Client module 
for developing and consuming RESTful Web services."
@@ -510,7 +510,7 @@
    "project":     "wookie",
    "retired":     "April 2016",
    "scm":         "svn",
-   "jira":        "WOOKIE",
+   "tracker":     ["JIRA", "WOOKIE"],
    "wiki":        "https://cwiki.apache.org/confluence/display/wookie/";,
    "mailnames":   ["dev", "user", "commits"],
    "description": "Wookie was a Java server application that allowed you to 
upload and deploy W3C/OpenSocial/Google Wave widgets to your applications."
@@ -542,7 +542,7 @@
    "subproject":  "xindice",
    "retired":     "August 2011",
    "scm":         "svn",
-   "bugzilla":    "Xindice",
+   "tracker":     ["Bugzilla","Xindice"],
    "wiki":        "http://wiki.apache.org/xindice";,
    "mailnames":   ["dev", "users"],
    "description": "Apache Xindice was a native XML database."

Modified: attic/site-jekyll/src/_plugins/generate_projects.rb
URL: 
http://svn.apache.org/viewvc/attic/site-jekyll/src/_plugins/generate_projects.rb?rev=1830268&r1=1830267&r2=1830268&view=diff
==============================================================================
--- attic/site-jekyll/src/_plugins/generate_projects.rb (original)
+++ attic/site-jekyll/src/_plugins/generate_projects.rb Thu Apr 26 21:35:07 2018
@@ -53,12 +53,23 @@ module Jekyll
         end
       end
 
-      if prj['bugzilla']
-        prj['issueURL'] = 
"https://bz.apache.org/bugzilla/buglist.cgi?product=#{prj['bugzilla']}"
-        prj['issueType'] = 'Bugzilla'
-      elsif prj['jira']
-        prj['issueURL'] = 
"https://issues.apache.org/jira/browse/#{prj['jira']}/"
-        prj['issueType'] = 'JIRA'
+      tracker = prj['tracker']
+      if tracker
+        type = tracker[0]
+        targ = tracker[1]
+        prj['issueType'] = type
+        case type
+          when 'JIRA'
+            prj['issueURL'] = "https://issues.apache.org/jira/browse/#{targ}/";
+          when 'Bugzilla'
+            prj['issueURL'] = 
"https://bz.apache.org/bugzilla/buglist.cgi?product=#{targ}";
+          when 'Bugzilla (AOO)' # hopefully never needed
+            prj['issueURL'] = 
"https://bz.apache.org/aoo/buglist.cgi?product=#{targ}";
+          when 'Bugzilla (SpamAssassin)'  # hopefully never needed
+            prj['issueURL'] = 
"https://bz.apache.org/SpamAssassin/buglist.cgi?product=#{targ}";
+          else
+            raise "Unexpected tracker: #{type} #{targ}"
+        end
       end
 
       if prj['scm'] == 'svn'


Reply via email to