Author: sebb Date: Fri Feb 13 14:51:40 2026 New Revision: 1931850 Log: webservices => ws
Added: comdev/projects.apache.org/trunk/data/committees/ws.rdf (contents, props changed) Modified: comdev/projects.apache.org/trunk/data/committees.xml comdev/projects.apache.org/trunk/scripts/committee_info.py comdev/projects.apache.org/trunk/scripts/cronjobs/parsecommitteeinfo.py comdev/projects.apache.org/trunk/scripts/cronjobs/parseprojects.py Modified: comdev/projects.apache.org/trunk/data/committees.xml ============================================================================== --- comdev/projects.apache.org/trunk/data/committees.xml Fri Feb 13 11:18:44 2026 (r1931849) +++ comdev/projects.apache.org/trunk/data/committees.xml Fri Feb 13 14:51:40 2026 (r1931850) @@ -293,7 +293,7 @@ <location>committees/velocity.rdf</location> <!-- Retired: location>committees-retired/vxquery.rdf</location --> <location>committees/wayang.rdf</location> - <location>committees/webservices.rdf</location> + <location>committees/ws.rdf</location> <location>committees/whimsy.rdf</location> <!-- Retired <location>committees-retired/whirr.rdf</location> --> <location>committees/wicket.rdf</location> Added: comdev/projects.apache.org/trunk/data/committees/ws.rdf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ comdev/projects.apache.org/trunk/data/committees/ws.rdf Fri Feb 13 14:51:40 2026 (r1931850) @@ -0,0 +1,24 @@ +<?xml version="1.0"?> +<!-- + ======================================================================= + + Copyright (c) 2006 The Apache Software Foundation. + All rights reserved. + + ======================================================================= +--> +<rdf:RDF xml:lang="en" + xmlns="http://usefulinc.com/ns/doap#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:asfext="http://projects.apache.org/ns/asfext#" + xmlns:foaf="http://xmlns.com/foaf/0.1/"> + <asfext:pmc rdf:about="ws"> + <asfext:name>Apache Web Services</asfext:name> + <asfext:charter> + The mission of Web Services is the creation and maintenance of software related to + Projects related to Web Services + </asfext:charter> + <foaf:homepage rdf:resource="http://ws.apache.org/"/> + </asfext:pmc> + +</rdf:RDF> Modified: comdev/projects.apache.org/trunk/scripts/committee_info.py ============================================================================== --- comdev/projects.apache.org/trunk/scripts/committee_info.py Fri Feb 13 11:18:44 2026 (r1931849) +++ comdev/projects.apache.org/trunk/scripts/committee_info.py Fri Feb 13 14:51:40 2026 (r1931850) @@ -127,11 +127,6 @@ def cycles(): if not c['pmc']: continue reportcycles[ctte] = c['report'] - # Duplicate some entries for now so the code can find them (the existing json has the duplicates) - if ctte == 'ws': # Special processing - reportcycles['webservices'] = reportcycles[ctte] - if ctte == 'httpd': # Special processing - reportcycles['http server'] = reportcycles[ctte] return reportcycles """ @@ -223,9 +218,6 @@ def pmcdates(): date = 0 ids[idk] = [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 """ Modified: comdev/projects.apache.org/trunk/scripts/cronjobs/parsecommitteeinfo.py ============================================================================== --- comdev/projects.apache.org/trunk/scripts/cronjobs/parsecommitteeinfo.py Fri Feb 13 11:18:44 2026 (r1931849) +++ comdev/projects.apache.org/trunk/scripts/cronjobs/parsecommitteeinfo.py Fri Feb 13 14:51:40 2026 (r1931850) @@ -33,11 +33,6 @@ from urlutils import URLopen, URLexists sys.path.append("..") # module committee_info is in parent directory import committee_info -# LDAP group ids not matching committee id; convert group to committeeId -group_ids = { - 'ws': 'webservices' -} - # homepages not matching https?://<committee id>.apache.org/ and not defined in committee-info.json / index.html homepages = { } @@ -149,8 +144,6 @@ def keyorder(s): return 'communitydevelopment' if s == 'httpd': return 'http' # so it sorts before HTTP Components (it's wrong in CI) - if s == 'ws': - return 'webservices' return s # extract committees composition @@ -169,7 +162,7 @@ for group in sorted(committees, key=keyo if ctte['pmc']: # we only want PMCs if ctte['established']: # only want ones with entries in section 3 # Fix up name where PMC RDF does not agree with LDAP group - committeeId = group_ids.get(group, group) + committeeId = group img = "https://www.apache.org/logos/res/%s/default.png" % committeeId if not skipImageTest and not URLexists(img): Modified: comdev/projects.apache.org/trunk/scripts/cronjobs/parseprojects.py ============================================================================== --- comdev/projects.apache.org/trunk/scripts/cronjobs/parseprojects.py Fri Feb 13 11:18:44 2026 (r1931849) +++ comdev/projects.apache.org/trunk/scripts/cronjobs/parseprojects.py Fri Feb 13 14:51:40 2026 (r1931850) @@ -120,7 +120,6 @@ itemlist = xmldoc.getElementsByTagName(' siteMap = { 'hc': 'httpcomponents', - 'ws':'webservices' } # convert from project to mail domain @@ -350,6 +349,10 @@ for s in itemlist : m = re.match(r"https?://([^.]+)\.apache\.org/?$", pmcrdf, re.IGNORECASE) if m: committeeId = m.group(1) + # Temporary override until DOAPs are fixed + if committeeId == 'webservices': + committeeId = 'ws' + print(f"WARN: found webservices in {url}") else: # Not a shortcut, so read the descriptor file try:
