Author: sebb
Date: Fri Feb 13 15:34:40 2026
New Revision: 1931853
Log:
webservices => ws
Modified:
comdev/reporter.apache.org/trunk/scripts/committee_info.py
comdev/reporter.apache.org/trunk/scripts/health.py
comdev/reporter.apache.org/trunk/scripts/pdata.py
comdev/reporter.apache.org/trunk/scripts/rapp/whimsy.py
Modified: comdev/reporter.apache.org/trunk/scripts/committee_info.py
==============================================================================
--- comdev/reporter.apache.org/trunk/scripts/committee_info.py Fri Feb 13
15:09:37 2026 (r1931852)
+++ comdev/reporter.apache.org/trunk/scripts/committee_info.py Fri Feb 13
15:34:40 2026 (r1931853)
@@ -59,7 +59,6 @@ def PMCnames():
...
}
Only includes actual PMC names
- Returns 'webservices' rather than 'ws'
"""
cidata = loadJson(URL)
committees = cidata['committees']
@@ -70,7 +69,6 @@ def PMCnames():
if not c['pmc']:
continue
name = 'Apache %s' % c['display_name']
- if ctte == 'ws': ctte = 'webservices'
namejson[ctte] = name
return namejson
@@ -98,7 +96,6 @@ def PMCsummary():
...
}
Only includes actual PMCs
- Returns 'webservices' rather than 'ws'
"""
cidata = loadJson(URL)
committees = cidata['committees']
@@ -109,7 +106,6 @@ def PMCsummary():
if not c['pmc']:
continue
name = 'Apache %s' % c['display_name']
- if ctte == 'ws': ctte = 'webservices'
chair = 'Unknown'
chs = c['chair']
for ch in chs: # allow for multiple chairs
@@ -151,9 +147,6 @@ def pmcdates():
date = 0
ids[uid] = [rid['name'], date]
dates[ent]['roster'] = ids
- # The 'CI' internal name for Web Services is 'ws' but reporter code
originally used 'webservices'
- if ent == 'ws':
- dates['webservices'] = dates[ent]
return dates
def cycles():
@@ -169,10 +162,6 @@ def cycles():
report_cycles[ctte] = [c['nextMeetingEpoch']]
report_cycles[ctte].extend(c['report'])
# Duplicate some entries for now so the code can find them (the
existing json has the duplicates)
- if ctte == 'ws': # Special processing
- report_cycles['webservices'] = report_cycles[ctte]
- if ctte == 'httpd': # Special processing
- report_cycles['http server'] = report_cycles[ctte]
return report_cycles
def getPMCs(uid, incubator=False):
Modified: comdev/reporter.apache.org/trunk/scripts/health.py
==============================================================================
--- comdev/reporter.apache.org/trunk/scripts/health.py Fri Feb 13 15:09:37
2026 (r1931852)
+++ comdev/reporter.apache.org/trunk/scripts/health.py Fri Feb 13 15:34:40
2026 (r1931853)
@@ -20,16 +20,11 @@ RAO_DATA = '../data'
pmap = {
'community': 'comdev',
- 'ws': 'webservices',
'hc': 'httpcomponents',
'whimsical': 'whimsy',
'empire': 'empire-db'
}
-ldapmap = {
- 'webservices': 'ws'
-}
-
def getReleaseData(project):
try:
with open(join(RAO_DATA,"releases/%s.json") % project, "r") as f:
@@ -84,8 +79,6 @@ for group in pmcnames:
jiras = []
count[group] = [0,0]
xgroup = group
- if group in ldapmap:
- xgroup = ldapmap[group]
if xgroup in pchanges:
count[group][0] = len(pchanges[xgroup])
if xgroup in cchanges:
Modified: comdev/reporter.apache.org/trunk/scripts/pdata.py
==============================================================================
--- comdev/reporter.apache.org/trunk/scripts/pdata.py Fri Feb 13 15:09:37
2026 (r1931852)
+++ comdev/reporter.apache.org/trunk/scripts/pdata.py Fri Feb 13 15:34:40
2026 (r1931853)
@@ -55,16 +55,11 @@ jmap = {
pmap = {# convert mailing list name to PMC name
'community': 'comdev',
- 'ws': 'webservices',
'hc': 'httpcomponents',
'whimsical': 'whimsy',
'empire': 'empire-db'
}
-ldapmap = {
- 'webservices': 'ws'
-}
-
def readJson(filename, *default):
"""Read a JSON file. If the read fails, return the default (if any)
otherwise return the exception"""
data = {}
@@ -283,8 +278,6 @@ def generate(user, project):
jiras = []
count = [0,0]
xgroup = group
- if group in ldapmap:
- xgroup = ldapmap[group]
if xgroup in pchanges:
count[0] = len(pchanges[xgroup])
if xgroup in cchanges:
Modified: comdev/reporter.apache.org/trunk/scripts/rapp/whimsy.py
==============================================================================
--- comdev/reporter.apache.org/trunk/scripts/rapp/whimsy.py Fri Feb 13
15:09:37 2026 (r1931852)
+++ comdev/reporter.apache.org/trunk/scripts/rapp/whimsy.py Fri Feb 13
15:34:40 2026 (r1931853)
@@ -116,8 +116,6 @@ def agenda_forced(environ, user):
def agenda(environ, user, fproject = None):
""" Returns data on the board report for a project, IF present and/or
filed in the current agenda """
project = fproject or environ.get('QUERY_STRING')
- # Kludge for webservices
- project = pdata.ldapmap.get(project, project)
report = None
_txtfile, url = latest_agenda(environ)
if has_access(user, project):
@@ -201,8 +199,6 @@ def publish(environ, _user):
digest = js.get('digest')
attach = js.get('attach')
print(project, agenda)
- # Kludge for webservices
- project = pdata.ldapmap.get(project, project)
if agenda and project and report:
message = "Publishing report for %s via Reporter" % project
payload = {
